diff --git a/.dockerignore b/.dockerignore
index 42dc9d58b..92bd5419d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,23 +1,57 @@
-node_modules
-tmp
+# Version control
+.git
+.gitignore
+
+# Sensitive config (user may mount their own)
 app/Config/Email.php
+
+# Build artifacts
+node_modules/
+dist/
+tmp/
 *.patch
 patches/
+
+# IDE and editor files
 .idea/
-git-svn-diff.py
-*.bash
+.vscode/
 .swp
+*.swp
 .buildpath
 .project
-.settings/*
-.git
-dist/
-node_modules/
-*.swp
+.settings/
+
+# Development tools and configs
+tests/
+phpunit.xml
+.php-cs-fixer.*
+phpstan.neon
+*.bash
+git-svn-diff.py
+
+# Documentation
+*.md
+!LICENSE
+branding/
+
+# Build configs (not needed at runtime)
+composer.json
+composer.lock
+package.json
+package-lock.json
+gulpfile.js
+.env
+.env.*
+.dockerignore
+
+# Temporary and backup files
 *.rej
 *.orig
 *~
 *.~
 *.log
-app/writable/session/*
-!app/writable/session/index.html
+
+# CI
+.github/
+.github/workflows/
+build/
diff --git a/.env.example b/.env.example
index 17298ab69..d055638c1 100644
--- a/.env.example
+++ b/.env.example
@@ -2,62 +2,116 @@
 # ENVIRONMENT
 #--------------------------------------------------------------------
 
-CI_ENVIRONMENT = production
+CI_ENVIRONMENT=production
+
+#--------------------------------------------------------------------
+# SECURITY: ALLOWED HOSTNAMES
+#--------------------------------------------------------------------
+# CRITICAL: Whitelist of allowed hostnames to prevent Host Header
+# Injection attacks (GHSA-jchf-7hr6-h4f3).
+#
+# REQUIRED IN PRODUCTION: Application will fail to start if not configured.
+# In development, falls back to 'localhost' with an error log.
+#
+# Configure with comma-separated list of domains/subdomains:
+#   app.allowedHostnames='yourdomain.com,www.yourdomain.com'
+#
+# Or via environment variable (useful for Docker/Compose):
+#   ALLOWED_HOSTNAMES=yourdomain.com,www.yourdomain.com
+#
+# For local development:
+#   app.allowedHostnames='localhost'
+#
+# Note: Do not include protocol (http/https) or port numbers.
+app.allowedHostnames=''
 
 #--------------------------------------------------------------------
 # DATABASE
 #--------------------------------------------------------------------
 
-database.default.hostname = 'localhost'
-database.default.database = 'ospos'
-database.default.username = 'admin'
-database.default.password = 'pointofsale'
-database.default.DBDriver = 'MySQLi'
-database.default.DBPrefix = 'ospos_'
+database.default.hostname='localhost'
+database.default.database='ospos'
+database.default.username='admin'
+database.default.password='pointofsale'
+database.default.DBDriver='MySQLi'
+database.default.DBPrefix='ospos_'
 
-database.development.hostname = 'localhost'
-database.development.database = 'ospos'
-database.development.username = 'admin'
-database.development.password = 'pointofsale'
-database.development.DBDriver = 'MySQLi'
-database.development.DBPrefix = 'ospos_'
+database.development.hostname='localhost'
+database.development.database='ospos'
+database.development.username='admin'
+database.development.password='pointofsale'
+database.development.DBDriver='MySQLi'
+database.development.DBPrefix='ospos_'
 
-database.tests.hostname = 'localhost'
-database.tests.database = 'ospos'
-database.tests.username = 'admin'
-database.tests.password = 'pointofsale'
-database.tests.DBDriver = 'MySQLi'
-database.tests.DBPrefix = 'ospos_'
+database.tests.hostname='localhost'
+database.tests.database='ospos_test'
+database.tests.username='admin'
+database.tests.password='pointofsale'
+database.tests.DBDriver='MySQLi'
+database.tests.DBPrefix='ospos_'
 
 #--------------------------------------------------------------------
 # ENCRYPTION
 #--------------------------------------------------------------------
 
-encryption.key = ''
+# Leave blank and the application auto-generates a unique key on first use.
+# For Docker/Compose, pass it via the ENCRYPTION_KEY env var instead:
+#   docker run -e ENCRYPTION_KEY="$(openssl rand -hex 32)" opensourcepos
+# ENCRYPTION_KEY is read as a fallback when encryption.key is empty, so no
+# shared key needs to be committed or baked into the shipped image.
+encryption.key=''
+# Persistent secret for HMAC-hashing login-throttle cache keys. Left blank and
+# provisioned on startup (php spark env:provision); independent of encryption.key.
+# For Docker/Compose, pass it via the THROTTLE_KEY env var instead:
+#   docker run -e THROTTLE_KEY="$(openssl rand -hex 32)" opensourcepos
+# THROTTLE_KEY is read as a fallback when throttle.key is empty, so no
+# shared secret needs to be committed or baked into the shipped image.
+throttle.key=''
 
 #--------------------------------------------------------------------
 # LOGGER
-# - 0 = Disables logging, Error logging TURNED OFF
-# - 1 = Emergency Messages - System is unusable
-# - 2 = Alert Messages - Action Must Be Taken Immediately
-# - 3 = Critical Messages - Application component unavailable, unexpected exception.
-# - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
-# - 5 = Warnings - Exceptional occurrences that are not errors.
-# - 6 = Notices - Normal but significant events.
-# - 7 = Info - Interesting events, like user logging in, etc.
-# - 8 = Debug - Detailed debug information.
-# - 9 = All Messages
+# - 0=Disables logging, Error logging TURNED OFF
+# - 1=Emergency Messages - System is unusable
+# - 2=Alert Messages - Action Must Be Taken Immediately
+# - 3=Critical Messages - Application component unavailable, unexpected exception.
+# - 4=Runtime Errors - Don't need immediate action, but should be monitored.
+# - 5=Warnings - Exceptional occurrences that are not errors.
+# - 6=Notices - Normal but significant events.
+# - 7=Info - Interesting events, like user logging in, etc.
+# - 8=Debug - Detailed debug information.
+# - 9=All Messages
 #--------------------------------------------------------------------
 
-logger.threshold = 0
-app.db_log_enabled = false
+logger.threshold=0
+app.db_log_enabled=false
 
 #--------------------------------------------------------------------
 # HONEYPOT
 #--------------------------------------------------------------------
 
-honeypot.hidden = true
-honeypot.label = 'Fill This Field'
-honeypot.name = 'honeypot'
-honeypot.template = '<label>{label}</label><input type="text" name="{name}" value="">'
-honeypot.container = '<div style="display:none">{template}</div>'
+honeypot.hidden=true
+honeypot.label='Fill This Field'
+honeypot.name='honeypot'
+honeypot.template='<label>{label}</label><input type="text" name="{name}" value="">'
+honeypot.container='<div style="display:none">{template}</div>'
+
+#--------------------------------------------------------------------
+# SECURITY: DISALLOW PASSWORD CHANGE
+#--------------------------------------------------------------------
+# When true, disables the "change password" feature for all employees.
+# Useful when passwords are managed by an external system (e.g. SSO/LDAP).
+#
+# DISALLOW_PASSWORD_CHANGE=false
+
+DISALLOW_PASSWORD_CHANGE=false
+
+#--------------------------------------------------------------------
+# SECURITY: DISALLOW GRANT CHANGE
+#--------------------------------------------------------------------
+# When true, disables changing an employee's grants for all employees.
+# New employees cannot be created with grants while this is enabled.
+# Useful for demo deployments.
+#
+# DISALLOW_GRANT_CHANGE=false
+
+DISALLOW_GRANT_CHANGE=false
diff --git a/.github/ISSUE_TEMPLATE/bug report.yml b/.github/ISSUE_TEMPLATE/bug report.yml
index c026d3144..fddd1ddcc 100644
--- a/.github/ISSUE_TEMPLATE/bug report.yml	
+++ b/.github/ISSUE_TEMPLATE/bug report.yml	
@@ -1,121 +1,187 @@
-name: Bug Report
-description: File a bug report
-title: "[Bug]: "
-labels: ["bug", "triage"]
-projects: ["ospos/3", "ospos/4"]
-assignees:
-  - none
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Bug reports indicate that something is not working as intended. 
-        Please include as much detail as possible and submit a separate bug report for each problem.
-        Do not include personal identifying information such as email addresses or encryption keys.           
-  - type: textarea
-    id: bug-description
-    attributes:
-      label: Bug Description?
-      description: Describe the problem that you are seeing
-      placeholder: "Describe the problem that you are seeing"
-    validations:
-      required: true 
-  - type: textarea
-    id: steps-reproduce
-    attributes:
-      label: Steps to Reproduce?
-      description: List the steps to reproduce this issue
-      placeholder: "Steps to Reproduce"
-    validations:
-      required: true
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected Behavior?
-      description: Tell us what did you expect to happen?
-      placeholder: "Expected Behavior"
-    validations:
-      required: true    
-  - type: dropdown
-    id: ospos-version
-    attributes:
-      label: OpensourcePOS Version
-      description: What version of our software are you running?
-      options:
-        - development (unreleased)
-        - opensourcepos 3.4.1
-        - opensourcepos 3.4.0
-        - opensourcepos 3.3.9
-        - opensourcepos 3.3.8
-        - opensourcepos 3.3.7
-      default: 0
-    validations:
-      required: true
-  - type: dropdown
-    id: php-version
-    attributes:
-      label: Php version
-      description: What version of Php?
-      options:
-        - Php 7.2
-        - Php 7.3
-        - Php 7.4
-        - Php 8.1 
-        - Php 8.2
-        - Php 8.3
-        - Php 8.4
-      default: 0
-    validations:
-      required: true 
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: What browsers are you seeing the problem on?
-      multiple: true
-      options:
-        - Firefox
-        - Chrome
-        - Safari
-        - Microsoft Edge
-        - Other
-  - type: input
-    id: server
-    attributes:
-      label: Server Operating System and version
-      description: "Server Operating System "
-      placeholder: "Server Operating System "
-    validations:
-      required: true  
-  - type: input
-    id: database
-    attributes:
-      label: Database Management System and version
-      description: "Database Management System"
-      placeholder: "Database Management"
-    validations:
-      required: true   
-  - type: input
-    id: webserver
-    attributes:
-      label: Web Server and version
-      description: "Web Server and version "
-      placeholder: "Web Server and version "
-    validations:
-      required: true    
-  - type: textarea
-    id: servers
-    attributes:
-      label: System Information Report (optional)
-      description: Copy and paste from OSPOS > Configuration > Setup & Conf > Setup & Conf?
-      placeholder: System Information Report
-      value: "System Information Report"
-    validations:
-      required: true  
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Unmodified copy of OpensourcePOS
-      description: By submitting this issue you agree this copy has not been modified
-      options:
-        - label: I agree this copy has not been modified
-          required: true
+name: 🐛 Bug Report
+description: File a bug report to help us improve
+title: "[Bug]: "
+labels: ["bug", "triage"]
+projects: ["ospos/3", "ospos/4"]
+assignees: []
+body:
+  # ─────────────────────────────────────────────────────────────────────────────
+  # INTRODUCTION
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: markdown
+    attributes:
+      value: |
+        ## Thanks for taking the time to fill out this bug report! 🐜
+
+        Bug reports help us identify and fix issues. Please provide as much detail as possible.
+
+        > ⚠️ **Important:** Submit a separate bug report for each problem you encounter.
+        >
+        > 🚫 Do not include personal identifying information such as email addresses or encryption keys.
+
+  # ─────────────────────────────────────────────────────────────────────────────
+  # PROBLEM DESCRIPTION
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: 🐛 Bug Description
+      description: A clear and concise description of what the bug is.
+      placeholder: |
+        Example: When I try to print a receipt, the application crashes
+        with an error message saying "Unable to connect to printer".
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-reproduce
+    attributes:
+      label: 📋 Steps to Reproduce
+      description: Detailed steps to reproduce the behavior.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: ✅ Expected Behavior
+      description: A clear and concise description of what you expected to happen.
+      placeholder: |
+        Example: The receipt should print successfully without any errors.
+    validations:
+      required: true
+
+  # ─────────────────────────────────────────────────────────────────────────────
+  # ENVIRONMENT DETAILS
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: dropdown
+    id: ospos-version
+    attributes:
+      label: 📦 OpenSourcePOS Version
+      description: What version of our software are you running?
+      options:
+        - development (unreleased)
+        - OpenSourcePOS 3.4.2
+        - OpenSourcePOS 3.4.1
+        - OpenSourcePOS 3.4.0
+        - OpenSourcePOS 3.3.9
+        - OpenSourcePOS 3.3.8
+      default: 0
+    validations:
+      required: true
+
+  - type: dropdown
+    id: php-version
+    attributes:
+      label: 🔧 PHP Version
+      description: What version of PHP are you running?
+      options:
+        - PHP 8.4
+        - PHP 8.3
+        - PHP 8.2
+        - PHP 8.1
+        - PHP 7.4
+        - Other
+      default: 0
+    validations:
+      required: true
+
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: 🌐 Browser(s)
+      description: What browser(s) are you seeing the problem on?
+      multiple: true
+      options:
+        - Firefox
+        - Chrome
+        - Safari
+        - Microsoft Edge
+        - Other
+
+  - type: input
+    id: server
+    attributes:
+      label: 🖥️ Server Operating System
+      description: What server OS and version are you running?
+      placeholder: "e.g., Ubuntu 22.04, CentOS 7, Windows Server 2022"
+    validations:
+      required: true
+
+  - type: input
+    id: database
+    attributes:
+      label: 🗄️ Database
+      description: What database management system and version are you using?
+      placeholder: "e.g., MySQL 8.0, MariaDB 10.11, Percona 8.0"
+    validations:
+      required: true
+
+  - type: input
+    id: webserver
+    attributes:
+      label: 🌍 Web Server
+      description: What web server and version are you using?
+      placeholder: "e.g., Apache 2.4, Nginx 1.24, Caddy 2.7"
+    validations:
+      required: true
+
+  # ─────────────────────────────────────────────────────────────────────────────
+  # ADDITIONAL INFORMATION
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: textarea
+    id: system-info
+    attributes:
+      label: 📊 System Information Report
+      description: |
+        Copy and paste the system information from OSPOS:
+
+        **Navigation:** Configuration → Setup & Conf → System Info
+      placeholder: |
+        Paste the System Information Report here...
+      render: text
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: 📜 Relevant Log Output
+      description: |
+        Please copy and paste any relevant log output.
+
+        **Log locations:**
+        - OSPOS logs: `writable/logs/`
+        - Web server logs: `/var/log/apache2/` or `/var/log/nginx/`
+        - PHP logs: Check your `php.ini` for `error_log` location
+      placeholder: |
+        Paste log output here...
+      render: shell
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: 📸 Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+      placeholder: Drag and drop images here...
+
+  # ─────────────────────────────────────────────────────────────────────────────
+  # CONFIRMATION
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: ✓ Confirmation
+      description: Please confirm the following before submitting
+      options:
+        - label: I certify that this is an unmodified copy of OpenSourcePOS
+          required: true
+        - label: I have searched existing issues to ensure this bug has not already been reported
+          required: true
+        - label: I have provided all the information requested above
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 028fa0b3d..16714eb90 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,63 +1,136 @@
-name: ✨ Feature Request
-description: Suggest an idea for this project
-title: "[Feature]: "
-labels: ["enhancement"]
-assignees: ["none"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this feature request! 🤗
-        Please make sure this feature request hasn't been already submitted by someone by looking through other open/closed issues. 😃
-
-  - type: dropdown
-    attributes:
-      multiple: false
-      label: Type of Feature
-      description: Select the type of feature request.
-      options:
-        - "✨ New Feature"
-        - "📝 Documentation"
-        - "🎨 Style and UI"
-        - "🔨 Code Refactor"
-        - "⚡ Performance Improvements"
-        - "✅ New Test"
-    validations:
-      required: true
-      
-  - type: dropdown
-    id: ospos-version
-    attributes:
-      label: OpensourcePOS Version
-      description: What version of our software are you running?
-      options:
-        - opensourcepos 3.3.9
-        - opensourcepos 3.3.8
-        - opensourcepos 3.3.7
-      default: 0
-    validations:
-      required: true  
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Give us a brief description of the feature or enhancement you would like
-    validations:
-      required: true
-
-  - type: textarea
-    id: additional-information
-    attributes:
-      label: Additional Information
-      description: Give us some additional information on the feature request like proposed solutions, links, screenshots, etc.
-      
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Verify you searched open requests in OpensourcePOS
-      description: By submitting this request you agree that you have searched Open Requests in the Tracker
-      options:
-        - label: I agree I have searched Open Requests
-          required: true 
- 
+name: ✨ Feature Request
+description: Suggest an idea or enhancement for this project
+title: "[Feature]: "
+labels: ["enhancement"]
+assignees: []
+body:
+  # ─────────────────────────────────────────────────────────────────────────────
+  # INTRODUCTION
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: markdown
+    attributes:
+      value: |
+        ## Thanks for suggesting a new feature! 💡
+        
+        We appreciate you taking the time to help improve OpenSourcePOS.
+        
+        > 📋 **Before submitting:** Please search [existing feature requests](https://github.com/opensourcepos/opensourcepos/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) to ensure your idea hasn't already been suggested.
+
+  # ─────────────────────────────────────────────────────────────────────────────
+  # FEATURE DETAILS
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: dropdown
+    id: feature-type
+    attributes:
+      label: 🏷️ Feature Type
+      description: What type of feature are you requesting?
+      options:
+        - "✨ New Feature"
+        - "📝 Documentation Improvement"
+        - "🎨 UI/UX Enhancement"
+        - "🔨 Code Refactoring"
+        - "⚡ Performance Improvement"
+        - "✅ New Test Coverage"
+        - "🔌 Plugin/Integration"
+      default: 0
+    validations:
+      required: true
+
+  - type: dropdown
+    id: ospos-version
+    attributes:
+      label: 📦 OpenSourcePOS Version
+      description: What version are you currently running?
+      options:
+        - development (unreleased)
+        - OpenSourcePOS 3.4.2
+        - OpenSourcePOS 3.4.1
+        - OpenSourcePOS 3.4.0
+        - OpenSourcePOS 3.3.9
+        - OpenSourcePOS 3.3.8
+      default: 0
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem-statement
+    attributes:
+      label: 🎯 Problem Statement
+      description: |
+        Is your feature request related to a problem? Please describe.
+        
+        A clear description of what the problem is. Ex: I'm always frustrated when [...]
+      placeholder: |
+        Example: I always have to manually calculate taxes for different regions, 
+        which is time-consuming and error-prone.
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposed-solution
+    attributes:
+      label: 💡 Proposed Solution
+      description: A clear and concise description of what you want to happen.
+      placeholder: |
+        Example: Add an automatic tax calculation feature that:
+        - Detects the customer's region
+        - Applies the correct tax rate
+        - Generates a tax report automatically
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: 🔄 Alternatives Considered
+      description: A clear description of any alternative solutions or features you've considered.
+      placeholder: |
+        Example: I considered using an external tax service, but it would be 
+        better to have this integrated directly into OpenSourcePOS.
+
+  # ─────────────────────────────────────────────────────────────────────────────
+  # ADDITIONAL INFORMATION
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: 📎 Additional Context
+      description: |
+        Add any other context, screenshots, mockups, or references about the feature request here.
+        
+        **Helpful additions:**
+        - Links to similar features in other software
+        - Mockups or diagrams
+        - Code examples
+        - Documentation references
+      placeholder: |
+        Any other relevant information, links, or screenshots...
+
+  - type: textarea
+    id: acceptance-criteria
+    attributes:
+      label: ✅ Acceptance Criteria
+      description: |
+        (Optional) Define what "done" looks like for this feature.
+        
+        Format: **Given** [context], **When** [action], **Then** [outcome]
+      placeholder: |
+        Given a customer is selected from region X
+        When the sale is completed
+        Then the tax rate for region X is automatically applied
+        And the tax amount is correctly calculated
+        And a tax entry is logged in the report
+
+  # ─────────────────────────────────────────────────────────────────────────────
+  # CONFIRMATION
+  # ─────────────────────────────────────────────────────────────────────────────
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: ✓ Confirmation
+      description: Please confirm before submitting
+      options:
+        - label: I have searched existing feature requests to ensure this is not a duplicate
+          required: true
+        - label: I have provided a clear problem statement and proposed solution
+          required: true
\ No newline at end of file
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
new file mode 100644
index 000000000..e4adb1f83
--- /dev/null
+++ b/.github/workflows/README.md
@@ -0,0 +1,63 @@
+# GitHub Actions
+
+This document describes the CI/CD workflows for OSPOS.
+
+## Build and Release Workflow (`.github/workflows/build-release.yml`)
+
+### Build Process
+- Setup PHP 8.2 with required extensions
+- Setup Node.js 20
+- Install composer dependencies
+- Install npm dependencies
+- Build frontend assets with Gulp
+
+### Docker Images
+- Build and push `opensourcepos` Docker image for multiple architectures (linux/amd64, linux/arm64)
+- On `master`: tagged `master` and `<sha>`
+- On other branches: tagged `<branch>-<sha>`
+- On a semver tag (e.g. `3.4.2`): tagged `<version>` and `latest`
+- The version number is never stamped onto `master`/branch builds — it only appears on tag releases
+- Pushed to Docker Hub
+
+### Releases
+- Create distribution archives (tar.gz, zip)
+- Create/update GitHub "unstable" release on master branch only
+
+## Required Secrets
+
+To use this workflow, you need to add the following secrets to your repository:
+
+1. **DOCKER_USERNAME** - Docker Hub username for pushing images
+2. **DOCKER_PASSWORD** - Docker Hub password/token for pushing images
+
+### How to add secrets
+
+1. Go to your repository on GitHub
+2. Click **Settings** → **Secrets and variables** → **Actions**
+3. Click **New repository secret**
+4. Add `DOCKER_USERNAME` and `DOCKER_PASSWORD`
+
+The `GITHUB_TOKEN` is automatically provided by GitHub Actions.
+
+## Workflow Triggers
+
+- **Push to master** - Runs build, Docker push (`master` + `<sha>` tags), and creates/updates the `unstable` release
+- **Push to other branches** - Runs build and Docker push (`<branch>-<sha>` tag)
+- **Push a semver tag** (e.g. `3.4.2`) - Runs build and Docker push (`<version>` + `latest` tags)
+- **Pull requests** - Runs build only (PHPUnit tests run in parallel via phpunit.yml); no Docker push
+
+## Existing Workflows
+
+This repository also has these workflows:
+- `.github/workflows/main.yml` - PHP linting with PHP-CS-Fixer
+- `.github/workflows/phpunit.yml` - PHPUnit tests (runs on all PHP versions 8.1-8.4)
+- `.github/workflows/php-linter.yml` - PHP linting
+
+## Testing
+
+PHPUnit tests are run separately via `.github/workflows/phpunit.yml` on every push and pull request, testing against PHP 8.1, 8.2, 8.3, and 8.4.
+
+To test the build workflow:
+1. Add the required secrets
+2. Push to master or create a PR
+3. Monitor the Actions tab in GitHub
\ No newline at end of file
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
new file mode 100644
index 000000000..2aa1e3b96
--- /dev/null
+++ b/.github/workflows/build-release.yml
@@ -0,0 +1,313 @@
+name: Build and Release
+
+on:
+  push:
+    branches:
+      - '**'
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-22.04
+
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      version-tag: ${{ steps.version.outputs.version-tag }}
+      short-sha: ${{ steps.version.outputs.short-sha }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          extensions: intl, mbstring, mysqli, gd, bcmath, zip
+          coverage: none
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Get composer cache directory
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Get npm cache directory
+        run: echo "NPM_CACHE_DIR=$(npm config get cache)" >> $GITHUB_ENV
+
+      - name: Cache npm dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.NPM_CACHE_DIR }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Install composer dependencies
+        run: composer install --no-dev --optimize-autoloader
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Install gulp globally
+        run: npm install -g gulp-cli
+
+      - name: Get version info
+        id: version
+        run: |
+          VERSION=$(grep "application_version" app/Config/App.php | sed "s/.*= '\(.*\)';/\1/g")
+          BRANCH=$(echo "${GITHUB_REF#refs/heads/}" | sed 's/feature\///' | tr '/' '_')
+          TAG=$(echo "${GITHUB_TAG:-$BRANCH}" | tr '/' '_')
+          SHORT_SHA=$(git rev-parse --short=6 HEAD)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "version-tag=$VERSION-$BRANCH-$SHORT_SHA" >> $GITHUB_OUTPUT
+          echo "short-sha=$SHORT_SHA" >> $GITHUB_OUTPUT
+          echo "branch=$BRANCH" >> $GITHUB_OUTPUT
+        env:
+          GITHUB_TAG: ${{ github.ref_name }}
+
+      - name: Validate release tag
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          # The ZIP below is named from App.php, while the draft-release job
+          # globs by the tag name. A manually-pushed tag that does not match
+          # App.php would silently produce a draft release with no archive, so
+          # fail fast instead.
+          if [ "${GITHUB_REF_NAME}" != "${{ steps.version.outputs.version }}" ]; then
+            echo "::error::tag ${GITHUB_REF_NAME} does not match App.php version ${{ steps.version.outputs.version }}"
+            exit 1
+          fi
+
+      - name: Create .env file
+        run: |
+          cp .env.example .env
+          sed -i 's/production/development/g' .env
+
+      - name: Update commit hash
+        run: |
+          SHORT_SHA="${{ steps.version.outputs.short-sha }}"
+          sed -i "s/commit_sha1 = 'dev'/commit_sha1 = '$SHORT_SHA'/g" app/Config/OSPOS.php
+
+      - name: Build frontend assets
+        run: npm run build
+
+      - name: Create distribution archives
+        run: |
+          set -euo pipefail
+          gulp compress
+          VERSION="${{ steps.version.outputs.version }}"
+          SHORT_SHA="${{ steps.version.outputs.short-sha }}"
+          mv dist/opensourcepos.tar "dist/opensourcepos.$VERSION.$SHORT_SHA.tar"
+          mv dist/opensourcepos.zip "dist/opensourcepos.$VERSION.$SHORT_SHA.zip"
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-${{ steps.version.outputs.short-sha }}
+          path: dist/
+          retention-days: 7
+
+      - name: Upload build context for Docker
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-context-${{ steps.version.outputs.short-sha }}
+          path: |
+            .
+            !.git
+            !node_modules
+          include-hidden-files: true
+          retention-days: 1
+
+  docker:
+    name: Build Docker Image
+    runs-on: ubuntu-22.04
+    needs: build
+    if: github.event_name == 'push'
+
+    steps:
+      - name: Download build context
+        uses: actions/download-artifact@v4
+        with:
+          name: build-context-${{ needs.build.outputs.short-sha }}
+          path: .
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Determine Docker tags
+        id: tags
+        run: |
+          REGISTRY="${{ secrets.DOCKER_USERNAME }}/opensourcepos"
+          SHA="${{ needs.build.outputs.short-sha }}"
+          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "tags=${REGISTRY}:${VERSION},${REGISTRY}:latest" >> "$GITHUB_OUTPUT"
+          elif [[ "$GITHUB_REF" == refs/heads/master ]]; then
+            echo "tags=${REGISTRY}:master,${REGISTRY}:${SHA}" >> "$GITHUB_OUTPUT"
+          else
+            BRANCH="${GITHUB_REF#refs/heads/}"
+            BRANCH="$(printf '%s' "$BRANCH" | LC_ALL=C tr -c 'A-Za-z0-9_.-' '_')"
+            BRANCH="${BRANCH:0:$((128 - ${#SHA} - 1))}"
+            [[ "$BRANCH" == [-.]* ]] && BRANCH="_${BRANCH:1}"
+            echo "tags=${REGISTRY}:${BRANCH}-${SHA}" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          GITHUB_REF: ${{ github.ref }}
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          target: ospos
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.tags.outputs.tags }}
+
+  unstable-release:
+    name: Create Unstable Release
+    needs: build
+    runs-on: ubuntu-22.04
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist-${{ needs.build.outputs.short-sha }}
+          path: dist/
+
+      - name: Get version info
+        id: version
+        run: |
+          VERSION="${{ needs.build.outputs.version }}"
+          SHORT_SHA=$(git rev-parse --short=6 HEAD)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "short-sha=$SHORT_SHA" >> $GITHUB_OUTPUT
+
+      - name: Create/Update unstable release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: unstable
+          name: Unstable OpenSourcePOS
+          body: |
+            This is a build of the latest master which might contain bugs. Use at your own risk.
+            
+            Check the releases section for the latest official release.
+          files: |
+            dist/opensourcepos.${{ steps.version.outputs.version }}.${{ steps.version.outputs.short-sha }}.zip
+          prerelease: true
+          draft: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  official-release:
+    name: Create Official Release (Draft)
+    needs: [build, docker]
+    runs-on: ubuntu-22.04
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist-${{ needs.build.outputs.short-sha }}
+          path: dist/
+
+      - name: Build release notes
+        run: |
+          VERSION="${GITHUB_REF_NAME}"
+          # Extract this version's changelog section (header + entries) from CHANGELOG.md.
+          SECTION=$(awk -v v="$VERSION" '
+            $0 ~ "^## \\[" v "\\] - " {insec=1; print; next}
+            insec && $0 ~ "^## \\[" {insec=0; next}
+            insec {print}
+          ' CHANGELOG.md)
+          if [ -z "$SECTION" ]; then
+            echo "WARNING: no changelog section found for $VERSION"
+            SECTION="Changelog section for ${VERSION} is not present in CHANGELOG.md."
+          fi
+          {
+            echo "## Upgrade instructions"
+            echo ""
+            echo "**Docker:**"
+            echo ""
+            echo '```bash'
+            echo "docker pull ${{ secrets.DOCKER_USERNAME }}/opensourcepos:${VERSION}"
+            echo "docker compose -f docker-compose.nginx.yml up -d"
+            echo '```'
+            echo ""
+            echo "**Existing installation:** download one of the archives below, extract it over your current install, and run any new database migrations."
+            echo ""
+            echo "---"
+            echo ""
+            echo "$SECTION"
+          } > /tmp/release_notes.md
+          echo "=== release notes (first 12 lines) ==="
+          head -12 /tmp/release_notes.md
+        env:
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+
+      - name: Create draft release
+        run: |
+          VERSION="${GITHUB_REF_NAME}"
+          ZIP=$(ls dist/opensourcepos."${VERSION}".*.zip 2>/dev/null | head -1)
+          if [ -n "$ZIP" ]; then
+            gh release create "$VERSION" \
+              --draft \
+              --title "OpenSourcePOS ${VERSION}" \
+              --notes-file /tmp/release_notes.md \
+              "$ZIP"
+          else
+            gh release create "$VERSION" \
+              --draft \
+              --title "OpenSourcePOS ${VERSION}" \
+              --notes-file /tmp/release_notes.md
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 6218fde3a..000000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '21 12 * * 3'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/delete-unstable-release.yml b/.github/workflows/delete-unstable-release.yml
index c10399599..c4247ed7c 100644
--- a/.github/workflows/delete-unstable-release.yml
+++ b/.github/workflows/delete-unstable-release.yml
@@ -8,15 +8,25 @@ on:
 jobs:
   delete_unstable_release:
     runs-on: ubuntu-latest
-    steps: 
-      - name: "Delete last unstable release"
-        uses: sgpublic/delete-release-action@v1.2
-        env: 
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
-        with:
-          release-drop: false
-          release-drop-tag: false
-          pre-release-drop: true
-          pre-release-keep-count: -1
-          pre-release-drop-tag: true
-
+    steps:
+      - name: "Delete the unstable release (matched by name)"
+        env:
+          TOKEN: ${{ secrets.TOKEN }}
+          RELEASE_NAME: "Unstable OpenSourcePOS"
+          TAG_NAME: "unstable"
+        run: |
+          set -euo pipefail
+          api="https://api.github.com/repos/${GITHUB_REPOSITORY}"
+          # Resolve the release id from its exact name so only this one release
+          # is ever touched; drafts and every other release are left alone.
+          id=$(curl -fsSL -H "Authorization: Bearer ${TOKEN}" "${api}/releases?per_page=100" \
+                | jq -r --arg n "${RELEASE_NAME}" '.[] | select(.name==$n) | .id // empty')
+          if [ -z "${id}" ]; then
+            echo "No release named '${RELEASE_NAME}' found; nothing to do."
+            exit 0
+          fi
+          curl -fsSL -X DELETE -H "Authorization: Bearer ${TOKEN}" "${api}/releases/${id}" >/dev/null
+          echo "Deleted release '${RELEASE_NAME}' (id=${id})"
+          curl -fsSL -X DELETE -H "Authorization: Bearer ${TOKEN}" "${api}/git/refs/tags/${TAG_NAME}" >/dev/null \
+            || echo "Tag '${TAG_NAME}' already gone; skipping."
+          echo "Deleted tag '${TAG_NAME}'"
diff --git a/.github/workflows/deploy-core.yml b/.github/workflows/deploy-core.yml
new file mode 100644
index 000000000..65824837a
--- /dev/null
+++ b/.github/workflows/deploy-core.yml
@@ -0,0 +1,219 @@
+name: Deploy Core
+
+on:
+  workflow_call:
+    inputs:
+      image_tag:
+        description: 'Docker image tag to deploy'
+        type: string
+        required: true
+      sha:
+        description: 'Git commit SHA to deploy'
+        type: string
+        required: true
+      description:
+        description: 'Deployment description'
+        type: string
+        required: true
+      pr_number:
+        description: 'Pull request number (optional)'
+        type: string
+        required: false
+    outputs:
+      deployment_id:
+        description: 'GitHub deployment ID'
+        value: ${{ jobs.deploy.outputs.deployment_id }}
+      status:
+        description: 'Deployment status (success/failure)'
+        value: ${{ jobs.deploy.outputs.status }}
+
+concurrency:
+  group: deploy-staging
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+  deployments: write
+
+jobs:
+  deploy:
+    name: Deploy to staging
+    runs-on: ubuntu-latest
+    
+    environment:
+      name: staging
+      url: ${{ vars.DEPLOY_URL || 'https://dev.opensourcepos.org' }}
+      deployment: false
+    
+    outputs:
+      deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+      status: ${{ steps.webhook.outputs.status }}
+    
+    steps:
+      - name: Create GitHub Deployment
+        id: deployment
+        env:
+          GH_TOKEN: ${{ github.token }}
+          IMAGE_TAG: ${{ inputs.image_tag }}
+          REF_SHA: ${{ inputs.sha }}
+          DESCRIPTION: ${{ inputs.description }}
+        run: |
+          set -euo pipefail
+          
+          DEPLOYMENT_ID=$(gh api "repos/${GITHUB_REPOSITORY}/deployments" \
+            -X POST \
+            -f ref="${REF_SHA}" \
+            -f environment="staging" \
+            -f description="${DESCRIPTION}" \
+            -F auto_merge=false \
+            -F required_contexts[] \
+            --jq '.id')
+          
+          if [ -z "$DEPLOYMENT_ID" ]; then
+            echo "::error::Failed to create deployment"
+            exit 1
+          fi
+          
+          echo "deployment_id=$DEPLOYMENT_ID" >> "$GITHUB_OUTPUT"
+          echo "Created deployment: $DEPLOYMENT_ID"
+      
+      - name: Set deployment status to in_progress
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          
+          gh api "repos/${GITHUB_REPOSITORY}/deployments/${{ steps.deployment.outputs.deployment_id }}/statuses" \
+            -X POST \
+            -f state="in_progress" \
+            -f description="Deployment in progress..." \
+            -f log_url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+      
+      - name: Trigger deployment webhook
+        id: webhook
+        env:
+          DEPLOY_WEBHOOK_URL: ${{ secrets.DEPLOY_WEBHOOK_URL }}
+          DEPLOY_WEBHOOK_SECRET: ${{ secrets.DEPLOY_WEBHOOK_SECRET }}
+          DOCKER_REPO_NAME: ${{ secrets.DOCKER_REPO_NAME }}
+          IMAGE_TAG: ${{ inputs.image_tag }}
+          REF_SHA: ${{ inputs.sha }}
+          DEPLOYMENT_ID: ${{ steps.deployment.outputs.deployment_id }}
+          PR_NUMBER: ${{ inputs.pr_number }}
+        run: |
+          set -euo pipefail
+          
+          if [ -z "$DEPLOY_WEBHOOK_URL" ]; then
+            echo "::error::DEPLOY_WEBHOOK_URL secret is not configured"
+            echo "Please add the DEPLOY_WEBHOOK_URL secret in your repository settings"
+            echo "status=failure" >> "$GITHUB_OUTPUT"
+            exit 1
+          fi
+          
+          REPO_NAME="${DOCKER_REPO_NAME:-opensourcepos/opensourcepos}"
+          REPO_NAMESPACE="${REPO_NAME%%/*}"
+          REPO_SHORT_NAME="${REPO_NAME#*/}"
+          PUSHED_AT=$(date +%s)
+          
+          if [ -n "$PR_NUMBER" ]; then
+            PAYLOAD=$(jq -n \
+              --arg callback_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+              --argjson pushed_at "$PUSHED_AT" \
+              --arg pusher "$GITHUB_ACTOR" \
+              --arg tag "$IMAGE_TAG" \
+              --arg repo_name "$REPO_NAME" \
+              --arg name "$REPO_SHORT_NAME" \
+              --arg namespace "$REPO_NAMESPACE" \
+              --arg repo_url "https://hub.docker.com/r/${REPO_NAME}/" \
+              --arg deployment_id "$DEPLOYMENT_ID" \
+              --arg repository "$GITHUB_REPOSITORY" \
+              --arg sha "$REF_SHA" \
+              --arg run_id "$GITHUB_RUN_ID" \
+              --arg actor "$GITHUB_ACTOR" \
+              --argjson pr_number "$PR_NUMBER" \
+              '{
+                callback_url: $callback_url,
+                push_data: {pushed_at: $pushed_at, pusher: $pusher, tag: $tag},
+                repository: {repo_name: $repo_name, name: $name, namespace: $namespace, repo_url: $repo_url, status: "Active"},
+                github_deployment: {id: $deployment_id, environment: "staging", repository: $repository, sha: $sha, run_id: $run_id, actor: $actor, pull_request: $pr_number}
+              }')
+          else
+            PAYLOAD=$(jq -n \
+              --arg callback_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+              --argjson pushed_at "$PUSHED_AT" \
+              --arg pusher "$GITHUB_ACTOR" \
+              --arg tag "$IMAGE_TAG" \
+              --arg repo_name "$REPO_NAME" \
+              --arg name "$REPO_SHORT_NAME" \
+              --arg namespace "$REPO_NAMESPACE" \
+              --arg repo_url "https://hub.docker.com/r/${REPO_NAME}/" \
+              --arg deployment_id "$DEPLOYMENT_ID" \
+              --arg repository "$GITHUB_REPOSITORY" \
+              --arg sha "$REF_SHA" \
+              --arg run_id "$GITHUB_RUN_ID" \
+              --arg actor "$GITHUB_ACTOR" \
+              '{
+                callback_url: $callback_url,
+                push_data: {pushed_at: $pushed_at, pusher: $pusher, tag: $tag},
+                repository: {repo_name: $repo_name, name: $name, namespace: $namespace, repo_url: $repo_url, status: "Active"},
+                github_deployment: {id: $deployment_id, environment: "staging", repository: $repository, sha: $sha, run_id: $run_id, actor: $actor}
+              }')
+          fi
+          
+          echo "Sending webhook..."
+          echo "Image: ${IMAGE_TAG}"
+          echo "Environment: staging"
+          
+          HEADERS=(-H "Content-Type: application/json")
+          
+          if [ -n "$DEPLOY_WEBHOOK_SECRET" ]; then
+            SIGNATURE=$(printf '%s' "$PAYLOAD" | openssl dgst -sha256 -hmac "$DEPLOY_WEBHOOK_SECRET" | sed 's/.*= //')
+            HEADERS+=(-H "X-Hub-Signature-256: sha256=$SIGNATURE")
+            echo "Using HMAC-SHA256 signature verification"
+          else
+            echo "::warning::DEPLOY_WEBHOOK_SECRET not set - webhook calls will not be signed"
+            echo "For security, configure DEPLOY_WEBHOOK_SECRET in your repository settings"
+          fi
+          
+          HTTP_CODE=$(curl -sS --connect-timeout 10 --max-time 120 \
+            -o response.txt -w "%{http_code}" \
+            -X POST \
+            "${HEADERS[@]}" \
+            -d "$PAYLOAD" \
+            "$DEPLOY_WEBHOOK_URL") || HTTP_CODE="000"
+          
+          echo "Response code: $HTTP_CODE"
+          if [ -s response.txt ]; then
+            cat response.txt
+          fi
+          
+          if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 300 ]; then
+            echo "status=success" >> "$GITHUB_OUTPUT"
+          else
+            echo "status=failure" >> "$GITHUB_OUTPUT"
+          fi
+      
+      - name: Set deployment status
+        if: always()
+        env:
+          GH_TOKEN: ${{ github.token }}
+          IMAGE_TAG: ${{ inputs.image_tag }}
+        run: |
+          set -euo pipefail
+          
+          STATE="${{ steps.webhook.outputs.status }}"
+          
+          if [ "$STATE" = "success" ]; then
+            DESCRIPTION=$(jq -nr --arg tag "$IMAGE_TAG" \
+              '"Deployed image \($tag) to staging"')
+            
+            gh api "repos/${GITHUB_REPOSITORY}/deployments/${{ steps.deployment.outputs.deployment_id }}/statuses" \
+              -X POST \
+              -f state="success" \
+              -f description="$DESCRIPTION"
+          else
+            gh api "repos/${GITHUB_REPOSITORY}/deployments/${{ steps.deployment.outputs.deployment_id }}/statuses" \
+              -X POST \
+              -f state="failure" \
+              -f description="Deployment failed"
+            exit 1
+          fi
\ No newline at end of file
diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml
new file mode 100644
index 000000000..ec9751698
--- /dev/null
+++ b/.github/workflows/deploy-pr.yml
@@ -0,0 +1,79 @@
+name: PR Deploy
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+concurrency:
+  group: staging-deploy
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+  deployments: write
+  pull-requests: write
+
+jobs:
+  prepare:
+    name: Prepare deployment
+    runs-on: ubuntu-latest
+    if: >
+      github.event.review.state == 'approved' &&
+      github.event.pull_request.head.repo.full_name == github.repository
+    outputs:
+      image_tag: ${{ steps.image.outputs.tag }}
+      sha: ${{ github.event.pull_request.head.sha }}
+      pr_number: ${{ github.event.pull_request.number }}
+    
+    steps:
+      - name: Checkout PR
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      
+      - name: Get image tag
+        id: image
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_SHA: ${{ github.event.pull_request.head.sha }}
+        run: |
+          IMAGE_TAG="pr-${PR_NUMBER}-${PR_SHA:0:7}"
+          echo "tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
+
+  deploy:
+    name: Deploy to staging
+    needs: prepare
+    uses: ./.github/workflows/deploy-core.yml
+    with:
+      image_tag: ${{ needs.prepare.outputs.image_tag }}
+      sha: ${{ needs.prepare.outputs.sha }}
+      description: Deploy PR #${{ needs.prepare.outputs.pr_number }} to staging
+      pr_number: ${{ needs.prepare.outputs.pr_number }}
+    secrets: inherit
+
+  comment:
+    name: Comment deployment status
+    needs: [prepare, deploy]
+    if: always() && needs.prepare.result == 'success'
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ github.token }}
+      IMAGE_TAG: ${{ needs.prepare.outputs.image_tag }}
+      PR_NUMBER: ${{ needs.prepare.outputs.pr_number }}
+      REF_SHA: ${{ needs.prepare.outputs.sha }}
+      STATUS: ${{ needs.deploy.outputs.status }}
+    
+    steps:
+      - name: Comment on PR
+        run: |
+          if [ "$STATUS" = "success" ]; then
+            BODY=$(jq -nr --arg tag "$IMAGE_TAG" --arg sha "$REF_SHA" --arg url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+              '"✅ **Staging deployment completed**\n\n🔗 **URL**: https://dev.opensourcepos.org\n📦 **Image Tag**: `\($tag)`\n🔨 **Commit**: \($sha)\n\nView logs: \($url)"')
+          else
+            BODY=$(jq -nr --arg url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+              '"❌ **Staging deployment failed**\n\nCheck the [workflow logs](\($url)) for details."')
+          fi
+          
+          gh api "repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments" \
+            -X POST \
+            -f body="$BODY"
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 000000000..a8d9d6af3
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,23 @@
+name: Deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: 'Docker image tag to deploy (e.g., v3.4.0, latest)'
+        required: true
+        default: 'latest'
+
+permissions:
+  contents: read
+  deployments: write
+
+jobs:
+  deploy:
+    name: Deploy to staging
+    uses: ./.github/workflows/deploy-core.yml
+    with:
+      image_tag: ${{ inputs.image_tag }}
+      sha: ${{ github.sha }}
+      description: Deploy image ${{ inputs.image_tag }}
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f6dd73190..4d823dc3f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,7 +28,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '8.1'
           - '8.2'
           - '8.3'
           - '8.4'
diff --git a/.github/workflows/opencode.yml b/.github/workflows/opencode.yml
deleted file mode 100644
index f74dd4fb0..000000000
--- a/.github/workflows/opencode.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: opencode
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-
-jobs:
-  opencode:
-    if: |
-      contains(github.event.comment.body, ' /oc') ||
-      startsWith(github.event.comment.body, '/oc') ||
-      contains(github.event.comment.body, ' /opencode') ||
-      startsWith(github.event.comment.body, '/opencode')
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-      pull-requests: read
-      issues: read
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-
-      - name: Run opencode
-        uses: anomalyco/opencode/github@latest
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-        with:
-          model: anthropic/claude-3-haiku-20240307
\ No newline at end of file
diff --git a/.github/workflows/php-linter.yml b/.github/workflows/php-linter.yml
index c27f5535c..fb94c5b86 100644
--- a/.github/workflows/php-linter.yml
+++ b/.github/workflows/php-linter.yml
@@ -12,14 +12,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: PHP Lint 8.0
-        uses: dbfx/github-phplint/8.0@master
-        with:
-          folder-to-exclude: "! -path \"./vendor/*\" ! -path \"./folder/excluded/*\""   
-      - name: PHP Lint 8.1
-        uses: dbfx/github-phplint/8.1@master
-        with:
-          folder-to-exclude: "! -path \"./vendor/*\" ! -path \"./folder/excluded/*\""
       - name: PHP Lint 8.2
         uses: dbfx/github-phplint/8.2@master
         with:
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index fe7b3ff48..b4c69e499 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -34,7 +34,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '8.1'
           - '8.2'
           - '8.3'
           - '8.4'
@@ -69,17 +68,13 @@ jobs:
       - name: Install npm dependencies
         run: npm install
 
-      - name: Build database.sql
-        run: npm run gulp build-database
-
       - name: Start MariaDB
         run: |
           docker run -d --name mysql \
-            -e MYSQL_ROOT_PASSWORD=root \
-            -e MYSQL_DATABASE=ospos \
+             -e MYSQL_ROOT_PASSWORD=root \
+             -e MYSQL_DATABASE=ospos_test \
             -e MYSQL_USER=admin \
             -e MYSQL_PASSWORD=pointofsale \
-            -v $PWD/app/Database/database.sql:/docker-entrypoint-initdb.d/database.sql \
             -p 3306:3306 \
             mariadb:10.5
           # Wait for MariaDB to be ready
@@ -89,6 +84,13 @@ jobs:
           done
           echo "MariaDB is ready!"
 
+          # Grant admin the CREATE/DROP privileges it needs to drop and
+          # recreate the test database at the start of each test class.
+          # Scoped to ospos_test only — never global *.* — so a compromised
+          # test process cannot alter or drop unrelated schemas.
+          docker exec mysql mysql -u root -proot \
+            --execute="GRANT CREATE, DROP ON ospos_test.* TO 'admin'@'%'; FLUSH PRIVILEGES;"
+
       - name: Get composer cache directory
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
@@ -107,11 +109,36 @@ jobs:
       - name: Create .env file
         run: cp .env.example .env
 
+      - name: Provision per-run encryption key
+        # Generates a unique key for this run and exports it as a real OS env
+        # var (ENCRYPTION_KEY), which the app's Encryption config reads as a
+        # fallback after the normal .env lookup. This is supported explicitly,
+        # so no shared key is committed or shipped.
+        run: |
+          KEY=$(openssl rand -hex 32)
+          printf 'ENCRYPTION_KEY=%s\n' "$KEY" >> "$GITHUB_ENV"
+
+      - name: Provision per-run throttle key
+        # checkThrottleEncryption() is a read-only guard that throws unless a
+        # throttle.key is present (app/Helpers/security_helper.php). It is
+        # normally minted at container startup via `php spark env:provision`,
+        # so the test environment must provide one.
+        #
+        # We write it into the .env file (replacing the empty placeholder
+        # copied from .env.example) rather than exporting an OS env var:
+        # CodeIgniter's env() resolves $_ENV first, and DotEnv populates
+        # $_ENV['throttle.key']='' from .env, which would shadow any OS var
+        # before getenv() is ever consulted.
+        run: |
+          KEY=$(openssl rand -hex 32)
+          sed -i "s/^throttle\.key=''/throttle.key='$KEY'/" .env
+          grep -Eq "^throttle\.key=.+" .env
+
       - name: Run PHPUnit tests
         env:
           CI_ENVIRONMENT: testing
           MYSQL_HOST_NAME: 127.0.0.1
-        run: composer test -- --log-junit test-results/junit.xml
+        run: composer test -- --no-coverage --log-junit test-results/junit.xml
 
       - name: Upload test results
         uses: actions/upload-artifact@v4
@@ -123,4 +150,4 @@ jobs:
 
       - name: Stop MariaDB
         if: always()
-        run: docker stop mysql && docker rm mysql
\ No newline at end of file
+        run: docker stop mysql && docker rm mysql
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..c9f306ce8
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,165 @@
+name: Release
+
+# Cuts the current release (changelog + tag + draft release) and, optionally,
+# bumps App.php to the next dev version. One workflow, full release cycle.
+#
+# Flow:
+#   1. Release current version:
+#        - generate git-cliff changelog section (base..HEAD)
+#        - insert it into CHANGELOG.md + GFM compare refs
+#        - commit + push the changelog
+#        - tag the current version and push the tag with the repo PAT
+#          (a PAT push triggers build-release.yml, whose official-release job
+#           creates the DRAFT GitHub Release with the changelog + assets)
+#   2. (optional) bump to the next dev version:
+#        - update App.php / package.json / docker-compose / issue templates
+#        - commit + push
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_bump:
+        description: 'After cutting this release, bump App.php to the next dev version'
+        required: true
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+          - skip
+        default: 'patch'
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Cut release and bump next version
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          # Use the repo PAT (an admin token) so the changelog + bump pushes
+          # below can update the protected master branch (enforce_admins is off).
+          # GITHUB_TOKEN cannot, because master requires a PR review.
+          token: ${{ secrets.TOKEN }}
+
+      - name: Install git-cliff
+        run: |
+          V=2.14.2
+          curl -sLSfL "https://github.com/orhun/git-cliff/releases/download/v${V}/git-cliff-${V}-x86_64-unknown-linux-musl.tar.gz" -o /tmp/cliff.tar.gz
+          tar xzf /tmp/cliff.tar.gz -C /tmp
+          mv "/tmp/git-cliff-${V}/git-cliff" /usr/local/bin/git-cliff
+          chmod +x /usr/local/bin/git-cliff
+          git cliff --version
+
+      - name: Determine version
+        id: version
+        run: |
+          APP_VERSION=$(grep "application_version" app/Config/App.php | sed "s/.*= '\(.*\)';/\1/g")
+          TARGET="$APP_VERSION"
+          if ! [[ "$TARGET" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "ERROR: target '$TARGET' is not in X.Y.Z form"; exit 1
+          fi
+          BASE=$(git tag --list | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          if [ -z "$BASE" ]; then
+            echo "ERROR: no previous release tag found"; exit 1
+          fi
+          if [ "$BASE" = "$TARGET" ]; then
+            echo "ERROR: target $TARGET equals base $BASE; nothing to release"; exit 1
+          fi
+          if ! printf '%s\n%s\n' "$BASE" "$TARGET" | sort -VC 2>/dev/null; then
+            echo "ERROR: target $TARGET is not greater than base $BASE"; exit 1
+          fi
+          echo "target=$TARGET" >> "$GITHUB_OUTPUT"
+          echo "base=$BASE" >> "$GITHUB_OUTPUT"
+          echo "Releasing $TARGET (previous release: $BASE)"
+
+      - name: Generate changelog section
+        run: |
+          git cliff --config cliff.toml \
+            --tag "${{ steps.version.outputs.target }}" \
+            --output /tmp/section.md \
+            "${{ steps.version.outputs.base }}..HEAD"
+          sed -i '/./,$!d' /tmp/section.md
+          echo "Generated $(grep -c '^- ' /tmp/section.md) entries"
+          echo "=== first 5 ==="
+          head -5 /tmp/section.md
+
+      - name: Insert into CHANGELOG.md
+        run: |
+          TARGET="${{ steps.version.outputs.target }}"
+          BASE="${{ steps.version.outputs.base }}"
+          sed -i "/^\[unreleased\]:/a [${TARGET}]: https://github.com/opensourcepos/opensourcepos/compare/${BASE}...${TARGET}" CHANGELOG.md
+          sed -i "s|^\[unreleased\]:.*|\[unreleased\]: https://github.com/opensourcepos/opensourcepos/compare/${TARGET}...HEAD|" CHANGELOG.md
+          LINE=$(grep -nE '^## \[[0-9]+\.' CHANGELOG.md | head -1 | cut -d: -f1)
+          printf '%s\n\n' "$(cat /tmp/section.md)" > /tmp/section_final.md
+          sed -i "$((LINE-1))r /tmp/section_final.md" CHANGELOG.md
+          echo "Inserted $TARGET section before line $LINE"
+
+      - name: Commit changelog
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add CHANGELOG.md
+          git commit -m "docs: add ${{ steps.version.outputs.target }} changelog"
+          git push origin HEAD
+
+      - name: Tag and push (PAT triggers build-release.yml)
+        run: |
+          TAG="${{ steps.version.outputs.target }}"
+          git tag "$TAG"
+          # Push with the repo PAT (not GITHUB_TOKEN) so the tag-push event
+          # triggers build-release.yml, whose official-release job creates the
+          # draft release with the changelog and assets.
+          git push "https://x-access-token:${RELEASE_PAT}@github.com/opensourcepos/opensourcepos.git" "refs/tags/$TAG"
+          echo "Released $TAG — draft release will be created by build-release.yml"
+        env:
+          RELEASE_PAT: ${{ secrets.TOKEN }}
+
+      - name: Bump to next dev version (optional)
+        if: ${{ inputs.next_bump != 'skip' }}
+        run: |
+          CURRENT="${{ steps.version.outputs.target }}"
+          MAJOR=$(echo "$CURRENT" | cut -d. -f1)
+          MINOR=$(echo "$CURRENT" | cut -d. -f2)
+          PATCH=$(echo "$CURRENT" | cut -d. -f3)
+          case "${{ inputs.next_bump }}" in
+            major) MAJOR=$((MAJOR + 1)); MINOR=0; PATCH=0 ;;
+            minor) MINOR=$((MINOR + 1)); PATCH=0 ;;
+            patch) PATCH=$((PATCH + 1)) ;;
+            *) echo "ERROR: unknown bump type ${{ inputs.next_bump }}"; exit 1 ;;
+          esac
+          NEXT="${MAJOR}.${MINOR}.${PATCH}"
+          echo "Bumping to next dev version $NEXT"
+
+          sed -i "s/public string \\\$application_version = '[^']*';/public string \\\$application_version = '$NEXT';/" app/Config/App.php
+          sed -i "s/\"version\": \"[^\"]*\",/\"version\": \"$NEXT\",/" package.json
+          # Keep package-lock.json in sync: bump only the @opensourcepos/opensourcepos
+          # package version (top-level + packages.""), leave dependency versions alone.
+          awk -v v="$NEXT" '
+            /"name": "@opensourcepos\/opensourcepos"/ { expect=1 }
+            expect && /"version": / { sub(/"version": "[^"]*"/, "\"version\": \"" v "\""); expect=0 }
+            { print }
+          ' package-lock.json > .package-lock.tmp && mv .package-lock.tmp package-lock.json
+          # Update the "latest X.Y version" README line only when major.minor changes
+          NEW_MM=$(echo "$NEXT" | cut -d. -f1,2)
+          OLD_MM=$(echo "$CURRENT" | cut -d. -f1,2)
+          if [ "$NEW_MM" != "$OLD_MM" ]; then
+            sed -i "s/The latest \`[0-9]*\.[0-9]*\` version/The latest \`${NEW_MM}\` version/" README.md
+          fi
+
+          echo "=== version refs after bump ==="
+          grep "application_version" app/Config/App.php
+          grep '"version"' package.json | head -1
+          grep -A1 '"name": "@opensourcepos/opensourcepos"' package-lock.json
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add app/Config/App.php package.json package-lock.json
+          [ "$NEW_MM" != "$OLD_MM" ] && git add README.md
+          git commit -m "chore: bump version to $NEXT"
+          git push origin HEAD
diff --git a/.github/workflows/update-issue-templates.yml b/.github/workflows/update-issue-templates.yml
deleted file mode 100644
index f101a6264..000000000
--- a/.github/workflows/update-issue-templates.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-name: Update Issue Templates
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 0'
-
-jobs:
-  update-templates:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        
-      - name: Fetch releases and update templates
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Fetch releases from GitHub API
-          RELEASES=$(gh api repos/${{ github.repository }}/releases --jq '.[].tag_name' | head -n 10)
-          
-          # Create temporary file with options
-          OPTIONS_FILE=$(mktemp)
-          echo "        - development (unreleased)" >> "$OPTIONS_FILE"
-          while IFS= read -r release; do
-            echo "        - opensourcepos $release" >> "$OPTIONS_FILE"
-          done <<< "$RELEASES"
-          
-          update_template() {
-            local template="$1"
-            local template_path=".github/ISSUE_TEMPLATE/$template"
-            
-            # Find the line numbers for the OpensourcePOS Version dropdown
-            start_line=$(grep -n "label: OpensourcePOS Version" "$template_path" | cut -d: -f1)
-            
-            if [ -z "$start_line" ]; then
-              echo "Could not find OpensourcePOS Version in $template"
-              return 1
-            fi
-            
-            # Find the options section and default line
-            options_start=$((start_line + 3))
-            default_line=$(grep -n "default:" "$template_path" | awk -F: -v opts="$options_start" '$1 > opts {print $1; exit}')
-            
-            # Create new template file
-            head -n $((options_start - 1)) "$template_path" > "${template_path}.new"
-            cat "$OPTIONS_FILE" >> "${template_path}.new"
-            tail -n +$default_line "$template_path" >> "${template_path}.new"
-            mv "${template_path}.new" "$template_path"
-            
-            echo "Updated $template"
-          }
-          
-          update_template "bug report.yml"
-          update_template "feature_request.yml"
-          
-      - name: Commit and push changes
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add .github/ISSUE_TEMPLATE/*.yml
-          if git diff --staged --quiet; then
-            echo "No changes to commit"
-          else
-            git commit -m "Update issue templates with latest releases [skip ci]"
-            git push
-          fi
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 1ef8696fa..6d066cb9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ $RECYCLE.BIN/
 .com.apple.timemachine.donotpresent
 
 # Other
+build/
 generate_languages.php
 dist
 docs
@@ -75,6 +76,8 @@ system/
 *~
 *.~
 .env
+.env.lock
+.env.tmp.*
 auth.json
 
 *.png
@@ -85,5 +88,5 @@ auth.json
 /writable/logs/*.log
 /writable/debugbar/*.json
 /app/Database/database.sql
-/writable/cache/settings
+/writable/cache/*
 /.env.bak
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 908983cfd..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-sudo: required
-
-branches:
-  except:
-    - unstable
-    - weblate
-services:
-  - docker
-
-dist: jammy
-language: node_js
-node_js:
-  - 20
-script:
-  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-  - docker run --rm -u $(id -u) -v $(pwd):/app opensourcepos/composer:ci4 composer install
-  - version=$(grep application_version app/Config/App.php | sed "s/.*=\s'\(.*\)';/\1/g")
-  - cp .env.example .env && sed -i 's/production/development/g' .env
-  - sed -i "s/commit_sha1 = 'dev'/commit_sha1 = '$rev'/g" app/Config/OSPOS.php
-  - echo "$version-$branch-$rev"
-  - npm version "$version-$branch-$rev" --force || true
-  - sed -i 's/opensourcepos.tar.gz/opensourcepos.$version.tgz/g' package.json
-  - npm ci && npm install -g gulp && npm run build
-  - docker build . --target ospos -t ospos
-  - docker build . --target ospos_test -t ospos_test
-  - docker run --rm ospos_test /app/vendor/bin/phpunit --testdox
-  - docker build app/Database/ -t "jekkos/opensourcepos:sql-$TAG"
-env:
-  global:
-  - BRANCH=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
-  - TAG=$(echo "${TRAVIS_TAG:-$BRANCH}" | tr '/' '-')
-  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD`
-after_success:
-  - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "ospos:latest"
-    "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:sql-$TAG"
-  - gulp compress
-  - mv dist/opensourcepos.tar.gz "dist/opensourcepos.$version.$rev.tgz"
-  - mv dist/opensourcepos.zip "dist/opensourcepos.$version.$rev.zip"
-deploy:
-  - provider: releases
-    edge: true
-    file: dist/opensourcepos.$version.$rev.zip
-    name: "Unstable OpensourcePos"
-    overwrite: true
-    release_notes: "This is a build of the latest master which might contain bugs. Use at your own risk. Check releases section for the latest official release"
-    prerelease: true
-    tag_name: unstable
-    user: jekkos
-
-    api_key:
-      secure: "KOukL8IFf/uL/BjMyCSKjf2vylydjcWqgEx0eMqFCg3nZ4ybMaOwPORRthIfyT72/FvGX/aoxxEn0uR/AEtb+hYQXHmNS+kZdX72JCe8LpGuZ7FJ5X+Eo9mhJcsmS+smd1sC95DySSc/GolKPo+0WtJYONY/xGCLxm+9Ay4HREg="
-
-    on:
-      branch: master
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000..d423d2acd
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,64 @@
+# Agent Instructions
+
+This document provides guidance for AI agents working on the Open Source Point of Sale (OSPOS) codebase.
+
+## Code Style
+
+- **PSR-12** enforced via PHP-CS-Fixer (config: `.php-cs-fixer.no-header.php`)
+- Follow PHP CodeIgniter 4 coding standards
+- `camelCase` for variables and methods; `PascalCase` for classes; `UPPER_CASE` for constants
+- When editing existing code containing non-PSR-compliant local variable names, refactor those variable names to `camelCase` as part of the edit
+- All newly written code (variables, classes, functions) must use PSR-compliant naming, regardless of surrounding code style
+- PHP 8.2+ features acceptable (named arguments, enums, readonly properties)
+- Write PHP 8.2+ compatible code with proper type declarations
+- Always import classes, functions, and constants with a `use` statement at the top of the file instead of referencing them inline via fully-qualified name (e.g. `use Config\Database;` then `Database::connect()`, not `\Config\Database::connect()`)
+- No useless comments or docblocks: if the code speaks for itself, explanatory comments are unnecessary. Do not add comments or docblocks that merely restate what the code already makes clear (e.g. `@param array $items` next to `array $items`, or a comment repeating a method's name) — only comment on non-obvious rationale, constraints, or behavior
+- Views in `app/Views/errors/html/` are excluded from the fixer
+- Run fixer before committing: `vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.no-header.php`
+- **JavaScript**: use `const` for variables that are never reassigned, `let` for variables that are. Never use `var`.
+
+## Development
+
+- Create a new git worktree for each issue, based on the latest state of `origin/master`
+- Commit fixes to the worktree and push to the remote
+
+## Testing
+
+- Run PHPUnit tests: `composer test`
+- Tests must pass before submitting changes
+- **One test file per class under test.** A controller, model, library, or helper gets exactly one test file covering all of its behavior — `Item_kits.php` → `tests/Controllers/Item_kitsTest.php` (or `Item_kitsControllerTest.php`, matching this codebase's existing `*ControllerTest.php` suffix for controllers), `Sale_lib.php` → `tests/Libraries/Sale_libTest.php`, etc. Do not create feature- or endpoint-scoped test files alongside a class's main test file (e.g. no `Item_kitsBarcodeTest.php` next to `Item_kitsControllerTest.php`) — add the new test methods to the existing file for that class instead. If no test file exists yet for the class, create the one canonical file rather than a narrowly-scoped one.
+- **Name test methods as `test{MethodUnderTest}_{Behavior}`.** `PascalCase` the method under test, then an underscore, then a short behavior phrase — `testPostSave_RejectsNegativeTaxPercent`, `testSaveLocale_AcceptsValidReferenceCodeMinMax`. Start the behavior with a verb: `Accepts`/`Requires` for valid or boundary cases, `Rejects` for invalid ones. The name should read as a self-documenting sentence and needs no docblock.
+
+## Build
+
+- Install dependencies: `composer install && npm install`
+- Build assets: `npm run build` or `gulp`
+
+## Conventions
+
+- Controllers go in `app/Controllers/`
+- Models go in `app/Models/`
+- Views go in `app/Views/`
+- Database migrations in `app/Database/Migrations/`
+- Use CodeIgniter 4 framework patterns and helpers
+- Sanitize user input; escape output using `esc()` helper
+
+## Localization
+
+- When adding new keys to language files, add the key to all `app/Language/*/` variants
+- **New keys must be inserted in alphabetical order** within the language array
+- Non-English files must use an empty string (`''`) as the value when no translation is provided — CodeIgniter automatically falls back to the default (`en`) language. This applies only when a translation genuinely isn't available yet.
+- **When explicitly asked to translate a phrase for a non-English language file, always provide the actual translation** — never leave the value as an empty string, and never leave source English text in a non-English language file
+- Never copy English text from a neighboring key as a value for a non-English language file, even if that neighboring key is already untranslated — evaluate each key independently
+- Only `app/Language/en/` and `app/Language/en-GB/` should contain English strings
+- When translating a string containing placeholders (e.g. `{filePath}`, `{reason}`) or literal filenames/keys (e.g. `throttle.key`, `.env`), keep that placeholder or filename text unchanged and untranslated — move it to whatever position is grammatically correct in the translated sentence
+- Plugin language files (`app/Plugins/*/Language/`) follow the same localization rules as `app/Language/`
+- Use `'` to encapsulate key and string values. If the value contains `'` then it should be escaped as `\'`
+- Align the `=>` of a newly inserted key with the `=>` column already used by the rest of the file, if that file pads keys to a fixed column (not all do — some files have no padding at all). If the new key is longer than the widest existing key and would push the alignment column further right, reformat the whole file to the new wider column rather than leaving only the new line at a different width
+
+## Security
+
+- Never commit secrets, credentials, or `.env` files
+- Use parameterized queries to prevent SQL injection
+- Validate and sanitize all user input
+- Never reference security advisory IDs (CVE, GHSA, etc.) in code, comments, commit messages, docblocks, documentation, or URLs — treat them the same as secrets. They act as a roadmap for attackers researching the exact exploit a fix addresses.
diff --git a/BUILD.md b/BUILD.md
index b3858453c..57dd3efc4 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -14,6 +14,7 @@ The build process uses the build tools "npm" and "gulp" to piece everything toge
 
 ## Prerequisites
 
+- Install Node.js 20 or later (the build fails on Node 18 and earlier - one of the license reporting dependencies requires newer JavaScript regex features)
 - Install the latest version of NPM (tested using version 9.4.2)
 - Install the latest version of Composer (tested using composer 2.5.1)
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e79764d70..890a137b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.4.0...HEAD
+[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.4.2...HEAD
 [3.4.2]: https://github.com/opensourcepos/opensourcepos/compare/3.4.1...3.4.2
 [3.4.1]: https://github.com/opensourcepos/opensourcepos/compare/3.4.0...3.4.1
 [3.4.0]: https://github.com/opensourcepos/opensourcepos/compare/3.3.9...3.4.0
@@ -34,10 +34,273 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [3.4.0] - 2025-02-06
+## [3.4.2] - 2026-09-30
+- Fix writable folder permission check (#4270) (#4273) by @jekkos
+- Extended payment delete fix (#4274) by @jekkos
+- Upgrade github workflow (#3708) (#4280) by @jekkos
+- Fix typo in writeable (#4270) by @jekkos
+- Fix migration 20250522000000 (#4284) by @jekkos
+- Upgrade to ci 4.6.2 (#4296) (#4298) by @jekkos
+- Fix barcode generation in items (#4270) by @jekkos
+- Allow empty tax category id (#4285) (#4288) by @jekkos
+- Fix security incident email address (#4298) by @jekkos
+- Fix item kits update (#4294) by @jekkos
+- Revert toast message sanitization (#4302) by @jekkos
+- Fix for suspended sales (#4283) (#4303) by @jekkos
+- Fix reference to uploads folder (#4270) (#4286) by @jekkos
+- Add generic try/catch in import (#4302) by @jekkos
+- Bump jspdf from 3.0.1 to 3.0.2 (#4309) by @dependabot[bot]
+- Fix mount path for uploads (#4308) by @jekkos
+- Add transactions to missing config keys migration. (#4318) by @Joe Williams
+- [Feature] Add logging to migrations (#4327) by @Joe Williams
+- Clean up docker compose setup (#4308) by @jekkos
+- Fix tax configuration pages (#4331) by @jekkos
+- Update SECURITY.md contact (#4335) by @jekkos
+- Add server side validation for password (#4335) by @jekkos
+- Add env variable to disallow pwd change (#4325) by @jekkos
+- Add recent releases to issue template (#4317) by @jekkos
+- Add DOMpurify + fix XSS (#4341) by @jekkos
+- Fix attachment cid (#4314) by @jekkos
+- Add DOMPurify to JS includes (#4341) by @jekkos
+- Allow anonymous giftcard creation (#4278) by @jekkos
+- Fix toast notifications in config (#4341) (#4343) by @jekkos
+- Fix creation of date attribute value (#4310) (#4344) by @jekkos
+- Fix wrong migration script location (#4285) by @jekkos
+- Escape return_policy in receipt + invoice (#4349) by @jekkos
+- Fix for detailed suppliers report (#4351) by @jekkos
+- Add show/hide cost price & profit feature - in reports #4130 (#4350) by @BhojKamal
+- Fix travis build after merge (#4130) by @jekkos
+- Add equals as permitted URI character (#4329) by @Chathura Dilushanka
+- Fix multiple XSS vulnerabilities (#3965) (#4356) by @jekkos
+- Bump lodash from 4.17.21 to 4.17.23 (#4369) by @dependabot[bot]
+- Bump jspdf and jspdf-autotable (#4373) by @dependabot[bot]
+- Fix XSS vulnerabilities in invoices + receipts (#3965) (#4363) by @jekkos
+- Fix XSS vulnerability in attributes (#3965) by @jekkos
+- Fix XSS vulnerability in register (#3965) by @jekkos
+- Fix XSS vulnerability in register (#3965) by @jekkos
+- Fix XSS vulnerabilities in invoice_email.php view by @jekkos
+- Fix permission bypass in Reports submodule access control (#4389) by @jekkos
+- Use Content-Type application/json for AJAX responses (#4357) by @jekkos
+- Language Array Key Typo Fix (#4371) by @Lucas Lyimo
+- Fix: Refresh session language for employee after update. (#4245) by @jekkos
+- Fix Docker image upload by replacing slashes in TAG by @jekkos
+- Fix broken object-level authorization in Employees controller (CVE-worthy) (#4391) by @jekkos
+- Bump dompurify from 3.3.1 to 3.3.2 (#4402) by @dependabot[bot]
+- Fix incorrect argument types in migration round_number() methods (#4403) by @jekkos
+- dd validation for invalid stock locations in CSV import (#4399) by @jekkos
+- fix(security): whitelist and validate invoice template types (#4393) by @jekkos
+- Fix second-order SQL injection in currency_symbol config (#4390) by @jekkos
+- Add row-level authorization to password change endpoints (#4401) by @jekkos
+- Fix: Handle image filenames with spaces in thumbnails by @jekkos
+- Fix: Sanitize image filenames to prevent thumbnail display issues (#4372) by @jekkos
+- Add migration to fix existing image filenames with spaces (#4372) by @jekkos
+- Refactor: Move ADMIN_MODULES to constants, rename methods to camelCase by @jekkos
+- Fix SQL injection in custom attribute search by @Ollama
+- Fix stored XSS vulnerability in item descriptions by @Ollama
+- Fix stored XSS vulnerabilities in employee permissions and customer data by @Ollama
+- Fix: Preserve CHECKBOX attribute state when adding attributes (#4385) by @jekkos
+- Fix payment type becoming null when editing sales by @Ollama
+- Fix broken SQL injection fix - use havingLike() instead of having() with named params by @Ollama
+- Fix mass assignment vulnerability in bulk edit (GHSA-49mq-h2g4-grr9) by @Ollama
+- Sync language files (#3468) by @Ollama
+- Add workflow to auto-update issue templates with releases by @Ollama
+- Update SECURITY.md with published security advisories by @Ollama
+- Bump jspdf from 4.1.0 to 4.2.0 (#4383) by @dependabot[bot]
+- Add filter persistence for table views via URL query string (#4400) by @jekkos
+- Fix filter persistence javascript issues (#4400) by @jekkos
+- Fix PHPUnit test configuration for database connectivity (#4430) by @jekkos
+- Fix IDOR vulnerability in password change (GHSA-mcc2-8rp2-q6ch) (#4427) by @jekkos
+- Fix XSS vulnerability in tax invoice view (#4432) by @jekkos
+- Fix permission bypass in Sales.getManage() access control (#4428) by @jekkos
+- Update SECURITY.md with published security advisories (#4431) by @jekkos
+- Fix SQL injection in suggestions column configuration (#4421) by @jekkos
+- Fix PHPUnit environment variables not being set (#4434) by @jekkos
+- Fix DECIMAL attribute not respecting locale format (#4422) by @jekkos
+- Fix stored XSS vulnerability in Attribute Definitions (GHSA-rvfg-ww4r-rwqf) (#4429) by @jekkos
+- Fix: Host Header Injection vulnerability (GHSA-jchf-7hr6-h4f3) by @Ollama
+- Fix stored XSS in gcaptcha_site_key on login page by @Ollama
+- Fix stored XSS via stock location name by @Ollama
+- Fix Token_lib::render() for PHP 8.4 compatibility by @Ollama
+- Use CIUnitTestCase for consistency with other tests by @Ollama
+- Fix: Pass  parameter to generate() and add composite format tests by @Ollama
+- Fix strftime directives handling and tighten test assertions by @Ollama
+- Add AGENTS.md with coding guidelines for AI agents by @Ollama
+- Fix: Add Debit Card filter to Daily Sales and Takings by @Ollama
+- Fix Taxes Summary Report totals not matching row values by @Ollama
+- Add unit tests for Taxes Summary Report calculations by @Ollama
+- Fix rounding consistency and update tests per review feedback by @Ollama
+- Rewrite tests to use database integration testing by @Ollama
+- Add seed data to tests for proper integration testing by @Ollama
+- Fix: Restrict employee selection in expenses and receivings forms by @Ollama
+- Fix review comments: remove redundant loop and add XSS escaping by @Ollama
+- Bump jspdf from 4.2.0 to 4.2.1 by @dependabot[bot]
+- Bump picomatch from 2.3.1 to 2.3.2 (#4451) by @dependabot[bot]
+- fix: Clear sale session after completing sale by @Ollama
+- fix: Remove redundant clear_mode() calls by @Ollama
+- Translate missing strings in multiple languages by @Ollama
+- Fix translation issues from code review by @Ollama
+- Remove English fallbacks from non-English translations by @Ollama
+- Add Calendar.php translations for missing languages by @Ollama
+- feat: migrate CI from Travis to GitHub Actions with enhancements by @Ollama
+- refactor: remove tables.sql and constraints.sql (#4447) by @Ollama
+- refactor: remove build-database gulp task (#4447) by @Ollama
+- refactor: optimize Docker image size by @Ollama
+- fix: remove duplicate phpunit.xml that prevented tests from running by @Ollama
+- fix: Use file-based session until database is migrated by @Ollama
+- feat: Improve migration UX on login page by @Ollama
+- Disable opencode workflow + run docker build by @jekkos
+- Fix negative price/quantity/discount validation (GHSA-wv3j-pp8r-7q43) (#4450) by @Nozomu Sasaki (Paul)
+- fix(ci): replace / with _ in branch names for Docker tags by @Ollama
+- fix(security): prevent command injection in sendmail path configuration by @Ollama
+- fix(security): prevent SQL injection in tax controller sort columns by @Ollama
+- feat: add release workflow with automated version bumping by @Ollama
+- refactor: simplify release workflow to version bump only by @Ollama
+- fix: address review comments by @Ollama
+- fix: address all review comments and restore issue template version update by @Ollama
+- fix: Tax Rate form not loading due to router service failure (#4479) by @jekkos
+- fix: Handle empty database on fresh install (#4467) by @jekkos
+- Fix: Improve allowedHostnames .env configuration and fail-fast in production (#4482) by @jekkos
+- [Feature]:  Case-sensitive attribute updates and CSV Import attribute deletion capability (#4384) by @objecttothis
+- fix: change docker image tag to master by @jekkos
+- Update to CodeIgniter 4.7.2 (#4485) by @objecttothis
+- Bump lodash from 4.17.23 to 4.18.1 (#4462) by @dependabot[bot]
+- [Fix]: Add missing return statements to Sales Controller functions by @Ollama
+- Encourage users to star the project by @objecttothis
+- Bump dompurify from 3.3.2 to 3.4.0 (#4512) by @dependabot[bot]
+- fix: propagate attribute definition failures in postSaveGeneral() (#4509) by @jekkos
+- fix: Escape dynamic output and fix CSS property in barcode_sheet.php (#4501) by @jekkos
+- Fix CRC currency reverting to EUR/LAK in locale config (#4511) by @jekkos
+- fix: Add missing $img_tag variable in Sales::getSendPdf() (#4515) by @jekkos
+- fix: Language dropdown not displaying saved language correctly (#4518) by @jekkos
+- fix: Scope orWhere clauses in Item::exists() and Item::get_item_id() (#4520) by @jekkos
+- fix: Update calendar translations (#4498) by @jekkos
+- fix: Catch mysqli_sql_exception in DB fallback handlers for fresh Docker installs (#4525) by @jekkos
+- fix(home): improve internal data type handling for user identification in auth process by @enricodelarosa
+- Assignable Keyboard Shortcuts Updates (#4532) by @WShells
+- chore: miscellaneous updates and improvements (#4530) by @BudsieBuds
+- chore(deps): bump minimatch from 3.1.2 to 3.1.5 (#4536) by @dependabot[bot]
+- chore: sync project files to match upstream templates (#4537) by @BudsieBuds
+- fix(ci): include hidden files in Docker build context (#4543) by @jekkos
+- feat: add ALLOWED_HOSTNAMES environment variable support for Docker/Compose (#4544) by @jekkos
+- fix(docker): correct permissions and fix migration barcode_type error (#4546) by @jekkos
+- docs: Update SECURITY.md with disclosure process (#4549) by @jekkos
+- feat: Bank transfer and wallet payment option added #4540 (#4547) by @BhojKamal
+- fix(security): Path traversal vulnerability in getPicThumb (#4545) by @jekkos
+- fix(security): SQL injection and path traversal vulnerabilities (#4539) by @jekkos
+- fix: Capture CSV import failures in save_tax_data and save_inventory_quantities (#4507) by @jekkos
+- fix: validate attributeId > 0 in saveAttributeLink() (#4508) by @jekkos
+- feat: Add deployment workflow with approval gates (#4522) by @jekkos
+- Bugfixes to get Migration working on MySQL and MariaDB (#4551) by @objecttothis
+- Bugfix: Sale search in register not handling trailing space properly (#4557) by @objecttothis
+- fix: cast string returns to int in MY_Migration (#4560) by @jekkos
+- Add fallback for allowedHostnames environment variable (#4565) by @objecttothis
+- fix: Allow searching by Sale ID in Takings/Daily Sales view (#4569) by @jekkos
+- Add Guards to Database Migration (#4571) by @objecttothis
+- fix: tax rate inputs blank with comma-decimal locales (#4555) by @jekkos
+- fix(security): Fix DOMPDF RCE and customer email sanitization (#4568) by @jekkos
+- Fix overly lenient date validation (#4574) by @objecttothis
+- fix(security): Escape attribute value in register by @jekkos
+- chore(deps): bump dompurify from 3.4.0 to 3.4.11 (#4578) by @dependabot[bot]
+- Bugfix: Fix problems with migration UI in login (#4589) by @objecttothis
+- Forgotten commit from login migration branch (#4592) by @objecttothis
+- Feature: Payment reference code (#4587) by @objecttothis
+- fix(giftcard): correct return type and rename getGiftcardId method (#4600) by @objecttothis
+- chore(deps): bump dompurify from 3.4.11 to 3.4.12 (#4602) by @dependabot[bot]
+- bugfix(reports): crash on detailed sales report when sale has multiple payments with reference codes (#4599) by @objecttothis
+- style(models): normalize quote style in SQL GROUP_CONCAT expression (#4608) by @objecttothis
+- chore(deps): upgrade dompdf from v2.0.8 to v3.1.6 (#4610) by @objecttothis
+- chore(deps): bump brace-expansion (#4614) by @dependabot[bot]
+- chore(deps): add xlsx via SheetJS CDN and upgrade tableexport plugin (#4615) by @objecttothis
+- chore(deps): bump lodash.template from 4.5.0 to 4.18.1 (#4616) by @objecttothis
+- fix(login): skip auth validation on new install to allow migration (#4609) by @objecttothis
+- fix: Wrap postSave() in single transaction for atomicity (#4506) by @jekkos
+- refactor: Replace var with let/const in JavaScript files (#4503) by @jekkos
+- fix: get_definition_by_name() returns single row instead of multi-dimensional array (#4452) (#4464) by @Jonathan Chang
+- fix(config): validate theme param to prevent XSS via invalid theme (#4620) by @objecttothis
+- fix(sales): enforce server-side authorization for price changes (#4631) by @objecttothis
+- fix(sales): escape quote number in email template to prevent XSS (#4625) by @objecttothis
+- refactor(migrations): rename execute_script to executeScript across all migrations (#4611) by @objecttothis
+- fix(auth): validate gcaptcha before password to prevent bypass (#4618) by @objecttothis
+- refactor: apply PSR-12 naming to Attribute definition methods (#4624) by @Rayan Abdul Cader
+- fix(security): sanitize filenames and escape logo path in config (#4630) by @objecttothis
+- fix: use db_connect() for item save transactions (#4636) by @richardmilles
+- fix(xss): remove redundant escaping that double-encoded item attribute values (#4628) by @objecttothis
+- chore(deps): bump codeigniter4/framework from 4.7.2 to 4.7.4 (#4638) by @dependabot[bot]
+- chore(deps): bump dompurify from 3.4.12 to 3.4.13 (#4639) by @dependabot[bot]
+- Reject item CSV imports whose header row is missing required columns (#4597) by @Sai Asish Y
+- fix(items): validate item_number and skip receiving quantity default for temp items (#4621) by @objecttothis
+- Feature: CodeIgniter Throttler (#4619) by @objecttothis
+- Bugfix: Resolve Race Condition in Rewards and Gift Card Spending (#4640) by @objecttothis
+- hotfix(auth): hash throttler keys to improve security (#4646) by @objecttothis
+- fix(items): add explicit sentinel value for clearing supplier in bulk edit (#4617) by @objecttothis
+- Codeigniter changes between 4.7.2 and 4.7.4 (#4650) by @objecttothis
+- Hotfix: Fix CI3 database migration caused by regression (#4649) by @objecttothis
+- fix(sales): gate per-record endpoints behind reports_sales grant (#4627) by @objecttothis
+- fix(email): update method call to camelCase for PSR-12 compliance (#4659) by @objecttothis
+- Feature admin account safeguards (#4657) by @objecttothis
+- Ensure payload data is escaped to prevent XSS (#4664) by @objecttothis
+- fix(sales): enforce reports_sales grant on search endpoint (#4673) by @objecttothis
+- fix(reports, home): resolve double-URL-decoding bypass for method grants (#4660) (#4666) by @objecttothis
+- Bugfix tax names (#4677) by @objecttothis
+- feat(validation, tests): add `valid_path_strict` rule and integrate into mailpath validation (#4684) by @objecttothis
+- fix(sales): harden payment validation and gift card handling by @objecttothis
+- fix: prevent duplicate items when editing imported rows (#4634) by @richardmilles
+- fix(barcode): resolve string interpolation issue in barcode display html (#4692) by @Vighnesh Nilajakar
+- fix(sales): gate getSearch behind reports_sales grant by @jekkos
+- bugfix(sales): reject non-negative gift-card amount_tendered (#4674) by @jekkos
+- fix(sales): harden unsuspend with auth, status gating, and null safety by @objecttothis
+- fix(tests): resolve all phpunit failures — clean-DB suite green (#4626) (#4691) by @jekkos
+- fix(licenses): guard malformed data, parallelize gulp tasks, require Node 20 by @objecttothis
+- fix(validation): broaden sendmail path regex, expand i18n, strip advisory IDs by @objecttothis
+- fix(security): handle special characters in `.env` key values and improve insertion logic (#4656) by @objecttothis
+- fix(locale): validate language_code against known locales to block path traversal (#4704) by @jekkos
+- Fix GHSA-frx7-c5vv-m3mr: recompute cashup total server-side and force owner identity (#4706) by @jekkos
+- feat(security): add THROTTLE_KEY env-var fallback for throttle.key (#4707) by @jekkos
+- fix(i18n): translate remaining English labels in Swiss German Items.php (#4701) by @Rayan Abdul Cader
+- fix(ci): stop stamping app version onto master and branch Docker tags (#4709) by @jekkos
+- chore(deps): bump fflate from 0.8.2 to 0.8.3 (#4690) by @dependabot[bot]
+- fix(i18n): swap print_delay_autoreturn number/required messages in 5 locales (#4699) by @Rayan Abdul Cader
+- chore(release): unified git-cliff release workflow (changelog + tag + optional bump) (#4711) by @jekkos
+- fix(release): push changelog/bump to master via admin PAT (GITHUB_TOKEN blocked by branch protection) by @jekkos
+- docs: add 3.4.2 changelog by @github-actions[bot]
+- chore: bump version to 3.4.3 by @github-actions[bot]
+- fix(security): HTML-escape attribute dropdown option labels in items attributes view (#4715) by @jekkos
+- fix(release): keep package-lock.json version in sync on bump (#4718) by @jekkos
+- fix(security): strip all HTML tags from $.notify alert messages (#4716) by @jekkos
+- chore: strip advisory IDs from code comments and changelog (#4720) by @jekkos
+- fix(security): report unwritable .env.lock, make throttle limits configurable (#4714) by @jekkos
+- chore: reset 3.4.2 (undo premature 3.4.3 bump + stale changelog) for re-cut by @jekkos
+
+## [3.4.1] - 2025-06-05
+- Feature: PSR-12 Compliant Indentation by @objecttothis in ([#4196](https://github.com/opensourcepos/opensourcepos/pull/4196))
+- Add .env to dist zip by @jekkos in ([#4199](https://github.com/opensourcepos/opensourcepos/pull/4199))
+- Add CI4 coding standards linter ([#3708](https://github.com/opensourcepos/opensourcepos/issues/3708)) by @jekkos in ([#4198](https://github.com/opensourcepos/opensourcepos/pull/4198))
+- Bump canvg from 3.0.10 to 3.0.11 by @dependabot in ([#4189](https://github.com/opensourcepos/opensourcepos/pull/4189))
+- Bump jspdf and jspdf-autotable by @dependabot in ([#4190](https://github.com/opensourcepos/opensourcepos/pull/4190))
+- Feature bump ci to 4.6.0 by @objecttothis in ([#4197](https://github.com/opensourcepos/opensourcepos/pull/4197))
+- Add Kurdish language option to UI by @BudsieBuds in ([#4210](https://github.com/opensourcepos/opensourcepos/pull/4210))
+- Convert language ku to ckb by @BudsieBuds in ([#4211](https://github.com/opensourcepos/opensourcepos/pull/4211))
+- Fix PHP 8.4 errors by @BudsieBuds in ([#4215](https://github.com/opensourcepos/opensourcepos/pull/4215))
+- Add default bootstrap to themes by @BudsieBuds in ([#4219](https://github.com/opensourcepos/opensourcepos/pull/4219))
+- Update language names by @BudsieBuds in ([#4218](https://github.com/opensourcepos/opensourcepos/pull/4218))
+- Update install docs by @BudsieBuds in ([#4217](https://github.com/opensourcepos/opensourcepos/pull/4217))
+- Convert menu icons to SVG by @BudsieBuds in ([#4220](https://github.com/opensourcepos/opensourcepos/pull/4220))
+- Enhance license handling by @BudsieBuds in ([#4223](https://github.com/opensourcepos/opensourcepos/pull/4223))
+- Fix datetime rendering ([#4226](https://github.com/opensourcepos/opensourcepos/issues/4226)) by @jekkos in ([#4227](https://github.com/opensourcepos/opensourcepos/pull/4227))
+- Fix datetime rendering by @jekkos in ([#4228](https://github.com/opensourcepos/opensourcepos/pull/4228))
+- Fix null error when sending by email a receipt of a sale that has no invoice by @diego-ramos in ([#4229](https://github.com/opensourcepos/opensourcepos/pull/4229))
+- Update Receivings.php to save form. by @odiea in ([#4231](https://github.com/opensourcepos/opensourcepos/pull/4231))
+- Update Cashups.php for ajax cashup total to work. by @odiea in ([#4238](https://github.com/opensourcepos/opensourcepos/pull/4238))
+- Coding style updates for PSR-12 compliance & improved readability by @BudsieBuds in ([#4204](https://github.com/opensourcepos/opensourcepos/pull/4204))
+- Fix Codeigniter disallowed characters error with payment types that have accents by @diego-ramos in ([#4232](https://github.com/opensourcepos/opensourcepos/pull/4232))
+- Fixed broken escape string for success & warning messages by @Franchovy in ([#4253](https://github.com/opensourcepos/opensourcepos/pull/4253))
+- Bugfix constraint migration fix by @objecttothis in ([#4230](https://github.com/opensourcepos/opensourcepos/pull/4230))
+- Fix item number lookup in sales/receivings ([#4212](https://github.com/opensourcepos/opensourcepos/issues/4212)) by @jekkos in ([#4250](https://github.com/opensourcepos/opensourcepos/pull/4250))
+
+## [3.4.0] - 2025-03-23
 
 - Translation updates (Spanish, Indonesian, Swedish, Urdu, Chinese, Thai, French, Dutch)
-- PHP 8.x support
+- PHP `8.x` support
 - Security fixes (XSS, SQLi)
 - Migration to Gulp as buildsystem
 - Decimal validation fix
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 10e1acd6c..302dae0b9 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,98 +1,85 @@
-Contributor Covenant Code of Conduct
-Our Pledge
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-Our Standards
-Examples of behavior that contributes to a positive environment for our
-community include:
+[comment]: # (Contributor Covenant 2.1 - from https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md)
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
 
 * Demonstrating empathy and kindness toward other people
 * Being respectful of differing opinions, viewpoints, and experiences
 * Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-community
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or advances of
-any kind
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others’ private information, such as a physical or email address,
-without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-professional setting
+* Publishing others' private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
-Enforcement Responsibilities
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-Scope
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official email address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
-All complaints will be reviewed and investigated promptly and fairly.
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-Enforcement Guidelines
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-1. Correction
-Community Impact: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-Consequence: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-2. Warning
-Community Impact: A violation through a single incident or series of
-actions.
-Consequence: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-3. Temporary Ban
-Community Impact: A serious violation of community standards, including
-sustained inappropriate behavior.
-Consequence: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-4. Permanent Ban
-Community Impact: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-Consequence: A permanent ban from any sort of public interaction within the
-community.
-Attribution
-This Code of Conduct is adapted from the Contributor Covenant,
-version 2.1, available at
-https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
-Community Impact Guidelines were inspired by
-Mozilla’s code of conduct enforcement ladder.
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+## Enforcement Responsibilities
 
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
 
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/Dockerfile b/Dockerfile
index 376b0834d..4180c9259 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,23 @@
 FROM php:8.2-apache AS ospos
 LABEL maintainer="jekkos"
 
-RUN apt update && apt-get install -y libicu-dev libgd-dev
-RUN a2enmod rewrite
-RUN docker-php-ext-install mysqli bcmath intl gd
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libicu-dev \
+    libgd-dev \
+    && docker-php-ext-install mysqli bcmath intl gd \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && a2enmod rewrite
+
 RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
 
 WORKDIR /app
-COPY . /app
-RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html
-RUN chmod -R 770 /app/writable/uploads /app/writable/logs /app/writable/cache && chown -R www-data:www-data /app
-
-FROM ospos AS ospos_test
-
-COPY --from=composer /usr/bin/composer /usr/bin/composer
-
-RUN apt-get install -y libzip-dev wget git
-RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -O /bin/wait-for-it.sh && chmod +x /bin/wait-for-it.sh
-RUN docker-php-ext-install zip
-RUN composer install -d/app
-#RUN sed -i 's/backupGlobals="true"/backupGlobals="false"/g' /app/tests/phpunit.xml
-WORKDIR /app/tests
-
-CMD ["/app/vendor/phpunit/phpunit/phpunit", "/app/test/helpers"]
+COPY --chown=www-data:www-data . /app
+RUN chmod 750 /app/writable/logs /app/writable/uploads /app/writable/cache /app/public/uploads /app/public/uploads/item_pics \
+    && chmod 640 /app/writable/uploads/importCustomers.csv \
+    && ln -s /app/*[^public] /var/www \
+    && rm -rf /var/www/html \
+    && ln -nsf /app/public /var/www/html
 
 FROM ospos AS ospos_dev
 
diff --git a/INSTALL.md b/INSTALL.md
index 3aeeca927..eb75cc034 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,27 +1,67 @@
 ## Server Requirements
 
-- PHP version `8.1` to `8.4` are supported, PHP version `≤7.4` is NOT supported. Please note that PHP needs to have the extensions `php-json`, `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring`, `php-curl` and `php-xml` installed and enabled. An unstable master build can be downloaded in the releases section.
+- PHP version `8.2` to `8.4` are supported, PHP version `≤ 8.1` is NOT supported. Please note that PHP needs to have the extensions `php-json`, `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring`, `php-curl` and `php-xml` installed and enabled. An unstable master build can be downloaded in the releases section.
 - MySQL `5.7` is supported, also MariaDB replacement `10.x` is supported and might offer better performance.
 - Apache `2.4` is 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.
 
+## Security Configuration
+
+### Allowed Hostnames (REQUIRED for Production)
+
+⚠️ **CRITICAL**: OpenSourcePOS validates the Host header to prevent Host Header Injection attacks. **You MUST configure `app.allowedHostnames` for production deployments. If not configured, the application will fail to start.**
+
+**Add to your `.env` file:**
+
+```bash
+# Comma-separated list of allowed hostnames (no protocols or ports)
+app.allowedHostnames = 'yourdomain.com,www.yourdomain.com'
+```
+
+**For local development:**
+
+```bash
+app.allowedHostnames = 'localhost'
+```
+
+**If you see this error at startup:**
+
+```text
+RuntimeException: Security: allowedHostnames is not configured.
+```
+
+**Solution**: Add `app.allowedHostnames` to your `.env` file with your domain(s).
+
+**Why this matters:**
+- Prevents Host Header Injection attacks
+- Ensures URLs are generated with the correct domain
+- Fixes issue #4480: .env configuration now works via comma-separated values
+
+### HTTPS Behind Proxy
+
+If your installation is behind a proxy with SSL offloading, set:
+```
+FORCE_HTTPS = true
+```
+
 ## Local install
 
-First of all, if you're seeing the message `system folder missing` after launching your browser, or cannot find `database.sql`, that most likely means you have cloned the repository and have not built the project.  To build the project from a source commit point instead of from an official release check out [Building OSPOS](BUILD.md). Otherwise, continue with the following steps.
+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. To build the project from a source commit point instead of from an official release check out [Building OSPOS](BUILD.md). Otherwise, continue with the following steps.
 
 1. Download the a [pre-release for a specific branch](https://github.com/opensourcepos/opensourcepos/releases) 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 `app/Database/database.sql` to create the tables needed.
-4. Unzip and upload Open Source Point of Sale files to the web-server.
-5. Open `.env` file and modify credentials to connect to your database if needed. (First copy .env.example to .env and update)
+3. Unzip and upload Open Source Point of Sale files to the web-server.
+4. If `.env` does not exist, copy `.env.example` to `.env`.
+5. Open `.env` and modify credentials to connect to your database if needed.
+6. The database schema will be automatically created when you first access the application. Migrations run automatically on fresh installs.
 7. Go to your install `public` dir via the browser.
 8. Log in using
    - Username: admin
    - Password: pointofsale
 9. If everything works, then set the `CI_ENVIRONMENT` variable to `production` in the .env file
-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` app/Config/.env` file from the `.env.example` to enable it in a development environment.
+10. Enjoy!
+11. 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` app/Config/.env` file from the `.env.example` to enable it in a development environment.
 
 ## Local install using Docker
 
@@ -31,7 +71,15 @@ Docker runs natively on Mac and Linux. Windows requires WSL2 to be installed. Pl
 
 **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 the following command
+First create a **regular `.env` file** in the project root (a missing one is not
+auto-created as a file — see the compose `create_host_path: false` setting). Copy
+the shipped example:
+
+```
+    cp .env.example .env
+```
+
+Then start the containers:
 
 ```
     docker-compose up
diff --git a/README.md b/README.md
index 755c73f60..ecd695b8f 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 </p>
 
 <p align="center">
-<a href="https://app.travis-ci.com/opensourcepos/opensourcepos" target="_blank"><img src="https://api.travis-ci.com/opensourcepos/opensourcepos.svg?branch=master" alt="Build Status"></a>
+<a href="https://github.com/opensourcepos/opensourcepos/actions/workflows/build-release.yml" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/actions/workflows/build-release.yml/badge.svg" alt="Build Status"></a>
 <a href="https://app.gitter.im/#/room/#opensourcepos_Lobby:gitter.im?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://app.gitter.im"></a>
 <a href="https://badge.fury.io/gh/opensourcepos%2Fopensourcepos" target="_blank"><img src="https://badge.fury.io/gh/opensourcepos%2Fopensourcepos.svg" alt="Project Version"></a>
 <a href="https://translate.opensourcepos.org/engage/opensourcepos/?utm_source=widget" target="_blank"><img src="https://translate.opensourcepos.org/widgets/opensourcepos/-/svg-badge.svg" alt="Translation Status"></a>
@@ -102,11 +102,11 @@ NOTE: If you're running non-release code, please make sure you always run the la
 
 - 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.1` is required to run this app.
+- PHP `≥ 8.2` is required to run this app.
 
 ## 🏃 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.
+If you like our project, please consider buying us a coffee through the button below so we can keep adding features. Please star the project if you like it!
 
 [![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.
@@ -137,7 +137,7 @@ Any person or company found breaching the license agreement might find a bunch o
 
 ## 🙏 Credits
 
-| <div align="center">DigitalOcean</div> | <div align="center">JetBrains</div> | <div align="center">Travis CI</div> |
+| <div align="center">DigitalOcean</div> | <div align="center">JetBrains</div> | <div align="center">GitHub</div> |
 | --- | --- | --- |
-| <div align="center"><a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=opensourcepos" target="_blank"><img src="https://github.com/user-attachments/assets/fbbf7433-ed35-407d-8946-fd03d236d350" alt="DigitalOcean Logo" height="50"></a></div> | <div align="center"><a href="https://www.jetbrains.com/idea/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/187f9bbe-4484-475c-9b58-5e5d5f931f09" alt="IntelliJ IDEA Logo" height="50"></a></div> | <div align="center"><a href="https://www.travis-ci.com/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/71cc2b44-83af-4510-a543-6358285f43c6" alt="Travis CI Logo" height="50"></a></div> |
-| Many thanks to [DigitalOcean](https://www.digitalocean.com) for providing the project with hosting credits. | 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://www.travis-ci.com/) for providing a free continuous integration service for open source projects. |
+| <div align="center"><a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=opensourcepos" target="_blank"><img src="https://github.com/user-attachments/assets/fbbf7433-ed35-407d-8946-fd03d236d350" alt="DigitalOcean Logo" height="50"></a></div> | <div align="center"><a href="https://www.jetbrains.com/idea/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/187f9bbe-4484-475c-9b58-5e5d5f931f09" alt="IntelliJ IDEA Logo" height="50"></a></div> | <div align="center"><a href="https://github.com/features/actions" target="_blank"><img src="https://github.githubassets.com/images/modules/site/icons/eyebrow-panel/actions-icon.svg" alt="GitHub Actions Logo" height="50"></a></div> |
+| Many thanks to [DigitalOcean](https://www.digitalocean.com) for providing the project with hosting credits. | 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 [GitHub](https://github.com) for providing free continuous integration via GitHub Actions for open-source projects. |
diff --git a/SECURITY.md b/SECURITY.md
index 771524f48..ab58ee26e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -5,8 +5,9 @@
   - [Supported Versions](#supported-versions)
   - [Security Advisories](#security-advisories)
   - [Reporting a Vulnerability](#reporting-a-vulnerability)
+  - [Disclosure Process](#disclosure-process)
 
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+<!-- END doctoc generated TOC please keep comment here to allow update -->
 
 # Security Policy
 
@@ -21,26 +22,116 @@ We release patches for security vulnerabilities.
 
 ## Security Advisories
 
-The following security vulnerabilities have been published:
-
-### High Severity
-
-| CVE | Vulnerability | CVSS | Published | Fixed In | Credit |
-|-----|--------------|------|-----------|----------|--------|
-| [CVE-2025-68434](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-wjm4-hfwg-5w5r) | CSRF leading to Admin Creation | 8.8 | 2025-12-17 | 3.4.2 | @Nixon-H, @jekkos |
-| [CVE-2025-68147](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-xgr7-7pvw-fpmh) | Stored XSS in Return Policy | 8.1 | 2025-12-17 | 3.4.2 | @Nixon-H, @jekkos |
-| [CVE-2025-66924](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-gv8j-f6gq-g59m) | Stored XSS in Item Kits | 7.2 | 2026-03-04 | 3.4.2 | @hungnqdz, @omkaryepre |
-
-### Medium Severity
-
-| CVE | Vulnerability | CVSS | Published | Fixed In | Credit |
-|-----|--------------|------|-----------|----------|--------|
-| [CVE-2025-68658](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-32r8-8r9r-9chw) | Stored XSS in Company Name | 4.3 | 2026-01-13 | 3.4.2 | @hungnqdz |
-
-For a complete list including draft advisories, see our [GitHub Security Advisories page](https://github.com/opensourcepos/opensourcepos/security/advisories).
+For a complete list of published and draft security advisories with CVE details, see our [GitHub Security Advisories page](https://github.com/opensourcepos/opensourcepos/security/advisories).
 
 ## Reporting a Vulnerability
 
-Please report (suspected) security vulnerabilities to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)**. 
+**Option 1: GitHub Security Advisory (Preferred)**
 
-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.
\ No newline at end of file
+1. Create a draft security advisory directly on GitHub:
+   - Go to https://github.com/opensourcepos/opensourcepos/security/advisories
+   - Click "New draft security advisory"
+   - Fill in the vulnerability details using our [template below](#vulnerability-template)
+   - Submit as **draft** (not published)
+
+2. Notify us for triage:
+   - Send an email to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)** with:
+     - Subject: `[GHSA] Brief description of vulnerability`
+     - Link to the draft advisory
+     - Brief summary
+
+**Option 2: Email Report**
+
+Send vulnerability details to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)**.
+
+You will receive a response within 48 hours. Confirmed vulnerabilities will be patched within a few days depending on complexity.
+
+## Disclosure Process
+
+### Timeline
+
+| Step | Timeline | Action |
+|------|----------|--------|
+| 1. Report received | Day 0 | We acknowledge within 48 hours |
+| 2. Triage & confirmation | Day 1-3 | We validate the vulnerability |
+| 3. Fix development | Day 3-7 | We develop and test the fix |
+| 4. Patch release | Day 7-10 | We release a security patch |
+| 5. CVE request | Day 7-14 | We request CVE from GitHub (if applicable) |
+| 6. Advisory published | Day 14 | We publish the advisory with credit |
+| 7. Public disclosure | Day 14+ | Full disclosure after patch release |
+
+### CVE Process
+
+**We request CVE identifiers through GitHub's security advisory system.** This is the preferred and easiest method:
+
+1. After we confirm and fix the vulnerability, we'll request a CVE through GitHub
+2. GitHub coordinates with MITRE on our behalf
+3. The CVE is automatically linked to the advisory
+4. You'll be credited as the reporter in the published advisory
+
+**Already have a CVE?** If you've already obtained a CVE from another source (e.g., VulDB, CVE.MITRE.ORG), please include it in your report or advisory. We'll update our advisory to reference the existing CVE.
+
+### No Bug Bounty Program
+
+**Important:** Open Source Point of Sale does not offer a bug bounty program.
+
+- All security research and vulnerability triage is done on a **voluntary basis** in our free time
+- We do not offer monetary rewards for vulnerability reports
+- We do credit reporters in published advisories (unless anonymity is requested)
+- We greatly appreciate the security research community's efforts to help improve project security
+
+### Security Best Practices for Researchers
+
+- **Do not** access, modify, or delete data that doesn't belong to you
+- **Do not** perform denial of service attacks
+- **Do not** publicly disclose vulnerabilities before we've had time to fix them
+- **Do** provide sufficient information to reproduce the vulnerability
+- **Do** allow us reasonable time to fix before public disclosure
+- **Do** report through official channels (GitHub advisories or email)
+
+### Vulnerability Template
+
+When creating a draft advisory, please include:
+
+```
+## Summary
+[Brief description of the vulnerability]
+
+## Impact
+- **Confidentiality:** [High/Medium/Low - what data can be exposed]
+- **Integrity:** [High/Medium/Low - what can be modified]
+- **Availability:** [High/Medium/Low - service disruption potential]
+- **Privilege Required:** [None/Low/High - authentication level needed]
+- **CVSS v3.1:** [Score] ([Vector string])
+
+## Details
+[Technical details about the vulnerability]
+
+**Affected Code:**
+```php
+// Path to affected file and vulnerable code
+```
+
+**Attack Vector:**
+[How an attacker can exploit this]
+
+## Proof of Concept
+```bash
+# Steps to reproduce
+```
+
+## Patch
+[Suggested fix or approach]
+
+## Affected Versions
+- OpenSourcePOS X.Y.Z and earlier
+
+## Credit
+[Your GitHub username or preferred name]
+```
+
+---
+
+**Thank you to all security researchers who have contributed to making Open Source Point of Sale more secure.** Your voluntary efforts help protect thousands of users worldwide and contribute to a safer, more trustworthy free and open-source software ecosystem. We deeply appreciate your responsible disclosure and the time you invest in improving our project.
+
+If you've reported a vulnerability and would like to discuss CVE coordination or have questions about the process, please reach out to us at [jeroen@steganos.dev](mailto:jeroen@steganos.dev).
\ No newline at end of file
diff --git a/app/Commands/EnvProvision.php b/app/Commands/EnvProvision.php
new file mode 100644
index 000000000..987b1d552
--- /dev/null
+++ b/app/Commands/EnvProvision.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace App\Commands;
+
+use App\Libraries\CI3SecretConverter;
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Exception;
+use RuntimeException;
+
+/**
+ * Idempotent startup provisioning of the encryption + throttle keys.
+ *
+ * In bare-metal deployments the web runtime can auto-provision keys inline
+ * (see checkEncryption()/checkThrottleEncryption(), gated by .env
+ * writability). In Docker/Compose deployments .env is typically mounted
+ * read-only, so keys are minted here at container start via
+ * `php spark env:provision`. For legacy CI3 deployments this command
+ * also re-encrypts stored CI3 secrets to the CI4 cipher (shared
+ * implementation with the interactive ConvertToCI4 migration).
+ */
+class EnvProvision extends BaseCommand
+{
+    /**
+     * The command's group.
+     *
+     * @var string
+     */
+    protected $group = 'Environment';
+
+    protected $name = 'env:provision';
+
+    protected $usage = 'env:provision';
+
+    protected $description = 'Ensures the encryption and throttle keys are provisioned and converts any legacy CI3-encrypted secrets.';
+
+    public function run(array $params): void
+    {
+        helper('security');
+
+        $throttleKey = provisionThrottleKey();
+        CLI::write('throttle.key       : ' . ($throttleKey !== '' ? 'present' : 'MISSING'), 'green');
+
+        $encryptionConfig = config('Encryption');
+        $key = (string) ($encryptionConfig->key ?? '');
+
+        if ($key !== '' && strlen($key) >= 64) {
+            CLI::write('encryption.key     : CI4 key already present', 'green');
+            CLI::newLine();
+
+            return;
+        }
+
+        $converter = new CI3SecretConverter();
+
+        if ($key !== '' && strlen($key) < 64) {
+            // DB read, safe outside the .env lock.
+            $plain   = $converter->decryptAll($key);
+            $hasData = $this->anyNonEmpty($plain);
+
+            // Backup -> rotate -> re-encrypt -> verify -> persist under a single .env lock.
+            rotateEncryptionKeyTransaction($key, static function () use ($plain, $hasData, $converter): void {
+                $encrypted = $converter->encryptAll($plain);
+
+                if (array_diff_assoc($plain, $converter->verifyAll($encrypted)) !== []) {
+                    throw new RuntimeException('Failed to verify converted encryption data.');
+                }
+
+                if ($hasData) {
+                    $converter->saveAll($encrypted);
+                }
+            });
+
+            CLI::write('encryption.key     : rotated CI3 -> CI4 key', 'green');
+            if ($hasData) {
+                CLI::write('legacy secrets     : converted and verified to CI4 cipher', 'green');
+            }
+        } else {
+            // Fresh key (no old key to decrypt): a single atomic write suffices;
+            // the transaction wrapper still serialises it against other workers.
+            rotateEncryptionKeyTransaction(null, static function (): void {});
+
+            CLI::write('encryption.key     : new CI4 key generated', 'green');
+
+            if ($this->legacySecretsPresent()) {
+                CLI::write('legacy secrets     : WARNING - stored CI3 secrets found but no CI3 key to decrypt them; they could not be recovered', 'yellow');
+            }
+        }
+
+        CLI::newLine();
+        CLI::write('env:provision complete.', 'green');
+        CLI::newLine();
+    }
+
+    private function anyNonEmpty(array $plain): bool
+    {
+        foreach ($plain as $value) {
+            if ((string) $value !== '') {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function legacySecretsPresent(): bool
+    {
+        try {
+            $appConfig = model('Appconfig');
+        } catch (Exception $e) {
+            return false;
+        }
+
+        foreach (CI3SecretConverter::LEGACY_KEYS as $col) {
+            try {
+                if ($appConfig->get_value($col) !== '') {
+                    return true;
+                }
+            } catch (Exception $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/app/Config/App.php b/app/Config/App.php
index 257d1e786..de204b036 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -12,7 +12,7 @@ class App extends BaseConfig
      *
      * @var string
      */
-    public string $application_version = '3.4.2';
+    public string $application_version = '3.4.3';
 
     /**
      * This is the commit hash for the version you are currently using.
@@ -58,9 +58,9 @@ class App extends BaseConfig
      * Allowed Hostnames in the Site URL other than the hostname in the baseURL.
      * If you want to accept multiple Hostnames, set this.
      *
-     * E.g.,
-     * When your site URL ($baseURL) is 'http://example.com/', and your site
-     * also accepts 'http://media.example.com/' and 'http://accounts.example.com/':
+     * Or via environment variable (useful for Docker/Compose):
+     *   ALLOWED_HOSTNAMES=example.com,www.example.com
+     *
      *     ['media.example.com', 'accounts.example.com']
      *
      * @var list<string>
@@ -117,7 +117,7 @@ class App extends BaseConfig
     | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
     |
     */
-    public string $permittedURIChars = 'a-z 0-9~%.:_\-=';
+    public string $permittedURIChars = 'a-z 0-9~%.:_\-';
 
     /**
      * --------------------------------------------------------------------------
@@ -278,14 +278,97 @@ class App extends BaseConfig
      * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
      * @see http://www.w3.org/TR/CSP/
      */
-    public bool $CSPEnabled = false;    // TODO: Currently CSP3 tags are not supported so enabling this causes problems with script-src-elem, style-src-attr and style-src-elem
+    public bool $CSPEnabled = false;
 
     public function __construct()
     {
         parent::__construct();
+
+        // Solution for CodeIgniter 4 limitation: arrays cannot be set from .env
+        // See: https://github.com/codeigniter4/CodeIgniter4/issues/7311
+        $envAllowedHostnames = $this->getEnvString('ALLOWED_HOSTNAMES')
+            ?? $this->getEnvString('app.allowedHostnames');
+
+        if ($envAllowedHostnames !== null) {
+            $this->allowedHostnames = array_values(array_filter(
+                array_map('trim', explode(',', $envAllowedHostnames)),
+                static fn (string $hostname): bool => $hostname !== ''
+            ));
+        }
+
         $this->https_on = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true');
+
+        $host = $this->getValidHost();
         $this->baseURL = $this->https_on ? 'https' : 'http';
-        $this->baseURL .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost') . '/';
+        $this->baseURL .= '://' . $host . '/';
         $this->baseURL .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
     }
+
+    /**
+     * Validates and returns a trusted hostname.
+     *
+     * Security: Prevents Host Header Injection attacks
+     * by validating the HTTP_HOST against a whitelist of allowed hostnames.
+     *
+     * In production: Fails fast if allowedHostnames is not configured.
+     * In development: Allows localhost fallback with an error log.
+     *
+     * @return string A validated hostname
+     * @throws \RuntimeException If allowedHostnames is not configured in production
+     */
+    private function getValidHost(): string
+    {
+        $httpHost = $_SERVER['HTTP_HOST'] ?? 'localhost';
+
+        // Determine environment
+        // CodeIgniter's test bootstrap sets $_SERVER['CI_ENVIRONMENT'] = 'testing'
+        // Check $_SERVER first, then $_ENV, then fall back to 'production'
+        $environment = $_SERVER['CI_ENVIRONMENT'] ?? $_ENV['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT') ?: 'production';
+
+        if (empty($this->allowedHostnames)) {
+            $errorMessage =
+                'Security: allowedHostnames is not configured. ' .
+                'Host header injection protection is disabled. ' .
+                'Set app.allowedHostnames in your .env file or ALLOWED_HOSTNAMES environment variable. ' .
+                'Example: app.allowedHostnames = "example.com,www.example.com" ' .
+                'Received Host: ' . $httpHost;
+
+            // Production: Fail explicitly to prevent silent security vulnerabilities
+            // Testing and development: Allow localhost fallback
+            if ($environment === 'production') {
+                throw new \RuntimeException($errorMessage);
+            }
+
+            log_message('error', $errorMessage . ' Using localhost fallback (development only).');
+            return 'localhost';
+        }
+
+        if (in_array($httpHost, $this->allowedHostnames, true)) {
+            return $httpHost;
+        }
+
+        // Host not in whitelist - use first configured hostname as fallback
+        log_message('warning',
+            'Security: Rejected HTTP_HOST "' . $httpHost . '" - not in allowedHostnames whitelist. ' .
+            'Using fallback: ' . $this->allowedHostnames[0]
+        );
+
+        return $this->allowedHostnames[0];
+    }
+
+    private function getEnvString(string $key): ?string
+    {
+        $value = env($key);
+
+        if (is_string($value) && trim($value) !== '') {
+            return $value;
+        }
+
+        $raw = $_ENV[$key] ?? $_SERVER[$key] ?? getenv($key);
+        if (is_string($raw) && trim($raw) !== '') {
+            return $raw;
+        }
+
+        return null;
+    }
 }
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index 87c815f8f..3ad1105cb 100644
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -17,8 +17,6 @@ use CodeIgniter\Config\AutoloadConfig;
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Autoload extends AutoloadConfig
 {
@@ -41,8 +39,7 @@ class Autoload extends AutoloadConfig
      */
     public $psr4 = [
         APP_NAMESPACE => APPPATH,
-        'Config'      => APPPATH . 'Config',
-        'dompdf'      => APPPATH . 'ThirdParty/dompdf/src'
+        'Config'      => APPPATH . 'Config'
     ];
 
     /**
diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php
index 02fd04a2b..40b6ca83c 100644
--- a/app/Config/Boot/testing.php
+++ b/app/Config/Boot/testing.php
@@ -1,23 +1,38 @@
 <?php
 
+/*
+ * The environment testing is reserved for PHPUnit testing. It has special
+ * conditions built into the framework at various places to assist with that.
+ * You can’t use it for your development.
+ */
+
 /*
  |--------------------------------------------------------------------------
-| ERROR DISPLAY
+ | ERROR DISPLAY
  |--------------------------------------------------------------------------
-*/
+ | In development, we want to show as many errors as possible to help
+ | make sure they don't make it to production. And save us hours of
+ | painful debugging.
+ */
 error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /*
  |--------------------------------------------------------------------------
-| DEBUG BACKTRACES
+ | DEBUG BACKTRACES
  |--------------------------------------------------------------------------
-*/
+ | If true, this constant will tell the error screens to display debug
+ | backtraces along with the other error information. If you would
+ | prefer to not see this, set this value to false.
+ */
 defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
  |--------------------------------------------------------------------------
-| DEBUG MODE
+ | DEBUG MODE
  |--------------------------------------------------------------------------
-*/
-defined('CI_DEBUG') || define('CI_DEBUG', true);
\ No newline at end of file
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. It's not widely used currently, and may not survive
+ | release of the framework.
+ */
+defined('CI_DEBUG') || define('CI_DEBUG', true);
diff --git a/app/Config/CURLRequest.php b/app/Config/CURLRequest.php
index 5a3d4e931..bc5947fb7 100644
--- a/app/Config/CURLRequest.php
+++ b/app/Config/CURLRequest.php
@@ -6,6 +6,22 @@ use CodeIgniter\Config\BaseConfig;
 
 class CURLRequest extends BaseConfig
 {
+    /**
+     * --------------------------------------------------------------------------
+     * CURLRequest Share Connection Options
+     * --------------------------------------------------------------------------
+     *
+     * Share connection options between requests.
+     *
+     * @var list<int>
+     *
+     * @see https://www.php.net/manual/en/curl.constants.php#constant.curl-lock-data-connect
+     */
+    public array $shareConnectionOptions = [
+        CURL_LOCK_DATA_CONNECT,
+        CURL_LOCK_DATA_DNS,
+    ];
+
     /**
      * --------------------------------------------------------------------------
      * CURLRequest Share Options
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
index a05ca78c1..0e0dfca9e 100644
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -3,6 +3,7 @@
 namespace Config;
 
 use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\Cache\Handlers\ApcuHandler;
 use CodeIgniter\Cache\Handlers\DummyHandler;
 use CodeIgniter\Cache\Handlers\FileHandler;
 use CodeIgniter\Cache\Handlers\MemcachedHandler;
@@ -78,7 +79,7 @@ class Cache extends BaseConfig
      * Your file storage preferences can be specified below, if you are using
      * the File driver.
      *
-     * @var array<string, int|string|null>
+     * @var array{storePath?: string, mode?: int}
      */
     public array $file = [
         'storePath' => WRITEPATH . 'cache/',
@@ -95,7 +96,7 @@ class Cache extends BaseConfig
      *
      * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
      *
-     * @var array<string, bool|int|string>
+     * @var array{host?: string, port?: int, weight?: int, raw?: bool}
      */
     public array $memcached = [
         'host'   => '127.0.0.1',
@@ -108,17 +109,28 @@ class Cache extends BaseConfig
      * -------------------------------------------------------------------------
      * Redis settings
      * -------------------------------------------------------------------------
+     *
      * Your Redis server can be specified below, if you are using
      * the Redis or Predis drivers.
      *
-     * @var array<string, int|string|null>
+     * @var array{
+     *     host?: string,
+     *     password?: string|null,
+     *     port?: int,
+     *     timeout?: int,
+     *     async?: bool,
+     *     persistent?: bool,
+     *     database?: int
+     * }
      */
     public array $redis = [
-        'host'     => '127.0.0.1',
-        'password' => null,
-        'port'     => 6379,
-        'timeout'  => 0,
-        'database' => 0,
+        'host'       => '127.0.0.1',
+        'password'   => null,
+        'port'       => 6379,
+        'timeout'    => 0,
+        'async'      => false, // specific to Predis and ignored by the native Redis extension
+        'persistent' => false,
+        'database'   => 0,
     ];
 
     /**
@@ -132,6 +144,7 @@ class Cache extends BaseConfig
      * @var array<string, class-string<CacheInterface>>
      */
     public array $validHandlers = [
+        'apcu'      => ApcuHandler::class,
         'dummy'     => DummyHandler::class,
         'file'      => FileHandler::class,
         'memcached' => MemcachedHandler::class,
@@ -158,4 +171,28 @@ class Cache extends BaseConfig
      * @var bool|list<string>
      */
     public $cacheQueryString = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Web Page Caching: Cache Status Codes
+     * --------------------------------------------------------------------------
+     *
+     * HTTP status codes that are allowed to be cached. Only responses with
+     * these status codes will be cached by the PageCache filter.
+     *
+     * Default: [] - Cache all status codes (backward compatible)
+     *
+     * Recommended: [200] - Only cache successful responses
+     *
+     * You can also use status codes like:
+     *   [200, 404, 410] - Cache successful responses and specific error codes
+     *   [200, 201, 202, 203, 204] - All 2xx successful responses
+     *
+     * WARNING: Using [] may cache temporary error pages (404, 500, etc).
+     * Consider restricting to [200] for production applications to avoid
+     * caching errors that should be temporary.
+     *
+     * @var list<int>
+     */
+    public array $cacheStatusCodes = [];
 }
diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 83c74b400..ccd5296cf 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -84,9 +84,12 @@ defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125);    // highest a
 /**
  * Global Constants.
  */
-const NEW_ENTRY = -1;
-const ACTIVE = 0;
-const DELETED = 1;
+const NEW_ENTRY                     = -1;
+const ACTIVE                        = 0;
+const DELETED                       = 1;
+const INSUFFICIENT_GIFTCARD_BALANCE = -2;
+const INSUFFICIENT_REWARD_POINTS    = -3;
+const INSUFFICIENT_STOCK            = -4;
 
 /**
  * Attribute Related Constants.
diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
index 5a46774af..bdf7c2ba1 100644
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -30,6 +30,11 @@ class ContentSecurityPolicy extends BaseConfig
      */
     public ?string $reportURI = null;
 
+    /**
+     * Specifies a reporting endpoint to which violation reports ought to be sent.
+     */
+    public ?string $reportTo = null;
+
     /**
      * Instructs user agents to rewrite URL schemes, changing
      * HTTP to HTTPS. This directive is for websites with
@@ -38,12 +43,12 @@ class ContentSecurityPolicy extends BaseConfig
     public bool $upgradeInsecureRequests = false;
 
     // -------------------------------------------------------------------------
-    // Sources allowed
+    // CSP DIRECTIVES SETTINGS
     // NOTE: once you set a policy to 'none', it cannot be further restricted
     // -------------------------------------------------------------------------
 
     /**
-     * Will default to self if not overridden
+     * Will default to `'self'` if not overridden
      *
      * @var list<string>|string|null
      */
@@ -64,6 +69,21 @@ class ContentSecurityPolicy extends BaseConfig
         'www.google.com www.gstatic.com'
     ];
 
+    /**
+     * Specifies valid sources for JavaScript <script> elements.
+     *
+     * @var list<string>|string
+     */
+    public array|string $scriptSrcElem = 'self';
+
+    /**
+     * Specifies valid sources for JavaScript inline event
+     * handlers and JavaScript URLs.
+     *
+     * @var list<string>|string
+     */
+    public array|string $scriptSrcAttr = 'self';
+
     /**
      * Lists allowed stylesheets' URLs.
      *
@@ -76,6 +96,21 @@ class ContentSecurityPolicy extends BaseConfig
         'https://fonts.googleapis.com',
     ];
 
+    /**
+     * Specifies valid sources for stylesheets <link> elements.
+     *
+     * @var list<string>|string
+     */
+    public array|string $styleSrcElem = 'self';
+
+    /**
+     * Specifies valid sources for stylesheets inline
+     * style attributes and `<style>` elements.
+     *
+     * @var list<string>|string
+     */
+    public array|string $styleSrcAttr = 'self';
+
     /**
      * Defines the origins from which images can be loaded.
      *
@@ -169,6 +204,11 @@ class ContentSecurityPolicy extends BaseConfig
      */
     public $manifestSrc;
 
+    /**
+     * @var list<string>|string
+     */
+    public array|string $workerSrc = [];
+
     /**
      * Limits the kinds of plugins a page may invoke.
      *
@@ -184,17 +224,17 @@ class ContentSecurityPolicy extends BaseConfig
     public $sandbox;
 
     /**
-     * Nonce tag for style
+     * Nonce placeholder for style tags.
      */
     public string $styleNonceTag = '{csp-style-nonce}';
 
     /**
-     * Nonce tag for script
+     * Nonce placeholder for script tags.
      */
     public string $scriptNonceTag = '{csp-script-nonce}';
 
     /**
-     * Replace nonce tag automatically
+     * Replace nonce tag automatically?
      */
     public bool $autoNonce = true;
 }
diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php
index 84ccc0e99..3bad18479 100644
--- a/app/Config/Cookie.php
+++ b/app/Config/Cookie.php
@@ -85,7 +85,7 @@ class Cookie extends BaseConfig
      * (empty string) means default SameSite attribute set by browsers (`Lax`)
      * will be set on cookies. If set to `None`, `$secure` must also be set.
      *
-     * @phpstan-var 'None'|'Lax'|'Strict'|''
+     * @var ''|'Lax'|'None'|'Strict'
      */
     public string $samesite = 'Lax';
 
diff --git a/app/Config/Database.php b/app/Config/Database.php
index 644dce6f4..5738ad62f 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -42,6 +42,8 @@ class Database extends Config
         'strictOn'     => false,
         'failover'     => [],
         'port'         => 3306,
+        'numberNative' => false,
+        'foundRows'    => false,
         'dateFormat'   => [
             'date'     => 'Y-m-d',
             'datetime' => 'Y-m-d H:i:s',
@@ -55,26 +57,27 @@ class Database extends Config
      * @var array<string, mixed>
      */
     public array $tests = [
-        'DSN'          => '',
-        'hostname'     => 'localhost',
-        'username'     => 'admin',
-        'password'     => 'pointofsale',
-        'database'     => 'ospos',
-        'DBDriver'     => 'MySQLi',
-        'DBPrefix'     => 'ospos_',
-        'pConnect'     => false,
-        'DBDebug'      => (ENVIRONMENT !== 'production'),
-        'charset'      => 'utf8mb4',
-        'DBCollat'     => 'utf8mb4_general_ci',
-        'swapPre'      => '',
-        'encrypt'      => false,
-        'compress'     => false,
-        'strictOn'     => false,
-        'failover'     => [],
-        'port'         => 3306,
-        'foreignKeys'  => true,
-        'busyTimeout'  => 1000,
-        'dateFormat'   => [
+        'DSN'         => '',
+        'hostname'    => 'localhost',
+        'username'    => 'admin',
+        'password'    => 'pointofsale',
+        'database'    => 'ospos',
+        'DBDriver'    => 'MySQLi',
+        'DBPrefix'    => 'ospos_',
+        'pConnect'    => false,
+        'DBDebug'     => (ENVIRONMENT !== 'production'),
+        'charset'     => 'utf8mb4',
+        'DBCollat'    => 'utf8mb4_general_ci',
+        'swapPre'     => '',
+        'encrypt'     => false,
+        'compress'    => false,
+        'strictOn'    => false,
+        'failover'    => [],
+        'port'        => 3306,
+        'foreignKeys' => true,
+        'busyTimeout' => 1000,
+        'synchronous' => null,
+        'dateFormat'  => [
             'date'     => 'Y-m-d',
             'datetime' => 'Y-m-d H:i:s',
             'time'     => 'H:i:s',
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
index 7e8aaacf0..788d68fdc 100644
--- a/app/Config/DocTypes.php
+++ b/app/Config/DocTypes.php
@@ -2,9 +2,6 @@
 
 namespace Config;
 
-/**
- * @immutable
- */
 class DocTypes
 {
     /**
diff --git a/app/Config/Email.php b/app/Config/Email.php
index d3a1a15d2..1e47be9bd 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -30,6 +30,11 @@ class Email extends BaseConfig
      */
     public string $SMTPHost = 'mail.mxserver.com';
 
+    /**
+     * Which SMTP authentication method to use: login, plain
+     */
+    public string $SMTPAuthMethod = 'login';
+
     /**
      * SMTP Username
      */
diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php
index e848c318f..310a5a174 100644
--- a/app/Config/Encryption.php
+++ b/app/Config/Encryption.php
@@ -23,6 +23,23 @@ class Encryption extends BaseConfig
      */
     public string $key = '';
 
+    /**
+     * --------------------------------------------------------------------------
+     * Previous Encryption Keys
+     * --------------------------------------------------------------------------
+     *
+     * When rotating encryption keys, add old keys here to maintain ability
+     * to decrypt data encrypted with previous keys. Encryption always uses
+     * the current $key. Decryption tries current key first, then falls back
+     * to previous keys if decryption fails.
+     *
+     * In .env file, use comma-separated string:
+     *   encryption.previousKeys = hex2bin:9be8c64fcea509867...,hex2bin:3f5a1d8e9c2b7a4f6...
+     *
+     * @var list<string>|string
+     */
+    public array|string $previousKeys = '';
+
     /**
      * --------------------------------------------------------------------------
      * Encryption Driver to Use
@@ -89,4 +106,53 @@ class Encryption extends BaseConfig
      * by CI3 Encryption default configuration.
      */
     public string $cipher = 'AES-256-CTR';
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        if ($this->key === '') {
+            // Fallback sources (notably the ENCRYPTION_KEY Docker var, which the
+            // parent never reads) were not decode-parsed, so run them through
+            // the same parser to keep hex2bin:/base64: keys consistent.
+            $this->key = self::parseKey(self::resolveKey(
+                (string) ($_SERVER['encryption.key'] ?? ''),
+                (string) ($_ENV['encryption.key'] ?? ''),
+                (string) getenv('encryption.key'),
+                (string) getenv('ENCRYPTION_KEY'),
+            ));
+        }
+    }
+
+    /**
+     * Decode a key's `hex2bin:`/`base64:` prefix, mirroring
+     * BaseConfig::parseEncryptionKey(); kept static so it is unit-testable.
+     */
+    public static function parseKey(string $key): string
+    {
+        if (str_starts_with($key, 'hex2bin:')) {
+            return (string) hex2bin(substr($key, 8));
+        }
+
+        if (str_starts_with($key, 'base64:')) {
+            return (string) base64_decode(substr($key, 7), true);
+        }
+
+        return $key;
+    }
+
+    /**
+     * Return the first non-empty source (highest precedence first). Cascading
+     * past empty strings (vs `??`) avoids a blank value shadowing the real key.
+     */
+    public static function resolveKey(string ...$sources): string
+    {
+        foreach ($sources as $source) {
+            if ($source !== '') {
+                return $source;
+            }
+        }
+
+        return '';
+    }
 }
diff --git a/app/Config/Events.php b/app/Config/Events.php
index 0516b4a57..d4c5a8792 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -28,7 +28,8 @@ use App\Events\Method;
 
 Events::on('pre_system', static function (): void {
     if (ENVIRONMENT !== 'testing') {
-        if (ini_get('zlib.output_compression')) {
+        $value = ini_get('zlib.output_compression');
+        if (filter_var($value, FILTER_VALIDATE_BOOLEAN) || (int) $value > 0) {
             throw FrameworkException::forEnabledZlibOutputCompression();
         }
 
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index efb99dfd8..9d6fb65ef 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -2,6 +2,7 @@
 
 namespace Config;
 
+use App\Filters\Throttle;
 use CodeIgniter\Config\Filters as BaseFilters;
 use CodeIgniter\Filters\Cors;
 use CodeIgniter\Filters\CSRF;
@@ -12,6 +13,7 @@ use CodeIgniter\Filters\InvalidChars;
 use CodeIgniter\Filters\PageCache;
 use CodeIgniter\Filters\PerformanceMetrics;
 use CodeIgniter\Filters\SecureHeaders;
+use App\Filters\IsLoggedIn;
 
 class Filters extends BaseFilters
 {
@@ -34,6 +36,8 @@ class Filters extends BaseFilters
         'forcehttps'    => ForceHTTPS::class,
         'pagecache'     => PageCache::class,
         'performance'   => PerformanceMetrics::class,
+        'isLoggedIn'    => IsLoggedIn::class,
+        'throttle'      => Throttle::class,
     ];
 
     /**
@@ -65,12 +69,16 @@ class Filters extends BaseFilters
      * List of filter aliases that are always
      * applied before and after every request.
      *
-     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
+     * @var array{
+     *     before: array<string, array{except: list<string>|string}>|list<string>,
+     *     after: array<string, array{except: list<string>|string}>|list<string>
+     * }
      */
     public array $globals = [
         'before' => [
             'honeypot',
-            'csrf' => ['except' => 'login'],
+            'isLoggedIn' => ['except' => 'login|migrate'],
+            'csrf' => ['except' => 'login|migrate'],
             'invalidchars',
         ],
         'after' => [
@@ -100,11 +108,13 @@ class Filters extends BaseFilters
      * before or after URI patterns.
      *
      * Example:
-     * isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
+     * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
      *
      * @var array<string, array<string, list<string>>>
      */
-    public array $filters = [];
+    public array $filters = [
+        'throttle' => ['before' => ['login', 'migrate']],
+    ];
 
     /**
      * Constructor to conditionally disable CSRF filter in testing environment
diff --git a/app/Config/Format.php b/app/Config/Format.php
index 0d334d72b..5bf56c22f 100644
--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -61,4 +61,13 @@ class Format extends BaseConfig
         'application/xml'  => 0,
         'text/xml'         => 0,
     ];
+
+    /**
+     * --------------------------------------------------------------------------
+     * Maximum depth for JSON encoding.
+     * --------------------------------------------------------------------------
+     *
+     * This value determines how deep the JSON encoder will traverse nested structures.
+     */
+    public int $jsonEncodeDepth = 512;
 }
diff --git a/app/Config/Hostnames.php b/app/Config/Hostnames.php
new file mode 100644
index 000000000..1b4c7224e
--- /dev/null
+++ b/app/Config/Hostnames.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Config;
+
+class Hostnames
+{
+    // List of known two-part TLDs for subdomain extraction
+    public const TWO_PART_TLDS = [
+        'co.uk', 'org.uk', 'gov.uk', 'ac.uk', 'sch.uk', 'ltd.uk', 'plc.uk',
+        'com.au', 'net.au', 'org.au', 'edu.au', 'gov.au', 'asn.au', 'id.au',
+        'co.jp', 'ac.jp', 'go.jp', 'or.jp', 'ne.jp', 'gr.jp',
+        'co.nz', 'org.nz', 'govt.nz', 'ac.nz', 'net.nz', 'geek.nz', 'maori.nz', 'school.nz',
+        'co.in', 'net.in', 'org.in', 'ind.in', 'ac.in', 'gov.in', 'res.in',
+        'com.cn', 'net.cn', 'org.cn', 'gov.cn', 'edu.cn',
+        'com.sg', 'net.sg', 'org.sg', 'gov.sg', 'edu.sg', 'per.sg',
+        'co.za', 'org.za', 'gov.za', 'ac.za', 'net.za',
+        'co.kr', 'or.kr', 'go.kr', 'ac.kr', 'ne.kr', 'pe.kr',
+        'co.th', 'or.th', 'go.th', 'ac.th', 'net.th', 'in.th',
+        'com.my', 'net.my', 'org.my', 'edu.my', 'gov.my', 'mil.my', 'name.my',
+        'com.mx', 'org.mx', 'net.mx', 'edu.mx', 'gob.mx',
+        'com.br', 'net.br', 'org.br', 'gov.br', 'edu.br', 'art.br', 'eng.br',
+        'co.il', 'org.il', 'ac.il', 'gov.il', 'net.il', 'muni.il',
+        'co.id', 'or.id', 'ac.id', 'go.id', 'net.id', 'web.id', 'my.id',
+        'com.hk', 'edu.hk', 'gov.hk', 'idv.hk', 'net.hk', 'org.hk',
+        'com.tw', 'net.tw', 'org.tw', 'edu.tw', 'gov.tw', 'idv.tw',
+        'com.sa', 'net.sa', 'org.sa', 'gov.sa', 'edu.sa', 'sch.sa', 'med.sa',
+        'co.ae', 'net.ae', 'org.ae', 'gov.ae', 'ac.ae', 'sch.ae',
+        'com.tr', 'net.tr', 'org.tr', 'gov.tr', 'edu.tr', 'av.tr', 'gen.tr',
+        'co.ke', 'or.ke', 'go.ke', 'ac.ke', 'sc.ke', 'me.ke', 'mobi.ke', 'info.ke',
+        'com.ng', 'org.ng', 'gov.ng', 'edu.ng', 'net.ng', 'sch.ng', 'name.ng',
+        'com.pk', 'net.pk', 'org.pk', 'gov.pk', 'edu.pk', 'fam.pk',
+        'com.eg', 'edu.eg', 'gov.eg', 'org.eg', 'net.eg',
+        'com.cy', 'net.cy', 'org.cy', 'gov.cy', 'ac.cy',
+        'com.lk', 'org.lk', 'edu.lk', 'gov.lk', 'net.lk', 'int.lk',
+        'com.bd', 'net.bd', 'org.bd', 'ac.bd', 'gov.bd', 'mil.bd',
+        'com.ar', 'net.ar', 'org.ar', 'gov.ar', 'edu.ar', 'mil.ar',
+        'gob.cl', 'com.pl', 'net.pl', 'org.pl', 'gov.pl', 'edu.pl',
+        'co.ir', 'ac.ir', 'org.ir', 'id.ir', 'gov.ir', 'sch.ir', 'net.ir',
+    ];
+}
diff --git a/app/Config/Images.php b/app/Config/Images.php
index a33ddadb9..68e415e04 100644
--- a/app/Config/Images.php
+++ b/app/Config/Images.php
@@ -16,6 +16,8 @@ class Images extends BaseConfig
     /**
      * The path to the image library.
      * Required for ImageMagick, GraphicsMagick, or NetPBM.
+     *
+     * @deprecated 4.7.0 No longer used.
      */
     public string $libraryPath = '/usr/local/bin/convert';
 
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
index 823e230ed..480fe5d28 100644
--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -4,6 +4,7 @@ namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Log\Handlers\FileHandler;
+use CodeIgniter\Log\Handlers\HandlerInterface;
 
 class Logger extends BaseConfig
 {
@@ -73,7 +74,7 @@ class Logger extends BaseConfig
      * Handlers are executed in the order defined in this array, starting with
      * the handler on top and continuing down.
      *
-     * @var array<class-string, array<string, int|list<string>|string>>
+     * @var array<class-string<HandlerInterface>, array<string, int|list<string>|string>>
      */
     public array $handlers = [
         /*
diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php
index a5c59b391..8e59c6247 100644
--- a/app/Config/Migrations.php
+++ b/app/Config/Migrations.php
@@ -47,4 +47,19 @@ class Migrations extends BaseConfig
      * - Y_m_d_His_
      */
     public string $timestampFormat = 'YmdHis_';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Enable/Disable Migration Lock
+     * --------------------------------------------------------------------------
+     *
+     * Locking is disabled by default.
+     *
+     * When enabled, it will prevent multiple migration processes
+     * from running at the same time by using a lock mechanism.
+     *
+     * This is useful in production environments to avoid conflicts
+     * or race conditions during concurrent deployments.
+     */
+    public bool $lock = false;
 }
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 8c5ef2470..c2db7340c 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -3,8 +3,6 @@
 namespace Config;
 
 /**
- * Mimes
- *
  * This file contains an array of mime types.  It is used by the
  * Upload class to help identify allowed file types.
  *
@@ -15,8 +13,6 @@ namespace Config;
  *
  * When working with mime types, please make sure you have the ´fileinfo´
  * extension enabled to reliably detect the media types.
- *
- * @immutable
  */
 class Mimes
 {
@@ -482,6 +478,8 @@ class Mimes
             'application/sla',
             'application/vnd.ms-pki.stl',
             'application/x-navistyle',
+            'model/stl',
+            'application/octet-stream',
         ],
     ];
 
@@ -490,7 +488,7 @@ class Mimes
      *
      * @return string|null The mime type found, or none if unable to determine.
      */
-    public static function guessTypeFromExtension(string $extension): array|string|null
+    public static function guessTypeFromExtension(string $extension)
     {
         $extension = trim(strtolower($extension), '. ');
 
@@ -508,7 +506,7 @@ class Mimes
      *
      * @return string|null The extension determined, or null if unable to match.
      */
-    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null): ?string
+    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null)
     {
         $type = trim(strtolower($type), '. ');
 
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
index 8d4bf5654..9e03fa491 100644
--- a/app/Config/Modules.php
+++ b/app/Config/Modules.php
@@ -9,8 +9,6 @@ use CodeIgniter\Modules\Modules as BaseModules;
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Modules extends BaseModules
 {
diff --git a/app/Config/OSPOS.php b/app/Config/OSPOS.php
index 6d4efbb22..a3b4ecb1b 100644
--- a/app/Config/OSPOS.php
+++ b/app/Config/OSPOS.php
@@ -5,6 +5,7 @@ namespace Config;
 use App\Models\Appconfig;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Config\BaseConfig;
+use Config\Database;
 
 /**
  * This class holds the configuration options stored from the database so that on launch those settings can be cached
@@ -13,7 +14,7 @@ use CodeIgniter\Config\BaseConfig;
  */
 class OSPOS extends BaseConfig
 {
-    public array $settings;
+    public array $settings = [];
     public string $commit_sha1 = 'dev';    // TODO: Travis scripts need to be updated to replace this with the commit hash on build
     private CacheInterface $cache;
 
@@ -33,15 +34,38 @@ class OSPOS extends BaseConfig
 
         if ($cache) {
             $this->settings = decode_array($cache);
-        } else {
+            return;
+        }
+
+        try {
+            $db = Database::connect();
+            $db->resetDataCache();
+
+            if (!$db->tableExists('app_config')) {
+                $this->settings = $this->getDefaultSettings();
+                return;
+            }
+
             $appconfig = model(Appconfig::class);
             foreach ($appconfig->get_all()->getResult() as $app_config) {
                 $this->settings[$app_config->key] = $app_config->value;
             }
             $this->cache->save('settings', encode_array($this->settings));
+        } catch (\Exception $e) {
+            $this->settings = $this->getDefaultSettings();
         }
     }
 
+    private function getDefaultSettings(): array
+    {
+        return [
+            'language'      => 'english',
+            'language_code' => 'en',
+            'company'       => 'Home',
+            'barcode_type'  => 'Code39'
+        ];
+    }
+
     /**
      * @return void
      */
diff --git a/app/Config/Optimize.php b/app/Config/Optimize.php
index 6fb441fd2..8b93eb1c9 100644
--- a/app/Config/Optimize.php
+++ b/app/Config/Optimize.php
@@ -8,7 +8,7 @@ namespace Config;
  * NOTE: This class does not extend BaseConfig for performance reasons.
  *       So you cannot replace the property values with Environment Variables.
  *
- * @immutable
+ * WARNING: Do not use these options when running the app in the Worker Mode.
  */
 class Optimize
 {
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
index 58217f21c..ee2d7ff3b 100644
--- a/app/Config/Paths.php
+++ b/app/Config/Paths.php
@@ -15,8 +15,6 @@ namespace Config;
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Paths
 {
@@ -77,4 +75,16 @@ class Paths
      * is used when no value is provided to `Services::renderer()`.
      */
     public string $viewDirectory = __DIR__ . '/../Views';
+
+    /**
+     * ---------------------------------------------------------------
+     * ENVIRONMENT DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of the directory where
+     * the .env file is located.
+     * Please consider security implications when changing this
+     * value - the directory should not be publicly accessible.
+     */
+    public string $envDirectory = __DIR__ . '/../../';
 }
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index b4fbf3221..a082e6233 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -2,14 +2,13 @@
 
 use CodeIgniter\Router\RouteCollection;
 
-/**
- * @var RouteCollection $routes
- */
+/** @var RouteCollection $routes */
 $routes->setDefaultController('Login');
 
 $routes->get('/', 'Login::index');
 $routes->get('login', 'Login::index');
 $routes->post('login', 'Login::index');
+$routes->post('migrate', 'Login::migrate');
 
 $routes->add('no_access/index/(:segment)', 'No_access::index/$1');
 $routes->add('no_access/index/(:segment)/(:segment)', 'No_access::index/$1/$2');
diff --git a/app/Config/Routing.php b/app/Config/Routing.php
index a7c1eeed7..e35bbbde8 100644
--- a/app/Config/Routing.php
+++ b/app/Config/Routing.php
@@ -96,6 +96,15 @@ class Routing extends BaseRouting
      */
     public bool $autoRoute = true;
 
+    /**
+     * If TRUE, the system will look for attributes on controller
+     * class and methods that can run before and after the
+     * controller/method.
+     *
+     * If FALSE, will ignore any attributes.
+     */
+    public bool $useControllerAttributes = true;
+
     /**
      * For Defined Routes.
      * If TRUE, will enable the use of the 'prioritize' option
diff --git a/app/Config/Security.php b/app/Config/Security.php
index 8d2804952..51aceeb74 100644
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -13,9 +13,9 @@ class Security extends BaseConfig
      *
      * Protection Method for Cross Site Request Forgery protection.
      *
-     * @var string|false 'cookie', 'session', or false
+     * @var string 'cookie' or 'session'
      */
-    public string|false $csrfProtection = 'session';
+    public string $csrfProtection = 'session';
 
     /**
      * --------------------------------------------------------------------------
diff --git a/app/Config/SecurityEnv.php b/app/Config/SecurityEnv.php
new file mode 100644
index 000000000..89c974e4b
--- /dev/null
+++ b/app/Config/SecurityEnv.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Resolves the on-disk locations the security_helper functions read/write for
+ * the runtime-generated .env secrets (encryption.key + throttle.key).
+ *
+ * Centralising these paths in a config object (mirroring Config\Encryption)
+ * lets the helper and the test suite agree on the same source of truth, and
+ * lets tests redirect all three to a per-run sandbox by mutating the shared
+ * instance — without changing any helper signature.
+ *
+ * The defaults are the production locations; tests override them in setUp().
+ */
+class SecurityEnv extends BaseConfig
+{
+    /**
+     * Path to the .env file that holds the two runtime-generated secrets.
+     */
+    public string $envPath = ROOTPATH . '.env';
+
+    /**
+     * Backup location used around encryption-key rotation so a failing
+     * conversion can be rolled back from the previous .env contents.
+     */
+    public string $backupPath = WRITEPATH . '/backup/.env.bak';
+
+    /**
+     * Dedicated mutex file for coordinating concurrent .env writes. Kept
+     * separate from .env itself because on Windows a file cannot be
+     * renamed/deleted while a handle to it is open.
+     */
+    public string $lockPath = ROOTPATH . '.env.lock';
+}
diff --git a/app/Config/Services.php b/app/Config/Services.php
index 942714fab..fb4d7bc89 100644
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -2,6 +2,7 @@
 
 namespace Config;
 
+use App\Libraries\MY_Language;
 use Locale;
 use HTMLPurifier;
 use HTMLPurifier_Config;
@@ -38,9 +39,11 @@ class Services extends BaseService
     /**
      * Responsible for loading the language string translations.
      *
+     * @param string|null $locale
+     * @param bool $getShared
      * @return MY_Language
      */
-    public static function language(?string $locale = null, bool $getShared = true)
+    public static function language(?string $locale = null, bool $getShared = true): MY_Language
     {
         if ($getShared) {
             return static::getSharedInstance('language', $locale)->setLocale($locale);
@@ -55,12 +58,12 @@ class Services extends BaseService
         // Use '?:' for empty string check
         $locale = $locale ?: $requestLocale;
 
-        return new \App\Libraries\MY_Language($locale);
+        return new MY_Language($locale);
     }
 
-    private static $htmlPurifier;
+    private static HTMLPurifier $htmlPurifier;
 
-    public static function htmlPurifier($getShared = true)
+    public static function htmlPurifier($getShared = true): object
     {
         if ($getShared) {
             return static::getSharedInstance('htmlPurifier');
diff --git a/app/Config/Session.php b/app/Config/Session.php
index 662422a20..700fe255f 100644
--- a/app/Config/Session.php
+++ b/app/Config/Session.php
@@ -5,6 +5,7 @@ namespace Config;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Session\Handlers\BaseHandler;
 use CodeIgniter\Session\Handlers\DatabaseHandler;
+use CodeIgniter\Session\Handlers\FileHandler;
 
 class Session extends BaseConfig
 {
@@ -14,6 +15,7 @@ class Session extends BaseConfig
      * --------------------------------------------------------------------------
      *
      * The session storage driver to use:
+     * - `CodeIgniter\Session\Handlers\ArrayHandler` (for testing)
      * - `CodeIgniter\Session\Handlers\FileHandler`
      * - `CodeIgniter\Session\Handlers\DatabaseHandler`
      * - `CodeIgniter\Session\Handlers\MemcachedHandler`
@@ -124,4 +126,27 @@ class Session extends BaseConfig
      * seconds.
      */
     public int $lockMaxRetries = 300;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        if ($this->driver === DatabaseHandler::class) {
+            try {
+                $db = Database::connect();
+
+                if (!$db->tableExists($this->savePath)) {
+                    $this->driver = FileHandler::class;
+                    $this->savePath = WRITEPATH . 'session';
+                }
+            } catch (\Exception $e) {
+                // Database not available yet (e.g. fresh install before migrations).
+                // Fall back to file-based sessions so the login/migration page
+                // can still be served. Catches mysqli_sql_exception which is
+                // not a subclass of DatabaseException but is a RuntimeException.
+                $this->driver = FileHandler::class;
+                $this->savePath = WRITEPATH . 'session';
+            }
+        }
+    }
 }
diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php
index 5a3e5045d..968653e9a 100644
--- a/app/Config/Toolbar.php
+++ b/app/Config/Toolbar.php
@@ -119,4 +119,29 @@ class Toolbar extends BaseConfig
     public array $watchedExtensions = [
         'php', 'css', 'js', 'html', 'svg', 'json', 'env',
     ];
+
+    /**
+     * --------------------------------------------------------------------------
+     * Ignored HTTP Headers
+     * --------------------------------------------------------------------------
+     *
+     * CodeIgniter Debug Toolbar normally injects HTML and JavaScript into every
+     * HTML response. This is correct for full page loads, but it breaks requests
+     * that expect only a clean HTML fragment.
+     *
+     * Libraries like HTMX, Unpoly, and Hotwire (Turbo) update parts of the page or
+     * manage navigation on the client side. Injecting the Debug Toolbar into their
+     * responses can cause invalid HTML, duplicated scripts, or JavaScript errors
+     * (such as infinite loops or "Maximum call stack size exceeded").
+     *
+     * Any request containing one of the following headers is treated as a
+     * client-managed or partial request, and the Debug Toolbar injection is skipped.
+     *
+     * @var array<string, string|null>
+     */
+    public array $disableOnHeaders = [
+        'X-Requested-With' => 'xmlhttprequest', // AJAX requests
+        'HX-Request'       => 'true',           // HTMX requests
+        'X-Up-Version'     => null,             // Unpoly partial requests
+    ];
 }
diff --git a/app/Config/UserAgents.php b/app/Config/UserAgents.php
index fda73748d..8ddfa05e3 100644
--- a/app/Config/UserAgents.php
+++ b/app/Config/UserAgents.php
@@ -230,9 +230,13 @@ class UserAgents extends BaseConfig
      */
     public array $robots = [
         'googlebot'            => 'Googlebot',
+        'google-pagerenderer'  => 'Google Page Renderer',
+        'google-read-aloud'    => 'Google Read Aloud',
+        'google-safety'        => 'Google Safety Bot',
         'msnbot'               => 'MSNBot',
         'baiduspider'          => 'Baiduspider',
         'bingbot'              => 'Bing',
+        'bingpreview'          => 'BingPreview',
         'slurp'                => 'Inktomi Slurp',
         'yahoo'                => 'Yahoo',
         'ask jeeves'           => 'Ask Jeeves',
@@ -248,5 +252,11 @@ class UserAgents extends BaseConfig
         'ia_archiver'          => 'Alexa Crawler',
         'MJ12bot'              => 'Majestic-12',
         'Uptimebot'            => 'Uptimebot',
+        'duckduckbot'          => 'DuckDuckBot',
+        'sogou'                => 'Sogou Spider',
+        'exabot'               => 'Exabot',
+        'bot'                  => 'Generic Bot',
+        'crawler'              => 'Generic Crawler',
+        'spider'               => 'Generic Spider',
     ];
 }
diff --git a/app/Config/Validation/OSPOSRules.php b/app/Config/Validation/OSPOSRules.php
index eb965ab53..b87251da3 100644
--- a/app/Config/Validation/OSPOSRules.php
+++ b/app/Config/Validation/OSPOSRules.php
@@ -6,6 +6,8 @@ use App\Models\Employee;
 use CodeIgniter\HTTP\IncomingRequest;
 use Config\OSPOS;
 use Config\Services;
+use DirectoryIterator;
+use IntlChar;
 
 /**
  * @property Employee employee
@@ -39,13 +41,6 @@ class OSPOSRules
             return false;
         }
 
-        $password = $data['password'];
-        if (!$employee->login($username, $password)) {
-            $error = lang('Login.invalid_username_and_password');
-
-            return false;
-        }
-
         $gcaptcha_enabled = array_key_exists('gcaptcha_enable', $this->config) && $this->config['gcaptcha_enable'];
         if ($gcaptcha_enabled) {
             $g_recaptcha_response = $this->request->getPost('g-recaptcha-response');
@@ -57,6 +52,13 @@ class OSPOSRules
             }
         }
 
+        $password = $data['password'];
+        if (!$employee->login($username, $password)) {
+            $error = lang('Login.invalid_username_and_password');
+
+            return false;
+        }
+
         return true;
     }
 
@@ -66,7 +68,7 @@ class OSPOSRules
      * @param $response
      * @return bool true on successful GCaptcha verification or false if GCaptcha failed.
      */
-    private function gcaptcha_check($response): bool
+    protected function gcaptcha_check($response): bool
     {
         if (!empty($response)) {
             $check = [
@@ -135,4 +137,139 @@ class OSPOSRules
     {
         return parse_decimals($candidate) !== false;
     }
+
+    /**
+     * Validates that a locale-aware decimal value is non-negative (>= 0).
+     *
+     * @param string $candidate
+     * @param string|null $error
+     * @return bool
+     * @noinspection PhpUnused
+     */
+    public function nonNegativeDecimal(string $candidate, ?string &$error = null): bool
+    {
+        $value = parse_decimals($candidate);
+
+        return $value !== false && $value >= 0;
+    }
+
+    /**
+     * Validates that the candidate value is greater than or equal to another
+     * field in the same request (proper cross-field comparison).
+     *
+     * CI4's built-in greater_than_equal_to[field] rule does not resolve the
+     * [field] token to that field's value, so this rule performs the real
+     * comparison and sets a human-readable error on failure.
+     *
+     * @param string $candidate The value being validated (e.g. max).
+     * @param string $otherField The field to compare against (e.g. min).
+     * @param array $data The full set of data being validated.
+     * @param string|null $error Error message set on failure.
+     * @return bool
+     * @noinspection PhpUnused
+     */
+    public function gte_field(string $candidate, string $otherField, array $data, ?string &$error = null): bool
+    {
+        $other = $data[$otherField] ?? null;
+
+        if (is_numeric($candidate) && is_numeric($other) && (float) $candidate < (float) $other) {
+            $error = 'The value must be a number greater than or equal to the ' . $otherField . ' field.';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates that the candidate theme name matches an installed bootswatch theme directory.
+     *
+     * @param string $theme
+     * @param string|null $error
+     * @return bool
+     * @noinspection PhpUnused
+     */
+    public function themeExists(string $theme, ?string &$error = null): bool
+    {
+        $dir = new DirectoryIterator('resources/bootswatch');
+
+        foreach ($dir as $fileInfo) {
+            if (
+                $fileInfo->isDir()
+                && !$fileInfo->isDot()
+                && $fileInfo->getFilename() !== 'fonts'
+                && $fileInfo->getFilename() === $theme
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Unicode-aware version of CodeIgniter's built-in `alpha_numeric_punct` rule, which only
+     * matches ASCII (`preg_match('\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', ...)`) and so rejects
+     * legitimate non-English text (e.g. accented or CJK characters). Allows unicode letters,
+     * combining marks (so base+diacritic sequences pass), and digits in place of `A-Z0-9`, and
+     * reuses the exact same punctuation set as the original rule (`~!#$%&*-_+=|:.` plus space),
+     * extended with `'` and `,` to accommodate real-world tax names (e.g. "O'Brien's Tax",
+     * "Impôt, incl."). `<` and `>` are deliberately absent from the punctuation set, same as in
+     * the original rule, so this also serves as a defense-in-depth backstop against HTML
+     * injection (the primary fix is escaping at render time).
+     *
+     * @param string $candidate
+     * @param string|null $error
+     * @return bool
+     * @noinspection PhpUnused
+     */
+    public function unicode_alpha_numeric_punct(string $candidate, ?string &$error = null): bool
+    {
+        $allowedPunctuation = ['~', '!', '#', '$', '%', '&', '*', '-', '_', '+', '=', '|', ':', '.', ' ', "'", ','];
+
+        $allowedCategories = [
+            IntlChar::CHAR_CATEGORY_UPPERCASE_LETTER,
+            IntlChar::CHAR_CATEGORY_LOWERCASE_LETTER,
+            IntlChar::CHAR_CATEGORY_TITLECASE_LETTER,
+            IntlChar::CHAR_CATEGORY_MODIFIER_LETTER,
+            IntlChar::CHAR_CATEGORY_OTHER_LETTER,
+            IntlChar::CHAR_CATEGORY_NON_SPACING_MARK,
+            IntlChar::CHAR_CATEGORY_COMBINING_SPACING_MARK,
+            IntlChar::CHAR_CATEGORY_ENCLOSING_MARK,
+            IntlChar::CHAR_CATEGORY_DECIMAL_DIGIT_NUMBER,
+            IntlChar::CHAR_CATEGORY_LETTER_NUMBER,
+            IntlChar::CHAR_CATEGORY_OTHER_NUMBER,
+        ];
+
+        foreach (mb_str_split($candidate) as $character) {
+            if (in_array($character, $allowedPunctuation, true)) {
+                continue;
+            }
+
+            if (!in_array(IntlChar::charType($character), $allowedCategories, true)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates a plain filesystem path, allowing space/colon/backslash for Windows paths and
+     * trailing sendmail-style args. Excludes shell metacharacters since this value is concatenated
+     * unescaped into a popen() call. Uses \A...\z, not ^...$, since $ also matches before a
+     * trailing newline.
+     *
+     * @param string $candidate
+     * @param string|null $error
+     * @return bool
+     * @noinspection PhpUnused
+     */
+    public function valid_path_strict(string $candidate, ?string &$error = null): bool
+    {
+        if ($candidate === '') {
+            return false;
+        }
+
+        return (bool) preg_match('/\A[a-zA-Z0-9_\-\/.: \\\\]+\z/', $candidate);
+    }
 }
diff --git a/app/Config/View.php b/app/Config/View.php
index cf8dd06f1..b52d980dc 100644
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -5,10 +5,6 @@ namespace Config;
 use CodeIgniter\Config\View as BaseView;
 use CodeIgniter\View\ViewDecoratorInterface;
 
-/**
- * @phpstan-type parser_callable (callable(mixed): mixed)
- * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
- */
 class View extends BaseView
 {
     /**
@@ -34,8 +30,7 @@ class View extends BaseView
      *  { title|esc(js) }
      *  { created_on|date(Y-m-d)|esc(attr) }
      *
-     * @var         array<string, string>
-     * @phpstan-var array<string, parser_callable_string>
+     * @var array<string, (callable(mixed): mixed)&string>
      */
     public $filters = [];
 
@@ -44,8 +39,7 @@ class View extends BaseView
      * by the core Parser by creating aliases that will be replaced with
      * any callable. Can be single or tag pair.
      *
-     * @var         array<string, callable|list<string>|string>
-     * @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
+     * @var array<string, (callable(mixed...): mixed)|((callable(mixed...): mixed)&string)|list<(callable(mixed...): mixed)&string>>
      */
     public $plugins = [];
 
@@ -59,4 +53,21 @@ class View extends BaseView
      * @var list<class-string<ViewDecoratorInterface>>
      */
     public array $decorators = [];
+
+    /**
+     * Subdirectory within app/Views for namespaced view overrides.
+     *
+     * Namespaced views will be searched in:
+     *
+     *   app/Views/{$appOverridesFolder}/{Namespace}/{view_path}.{php|html...}
+     *
+     * This allows application-level overrides for package or module views
+     * without modifying vendor source files.
+     *
+     * Examples:
+     *   'overrides' -> app/Views/overrides/Example/Blog/post/card.php
+     *   'vendor'    -> app/Views/vendor/Example/Blog/post/card.php
+     *   ''          -> app/Views/Example/Blog/post/card.php (direct mapping)
+     */
+    public string $appOverridesFolder = 'overrides';
 }
diff --git a/app/Config/WorkerMode.php b/app/Config/WorkerMode.php
new file mode 100644
index 000000000..fd8b49434
--- /dev/null
+++ b/app/Config/WorkerMode.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Config;
+
+/**
+ * This configuration controls how CodeIgniter behaves when running
+ * in worker mode (with FrankenPHP).
+ */
+class WorkerMode
+{
+    /**
+     * Persistent Services
+     *
+     * List of service names that should persist across requests.
+     * These services will NOT be reset between requests.
+     *
+     * Services not in this list will be reset for each request to prevent
+     * state leakage.
+     *
+     * Recommended persistent services:
+     * - `autoloader`: PSR-4 autoloading configuration
+     * - `locator`: File locator
+     * - `exceptions`: Exception handler
+     * - `commands`: CLI commands registry
+     * - `codeigniter`: Main application instance
+     * - `superglobals`: Superglobals wrapper
+     * - `routes`: Router configuration
+     * - `cache`: Cache instance
+     *
+     * @var list<string>
+     */
+    public array $persistentServices = [
+        'autoloader',
+        'locator',
+        'exceptions',
+        'commands',
+        'codeigniter',
+        'superglobals',
+        'routes',
+        'cache',
+    ];
+
+    /**
+     * Reset Event Listeners
+     *
+     * List of event names whose listeners should be removed between requests.
+     * Use this if you register event listeners inside other event callbacks
+     * (rather than at the top level of Config/Events.php), which would cause
+     * them to accumulate across requests in worker mode.
+     *
+     * @var list<string>
+     */
+    public array $resetEventListeners = [];
+
+    /**
+     * Force Garbage Collection
+     *
+     * Whether to force garbage collection after each request.
+     * Helps prevent memory leaks at a small performance cost.
+     */
+    public bool $forceGarbageCollection = true;
+}
diff --git a/app/Controllers/Attributes.php b/app/Controllers/Attributes.php
index 199632825..0b59836ae 100644
--- a/app/Controllers/Attributes.php
+++ b/app/Controllers/Attributes.php
@@ -5,6 +5,7 @@ namespace App\Controllers;
 use App\Models\Attribute;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
+use JsonException;
 
 require_once('Secure_Controller.php');
 
@@ -64,8 +65,14 @@ class Attributes extends Secure_Controller
      */
     public function postSaveAttributeValue(): ResponseInterface
     {
+        $attributeValue = $this->request->getPost('attribute_value');
+
+        if (!is_string($attributeValue) || $attributeValue === '') {
+            return $this->response->setJSON(['success' => false]);
+        }
+
         $success = $this->attribute->saveAttributeValue(
-            html_entity_decode($this->request->getPost('attribute_value')),
+            $attributeValue,
             $this->request->getPost('definition_id', FILTER_SANITIZE_NUMBER_INT),
             $this->request->getPost('item_id', FILTER_SANITIZE_NUMBER_INT) ?? false,
             $this->request->getPost('attribute_id', FILTER_SANITIZE_NUMBER_INT) ?? false
@@ -81,8 +88,14 @@ class Attributes extends Secure_Controller
      */
     public function postDeleteDropdownAttributeValue(): ResponseInterface
     {
+        $attributeValue = $this->request->getPost('attribute_value');
+
+        if (!is_string($attributeValue) || $attributeValue === '') {
+            return $this->response->setJSON(['success' => false]);
+        }
+
         $success = $this->attribute->deleteDropdownAttributeValue(
-            html_entity_decode($this->request->getPost('attribute_value')),
+            $attributeValue,
             $this->request->getPost('definition_id', FILTER_SANITIZE_NUMBER_INT)
         );
 
@@ -106,12 +119,24 @@ class Attributes extends Secure_Controller
             $definition_flags |= $flag;
         }
 
+        // Validate definition_group (definition_fk) foreign key
+        $definition_group_input = $this->request->getPost('definition_group');
+        $definition_fk = $this->validateDefinitionGroup($definition_group_input);
+
+        if ($definition_fk === false) {
+            return $this->response->setJSON([
+                'success' => false,
+                'message' => lang('Attributes.definition_invalid_group'),
+                'id'      => NEW_ENTRY
+            ]);
+        }
+
         // Save definition data
         $definition_data = [
             'definition_name'  => $this->request->getPost('definition_name'),
             'definition_unit'  => $this->request->getPost('definition_unit') != '' ? $this->request->getPost('definition_unit') : null,
             'definition_flags' => $definition_flags,
-            'definition_fk'    => $this->request->getPost('definition_group') != '' ? $this->request->getPost('definition_group') : null
+            'definition_fk'    => $definition_fk
         ];
 
         if ($this->request->getPost('definition_type') != null) {
@@ -120,11 +145,25 @@ class Attributes extends Secure_Controller
 
         $definition_name = $definition_data['definition_name'];
 
-        if ($this->attribute->save_definition($definition_data, $definition_id)) {
+        if ($definition_id == NO_DEFINITION_ID) {
+            try {
+                $definition_values = json_decode($this->request->getPost('definition_values') ?? '', false, 512, JSON_THROW_ON_ERROR);
+            } catch (JsonException) {
+                $definition_values = null;
+            }
+
+            if (!is_array($definition_values) || array_filter($definition_values, static fn ($value) => !is_string($value)) !== []) {
+                return $this->response->setJSON([
+                    'success' => false,
+                    'message' => lang('Attributes.definition_error_adding_updating', [$definition_name]),
+                    'id'      => NEW_ENTRY
+                ]);
+            }
+        }
+
+        if ($this->attribute->saveDefinition($definition_data, $definition_id)) {
             // New definition
             if ($definition_id == NO_DEFINITION_ID) {
-                $definition_values = json_decode(html_entity_decode($this->request->getPost('definition_values')));
-
                 foreach ($definition_values as $definition_value) {
                     $this->attribute->saveAttributeValue($definition_value, $definition_data['definition_id']);
                 }
@@ -150,6 +189,32 @@ class Attributes extends Secure_Controller
         }
     }
 
+    /**
+     * Validates a definition_group foreign key.
+     * Returns the validated integer ID, null if empty, or false if invalid.
+     *
+     * @param mixed $definition_group_input
+     * @return int|null|false
+     */
+    private function validateDefinitionGroup(mixed $definition_group_input): int|null|false
+    {
+        if ($definition_group_input === '' || $definition_group_input === null) {
+            return null;
+        }
+
+        $definition_group_id = (int) $definition_group_input;
+
+        // Must be a positive integer, exist in attribute_definitions, and be of type GROUP
+        if ($definition_group_id <= 0
+            || !$this->attribute->exists($definition_group_id)
+            || $this->attribute->getAttributeInfo($definition_group_id)->definition_type !== GROUP
+        ) {
+            return false;
+        }
+
+        return $definition_group_id;
+    }
+
     /**
      *
      * @param int $definition_id
@@ -183,7 +248,7 @@ class Attributes extends Secure_Controller
     private function get_attributes(int $definition_flags = 0): array
     {
         $definition_flag_names = [];
-        foreach (Attribute::get_definition_flags() as $id => $term) {
+        foreach (Attribute::getDefinitionFlags() as $id => $term) {
             if ($id & $definition_flags) {
                 $definition_flag_names[$id] = lang('Attributes.' . strtolower($term) . '_visibility');
             }
@@ -192,26 +257,26 @@ class Attributes extends Secure_Controller
     }
 
     /**
-     * @param int $definition_id
+     * @param int $definitionId
      * @return string
      */
-    public function getView(int $definition_id = NO_DEFINITION_ID): string
+    public function getView(int $definitionId = NO_DEFINITION_ID): string
     {
-        $info = $this->attribute->getAttributeInfo($definition_id);
+        $info = $this->attribute->getAttributeInfo($definitionId);
         foreach (get_object_vars($info) as $property => $value) {
             $info->$property = $value;
         }
 
-        $data['definition_id'] = $definition_id;
-        $data['definition_values'] = $this->attribute->get_definition_values($definition_id);
-        $data['definition_group'] = $this->attribute->get_definitions_by_type(GROUP, $definition_id);
+        $data['definition_id'] = $definitionId;
+        $data['definition_values'] = $this->attribute->getDefinitionValues($definitionId);
+        $data['definition_group'] = $this->attribute->getDefinitionsByType(GROUP, $definitionId);
         $data['definition_group'][''] = lang('Common.none_selected_text');
         $data['definition_info'] = $info;
 
-        $show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
-        $data['definition_flags'] = $this->get_attributes($show_all);
-        $selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
-        $data['selected_definition_flags'] = $this->get_attributes($selected_flags);
+        $showAll = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES | Attribute::SHOW_IN_SEARCH;
+        $data['definition_flags'] = $this->get_attributes($showAll);
+        $selectedFlags = $info->definition_flags === '' ? $showAll : $info->definition_flags;
+        $data['selected_definition_flags'] = $this->get_attributes($selectedFlags);
 
         return view('attributes/form', $data);
     }
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 689405bdf..ab45a7710 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -3,44 +3,28 @@
 namespace App\Controllers;
 
 use CodeIgniter\Controller;
-use CodeIgniter\HTTP\CLIRequest;
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 /**
- * Class BaseController
- *
  * BaseController provides a convenient place for loading components
  * and performing functions that are needed by all your controllers.
- * Extend this class in any new controllers:
- *     class Home extends BaseController
  *
- * For security be sure to declare any new methods as protected or private.
+ * Extend this class in any new controllers:
+ * ```
+ *     class Home extends BaseController
+ * ```
+ *
+ * For security, be sure to declare any new methods as protected or private.
  */
 abstract class BaseController extends Controller
 {
-    /**
-     * Instance of the main Request object.
-     *
-     * @var CLIRequest|IncomingRequest
-     */
-    protected $request;
-
-    /**
-     * An array of helpers to be loaded automatically upon
-     * class instantiation. These helpers will be available
-     * to all other controllers that extend BaseController.
-     *
-     * @var list<string>
-     */
-    protected $helpers = [];
-
     /**
      * Be sure to declare properties for any property fetch you initialized.
      * The creation of dynamic property is deprecated in PHP 8.2.
      */
+
     // protected $session;
 
     /**
@@ -48,11 +32,14 @@ abstract class BaseController extends Controller
      */
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
-        // Do Not Edit This Line
+        // Load here all helpers you want to be available in your controllers that extend BaseController.
+        // Caution: Do not put the this below the parent::initController() call below.
+        // $this->helpers = ['form', 'url'];
+
+        // Caution: Do not edit this line.
         parent::initController($request, $response, $logger);
 
         // Preload any models, libraries, etc, here.
-
-        // E.g.: $this->session = service('session');
+        // $this->session = service('session');
     }
 }
diff --git a/app/Controllers/Cashups.php b/app/Controllers/Cashups.php
index 6cb06151a..5ecc9c441 100644
--- a/app/Controllers/Cashups.php
+++ b/app/Controllers/Cashups.php
@@ -36,6 +36,9 @@ class Cashups extends Secure_Controller
         // filters that will be loaded in the multiselect dropdown
         $data['filters'] = ['is_deleted' => lang('Cashups.is_deleted')];
 
+        // Restore filters from URL
+        $data = array_merge($data, restoreTableFilters($this->request));
+
         return view('cashups/manage', $data);
     }
 
@@ -208,20 +211,29 @@ class Cashups extends Secure_Controller
         $close_date = $this->request->getPost('close_date');
         $close_date_formatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $close_date);
 
+        $open_amount_cash     = parse_decimals($this->request->getPost('open_amount_cash'));
+        $transfer_amount_cash = parse_decimals($this->request->getPost('transfer_amount_cash'));
+        $closed_amount_cash   = parse_decimals($this->request->getPost('closed_amount_cash'));
+        $closed_amount_due    = parse_decimals($this->request->getPost('closed_amount_due'));
+        $closed_amount_card   = parse_decimals($this->request->getPost('closed_amount_card'));
+        $closed_amount_check  = parse_decimals($this->request->getPost('closed_amount_check'));
+
+        $logged_in_employee = $this->employee->get_logged_in_employee_info();
+
         $cash_up_data = [
             'open_date'            => $open_date_formatter->format('Y-m-d H:i:s'),
             'close_date'           => $close_date_formatter->format('Y-m-d H:i:s'),
-            'open_amount_cash'     => parse_decimals($this->request->getPost('open_amount_cash')),
-            'transfer_amount_cash' => parse_decimals($this->request->getPost('transfer_amount_cash')),
-            'closed_amount_cash'   => parse_decimals($this->request->getPost('closed_amount_cash')),
-            'closed_amount_due'    => parse_decimals($this->request->getPost('closed_amount_due')),
-            'closed_amount_card'   => parse_decimals($this->request->getPost('closed_amount_card')),
-            'closed_amount_check'  => parse_decimals($this->request->getPost('closed_amount_check')),
-            'closed_amount_total'  => parse_decimals($this->request->getPost('closed_amount_total')),
+            'open_amount_cash'     => $open_amount_cash,
+            'transfer_amount_cash' => $transfer_amount_cash,
+            'closed_amount_cash'   => $closed_amount_cash,
+            'closed_amount_due'    => $closed_amount_due,
+            'closed_amount_card'   => $closed_amount_card,
+            'closed_amount_check'  => $closed_amount_check,
+            'closed_amount_total'  => $this->_calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check),
             'note'                 => $this->request->getPost('note') != null,
             'description'          => $this->request->getPost('description', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
-            'open_employee_id'     => $this->request->getPost('open_employee_id', FILTER_SANITIZE_NUMBER_INT),
-            'close_employee_id'    => $this->request->getPost('close_employee_id', FILTER_SANITIZE_NUMBER_INT),
+            'open_employee_id'     => $logged_in_employee->person_id,
+            'close_employee_id'    => $logged_in_employee->person_id,
             'deleted'              => $this->request->getPost('deleted') != null
         ];
 
diff --git a/app/Controllers/Config.php b/app/Controllers/Config.php
index f1d63ed4c..420c92b98 100644
--- a/app/Controllers/Config.php
+++ b/app/Controllers/Config.php
@@ -11,6 +11,7 @@ use App\Models\Appconfig;
 use App\Models\Attribute;
 use App\Models\Customer_rewards;
 use App\Models\Dinner_table;
+use App\Models\Item;
 use App\Models\Module;
 use App\Models\Enums\Rounding_mode;
 use App\Models\Stock_location;
@@ -63,7 +64,7 @@ class Config extends Secure_Controller
         $this->db = Database::connect();
 
         helper('security');
-        if (check_encryption()) {
+        if (checkEncryption()) {
             $this->encrypter = Services::encrypter();
         } else {
             log_message('alert', 'Error preparing encryption key');
@@ -81,7 +82,7 @@ class Config extends Secure_Controller
         $npmDev = false;
         $license = [];
 
-        $license[$i]['title'] = 'Open Source Point Of Sale ' . config('App')->application_version;
+        $license[$i]['title'] = 'Open Source Point of Sale ' . config('App')->application_version;
 
         if (file_exists('license/LICENSE')) {
             $license[$i]['text'] = file_get_contents('license/LICENSE', false, null, 0, 3000);
@@ -157,14 +158,20 @@ class Config extends Secure_Controller
             $file = file_get_contents('license/npm-prod.LICENSES');
             $array = json_decode($file, true);
 
-            foreach ($array as $dependency) {
-                $license[$i]['text'] .= "library: {$dependency['name']}\n";
-                $license[$i]['text'] .= "authors: {$dependency['author']}\n";
-                $license[$i]['text'] .= "website: {$dependency['homepage']}\n";
-                $license[$i]['text'] .= "version: {$dependency['installedVersion']}\n";
-                $license[$i]['text'] .= "license: {$dependency['licenseType']}\n";
+            if (is_array($array)) {
+                foreach ($array as $dependency) {
+                    if (!is_array($dependency) || count(array_intersect(['name', 'author', 'homepage', 'installedVersion', 'licenseType'], array_keys($dependency))) !== 5) {
+                        continue;
+                    }
 
-                $license[$i]['text'] .= "\n";
+                    $license[$i]['text'] .= "library: {$dependency['name']}\n";
+                    $license[$i]['text'] .= "authors: {$dependency['author']}\n";
+                    $license[$i]['text'] .= "website: {$dependency['homepage']}\n";
+                    $license[$i]['text'] .= "version: {$dependency['installedVersion']}\n";
+                    $license[$i]['text'] .= "license: {$dependency['licenseType']}\n";
+
+                    $license[$i]['text'] .= "\n";
+                }
             }
             $license[$i]['text'] = rtrim($license[$i]['text'], "\n");
         }
@@ -177,14 +184,20 @@ class Config extends Secure_Controller
             $file = file_get_contents('license/npm-dev.LICENSES');
             $array = json_decode($file, true);
 
-            foreach ($array as $dependency) {
-                $license[$i]['text'] .= "library: {$dependency['name']}\n";
-                $license[$i]['text'] .= "authors: {$dependency['author']}\n";
-                $license[$i]['text'] .= "website: {$dependency['homepage']}\n";
-                $license[$i]['text'] .= "version: {$dependency['installedVersion']}\n";
-                $license[$i]['text'] .= "license: {$dependency['licenseType']}\n";
+            if (is_array($array)) {
+                foreach ($array as $dependency) {
+                    if (!is_array($dependency) || count(array_intersect(['name', 'author', 'homepage', 'installedVersion', 'licenseType'], array_keys($dependency))) !== 5) {
+                        continue;
+                    }
 
-                $license[$i]['text'] .= "\n";
+                    $license[$i]['text'] .= "library: {$dependency['name']}\n";
+                    $license[$i]['text'] .= "authors: {$dependency['author']}\n";
+                    $license[$i]['text'] .= "website: {$dependency['homepage']}\n";
+                    $license[$i]['text'] .= "version: {$dependency['installedVersion']}\n";
+                    $license[$i]['text'] .= "license: {$dependency['licenseType']}\n";
+
+                    $license[$i]['text'] .= "\n";
+                }
             }
             $license[$i]['text'] = rtrim($license[$i]['text'], "\n");
         }
@@ -220,6 +233,7 @@ class Config extends Secure_Controller
      */
     public function getIndex(): string
     {
+        $data['config'] = $this->config;
         $data['stock_locations'] = $this->stock_location->get_all()->getResultArray();
         $data['dinner_tables'] = $this->dinner_table->get_all()->getResultArray();
         $data['customer_rewards'] = $this->customer_rewards->get_all()->getResultArray();
@@ -230,6 +244,8 @@ class Config extends Secure_Controller
         $data['line_sequence_options'] = $this->sale_lib->get_line_sequence_options();
         $data['register_mode_options'] = $this->sale_lib->get_register_mode_options();
         $data['invoice_type_options'] = $this->sale_lib->get_invoice_type_options();
+        $data['keyboardShortcutOptions'] = $this->sale_lib->getKeyShortcutsOptions();
+        $data['keyboardShortcuts'] = $this->sale_lib->getKeyShortcuts();
         $data['rounding_options'] = rounding_mode::get_rounding_options();
         $data['tax_code_options'] = $this->tax_lib->get_tax_code_options();
         $data['tax_category_options'] = $this->tax_lib->get_tax_category_options();
@@ -250,27 +266,29 @@ class Config extends Secure_Controller
         $data['selected_image_allowed_types'] = explode(',', $this->config['image_allowed_types']);
 
         // Integrations Related fields
-        $data['mailchimp']    = [];
+        $data['mailchimp']     = [];
+        $data['smtp_pass_set'] = !empty($this->config['smtp_pass']);
+        $data['msg_pwd_set']   = !empty($this->config['msg_pwd']);
 
-        if (check_encryption()) {    // TODO: Hungarian notation
+        if (checkEncryption()) {    // TODO: Hungarian notation
             if (!isset($this->encrypter)) {
                 helper('security');
                 $this->encrypter = Services::encrypter();
             }
 
-            $data['mailchimp']['api_key'] = (isset($this->config['mailchimp_api_key']) && !empty($this->config['mailchimp_api_key']))
-                ? $this->encrypter->decrypt($this->config['mailchimp_api_key'])
-                : '';
+            $data['mailchimp']['api_key']     = '';
+            $data['mailchimp']['api_key_set'] = !empty($this->config['mailchimp_api_key']);
 
             $data['mailchimp']['list_id'] = (isset($this->config['mailchimp_list_id']) && !empty($this->config['mailchimp_list_id']))
                 ? $this->encrypter->decrypt($this->config['mailchimp_list_id'])
                 : '';
 
             // Remove any backup of .env created by check_encryption()
-            remove_backup();
+            removeBackup();
         } else {
-            $data['mailchimp']['api_key'] = '';
-            $data['mailchimp']['list_id'] = '';
+            $data['mailchimp']['api_key']     = '';
+            $data['mailchimp']['api_key_set'] = false;
+            $data['mailchimp']['list_id']     = '';
         }
 
         $data['mailchimp']['lists'] = $this->_mailchimp();
@@ -345,10 +363,11 @@ class Config extends Secure_Controller
 
         $filename = $file->getClientName();
         $info = pathinfo($filename);
+        helper('security');
 
         $file_info = [
             'orig_name' => $filename,
-            'raw_name'  => $info['filename'],
+            'raw_name'  => sanitize_filename($info['filename']),
             'file_ext'  => $file->guessExtension()
         ];
 
@@ -366,7 +385,15 @@ class Config extends Secure_Controller
      */
     public function postSaveGeneral(): ResponseInterface
     {
-        $batch_save_data = [
+        $rules = [
+            'theme' => 'permit_empty|themeExists',
+        ];
+        if (!$this->validate($rules)) {
+            $errors = $this->validator->getErrors();
+            return $this->response->setJSON(['success' => false, 'message' => reset($errors)]);
+        }
+
+        $batchSaveData = [
             'theme'                             => $this->request->getPost('theme'),
             'login_form'                        => $this->request->getPost('login_form'),
             'default_sales_discount_type'       => $this->request->getPost('default_sales_discount_type') != null,
@@ -385,9 +412,9 @@ class Config extends Secure_Controller
             'gcaptcha_enable'                   => $this->request->getPost('gcaptcha_enable') != null,
             'gcaptcha_secret_key'               => $this->request->getPost('gcaptcha_secret_key'),
             'gcaptcha_site_key'                 => $this->request->getPost('gcaptcha_site_key'),
-            'suggestions_first_column'          => $this->request->getPost('suggestions_first_column'),
-            'suggestions_second_column'         => $this->request->getPost('suggestions_second_column'),
-            'suggestions_third_column'          => $this->request->getPost('suggestions_third_column'),
+            'suggestions_first_column'          => $this->validateSuggestionsColumn($this->request->getPost('suggestions_first_column'), 'first'),
+            'suggestions_second_column'         => $this->validateSuggestionsColumn($this->request->getPost('suggestions_second_column'), 'other'),
+            'suggestions_third_column'          => $this->validateSuggestionsColumn($this->request->getPost('suggestions_third_column'), 'other'),
             'giftcard_number'                   => $this->request->getPost('giftcard_number'),
             'derive_sale_quantity'              => $this->request->getPost('derive_sale_quantity') != null,
             'multi_pack_enabled'                => $this->request->getPost('multi_pack_enabled') != null,
@@ -397,19 +424,26 @@ class Config extends Secure_Controller
 
         $this->module->set_show_office_group($this->request->getPost('show_office_group') != null);
 
-        if ($batch_save_data['category_dropdown'] == 1) {
-            $definition_data['definition_name'] = 'ospos_category';
-            $definition_data['definition_flags'] = 0;
-            $definition_data['definition_type'] = 'DROPDOWN';
-            $definition_data['definition_id'] = CATEGORY_DEFINITION_ID;
-            $definition_data['deleted'] = 0;
+        $this->db->transStart();
 
-            $this->attribute->save_definition($definition_data, CATEGORY_DEFINITION_ID);
-        } elseif ($batch_save_data['category_dropdown'] == NO_DEFINITION_ID) {
-            $this->attribute->deleteDefinition(CATEGORY_DEFINITION_ID);
+        $attributeSuccess = true;
+        if ($batchSaveData['category_dropdown']) {
+            $definitionData['definition_name'] = 'ospos_category';
+            $definitionData['definition_flags'] = 0;
+            $definitionData['definition_type'] = 'DROPDOWN';
+            $definitionData['definition_id'] = CATEGORY_DEFINITION_ID;
+            $definitionData['deleted'] = 0;
+
+            $attributeSuccess = $this->attribute->saveDefinition($definitionData, CATEGORY_DEFINITION_ID);
+        } elseif ($batchSaveData['category_dropdown'] == NO_DEFINITION_ID) {
+            $attributeSuccess = $this->attribute->deleteDefinition(CATEGORY_DEFINITION_ID);
         }
 
-        $success = $this->appconfig->batch_save($batch_save_data);
+        $success = $attributeSuccess && $this->appconfig->batch_save($batchSaveData);
+
+        $this->db->transComplete();
+
+        $success = $success && $this->db->transStatus();
 
         return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
     }
@@ -422,32 +456,35 @@ class Config extends Secure_Controller
      */
     public function postCheckNumberLocale(): ResponseInterface
     {
-        $number_locale = $this->request->getPost('number_locale');
-        $save_number_locale = $this->request->getPost('save_number_locale');
+        $numberLocale = $this->request->getPost('number_locale');
+        $saveNumberLocale = $this->request->getPost('save_number_locale');
+        $postedCurrencySymbol = $this->request->getPost('currency_symbol');
+        $postedCurrencyCode = $this->request->getPost('currency_code');
 
-        $fmt = new NumberFormatter($number_locale, NumberFormatter::CURRENCY);
-        if ($number_locale != $save_number_locale) {
-            $currency_symbol = $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL);
-            $currency_code = $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE);
-            $save_number_locale = $number_locale;
-        } else {
-            $currency_symbol = empty($this->request->getPost('currency_symbol')) ? $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL) : $this->request->getPost('currency_symbol');
-            $currency_code = empty($this->request->getPost('currency_code')) ? $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE) : $this->request->getPost('currency_code');
+        $fmt = new NumberFormatter($numberLocale, NumberFormatter::CURRENCY);
+
+        // Use posted values if provided, otherwise fall back to locale defaults
+        $currencySymbol = $postedCurrencySymbol !== '' ? $postedCurrencySymbol : $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL);
+        $currencyCode = $postedCurrencyCode !== '' ? $postedCurrencyCode : $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE);
+
+        // Update saved locale if it changed
+        if ($numberLocale !== $saveNumberLocale) {
+            $saveNumberLocale = $numberLocale;
         }
 
         if ($this->request->getPost('thousands_separator') == 'false') {
             $fmt->setTextAttribute(NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
         }
 
-        $fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $currency_symbol);
-        $number_local_example = $fmt->format(1234567890.12300);
+        $fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $currencySymbol);
+        $numberLocaleExample = $fmt->format(1234567890.12300);
 
         return $this->response->setJSON([
-            'success'               => $number_local_example != false,
-            'save_number_locale'    => $save_number_locale,
-            'number_locale_example' => $number_local_example,
-            'currency_symbol'       => $currency_symbol,
-            'currency_code'         => $currency_code,
+            'success'               => $numberLocaleExample != false,
+            'save_number_locale'    => $saveNumberLocale,
+            'number_locale_example' => $numberLocaleExample,
+            'currency_symbol'       => $currencySymbol,
+            'currency_code'         => $currencyCode,
         ]);
     }
 
@@ -460,27 +497,43 @@ class Config extends Secure_Controller
      */
     public function postSaveLocale(): ResponseInterface
     {
-        $exploded = explode(":", $this->request->getPost('language'));
+        $rules = [
+            'payment_reference_code_min' => 'required|integer|greater_than[0]',
+            'payment_reference_code_max' => 'required|integer|gte_field[payment_reference_code_min]',
+        ];
+        if (!$this->validate($rules)) {
+            $errors = $this->validator->getErrors();
+            return $this->response->setJSON(['success' => false, 'message' => reset($errors)]);
+        }
+
+        $language = $this->request->getPost('language');
+        if (!in_array($language, array_keys(get_languages()), true)) {
+            return $this->response->setJSON(['success' => false, 'message' => 'Invalid language']);
+        }
+
+        $exploded = explode(":", $language);
         $currency_symbol = $this->request->getPost('currency_symbol');
         $batch_save_data = [
-            'currency_symbol'       => htmlspecialchars($currency_symbol ?? ''),
-            'currency_code'         => $this->request->getPost('currency_code'),
-            'language_code'         => $exploded[0],
-            'language'              => $exploded[1],
-            'timezone'              => $this->request->getPost('timezone'),
-            'dateformat'            => $this->request->getPost('dateformat'),
-            'timeformat'            => $this->request->getPost('timeformat'),
-            'thousands_separator'   => $this->request->getPost('thousands_separator') != null,
-            'number_locale'         => $this->request->getPost('number_locale'),
-            'currency_decimals'     => $this->request->getPost('currency_decimals', FILTER_SANITIZE_NUMBER_INT),
-            'tax_decimals'          => $this->request->getPost('tax_decimals', FILTER_SANITIZE_NUMBER_INT),
-            'quantity_decimals'     => $this->request->getPost('quantity_decimals', FILTER_SANITIZE_NUMBER_INT),
-            'country_codes'         => htmlspecialchars($this->request->getPost('country_codes')),
-            'payment_options_order' => $this->request->getPost('payment_options_order'),
-            'date_or_time_format'   => $this->request->getPost('date_or_time_format') != null,
-            'cash_decimals'         => $this->request->getPost('cash_decimals', FILTER_SANITIZE_NUMBER_INT),
-            'cash_rounding_code'    => $this->request->getPost('cash_rounding_code'),
-            'financial_year'        => $this->request->getPost('financial_year', FILTER_SANITIZE_NUMBER_INT)
+            'currency_symbol'            => htmlspecialchars($currency_symbol ?? ''),
+            'currency_code'              => $this->request->getPost('currency_code'),
+            'language_code'              => $exploded[0],
+            'language'                   => $exploded[1],
+            'timezone'                   => $this->request->getPost('timezone'),
+            'dateformat'                 => $this->request->getPost('dateformat'),
+            'timeformat'                 => $this->request->getPost('timeformat'),
+            'thousands_separator'        => $this->request->getPost('thousands_separator') != null,
+            'number_locale'              => $this->request->getPost('number_locale'),
+            'currency_decimals'          => $this->request->getPost('currency_decimals', FILTER_SANITIZE_NUMBER_INT),
+            'tax_decimals'               => $this->request->getPost('tax_decimals', FILTER_SANITIZE_NUMBER_INT),
+            'quantity_decimals'          => $this->request->getPost('quantity_decimals', FILTER_SANITIZE_NUMBER_INT),
+            'country_codes'              => htmlspecialchars($this->request->getPost('country_codes')),
+            'payment_options_order'      => $this->request->getPost('payment_options_order'),
+            'payment_reference_code_min' => $this->request->getPost('payment_reference_code_min', FILTER_SANITIZE_NUMBER_INT),
+            'payment_reference_code_max' => $this->request->getPost('payment_reference_code_max', FILTER_SANITIZE_NUMBER_INT),
+            'date_or_time_format'        => $this->request->getPost('date_or_time_format') != null,
+            'cash_decimals'              => $this->request->getPost('cash_decimals', FILTER_SANITIZE_NUMBER_INT),
+            'cash_rounding_code'         => $this->request->getPost('cash_rounding_code'),
+            'financial_year'             => $this->request->getPost('financial_year', FILTER_SANITIZE_NUMBER_INT)
         ];
 
         $success = $this->appconfig->batch_save($batch_save_data);
@@ -497,15 +550,37 @@ class Config extends Secure_Controller
      */
     public function postSaveEmail(): ResponseInterface
     {
-        $password = '';
+        $postedPass = (string) $this->request->getPost('smtp_pass');
 
-        if (check_encryption() && !empty($this->request->getPost('smtp_pass'))) {
-            $password = $this->encrypter->encrypt($this->request->getPost('smtp_pass'));
+        if (checkEncryption() && $postedPass !== '') {
+            $password = $this->encrypter->encrypt($postedPass);
+        } else {
+            $password = (string) ($this->config['smtp_pass'] ?? '');
+        }
+
+        $protocol = $this->request->getPost('protocol');
+        $mailpath = $this->request->getPost('mailpath');
+
+        $rules = [
+            'mailpath' => [
+                'label' => lang('Config.email_mailpath'),
+                'rules' => ($protocol === 'sendmail' ? 'required' : 'permit_empty') . '|valid_path_strict'
+            ]
+        ];
+        $messages = [
+            'mailpath' => [
+                'required'          => lang('Config.mailpath_invalid'),
+                'valid_path_strict' => lang('Config.mailpath_invalid')
+            ]
+        ];
+
+        if ($error = $this->validateFields($rules, $messages)) {
+            return $error;
         }
 
         $batch_save_data = [
-            'protocol'     => $this->request->getPost('protocol'),
-            'mailpath'     => $this->request->getPost('mailpath'),
+            'protocol'     => $protocol,
+            'mailpath'     => $mailpath,
             'smtp_host'    => $this->request->getPost('smtp_host'),
             'smtp_user'    => $this->request->getPost('smtp_user'),
             'smtp_pass'    => $password,
@@ -528,10 +603,12 @@ class Config extends Secure_Controller
      */
     public function postSaveMessage(): ResponseInterface
     {
-        $password = '';
+        $postedPwd = (string) $this->request->getPost('msg_pwd');
 
-        if (check_encryption() && !empty($this->request->getPost('msg_pwd'))) {
-            $password = $this->encrypter->encrypt($this->request->getPost('msg_pwd'));
+        if (checkEncryption() && $postedPwd !== '') {
+            $password = $this->encrypter->encrypt($postedPwd);
+        } else {
+            $password = (string) ($this->config['msg_pwd'] ?? '');
         }
 
         $batch_save_data = [
@@ -594,19 +671,25 @@ class Config extends Secure_Controller
      */
     public function postSaveMailchimp(): ResponseInterface
     {
-        $api_key = '';
-        $list_id = '';
+        $postedKey  = (string) $this->request->getPost('mailchimp_api_key');
+        $postedList = (string) $this->request->getPost('mailchimp_list_id');
 
-        if (check_encryption()) {
-            $api_key_unencrypted = $this->request->getPost('mailchimp_api_key');
-            if (!empty($api_key_unencrypted)) {
-                $api_key = $this->encrypter->encrypt($api_key_unencrypted);
-            }
+        if (checkEncryption()) {
+            $api_key = $postedKey !== ''
+                ? $this->encrypter->encrypt($postedKey)
+                : (string) ($this->config['mailchimp_api_key'] ?? '');
 
-            $list_id_unencrypted = $this->request->getPost('mailchimp_list_id');
-            if (!empty($list_id_unencrypted)) {
-                $list_id = $this->encrypter->encrypt($list_id_unencrypted);
-            }
+            $list_id = $postedList !== ''
+                ? $this->encrypter->encrypt($postedList)
+                : (string) ($this->config['mailchimp_list_id'] ?? '');
+        } else {
+            $api_key = $postedKey !== ''
+                ? (string) $postedKey
+                : (string) ($this->config['mailchimp_api_key'] ?? '');
+
+            $list_id = $postedList !== ''
+                ? (string) $postedList
+                : (string) ($this->config['mailchimp_list_id'] ?? '');
         }
 
         $batch_save_data = ['mailchimp_api_key' => $api_key, 'mailchimp_list_id' => $list_id];
@@ -895,7 +978,9 @@ class Config extends Secure_Controller
     public function postSaveReceipt(): ResponseInterface
     {
         $batch_save_data = [
-            'receipt_template'              => $this->request->getPost('receipt_template'),
+            'receipt_template'              => Sale_lib::isValidReceiptTemplate($this->request->getPost('receipt_template'))
+                ? $this->request->getPost('receipt_template')
+                : 'receipt_default',
             'receipt_font_size'             => $this->request->getPost('receipt_font_size', FILTER_SANITIZE_NUMBER_INT),
             'print_delay_autoreturn'        => $this->request->getPost('print_delay_autoreturn', FILTER_SANITIZE_NUMBER_INT),
             'email_receipt_check_behaviour' => $this->request->getPost('email_receipt_check_behaviour'),
@@ -920,6 +1005,44 @@ class Config extends Secure_Controller
         return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
     }
 
+    /**
+     * Saves keyboard shortcut bindings.
+     *
+     * @return ResponseInterface
+     * @noinspection PhpUnused
+     */
+    public function postSaveShortcuts(): ResponseInterface
+    {
+        $allowedShortcuts = array_keys($this->sale_lib->getKeyShortcutsOptions());
+        $currentShortcuts = $this->sale_lib->getKeyShortcuts();
+        $batchSaveData = [];
+
+        foreach ($currentShortcuts as $name => $shortcut) {
+            $postedValue = trim((string)$this->request->getPost('key_' . $name));
+
+            if (!in_array($postedValue, $allowedShortcuts, true)) {
+                $postedValue = $shortcut['value'];
+            }
+
+            $batchSaveData['key_' . $name] = $postedValue;
+        }
+
+        $duplicateValues = array_filter(array_count_values($batchSaveData), static fn(int $count): bool => $count > 1);
+        if (!empty($duplicateValues)) {
+            return $this->response->setJSON([
+                'success' => false,
+                'message' => lang('Config.shortcuts_duplicate_bindings')
+            ]);
+        }
+
+        $success = $this->appconfig->batch_save($batchSaveData);
+
+        return $this->response->setJSON([
+            'success' => $success,
+            'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')
+        ]);
+    }
+
     /**
      * Saves invoice configuration. Used in app/Views/configs/invoice_config.php.
      *
@@ -943,8 +1066,8 @@ class Config extends Secure_Controller
             'work_order_enable'           => $this->request->getPost('work_order_enable') != null,
             'work_order_format'           => $this->request->getPost('work_order_format'),
             'last_used_work_order_number' => $this->request->getPost('last_used_work_order_number', FILTER_SANITIZE_NUMBER_INT),
-            'invoice_type'                => Sale_lib::isValidInvoiceType($this->request->getPost('invoice_type')) 
-                ? $this->request->getPost('invoice_type') 
+            'invoice_type'                => Sale_lib::isValidInvoiceType($this->request->getPost('invoice_type'))
+                ? $this->request->getPost('invoice_type')
                 : 'invoice'
         ];
 
@@ -976,4 +1099,26 @@ class Config extends Secure_Controller
 
         return $this->response->setJSON(['success' => $success]);
     }
+
+    /**
+     * Validates suggestions column configuration to prevent SQL injection.
+     *
+     * @param mixed $column The column value from POST
+     * @param string $fieldType Either 'first' or 'other' to determine default fallback
+     * @return string Validated column name
+     */
+    private function validateSuggestionsColumn(mixed $column, string $fieldType): string
+    {
+        if (!is_string($column)) {
+            return $fieldType === 'first' ? 'name' : '';
+        }
+
+        $allowed = $fieldType === 'first'
+            ? Item::ALLOWED_SUGGESTIONS_COLUMNS
+            : Item::ALLOWED_SUGGESTIONS_COLUMNS_WITH_EMPTY;
+
+        $fallback = $fieldType === 'first' ? 'name' : '';
+
+        return in_array($column, $allowed, true) ? $column : $fallback;
+    }
 }
diff --git a/app/Controllers/Customers.php b/app/Controllers/Customers.php
index b4adfb455..55a872a61 100644
--- a/app/Controllers/Customers.php
+++ b/app/Controllers/Customers.php
@@ -419,7 +419,15 @@ class Customers extends Persons
                     $consent = $data[3] == '' ? 0 : 1;
 
                     if (sizeof($data) >= 16 && $consent) {
-                        $email = strtolower($data[4]);
+                        $email = filter_var(strtolower($data[4]), FILTER_SANITIZE_EMAIL);
+                        
+                        // Empty email is allowed, but if provided it must be valid
+                        if ($email !== '' && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                            $failCodes[] = 'Row ' . $i . ': Invalid email format';
+                            $i++;
+                            continue;
+                        }
+                        
                         $person_data = [
                             'first_name'   => $data[0],
                             'last_name'    => $data[1],
diff --git a/app/Controllers/Employees.php b/app/Controllers/Employees.php
index 8e183d2d9..727240fec 100644
--- a/app/Controllers/Employees.php
+++ b/app/Controllers/Employees.php
@@ -3,6 +3,7 @@
 namespace App\Controllers;
 
 use App\Models\Module;
+use CodeIgniter\HTTP\Exceptions\RedirectException;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
@@ -79,8 +80,7 @@ class Employees extends Persons
         $current_user = $this->employee->get_logged_in_employee_info();
 
         if ($employee_id != NEW_ENTRY && !$this->employee->canModifyEmployee($person_info->person_id, $current_user->person_id)) {
-            header('Location: ' . base_url('no_access/employees/employees'));
-            exit();
+            throw new RedirectException('no_access/employees/employees');
         }
 
         foreach (get_object_vars($person_info) as $property => $value) {
@@ -114,13 +114,13 @@ class Employees extends Persons
      * Inserts/updates an employee
      * @return ResponseInterface
      */
-    public function postSave(int $employee_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $employeeId = NEW_ENTRY): ResponseInterface
     {
-        $current_user = $this->employee->get_logged_in_employee_info();
+        $currentUser = $this->employee->get_logged_in_employee_info();
 
-        if ($employee_id != NEW_ENTRY) {
-            $target_employee = $this->employee->get_info($employee_id);
-            if (!$this->employee->canModifyEmployee($target_employee->person_id, $current_user->person_id)) {
+        if ($employeeId != NEW_ENTRY) {
+            $targetEmployee = $this->employee->get_info($employeeId);
+            if (!$this->employee->canModifyEmployee($targetEmployee->person_id, $currentUser->person_id)) {
                 return $this->response->setJSON([
                     'success' => false,
                     'message' => lang('Employees.error_updating_admin'),
@@ -129,17 +129,17 @@ class Employees extends Persons
             }
         }
 
-        $first_name = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);    // TODO: duplicated code
-        $last_name = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $firstName = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);    // TODO: duplicated code
+        $lastName = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
 
         // format first and last name properly
-        $first_name = $this->nameize($first_name);
-        $last_name = $this->nameize($last_name);
+        $firstName = $this->nameize($firstName);
+        $lastName = $this->nameize($lastName);
 
-        $person_data = [
-            'first_name'   => $first_name,
-            'last_name'    => $last_name,
+        $personData = [
+            'first_name'   => $firstName,
+            'last_name'    => $lastName,
             'gender'       => $this->request->getPost('gender', FILTER_SANITIZE_NUMBER_INT),
             'email'        => $email,
             'phone_number' => $this->request->getPost('phone_number', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -152,27 +152,55 @@ class Employees extends Persons
             'comments'     => $this->request->getPost('comments', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
         ];
 
-        $grants_array = [];
-        $isAdmin = $this->employee->isAdmin($current_user->person_id);
+        $grantsArray = [];
+        $isAdmin = $this->employee->isAdmin($currentUser->person_id);
 
         foreach ($this->module->get_all_permissions()->getResult() as $permission) {
             $grants = [];
             $grant = $this->request->getPost('grant_' . $permission->permission_id) != null ? $this->request->getPost('grant_' . $permission->permission_id, FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
 
             if ($grant == $permission->permission_id) {
-                if (!$isAdmin && !$this->employee->has_grant($permission->permission_id, $current_user->person_id)) {
+                if (!$isAdmin && !$this->employee->has_grant($permission->permission_id, $currentUser->person_id)) {
                     continue;
                 }
                 $grants['permission_id'] = $permission->permission_id;
                 $grants['menu_group'] = $this->request->getPost('menu_group_' . $permission->permission_id) != null ? $this->request->getPost('menu_group_' . $permission->permission_id, FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '--';
-                $grants_array[] = $grants;
+                $grantsArray[] = $grants;
             }
         }
 
+        $minimumGrants = ['employees', 'home', 'office'];
+        $missingMinimumGrant = array_diff($minimumGrants, array_column($grantsArray, 'permission_id'));
+
+        if ($isAdmin && $employeeId == $currentUser->person_id && !empty($missingMinimumGrant)) {
+            return $this->response->setJSON([
+                'success' => false,
+                'message' => lang('Employees.error_cannot_remove_own_minimum_grant'),
+                'id'      => $employeeId
+            ]);
+        }
+
+        if (filter_var(getenv('DISALLOW_GRANT_CHANGE'), FILTER_VALIDATE_BOOLEAN)
+            && $this->hasGrantsChanged($employeeId, $isAdmin, $currentUser, $grantsArray)) {
+            return $this->response->setJSON([
+                'success' => false,
+                'message' => lang('Employees.error_grant_change_disallowed'),
+                'id'      => $employeeId
+            ]);
+        }
+
+        if (!empty($this->request->getPost('password')) && ENVIRONMENT != 'testing' && filter_var(getenv('DISALLOW_PASSWORD_CHANGE'), FILTER_VALIDATE_BOOLEAN)) {
+            return $this->response->setJSON([
+                'success' => false,
+                'message' => lang('Employees.error_password_change_disallowed'),
+                'id'      => $employeeId
+            ]);
+        }
+
         // Password has been changed OR first time password set
         if (!empty($this->request->getPost('password')) && ENVIRONMENT != 'testing') {
             $exploded = explode(":", $this->request->getPost('language', FILTER_SANITIZE_FULL_SPECIAL_CHARS));
-            $employee_data = [
+            $employeeData = [
                 'username'      => $this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                 'password'      => password_hash($this->request->getPost('password'), PASSWORD_DEFAULT),
                 'hash_version'  => 2,
@@ -181,42 +209,79 @@ class Employees extends Persons
             ];
         } else { // Password not changed
             $exploded = explode(":", $this->request->getPost('language', FILTER_SANITIZE_FULL_SPECIAL_CHARS));
-            $employee_data = [
+            $employeeData = [
                 'username'      => $this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                 'language_code' => $exploded[0],
                 'language'      => $exploded[1]
             ];
+
+            // In the testing environment the password above is never persisted
+            // (see the condition on the first branch), yet ospos_employees.password
+            // is NOT NULL. When creating a new employee, supply a placeholder hash
+            // so the insert succeeds and the grant-handling logic under test is
+            // not masked by a constraint failure. Production behavior is unchanged.
+            if (ENVIRONMENT === 'testing' && $employeeId == NEW_ENTRY) {
+                $employeeData['password']     = password_hash('test-placeholder', PASSWORD_DEFAULT);
+                $employeeData['hash_version'] = 2;
+            }
         }
 
-        if ($this->employee->save_employee($person_data, $employee_data, $grants_array, $employee_id)) {
+        if ($this->employee->save_employee($personData, $employeeData, $grantsArray, $employeeId)) {
             // New employee
-            if ($employee_id == NEW_ENTRY) {
+            if ($employeeId == NEW_ENTRY) {
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Employees.successful_adding') . ' ' . $first_name . ' ' . $last_name,
-                    'id'      => $employee_data['person_id']
+                    'message' => lang('Employees.successful_adding') . ' ' . $firstName . ' ' . $lastName,
+                    'id'      => $employeeData['person_id']
                 ]);
             } else { // Existing employee
-                $logged_in_employee_id = session()->get('person_id');
-                if ($employee_id == $logged_in_employee_id) {
-                    session()->set('language_code', $employee_data['language_code']);
-                    session()->set('language', $employee_data['language']);
+                $loggedInEmployeeId = session()->get('person_id');
+                if ($employeeId == $loggedInEmployeeId) {
+                    session()->set('language_code', $employeeData['language_code']);
+                    session()->set('language', $employeeData['language']);
                 }
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Employees.successful_updating') . ' ' . $first_name . ' ' . $last_name,
-                    'id'      => $employee_id
+                    'message' => lang('Employees.successful_updating') . ' ' . $firstName . ' ' . $lastName,
+                    'id'      => $employeeId
                 ]);
             }
         } else { // Failure
             return $this->response->setJSON([
                 'success' => false,
-                'message' => lang('Employees.error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
+                'message' => lang('Employees.error_adding_updating') . ' ' . $firstName . ' ' . $lastName,
                 'id'      => NEW_ENTRY
             ]);
         }
     }
 
+    /**
+     * Determines whether the submitted grants differ from the employee's current grants,
+     * limited to the permissions the current user has authority over when not an admin.
+     */
+    private function hasGrantsChanged(int $employeeId, bool $isAdmin, object $currentUser, array $grantsArray): bool
+    {
+        $currentGrantIds = [];
+
+        if ($employeeId != NEW_ENTRY) {
+            $currentGrantIds = array_column($this->employee->get_employee_grants($employeeId), 'permission_id');
+
+            if (!$isAdmin) {
+                $currentGrantIds = array_values(array_filter(
+                    $currentGrantIds,
+                    fn ($permissionId) => $this->employee->has_grant($permissionId, $currentUser->person_id)
+                ));
+            }
+        }
+
+        $submittedGrantIds = array_column($grantsArray, 'permission_id');
+
+        sort($currentGrantIds);
+        sort($submittedGrantIds);
+
+        return $currentGrantIds !== $submittedGrantIds;
+    }
+
     /**
      * This deletes employees from the employees table
      * @return ResponseInterface
diff --git a/app/Controllers/Expenses.php b/app/Controllers/Expenses.php
index d2ec24a46..258ae1dcf 100644
--- a/app/Controllers/Expenses.php
+++ b/app/Controllers/Expenses.php
@@ -38,6 +38,9 @@ class Expenses extends Secure_Controller
             'is_deleted'  => lang('Expenses.is_deleted')
         ];
 
+        // Restore filters from URL
+        $data = array_merge($data, restoreTableFilters($this->request));
+
         return view('expenses/manage', $data);
     }
 
@@ -90,16 +93,23 @@ class Expenses extends Secure_Controller
     {
         $data = [];    // TODO: Duplicated code
 
-        $data['employees'] = [];
-        foreach ($this->employee->get_all()->getResult() as $employee) {
-            foreach (get_object_vars($employee) as $property => $value) {
-                $employee->$property = $value;
-            }
-
-            $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
-        }
-
         $data['expenses_info'] = $this->expense->get_info($expense_id);
+        $expense_id = $data['expenses_info']->expense_id;
+
+        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+        $can_assign_employee = $this->employee->has_grant('employees', $current_employee_id);
+
+        $data['employees'] = [];
+        if ($can_assign_employee) {
+            foreach ($this->employee->get_all()->getResult() as $employee) {
+                $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
+            }
+        } else {
+            $stored_employee_id = $expense_id == NEW_ENTRY ? $current_employee_id : $data['expenses_info']->employee_id;
+            $stored_employee = $this->employee->get_info($stored_employee_id);
+            $data['employees'][$stored_employee_id] = $stored_employee->first_name . ' ' . $stored_employee->last_name;
+        }
+        $data['can_assign_employee'] = $can_assign_employee;
 
         $expense_categories = [];
         foreach ($this->expense_category->get_all(0, 0, true)->getResultArray() as $row) {
@@ -107,11 +117,9 @@ class Expenses extends Secure_Controller
         }
         $data['expense_categories'] = $expense_categories;
 
-        $expense_id = $data['expenses_info']->expense_id;
-
         if ($expense_id == NEW_ENTRY) {
             $data['expenses_info']->date = date('Y-m-d H:i:s');
-            $data['expenses_info']->employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+            $data['expenses_info']->employee_id = $current_employee_id;
         }
 
         $data['payments'] = [];
@@ -152,6 +160,20 @@ class Expenses extends Secure_Controller
 
         $date_formatter = date_create_from_format($config['dateformat'] . ' ' . $config['timeformat'], $newdate);
 
+        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+        $submitted_employee_id = $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT);
+
+        if (!$this->employee->has_grant('employees', $current_employee_id)) {
+            if ($expense_id == NEW_ENTRY) {
+                $employee_id = $current_employee_id;
+            } else {
+                $existing_expense = $this->expense->get_info($expense_id);
+                $employee_id = $existing_expense->employee_id;
+            }
+        } else {
+            $employee_id = $submitted_employee_id;
+        }
+
         $expense_data = [
             'date'                => $date_formatter->format('Y-m-d H:i:s'),
             'supplier_id'         => $this->request->getPost('supplier_id') == '' ? null : $this->request->getPost('supplier_id', FILTER_SANITIZE_NUMBER_INT),
@@ -161,7 +183,7 @@ class Expenses extends Secure_Controller
             'payment_type'        => $this->request->getPost('payment_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             'expense_category_id' => $this->request->getPost('expense_category_id', FILTER_SANITIZE_NUMBER_INT),
             'description'         => $this->request->getPost('description', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
-            'employee_id'         => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
+            'employee_id'         => $employee_id,
             'deleted'             => $this->request->getPost('deleted') != null
         ];
 
diff --git a/app/Controllers/Giftcards.php b/app/Controllers/Giftcards.php
index 75899d8e8..68e954a3a 100644
--- a/app/Controllers/Giftcards.php
+++ b/app/Controllers/Giftcards.php
@@ -163,7 +163,7 @@ class Giftcards extends Secure_Controller
     {
         $existing_id = $this->request->getPost('giftcard_id', FILTER_SANITIZE_NUMBER_INT);
         $giftcard_number = $this->request->getPost('giftcard_number', FILTER_SANITIZE_NUMBER_INT);
-        $giftcard_id = $this->giftcard->get_giftcard_id($giftcard_number);
+        $giftcard_id = $this->giftcard->getGiftcardId($giftcard_number);
         $success = ($giftcard_id == (int) $existing_id || !$giftcard_id );
 
         return $this->response->setJSON($success ? 'true' : 'false');
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index fb5177925..8161a7c3c 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -2,6 +2,8 @@
 
 namespace App\Controllers;
 
+use App\Libraries\MY_Migration;
+use App\Models\Employee;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\ResponseInterface;
 
@@ -9,6 +11,13 @@ class Home extends Secure_Controller
 {
     public function __construct()
     {
+        $methodName = urldecode(service('request')->getUri()->getSegment(2));
+
+        if ($methodName === 'logout') {
+            $this->employee = model(Employee::class);
+            return;
+        }
+
         parent::__construct('home', null, 'home');
     }
 
@@ -34,21 +43,20 @@ class Home extends Secure_Controller
     }
 
     /**
-     * Load "change employee password" form
+     * Load the "change employee password" form
      *
-     * @return string
-     * @noinspection PhpUnused
+     * @param int $employeeId
+     * @return ResponseInterface|string
      */
-    public function getChangePassword(int $employeeId = NEW_ENTRY): string
+    public function getChangePassword(int $employeeId = NEW_ENTRY): ResponseInterface|string
     {
         $loggedInEmployee = $this->employee->get_logged_in_employee_info();
-        $currentPersonId = $loggedInEmployee->person_id;
+        $currentPersonId = (int) $loggedInEmployee->person_id;
 
         $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
 
-        if (!$this->employee->can_modify_employee($employeeId, $currentPersonId)) {
-            header('Location: ' . base_url('no_access/home/home'));
-            exit();
+        if (!$this->employee->isAdmin($currentPersonId) && $employeeId !== $currentPersonId) {
+            return $this->response->setStatusCode(403)->setBody(lang('Employees.unauthorized_modify'));
         }
 
         $person_info = $this->employee->get_info($employeeId);
@@ -68,10 +76,11 @@ class Home extends Secure_Controller
     public function postSave(int $employeeId = NEW_ENTRY): ResponseInterface
     {
         $currentUser = $this->employee->get_logged_in_employee_info();
+        $currentPersonId = (int) $currentUser->person_id;
 
-        $employeeId = $employeeId === NEW_ENTRY ? $currentUser->person_id : $employeeId;
+        $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
 
-        if (!$this->employee->can_modify_employee($employeeId, $currentUser->person_id)) {
+        if (!$this->employee->isAdmin($currentPersonId) && $employeeId !== $currentPersonId) {
             return $this->response->setStatusCode(403)->setJSON([
                 'success' => false,
                 'message' => lang('Employees.unauthorized_modify')
@@ -82,7 +91,7 @@ class Home extends Secure_Controller
             if ($this->employee->check_password($this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS), $this->request->getPost('current_password'))) {
                 // Validate password length BEFORE hashing
                 $new_password = $this->request->getPost('password');
-                
+
                 if (strlen($new_password) < 8) {
                     return $this->response->setJSON([
                         'success' => false,
@@ -90,7 +99,7 @@ class Home extends Secure_Controller
                         'id'      => NEW_ENTRY
                     ]);
                 }
-                
+
                 $employee_data = [
                     'username'     => $this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                     'password'     => password_hash($new_password, PASSWORD_DEFAULT),
@@ -125,4 +134,4 @@ class Home extends Secure_Controller
             ]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Controllers/Item_kits.php b/app/Controllers/Item_kits.php
index f0cc57eb1..820db78a0 100644
--- a/app/Controllers/Item_kits.php
+++ b/app/Controllers/Item_kits.php
@@ -255,39 +255,39 @@ class Item_kits extends Secure_Controller
     /**
      * AJAX called function that generates barcodes for selected item_kits.
      *
-     * @param string $item_kit_ids Colon separated list of item_kit_id values to generate barcodes for.
+     * @param string $itemKitIds Colon separated list of item_kit_id values to generate barcodes for.
      * @return string
      * @noinspection PhpUnused
      */
-    public function getGenerateBarcodes(string $item_kit_ids): string
+    public function getGenerateBarcodes(string $itemKitIds): string
     {
-        $barcode_lib = new Barcode_lib();
+        $barcodeLib = new Barcode_lib();
         $result = [];
 
-        $item_kit_ids = explode(':', $item_kit_ids);
-        foreach ($item_kit_ids as $item_kid_id) {
+        $itemKitIds = explode(':', $itemKitIds);
+        foreach ($itemKitIds as $itemKitId) {
             // Calculate the total cost and retail price of the Kit, so it can be added to the barcode text at the bottom
-            $item_kit = $this->_add_totals_to_item_kit($this->item_kit->get_info($item_kid_id));
+            $itemKit = $this->_add_totals_to_item_kit($this->item_kit->get_info($itemKitId));
 
-            $item_kid_id = 'KIT ' . urldecode($item_kid_id);
+            $itemKitId = 'KIT ' . $itemKitId;
 
             $result[] = [
-                'name'        => $item_kit->name,
-                'item_id'     => $item_kid_id,
-                'item_number' => $item_kid_id,
-                'cost_price'  => $item_kit->total_cost_price,
-                'unit_price'  => $item_kit->total_unit_price
+                'name'        => $itemKit->name,
+                'item_id'     => $itemKitId,
+                'item_number' => $itemKitId,
+                'cost_price'  => $itemKit->total_cost_price,
+                'unit_price'  => $itemKit->total_unit_price
             ];
         }
 
         $data['items'] = $result;
-        $barcode_config = $barcode_lib->get_barcode_config();
+        $barcodeConfig = $barcodeLib->get_barcode_config();
         // In case the selected barcode type is not Code39 or Code128 we set by default Code128
         // The rationale for this is that EAN codes cannot have strings as seed, so 'KIT ' is not allowed
-        if ($barcode_config['barcode_type'] != 'C39' && $barcode_config['barcode_type'] != 'C128') {
-            $barcode_config['barcode_type'] = 'C128';
+        if ($barcodeConfig['barcode_type'] != 'C39' && $barcodeConfig['barcode_type'] != 'C128') {
+            $barcodeConfig['barcode_type'] = 'C128';
         }
-        $data['barcode_config'] = $barcode_config;
+        $data['barcode_config'] = $barcodeConfig;
 
         // Display barcodes
         return view("barcodes/barcode_sheet", $data);
diff --git a/app/Controllers/Items.php b/app/Controllers/Items.php
index 8bf7914cb..33529261b 100644
--- a/app/Controllers/Items.php
+++ b/app/Controllers/Items.php
@@ -4,7 +4,6 @@ namespace App\Controllers;
 
 use App\Libraries\Barcode_lib;
 use App\Libraries\Item_lib;
-
 use App\Models\Attribute;
 use App\Models\Inventory;
 use App\Models\Item;
@@ -14,10 +13,12 @@ use App\Models\Item_taxes;
 use App\Models\Stock_location;
 use App\Models\Supplier;
 use App\Models\Tax_category;
-
+use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Images\Handlers\BaseHandler;
 use CodeIgniter\HTTP\DownloadResponse;
+use CodeIgniter\Validation\FormatRules;
+use Config\Database;
 use Config\OSPOS;
 use Config\Services;
 use Exception;
@@ -27,6 +28,7 @@ require_once('Secure_Controller.php');
 
 class Items extends Secure_Controller
 {
+    private BaseConnection $db;
     private BaseHandler $image;
     private Barcode_lib $barcode_lib;
     private Item_lib $item_lib;
@@ -46,6 +48,8 @@ class Items extends Secure_Controller
     {
         parent::__construct('items');
 
+        $this->db = Database::connect();
+
         $this->session = Services::session();
 
         $this->image = Services::image();
@@ -72,8 +76,13 @@ class Items extends Secure_Controller
     {
         $this->session->set('allow_temp_items', 0);
 
-        $data['table_headers'] = get_items_manage_table_headers();
-        $data['stock_location'] = $this->item_lib->get_item_location();
+        $data['table_headers'] = getItemsManageTableHeaders();
+
+        // Restore stock_location from URL or session
+        $stockLocation = $this->request->getGet('stock_location', FILTER_SANITIZE_NUMBER_INT);
+        $data['stock_location'] = $stockLocation
+            ? $stockLocation
+            : $this->item_lib->get_item_location();
         $data['stock_locations'] = $this->stock_location->get_allowed_locations();
 
         // Filters that will be loaded in the multiselect dropdown
@@ -87,6 +96,9 @@ class Items extends Secure_Controller
             'temporary'      => lang('Items.temp')
         ];
 
+        // Restore filters from URL
+        $data = array_merge($data, restoreTableFilters($this->request));
+
         return view('items/manage', $data);
     }
 
@@ -99,12 +111,14 @@ class Items extends Secure_Controller
         $search = $this->request->getGet('search', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
         $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort = $this->sanitizeSortColumn(item_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'item_id');
         $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $this->item_lib->set_item_location($this->request->getGet('stock_location'));
 
-        $definition_names = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+        $definitionNamesWithTypes = $this->attribute->getDefinitionsByFlags(Attribute::SHOW_IN_ITEMS, true);
+        $definitionIds = array_keys($definitionNamesWithTypes);
+
+        $sort = $this->sanitizeSortColumn(itemSortColumns($definitionIds), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'items.item_id');
 
         $filters = [
             'start_date'        => $this->request->getGet('start_date'),
@@ -117,25 +131,79 @@ class Items extends Secure_Controller
             'search_custom'     => false,
             'is_deleted'        => false,
             'temporary'         => false,
-            'definition_ids'    => array_keys($definition_names)
+            'definition_ids'    => $definitionIds
         ];
 
         // Check if any filter is set in the multiselect dropdown
-        $request_filters = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? [], true);
-        $filters = array_merge($filters, $request_filters);
-        $items = $this->item->search($search, $filters, $limit, $offset, $sort, $order);
-        $total_rows = $this->item->get_found_rows($search, $filters);
-        $data_rows = [];
+        $requestFilters = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? [], true);
+        $filters = array_merge($filters, $requestFilters);
 
-        foreach ($items->getResult() as $item) {
-            $data_rows[] = get_item_data_row($item);
+        // When search_custom is enabled, include attributes that are searchable but may not be visible in table
+        if (!empty($filters['search_custom'])) {
+            $searchableDefinitions = $this->attribute->getDefinitionsByFlags(Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_SEARCH);
+            $filters['definition_ids'] = array_keys($searchableDefinitions);
+        }
+
+        $items = $this->item->search($search, $filters, $limit, $offset, $sort, $order);
+        $itemResults = $items->getResult();
+        $totalRows = $this->item->get_found_rows($search, $filters);
+        $taxPercentsByItemId = $this->buildTaxPercentsByItem($itemResults);
+
+        $dataRows = [];
+
+        foreach ($itemResults as $item) {
+            $dataRows[] = getItemDataRow($item, $definitionNamesWithTypes, $taxPercentsByItemId);
 
             if ($item->pic_filename !== null) {
                 $this->update_pic_filename($item);
             }
         }
 
-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        return $this->response->setJSON(['total' => $totalRows, 'rows' => $dataRows]);
+    }
+
+    /**
+     * @return array item_id => formatted tax percents string
+     */
+    private function buildTaxPercentsByItem(array $items): array
+    {
+        $config = config(OSPOS::class)->settings;
+        $taxPercentsByItemId = [];
+
+        if ($config['use_destination_based_tax']) {
+            $taxCategoryIds = array_unique(array_filter(array_map(fn ($item) => $item->tax_category_id, $items)));
+
+            if (empty($taxCategoryIds)) {
+                return [];
+            }
+
+            $taxCategoryNames = [];
+            foreach ($this->tax_category->get_multiple_info($taxCategoryIds)->getResult() as $taxCategoryInfo) {
+                $taxCategoryNames[$taxCategoryInfo->tax_category_id] = $taxCategoryInfo->tax_category;
+            }
+
+            foreach ($items as $item) {
+                if ($item->tax_category_id !== null && isset($taxCategoryNames[$item->tax_category_id])) {
+                    $taxPercentsByItemId[$item->item_id] = $taxCategoryNames[$item->tax_category_id];
+                }
+            }
+        } else {
+            $itemIds = array_map(fn ($item) => $item->item_id, $items);
+            $itemTaxesByItemId = $this->item_taxes->getInfoMultiple($itemIds);
+
+            foreach ($itemIds as $itemId) {
+                $taxPercents = '';
+                foreach ($itemTaxesByItemId[$itemId] ?? [] as $taxInfo) {
+                    $taxPercents .= to_tax_decimals($taxInfo['percent']) . '%, ';
+                }
+
+                // Remove ', ' from last item
+                $taxPercents = substr($taxPercents, 0, -2);
+                $taxPercentsByItemId[$itemId] = !$taxPercents ? '-' : $taxPercents;
+            }
+        }
+
+        return $taxPercentsByItemId;
     }
 
     /**
@@ -148,8 +216,23 @@ class Items extends Secure_Controller
     {
         helper('file');
 
-        $pic_filename = rawurldecode($pic_filename);
-        $file_extension = pathinfo($pic_filename, PATHINFO_EXTENSION);
+        // Security: Sanitize filename to prevent path traversal
+        // Use basename() to strip directory components and prevent '../' attacks
+        $pic_filename = basename(rawurldecode($pic_filename));
+        $file_extension = strtolower(pathinfo($pic_filename, PATHINFO_EXTENSION));
+
+        // Validate file extension against system-configured allowed image types
+        // Handle both legacy pipe-separated and current comma-separated formats
+        // Fallback to types that GD library can process for thumbnail generation
+        $allowed_types = $this->config['image_allowed_types'] ?? 'jpg,jpeg,gif,png,webp,bmp,tif,tiff';
+        $allowed_extensions = strpos($allowed_types, '|') !== false
+            ? explode('|', $allowed_types)
+            : explode(',', $allowed_types);
+
+        if (!in_array($file_extension, $allowed_extensions, true)) {
+            return $this->response->setStatusCode(400)->setBody('Invalid file type');
+        }
+
         $images = glob("./uploads/item_pics/$pic_filename");
         $base_path = './uploads/item_pics/' . pathinfo($pic_filename, PATHINFO_FILENAME);
 
@@ -249,17 +332,21 @@ class Items extends Secure_Controller
     }
 
     /**
-     * @param string $item_ids
+     * @param string $itemIds
      * @return ResponseInterface
      */
-    public function getRow(string $item_ids): ResponseInterface    // TODO: An array would be better for parameter.
+    public function getRow(string $itemIds): ResponseInterface    // TODO: An array would be better for parameter.
     {
-        $item_infos = $this->item->get_multiple_info(explode(':', $item_ids), $this->item_lib->get_item_location());
+        $itemInfos = $this->item->get_multiple_info(explode(':', $itemIds), $this->item_lib->get_item_location());
+        $itemResults = $itemInfos->getResult();
+
+        $definitionNames = $this->attribute->getDefinitionsByFlags(Attribute::SHOW_IN_ITEMS, true);
+        $taxPercentsByItemId = $this->buildTaxPercentsByItem($itemResults);
 
         $result = [];
 
-        foreach ($item_infos->getResult() as $item_info) {
-            $result[$item_info->item_id] = get_item_data_row($item_info);
+        foreach ($itemResults as $itemInfo) {
+            $result[$itemInfo->item_id] = getItemDataRow($itemInfo, $definitionNames, $taxPercentsByItemId);
         }
 
         return $this->response->setJSON($result);
@@ -283,7 +370,7 @@ class Items extends Secure_Controller
         $data['default_tax_2_rate'] = '';
         $data['item_kit_disabled'] = !$this->employee->has_grant('item_kits', $this->employee->get_logged_in_employee_info()->person_id);
         $data['definition_values'] = $this->attribute->get_attributes_by_item($item_id);
-        $data['definition_names'] = $this->attribute->get_definition_names();
+        $data['definition_names'] = $this->attribute->getDefinitionNames();
 
         foreach ($data['definition_values'] as $definition_id => $definition) {
             unset($data['definition_names'][$definition_id]);
@@ -299,9 +386,9 @@ class Items extends Secure_Controller
 
         if ($data['category_dropdown'] === '1') {
             $categories = ['' => lang('Items.none')];
-            $category_options = $this->attribute->get_definition_values(CATEGORY_DEFINITION_ID);
-            $category_options = array_combine($category_options, $category_options);    // Overwrite indexes with values for saving in items table instead of attributes
-            $data['categories'] = array_merge($categories, $category_options);
+            $categoryOptions = $this->attribute->getDefinitionValues(CATEGORY_DEFINITION_ID);
+            $categoryOptions = array_combine($categoryOptions, $categoryOptions);    // Overwrite indexes with values for saving in items table instead of attributes
+            $data['categories'] = array_merge($categories, $categoryOptions);
 
             $data['selected_category'] = $item_info->category;
         }
@@ -497,10 +584,10 @@ class Items extends Secure_Controller
         $data['item_id'] = $item_id;
         $definition_ids = json_decode($this->request->getGet('definition_ids') ?? '', true);
         $data['definition_values'] = $this->attribute->get_attributes_by_item($item_id) + $this->attribute->get_values_by_definitions($definition_ids);
-        $data['definition_names'] = $this->attribute->get_definition_names();
+        $data['definition_names'] = $this->attribute->getDefinitionNames();
 
         foreach ($data['definition_values'] as $definition_id => $definition_value) {
-            $attribute_value = $this->attribute->get_attribute_value($item_id, $definition_id);
+            $attribute_value = $this->attribute->getAttributeValue($item_id, $definition_id);
             $attribute_id = (empty($attribute_value) || empty($attribute_value->attribute_id)) ? null : $attribute_value->attribute_id;
             $values = &$data['definition_values'][$definition_id];
             $values['attribute_id'] = $attribute_id;
@@ -508,7 +595,7 @@ class Items extends Secure_Controller
             $values['selected_value'] = '';
 
             if ($definition_value['definition_type'] === DROPDOWN) {
-                $values['values'] = $this->attribute->get_definition_values($definition_id);
+                $values['values'] = $this->attribute->getDefinitionValues($definition_id);
                 $link_value = $this->attribute->get_link_value($item_id, $definition_id);
                 $values['selected_value'] = (empty($link_value)) ? '' : $link_value->attribute_id;
             }
@@ -533,10 +620,10 @@ class Items extends Secure_Controller
         $data['item_id'] = $item_id;
         $definition_ids = json_decode($this->request->getPost('definition_ids'), true);
         $data['definition_values'] = $this->attribute->get_attributes_by_item($item_id) + $this->attribute->get_values_by_definitions($definition_ids);
-        $data['definition_names'] = $this->attribute->get_definition_names();
+        $data['definition_names'] = $this->attribute->getDefinitionNames();
 
         foreach ($data['definition_values'] as $definition_id => $definition_value) {
-            $attribute_value = $this->attribute->get_attribute_value($item_id, $definition_id);
+            $attribute_value = $this->attribute->getAttributeValue($item_id, $definition_id);
             $attribute_id = (empty($attribute_value) || empty($attribute_value->attribute_id)) ? null : $attribute_value->attribute_id;
             $values = &$data['definition_values'][$definition_id];
             $values['attribute_id'] = $attribute_id;
@@ -544,7 +631,7 @@ class Items extends Secure_Controller
             $values['selected_value'] = '';
 
             if ($definition_value['definition_type'] === DROPDOWN) {
-                $values['values'] = $this->attribute->get_definition_values($definition_id);
+                $values['values'] = $this->attribute->getDefinitionValues($definition_id);
                 $link_value = $this->attribute->get_link_value($item_id, $definition_id);
                 $values['selected_value'] = (empty($link_value)) ? '' : $link_value->attribute_id;
             }
@@ -567,7 +654,10 @@ class Items extends Secure_Controller
      */
     public function getBulkEdit(): string
     {
-        $suppliers = ['' => lang('Items.none')];
+        $suppliers = [
+            ''                          => lang('Items.do_nothing'),
+            Item::CLEAR_SUPPLIER_OPTION => lang('Items.none')
+        ];
 
         foreach ($this->supplier->get_all()->getResultArray() as $row) {
             $suppliers[$row['person_id']] = $row['company_name'];
@@ -589,152 +679,226 @@ class Items extends Secure_Controller
         return view('items/form_bulk', $data);
     }
 
+    private function validateItemFields(int $itemId): ?ResponseInterface
+    {
+        $itemNumber = $this->request->getPost('item_number');
+
+        if (!empty($itemNumber)) {
+            $rules = [
+                'item_number' => 'alpha_numeric_punct',
+            ];
+            $messages = [
+                'item_number' => [
+                    'alpha_numeric_punct' => lang('Items.item_number_invalid'),
+                ],
+            ];
+
+            $error = $this->validateFields($rules, $messages, $itemId);
+            if ($error !== null) {
+                return $error;
+            }
+        }
+
+        $taxNamesInput = $this->request->getPost('tax_names');
+
+        if (!empty($taxNamesInput)) {
+            $rules = [
+                'tax_names.*' => 'required|max_length[255]|unicode_alpha_numeric_punct',
+            ];
+            $messages = [
+                'tax_names.*' => [
+                    'required'                    => lang('Items.tax_name_invalid'),
+                    'max_length'                  => lang('Items.tax_name_invalid'),
+                    'unicode_alpha_numeric_punct' => lang('Items.tax_name_invalid'),
+                ],
+            ];
+
+            $error = $this->validateFields($rules, $messages, $itemId);
+            if ($error !== null) {
+                return $error;
+            }
+        }
+
+        return null;
+    }
+
+    private function validateBulkUpdateFields(): ?ResponseInterface
+    {
+        $taxNamesInput = $this->request->getPost('tax_names');
+
+        if (!empty($taxNamesInput)) {
+            $rules = [
+                'tax_names.*' => 'max_length[255]|unicode_alpha_numeric_punct',
+            ];
+            $messages = [
+                'tax_names.*' => [
+                    'max_length'                  => lang('Items.tax_name_invalid'),
+                    'unicode_alpha_numeric_punct' => lang('Items.tax_name_invalid'),
+                ],
+            ];
+
+            return $this->validateFields($rules, $messages, NEW_ENTRY);
+        }
+
+        return null;
+    }
+
     /**
-     * @param int $item_id
+     * @param int $itemId
      * @return ResponseInterface
      * @throws ReflectionException
      */
-    public function postSave(int $item_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $itemId = NEW_ENTRY): ResponseInterface
     {
-        $upload_data = $this->upload_image();
-        $upload_success = empty($upload_data['error']);
+        $validationError = $this->validateItemFields($itemId);
 
-        $raw_receiving_quantity = $this->request->getPost('receiving_quantity');
-
-        $receiving_quantity = parse_quantity($raw_receiving_quantity);
-        $item_type = $this->request->getPost('item_type') === null ? ITEM : intval($this->request->getPost('item_type'));
-
-        if ($receiving_quantity === 0.0 && $item_type !== ITEM_TEMP) {
-            $receiving_quantity = 1;
+        if ($validationError !== null) {
+            return $validationError;
         }
 
-        $default_pack_name = lang('Items.default_pack_name');
+        $uploadData = $this->upload_image();
+        $uploadSuccess = empty($uploadData['error']);
 
-        $cost_price = parse_decimals($this->request->getPost('cost_price'));
-        $unit_price = parse_decimals($this->request->getPost('unit_price'));
-        $reorder_level = parse_quantity($this->request->getPost('reorder_level'));
-        $qty_per_pack = parse_quantity($this->request->getPost('qty_per_pack') ?? '');
+        $rawReceivingQuantity = $this->request->getPost('receiving_quantity');
+
+        $receivingQuantity = parse_quantity($rawReceivingQuantity);
+        $itemType = $this->request->getPost('item_type') === null ? ITEM : intval($this->request->getPost('item_type'));
+
+        if ($receivingQuantity === 0.0 && $itemType !== ITEM_TEMP) {
+            $receivingQuantity = 1;
+        }
+
+        $defaultPackName = lang('Items.default_pack_name');
+
+        $costPrice = parse_decimals($this->request->getPost('cost_price'));
+        $unitPrice = parse_decimals($this->request->getPost('unit_price'));
+        $reorderLevel = parse_quantity($this->request->getPost('reorder_level'));
+        $qtyPerPack = parse_quantity($this->request->getPost('qty_per_pack') ?? '');
 
         // Save item data
-        $item_data = [
+        $itemData = [
             'name'                  => $this->request->getPost('name'),
             'description'           => $this->request->getPost('description', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             'category'              => $this->request->getPost('category'),
-            'item_type'             => $item_type,
+            'item_type'             => $itemType,
             'stock_type'            => $this->request->getPost('stock_type') === null ? HAS_STOCK : intval($this->request->getPost('stock_type')),
             'supplier_id'           => empty($this->request->getPost('supplier_id')) ? null : intval($this->request->getPost('supplier_id')),
             'item_number'           => empty($this->request->getPost('item_number')) ? null : $this->request->getPost('item_number'),
-            'cost_price'            => $cost_price,
-            'unit_price'            => $unit_price,
-            'reorder_level'         => $reorder_level,
-            'receiving_quantity'    => $receiving_quantity,
+            'cost_price'            => $costPrice,
+            'unit_price'            => $unitPrice,
+            'reorder_level'         => $reorderLevel,
+            'receiving_quantity'    => $receivingQuantity,
             'allow_alt_description' => $this->request->getPost('allow_alt_description') != null,
             'is_serialized'         => $this->request->getPost('is_serialized') != null,
-            'qty_per_pack'          => $this->request->getPost('qty_per_pack') == null ? 1 : parse_quantity($qty_per_pack),
-            'pack_name'             => $this->request->getPost('pack_name') == null ? $default_pack_name : $this->request->getPost('pack_name'),
-            'low_sell_item_id'      => $this->request->getPost('low_sell_item_id') === null ? $item_id : intval($this->request->getPost('low_sell_item_id')),
+            'qty_per_pack'          => $this->request->getPost('qty_per_pack') == null ? 1 : parse_quantity($qtyPerPack),
+            'pack_name'             => $this->request->getPost('pack_name') == null ? $defaultPackName : $this->request->getPost('pack_name'),
+            'low_sell_item_id'      => $this->request->getPost('low_sell_item_id') === null ? $itemId : intval($this->request->getPost('low_sell_item_id')),
             'deleted'               => $this->request->getPost('is_deleted') != null,
             'hsn_code'              => $this->request->getPost('hsn_code') === null ? '' : $this->request->getPost('hsn_code')
         ];
 
-        if ($item_data['item_type'] == ITEM_TEMP) {
-            $item_data['stock_type'] = HAS_NO_STOCK;
-            $item_data['receiving_quantity'] = 0;
-            $item_data['reorder_level'] = 0;
+        if ($itemData['item_type'] == ITEM_TEMP) {
+            $itemData['stock_type'] = HAS_NO_STOCK;
+            $itemData['receiving_quantity'] = 0;
+            $itemData['reorder_level'] = 0;
         }
 
-        $tax_category_id = $this->request->getPost('tax_category_id');
+        $taxCategoryId = $this->request->getPost('tax_category_id');
 
-        if (!isset($tax_category_id)) {
-            $item_data['tax_category_id'] = null;
+        if (!isset($taxCategoryId)) {
+            $itemData['tax_category_id'] = null;
         } else {
-            $item_data['tax_category_id'] = empty($this->request->getPost('tax_category_id')) ? null : intval($this->request->getPost('tax_category_id'));
+            $itemData['tax_category_id'] = empty($this->request->getPost('tax_category_id')) ? null : intval($this->request->getPost('tax_category_id'));
         }
 
-        if (!empty($upload_data['orig_name']) && $upload_data['raw_name']) {
-            $item_data['pic_filename'] = $upload_data['raw_name'] . '.' . $upload_data['file_ext'];
+        if (!empty($uploadData['orig_name']) && $uploadData['raw_name']) {
+            $itemData['pic_filename'] = $uploadData['raw_name'] . '.' . $uploadData['file_ext'];
         }
 
-        $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+        $employeeId = $this->employee->get_logged_in_employee_info()->person_id;
 
-        if ($this->item->save_value($item_data, $item_id)) {
-            $success = true;
-            $new_item = false;
+        // Wrap the entire save sequence in a single transaction for atomicity
+        $db = db_connect();
+        $db->transBegin();
 
-            if ($item_id === NEW_ENTRY) {
-                $item_id = $item_data['item_id'];
-                $new_item = true;
+        $success = $this->item->save_value($itemData, $itemId);
+        $newItem = false;
+
+        if ($success) {
+            if ($itemId === NEW_ENTRY) {
+                $itemId = $itemData['item_id'];
+                $newItem = true;
             }
 
-            $use_destination_based_tax = (bool)$this->config['use_destination_based_tax'];
+            $useDestinationBasedTax = (bool)$this->config['use_destination_based_tax'];
 
-            if (!$use_destination_based_tax) {
-                $items_taxes_data = [];
-                $tax_names = $this->request->getPost('tax_names');
-                $tax_percents = $this->request->getPost('tax_percents');
+            if (!$useDestinationBasedTax) {
+                $itemsTaxesData = [];
+                $taxNames = $this->request->getPost('tax_names');
+                $taxPercents = $this->request->getPost('tax_percents');
 
-                $tax_name_index = 0;
+                $taxNameIndex = 0;
 
-                foreach ($tax_percents as $tax_percent) {
-                    $tax_percentage = parse_tax($tax_percent);
+                foreach ($taxPercents as $taxPercent) {
+                    $taxPercentage = parse_tax($taxPercent);
 
-                    if (is_numeric($tax_percentage)) {
-                        $items_taxes_data[] = ['name' => $tax_names[$tax_name_index], 'percent' => $tax_percentage];
+                    if (is_numeric($taxPercentage)) {
+                        $itemsTaxesData[] = ['name' => $taxNames[$taxNameIndex], 'percent' => $taxPercentage];
                     }
 
-                    $tax_name_index++;
+                    $taxNameIndex++;
                 }
-                $success &= $this->item_taxes->save_value($items_taxes_data, $item_id);
+                $success = $success && $this->item_taxes->save_value($itemsTaxesData, $itemId);
             }
 
             // Save item quantity
-            $stock_locations = $this->stock_location->get_undeleted_all()->getResultArray();
-            foreach ($stock_locations as $location) {
-                $updated_quantity = parse_quantity($this->request->getPost('quantity_' . $location['location_id']));
+            $stockLocations = $this->stock_location->get_undeleted_all()->getResultArray();
+            foreach ($stockLocations as $location) {
+                $updatedQuantity = parse_quantity($this->request->getPost('quantity_' . $location['location_id']));
 
-                if ($item_data['item_type'] == ITEM_TEMP) {
-                    $updated_quantity = 0;
+                if ($itemData['item_type'] == ITEM_TEMP) {
+                    $updatedQuantity = 0;
                 }
 
-                $location_detail = [
-                    'item_id'     => $item_id,
+                $locationDetail = [
+                    'item_id'     => $itemId,
                     'location_id' => $location['location_id'],
-                    'quantity'    => $updated_quantity
+                    'quantity'    => $updatedQuantity
                 ];
 
-                $item_quantity = $this->item_quantity->get_item_quantity($item_id, $location['location_id']);
+                $itemQuantity = $this->item_quantity->get_item_quantity($itemId, $location['location_id']);
 
-                if ($item_quantity->quantity != $updated_quantity || $new_item) {
-                    $success &= $this->item_quantity->save_value($location_detail, $item_id, $location['location_id']);
+                if ($itemQuantity->quantity != $updatedQuantity || $newItem) {
+                    $success = $success && $this->item_quantity->save_value($locationDetail, $itemId, $location['location_id']);
 
-                    $inv_data = [
+                    $invData = [
                         'trans_date'      => date('Y-m-d H:i:s'),
-                        'trans_items'     => $item_id,
-                        'trans_user'      => $employee_id,
+                        'trans_items'     => $itemId,
+                        'trans_user'      => $employeeId,
                         'trans_location'  => $location['location_id'],
                         'trans_comment'   => lang('Items.manually_editing_of_quantity'),
-                        'trans_inventory' => $updated_quantity - $item_quantity->quantity
+                        'trans_inventory' => $updatedQuantity - $itemQuantity->quantity
                     ];
 
-                    $success &= $this->inventory->insert($inv_data, false);
+                    $success = $success && $this->inventory->insert($invData, false);
                 }
             }
-            $this->saveItemAttributes($item_id);
-
-            if ($success && $upload_success) {
-                $message = lang('Items.successful_' . ($new_item ? 'adding' : 'updating')) . ' ' . $item_data['name'];
-
-                return $this->response->setJSON(['success' => true, 'message' => $message, 'id' => $item_id]);
-            } else {
-                $message = $upload_success ? lang('Items.error_adding_updating') . ' ' . $item_data['name'] : strip_tags($upload_data['error']);
-
-                return $this->response->setJSON(['success' => false, 'message' => $message, 'id' => $item_id]);
-            }
-        } else {
-            $message = lang('Items.error_adding_updating') . ' ' . $item_data['name'];
-
-            return $this->response->setJSON(['success' => false, 'message' => $message, 'id' => NEW_ENTRY]);
+            $success = $success && $this->saveItemAttributes($itemId);
         }
+
+        // Check all success conditions before committing
+        if ($success && $uploadSuccess) {
+            $db->transCommit();
+            $message = lang('Items.successful_' . ($newItem ? 'adding' : 'updating')) . ' ' . $itemData['name'];
+
+            return $this->response->setJSON(['success' => true, 'message' => $message, 'id' => $itemId]);
+        }
+
+        // Rollback on failure
+        $db->transRollback();
+        $message = $uploadSuccess ? lang('Items.error_adding_updating') . ' ' . $itemData['name'] : strip_tags($uploadData['error']);
+
+        return $this->response->setJSON(['success' => false, 'message' => $message, 'id' => $itemId]);
     }
 
     /**
@@ -769,7 +933,7 @@ class Items extends Secure_Controller
 
         $filename = $file->getClientName();
         $info = pathinfo($filename);
-        
+
         // Sanitize filename to remove problematic characters like spaces
         $sanitized_name = preg_replace('/[^a-zA-Z0-9_\-\.]/', '_', $info['filename']);
 
@@ -873,37 +1037,34 @@ class Items extends Secure_Controller
      */
     public function postBulkUpdate(): ResponseInterface
     {
-        $items_to_update = $this->request->getPost('item_ids');
-        $item_data = [];
+        $validationError = $this->validateBulkUpdateFields();
 
-        foreach (Item::ALLOWED_BULK_EDIT_FIELDS as $field) {
-            $value = $this->request->getPost($field);
-            if ($field === 'supplier_id' && $value !== '') {
-                $item_data[$field] = $value;
-            } elseif ($value !== null && $value !== '') {
-                $item_data[$field] = $value;
-            }
+        if ($validationError !== null) {
+            return $validationError;
         }
 
-        // Item data could be empty if tax information is being updated
-        if (empty($item_data) || $this->item->update_multiple($item_data, $items_to_update)) {
-            $items_taxes_data = [];
-            $tax_names = $this->request->getPost('tax_names');
-            $tax_percents = $this->request->getPost('tax_percents');
-            $tax_updated = false;
+        $itemsToUpdate = $this->request->getPost('item_ids');
+        $itemData = Item::filterBulkEditFields($this->request->getPost() ?? []);
 
-            foreach ($tax_percents as $tax_percent) {
-                if (!empty($tax_names[$tax_percent]) && is_numeric($tax_percents[$tax_percent])) {
-                    $tax_updated = true;
-                    $items_taxes_data[] = ['name' => $tax_names[$tax_percent], 'percent' => $tax_percents[$tax_percent]];
+        // Item data could be empty if tax information is being updated
+        if (empty($itemData) || $this->item->updateMultiple($itemData, $itemsToUpdate)) {
+            $itemsTaxesData = [];
+            $taxNames = $this->request->getPost('tax_names');
+            $taxPercents = $this->request->getPost('tax_percents');
+            $taxUpdated = false;
+
+            foreach ($taxPercents as $tax_percent) {
+                if (!empty($taxNames[$tax_percent]) && is_numeric($taxPercents[$tax_percent])) {
+                    $taxUpdated = true;
+                    $itemsTaxesData[] = ['name' => $taxNames[$tax_percent], 'percent' => $taxPercents[$tax_percent]];
                 }
             }
 
-            if ($tax_updated) {
-                $this->item_taxes->save_multiple($items_taxes_data, $items_to_update);
+            if ($taxUpdated) {
+                $this->item_taxes->save_multiple($itemsTaxesData, $itemsToUpdate);
             }
 
-            return $this->response->setJSON(['success' => true, 'message' => lang('Items.successful_bulk_edit'), 'id' => $items_to_update]);
+            return $this->response->setJSON(['success' => true, 'message' => lang('Items.successful_bulk_edit'), 'id' => $itemsToUpdate]);
         } else {
             return $this->response->setJSON(['success' => false, 'message' => lang('Items.error_updating_multiple')]);
         }
@@ -932,11 +1093,11 @@ class Items extends Secure_Controller
      */
     public function getGenerateCsvFile(): DownloadResponse
     {
-        helper('importfile_helper');
+        helper('importfile');
         $name = 'import_items.csv';
         $allowed_locations = $this->stock_location->get_allowed_locations();
-        $allowed_attributes = $this->attribute->get_definition_names();
-        $data = generate_import_items_csv($allowed_locations, $allowed_attributes);
+        $allowedAttributes = $this->attribute->getDefinitionNames();
+        $data = generate_import_items_csv($allowed_locations, $allowedAttributes);
 
         return $this->response->download($name, $data);
     }
@@ -951,14 +1112,13 @@ class Items extends Secure_Controller
     }
 
     /**
-     * Imports items from CSV formatted file.
+     * Imports items from a CSV formatted file.
      * @return ResponseInterface
-     * @throws ReflectionException
      * @noinspection PhpUnused
      */
     public function postImportCsvFile(): ResponseInterface
     {
-        helper('importfile_helper');
+        helper('importfile');
         try {
             if ($_FILES['file_path']['error'] !== UPLOAD_ERR_OK) {
                 return $this->response->setJSON(['success' => false, 'message' => lang('Items.csv_import_failed')]);
@@ -967,33 +1127,39 @@ class Items extends Secure_Controller
                     set_time_limit(240);
 
                     $failCodes = [];
-                    $csv_rows = get_csv_file($_FILES['file_path']['tmp_name']);
-                    $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-                    $allowed_stock_locations = $this->stock_location->get_allowed_locations();
-                    $attribute_definition_names    = $this->attribute->get_definition_names();
+                    $csvRows = get_csv_file($_FILES['file_path']['tmp_name']);
+                    $allowedStockLocations = $this->stock_location->get_allowed_locations();
+                    $attributeDefinitionNames    = $this->attribute->getDefinitionNames();
 
-                    unset($attribute_definition_names[NEW_ENTRY]);    // Removes the common_none_selected_text from the array
+                    if (!csvImportHasRequiredItemHeaders($csvRows, $allowedStockLocations, $attributeDefinitionNames)) {
+                        return $this->response->setJSON(['success' => false, 'message' => lang('Items.csv_import_nodata_wrongformat')]);
+                    }
 
-                    $attribute_data = [];
+                    $employeeId = $this->employee->get_logged_in_employee_info()->person_id;
 
-                    foreach ($attribute_definition_names as $definition_name) {
-                        $attribute_data[$definition_name] = $this->attribute->get_definition_by_name($definition_name)[0];
+                    unset($attributeDefinitionNames[NEW_ENTRY]);    // Removes the common_none_selected_text from the array
 
-                        if ($attribute_data[$definition_name]['definition_type'] === DROPDOWN) {
-                            $attribute_data[$definition_name]['dropdown_values'] = $this->attribute->get_definition_values($attribute_data[$definition_name]['definition_id']);
+                    $attributeData = [];
+
+
+                    foreach ($attributeDefinitionNames as $definitionName) {
+                        $attributeData[$definitionName] = $this->attribute->getDefinitionByName($definitionName);
+
+                        if ($attributeData[$definitionName]['definition_type'] === DROPDOWN) {
+                            $attributeData[$definitionName]['dropdown_values'] = $this->attribute->getDefinitionValues($attributeData[$definitionName]['definition_id']);
                         }
                     }
                     $db = db_connect();
                     $db->transBegin();    // TODO: This section needs to be reworked so that the data array is being created then passed to the Item model because $db doesn't exist in the controller without being instantiated, but database operations should be restricted to the model
 
-                    foreach ($csv_rows as $key => $row) {
-                        $is_failed_row = false;
-                        $item_id = (int)$row['Id'];
-                        $is_update = ($item_id > 0);
-                        $item_data = [
-                            'item_id'       => $item_id,
+                    foreach ($csvRows as $key => $row) {
+                        $isFailedRow = false;
+                        $itemId = (int)$row['Id'];
+                        $isUpdate = ($itemId > 0);
+                        $itemData = [
+                            'item_id'       => $itemId,
                             'name'          => $row['Item Name'],
-                            'description'   => $row['Description'],
+                            'description'   => filter_var($row['Description'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                             'category'      => $row['Category'],
                             'cost_price'    => $row['Cost Price'],
                             'unit_price'    => $row['Unit Price'],
@@ -1003,25 +1169,26 @@ class Items extends Secure_Controller
                             'pic_filename'  => $row['Image']
                         ];
 
-                        if (!empty($row['supplier ID'])) {
-                            $item_data['supplier_id'] = $this->supplier->exists($row['Supplier ID']) ? $row['Supplier ID'] : null;
+                        if (!empty($row['Supplier ID'])) {
+                            $itemData['supplier_id'] = $this->supplier->exists($row['Supplier ID']) ? $row['Supplier ID'] : null;
                         }
 
-                        if ($is_update) {
-                            $item_data['allow_alt_description'] = empty($row['Allow Alt Description']) ? null : $row['Allow Alt Description'];
-                            $item_data['is_serialized'] = empty($row['Item has Serial Number']) ? null : $row['Item has Serial Number'];
+                        if ($isUpdate) {
+                            $itemData['allow_alt_description'] = $row['Allow Alt Description'] === '' ? null : $row['Allow Alt Description'];
+                            $itemData['is_serialized'] = $row['Item has Serial Number'] === '' ? null : $row['Item has Serial Number'];
                         } else {
-                            $item_data['allow_alt_description'] = empty($row['Allow Alt Description']) ? '0' : '1';
-                            $item_data['is_serialized'] = empty($row['Item has Serial Number']) ? '0' : '1';
+                            $itemData['allow_alt_description'] = $row['Allow Alt Description'] === '' ? '0' : '1';
+                            $itemData['is_serialized'] = $row['Item has Serial Number'] === '' ? '0' : '1';
                         }
 
-                        if (!empty($row['Barcode']) && !$is_update) {
-                            $item_data['item_number'] = $row['Barcode'];
-                            $is_failed_row = $this->item->item_number_exists($item_data['item_number']);
+                        if (!empty($row['Barcode'])) {
+                            $itemData['item_number'] = $row['Barcode'];
+                            $isFailedRow = $this->item->item_number_exists($itemData['item_number'], $itemId);
                         }
 
-                        if (!$is_failed_row) {
-                            $invalidLocations = $this->validateCSVStockLocations($row, $allowedStockLocations);
+                        if (!$isFailedRow) {
+                            $allowedStockLocations = $this->stock_location->get_allowed_locations();
+                            $isFailedRow = $this->validateCSVData($row, $itemData, $allowedStockLocations, $attributeDefinitionNames, $attributeData);
                             if (!empty($invalidLocations)) {
                                 $isFailedRow = true;
                                 log_message('error', 'CSV import: Invalid stock location(s) found: ' . implode(', ', $invalidLocations));
@@ -1029,28 +1196,41 @@ class Items extends Secure_Controller
                         }
 
                         // Remove false, null, '' and empty strings but keep 0
-                        $item_data = array_filter($item_data, function ($value) {
+                        $itemData = array_filter($itemData, function ($value) {
                             return $value !== null && strlen($value);
                         });
 
-                        if (!$is_failed_row && $this->item->save_value($item_data, $item_id)) {
-                            $this->save_tax_data($row, $item_data);
-                            $this->save_inventory_quantities($row, $item_data, $allowed_stock_locations, $employee_id);
-                            $is_failed_row = $this->save_attribute_data($row, $item_data, $attribute_data);    // TODO: $is_failed_row never gets used after this.
+                        if (!$isFailedRow && $this->item->save_value($itemData, $itemId)) {
+                            if (!$this->save_tax_data($row, $itemData)) {
+                                $isFailedRow = true;
+                            }
+                            if (!$this->save_inventory_quantities($row, $itemData, $allowedStockLocations, $employeeId)) {
+                                $isFailedRow = true;
+                            }
+                            $csvAttributeValues = $this->extractAttributeData($row);
+                            if (!$this->attribute->saveCSVRowAttributeData($csvAttributeValues, $itemData, $attributeData)) {
+                                $isFailedRow = true;
+                            }
+                            if ($isFailedRow) {
+                                $failedRow = $key + 2;
+                                $failCodes[] = $failedRow;
+                                log_message('error', "CSV Item import failed on line $failedRow while saving item.");
+                                continue;
+                            }
 
-                            if ($is_update) {
-                                $item_data = array_merge($item_data, get_object_vars($this->item->get_info_by_id_or_number($item_id)));
+                            if ($isUpdate) {
+                                $itemData = array_merge($itemData, get_object_vars($this->item->get_info_by_id_or_number($itemId)));
                             }
                         } else {
-                            $failed_row = $key + 2;
-                            $failCodes[] = $failed_row;
-                            log_message('error', "CSV Item import failed on line $failed_row. This item was not imported.");
+                            $failedRow = $key + 2;
+                            $failCodes[] = $failedRow;
+                            log_message('error', "CSV Item import failed on line $failedRow. This item was not imported.");
                         }
 
-                        unset($csv_rows[$key]);
+                        unset($csvRows[$key]);
                     }
 
-                    $csv_rows = null;
+                    $csvRows = null;
 
                     if (count($failCodes) > 0) {
                         $message = lang('Items.csv_import_partially_failed', [count($failCodes), implode(', ', $failCodes)]);
@@ -1058,6 +1238,7 @@ class Items extends Secure_Controller
                         return $this->response->setJSON(['success' => false, 'message' => $message]);
                     } else {
                         $db->transCommit();
+                        $this->attribute->deleteOrphanedValues();
 
                         return $this->response->setJSON(['success' => true, 'message' => lang('Items.csv_import_success')]);
                     }
@@ -1071,6 +1252,20 @@ class Items extends Secure_Controller
 
     }
 
+    private function extractAttributeData(array $row): array
+    {
+        $attributeData = [];
+
+        foreach ($row as $key => $value) {
+            if (str_starts_with($key, 'attribute_')) {
+                $definitionName = substr($key, 10);
+                $attributeData[$definitionName] = $value;
+            }
+        }
+
+        return $attributeData;
+    }
+
     /**
      * Validates that stock location columns in CSV row are valid locations
      *
@@ -1099,87 +1294,109 @@ class Items extends Secure_Controller
      * Checks the entire line of data in an import file for errors
      *
      * @param array $row
-     * @param array $item_data
-     * @param array $allowed_locations
-     * @param array $definition_names
-     * @param array $attribute_data
+     * @param array $itemData
+     * @param array $allowedStockLocations
+     * @param array $definitionNames
+     * @param array $attributeData
      * @return    bool    Returns false if all data checks out and true when there is an error in the data
      */
-    private function data_error_check(array $row, array $item_data, array $allowed_locations, array $definition_names, array $attribute_data): bool    // TODO: Long function and large number of parameters in the declaration... perhaps refactoring is needed
+    private function validateCSVData(array $row, array $itemData, array $allowedStockLocations, array $definitionNames, array $attributeData): bool    // TODO: Long function and large number of parameters in the declaration... perhaps refactoring is needed
     {
-        $item_id = $row['Id'];
-        $is_update = (bool)$item_id;
+        $itemId = $row['Id'];
+        $isUpdate = (bool)$itemId;
 
         // Check for empty required fields
-        $check_for_empty = [
-            'name'       => $item_data['name'],
-            'category'   => $item_data['category'],
-            'unit_price' => $item_data['unit_price']
+        $valuesToCheckForEmpty = [
+            'name'       => $itemData['name'],
+            'category'   => $itemData['category'],
+            'unit_price' => $itemData['unit_price']
         ];
 
-        foreach ($check_for_empty as $key => $val) {
-            if (empty($val) && !$is_update) {
+        foreach ($valuesToCheckForEmpty as $key => $value) {
+            if (($value === null || $value === '') && !$isUpdate) {
                 log_message('error', "Empty required value in $key.");
                 return true;
             }
         }
 
-        if (!$is_update) {
-            $item_data['cost_price'] = empty($item_data['cost_price']) ? 0 : $item_data['cost_price'];    // Allow for zero wholesale price
+        if (!$isUpdate) {
+            $itemData['cost_price'] = empty($itemData['cost_price']) ? 0 : $itemData['cost_price'];    // Allow for zero wholesale price
         } else {
-            if (!$this->item->exists($item_id)) {
-                log_message('error', "non-existent item_id: '$item_id' when either existing item_id or no item_id is required.");
+            if (!$this->item->exists($itemId)) {
+                log_message('error', "non-existent item_id: '$itemId' when either existing item_id or no item_id is required.");
                 return true;
             }
         }
 
         // Build array of fields to check for numerics
-        $check_for_numeric_values = [
-            'cost_price'    => $item_data['cost_price'],
-            'unit_price'    => $item_data['unit_price'],
-            'reorder_level' => $item_data['reorder_level'],
+        $valuesToCheckForNumeric = [
+            'cost_price'    => $itemData['cost_price'],
+            'unit_price'    => $itemData['unit_price'],
+            'reorder_level' => $itemData['reorder_level'],
             'supplier_id'   => $row['Supplier ID'],
             'Tax 1 Percent' => $row['Tax 1 Percent'],
             'Tax 2 Percent' => $row['Tax 2 Percent']
         ];
 
-        foreach ($allowed_locations as $location_name) {
-            $check_for_numeric_values[] = $row["location_$location_name"];
+        foreach ($allowedStockLocations as $location_name) {
+            $valuesToCheckForNumeric[] = $row["location_$location_name"];
         }
 
         // Check for non-numeric values which require numeric
-        foreach ($check_for_numeric_values as $key => $value) {
+        foreach ($valuesToCheckForNumeric as $key => $value) {
             if (!is_numeric($value) && !empty($value)) {
                 log_message('error', "non-numeric: '$value' for '$key' when numeric is required");
                 return true;
             }
         }
 
+        // Check item_number for disallowed characters
+        if (!empty($itemData['item_number'])) {
+            $formatRules = new FormatRules();
+
+            if (!$formatRules->alpha_numeric_punct($itemData['item_number'])) {
+                log_message('error', "invalid item_number: '{$itemData['item_number']}' contains disallowed characters");
+                return true;
+            }
+        }
+
+        // Check stock locations
+        $invalidLocations = $this->validateCSVStockLocations($row, $allowedStockLocations);
+        if (!empty($invalidLocations)) {
+            log_message('error', 'CSV import: Invalid stock location(s) found: ' . implode(', ', $invalidLocations));
+            return true;
+        }
+
         // Check Attribute Data
-        foreach ($definition_names as $definition_name) {
-            if (!empty($row["attribute_$definition_name"])) {
-                $definition_type = $attribute_data[$definition_name]['definition_type'];
-                $attribute_value = $row["attribute_$definition_name"];
+        foreach ($definitionNames as $definitionName) {
+            $attributeColumn = "attribute_$definitionName";
+            if (array_key_exists($attributeColumn, $row) && $row[$attributeColumn] != '') {
+                $definitionType = $attributeData[$definitionName]['definition_type'];
+                $attributeValue = $row[$attributeColumn];
 
-                switch ($definition_type) {
+                if (strcasecmp($attributeValue, '_DELETE_') === 0) {
+                    continue;
+                }
+
+                switch ($definitionType) {
                     case DROPDOWN:
-                        $dropdown_values = $attribute_data[$definition_name]['dropdown_values'];
-                        $dropdown_values[] = '';
+                        $dropdownValues = $attributeData[$definitionName]['dropdown_values'];
+                        $dropdownValues[] = '';
 
-                        if (!empty($attribute_value) && !in_array($attribute_value, $dropdown_values)) {
-                            log_message('error', "Value: '$attribute_value' is not an acceptable DROPDOWN value");
+                        if (!empty($attributeValue) && !in_array($attributeValue, $dropdownValues)) {
+                            log_message('error', "Value: '$attributeValue' is not an acceptable DROPDOWN value");
                             return true;
                         }
                         break;
                     case DECIMAL:
-                        if (!is_numeric($attribute_value) && !empty($attribute_value)) {
-                            log_message('error', "'$attribute_value' is not an acceptable DECIMAL value");
+                        if (!is_numeric($attributeValue) && !empty($attributeValue)) {
+                            log_message('error', "'$attributeValue' is not an acceptable DECIMAL value");
                             return true;
                         }
                         break;
                     case DATE:
-                        if (!valid_date($attribute_value) && !empty($attribute_value)) {
-                            log_message('error', "'$attribute_value' is not an acceptable DATE value. The value must match the set locale.");
+                        if (!isValidDate($attributeValue) && !empty($attributeValue)) {
+                            log_message('error', "'$attributeValue' is not an acceptable DATE value. The value must match the set locale.");
                             return true;
                         }
                         break;
@@ -1190,59 +1407,6 @@ class Items extends Secure_Controller
         return false;
     }
 
-    /**
-     * Saves attribute data found in the CSV import.
-     *
-     * @param array $row
-     * @param array $item_data
-     * @param array $definitions
-     * @return bool
-     */
-    private function save_attribute_data(array $row, array $item_data, array $definitions): bool
-    {
-        foreach ($definitions as $definition) {
-            $attribute_name = $definition['definition_name'];
-            $attribute_value = $row["attribute_$attribute_name"];
-
-            // Create attribute value
-            if (!empty($attribute_value) || $attribute_value === '0') {
-                if ($definition['definition_type'] === CHECKBOX) {
-                    $checkbox_is_unchecked = (strcasecmp($attribute_value, 'false') === 0 || $attribute_value === '0');
-                    $attribute_value = $checkbox_is_unchecked ? '0' : '1';
-
-                    $attribute_id = $this->store_attribute_value($attribute_value, $definition, $item_data['item_id']);
-                } elseif (!empty($attribute_value)) {
-                    $attribute_id = $this->store_attribute_value($attribute_value, $definition, $item_data['item_id']);
-                } else {
-                    return true;
-                }
-
-                if (!$attribute_id) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Saves the attribute_value and attribute_link if necessary
-     */
-    private function store_attribute_value(string $value, array $attribute_data, int $item_id)
-    {
-        $attribute_id = $this->attribute->attributeValueExists($value, $attribute_data['definition_type']);
-
-        $this->attribute->deleteAttributeLinks($item_id, $attribute_data['definition_id']);
-
-        if (!$attribute_id) {
-            $attribute_id = $this->attribute->saveAttributeValue($value, $attribute_data['definition_id'], $item_id, false, $attribute_data['definition_type']);
-        } elseif (!$this->attribute->saveAttributeLink($item_id, $attribute_data['definition_id'], $attribute_id)) {
-            return false;
-        }
-
-        return $attribute_id;
-    }
-
     /**
      * Saves inventory quantities for the row in the appropriate stock locations.
      *
@@ -1250,13 +1414,15 @@ class Items extends Secure_Controller
      * @param array $item_data
      * @param array $allowed_locations
      * @param int $employee_id
+     * @return bool Returns true on success, false on failure
      * @throws ReflectionException
      */
-    private function save_inventory_quantities(array $row, array $item_data, array $allowed_locations, int $employee_id): void
+    private function save_inventory_quantities(array $row, array $item_data, array $allowed_locations, int $employee_id): bool
     {
         // Quantities & Inventory Section
         $comment = lang('Items.inventory_CSV_import_quantity');
         $is_update = (bool)$row['Id'];
+        $success = true;
 
         foreach ($allowed_locations as $location_id => $location_name) {
             $item_quantity_data = ['item_id' => $item_data['item_id'], 'location_id' => $location_id];
@@ -1270,20 +1436,22 @@ class Items extends Secure_Controller
 
             if (!empty($row["location_$location_name"]) || $row["location_$location_name"] === '0') {
                 $item_quantity_data['quantity'] = $row["location_$location_name"];
-                $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
+                $success &= $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
                 $csv_data['trans_inventory'] = $row["location_$location_name"];
-                $this->inventory->insert($csv_data, false);
+                $success &= (bool)$this->inventory->insert($csv_data, false);
             } elseif ($is_update) {
-                return;
+                continue;
             } else {
                 $item_quantity_data['quantity'] = 0;
-                $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
+                $success &= $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
                 $csv_data['trans_inventory'] = 0;
-                $this->inventory->insert($csv_data, false);
+                $success &= (bool)$this->inventory->insert($csv_data, false);
             }
         }
+
+        return (bool)$success;
     }
 
     /**
@@ -1291,8 +1459,9 @@ class Items extends Secure_Controller
      *
      * @param array $row
      * @param array $item_data
+     * @return bool Returns true on success, false on failure
      */
-    private function save_tax_data(array $row, array $item_data): void
+    private function save_tax_data(array $row, array $item_data): bool
     {
         $items_taxes_data = [];
 
@@ -1304,9 +1473,11 @@ class Items extends Secure_Controller
             $items_taxes_data[] = ['name' => $row['Tax 2 Name'], 'percent' => $row['Tax 2 Percent']];
         }
 
-        if (isset($items_taxes_data)) {
-            $this->item_taxes->save_value($items_taxes_data, $item_data['item_id']);
+        if (!empty($items_taxes_data)) {
+            return $this->item_taxes->save_value($items_taxes_data, $item_data['item_id']);
         }
+
+        return true;
     }
 
     /**
@@ -1336,10 +1507,11 @@ class Items extends Secure_Controller
      * Saves item attributes for a given item.
      *
      * @param int $itemId The item for which attributes need to be saved to.
-     * @return void
+     * @return bool Returns true when item attributes are successfully saved and false on error.
      */
-    public function saveItemAttributes(int $itemId): void
+    public function saveItemAttributes(int $itemId): bool
     {
+        $success = true;
         $attributeLinks = $this->request->getPost('attribute_links') ?? [];
         $attributeIds = $this->request->getPost('attribute_ids');
 
@@ -1351,16 +1523,18 @@ class Items extends Secure_Controller
             switch ($definitionType) {
                 case DROPDOWN:
                     $attributeId = $attributeValue;
+                    $success = $success && $this->attribute->saveAttributeLink($itemId, $definitionId, $attributeId);
                     break;
                 case DECIMAL:
                     $attributeValue = parse_decimals($attributeValue);
-                // Fall through to save the attribute value
+                    // no break
                 default:
                     $attributeId = $this->attribute->saveAttributeValue($attributeValue, $definitionId, $itemId, $attributeIds[$definitionId], $definitionType);
+                    $success = $success && ($attributeId > 0);
                     break;
             }
-
-            $this->attribute->saveAttributeLink($itemId, $definitionId, $attributeId);
         }
+
+        return $success && $this->attribute->deleteOrphanedValues();
     }
 }
diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php
index 48f723144..f5184f4d0 100644
--- a/app/Controllers/Login.php
+++ b/app/Controllers/Login.php
@@ -5,6 +5,7 @@ namespace App\Controllers;
 use App\Libraries\MY_Migration;
 use App\Models\Employee;
 use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Model;
 use Config\OSPOS;
 use Config\Services;
@@ -17,28 +18,40 @@ class Login extends BaseController
     public Model $employee;
 
     /**
-     * @return RedirectResponse|string
+     * @return RedirectResponse|ResponseInterface|string
      */
-    public function index(): string|RedirectResponse
+    public function index(): string|RedirectResponse|ResponseInterface
     {
         $this->employee = model(Employee::class);
         if (!$this->employee->is_logged_in()) {
             $migration = new MY_Migration(config('Migrations'));
             $config = config(OSPOS::class)->settings;
 
-            $gcaptcha_enabled = array_key_exists('gcaptcha_enable', $config)
+            $gcaptchaEnabled = array_key_exists('gcaptcha_enable', $config)
                 ? $config['gcaptcha_enable']
                 : false;
 
-            $migration->migrate_to_ci4();
+            $migration->migrateToCI4();
+
+            $currentVersion = MY_Migration::getCurrentVersion();
+
+            if ($currentVersion === null) {
+                return $this->response->setJSON([
+                    'success' => false,
+                    'message' => lang('Login.migration_error_connection')
+                ])->setStatusCode(503);
+            }
+
+            $latestVersion = $migration->getLatestMigration();
 
             $validation = Services::validation();
 
             $data = [
-                'has_errors'       => false,
-                'is_latest'        => $migration->is_latest(),
-                'latest_version'   => $migration->get_latest_migration(),
-                'gcaptcha_enabled' => $gcaptcha_enabled,
+                'hasErrors'       => false,
+                'isNewInstall'   => $currentVersion === 0,
+                'isLatest'        => $latestVersion === $currentVersion,
+                'latestVersion'   => $latestVersion,
+                'gcaptchaEnabled' => $gcaptchaEnabled,
                 'config'           => $config,
                 'validation'       => $validation
             ];
@@ -47,6 +60,13 @@ class Login extends BaseController
                 return view('login', $data);
             }
 
+            if (!$data['isLatest'] || $data['isNewInstall']) {
+                set_time_limit(3600);
+
+                $migration->setNamespace('App')->latest();
+                return redirect()->to('login');
+            }
+
             $rules = ['username' => 'required|login_check[data]'];
             $messages = [
                 'username' => [
@@ -56,19 +76,65 @@ class Login extends BaseController
             ];
 
             if (!$this->validate($rules, $messages)) {
-                $data['has_errors'] = !empty($validation->getErrors());
+                $data['hasErrors'] = !empty($validation->getErrors());
 
                 return view('login', $data);
             }
-
-            if (!$data['is_latest']) {
-                set_time_limit(3600);
-
-                $migration->setNamespace('App')->latest();
-                return redirect()->to('login');
-            }
         }
 
         return redirect()->to('home');
     }
+
+    public function migrate(): ResponseInterface
+    {
+        $currentVersion = MY_Migration::getCurrentVersion();
+
+        if ($currentVersion === null) {
+            return $this->response->setJSON([
+                'success' => false,
+                'message' => lang('Login.migration_error_connection')
+            ])->setStatusCode(503);
+        }
+
+        // Only a confirmed empty database counts as a new install with no credentials to check.
+        $isNewInstall = $currentVersion === 0;
+
+        if (!$isNewInstall) {
+            $rules = ['username' => 'required|login_check[data]'];
+            $messages = [
+                'username' => [
+                    'required'    => lang('Login.required_username'),
+                    'login_check' => lang('Login.invalid_username_and_password'),
+                ]
+            ];
+
+            if (!$this->validate($rules, $messages)) {
+                return $this->response->setJSON([
+                    'success' => false,
+                    'message' => lang('Login.invalid_username_and_password')
+                ])->setStatusCode(401);
+            }
+        }
+
+        try {
+            $migration = new MY_Migration(config('Migrations'));
+            $migration->migrateToCI4();
+
+            set_time_limit(3600);
+            $migration->setNamespace('App')->latest();
+
+            return $this->response->setJSON([
+                'success' => true,
+                'message' => 'Migration completed successfully'
+            ]);
+
+        } catch (\Exception $e) {
+            log_message('error', 'Migration failed: ' . $e->getMessage());
+
+            return $this->response->setJSON([
+                'success' => false,
+                'message' => 'Migration failed: ' . $e->getMessage()
+            ])->setStatusCode(500);
+        }
+    }
 }
diff --git a/app/Controllers/No_access.php b/app/Controllers/No_access.php
index 87716c758..c0bcdff14 100644
--- a/app/Controllers/No_access.php
+++ b/app/Controllers/No_access.php
@@ -2,8 +2,10 @@
 
 namespace App\Controllers;
 
+use App\Models\Employee;
 use App\Models\Module;
 use CodeIgniter\HTTP\ResponseInterface;
+use Config\OSPOS;
 
 /**
  * Part of the grants mechanism to restrict access to modules that the user doesn't have permission for.
@@ -13,10 +15,12 @@ use CodeIgniter\HTTP\ResponseInterface;
  */
 class No_access extends BaseController
 {
+    private Employee $employee;
     private Module $module;
 
     public function __construct()
     {
+        $this->employee = model(Employee::class);
         $this->module = model(Module::class);
     }
 
@@ -30,6 +34,20 @@ class No_access extends BaseController
         $data['module_name']   = $this->module->get_module_name($module_id);
         $data['permission_id'] = $permission_id;
 
-        return view('no_access', $data);
+        $userInfo = $this->employee->get_logged_in_employee_info();
+        if ($userInfo === false || $this->request->isAJAX()) {
+            return view('no_access', $data);
+        }
+
+        $menuGroup = session()->get('menu_group');
+        $allowedModules = $menuGroup == 'home'
+            ? $this->module->get_allowed_home_modules($userInfo->person_id)
+            : $this->module->get_allowed_office_modules($userInfo->person_id);
+
+        $data['user_info']       = $userInfo;
+        $data['allowed_modules'] = $allowedModules->getResult();
+        $data['config']          = config(OSPOS::class)->settings;
+
+        return view('partial/header', $data) . view('no_access', $data) . view('partial/footer');
     }
 }
diff --git a/app/Controllers/Receivings.php b/app/Controllers/Receivings.php
index 52f0169ac..0256546c1 100644
--- a/app/Controllers/Receivings.php
+++ b/app/Controllers/Receivings.php
@@ -190,11 +190,11 @@ class Receivings extends Secure_Controller
     /**
      * Edit line item in current receiving. Used in app/Views/receivings/receiving.php
      *
-     * @param string|int|null $item_id
+     * @param int|string|null $item_id
      * @return string
      * @noinspection PhpUnused
      */
-    public function postEditItem($item_id): string
+    public function postEditItem(int|string|null $item_id): string
     {
         $data = [];
 
@@ -241,15 +241,26 @@ class Receivings extends Secure_Controller
             $data['suppliers'][$supplier->person_id] = $supplier->first_name . ' ' . $supplier->last_name;
         }
 
+        $receiving_info = $this->receiving->get_info($receiving_id)->getRowArray();
+
+        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+        $can_assign_employee = $this->employee->has_grant('employees', $current_employee_id);
+
         $data['employees'] = [];
-        foreach ($this->employee->get_all()->getResult() as $employee) {
-            $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
+        if ($can_assign_employee) {
+            foreach ($this->employee->get_all()->getResult() as $employee) {
+                $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
+            }
+        } else {
+            $stored_employee_id = $receiving_info['employee_id'];
+            $stored_employee = $this->employee->get_info($stored_employee_id);
+            $data['employees'][$stored_employee_id] = $stored_employee->first_name . ' ' . $stored_employee->last_name;
         }
 
-        $receiving_info = $this->receiving->get_info($receiving_id)->getRowArray();
         $data['selected_supplier_name'] = !empty($receiving_info['supplier_id']) ? $receiving_info['company_name'] : '';
         $data['selected_supplier_id'] = $receiving_info['supplier_id'];
         $data['receiving_info'] = $receiving_info;
+        $data['can_assign_employee'] = $can_assign_employee;
 
         return view('receivings/form', $data);
     }
@@ -269,8 +280,10 @@ class Receivings extends Secure_Controller
     }
 
     /**
-     * @throws ReflectionException
+     * @param int $receiving_id
+     * @param bool $update_inventory
      * @return ResponseInterface
+     * @throws ReflectionException
      */
     public function postDelete(int $receiving_id = -1, bool $update_inventory = true): ResponseInterface
     {
@@ -491,10 +504,20 @@ class Receivings extends Secure_Controller
         $date_formatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $newdate);
         $receiving_time = $date_formatter->format('Y-m-d H:i:s');
 
+        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+        $submitted_employee_id = $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT);
+
+        if (!$this->employee->has_grant('employees', $current_employee_id)) {
+            $existing_receiving = $this->receiving->get_info($receiving_id)->getRowArray();
+            $employee_id = $existing_receiving['employee_id'];
+        } else {
+            $employee_id = $submitted_employee_id;
+        }
+
         $receiving_data = [
             'receiving_time' => $receiving_time,
             'supplier_id'    => $this->request->getPost('supplier_id') ? $this->request->getPost('supplier_id', FILTER_SANITIZE_NUMBER_INT) : null,
-            'employee_id'    => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
+            'employee_id'    => $employee_id,
             'comment'        => $this->request->getPost('comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             'reference'      => $this->request->getPost('reference') != '' ? $this->request->getPost('reference', FILTER_SANITIZE_FULL_SPECIAL_CHARS) : null
         ];
diff --git a/app/Controllers/Reports.php b/app/Controllers/Reports.php
index 6cd8599e6..f01249515 100644
--- a/app/Controllers/Reports.php
+++ b/app/Controllers/Reports.php
@@ -25,6 +25,7 @@ use App\Models\Reports\Summary_sales;
 use App\Models\Reports\Summary_sales_taxes;
 use App\Models\Reports\Summary_suppliers;
 use App\Models\Reports\Summary_taxes;
+use CodeIgniter\HTTP\Exceptions\RedirectException;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;
@@ -55,8 +56,8 @@ class Reports extends Secure_Controller
     {
         parent::__construct('reports');
         $request = Services::request();
-        $method_name = $request->getUri()->getSegment(2);
-        $exploder = explode('_', $method_name);
+        $methodName = urldecode($request->getUri()->getSegment(2));
+        $exploder = explode('_', $methodName);
 
         $this->attribute = config(Attribute::class);
         $this->config = config(OSPOS::class)->settings;
@@ -79,15 +80,16 @@ class Reports extends Secure_Controller
         $this->inventory_summary = model(Inventory_summary::class);
 
         if (sizeof($exploder) > 1) {
-            preg_match('/(?:inventory)|([^_.]*)(?:_graph|_row)?$/', $method_name, $matches);
+            preg_match('/(?:inventory)|([^_.]*)(?:_graph|_row)?$/', $methodName, $matches);
             preg_match('/^(.*?)([sy])?$/', array_pop($matches), $matches);
-            $submodule_id = $matches[1] . ((count($matches) > 2) ? $matches[2] : 's');
+            $submoduleId = $matches[1] . ((count($matches) > 2) ? $matches[2] : 's');
+        } else {
+            $submoduleId = null;
+        }
 
-            // Check access to report submodule
-            if (!$this->employee->has_grant('reports_' . $submodule_id, $this->employee->get_logged_in_employee_info()->person_id)) {
-                header('Location: ' . base_url('no_access/reports/reports_' . $submodule_id));
-                exit();
-            }
+        // Check access to report submodule
+        if ($submoduleId !== null && !$this->employee->has_grant('reports_' . $submoduleId, $this->employee->get_logged_in_employee_info()->person_id)) {
+            throw new RedirectException('no_access/reports/reports_' . $submoduleId);
         }
 
         helper('report');
@@ -1246,13 +1248,15 @@ class Reports extends Secure_Controller
     public function get_payment_type(): array
     {
         return [
-            'all'      => lang('Common.none_selected_text'),
-            'cash'     => lang('Sales.cash'),
-            'due'      => lang('Sales.due'),
-            'check'    => lang('Sales.check'),
-            'credit'   => lang('Sales.credit'),
-            'debit'    => lang('Sales.debit'),
-            'invoices' => lang('Sales.invoice')
+            'all'           => lang('Common.none_selected_text'),
+            'cash'          => lang('Sales.cash'),
+            'due'           => lang('Sales.due'),
+            'check'         => lang('Sales.check'),
+            'credit'        => lang('Sales.credit'),
+            'debit'         => lang('Sales.debit'),
+            'bank_transfer' => lang('Sales.bank_transfer'),
+            'wallet'        => lang('Sales.wallet'),
+            'invoices'      => lang('Sales.invoice')
         ];
     }
 
@@ -1776,7 +1780,7 @@ class Reports extends Secure_Controller
     {
         $this->clearCache();
 
-        $definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_SALES);
+        $definition_names = $this->attribute->getDefinitionsByFlags(attribute::SHOW_IN_SALES, true);
 
         $inputs = [
             'start_date'     => $start_date,
@@ -1789,7 +1793,12 @@ class Reports extends Secure_Controller
         $this->detailed_sales->create($inputs);
 
         $columns = $this->detailed_sales->getDataColumns();
-        $columns['details'] = array_merge($columns['details'], $definition_names);
+        // Extract just names for column headers
+        $definitionHeaders = [];
+        foreach ($definition_names as $definition_id => $definitionInfo) {
+            $definitionHeaders[$definition_id] = $definitionInfo['name'];
+        }
+        $columns['details'] = array_merge($columns['details'], $definitionHeaders);
 
         $headers = $columns;
 
@@ -1930,14 +1939,19 @@ class Reports extends Secure_Controller
     {
         $this->clearCache();
 
-        $definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_RECEIVINGS);
+        $definition_names = $this->attribute->getDefinitionsByFlags(attribute::SHOW_IN_RECEIVINGS, true);
 
         $inputs = ['start_date' => $start_date, 'end_date' => $end_date, 'receiving_type' => $receiving_type, 'location_id' => $location_id, 'definition_ids' => array_keys($definition_names)];
 
         $this->detailed_receivings->create($inputs);
 
         $columns = $this->detailed_receivings->getDataColumns();
-        $columns['details'] = array_merge($columns['details'], $definition_names);
+        // Extract just names for column headers
+        $definitionHeaders = [];
+        foreach ($definition_names as $definition_id => $definitionInfo) {
+            $definitionHeaders[$definition_id] = $definitionInfo['name'];
+        }
+        $columns['details'] = array_merge($columns['details'], $definitionHeaders);
 
         $headers = $columns;
         $report_data = $this->detailed_receivings->getData($inputs);
diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index 81033a3ab..56d905bc4 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -69,21 +69,21 @@ class Sales extends Secure_Controller
     public function getIndex(): ResponseInterface|string
     {
         $this->session->set('allow_temp_items', 1);
-        return $this->_reload();    // TODO: Hungarian Notation
+        return $this->reload();
     }
 
     /**
      * Load the sale edit modal. Used in app/Views/sales/register.php.
      *
-     * @return string
+     * @return ResponseInterface|string
      * @noinspection PhpUnused
      */
-    public function getManage(): string
+    public function getManage(): ResponseInterface|string
     {
-        $person_id = $this->session->get('person_id');
+        $personId = $this->session->get('person_id');
 
-        if (!$this->employee->has_grant('reports_sales', $person_id)) {
-            redirect('no_access/sales/reports_sales');
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return redirect()->to('no_access/sales/reports_sales');
         } else {
             $data['table_headers'] = get_sales_manage_table_headers();
 
@@ -92,44 +92,71 @@ class Sales extends Secure_Controller
                 'only_due'          => lang('Sales.due_filter'),
                 'only_check'        => lang('Sales.check_filter'),
                 'only_creditcard'   => lang('Sales.credit_filter'),
+                'only_debit'        => lang('Sales.debit'),
+                'only_bank_transfer'=> lang('Sales.bank_transfer'),
+                'only_wallet'       => lang('Sales.wallet'),
                 'only_invoices'     => lang('Sales.invoice_filter'),
                 'selected_customer' => lang('Sales.selected_customer')
             ];
 
             if ($this->sale_lib->get_customer() != -1) {
-                $selected_filters = ['selected_customer'];
+                $selectedFilters = ['selected_customer'];
                 $data['customer_selected'] = true;
             } else {
                 $data['customer_selected'] = false;
-                $selected_filters = [];
+                $selectedFilters = [];
             }
-            $data['selected_filters'] = $selected_filters;
+
+            // Restore filters from URL query string
+            $filters = restoreTableFilters($this->request);
+            if (!empty($filters['selected_filters'])) {
+                $selectedFilters = array_merge($selectedFilters, $filters['selected_filters']);
+            }
+            if (isset($filters['start_date'])) {
+                $data['start_date'] = $filters['start_date'];
+            }
+            if (isset($filters['end_date'])) {
+                $data['end_date'] = $filters['end_date'];
+            }
+            $data['selected_filters'] = $selectedFilters;
 
             return view('sales/manage', $data);
         }
     }
 
     /**
-     * @param int $row_id
+     * @param int $rowId
      * @return ResponseInterface
      */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $rowId): ResponseInterface
     {
-        $sale_info = $this->sale->get_info($row_id)->getRow();
-        $data_row = get_sale_data_row($sale_info);
+        $personId = $this->session->get('person_id');
 
-        return $this->response->setJSON($data_row);
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return $this->response->setStatusCode(403)->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+        }
+
+        $saleInfo = $this->sale->get_info($rowId)->getRow();
+        $dataRow = getSaleDataRow($saleInfo);
+
+        return $this->response->setJSON($dataRow);
     }
 
     /**
-     * @return void
+     * @return ResponseInterface
      */
     public function getSearch(): ResponseInterface
     {
+        $personId = $this->session->get('person_id');
+
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return $this->response->setStatusCode(403)->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+        }
+
         $search = $this->request->getGet('search', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
         $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort = $this->sanitizeSortColumn(sales_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'sale_id');
+        $sort = $this->sanitizeSortColumn(salesHeaders(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'sale_id');
         $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $filters = [
@@ -142,29 +169,32 @@ class Sales extends Secure_Controller
             'only_check'        => false,
             'selected_customer' => false,
             'only_creditcard'   => false,
+            'only_debit'        => false,
+            'only_bank_transfer'=> false,
+            'only_wallet'       => false,
             'only_invoices'     => $this->config['invoice_enable'] && $this->request->getGet('only_invoices', FILTER_SANITIZE_NUMBER_INT),
-            'is_valid_receipt'  => $this->sale->is_valid_receipt($search)
+            'is_valid_receipt'  => $this->sale->isValidReceipt($search)
         ];
 
         // Check if any filter is set in the multiselect dropdown
-        $request_filters = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? [], true);
-        $filters = array_merge($filters, $request_filters);
+        $requestFilters = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? [], true);
+        $filters = array_merge($filters, $requestFilters);
 
         $sales = $this->sale->search($search, $filters, $limit, $offset, $sort, $order);
-        $total_rows = $this->sale->get_found_rows($search, $filters);
-        $payments = $this->sale->get_payments_summary($search, $filters);
-        $payment_summary = get_sales_manage_payments_summary($payments);
+        $totalRows = $this->sale->get_found_rows($search, $filters);
+        $payments = $this->sale->getPaymentsSummary($search, $filters);
+        $paymentSummary = getSalesManagePaymentsSummary($payments);
 
-        $data_rows = [];
+        $dataRows = [];
         foreach ($sales->getResult() as $sale) {
-            $data_rows[] = get_sale_data_row($sale);
+            $dataRows[] = getSaleDataRow($sale);
         }
 
-        if ($total_rows > 0) {
-            $data_rows[] = get_sale_data_last_row($sales);
+        if ($totalRows > 0) {
+            $dataRows[] = getSaleDataLastRow($sales);
         }
 
-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary]);
+        return $this->response->setJSON(['total' => $totalRows, 'rows' => $dataRows, 'payment_summary' => $paymentSummary]);
     }
 
     /**
@@ -180,7 +210,7 @@ class Sales extends Secure_Controller
             ? $this->request->getGet('term')
             : null;
 
-        if ($this->sale_lib->get_mode() == 'return' && $this->sale->is_valid_receipt($receipt)) {
+        if ($this->sale_lib->get_mode() == 'return' && $this->sale->isValidReceipt($receipt)) {
             // If a valid receipt or invoice was found the search term will be replaced with a receipt number (POS #)
             $suggestions[] = $receipt;
         }
@@ -224,7 +254,7 @@ class Sales extends Secure_Controller
             }
         }
 
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -274,7 +304,7 @@ class Sales extends Secure_Controller
 
         $this->sale_lib->empty_payments();
 
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -292,7 +322,7 @@ class Sales extends Secure_Controller
         };
 
         $this->sale_lib->set_mode($mode);
-        return $this->_reload();
+        return $this->reload();
     }
 
 
@@ -326,7 +356,7 @@ class Sales extends Secure_Controller
     public function postSetPaymentType(): ResponseInterface|string    // TODO: This function does not appear to be called anywhere in the code.
     {
         $this->sale_lib->set_payment_type($this->request->getPost('selected_payment_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS));
-        return $this->_reload();    // TODO: Hungarian notation.
+        return $this->reload();
     }
 
     /**
@@ -376,88 +406,133 @@ class Sales extends Secure_Controller
     {
         $data = [];
         $giftcard = model(Giftcard::class);
-        $payment_type = $this->request->getPost('payment_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $paymentType = $this->request->getPost('payment_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-        if ($payment_type !== lang('Sales.giftcard')) {
-            $rules = ['amount_tendered' => 'trim|required|decimal_locale',];
-            $messages = ['amount_tendered' => lang('Sales.must_enter_numeric')];
-        } else {
-            $rules = ['amount_tendered' => 'trim|required',];
+        if (!is_string($paymentType) || $paymentType === '') {
+            $data['error'] = lang('Sales.must_enter_numeric');
+
+            return $this->reload($data);
+        }
+
+        if (
+            $paymentType !== lang('Sales.giftcard')
+            && $paymentType !== lang('Sales.rewards')
+            && (str_contains($paymentType, lang('Sales.giftcard')) || str_contains($paymentType, lang('Sales.rewards')))
+        ) {
+            $data['error'] = lang('Sales.must_enter_numeric');
+
+            return $this->reload($data);
+        }
+
+        $isReturnMode = $this->sale_lib->get_mode() === 'return';
+        $amountTenderedRule = $isReturnMode ? 'trim|required|decimal_locale' : 'trim|required|decimal_locale|nonNegativeDecimal';
+
+        if ($paymentType === lang('Sales.giftcard')) {
+            $rules    = ['amount_tendered' => 'trim|required|integer'];
             $messages = ['amount_tendered' => lang('Sales.must_enter_numeric_giftcard')];
+        } elseif (in_array($paymentType, get_reference_code_payment_types())) {
+            $min      = (int)($this->config['payment_reference_code_min'] ?? 3);
+            $max      = (int)($this->config['payment_reference_code_max'] ?? 20);
+            $rules    = [
+                'amount_tendered' => $amountTenderedRule,
+                'reference_code'  => "trim|required|alpha_numeric|min_length[$min]|max_length[$max]",
+            ];
+            $messages = [
+                'amount_tendered' => [
+                    'required'           => lang('Sales.must_enter_numeric'),
+                    'decimal_locale'     => lang('Sales.must_enter_numeric'),
+                    'nonNegativeDecimal' => lang('Sales.negative_amount_tendered'),
+                ],
+                'reference_code'  => [
+                    'required'      => lang('Sales.must_enter_reference_code'),
+                    'alpha_numeric' => lang('Sales.reference_code_invalid_characters'),
+                    'min_length'    => lang('Sales.reference_code_length_error'),
+                    'max_length'    => lang('Sales.reference_code_length_error'),
+                ],
+            ];
+        } else {
+            $rules    = ['amount_tendered' => $amountTenderedRule];
+            $messages = [
+                'amount_tendered' => [
+                    'required'           => lang('Sales.must_enter_numeric'),
+                    'decimal_locale'     => lang('Sales.must_enter_numeric'),
+                    'nonNegativeDecimal' => lang('Sales.negative_amount_tendered'),
+                ],
+            ];
         }
 
         if (!$this->validate($rules, $messages)) {
-            $data['error'] = $payment_type === lang('Sales.giftcard')
-                ? lang('Sales.must_enter_numeric_giftcard')
-                : lang('Sales.must_enter_numeric');
+            $errors = $this->validator->getErrors();
+            $data['error'] = $errors ? reset($errors) : lang('Sales.must_enter_numeric');
         } else {
-            if ($payment_type === lang('Sales.giftcard')) {
-                // In the case of giftcard payment the register input amount_tendered becomes the giftcard number
-                $amount_tendered = parse_decimals($this->request->getPost('amount_tendered'));
-                $giftcard_num = $amount_tendered;
+            if ($paymentType === lang('Sales.giftcard')) {
+                // For giftcard payments, the register input amount_tendered becomes the giftcard number
+                $amountTendered = parse_decimals($this->request->getPost('amount_tendered'));
+                $giftcardNumber = $amountTendered;
 
-                $payments = $this->sale_lib->get_payments();
-                $payment_type = $payment_type . ':' . $giftcard_num;
-                $current_payments_with_giftcard = isset($payments[$payment_type]) ? $payments[$payment_type]['payment_amount'] : 0;
-                $cur_giftcard_value = $giftcard->get_giftcard_value($giftcard_num);
-                $cur_giftcard_customer = $giftcard->get_giftcard_customer($giftcard_num);
-                $customer_id = $this->sale_lib->get_customer();
+                $payments = $this->sale_lib->getPayments();
+                $paymentType = $paymentType . ':' . $giftcardNumber;
+                $currentPaymentsWithGiftcard = isset($payments[$paymentType]) ? $payments[$paymentType]['payment_amount'] : 0;
+                $currentGiftcardValue = $giftcard->get_giftcard_value($giftcardNumber);
+                $currentGiftcardCustomer = $giftcard->get_giftcard_customer($giftcardNumber);
+                $customerId = $this->sale_lib->get_customer();
 
-                if (isset($cur_giftcard_customer) && $cur_giftcard_customer != $customer_id && $cur_giftcard_customer != null) {
-                    $data['error'] = lang('Giftcards.cannot_use', [$giftcard_num]);
-                } elseif (($cur_giftcard_value - $current_payments_with_giftcard) <= 0 && $this->sale_lib->get_mode() === 'sale') {
-                    $data['error'] = lang('Giftcards.remaining_balance', [$giftcard_num, $cur_giftcard_value]);
+                if (isset($currentGiftcardCustomer) && $currentGiftcardCustomer != $customerId && $currentGiftcardCustomer != null) {
+                    $data['error'] = lang('Giftcards.cannot_use', [$giftcardNumber]);
+                } elseif (($currentGiftcardValue - $currentPaymentsWithGiftcard) <= 0 && $this->sale_lib->get_mode() === 'sale') {
+                    $data['error'] = lang('Giftcards.remaining_balance', [$giftcardNumber, $currentGiftcardValue]);
                 } else {
-                    $new_giftcard_value = $giftcard->get_giftcard_value($giftcard_num) - $this->sale_lib->get_amount_due();
-                    $new_giftcard_value = max($new_giftcard_value, 0);
-                    $this->sale_lib->set_giftcard_remainder($new_giftcard_value);
-                    $new_giftcard_value = str_replace('$', '\$', to_currency($new_giftcard_value));
-                    $data['warning'] = lang('Giftcards.remaining_balance', [$giftcard_num, $new_giftcard_value]);
-                    $amount_tendered = min($this->sale_lib->get_amount_due(), $giftcard->get_giftcard_value($giftcard_num));
+                    $newGiftcardValue = $giftcard->get_giftcard_value($giftcardNumber) - $this->sale_lib->get_amount_due();
+                    $newGiftcardValue = max($newGiftcardValue, 0);
+                    $this->sale_lib->set_giftcard_remainder($newGiftcardValue);
+                    $newGiftcardValue = to_currency($newGiftcardValue);
+                    $data['warning'] = lang('Giftcards.remaining_balance', [$giftcardNumber, $newGiftcardValue]);
+                    $amountTendered = min($this->sale_lib->get_amount_due(), $giftcard->get_giftcard_value($giftcardNumber));
 
-                    $this->sale_lib->add_payment($payment_type, $amount_tendered);
+                    $this->sale_lib->addPayment($paymentType, $amountTendered);
                 }
-            } elseif ($payment_type === lang('Sales.rewards')) {
-                $customer_id = $this->sale_lib->get_customer();
-                $package_id = $this->customer->get_info($customer_id)->package_id;
-                if (!empty($package_id)) {
-                    $points = $this->customer->get_info($customer_id)->points;
+            } elseif ($paymentType === lang('Sales.rewards')) {
+                $customerId = $this->sale_lib->get_customer();
+                $packageId = $this->customer->get_info($customerId)->package_id;
+                if (!empty($packageId)) {
+                    $points = $this->customer->get_info($customerId)->points;
                     $points = ($points == null ? 0 : $points);
 
-                    $payments = $this->sale_lib->get_payments();
-                    $current_payments_with_rewards = isset($payments[$payment_type]) ? $payments[$payment_type]['payment_amount'] : 0;
-                    $cur_rewards_value = $points;
+                    $payments = $this->sale_lib->getPayments();
+                    $currentPaymentsWithRewards = isset($payments[$paymentType]) ? $payments[$paymentType]['payment_amount'] : 0;
+                    $curRewardsValue = $points;
 
-                    if (($cur_rewards_value - $current_payments_with_rewards) <= 0) {
-                        $data['error'] = lang('Sales.rewards_remaining_balance') . to_currency($cur_rewards_value);
+                    if (($curRewardsValue - $currentPaymentsWithRewards) <= 0) {
+                        $data['error'] = lang('Sales.rewards_remaining_balance') . to_currency($curRewardsValue);
                     } else {
-                        $new_reward_value = $points - $this->sale_lib->get_amount_due();
-                        $new_reward_value = max($new_reward_value, 0);
-                        $this->sale_lib->set_rewards_remainder($new_reward_value);
-                        $new_reward_value = str_replace('$', '\$', to_currency($new_reward_value));
-                        $data['warning'] = lang('Sales.rewards_remaining_balance') . $new_reward_value;
-                        $amount_tendered = min($this->sale_lib->get_amount_due(), $points);
+                        $newRewardValue = $points - $this->sale_lib->get_amount_due();
+                        $newRewardValue = max($newRewardValue, 0);
+                        $this->sale_lib->set_rewards_remainder($newRewardValue);
+                        $newRewardValue = str_replace('$', '\$', to_currency($newRewardValue));
+                        $data['warning'] = lang('Sales.rewards_remaining_balance') . $newRewardValue;
+                        $amountTendered = min($this->sale_lib->get_amount_due(), $points);
 
-                        $this->sale_lib->add_payment($payment_type, $amount_tendered);
+                        $this->sale_lib->addPayment($paymentType, $amountTendered);
                     }
                 }
-            } elseif ($payment_type === lang('Sales.cash')) {
-                $amount_due = $this->sale_lib->get_total();
-                $sales_total = $this->sale_lib->get_total(false);
-                $amount_tendered = parse_decimals($this->request->getPost('amount_tendered'));
-                $this->sale_lib->add_payment($payment_type, $amount_tendered);
-                $cash_adjustment_amount = $amount_due - $sales_total;
-                if ($cash_adjustment_amount <> 0) {
+            } elseif ($paymentType === lang('Sales.cash')) {
+                $amountDue = $this->sale_lib->get_total();
+                $salesTotal = $this->sale_lib->get_total(false);
+                $amountTendered = parse_decimals($this->request->getPost('amount_tendered'));
+                $this->sale_lib->addPayment($paymentType, $amountTendered);
+                $cashAdjustmentAmount = $amountDue - $salesTotal;
+                if ($cashAdjustmentAmount <> 0) {
                     $this->session->set('cash_mode', CASH_MODE_TRUE);
-                    $this->sale_lib->add_payment(lang('Sales.cash_adjustment'), $cash_adjustment_amount, CASH_ADJUSTMENT_TRUE);
+                    $this->sale_lib->addPayment(lang('Sales.cash_adjustment'), $cashAdjustmentAmount, null, CASH_ADJUSTMENT_TRUE);
                 }
             } else {
-                $amount_tendered = parse_decimals($this->request->getPost('amount_tendered'));
-                $this->sale_lib->add_payment($payment_type, $amount_tendered);
+                $amountTendered = parse_decimals($this->request->getPost('amount_tendered'));
+                $referenceCode = $this->request->getPost('reference_code');
+                $this->sale_lib->addPayment($paymentType, $amountTendered, $referenceCode);
             }
         }
 
-        return $this->_reload($data);
+        return $this->reload($data);
     }
 
     /**
@@ -473,7 +548,7 @@ class Sales extends Secure_Controller
 
         $this->sale_lib->delete_payment(base64url_decode($payment_id));
 
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -507,7 +582,7 @@ class Sales extends Secure_Controller
         $quantity = ($mode == 'return') ? -$quantity : $quantity;
         $item_location = $this->sale_lib->get_sale_location();
 
-        if ($mode == 'return' && $this->sale->is_valid_receipt($item_id_or_number_or_item_kit_or_receipt)) {
+        if ($mode == 'return' && $this->sale->isValidReceipt($item_id_or_number_or_item_kit_or_receipt)) {
             $this->sale_lib->return_entire_sale($item_id_or_number_or_item_kit_or_receipt);
         } elseif ($this->item_kit->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt)) {
             // Add kit item to order if one is assigned
@@ -553,7 +628,7 @@ class Sales extends Secure_Controller
             }
         }
 
-        return $this->_reload($data);
+        return $this->reload($data);
     }
 
     /**
@@ -568,37 +643,74 @@ class Sales extends Secure_Controller
         $data = [];
 
         $rules = [
-            'price'    => 'trim|required|decimal_locale',
+            'price'    => 'trim|required|decimal_locale|nonNegativeDecimal',
             'quantity' => 'trim|required|decimal_locale',
-            'discount' => 'trim|permit_empty|decimal_locale',
+            'discount' => 'trim|permit_empty|decimal_locale|nonNegativeDecimal',
         ];
 
-        if ($this->validate($rules)) {
+        $messages = [
+            'price' => [
+                'nonNegativeDecimal' => lang('Sales.negative_price_invalid'),
+            ],
+            'discount' => [
+                'nonNegativeDecimal' => lang('Sales.negative_discount_invalid'),
+            ],
+        ];
+
+        if ($this->validate($rules, $messages)) {
             $description = $this->request->getPost('description', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $serialnumber = $this->request->getPost('serialnumber', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $price = parse_decimals($this->request->getPost('price'));
+            $price = $price !== false ? number_format((float) $price, totals_decimals(), '.', '') : $price;
             $quantity = parse_decimals($this->request->getPost('quantity'));
             $discount_type = $this->request->getPost('discount_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $discount = $discount_type
                 ? parse_quantity($this->request->getPost('discount'))
                 : parse_decimals($this->request->getPost('discount'));
+            $discount = $discount ?: 0;
+
+            // Return mode legitimately uses negative quantities for refunds
+            if ($this->sale_lib->get_mode() != 'return' && $quantity < 0) {
+                $data['error'] = lang('Sales.negative_quantity_invalid');
+                return $this->reload($data);
+            }
+
+            // Business logic: discount bounds depend on discount_type and item values
+            if ($discount_type == PERCENT && $discount > 100) {
+                $data['error'] = lang('Sales.discount_percent_exceeds_100');
+                return $this->reload($data);
+            }
+
+            $precision = totals_decimals();
+            if ($discount_type == FIXED && bccomp((string)$discount, bcmul((string)abs($quantity), (string)$price, $precision), $precision) > 0) {
+                $data['error'] = lang('Sales.discount_exceeds_item_total');
+                return $this->reload($data);
+            }
+
+            // sales_change_price grant is enforced server-side here; the UI-only "change_price" flag must not be trusted
+            $current_price = $this->sale_lib->get_cart()[$line]['price'] ?? null;
+            $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+            if ($current_price !== null && bccomp((string)$price, (string)$current_price, $precision) != 0 && !$this->employee->has_grant('sales_change_price', $employee_id)) {
+                $data['error'] = lang('Sales.not_authorized');
+                return $this->reload($data);
+            }
 
             $item_location = $this->request->getPost('location', FILTER_SANITIZE_NUMBER_INT);
             $discounted_total = $this->request->getPost('discounted_total') != ''
                 ? parse_decimals($this->request->getPost('discounted_total') ?? '')
                 : null;
 
-
             $this->sale_lib->edit_item($line, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $discounted_total);
 
             $this->sale_lib->empty_payments();
 
             $data['warning'] = $this->sale_lib->out_of_stock($this->sale_lib->get_item_id($line), $item_location);
         } else {
-            $data['error'] = lang('Sales.error_editing_item');
+            $errors = $this->validator->getErrors();
+            $data['error'] = $errors ? reset($errors) : lang('Sales.error_editing_item');
         }
 
-        return $this->_reload($data);
+        return $this->reload($data);
     }
 
     /**
@@ -615,7 +727,7 @@ class Sales extends Secure_Controller
 
         $this->sale_lib->empty_payments();
 
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -633,7 +745,7 @@ class Sales extends Secure_Controller
         $this->sale_lib->clear_quote_number();
         $this->sale_lib->remove_customer();
 
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -645,21 +757,21 @@ class Sales extends Secure_Controller
      */
     public function postComplete(): string    // TODO: this function is huge.  Probably should be refactored.
     {
-        $sale_id = $this->sale_lib->get_sale_id();
+        $saleId = $this->sale_lib->get_sale_id();
         $data = [];
         $data['dinner_table'] = $this->sale_lib->get_dinner_table();
 
         $data['cart'] = $this->sale_lib->get_cart();
 
         $data['include_hsn'] = (bool)$this->config['include_hsn'];
-        $__time = time();
-        $data['transaction_time'] = to_datetime($__time);
-        $data['transaction_date'] = to_date($__time);
+        $time = time();
+        $data['transaction_time'] = to_datetime($time);
+        $data['transaction_date'] = to_date($time);
         $data['show_stock_locations'] = $this->stock_location->show_locations('sales');
         $data['comments'] = $this->sale_lib->get_comment();
-        $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $employee_info = $this->employee->get_info($employee_id);
-        $data['employee'] = $employee_info->first_name . ' ' . mb_substr($employee_info->last_name, 0, 1);
+        $employeeId = $this->employee->get_logged_in_employee_info()->person_id;
+        $employeeInfo = $this->employee->get_info($employeeId);
+        $data['employee'] = $employeeInfo->first_name . ' ' . mb_substr($employeeInfo->last_name, 0, 1);
 
         $data['company_info'] = implode("\n", [$this->config['address'], $this->config['phone']]);
 
@@ -677,26 +789,26 @@ class Sales extends Secure_Controller
         $data['print_after_sale'] = $this->session->get('sales_print_after_sale');
         $data['price_work_orders'] = $this->sale_lib->is_price_work_orders();
         $data['email_receipt'] = $this->sale_lib->is_email_receipt();
-        $customer_id = $this->sale_lib->get_customer();
-        $invoice_number = $this->sale_lib->get_invoice_number();
-        $data["invoice_number"] = $invoice_number;
-        $work_order_number = $this->sale_lib->get_work_order_number();
-        $data["work_order_number"] = $work_order_number;
-        $quote_number = $this->sale_lib->get_quote_number();
-        $data["quote_number"] = $quote_number;
-        $customer_info = $this->_load_customer_data($customer_id, $data);
+        $customerId = $this->sale_lib->get_customer();
+        $invoiceNumber = $this->sale_lib->get_invoice_number();
+        $data["invoice_number"] = $invoiceNumber;
+        $workOrderNumber = $this->sale_lib->get_work_order_number();
+        $data["work_order_number"] = $workOrderNumber;
+        $quoteNumber = $this->sale_lib->get_quote_number();
+        $data["quote_number"] = $quoteNumber;
+        $customerInfo = $this->_load_customer_data($customerId, $data);
 
-        if ($customer_info != null) {
-            $data["customer_comments"] = $customer_info->comments;
-            $data['tax_id'] = $customer_info->tax_id;
+        if ($customerInfo != null) {
+            $data["customer_comments"] = $customerInfo->comments;
+            $data['tax_id'] = $customerInfo->tax_id;
         }
-        $tax_details = $this->tax_lib->get_taxes($data['cart']);    // TODO: Duplicated code
-        $data['taxes'] = $tax_details[0];
+        $taxDetails = $this->tax_lib->get_taxes($data['cart']);    // TODO: Duplicated code
+        $data['taxes'] = $taxDetails[0];
         $data['discount'] = $this->sale_lib->get_discount();
-        $data['payments'] = $this->sale_lib->get_payments();
+        $data['payments'] = $this->sale_lib->getPayments();
 
         // Returns 'subtotal', 'total', 'cash_total', 'payment_total', 'amount_due', 'cash_amount_due', 'payments_cover_total'
-        $totals = $this->sale_lib->get_totals($tax_details[0]);
+        $totals = $this->sale_lib->get_totals($taxDetails[0]);
         $data['subtotal'] = $totals['subtotal'];
         $data['total'] = $totals['total'];
         $data['payments_total'] = $totals['payment_total'];
@@ -709,6 +821,17 @@ class Sales extends Secure_Controller
         $data['cash_amount_due'] = $totals['cash_amount_due'];
         $data['non_cash_amount_due'] = $totals['amount_due'];
 
+        // Prevent negative total sales (fraud/theft vector) - returns can have negative totals for legitimate refunds
+        if ($this->sale_lib->get_mode() != 'return' && bccomp($totals['total'], '0') < 0) {
+            $data['error'] = lang('Sales.negative_total_invalid');
+            return $this->reload($data);
+        }
+
+        if (!$totals['payments_cover_total'] && !$this->sale_lib->is_invoice_mode() && !$this->sale_lib->is_quote_mode()) {
+            $data['error'] = lang('Sales.amount_due_not_covered');
+            return $this->reload($data);
+        }
+
         if ($data['cash_mode']) {    // TODO: Convert this to ternary notation
             $data['amount_due'] = $totals['cash_amount_due'];
         } else {
@@ -738,42 +861,49 @@ class Sales extends Secure_Controller
         $data['print_price_info'] = true;
 
         if ($this->sale_lib->is_invoice_mode()) {
-            $invoice_format = $this->config['sales_invoice_format'];
+            $invoiceFormat = $this->config['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
-            if (!empty($invoice_format) && $invoice_number == null) {
+            if (!empty($invoiceFormat) && $invoiceNumber == null) {
                 // The user can retain the default encoded format or can manually override it.  It still passes through the rendering step.
-                $invoice_number = $this->token_lib->render($invoice_format);
+                $invoiceNumber = $this->token_lib->render($invoiceFormat);
             }
 
 
-            if ($sale_id == NEW_ENTRY && $this->sale->check_invoice_number_exists($invoice_number)) {
-                $data['error'] = lang('Sales.invoice_number_duplicate', [$invoice_number]);
-                $this->_reload($data);
+            if ($saleId == NEW_ENTRY && $this->sale->check_invoice_number_exists($invoiceNumber)) {
+                $data['error'] = lang('Sales.invoice_number_duplicate', [$invoiceNumber]);
+                return $this->reload($data);
             } else {
-                $data['invoice_number'] = $invoice_number;
+                $data['invoice_number'] = $invoiceNumber;
                 $data['sale_status'] = COMPLETED;
-                $sale_type = SALE_TYPE_INVOICE;
+                $saleType = SALE_TYPE_INVOICE;
 
-                $invoice_type = $this->config['invoice_type'];
-                if (!Sale_lib::isValidInvoiceType($invoice_type)) {
-                    $invoice_type = 'invoice';
+                $invoiceType = $this->config['invoice_type'];
+                if (!Sale_lib::isValidInvoiceType($invoiceType)) {
+                    $invoiceType = 'invoice';
                 }
-                $invoice_view = $invoice_type;
+                $invoiceView = $invoiceType;
 
                 // Save the data to the sales table
-                $data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
+                $data['sale_id_num'] = $this->sale->save_value($saleId, $data['sale_status'], $data['cart'], $customerId, $employeeId, $data['comments'], $invoiceNumber, $workOrderNumber, $quoteNumber, $saleType, $data['payments'], $data['dinner_table'], $taxDetails);
                 $data['sale_id'] = 'POS ' . $data['sale_id_num'];
 
                 // Resort and filter cart lines for printing
                 $data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
 
-                if ($data['sale_id_num'] == NEW_ENTRY) {
+                if ($data['sale_id_num'] === INSUFFICIENT_GIFTCARD_BALANCE) {
+                    $data['error_message'] = lang('Sales.insufficient_giftcard_balance');
+                    return $this->reload($data);
+                } elseif ($data['sale_id_num'] === INSUFFICIENT_REWARD_POINTS) {
+                    $data['error_message'] = lang('Sales.insufficient_reward_points');
+                    return $this->reload($data);
+                } elseif ($data['sale_id_num'] == NEW_ENTRY) {
                     $data['error_message'] = lang('Sales.transaction_failed');
+                    return $this->reload($data);
                 } else {
                     $data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
-                    return view('sales/' . $invoice_view, $data);
                     $this->sale_lib->clear_all();
+                    return view('sales/' . $invoiceView, $data);
                 }
             }
         } elseif ($this->sale_lib->is_work_order_mode()) {
@@ -785,80 +915,117 @@ class Sales extends Secure_Controller
             $data['sales_work_order'] = lang('Sales.work_order');
             $data['work_order_number_label'] = lang('Sales.work_order_number');
 
-            if ($work_order_number == null) {
+            if ($workOrderNumber == null) {
                 // Generate work order number
-                $work_order_format = $this->config['work_order_format'];
-                $work_order_number = $this->token_lib->render($work_order_format);
+                $workOrderFormat = $this->config['work_order_format'];
+                $workOrderNumber = $this->token_lib->render($workOrderFormat);
             }
 
-            if ($sale_id == NEW_ENTRY && $this->sale->check_work_order_number_exists($work_order_number)) {
+            if ($saleId == NEW_ENTRY && $this->sale->check_work_order_number_exists($workOrderNumber)) {
                 $data['error'] = lang('Sales.work_order_number_duplicate');
-                $this->_reload($data);
+                return $this->reload($data);
             } else {
-                $data['work_order_number'] = $work_order_number;
+                $data['work_order_number'] = $workOrderNumber;
                 $data['sale_status'] = SUSPENDED;
-                $sale_type = SALE_TYPE_WORK_ORDER;
+                $saleType = SALE_TYPE_WORK_ORDER;
+
+                $data['sale_id_num'] = $this->sale->save_value($saleId, $data['sale_status'], $data['cart'], $customerId, $employeeId, $data['comments'], $invoiceNumber, $workOrderNumber, $quoteNumber, $saleType, $data['payments'], $data['dinner_table'], $taxDetails);
+
+                if ($data['sale_id_num'] === INSUFFICIENT_GIFTCARD_BALANCE) {
+                    $data['error_message'] = lang('Sales.insufficient_giftcard_balance');
+                    return $this->reload($data);
+                } elseif ($data['sale_id_num'] === INSUFFICIENT_REWARD_POINTS) {
+                    $data['error_message'] = lang('Sales.insufficient_reward_points');
+                    return $this->reload($data);
+                } elseif ($data['sale_id_num'] == NEW_ENTRY) {
+                    $data['error_message'] = lang('Sales.transaction_failed');
+                    return $this->reload($data);
+                }
 
-                $data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
                 $this->sale_lib->set_suspended_id($data['sale_id_num']);
 
                 $data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
 
                 $data['barcode'] = null;
 
-                return view('sales/work_order', $data);
-                $this->sale_lib->clear_mode();
                 $this->sale_lib->clear_all();
+                return view('sales/work_order', $data);
             }
         } elseif ($this->sale_lib->is_quote_mode()) {
             $data['sales_quote'] = lang('Sales.quote');
             $data['quote_number_label'] = lang('Sales.quote_number');
 
-            if ($quote_number == null) {
+            if ($quoteNumber == null) {
                 // Generate quote number
-                $quote_format = $this->config['sales_quote_format'];
-                $quote_number = $this->token_lib->render($quote_format);
+                $quoteFormat = $this->config['sales_quote_format'];
+                $quoteNumber = $this->token_lib->render($quoteFormat);
             }
 
-            if ($sale_id == NEW_ENTRY && $this->sale->check_quote_number_exists($quote_number)) {
+            if ($saleId == NEW_ENTRY && $this->sale->check_quote_number_exists($quoteNumber)) {
                 $data['error'] = lang('Sales.quote_number_duplicate');
-                $this->_reload($data);
+                return $this->reload($data);
             } else {
-                $data['quote_number'] = $quote_number;
+                $data['quote_number'] = $quoteNumber;
                 $data['sale_status'] = SUSPENDED;
-                $sale_type = SALE_TYPE_QUOTE;
+                $saleType = SALE_TYPE_QUOTE;
+
+                $data['sale_id_num'] = $this->sale->save_value($saleId, $data['sale_status'], $data['cart'], $customerId, $employeeId, $data['comments'], $invoiceNumber, $workOrderNumber, $quoteNumber, $saleType, $data['payments'], $data['dinner_table'], $taxDetails);
+
+                if ($data['sale_id_num'] === INSUFFICIENT_GIFTCARD_BALANCE) {
+                    $data['error_message'] = lang('Sales.insufficient_giftcard_balance');
+                    return $this->reload($data);
+                } elseif ($data['sale_id_num'] === INSUFFICIENT_REWARD_POINTS) {
+                    $data['error_message'] = lang('Sales.insufficient_reward_points');
+                    return $this->reload($data);
+                } elseif ($data['sale_id_num'] == NEW_ENTRY) {
+                    $data['error_message'] = lang('Sales.transaction_failed');
+                    return $this->reload($data);
+                }
 
-                $data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
                 $this->sale_lib->set_suspended_id($data['sale_id_num']);
 
                 $data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
                 $data['barcode'] = null;
 
-                return view('sales/quote', $data);
-                $this->sale_lib->clear_mode();
                 $this->sale_lib->clear_all();
+                return view('sales/quote', $data);
             }
         } else {
             // Save the data to the sales table
             $data['sale_status'] = COMPLETED;
             if ($this->sale_lib->is_return_mode()) {
-                $sale_type = SALE_TYPE_RETURN;
+                $saleType = SALE_TYPE_RETURN;
             } else {
-                $sale_type = SALE_TYPE_POS;
+                $saleType = SALE_TYPE_POS;
             }
 
-            $data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
+            $data['sale_id_num'] = $this->sale->save_value($saleId, $data['sale_status'], $data['cart'], $customerId, $employeeId, $data['comments'], $invoiceNumber, $workOrderNumber, $quoteNumber, $saleType, $data['payments'], $data['dinner_table'], $taxDetails);
 
             $data['sale_id'] = 'POS ' . $data['sale_id_num'];
 
             $data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
 
-            if ($data['sale_id_num'] == NEW_ENTRY) {
+            if ($data['sale_id_num'] === INSUFFICIENT_GIFTCARD_BALANCE) {
+                $data['error_message'] = lang('Sales.insufficient_giftcard_balance');
+                return $this->reload($data);
+            } elseif ($data['sale_id_num'] === INSUFFICIENT_REWARD_POINTS) {
+                $data['error_message'] = lang('Sales.insufficient_reward_points');
+                return $this->reload($data);
+            } elseif ($data['sale_id_num'] == NEW_ENTRY) {
                 $data['error_message'] = lang('Sales.transaction_failed');
+                return $this->reload($data);
             } else {
                 $data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
-                return view('sales/receipt', $data);
+
+                // Validate receipt template to prevent path traversal
+                $receiptTemplate = $this->config['receipt_template'] ?? '';
+                if (!Sale_lib::isValidReceiptTemplate($receiptTemplate)) {
+                    $receiptTemplate = 'receipt_default';
+                }
+                $data['receipt_template_view'] = $receiptTemplate;
+
                 $this->sale_lib->clear_all();
+                return view('sales/receipt', $data);
             }
         }
     }
@@ -866,35 +1033,44 @@ class Sales extends Secure_Controller
     /**
      * Email PDF invoice to customer. Used in app/Views/sales/form.php, invoice.php, quote.php, tax_invoice.php and work_order.php
      *
-     * @param int $sale_id
+     * @param int $saleId
      * @param string $type
      * @return ResponseInterface
      * @noinspection PhpUnused
      */
-    public function getSendPdf(int $sale_id, string $type = 'invoice'): ResponseInterface
+    public function getSendPdf(int $saleId, string $type = 'invoice'): ResponseInterface
     {
-        $sale_data = $this->_load_sale_data($sale_id);
+        $personId = $this->session->get('person_id');
+
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return $this->response->setStatusCode(403)->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+        }
+
+        $saleData = $this->_load_sale_data($saleId);
 
         $result = false;
         $message = lang('Sales.invoice_no_email');
 
-        if (!empty($sale_data['customer_email'])) {
-            $to = $sale_data['customer_email'];
-            $number = array_key_exists($type . "_number", $sale_data) ?  $sale_data[$type . "_number"] : "";
+        if (!empty($saleData['customer_email'])) {
+            $to = $saleData['customer_email'];
+            $number = array_key_exists($type . "_number", $saleData) ?  $saleData[$type . "_number"] : "";
             $subject = lang('Sales.' . $type) . ' ' . $number;
 
             $text = $this->config['invoice_email_message'];
             $tokens = [
                 new Token_invoice_sequence($number),
-                new Token_invoice_count('POS ' . $sale_data['sale_id']),
-                new Token_customer((array)$sale_data)
+                new Token_invoice_count('POS ' . $saleData['sale_id']),
+                new Token_customer((array)$saleData)
             ];
             $text = $this->token_lib->render($text, $tokens);
-            $sale_data['mimetype'] = mime_content_type(FCPATH . 'uploads/' . $this->config['company_logo']);
+            $saleData['mimetype'] = $this->email_lib->getLogoMimeType();
+
+            // Build img_tag for email views that need it (receipt_email.php)
+            $saleData['img_tag'] = $this->email_lib->buildLogoImgTag();
 
             // Generate email attachment: invoice in PDF format
             $view = Services::renderer();
-            $html = $view->setData($sale_data)->render("sales/$type" . '_email', $sale_data);
+            $html = $view->setData($saleData)->render("sales/$type" . '_email', $saleData);
 
             // Load PDF helper
             helper(['dompdf', 'file']);
@@ -908,38 +1084,38 @@ class Sales extends Secure_Controller
 
         $this->sale_lib->clear_all();
 
-        return $this->response->setJSON(['success' => $result, 'message' => $message, 'id' => $sale_id]);
+        return $this->response->setJSON(['success' => $result, 'message' => $message, 'id' => $saleId]);
     }
 
     /**
      * Emails sales receipt to customer. Used in app/Views/sales/receipt.php
      *
-     * @param int $sale_id
+     * @param int $saleId
      * @return ResponseInterface
      * @noinspection PhpUnused
      */
-    public function getSendReceipt(int $sale_id): ResponseInterface
+    public function getSendReceipt(int $saleId): ResponseInterface
     {
-        $sale_data = $this->_load_sale_data($sale_id);
+        $personId = $this->session->get('person_id');
+
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return $this->response->setStatusCode(403)->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+        }
+
+        $saleData = $this->_load_sale_data($saleId);
 
         $result = false;
         $message = lang('Sales.receipt_no_email');
 
-        if (!empty($sale_data['customer_email'])) {
-            $sale_data['barcode'] = $this->barcode_lib->generate_receipt_barcode($sale_data['sale_id']);
-            $sale_data['img_tag'] = '';
+        if (!empty($saleData['customer_email'])) {
+            $saleData['barcode'] = $this->barcode_lib->generate_receipt_barcode($saleData['sale_id']);
+            $saleData['img_tag'] = $this->email_lib->buildLogoImgTag();
 
-            $logo_path = FCPATH . 'uploads/' . $this->config['company_logo'];
-            if (!empty($this->config['company_logo']) && file_exists($logo_path)) {
-                $logo_data = base64_encode(file_get_contents($logo_path));
-                $sale_data['img_tag'] = '<img id="image" src="data:image/png;base64,' . $logo_data . '" alt="company_logo">';
-            }
-
-            $to = $sale_data['customer_email'];
+            $to = $saleData['customer_email'];
             $subject = lang('Sales.receipt');
 
             $view = Services::renderer();
-            $text = $view->setData($sale_data)->render('sales/receipt_email');
+            $text = $view->setData($saleData)->render('sales/receipt_email');
 
             $result = $this->email_lib->sendEmail($to, $subject, $text);
 
@@ -948,7 +1124,7 @@ class Sales extends Secure_Controller
 
         $this->sale_lib->clear_all();
 
-        return $this->response->setJSON(['success' => $result, 'message' => $message, 'id' => $sale_id]);
+        return $this->response->setJSON(['success' => $result, 'message' => $message, 'id' => $saleId]);
     }
 
     /**
@@ -1033,7 +1209,7 @@ class Sales extends Secure_Controller
         $this->sale_lib->copy_entire_sale($sale_id);
         $data = [];
         $data['cart'] = $this->sale_lib->get_cart();
-        $data['payments'] = $this->sale_lib->get_payments();
+        $data['payments'] = $this->sale_lib->getPayments();
         $data['selected_payment_type'] = $this->sale_lib->get_payment_type();
 
         $tax_details = $this->tax_lib->get_taxes($data['cart'], $sale_id);
@@ -1115,6 +1291,13 @@ class Sales extends Secure_Controller
         }
         $data['invoice_view'] = $invoice_type;
 
+        // Validate receipt template to prevent path traversal
+        $receipt_template = $this->config['receipt_template'] ?? '';
+        if (!Sale_lib::isValidReceiptTemplate($receipt_template)) {
+            $receipt_template = 'receipt_default';
+        }
+        $data['receipt_template_view'] = $receipt_template;
+
         return $data;
     }
 
@@ -1122,7 +1305,7 @@ class Sales extends Secure_Controller
      * @param array $data
      * @return void
      */
-    private function _reload(array $data = []): ResponseInterface|string    // TODO: Hungarian notation
+    private function reload(array $data = []): ResponseInterface|string
     {
         $sale_id = $this->session->get('sale_id');    // TODO: This variable is never used
 
@@ -1148,7 +1331,7 @@ class Sales extends Secure_Controller
         $tax_details = $this->tax_lib->get_taxes($data['cart']);    // TODO: Duplicated code.
         $data['taxes'] = $tax_details[0];
         $data['discount'] = $this->sale_lib->get_discount();
-        $data['payments'] = $this->sale_lib->get_payments();
+        $data['payments'] = $this->sale_lib->getPayments();
 
         // Returns 'subtotal', 'total', 'cash_total', 'payment_total', 'amount_due', 'cash_amount_due', 'payments_cover_total'
         $totals = $this->sale_lib->get_totals($tax_details[0]);
@@ -1190,6 +1373,8 @@ class Sales extends Secure_Controller
             $data['payment_options'] = $this->sale->get_payment_options();
         }
 
+        $data['reference_code_payment_types'] = get_reference_code_payment_types();
+
         $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);
 
@@ -1209,6 +1394,7 @@ class Sales extends Secure_Controller
 
         $data['quote_number'] = $this->sale_lib->get_quote_number();
         $data['work_order_number'] = $this->sale_lib->get_work_order_number();
+        $data['keyboardShortcuts'] = $this->sale_lib->getKeyShortcuts();
 
         // TODO: the if/else set below should be converted to a switch
         if ($this->sale_lib->get_mode() == 'sale_invoice') {    // TODO: Duplicated code.
@@ -1234,13 +1420,19 @@ class Sales extends Secure_Controller
     /**
      * Load the sales receipt for a sale. Used in app/Views/sales/form.php
      *
-     * @param int $sale_id
+     * @param int $saleId
      * @return string
      * @noinspection PhpUnused
      */
-    public function getReceipt(int $sale_id): string
+    public function getReceipt(int $saleId): string|ResponseInterface
     {
-        $data = $this->_load_sale_data($sale_id);
+        $personId = $this->session->get('person_id');
+
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return redirect()->to('no_access/sales/reports_sales');
+        }
+
+        $data = $this->_load_sale_data($saleId);
         $this->sale_lib->clear_all();
 
         return view('sales/receipt', $data);
@@ -1249,13 +1441,19 @@ class Sales extends Secure_Controller
     /**
      * Loads the sales invoice for a sale. Used in app/Views/sales/form.php
      *
-     * @param int $sale_id
+     * @param int $saleId
      * @return string
      * @noinspection PhpUnused
      */
-    public function getInvoice(int $sale_id): string
+    public function getInvoice(int $saleId): string|ResponseInterface
     {
-        $data = $this->_load_sale_data($sale_id);
+        $personId = $this->session->get('person_id');
+
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return redirect()->to('no_access/sales/reports_sales');
+        }
+
+        $data = $this->_load_sale_data($saleId);
         $this->sale_lib->clear_all();
 
         return view('sales/' . $data['invoice_view'], $data);
@@ -1264,30 +1462,36 @@ class Sales extends Secure_Controller
     /**
      * Edits an existing sale or work order. Used in app/Views/sales/form.php
      *
-     * @param int $sale_id
+     * @param int $saleId
      * @return string
      * @throws ReflectionException
      */
-    public function getEdit(int $sale_id): string
+    public function getEdit(int $saleId): string|ResponseInterface
     {
+        $personId = $this->session->get('person_id');
+
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return redirect()->to('no_access/sales/reports_sales');
+        }
+
         $data = [];
 
-        $sale_info = $this->sale->get_info($sale_id)->getRowArray();
-        $data['selected_customer_id'] = $sale_info['customer_id'];
-        $data['selected_customer_name'] = $sale_info['customer_name'];
-        $employee_info = $this->employee->get_info($sale_info['employee_id']);
-        $data['selected_employee_id'] = $sale_info['employee_id'];
-        $data['selected_employee_name'] = $employee_info->first_name . ' ' . $employee_info->last_name;
-        $data['sale_info'] = $sale_info;
-        $balance_due = round($sale_info['amount_due'] - $sale_info['amount_tendered'] + $sale_info['cash_refund'], totals_decimals(), PHP_ROUND_HALF_UP);
+        $saleInfo = $this->sale->get_info($saleId)->getRowArray();
+        $data['selected_customer_id'] = $saleInfo['customer_id'];
+        $data['selected_customer_name'] = $saleInfo['customer_name'];
+        $employeeInfo = $this->employee->get_info($saleInfo['employee_id']);
+        $data['selected_employee_id'] = $saleInfo['employee_id'];
+        $data['selected_employee_name'] = $employeeInfo->first_name . ' ' . $employeeInfo->last_name;
+        $data['sale_info'] = $saleInfo;
+        $balanceDue = round($saleInfo['amount_due'] - $saleInfo['amount_tendered'] + $saleInfo['cash_refund'], totals_decimals(), PHP_ROUND_HALF_UP);
 
-        if (!$this->sale_lib->reset_cash_rounding() && $balance_due < 0) {
-            $balance_due = 0;
+        if (!$this->sale_lib->reset_cash_rounding() && $balanceDue < 0) {
+            $balanceDue = 0;
         }
 
         $data['payments'] = [];
 
-        foreach ($this->sale->get_sale_payments($sale_id)->getResult() as $payment) {
+        foreach ($this->sale->get_sale_payments($saleId)->getResult() as $payment) {
             foreach (get_object_vars($payment) as $property => $value) {
                 $payment->$property = $value;
             }
@@ -1295,23 +1499,24 @@ class Sales extends Secure_Controller
         }
 
         $data['payment_type_new'] = PAYMENT_TYPE_UNASSIGNED;
-        $data['payment_amount_new'] = $balance_due;
+        $data['payment_amount_new'] = $balanceDue;
 
-        $data['balance_due'] = $balance_due != 0;
+        $data['balance_due'] = $balanceDue != 0;
 
         // Don't allow gift card to be a payment option in a sale transaction edit because it's a complex change
-        $payment_options = $this->sale->get_payment_options(false);
+        $paymentOptions = $this->sale->get_payment_options(false);
 
         if ($this->sale_lib->reset_cash_rounding()) {
-            $payment_options[lang('Sales.cash_adjustment')] = lang('Sales.cash_adjustment');
+            $paymentOptions[lang('Sales.cash_adjustment')] = lang('Sales.cash_adjustment');
         }
 
-        $data['payment_options'] = $payment_options;
+        $data['payment_options'] = $paymentOptions;
+        $data['reference_code_payment_types'] = get_reference_code_payment_types();
 
         // Set up a slightly modified list of payment types for new payment entry
-        $payment_options["--"] = lang('Common.none_selected_text');
+        $paymentOptions["--"] = lang('Common.none_selected_text');
 
-        $data['new_payment_options'] = $payment_options;
+        $data['new_payment_options'] = $paymentOptions;
 
         return view('sales/form', $data);
     }
@@ -1327,7 +1532,7 @@ class Sales extends Secure_Controller
         $has_grant = $this->employee->has_grant('sales_delete', $employee_id);
 
         if (!$has_grant) {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+            return $this->response->setStatusCode(403)->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
         } else {
             $sale_ids = $sale_id == NEW_ENTRY ? $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT) : [$sale_id];
 
@@ -1354,7 +1559,7 @@ class Sales extends Secure_Controller
         $has_grant = $this->employee->has_grant('sales_delete', $employee_id);
 
         if (!$has_grant) {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+            return $this->response->setStatusCode(403)->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
         } else {
             $sale_ids = $sale_id == NEW_ENTRY ? $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT) : [$sale_id];
 
@@ -1373,94 +1578,128 @@ class Sales extends Secure_Controller
     /**
      * This saves the sale from the update sale view (sales/form).
      * It only updates the sales table and payments.
-     * @param int $sale_id
+     * @param int $saleId
      * @return ResponseInterface
      * @throws ReflectionException
      */
-    public function postSave(int $sale_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $saleId = NEW_ENTRY): ResponseInterface
     {
-        $newdate = $this->request->getPost('date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $inventory = model(Inventory::class);
-        $date_formatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $newdate);
-        $sale_time = $date_formatter->format('Y-m-d H:i:s');
+        $personId = $this->session->get('person_id');
 
-        $sale_data = [
-            'sale_time'      => $sale_time,
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return $this->response->setStatusCode(403)->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+        }
+
+        $newdate = $this->request->getPost('date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $employeeId = $this->employee->get_logged_in_employee_info()->person_id;
+        $inventory = model(Inventory::class);
+        $dateFormatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $newdate);
+        $saleTime = $dateFormatter->format('Y-m-d H:i:s');
+
+        $saleData = [
+            'sale_time'      => $saleTime,
             'customer_id'    => $this->request->getPost('customer_id') != '' ? $this->request->getPost('customer_id', FILTER_SANITIZE_NUMBER_INT) : null,
             'employee_id'    => $this->request->getPost('employee_id') != '' ? $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT) : null,
             'comment'        => $this->request->getPost('comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             'invoice_number' => $this->request->getPost('invoice_number') != '' ? $this->request->getPost('invoice_number', FILTER_SANITIZE_FULL_SPECIAL_CHARS) : null
         ];
 
+        // Validate reference_code for the new payment if applicable
+        $paymentTypeNewCheck = $this->request->getPost('payment_type_new', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $paymentAmountNewCheck = $this->request->getPost('payment_amount_new');
+        if ($paymentTypeNewCheck != PAYMENT_TYPE_UNASSIGNED && !empty($paymentAmountNewCheck)
+            && in_array($paymentTypeNewCheck, get_reference_code_payment_types())) {
+            $min = (int)($this->config['payment_reference_code_min'] ?? 3);
+            $max = (int)($this->config['payment_reference_code_max'] ?? 40);
+            $rules = [
+                'reference_code_new' => "trim|required|alpha_numeric|min_length[$min]|max_length[$max]",
+            ];
+            $messages = [
+                'reference_code_new' => [
+                    'required'      => lang('Sales.must_enter_reference_code'),
+                    'alpha_numeric' => lang('Sales.reference_code_invalid_characters'),
+                    'min_length'    => lang('Sales.reference_code_length_error'),
+                    'max_length'    => lang('Sales.reference_code_length_error'),
+                ],
+            ];
+            if (!$this->validate($rules, $messages)) {
+                $errors = $this->validator->getErrors();
+                return $this->response->setJSON(['success' => false, 'message' => reset($errors), 'id' => $saleId]);
+            }
+        }
+
         // In order to maintain tradition the only element that can change on prior payments is the payment type
-        $amount_tendered = 0;
-        $number_of_payments = $this->request->getPost('number_of_payments', FILTER_SANITIZE_NUMBER_INT);
-        for ($i = 0; $i < $number_of_payments; ++$i) {
-            $payment_id = $this->request->getPost("payment_id_$i", FILTER_SANITIZE_NUMBER_INT);
-            $payment_type = $this->request->getPost("payment_type_$i", FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            $payment_amount = parse_decimals($this->request->getPost("payment_amount_$i"));
-            $refund_type = $this->request->getPost("refund_type_$i", FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            $cash_refund = parse_decimals($this->request->getPost("refund_amount_$i"));
+        $amountTendered = 0;
+        $numberOfPayments = $this->request->getPost('number_of_payments', FILTER_SANITIZE_NUMBER_INT);
+        for ($i = 0; $i < $numberOfPayments; ++$i) {
+            $paymentId = $this->request->getPost("payment_id_$i", FILTER_SANITIZE_NUMBER_INT);
+            $paymentType = $this->request->getPost("payment_type_$i", FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+            $paymentAmount = parse_decimals($this->request->getPost("payment_amount_$i"));
+            $refundType = $this->request->getPost("refund_type_$i", FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+            $cashRefund = parse_decimals($this->request->getPost("refund_amount_$i"));
+            $referenceCode = $this->request->getPost("reference_code_$i", FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?: null;
 
-            $cash_adjustment = $payment_type == lang('Sales.cash_adjustment') ? CASH_ADJUSTMENT_TRUE : CASH_ADJUSTMENT_FALSE;
+            $cashAdjustment = $paymentType == lang('Sales.cash_adjustment') ? CASH_ADJUSTMENT_TRUE : CASH_ADJUSTMENT_FALSE;
 
-            if (!$cash_adjustment) {
-                $amount_tendered += $payment_amount - $cash_refund;
+            if (!$cashAdjustment) {
+                $amountTendered += $paymentAmount - $cashRefund;
             }
 
             // Non-cash positive refund amounts
-            if (empty(strstr($refund_type, lang('Sales.cash'))) && $cash_refund > 0) {    // TODO: This if and the one below can be combined.
+            if (empty(strstr($refundType, lang('Sales.cash'))) && $cashRefund > 0) {    // TODO: This if and the one below can be combined.
                 // Change it to be a new negative payment (a "non-cash refund")
-                $payment_type = $refund_type;
-                $payment_amount = $payment_amount - $cash_refund;
-                $cash_refund = 0.00;
+                $paymentType = $refundType;
+                $paymentAmount = $paymentAmount - $cashRefund;
+                $cashRefund = 0.00;
             }
 
-            $sale_data['payments'][] = [
-                'payment_id'      => $payment_id,
-                'payment_type'    => $payment_type,
-                'payment_amount'  => $payment_amount,
-                'cash_refund'     => $cash_refund,
-                'cash_adjustment' => $cash_adjustment,
-                'employee_id'     => $employee_id
+            $saleData['payments'][] = [
+                'payment_id'      => $paymentId,
+                'payment_type'    => $paymentType,
+                'payment_amount'  => $paymentAmount,
+                'cash_refund'     => $cashRefund,
+                'cash_adjustment' => $cashAdjustment,
+                'employee_id'     => $employeeId,
+                'reference_code'  => $referenceCode,
             ];
         }
 
-        $payment_id = NEW_ENTRY;
-        $payment_amount_new = $this->request->getPost('payment_amount_new');
-        $payment_type = $this->request->getPost('payment_type_new', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $paymentId = NEW_ENTRY;
+        $paymentAmountNew = $this->request->getPost('payment_amount_new');
+        $paymentType = $this->request->getPost('payment_type_new', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $referenceCodeNew = $this->request->getPost('reference_code_new', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?: null;
 
-        if ($payment_type != PAYMENT_TYPE_UNASSIGNED && !empty($payment_amount_new)) {
-            $payment_amount = parse_decimals($payment_amount_new);
-            $cash_refund = 0;
-            if ($payment_type == lang('Sales.cash_adjustment')) {
-                $cash_adjustment = CASH_ADJUSTMENT_TRUE;
+        if ($paymentType != PAYMENT_TYPE_UNASSIGNED && !empty($paymentAmountNew)) {
+            $paymentAmount = parse_decimals($paymentAmountNew);
+            $cashRefund = 0;
+            if ($paymentType == lang('Sales.cash_adjustment')) {
+                $cashAdjustment = CASH_ADJUSTMENT_TRUE;
             } else {
-                $cash_adjustment = CASH_ADJUSTMENT_FALSE;
-                $amount_tendered += $payment_amount;
-                $sale_info = $this->sale->get_info($sale_id)->getRowArray();
+                $cashAdjustment = CASH_ADJUSTMENT_FALSE;
+                $amountTendered += $paymentAmount;
+                $saleInfo = $this->sale->get_info($saleId)->getRowArray();
 
-                if ($amount_tendered > $sale_info['amount_due']) {
-                    $cash_refund = $amount_tendered - $sale_info['amount_due'];
+                if ($amountTendered > $saleInfo['amount_due']) {
+                    $cashRefund = $amountTendered - $saleInfo['amount_due'];
                 }
             }
 
-            $sale_data['payments'][] = [
-                'payment_id'      => $payment_id,
-                'payment_type'    => $payment_type,
-                'payment_amount'  => $payment_amount,
-                'cash_refund'     => $cash_refund,
-                'cash_adjustment' => $cash_adjustment,
-                'employee_id'     => $employee_id
+            $saleData['payments'][] = [
+                'payment_id'      => $paymentId,
+                'payment_type'    => $paymentType,
+                'payment_amount'  => $paymentAmount,
+                'cash_refund'     => $cashRefund,
+                'cash_adjustment' => $cashAdjustment,
+                'employee_id'     => $employeeId,
+                'reference_code'  => $referenceCodeNew,
             ];
         }
 
-        $inventory->update('POS ' . $sale_id, ['trans_date' => $sale_time]);    // TODO: Reflection Exception
-        if ($this->sale->update($sale_id, $sale_data)) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Sales.successfully_updated'), 'id' => $sale_id]);
+        $inventory->update('POS ' . $saleId, ['trans_date' => $saleTime]);    // TODO: Reflection Exception
+        if ($this->sale->update($saleId, $saleData)) {
+            return $this->response->setJSON(['success' => true, 'message' => lang('Sales.successfully_updated'), 'id' => $saleId]);
         } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Sales.unsuccessfully_updated'), 'id' => $sale_id]);
+            return $this->response->setJSON(['success' => false, 'message' => lang('Sales.unsuccessfully_updated'), 'id' => $saleId]);
         }
     }
 
@@ -1478,7 +1717,7 @@ class Sales extends Secure_Controller
     {
         $sale_id = $this->sale_lib->get_sale_id();
         if ($sale_id != NEW_ENTRY && $sale_id != '') {
-            $sale_type = $this->sale_lib->get_sale_type();
+            $sale_type = $this->sale_lib->getSaleType();
 
             if ($this->config['dinner_table_enable']) {
                 $dinner_table = $this->sale_lib->get_dinner_table();
@@ -1496,7 +1735,7 @@ class Sales extends Secure_Controller
         }
 
         $this->sale_lib->clear_all();
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -1510,7 +1749,7 @@ class Sales extends Secure_Controller
         $suspended_id = $this->sale_lib->get_suspended_id();
         $this->sale_lib->clear_all();
         $this->sale->delete_suspended_sale($suspended_id);
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -1526,13 +1765,13 @@ class Sales extends Secure_Controller
         $sale_id = $this->sale_lib->get_sale_id();
         $dinner_table = $this->sale_lib->get_dinner_table();
         $cart = $this->sale_lib->get_cart();
-        $payments = $this->sale_lib->get_payments();
+        $payments = $this->sale_lib->getPayments();
         $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
         $customer_id = $this->sale_lib->get_customer();
         $invoice_number = $this->sale_lib->get_invoice_number();
         $work_order_number = $this->sale_lib->get_work_order_number();
         $quote_number = $this->sale_lib->get_quote_number();
-        $sale_type = $this->sale_lib->get_sale_type();
+        $sale_type = $this->sale_lib->getSaleType();
 
         if ($sale_type == '') {
             $sale_type = SALE_TYPE_POS;
@@ -1544,15 +1783,21 @@ class Sales extends Secure_Controller
         $data = [];
         $sales_taxes = [[], []];
 
-        if ($this->sale->save_value($sale_id, $sale_status, $cart, $customer_id, $employee_id, $comment, $invoice_number, $work_order_number, $quote_number, $sale_type, $payments, $dinner_table, $sales_taxes) == '-1') {
+        $saleIdNum = $this->sale->save_value($sale_id, $sale_status, $cart, $customer_id, $employee_id, $comment, $invoice_number, $work_order_number, $quote_number, $sale_type, $payments, $dinner_table, $sales_taxes);
+
+        if ($saleIdNum === INSUFFICIENT_GIFTCARD_BALANCE) {
+            $data['error'] = lang('Sales.insufficient_giftcard_balance');
+        } elseif ($saleIdNum === INSUFFICIENT_REWARD_POINTS) {
+            $data['error'] = lang('Sales.insufficient_reward_points');
+        } elseif ($saleIdNum === NEW_ENTRY) {
             $data['error'] = lang('Sales.unsuccessfully_suspended_sale');
+            $this->sale_lib->clear_all();
         } else {
             $data['success'] = lang('Sales.successfully_suspended_sale');
+            $this->sale_lib->clear_all();
         }
 
-        $this->sale_lib->clear_all();
-
-        return $this->_reload($data);
+        return $this->reload($data);
     }
 
     /**
@@ -1576,17 +1821,24 @@ class Sales extends Secure_Controller
      */
     public function postUnsuspend(): ResponseInterface|string
     {
-        $sale_id = $this->request->getPost('suspended_sale_id', FILTER_SANITIZE_NUMBER_INT);
-        $this->sale_lib->clear_all();
+        $personId = $this->session->get('person_id');
 
-        if ($sale_id > 0) {
-            $this->sale_lib->copy_entire_sale($sale_id);
+        if (!$this->employee->has_grant('reports_sales', $personId)) {
+            return $this->response->setStatusCode(403)
+                ->setJSON(['success' => false, 'message' => lang('Sales.not_authorized')]);
+        }
+
+        $saleId = $this->request->getPost('suspended_sale_id', FILTER_SANITIZE_NUMBER_INT);
+
+        if ($saleId > 0 && $this->sale->getSaleStatus($saleId) == SUSPENDED) {
+            $this->sale_lib->clear_all();
+            $this->sale_lib->copy_entire_sale($saleId);
         }
 
         // Set current register mode to reflect that of unsuspended order type
-        $this->change_register_mode($this->sale_lib->get_sale_type());
+        $this->change_register_mode($this->sale_lib->getSaleType());
 
-        return $this->_reload();
+        return $this->reload();
     }
 
     /**
@@ -1597,7 +1849,9 @@ class Sales extends Secure_Controller
      */
     public function getSalesKeyboardHelp(): string
     {
-        return view('sales/help');
+        return view('sales/help', [
+            'keyboardShortcuts' => $this->sale_lib->getKeyShortcuts()
+        ]);
     }
 
     /**
@@ -1648,10 +1902,11 @@ class Sales extends Secure_Controller
         $this->item->update_item_number($item_id, $item_number);
         $cart = $this->sale_lib->get_cart();
         $x = $this->search_cart_for_item_id($item_id, $cart);
-        if ($x != null) {
+        if ($x !== null) {
             $cart[$x]['item_number'] = $item_number;
         }
         $this->sale_lib->set_cart($cart);
+        return $this->response->setJSON(['success' => true]);
     }
 
     /**
@@ -1670,11 +1925,12 @@ class Sales extends Secure_Controller
         $cart = $this->sale_lib->get_cart();
         $x = $this->search_cart_for_item_id($item_id, $cart);
 
-        if ($x != null) {
+        if ($x !== null) {
             $cart[$x]['name'] = $name;
         }
 
         $this->sale_lib->set_cart($cart);
+        return $this->response->setJSON(['success' => true]);
     }
 
     /**
@@ -1693,11 +1949,12 @@ class Sales extends Secure_Controller
         $cart = $this->sale_lib->get_cart();
         $x = $this->search_cart_for_item_id($item_id, $cart);
 
-        if ($x != null) {
+        if ($x !== null) {
             $cart[$x]['description'] = $description;
         }
 
         $this->sale_lib->set_cart($cart);
+        return $this->response->setJSON(['success' => true]);
     }
 
     /**
diff --git a/app/Controllers/Secure_Controller.php b/app/Controllers/Secure_Controller.php
index 2e6affc44..535825d3e 100644
--- a/app/Controllers/Secure_Controller.php
+++ b/app/Controllers/Secure_Controller.php
@@ -4,6 +4,7 @@ namespace App\Controllers;
 
 use App\Models\Employee;
 use App\Models\Module;
+use CodeIgniter\HTTP\Exceptions\RedirectException;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Model;
 use CodeIgniter\Session\Session;
@@ -39,18 +40,12 @@ class Secure_Controller extends BaseController
         $config = config(OSPOS::class)->settings;
         $validation = Services::validation();
 
-        if (!$this->employee->is_logged_in()) {
-            header("Location:" . base_url('login'));
-            exit();
-        }
-
         $logged_in_employee_info = $this->employee->get_logged_in_employee_info();
         if (
             !$this->employee->has_module_grant($module_id, $logged_in_employee_info->person_id)
             || (isset($submodule_id) && !$this->employee->has_module_grant($submodule_id, $logged_in_employee_info->person_id))
         ) {
-            header("Location:" . base_url("no_access/$module_id/$submodule_id"));
-            exit();
+            throw new RedirectException("no_access/$module_id/$submodule_id");
         }
 
         // Load up global global_view_data visible to all the loaded views
@@ -80,7 +75,36 @@ class Secure_Controller extends BaseController
 
     public function sanitizeSortColumn($headers, $field, $default): string
     {
-        return $field != null && in_array($field, array_keys(array_merge(...$headers))) ? $field : $default;
+        if ($field === null) {
+            return $default;
+        }
+
+        // Flatten keys directly as array_merge() renumbers numeric string keys
+        $validColumns = [];
+        foreach ($headers as $header) {
+            $validColumns[] = (string) array_key_first($header);
+        }
+
+        return in_array((string) $field, $validColumns, true) ? $field : $default;
+    }
+
+    /**
+     * Validates the given rules and, on failure, returns a JSON error response.
+     *
+     * @param array $rules
+     * @param array $messages
+     * @param mixed $id
+     * @return ResponseInterface|null
+     */
+    protected function validateFields(array $rules, array $messages, $id = NEW_ENTRY): ?ResponseInterface
+    {
+        if (!$this->validate($rules, $messages)) {
+            $errors = $this->validator->getErrors();
+
+            return $this->response->setJSON(['success' => false, 'message' => reset($errors), 'id' => $id]);
+        }
+
+        return null;
     }
 
     /**
@@ -144,9 +168,9 @@ class Secure_Controller extends BaseController
 
     /**
      * @param int $data_item_id
-     * @return false
+     * @return ResponseInterface|false
      */
-    public function postSave(int $data_item_id = -1)
+    public function postSave(int $data_item_id = -1): ResponseInterface|false
     {
         return false;
     }
diff --git a/app/Controllers/Tax_categories.php b/app/Controllers/Tax_categories.php
index 994eedbfa..62289a9da 100644
--- a/app/Controllers/Tax_categories.php
+++ b/app/Controllers/Tax_categories.php
@@ -40,7 +40,7 @@ class Tax_categories extends Secure_Controller
         $search = $this->request->getGet('search');
         $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
         $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort   = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $sort   = $this->sanitizeSortColumn(get_tax_categories_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'tax_category_id');
         $order  = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $tax_categories = $this->tax_category->search($search, $limit, $offset, $sort, $order);
diff --git a/app/Controllers/Tax_codes.php b/app/Controllers/Tax_codes.php
index 7413622e4..d9fa2b046 100644
--- a/app/Controllers/Tax_codes.php
+++ b/app/Controllers/Tax_codes.php
@@ -50,7 +50,7 @@ class Tax_codes extends Secure_Controller
         $search = $this->request->getGet('search');
         $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
         $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort   = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $sort   = $this->sanitizeSortColumn(get_tax_code_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'tax_code');
         $order  = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $tax_codes = $this->tax_code->search($search, $limit, $offset, $sort, $order);
diff --git a/app/Controllers/Tax_jurisdictions.php b/app/Controllers/Tax_jurisdictions.php
index a2ac12114..f29df341f 100644
--- a/app/Controllers/Tax_jurisdictions.php
+++ b/app/Controllers/Tax_jurisdictions.php
@@ -43,7 +43,7 @@ class Tax_jurisdictions extends Secure_Controller
         $search = $this->request->getGet('search');
         $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
         $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort   = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $sort   = $this->sanitizeSortColumn(get_tax_jurisdictions_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'jurisdiction_id');
         $order  = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $tax_jurisdictions = $this->tax_jurisdiction->search($search, $limit, $offset, $sort, $order);
diff --git a/app/Controllers/Taxes.php b/app/Controllers/Taxes.php
index 212e1fedc..29627c7fe 100644
--- a/app/Controllers/Taxes.php
+++ b/app/Controllers/Taxes.php
@@ -81,7 +81,7 @@ class Taxes extends Secure_Controller
         $search = $this->request->getGet('search');
         $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
         $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $sort = $this->sanitizeSortColumn(get_tax_rates_manage_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'tax_rate_id');
         $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $tax_rates = $this->tax->search($search, $limit, $offset, $sort, $order);
diff --git a/app/Database/Dockerfile b/app/Database/Dockerfile
index f9e8332b9..43cbc3c0b 100644
--- a/app/Database/Dockerfile
+++ b/app/Database/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3.14
-MAINTAINER jekkos
+LABEL maintainer="jekkos"
 
 ADD database.sql /docker-entrypoint-initdb.d/database.sql
 VOLUME /docker-entrypoint-initdb.d
diff --git a/app/Database/Migrations/20170501000000_initial_schema.php b/app/Database/Migrations/20170501000000_initial_schema.php
new file mode 100644
index 000000000..057f398c4
--- /dev/null
+++ b/app/Database/Migrations/20170501000000_initial_schema.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_Initial_Schema extends Migration
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Perform a migration step.
+     *
+     * Deterministically (re)applies the base 3.0.2 schema. Down() is
+     * responsible for clearing the application tables first, so this method
+     * always runs the initial schema script. We intentionally do NOT skip on
+     * "tables already exist": CodeIgniter's listTables() result is cached on
+     * the connection, so a prior down()/regress() cycle in the same process
+     * can leave a stale table list and a naive "skip if present" check would
+     * refuse to rebuild tables that were just dropped.
+     */
+    public function up(): void
+    {
+        helper('migration');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/initial_schema.sql');
+    }
+
+    /**
+     * Revert a migration step.
+     *
+     * Drops the base application tables (and the migrations tracking table)
+     * so the next up() re-creates a clean 3.0.2 baseline. Disables FK checks
+     * so drop order doesn't matter.
+     */
+    public function down(): void
+    {
+        // Query the table list straight from the database. We must NOT use
+        // $this->db->listTables(): CI4 caches the result in dataCache and, in a
+        // long-lived test process, that cached list is stale (populated by a
+        // prior test class's connection), so drops would be skipped and the
+        // next up() would hit "Table ... already exists".
+        $db    = $this->db;
+        $result = $db->query('SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = ?', [$db->database]);
+
+        $tables = $result ? array_column($result->getResultArray(), 'TABLE_NAME') : [];
+
+        // Preserve the migrations tracking table: MigrationRunner::regress()
+        // calls removeHistory() AFTER down(), so dropping it here would raise
+        // "Table '...ospos_migrations' doesn't exist".
+        $migrationsTable = $db->getPrefix() . 'migrations';
+
+        $db->query('SET FOREIGN_KEY_CHECKS = 0');
+        foreach ($tables as $table) {
+            if ($table === $migrationsTable) {
+                continue;
+            }
+            $db->query('DROP TABLE IF EXISTS `' . $table . '`');
+        }
+        $db->query('SET FOREIGN_KEY_CHECKS = 1');
+
+        // Invalidate the stale in-connection table-name cache so a subsequent
+        // listTables() in the same process sees the fresh state.
+        $db->dataCache['table_names'] = [];
+    }
+}
diff --git a/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php b/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
index a4cc26f8f..ce56b0d7b 100644
--- a/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
+++ b/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
@@ -2,6 +2,7 @@
 
 namespace App\Database\Migrations;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Migration;
 
 class Migration_Upgrade_To_3_1_1 extends Migration
@@ -17,7 +18,37 @@ class Migration_Upgrade_To_3_1_1 extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql');
+
+        // MariaDB blocks CONVERT TO CHARACTER SET on tables with FK constraints.
+        // Drop all FKs across affected tables before running the SQL script, recreate after.
+        $fkColumns = [
+            ['modules',         'module_id'],
+            ['stock_locations', 'location_id'],
+            ['permissions',     'permission_id'],
+            ['people',          'person_id'],
+            ['suppliers',       'supplier_id'],
+            ['items',           'item_id'],
+            ['item_kits',       'item_kit_id'],
+            ['sales',           'sale_id'],
+            ['receivings',      'receiving_id'],
+            ['employees',       'employee_id'],
+            ['customers',       'person_id'],
+        ];
+
+        $constraints = [];
+        foreach ($fkColumns as [$table, $column]) {
+            foreach (dropAllForeignKeyConstraints($table, $column) as $c) {
+                $constraints[$c['constraintName']] = $c;
+            }
+        }
+
+        if (!executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql')) {
+            throw new DatabaseException('Migration script 3.0.2_to_3.1.1.sql failed. Check logs for details.');
+        }
+
+        $droppedTables = ['sales_suspended', 'sales_suspended_items', 'sales_suspended_items_taxes', 'sales_suspended_payments'];
+        $toRecreate = array_filter($constraints, fn($c) => !in_array($c['tableName'], $droppedTables, true));
+        recreateForeignKeyConstraints(array_values($toRecreate));
     }
 
     /**
diff --git a/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php b/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
index 1955e0019..83adfbcd0 100644
--- a/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
+++ b/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
@@ -12,7 +12,7 @@ class Migration_Upgrade_To_3_2_0 extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php b/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
index 2af2fec9c..6446e5524 100644
--- a/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
+++ b/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
@@ -12,7 +12,7 @@ class Migration_Upgrade_To_3_2_1 extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.2.0_to_3.2.1.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.2.0_to_3.2.1.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20181015100000_attributes.php b/app/Database/Migrations/20181015100000_attributes.php
index 58fe96fce..076015b55 100644
--- a/app/Database/Migrations/20181015100000_attributes.php
+++ b/app/Database/Migrations/20181015100000_attributes.php
@@ -12,7 +12,7 @@ class Migration_Attributes extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_attributes.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_attributes.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php b/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
index fc86d6018..9604aeb5e 100644
--- a/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
+++ b/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
@@ -12,7 +12,7 @@ class Migration_Upgrade_To_3_3_0 extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190129212600_indiagst.php b/app/Database/Migrations/20190129212600_indiagst.php
index 37933e691..2c5ff76e5 100644
--- a/app/Database/Migrations/20190129212600_indiagst.php
+++ b/app/Database/Migrations/20190129212600_indiagst.php
@@ -17,7 +17,7 @@ class Migration_IndiaGST extends Migration
 
         // If number of entries is greater than zero then the tax data needs to be migrated
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst.sql');
 
         $count_of_tax_codes = $this->get_count_of_tax_code_entries();
 
diff --git a/app/Database/Migrations/20190213210000_indiagst1.php b/app/Database/Migrations/20190213210000_indiagst1.php
index 396202f14..d45d7a3ca 100644
--- a/app/Database/Migrations/20190213210000_indiagst1.php
+++ b/app/Database/Migrations/20190213210000_indiagst1.php
@@ -12,7 +12,7 @@ class Migration_IndiaGST1 extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst1.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst1.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190220210000_indiagst2.php b/app/Database/Migrations/20190220210000_indiagst2.php
index 5b5b1607c..12cf5364a 100644
--- a/app/Database/Migrations/20190220210000_indiagst2.php
+++ b/app/Database/Migrations/20190220210000_indiagst2.php
@@ -12,7 +12,7 @@ class Migration_IndiaGST2 extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst2.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_indiagst2.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190301124900_decimal_attribute_type.php b/app/Database/Migrations/20190301124900_decimal_attribute_type.php
index c50dc57e9..a8235ac52 100644
--- a/app/Database/Migrations/20190301124900_decimal_attribute_type.php
+++ b/app/Database/Migrations/20190301124900_decimal_attribute_type.php
@@ -12,7 +12,7 @@ class Migration_decimal_attribute_type extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_decimal_attribute_type.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_decimal_attribute_type.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190317102600_add_iso_4217.php b/app/Database/Migrations/20190317102600_add_iso_4217.php
index 124efa708..5778fe2b3 100644
--- a/app/Database/Migrations/20190317102600_add_iso_4217.php
+++ b/app/Database/Migrations/20190317102600_add_iso_4217.php
@@ -12,7 +12,7 @@ class Migration_add_iso_4217 extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_add_iso_4217.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_add_iso_4217.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190427100000_paymenttracking.php b/app/Database/Migrations/20190427100000_paymenttracking.php
index 50e9c90e7..11c1cfe6b 100644
--- a/app/Database/Migrations/20190427100000_paymenttracking.php
+++ b/app/Database/Migrations/20190427100000_paymenttracking.php
@@ -12,7 +12,7 @@ class Migration_PaymentTracking extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190502100000_refundtracking.php b/app/Database/Migrations/20190502100000_refundtracking.php
index e8012e657..18c157462 100644
--- a/app/Database/Migrations/20190502100000_refundtracking.php
+++ b/app/Database/Migrations/20190502100000_refundtracking.php
@@ -12,7 +12,7 @@ class Migration_RefundTracking extends Migration
     public function up(): void
     {
         helper(['migration', 'locale']);
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_refundtracking.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_refundtracking.sql');
 
         // Add missing cash_refund amounts to payments table
         $decimals = totals_decimals();
diff --git a/app/Database/Migrations/20190612100000_dbfix.php b/app/Database/Migrations/20190612100000_dbfix.php
index 3b7c96de2..65377575f 100644
--- a/app/Database/Migrations/20190612100000_dbfix.php
+++ b/app/Database/Migrations/20190612100000_dbfix.php
@@ -12,7 +12,7 @@ class Migration_DBFix extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_dbfix.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_dbfix.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20190615100000_fix_attribute_datetime.php b/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
index 45a204b41..f07a3af89 100644
--- a/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
+++ b/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
@@ -12,7 +12,7 @@ class Migration_fix_attribute_datetime extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20191231100000_paymentdatefix.php b/app/Database/Migrations/20191231100000_paymentdatefix.php
index f1d0b3491..8f2a30aeb 100644
--- a/app/Database/Migrations/20191231100000_paymentdatefix.php
+++ b/app/Database/Migrations/20191231100000_paymentdatefix.php
@@ -12,7 +12,7 @@ class Migration_PaymentDateFix extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_paymentdatefix.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_paymentdatefix.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20200125100000_saleschangeprice.php b/app/Database/Migrations/20200125100000_saleschangeprice.php
index 738cdd233..81b6051b8 100644
--- a/app/Database/Migrations/20200125100000_saleschangeprice.php
+++ b/app/Database/Migrations/20200125100000_saleschangeprice.php
@@ -12,7 +12,7 @@ class Migration_SalesChangePrice extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_saleschangeprice.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_saleschangeprice.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php b/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
index 3082c49ff..b23172236 100644
--- a/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
+++ b/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
@@ -12,7 +12,7 @@ class Migration_modify_attr_links_constraint extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20201110000000_add_item_kit_number.php b/app/Database/Migrations/20201110000000_add_item_kit_number.php
index 9bdffff3c..2f307a66f 100644
--- a/app/Database/Migrations/20201110000000_add_item_kit_number.php
+++ b/app/Database/Migrations/20201110000000_add_item_kit_number.php
@@ -12,7 +12,7 @@ class Migration_add_item_kit_number extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.3_add_kits_item_number.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.3_add_kits_item_number.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20210103000000_modify_session_datatype.php b/app/Database/Migrations/20210103000000_modify_session_datatype.php
index 571659faf..5c24aab75 100644
--- a/app/Database/Migrations/20210103000000_modify_session_datatype.php
+++ b/app/Database/Migrations/20210103000000_modify_session_datatype.php
@@ -12,7 +12,7 @@ class Migration_modify_session_datatype extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.3.4_modify_session_datatype.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.3.4_modify_session_datatype.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20210422000000_database_optimizations.php b/app/Database/Migrations/20210422000000_database_optimizations.php
index 94c1adc32..74aeeedef 100644
--- a/app/Database/Migrations/20210422000000_database_optimizations.php
+++ b/app/Database/Migrations/20210422000000_database_optimizations.php
@@ -18,12 +18,35 @@ class Migration_database_optimizations extends Migration
     {
         log_message('info', 'Migrating database optimizations.');
 
+        helper('migration');
+
+        dropForeignKeyConstraints(['ospos_customers_ibfk_1'], 'customers');
+        dropForeignKeyConstraints(['ospos_customers_points_ibfk_1'], 'customers_points');
+        dropForeignKeyConstraints(['ospos_sales_ibfk_2'], 'sales');
+        dropForeignKeyConstraints(['ospos_sales_payments_ibfk_2'], 'sales_payments');
+        dropForeignKeyConstraints(['ospos_sales_ibfk_1'], 'sales');
+        dropForeignKeyConstraints(['ospos_receivings_ibfk_1'], 'receivings');
+        dropForeignKeyConstraints(['ospos_inventory_ibfk_2'], 'inventory');
+        dropForeignKeyConstraints(['ospos_grants_ibfk_2'], 'grants');
+        dropForeignKeyConstraints(['ospos_expenses_ibfk_2'], 'expenses');
+        dropForeignKeyConstraints(['ospos_employees_ibfk_1'], 'employees');
+        dropForeignKeyConstraints(['ospos_cash_up_ibfk_1'], 'cash_up');
+        dropForeignKeyConstraints(['ospos_cash_up_ibfk_2'], 'cash_up');
+        dropForeignKeyConstraints(['ospos_items_ibfk_1'], 'items');
+        dropForeignKeyConstraints(['ospos_expenses_ibfk_3'], 'expenses');
+        dropForeignKeyConstraints(['ospos_receivings_ibfk_2'], 'receivings');
+        dropForeignKeyConstraints(['ospos_suppliers_ibfk_1'], 'suppliers');
+
+        createPrimaryKey('customers', 'person_id');
+        createPrimaryKey('employees', 'person_id');
+        createPrimaryKey('suppliers', 'person_id');
+
         $attribute = model(Attribute::class);
 
-        $attribute->delete_orphaned_values();
+        $attribute->deleteOrphanedValues();
 
-        $this->migrate_duplicate_attribute_values(DECIMAL);
-        $this->migrate_duplicate_attribute_values(DATE);
+        $this->migrateDuplicateAttributeValues(DECIMAL);
+        $this->migrateDuplicateAttributeValues(DATE);
 
         // Select all attributes that have data in more than one column
         $builder = $this->db->table('attribute_values');
@@ -36,110 +59,118 @@ class Migration_database_optimizations extends Migration
         $builder->where('attribute_value IS NOT NULL');
         $builder->where('attribute_decimal IS NOT NULL');
         $builder->groupEnd();
-        $attribute_values = $builder->get();
+        $attributeValues = $builder->get();
 
         $this->db->transStart();
 
         // Clean up Attribute values table where there is an attribute value and an attribute_date/attribute_decimal
-        foreach ($attribute_values->getResultArray() as $attribute_value) {
+        foreach ($attributeValues->getResultArray() as $attributeValue) {
             $builder = $this->db->table('attribute_values');
-            $builder->delete(['attribute_id' => $attribute_value['attribute_id']]);
+            $builder->delete(['attribute_id' => $attributeValue['attribute_id']]);
 
             $builder = $this->db->table('attribute_links');
             $builder->select('links.definition_id, links.item_id, links.attribute_id, defs.definition_type');
             $builder->join('attribute_definitions defs', 'defs.definition_id = links.definition_id');
-            $builder->where('attribute_id', $attribute_value['attribute_id']);
-            $attribute_links = $builder->get();
+            $builder->where('attribute_id', $attributeValue['attribute_id']);
+            $attributeLinks = $builder->get();
 
-            if ($attribute_links) {
+            if ($attributeLinks) {
                 $builder = $this->db->table('attribute_links');
-                $attribute_links = $attribute_links->getResultArray() ?: [];
+                $attributeLinks = $attributeLinks->getResultArray() ?: [];
 
-                foreach ($attribute_links->getResultArray() as $attribute_link) {
-                    $builder->where('attribute_id', $attribute_link['attribute_id']);
-                    $builder->where('item_id', $attribute_link['item_id']);
+                foreach ($attributeLinks as $attributeLink) {
+                    $builder->where('attribute_id', $attributeLink['attribute_id']);
+                    $builder->where('item_id', $attributeLink['item_id']);
                     $builder->delete();
 
-                    switch ($attribute_link['definition_type']) {
+                    switch ($attributeLink['definition_type']) {
                         case DECIMAL:
-                            $value = $attribute_value['attribute_decimal'];
+                            $value = $attributeValue['attribute_decimal'];
                             break;
                         case DATE:
                             $config = config(OSPOS::class)->settings;
-                            $attribute_date = DateTime::createFromFormat('Y-m-d', $attribute_value['attribute_date']);
-                            $value = $attribute_date->format($config['dateformat']);
+                            $attributeDate = DateTime::createFromFormat('Y-m-d', (string) $attributeValue['attribute_date']);
+
+                            if ($attributeDate === false) {
+                                log_message('warning', 'Migration 20210422000000: unparseable attribute_date "' . $attributeValue['attribute_date'] . '" for attribute_id ' . $attributeValue['attribute_id'] . ' — preserving raw value.');
+                                $value = (string) $attributeValue['attribute_date'];
+                            } else {
+                                $dateFormat = empty($config['dateformat']) ? 'Y-m-d' : $config['dateformat'];
+                                if (empty($config['dateformat'])) {
+                                    log_message('warning', 'Migration 20210422000000: dateformat config empty, falling back to Y-m-d for attribute_id ' . $attributeValue['attribute_id'] . '.');
+                                }
+                                $value = $attributeDate->format($dateFormat);
+                            }
                             break;
                         default:
-                            $value = $attribute_value['attribute_value'];
+                            $value = $attributeValue['attribute_value'];
                             break;
                     }
 
-                    $attribute->saveAttributeValue($value, $attribute_link['definition_id'], $attribute_link['item_id'], false, $attribute_link['definition_type']);
+                    $attribute->saveAttributeValue($value, $attributeLink['definition_id'], $attributeLink['item_id'], false, $attributeLink['definition_type']);
                 }
             }
         }
         $this->db->transComplete();
 
-        helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql');
         log_message('info', 'Finished migrating database optimizations.');
     }
 
     /**
      * Given the type of attribute, deletes any duplicates it finds in the attribute_values table and reassigns those
      */
-    private function migrate_duplicate_attribute_values($attribute_type): void
+    private function migrateDuplicateAttributeValues(string $attributeType): void
     {
         // Remove duplicate attribute values needed to make attribute_decimals and attribute_dates unique
         $this->db->transStart();
 
-        $column = 'attribute_' . strtolower($attribute_type);
+        $column = 'attribute_' . strtolower($attributeType);
 
         $builder = $this->db->table('attribute_values');
         $builder->select("$column");
         $builder->groupBy($column);
         $builder->having("COUNT($column) > 1");
-        $duplicated_values = $builder->get();
+        $duplicatedValues = $builder->get();
 
-        foreach ($duplicated_values->getResultArray() as $duplicated_value) {
-            $subquery_builder = $this->db->table('attribute_values');
-            $subquery_builder->select('attribute_id');
-            $subquery_builder->where($column, $duplicated_value[$column]);
-            $subquery = $subquery_builder->getCompiledSelect();
+        foreach ($duplicatedValues->getResultArray() as $duplicatedValue) {
+            $subqueryBuilder = $this->db->table('attribute_values');
+            $subqueryBuilder->select('attribute_id');
+            $subqueryBuilder->where($column, $duplicatedValue[$column]);
+            $subquery = $subqueryBuilder->getCompiledSelect();
 
             $builder = $this->db->table('attribute_values');
             $builder->select('attribute_id');
-            $builder->where($column, $duplicated_value[$column]);
+            $builder->where($column, $duplicatedValue[$column]);
             $builder->where("attribute_id IN ($subquery)", null, false);
-            $attribute_ids_to_fix = $builder->get();
+            $attributeIdsToFix = $builder->get();
 
-            $this->reassign_duplicate_attribute_values($attribute_ids_to_fix, $duplicated_value);
+            $this->reassignDuplicateAttributeValues($attributeIdsToFix);
         }
 
         $this->db->transComplete();
     }
 
     /**
-     * Updates the attribute_id in all attribute_link rows with duplicated attribute_ids then deletes unneeded rows from attribute_values
+     * Updates the attribute_id in all attribute_link rows with duplicated attributeIds then deletes unneeded rows from attributeValues
      *
-     * @param ResultInterface $attribute_ids_to_fix All attribute_ids that need to parsed
-     * @param array $attribute_value The attribute value in question.
+     * @param ResultInterface $attributeIdsToFix All attributeIds that need to parsed
      */
-    private function reassign_duplicate_attribute_values(ResultInterface $attribute_ids_to_fix, array $attribute_value): void
+    private function reassignDuplicateAttributeValues(ResultInterface $attributeIdsToFix): void
     {
-        $attribute_ids = $attribute_ids_to_fix->getResultArray();
-        $retain_attribute_id = $attribute_ids[0]['attribute_id'];
+        $attributeIds = $attributeIdsToFix->getResultArray();
+        $retainAttributeId = $attributeIds[0]['attribute_id'];
 
-        foreach ($attribute_ids as $attribute_id) {
+        foreach ($attributeIds as $attributeId) {
             // Update attribute_link with the attribute_id we are keeping
             $builder = $this->db->table('attribute_links');
-            $builder->where('attribute_id', $attribute_id['attribute_id']);
-            $builder->update(['attribute_id' => $retain_attribute_id]);
+            $builder->where('attribute_id', $attributeId['attribute_id']);
+            $builder->update(['attribute_id' => $retainAttributeId]);
 
             // Delete the row from attribute_values if it isn't our keeper
-            if ($attribute_id['attribute_id'] !== $retain_attribute_id) {
+            if ($attributeId['attribute_id'] !== $retainAttributeId) {
                 $builder = $this->db->table('attribute_values');
-                $builder->delete(['attribute_id' => $attribute_id['attribute_id']]);
+                $builder->delete(['attribute_id' => $attributeId['attribute_id']]);
             }
         }
     }
diff --git a/app/Database/Migrations/20220127000000_convertToCI4.php b/app/Database/Migrations/20220127000000_convertToCI4.php
new file mode 100644
index 000000000..f860c7aaa
--- /dev/null
+++ b/app/Database/Migrations/20220127000000_convertToCI4.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use App\Libraries\CI3SecretConverter;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Forge;
+use CodeIgniter\Database\Migration;
+use CodeIgniter\HTTP\Exceptions\RedirectException;
+use RuntimeException;
+
+class ConvertToCI4 extends Migration
+{
+    /**
+     * Constructor.
+     */
+    public function __construct(?Forge $forge = null)
+    {
+        parent::__construct($forge);
+        helper('security');
+    }
+
+    /**
+     * Perform a migration step.
+     */
+    public function up(): void
+    {
+        helper('migration');
+
+        if (!executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_CI4Conversion.sql')) {
+            throw new DatabaseException('Migration script 3.4.0_CI4Conversion.sql failed. Check logs for details.');
+        }
+
+        $existingKey = (string) config('Encryption')->key;
+
+        // A valid CI4 key requires no write — just confirm it is usable.
+        if ($existingKey !== '' && strlen($existingKey) >= 64) {
+            checkEncryption();
+
+            return;
+        }
+
+        // Every branch below writes to .env. If the runtime user cannot write
+        // it (e.g. Docker/Compose with a read-only .env mount), fail with an
+        // actionable message instead of a raw fopen() error deep in the writer.
+        if (!envFileIsWritable()) {
+            log_message('critical', 'Encryption key not provisioned and .env is not writable. Run `php spark env:provision` to generate one.');
+
+            throw new RuntimeException(lang('Error.encryption_key_not_provisioned'));
+        }
+
+        if ($existingKey !== '' && strlen($existingKey) < 64) {
+            // Old CI3-era key: decrypt, rotate, re-encrypt, persist — all under
+            // a single .env lock (see convertCI3EncryptedData).
+            $this->convertCI3EncryptedData($existingKey);
+        } else {
+            // No key at all: provision a fresh one (single atomic write), then
+            // drop the incidental pre-write backup left behind by the rotation.
+            rotateEncryptionKey(null);
+            removeBackup();
+        }
+    }
+
+    /**
+     * Revert a migration step.
+     */
+    public function down(): void {}
+
+    /**
+     * Decrypts legacy CI3-encrypted secrets with the old key, rotates to a
+     * fresh CI4 key, re-encrypts under the new key, verifies the round trip,
+     * and persists the result.
+     *
+     * The actual decryption/encryption is delegated to CI3SecretConverter so
+     * the docker startup command (env:provision) shares the same code path.
+     *
+     * @param string $oldKey the CI3-era key currently in .env
+     * @throws RedirectException
+     */
+    private function convertCI3EncryptedData(string $oldKey): void
+    {
+        $converter = new CI3SecretConverter();
+
+        // DB read, safe outside the .env lock.
+        $plain = $converter->decryptAll($oldKey);
+
+        // Backup -> rotate -> re-encrypt -> verify -> persist under one .env
+        // lock. On any failure the transaction restores the pre-rotation .env
+        // (still holding the lock); on success it drops the backup.
+        rotateEncryptionKeyTransaction($oldKey, static function () use ($plain, $converter): void {
+            $encrypted = $converter->encryptAll($plain);
+
+            // Verify the round trip before committing so we never lose data.
+            if (array_diff_assoc($plain, $converter->verifyAll($encrypted)) !== []) {
+                throw new RedirectException('login'); // TODO: Need to figure out how to pass the error to the Login controller so that it gets displayed.
+            }
+
+            $converter->saveAll($encrypted);
+        });
+    }
+}
diff --git a/app/Database/Migrations/20220127000000_convert_to_ci4.php b/app/Database/Migrations/20220127000000_convert_to_ci4.php
deleted file mode 100644
index 65fc9f9e1..000000000
--- a/app/Database/Migrations/20220127000000_convert_to_ci4.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace App\Database\Migrations;
-
-use App\Models\Appconfig;
-use CodeIgniter\Database\Forge;
-use CodeIgniter\Database\Migration;
-use CodeIgniter\HTTP\RedirectResponse;
-use CodeIgniter\HTTP\Exceptions\RedirectException;
-use Config\Encryption;
-use Config\Services;
-use ReflectionException;
-
-class Convert_to_ci4 extends Migration
-{
-    /**
-     * Constructor.
-     */
-    public function __construct(?Forge $forge = null)
-    {
-        parent::__construct($forge);
-        helper('security');
-    }
-
-    /**
-     * Perform a migration step.
-     */
-    public function up(): void
-    {
-        helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_ci4_conversion.sql');
-
-        if (!empty(config('Encryption')->key)) {
-            $this->convert_ci3_encrypted_data();
-        } else {
-            check_encryption();
-        }
-
-        remove_backup();
-    }
-
-    /**
-     * Revert a migration step.
-     */
-    public function down(): void {}
-
-    /**
-     * @return RedirectResponse|void
-     * @throws ReflectionException
-     */
-    private function convert_ci3_encrypted_data()
-    {
-        $appconfig = model(Appconfig::class);
-
-        $ci3_encrypted_data = [
-            'clcdesq_api_key'   => '',
-            'clcdesq_api_url'   => '',
-            'mailchimp_api_key' => '',
-            'mailchimp_list_id' => '',
-            'smtp_pass'         => ''
-        ];
-
-        foreach ($ci3_encrypted_data as $key => $value) {
-            $ci3_encrypted_data[$key] = $appconfig->get_value($key);
-        }
-
-        $decrypted_data = $this->decrypt_ci3_data($ci3_encrypted_data);
-
-        check_encryption();
-
-        try {
-            $ci4_encrypted_data = $this->encrypt_data($decrypted_data);
-
-            $success = empty(array_diff_assoc($decrypted_data, $this->decrypt_data($ci4_encrypted_data)));
-            if (!$success) {
-                abort_encryption_conversion();
-                remove_backup();
-                throw new RedirectException('login');
-            }
-
-            $appconfig->batch_save($ci4_encrypted_data);
-        } catch (RedirectException $e) {
-            return redirect()->to('login'); // TODO: Need to figure out how to pass the error to the Login controller so that it gets displayed.
-        }
-    }
-
-    /**
-     * Decrypts CI3 encrypted data and returns the plaintext values.
-     *
-     * @param array $encrypted_data Data encrypted using CI3 methodology.
-     * @return array Plaintext, unencrypted data.
-     */
-    private function decrypt_ci3_data(array $encrypted_data): array
-    {
-        $config = new Encryption();
-        $config->driver = 'OpenSSL';
-        $config->key = config('Encryption')->key;
-        $config->cipher = 'AES-128-CBC';
-        $config->rawData = false;
-        $config->encryptKeyInfo = 'encryption';
-        $config->authKeyInfo = 'authentication';
-
-        $encrypter = Services::encrypter($config);
-
-        $decrypted_data = [];
-        foreach ($encrypted_data as $key => $value) {
-            $decrypted_data[$key] = !empty($value) ? $encrypter->decrypt($value) : '';
-        }
-
-        return $decrypted_data;
-    }
-
-    /**
-     * Encrypts data using CI4 algorithms.
-     *
-     * @param array $plain_data Data to be encrypted.
-     * @return array Encrypted data.
-     */
-    private function encrypt_data(array $plain_data): array
-    {
-        $encrypter = Services::encrypter();
-
-        $encrypted_data = [];
-        foreach ($plain_data as $key => $value) {
-            $encrypted_data[$key] = !empty($value) ? $encrypter->encrypt($value) : '';
-        }
-
-        return $encrypted_data;
-    }
-
-    /**
-     * Decrypts data using CI4 algorithms.
-     *
-     * @param array $encrypted_data Data to be decrypted.
-     * @return array Decrypted data.
-     */
-    private function decrypt_data(array $encrypted_data): array
-    {
-        $encrypter = Services::encrypter();
-
-        $decrypted_data = [];
-        foreach ($encrypted_data as $key => $value) {
-            $decrypted_data[$key] = !empty($value) ? $encrypter->decrypt($value) : '';
-        }
-
-        return $decrypted_data;
-    }
-}
diff --git a/app/Database/Migrations/20240630000001_fix_keys_for_db_upgrade.php b/app/Database/Migrations/20240630000001_fix_keys_for_db_upgrade.php
index 2ef6d0bf1..2ee75cc7f 100644
--- a/app/Database/Migrations/20240630000001_fix_keys_for_db_upgrade.php
+++ b/app/Database/Migrations/20240630000001_fix_keys_for_db_upgrade.php
@@ -56,7 +56,7 @@ class Migration_fix_keys_for_db_upgrade extends Migration
         $foreignKeyExists = $this->db->query($checkSql)->getRow();
 
         if ($foreignKeyExists) {
-            $this->db->query('ALTER TABLE ' . $this->db->prefixTable('sales_items_taxes') . ' DROP CONSTRAINT ospos_sales_items_taxes_ibfk_1');
+            $this->db->query('ALTER TABLE ' . $this->db->prefixTable('sales_items_taxes') . ' DROP FOREIGN KEY ospos_sales_items_taxes_ibfk_1');
         }
 
         $this->db->query('ALTER TABLE ' . $this->db->prefixTable('sales_items_taxes')
diff --git a/app/Database/Migrations/20240826000000_fix_duplicate_attributes.php b/app/Database/Migrations/20240826000000_fix_duplicate_attributes.php
index 04c86fb3d..6822a1589 100644
--- a/app/Database/Migrations/20240826000000_fix_duplicate_attributes.php
+++ b/app/Database/Migrations/20240826000000_fix_duplicate_attributes.php
@@ -28,7 +28,7 @@ class fix_duplicate_attributes extends Migration
 
         dropForeignKeyConstraints($foreignKeys, 'attribute_links');
 
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_attribute_links_unique_constraint.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_attribute_links_unique_constraint.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20250425000000_sessions_migration.php b/app/Database/Migrations/20250425000000_sessions_migration.php
index 56db8cf24..7402dda81 100644
--- a/app/Database/Migrations/20250425000000_sessions_migration.php
+++ b/app/Database/Migrations/20250425000000_sessions_migration.php
@@ -12,7 +12,7 @@ class Migration_sessions_migration extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.1_migrate_sessions_table.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.4.1_migrate_sessions_table.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20250522000000_AttributeLinksUniqueConstraint.php b/app/Database/Migrations/20250522000000_AttributeLinksUniqueConstraint.php
index a7ba9e72d..884d95b68 100644
--- a/app/Database/Migrations/20250522000000_AttributeLinksUniqueConstraint.php
+++ b/app/Database/Migrations/20250522000000_AttributeLinksUniqueConstraint.php
@@ -21,7 +21,7 @@ class AttributeLinksUniqueConstraint extends Migration
         dropForeignKeyConstraints($foreignKeys, 'attribute_links');
         dropColumnIfExists('ospos_attribute_links', 'generated_unique_column');
 
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.1_attribute_links_unique_constraint.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.4.1_attribute_links_unique_constraint.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20250716170000_MissingConfigKeys.php b/app/Database/Migrations/20250716170000_MissingConfigKeys.php
index 2d41b5d38..85617e11e 100644
--- a/app/Database/Migrations/20250716170000_MissingConfigKeys.php
+++ b/app/Database/Migrations/20250716170000_MissingConfigKeys.php
@@ -12,7 +12,7 @@ class Migration_MissingConfigKeys extends Migration
     public function up(): void
     {
         helper('migration');
-        executeScriptWithTransaction(APPPATH . 'Database/Migrations/sqlscripts/3.4.2_missing_config_keys.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.4.2_missing_config_keys.sql', true);
     }
 
     /**
diff --git a/app/Database/Migrations/20250729170000_NullableTaxCategoryId.php b/app/Database/Migrations/20250729170000_NullableTaxCategoryId.php
index 51e609709..27367797d 100644
--- a/app/Database/Migrations/20250729170000_NullableTaxCategoryId.php
+++ b/app/Database/Migrations/20250729170000_NullableTaxCategoryId.php
@@ -12,7 +12,7 @@ class Migration_NullableTaxCategoryId extends Migration
     public function up(): void
     {
         helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.2_nullable_tax_category_id.sql');
+        executeScript(APPPATH . 'Database/Migrations/sqlscripts/3.4.2_nullable_tax_category_id.sql');
     }
 
     /**
diff --git a/app/Database/Migrations/20260506000000_AddShortcutKeys.php b/app/Database/Migrations/20260506000000_AddShortcutKeys.php
new file mode 100644
index 000000000..66f5347af
--- /dev/null
+++ b/app/Database/Migrations/20260506000000_AddShortcutKeys.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddShortcutKeys extends Migration
+{
+    public function up(): void
+    {
+        $shortcutValues = [
+            ['key' => 'key_cancel', 'value' => '27 | ESC'],
+            ['key' => 'key_items', 'value' => '49 | ALT + 1'],
+            ['key' => 'key_customers', 'value' => '50 | ALT + 2'],
+            ['key' => 'key_suspend', 'value' => '51 | ALT + 3'],
+            ['key' => 'key_suspended', 'value' => '52 | ALT + 4'],
+            ['key' => 'key_amount', 'value' => '53 | ALT + 5'],
+            ['key' => 'key_payment', 'value' => '54 | ALT + 6'],
+            ['key' => 'key_complete', 'value' => '55 | ALT + 7'],
+            ['key' => 'key_finish', 'value' => '56 | ALT + 8'],
+            ['key' => 'key_help', 'value' => '57 | ALT + 9'],
+        ];
+
+        $this->db->table('app_config')->ignore(true)->insertBatch($shortcutValues);
+    }
+
+    public function down(): void
+    {
+        $shortcutKeys = [
+            'key_cancel',
+            'key_items',
+            'key_customers',
+            'key_suspend',
+            'key_suspended',
+            'key_amount',
+            'key_payment',
+            'key_complete',
+            'key_finish',
+            'key_help',
+        ];
+
+        $this->db->table('app_config')
+            ->whereIn('key', $shortcutKeys)
+            ->delete();
+    }
+}
diff --git a/app/Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql b/app/Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql
index f1b80715b..5852b9875 100644
--- a/app/Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql
+++ b/app/Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql
@@ -327,19 +327,6 @@ INSERT INTO `ospos_sales_items` (sale_id, item_id, description, serialnumber, li
 INSERT INTO `ospos_sales_payments` (sale_id, payment_type, payment_amount) SELECT sale_id, payment_type, payment_amount FROM `ospos_sales_suspended_payments`;
 INSERT INTO `ospos_sales_items_taxes` (sale_id, item_id, line, name, percent) SELECT sale_id, item_id, line, name, percent FROM `ospos_sales_suspended_items_taxes`;
 
-ALTER TABLE `ospos_sales_suspended_payments` DROP FOREIGN KEY `ospos_sales_suspended_payments_ibfk_1`;
-
-ALTER TABLE `ospos_sales_suspended_items_taxes` DROP FOREIGN KEY `ospos_sales_suspended_items_taxes_ibfk_1`;
-ALTER TABLE `ospos_sales_suspended_items_taxes` DROP FOREIGN KEY `ospos_sales_suspended_items_taxes_ibfk_2`;
-
-ALTER TABLE `ospos_sales_suspended_items` DROP FOREIGN KEY `ospos_sales_suspended_items_ibfk_1`;
-ALTER TABLE `ospos_sales_suspended_items` DROP FOREIGN KEY `ospos_sales_suspended_items_ibfk_2`;
-ALTER TABLE `ospos_sales_suspended_items` DROP FOREIGN KEY `ospos_sales_suspended_items_ibfk_3`;
-
-ALTER TABLE `ospos_sales_suspended` DROP FOREIGN KEY `ospos_sales_suspended_ibfk_1`;
-ALTER TABLE `ospos_sales_suspended` DROP FOREIGN KEY `ospos_sales_suspended_ibfk_2`;
-ALTER TABLE `ospos_sales_suspended` DROP FOREIGN KEY `ospos_sales_suspended_ibfk_3`;
-
 DROP TABLE `ospos_sales_suspended_payments`, `ospos_sales_suspended_items_taxes`, `ospos_sales_suspended_items`, `ospos_sales_suspended`;
 
 --
diff --git a/app/Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql b/app/Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql
index 19ea538a2..397b05ab6 100644
--- a/app/Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql
+++ b/app/Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql
@@ -140,7 +140,7 @@ CREATE TABLE IF NOT EXISTS `ospos_expense_categories` (
   `category_name` varchar(255) DEFAULT NULL,
   `category_description` varchar(255) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 -- Table structure for table `ospos_expenses`
@@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `ospos_expenses` (
   `description` varchar(255) NOT NULL,
   `employee_id` int(10) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 -- Indexes for table `ospos_expense_categories`
diff --git a/app/Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql b/app/Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql
index d6ffb7062..d2695969e 100644
--- a/app/Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql
+++ b/app/Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql
@@ -75,7 +75,7 @@ CREATE TABLE `ospos_cash_up` (
   `open_employee_id` int(10) NOT NULL,
   `close_employee_id` int(10) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 -- Indexes for table `ospos_cash_up`
 
diff --git a/app/Database/Migrations/sqlscripts/3.3.0_indiagst.sql b/app/Database/Migrations/sqlscripts/3.3.0_indiagst.sql
index 449951025..0e1597ddc 100644
--- a/app/Database/Migrations/sqlscripts/3.3.0_indiagst.sql
+++ b/app/Database/Migrations/sqlscripts/3.3.0_indiagst.sql
@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `ospos_tax_codes` (
     `state` varchar(255) NOT NULL DEFAULT '',
     `deleted` int(1) NOT NULL DEFAULT 0,
     PRIMARY KEY (`tax_code_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 ALTER TABLE `ospos_customers`
     ADD COLUMN `tax_id` varchar(32) NOT NULL DEFAULT '' AFTER `taxable`,
@@ -59,7 +59,7 @@ CREATE TABLE `ospos_sales_taxes` (
     `rounding_code` tinyint(2) NOT NULL DEFAULT 0,
     PRIMARY KEY (`sales_taxes_id`),
     KEY `print_sequence` (`sale_id`,`print_sequence`,`tax_group`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 CREATE TABLE IF NOT EXISTS `ospos_tax_jurisdictions` (
     `jurisdiction_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS `ospos_tax_jurisdictions` (
     `cascade_sequence` tinyint(2) NOT NULL DEFAULT 0,
     `deleted` int(1) NOT NULL DEFAULT 0,
     PRIMARY KEY (`jurisdiction_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci AUTO_INCREMENT=1;
 
 ALTER TABLE `ospos_suppliers`
     ADD COLUMN `tax_id` varchar(32) DEFAULT NULL AFTER `account_number`;
@@ -89,7 +89,7 @@ CREATE TABLE IF NOT EXISTS `ospos_tax_rates` (
     `tax_rate` decimal(15,4) NOT NULL DEFAULT 0.0000,
     `tax_rounding_code` tinyint(2) NOT NULL DEFAULT 0,
     PRIMARY KEY (`tax_rate_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 -- Add support for sales tax report
 
diff --git a/app/Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql b/app/Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql
index 84870add8..641bdc33b 100644
--- a/app/Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql
+++ b/app/Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql
@@ -12,7 +12,7 @@ CREATE TABLE `ospos_sales_payments` (
   `reference_code` varchar(40) NOT NULL DEFAULT '',
   PRIMARY KEY (`payment_id`),
   KEY `payment_sale` (`sale_id`, `payment_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 INSERT INTO ospos_sales_payments (sale_id, payment_type, payment_amount, payment_user)
 SELECT payments.sale_id, payments.payment_type, payments.payment_amount, sales.employee_id
diff --git a/app/Database/Migrations/sqlscripts/3.4.0_ci4_conversion.sql b/app/Database/Migrations/sqlscripts/3.4.0_CI4Conversion.sql
similarity index 100%
rename from app/Database/Migrations/sqlscripts/3.4.0_ci4_conversion.sql
rename to app/Database/Migrations/sqlscripts/3.4.0_CI4Conversion.sql
diff --git a/app/Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql b/app/Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql
index 50f702b95..86f3e189e 100644
--- a/app/Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql
+++ b/app/Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql
@@ -11,10 +11,6 @@ ALTER TABLE `ospos_attribute_definitions` ADD INDEX(`definition_type`);
 ALTER TABLE `ospos_cash_up` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL;
 
 #ospos_customers table
-ALTER TABLE `ospos_customers` DROP FOREIGN KEY `ospos_customers_ibfk_1`;
-ALTER TABLE `ospos_customers_points` DROP FOREIGN KEY `ospos_customers_points_ibfk_1`;
-ALTER TABLE `ospos_sales` DROP FOREIGN KEY `ospos_sales_ibfk_2`;
-
 ALTER TABLE `ospos_customers` MODIFY `taxable` tinyint(1) DEFAULT 1 NOT NULL;
 ALTER TABLE `ospos_customers` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL;
 ALTER TABLE `ospos_customers` MODIFY `discount_type` tinyint(1) DEFAULT 0 NOT NULL;
@@ -31,16 +27,6 @@ ALTER TABLE `ospos_dinner_tables` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL
 ALTER TABLE `ospos_dinner_tables` ADD INDEX(`status`);
 
 #ospos_employees table
-ALTER TABLE `ospos_sales_payments` DROP FOREIGN KEY `ospos_sales_payments_ibfk_2`;
-ALTER TABLE `ospos_sales` DROP FOREIGN KEY `ospos_sales_ibfk_1`;
-ALTER TABLE `ospos_receivings` DROP FOREIGN KEY `ospos_receivings_ibfk_1`;
-ALTER TABLE `ospos_inventory` DROP FOREIGN KEY `ospos_inventory_ibfk_2`;
-ALTER TABLE `ospos_grants` DROP FOREIGN KEY `ospos_grants_ibfk_2`;
-ALTER TABLE `ospos_expenses` DROP FOREIGN KEY `ospos_expenses_ibfk_2`;
-ALTER TABLE `ospos_employees` DROP FOREIGN KEY `ospos_employees_ibfk_1`;
-ALTER TABLE `ospos_cash_up` DROP FOREIGN KEY `ospos_cash_up_ibfk_1`;
-ALTER TABLE `ospos_cash_up` DROP FOREIGN KEY `ospos_cash_up_ibfk_2`;
-
 ALTER TABLE `ospos_employees` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL;
 ALTER TABLE `ospos_employees` MODIFY `hash_version` tinyint(1) DEFAULT 2 NOT NULL;
 
@@ -67,7 +53,6 @@ ALTER TABLE `ospos_expense_categories` ADD INDEX(`category_description`);
 ALTER TABLE `ospos_giftcards` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL;
 
 #ospos_items table
-ALTER TABLE `ospos_items` DROP FOREIGN KEY `ospos_items_ibfk_1`;
 ALTER TABLE `ospos_items` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL;
 ALTER TABLE `ospos_items` MODIFY `stock_type` tinyint(1) DEFAULT 0 NOT NULL;
 ALTER TABLE `ospos_items` MODIFY `item_type` tinyint(1) DEFAULT 0 NOT NULL;
@@ -112,10 +97,6 @@ ALTER TABLE `ospos_sessions` ADD INDEX(`ip_address`);
 ALTER TABLE `ospos_stock_locations` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL;
 
 #ospos_suppliers table
-ALTER TABLE `ospos_expenses` DROP FOREIGN KEY `ospos_expenses_ibfk_3`;
-ALTER TABLE `ospos_receivings` DROP FOREIGN KEY `ospos_receivings_ibfk_2`;
-ALTER TABLE `ospos_suppliers` DROP FOREIGN KEY `ospos_suppliers_ibfk_1`;
-
 ALTER TABLE `ospos_suppliers` MODIFY `deleted` tinyint(1) DEFAULT 0 NOT NULL;
 ALTER TABLE `ospos_suppliers` MODIFY `category` tinyint(1) NOT NULL;
 ALTER TABLE `ospos_suppliers` ADD INDEX(`category`);
diff --git a/app/Database/tables.sql b/app/Database/Migrations/sqlscripts/initial_schema.sql
similarity index 76%
rename from app/Database/tables.sql
rename to app/Database/Migrations/sqlscripts/initial_schema.sql
index 943706722..0823793a5 100644
--- a/app/Database/tables.sql
+++ b/app/Database/Migrations/sqlscripts/initial_schema.sql
@@ -730,3 +730,148 @@ CREATE TABLE `ospos_suppliers` (
 --
 -- Dumping data for table `ospos_suppliers`
 --
+--
+-- Constraints for dumped tables
+--
+
+--
+-- Constraints for table `ospos_customers`
+--
+ALTER TABLE `ospos_customers`
+    ADD CONSTRAINT `ospos_customers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
+
+--
+-- Constraints for table `ospos_employees`
+--
+ALTER TABLE `ospos_employees`
+    ADD CONSTRAINT `ospos_employees_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
+
+--
+-- Constraints for table `ospos_inventory`
+--
+ALTER TABLE `ospos_inventory`
+    ADD CONSTRAINT `ospos_inventory_ibfk_1` FOREIGN KEY (`trans_items`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_inventory_ibfk_2` FOREIGN KEY (`trans_user`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_inventory_ibfk_3` FOREIGN KEY (`trans_location`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_items`
+--
+ALTER TABLE `ospos_items`
+    ADD CONSTRAINT `ospos_items_ibfk_1` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
+
+--
+-- Constraints for table `ospos_items_taxes`
+--
+ALTER TABLE `ospos_items_taxes`
+    ADD CONSTRAINT `ospos_items_taxes_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`) ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_item_kit_items`
+--
+ALTER TABLE `ospos_item_kit_items`
+    ADD CONSTRAINT `ospos_item_kit_items_ibfk_1` FOREIGN KEY (`item_kit_id`) REFERENCES `ospos_item_kits` (`item_kit_id`) ON DELETE CASCADE,
+    ADD CONSTRAINT `ospos_item_kit_items_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`)  ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_permissions`
+--
+ALTER TABLE `ospos_permissions`
+    ADD CONSTRAINT `ospos_permissions_ibfk_1` FOREIGN KEY (`module_id`) REFERENCES `ospos_modules` (`module_id`) ON DELETE CASCADE,
+    ADD CONSTRAINT `ospos_permissions_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`) ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_grants`
+--
+ALTER TABLE `ospos_grants`
+    ADD CONSTRAINT `ospos_grants_ibfk_1` foreign key (`permission_id`) references `ospos_permissions` (`permission_id`) ON DELETE CASCADE,
+    ADD CONSTRAINT `ospos_grants_ibfk_2` foreign key (`person_id`) references `ospos_employees` (`person_id`) ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_receivings`
+--
+ALTER TABLE `ospos_receivings`
+    ADD CONSTRAINT `ospos_receivings_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_receivings_ibfk_2` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
+
+--
+-- Constraints for table `ospos_receivings_items`
+--
+ALTER TABLE `ospos_receivings_items`
+    ADD CONSTRAINT `ospos_receivings_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_receivings_items_ibfk_2` FOREIGN KEY (`receiving_id`) REFERENCES `ospos_receivings` (`receiving_id`);
+
+--
+-- Constraints for table `ospos_sales`
+--
+ALTER TABLE `ospos_sales`
+    ADD CONSTRAINT `ospos_sales_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_sales_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
+
+--
+-- Constraints for table `ospos_sales_items`
+--
+ALTER TABLE `ospos_sales_items`
+    ADD CONSTRAINT `ospos_sales_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_sales_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`),
+    ADD CONSTRAINT `ospos_sales_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_sales_items_taxes`
+--
+ALTER TABLE `ospos_sales_items_taxes`
+    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_items` (`sale_id`,`item_id`,`line`),
+    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
+
+--
+-- Constraints for table `ospos_sales_payments`
+--
+ALTER TABLE `ospos_sales_payments`
+    ADD CONSTRAINT `ospos_sales_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended`
+--
+ALTER TABLE `ospos_sales_suspended`
+    ADD CONSTRAINT `ospos_sales_suspended_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_sales_suspended_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended_items`
+--
+ALTER TABLE `ospos_sales_suspended_items`
+    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`),
+    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended_items_taxes`
+--
+ALTER TABLE `ospos_sales_suspended_items_taxes`
+    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_suspended_items` (`sale_id`,`item_id`,`line`),
+    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended_payments`
+--
+ALTER TABLE `ospos_sales_suspended_payments`
+    ADD CONSTRAINT `ospos_sales_suspended_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`);
+
+--
+-- Constraints for table `ospos_item_quantities`
+--
+ALTER TABLE `ospos_item_quantities`
+    ADD CONSTRAINT `ospos_item_quantities_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_item_quantities_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_suppliers`
+--
+ALTER TABLE `ospos_suppliers`
+    ADD CONSTRAINT `ospos_suppliers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
+
+--
+-- Constraints for table `ospos_giftcards`
+--
+ALTER TABLE `ospos_giftcards`
+    ADD CONSTRAINT `ospos_giftcards_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
diff --git a/app/Database/Seeds/TestDatabaseBootstrapSeeder.php b/app/Database/Seeds/TestDatabaseBootstrapSeeder.php
new file mode 100644
index 000000000..134d10406
--- /dev/null
+++ b/app/Database/Seeds/TestDatabaseBootstrapSeeder.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Database\Seeds;
+
+use CodeIgniter\Database\Seeder;
+use Config\Database;
+
+class TestDatabaseBootstrapSeeder extends Seeder
+{
+    public static function reset(): void
+    {
+        if (ENVIRONMENT !== 'testing') {
+            throw new \RuntimeException('TestDatabaseBootstrapSeeder can only run in the testing environment.');
+        }
+
+        $config = config('Database');
+        $group  = $config->tests;
+        $dbName = $group['database'];
+
+        if ($dbName === '' || !str_contains(strtolower($dbName), 'test')) {
+            throw new \RuntimeException("Refusing to reset non-test database: {$dbName}");
+        }
+
+        $serverConn = Database::connect([
+            'hostname' => $group['hostname'],
+            'username' => $group['username'],
+            'password' => $group['password'],
+            'DBDriver' => $group['DBDriver'],
+            'database' => null,
+            'charset'  => $group['charset'] ?? 'utf8mb4',
+            'DBCollat' => $group['DBCollat'] ?? 'utf8mb4_general_ci',
+        ], false);
+
+        $serverConn->query("DROP DATABASE IF EXISTS `{$dbName}`");
+        $serverConn->query("CREATE DATABASE IF NOT EXISTS `{$dbName}`");
+        $serverConn->close();
+
+        // The application's shared 'tests' connection caches listTables()
+        // results in dataCache['table_names'']. Because we dropped and
+        // recreated the schema on a SEPARATE server connection above, that
+        // cache is now stale. Reset it so subsequent listTables()/tableExists()
+        // calls re-query the server instead of trusting a dropped schema's table
+        // list (which previously caused "ospos_migrations doesn't exist" and
+        // "column ... doesn't exist" errors for every class that followed a
+        // bootstrap-reset class in the suite).
+        $shared = Database::connect('tests');
+        $shared->resetDataCache();
+    }
+
+    public function run(): void
+    {
+        self::reset();
+    }
+}
diff --git a/app/Database/constraints.sql b/app/Database/constraints.sql
deleted file mode 100644
index 84c9ea292..000000000
--- a/app/Database/constraints.sql
+++ /dev/null
@@ -1,145 +0,0 @@
---
--- Constraints for dumped tables
---
-
---
--- Constraints for table `ospos_customers`
---
-ALTER TABLE `ospos_customers`
-    ADD CONSTRAINT `ospos_customers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
-
---
--- Constraints for table `ospos_employees`
---
-ALTER TABLE `ospos_employees`
-    ADD CONSTRAINT `ospos_employees_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
-
---
--- Constraints for table `ospos_inventory`
---
-ALTER TABLE `ospos_inventory`
-    ADD CONSTRAINT `ospos_inventory_ibfk_1` FOREIGN KEY (`trans_items`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_inventory_ibfk_2` FOREIGN KEY (`trans_user`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_inventory_ibfk_3` FOREIGN KEY (`trans_location`) REFERENCES `ospos_stock_locations` (`location_id`);
-
---
--- Constraints for table `ospos_items`
---
-ALTER TABLE `ospos_items`
-    ADD CONSTRAINT `ospos_items_ibfk_1` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
-
---
--- Constraints for table `ospos_items_taxes`
---
-ALTER TABLE `ospos_items_taxes`
-    ADD CONSTRAINT `ospos_items_taxes_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`) ON DELETE CASCADE;
-
---
--- Constraints for table `ospos_item_kit_items`
---
-ALTER TABLE `ospos_item_kit_items`
-    ADD CONSTRAINT `ospos_item_kit_items_ibfk_1` FOREIGN KEY (`item_kit_id`) REFERENCES `ospos_item_kits` (`item_kit_id`) ON DELETE CASCADE,
-    ADD CONSTRAINT `ospos_item_kit_items_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`)  ON DELETE CASCADE;
-
---
--- Constraints for table `ospos_permissions`
---
-ALTER TABLE `ospos_permissions`
-    ADD CONSTRAINT `ospos_permissions_ibfk_1` FOREIGN KEY (`module_id`) REFERENCES `ospos_modules` (`module_id`) ON DELETE CASCADE,
-    ADD CONSTRAINT `ospos_permissions_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`) ON DELETE CASCADE;
-
---
--- Constraints for table `ospos_grants`
---
-ALTER TABLE `ospos_grants`
-    ADD CONSTRAINT `ospos_grants_ibfk_1` foreign key (`permission_id`) references `ospos_permissions` (`permission_id`) ON DELETE CASCADE,
-    ADD CONSTRAINT `ospos_grants_ibfk_2` foreign key (`person_id`) references `ospos_employees` (`person_id`) ON DELETE CASCADE;
-
---
--- Constraints for table `ospos_receivings`
---
-ALTER TABLE `ospos_receivings`
-    ADD CONSTRAINT `ospos_receivings_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_receivings_ibfk_2` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
-
---
--- Constraints for table `ospos_receivings_items`
---
-ALTER TABLE `ospos_receivings_items`
-    ADD CONSTRAINT `ospos_receivings_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_receivings_items_ibfk_2` FOREIGN KEY (`receiving_id`) REFERENCES `ospos_receivings` (`receiving_id`);
-
---
--- Constraints for table `ospos_sales`
---
-ALTER TABLE `ospos_sales`
-    ADD CONSTRAINT `ospos_sales_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_sales_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
-
---
--- Constraints for table `ospos_sales_items`
---
-ALTER TABLE `ospos_sales_items`
-    ADD CONSTRAINT `ospos_sales_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_sales_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`),
-    ADD CONSTRAINT `ospos_sales_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
-
---
--- Constraints for table `ospos_sales_items_taxes`
---
-ALTER TABLE `ospos_sales_items_taxes`
-    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_items` (`sale_id`,`item_id`,`line`),
-    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
-
---
--- Constraints for table `ospos_sales_payments`
---
-ALTER TABLE `ospos_sales_payments`
-    ADD CONSTRAINT `ospos_sales_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`);
-
---
--- Constraints for table `ospos_sales_suspended`
---
-ALTER TABLE `ospos_sales_suspended`
-    ADD CONSTRAINT `ospos_sales_suspended_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_sales_suspended_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
-
---
--- Constraints for table `ospos_sales_suspended_items`
---
-ALTER TABLE `ospos_sales_suspended_items`
-    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`),
-    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
-
---
--- Constraints for table `ospos_sales_suspended_items_taxes`
---
-ALTER TABLE `ospos_sales_suspended_items_taxes`
-    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_suspended_items` (`sale_id`,`item_id`,`line`),
-    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
-
---
--- Constraints for table `ospos_sales_suspended_payments`
---
-ALTER TABLE `ospos_sales_suspended_payments`
-    ADD CONSTRAINT `ospos_sales_suspended_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`);
-
---
--- Constraints for table `ospos_item_quantities`
---
-ALTER TABLE `ospos_item_quantities`
-    ADD CONSTRAINT `ospos_item_quantities_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_item_quantities_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`);
-
---
--- Constraints for table `ospos_suppliers`
---
-ALTER TABLE `ospos_suppliers`
-    ADD CONSTRAINT `ospos_suppliers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
-
---
--- Constraints for table `ospos_giftcards`
---
-ALTER TABLE `ospos_giftcards`
-    ADD CONSTRAINT `ospos_giftcards_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
diff --git a/app/Events/Db_log.php b/app/Events/Db_log.php
index 5d3784b04..bfaf347b1 100644
--- a/app/Events/Db_log.php
+++ b/app/Events/Db_log.php
@@ -36,21 +36,26 @@ class Db_log
     private function generate_message(): string
     {
         $db = Database::connect();
-        $last_query = $db->getLastQuery();
-        $affected_rows = $db->affectedRows();
-        $execution_time = $this->convert_time($last_query->getDuration());
+        $lastQuery = $db->getLastQuery();
+
+        if ($lastQuery === null) {
+            return '';
+        }
+
+        $affectedRows = $db->affectedRows();
+        $executionTime = $this->convert_time($lastQuery->getDuration());
 
         $message = '*** Query: ' . date('Y-m-d H:i:s T') . ' *******************'
-            . "\n" . $last_query->getQuery()
-            . "\n Affected rows: $affected_rows"
-            . "\n Execution Time: " . $execution_time['time'] . ' ' . $execution_time['unit'];
+            . "\n" . $lastQuery->getQuery()
+            . "\n Affected rows: $affectedRows"
+            . "\n Execution Time: " . $executionTime['time'] . ' ' . $executionTime['unit'];
 
-        $long_query = ($execution_time['unit'] === 's') && ($execution_time['time'] > 0.5);
-        if ($long_query) {
+        $longQuery = ($executionTime['unit'] === 's') && ($executionTime['time'] > 0.5);
+        if ($longQuery) {
             $message .= ' [LONG RUNNING QUERY]';
         }
 
-        return $this->config->db_log_only_long && !$long_query ? '' : $message;
+        return $this->config->db_log_only_long && !$longQuery ? '' : $message;
     }
 
     /**
diff --git a/app/Events/Load_config.php b/app/Events/Load_config.php
index dc7805e64..d98d68e66 100644
--- a/app/Events/Load_config.php
+++ b/app/Events/Load_config.php
@@ -4,6 +4,8 @@ namespace App\Events;
 
 use App\Libraries\MY_Migration;
 use App\Models\Appconfig;
+use CodeIgniter\Session\Handlers\DatabaseHandler;
+use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\Session\Session;
 use Config\OSPOS;
 use Config\Services;
@@ -19,38 +21,51 @@ class Load_config
 {
     public Session $session;
 
-    /**
-     * Loads configuration from database into App CI config and then applies those settings
-     */
     public function load_config(): void
     {
-        // Migrations
         $migration_config = config('Migrations');
         $migration = new MY_Migration($migration_config);
 
         $this->session = session();
 
-        // Database Configuration
         $config = config(OSPOS::class);
 
-        if (!$migration->is_latest()) {
+        if (!$migration->isLatest()) {
             $this->session->destroy();
         }
 
-        // Language
-        $language_exists = file_exists('../app/Language/' . current_language_code());
-
-        if (current_language_code() == null || current_language() == null || !$language_exists) {    // TODO: current_language() is undefined
-            $config->settings['language'] = 'english';
-            $config->settings['language_code'] = 'en';
-        }
+        $this->setDefaultLanguage($config);
 
         $language = Services::language();
-        $language->setLocale($config->settings['language_code']);
+        $language->setLocale(current_language_code());
 
-        // Time Zone
         date_default_timezone_set($config->settings['timezone'] ?? ini_get('date.timezone'));
 
         bcscale(max(2, totals_decimals() + tax_decimals()));
     }
+
+    private function setDefaultLanguage(OSPOS $config): void
+    {
+        $languageCode = $config->settings['language_code'] ?? null;
+
+        if (empty($config->settings) || $languageCode === null) {
+            $config->settings['language'] = 'english';
+            $config->settings['language_code'] = 'en';
+            return;
+        }
+
+        if (!$this->languageExists($languageCode)) {
+            $config->settings['language'] = 'english';
+            $config->settings['language_code'] = 'en';
+        }
+    }
+
+    private function languageExists(string $languageCode): bool
+    {
+        if (strpbrk($languageCode, '/\\') !== false || str_contains($languageCode, '..') || str_contains($languageCode, "\0")) {
+            return false;
+        }
+
+        return file_exists(APPPATH . 'Language/' . $languageCode);
+    }
 }
diff --git a/app/Filters/IsLoggedIn.php b/app/Filters/IsLoggedIn.php
new file mode 100644
index 000000000..98ab87069
--- /dev/null
+++ b/app/Filters/IsLoggedIn.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Filters;
+
+use App\Models\Employee;
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\Exceptions\RedirectException;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class IsLoggedIn implements FilterInterface
+{
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $employee = model(Employee::class);
+
+        if (!$employee->is_logged_in()) {
+            if ($request->isAJAX()) {
+                return service('response')
+                    ->setStatusCode(401)
+                    ->setJSON([
+                        'success' => false,
+                        'message' => 'Session expired. Please log in again.',
+                    ]);
+            }
+
+            throw new RedirectException('login');
+        }
+
+        return null;
+    }
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
+}
diff --git a/app/Filters/Throttle.php b/app/Filters/Throttle.php
new file mode 100644
index 000000000..ca4a558ab
--- /dev/null
+++ b/app/Filters/Throttle.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+
+/**
+ * Rate limits login/migrate POST attempts by IP and submitted username to
+ * mitigate brute-force/credential-stuffing. Backed by CodeIgniter's
+ * cache-based Throttler, so limits are per-server (not shared on file cache).
+ *
+ * Tunable via `throttle.capacity` (default 5; 0 disables) and
+ * `throttle.seconds` (window, default 60) in .env.
+ */
+class Throttle implements FilterInterface
+{
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        if ($request->getMethod() !== 'POST') {
+            return null;
+        }
+
+        // Non-positive integer = explicit disable; missing/non-numeric falls
+        // back to the default so a typo (e.g. "five") cannot bypass lockout.
+        $capacity = filter_var(env('throttle.capacity'), FILTER_VALIDATE_INT);
+        if ($capacity === false) {
+            $capacity = 5;
+        }
+        if ($capacity <= 0) {
+            return null;
+        }
+
+        $seconds = filter_var(env('throttle.seconds'), FILTER_VALIDATE_INT);
+        if ($seconds === false) {
+            $seconds = 60;
+        }
+        $seconds = max(1, $seconds);
+
+        helper('security');
+
+        $throttler = Services::throttler();
+        $secret    = checkThrottleEncryption();
+
+        $ipKey       = 'login-ip-' . hash_hmac('sha256', $request->getIPAddress(), $secret);
+        $rawUsername = $request->getPost('username');
+        $username    = is_scalar($rawUsername) ? strtolower((string) $rawUsername) : '';
+        $usernameKey = $username !== '' ? 'login-user-' . hash_hmac('sha256', $username, $secret) : null;
+
+        $ipOk       = $throttler->check($ipKey, $capacity, $seconds);
+        $usernameOk = $usernameKey === null || $throttler->check($usernameKey, $capacity, $seconds);
+
+        if (!$ipOk || !$usernameOk) {
+            log_message('warning', 'Login throttled for IP {ip} (username: {username})', [
+                'ip'       => $request->getIPAddress(),
+                'username' => $username !== '' ? $username : '(none)',
+            ]);
+
+            return service('response')
+                ->setStatusCode(429)
+                ->setJSON([
+                    'success' => false,
+                    'message' => lang('Login.too_many_attempts'),
+                ]);
+        }
+
+        return null;
+    }
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        return null;
+    }
+}
diff --git a/app/Helpers/attribute_helper.php b/app/Helpers/attribute_helper.php
new file mode 100644
index 000000000..af89723c6
--- /dev/null
+++ b/app/Helpers/attribute_helper.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Translates the attribute type to the corresponding database column name.
+ *
+ * Maps attribute type constants to their corresponding attribute_values table columns.
+ * Defaults to 'attribute_value' for TEXT, DROPDOWN and CHECKBOX attribute types.
+ *
+ * @param string $input The attribute type constant (DATE, DECIMAL, etc.)
+ * @return string The database column name for storing this attribute type
+ */
+function getAttributeDataType(string $input): string
+{
+    $columnMap = [
+        DATE => 'attribute_date',
+        DECIMAL => 'attribute_decimal',
+    ];
+
+    return $columnMap[$input] ?? 'attribute_value';
+}
+
+/**
+ * Validates that the provided data type is an allowed attribute value type.
+ *
+ * @param string $dataType
+ * @return void
+ */
+function validateAttributeValueType(string $dataType): void
+{
+    $attributeValueTypes = ['attribute_value', 'attribute_decimal', 'attribute_date'];
+
+    if (!in_array($dataType, $attributeValueTypes, true)) {
+        throw new InvalidArgumentException('Invalid data type');
+    }
+}
diff --git a/app/Helpers/dompdf_helper.php b/app/Helpers/dompdf_helper.php
index 3baf0a5ea..fcd9a3c1f 100644
--- a/app/Helpers/dompdf_helper.php
+++ b/app/Helpers/dompdf_helper.php
@@ -5,8 +5,13 @@
  */
 function create_pdf(string $html, string $filename = ''): string
 {
-    // Need to enable magic quotes for the
-    $dompdf = new Dompdf\Dompdf(['isRemoteEnabled' => true, 'isPhpEnabled' => true]);
+    // Security: Disable PHP execution in PDFs to prevent RCE attacks
+    // Security: Disable remote file access to prevent SSRF attacks
+    // Only local files referenced in HTML are allowed
+    $dompdf = new Dompdf\Dompdf([
+        'isRemoteEnabled' => false,
+        'isPhpEnabled' => false
+    ]);
     $dompdf->loadHtml(str_replace(['\n', '\r'], '', $html));
     $dompdf->render();
 
diff --git a/app/Helpers/importfile_helper.php b/app/Helpers/importfile_helper.php
index 07cef9a43..fb3f67823 100644
--- a/app/Helpers/importfile_helper.php
+++ b/app/Helpers/importfile_helper.php
@@ -1,10 +1,10 @@
 <?php
+
 /**
  * @param array $stock_locations
  * @param array $attributes
  * @return string
  */
-
 function generate_import_items_csv(array $stock_locations, array $attributes): string
 {
     $csv_headers = pack('CCC', 0xef, 0xbb, 0xbf);    // Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
@@ -98,3 +98,32 @@ function bom_exists(&$file_handle): bool
 
     return $result;
 }
+
+/**
+ * Checks that the parsed item import rows expose the columns the current
+ * template requires. A file whose header row does not match the template
+ * (for example when the "Id" column is missing, an attribute column was
+ * renamed, or a stock location was added since the file was last downloaded)
+ * would otherwise trigger "Undefined array key" errors while building each
+ * item. The required columns are derived from generate_import_items_csv(),
+ * the same function that builds the downloadable template, so location and
+ * attribute columns stay in sync automatically.
+ *
+ * @param array $csv_rows Rows returned by get_csv_file().
+ * @param array $stock_locations Stock locations, as returned by Stock_location::get_allowed_locations().
+ * @param array $attribute_names Attribute definition names, as returned by Attribute::get_definition_names().
+ * @return bool True when the required columns are present.
+ */
+function csvImportHasRequiredItemHeaders(array $csv_rows, array $stock_locations, array $attribute_names): bool
+{
+    if (empty($csv_rows)) {
+        return false;
+    }
+
+    $template_header_line = substr(generate_import_items_csv($stock_locations, $attribute_names), 3);
+    $required_headers = str_getcsv($template_header_line);
+
+    $present_headers = array_keys(reset($csv_rows));
+
+    return empty(array_diff($required_headers, $present_headers));
+}
diff --git a/app/Helpers/locale_helper.php b/app/Helpers/locale_helper.php
index b5d04e460..a9cc3ae64 100644
--- a/app/Helpers/locale_helper.php
+++ b/app/Helpers/locale_helper.php
@@ -22,9 +22,7 @@ function current_language_code(bool $load_system_language = false): string
         }
     }
 
-    $language_code = $config['language_code'];
-
-    return empty($language_code) ? DEFAULT_LANGUAGE_CODE : $language_code;
+    return $config['language_code'] ?? DEFAULT_LANGUAGE_CODE;
 }
 
 /**
@@ -45,9 +43,7 @@ function current_language(bool $load_system_language = false): string
         }
     }
 
-    $language = $config['language'];
-
-    return empty($language) ? DEFAULT_LANGUAGE : $language;
+    return $config['language'] ?? DEFAULT_LANGUAGE;
 }
 
 /**
@@ -276,9 +272,24 @@ function get_payment_options(): array
         $payments[lang('Sales.upi')] = lang('Sales.upi');
     }
 
+    $payments[lang('Sales.bank_transfer')] = lang('Sales.bank_transfer');
+    $payments[lang('Sales.wallet')]        = lang('Sales.wallet');
+
     return $payments;
 }
 
+/**
+ * Returns the payment types that require a reference code (e.g. card terminal receipt number).
+ * Single source of truth used by both the controller validation and the view's JS.
+ */
+function get_reference_code_payment_types(): array
+{
+    return [
+        lang('Sales.debit'),
+        lang('Sales.credit'),
+    ];
+}
+
 /**
  * Determines if the current currency symbol is on the right side of the amount
  *
@@ -474,7 +485,7 @@ function parse_decimals(string $number, ?int $decimals = null): mixed
     $fmt = new NumberFormatter($config['number_locale'], NumberFormatter::DECIMAL);
 
     if (!$decimals) {
-        $decimals = intVal($config['currency_decimals']);
+        $decimals = intVal($config['currency_decimals'] ?? 2);
         $fmt->setAttribute(NumberFormatter::FRACTION_DIGITS, $decimals);
     }
 
@@ -640,13 +651,14 @@ function dateformat_bootstrap(string $php_format): string
 }
 
 /**
- * @param string $date
+ * @param string $candidate
  * @return bool
  */
-function valid_date(string $date): bool    // TODO: need a better name for $date.  Perhaps $candidate. Also the function name would be better as is_valid_date()
+function isValidDate(string $candidate): bool
 {
     $config = config(OSPOS::class)->settings;
-    return (DateTime::createFromFormat($config['dateformat'], $date));
+    $parsed = DateTime::createFromFormat($config['dateformat'], $candidate);
+    return $parsed !== false && $parsed->format($config['dateformat']) === $candidate;
 }
 
 /**
diff --git a/app/Helpers/migration_helper.php b/app/Helpers/migration_helper.php
index 87183a060..0e86143c6 100644
--- a/app/Helpers/migration_helper.php
+++ b/app/Helpers/migration_helper.php
@@ -3,77 +3,43 @@
 use Config\Database;
 
 /**
- * Migration helper.
+ * Executes a SQL migration script.
  * @param string $path Path to migration script.
+ * @param bool $withTransaction Whether to wrap execution in a transaction.
  * @return bool Whether the migration executed successfully.
  */
-function execute_script(string $path): bool
+function executeScript(string $path, bool $withTransaction = false): bool
 {
-    $version = preg_replace("/(.*_)?(.*).sql/", "$2", $path);
+    $version = explode('_', basename($path, '.sql'), 2)[0];
     log_message('info', "Migrating to $version (file: $path)");
 
-    $sql = file_get_contents($path);
-    $sqls = explode(';', $sql);
+    $sqls = explode(';', file_get_contents($path));
     array_pop($sqls);
 
     $db = Database::connect();
 
+    if ($withTransaction) {
+        $db->transStart();
+    }
+
     $success = true; // whether *all* queries succeeded
-    foreach ($sqls as $statement) {
-        $statement = "$statement;";
-        $hadError = !$db->simpleQuery($statement);
-
-        if ($hadError) {
-            $success = false;
-            foreach ($db->error() as $error) {
-                log_message('error', "error: $error");
-            }
-        }
-    }
-
-    if ($success) {
-        log_message('info', "Successfully migrated to $version");
-    }
-    else {
-        log_message('info', "Could not migrate to $version.");
-    }
-
-    return $success;
-}
-
-/**
- * Migration helper that uses a transaction.
- * @param string $path Path to migration script.
- * @return bool Whether the migration executed successfully.
- */
-function executeScriptWithTransaction(string $path): bool
-{
-    $version = preg_replace("/(.*_)?(.*).sql/", "$2", $path);
-    log_message('info', "Migrating to $version (file: $path) with transaction");
-
-    $sql = file_get_contents($path);
-    $sqls = explode(';', $sql);
-    array_pop($sqls);
-
-    $db = Database::connect();
-    $db->transStart();
-
-    $success = true;
     try {
         foreach ($sqls as $statement) {
             $statement = "$statement;";
-            $hadError = !$db->query($statement);
+            $hadError = $withTransaction ? !$db->query($statement) : !$db->simpleQuery($statement);
 
             if ($hadError) {
                 $success = false;
                 foreach ($db->error() as $error) {
-                    log_message('info', "error: $error");
+                    log_message('error', "error: $error");
                 }
             }
         }
     } catch (Exception $e) {
-        log_message('info', "Could not migrate to $version: " . $e->getMessage());
-        $db->transRollback();
+        log_message('error', "Could not migrate to $version: " . $e->getMessage());
+        if ($withTransaction) {
+            $db->transRollback();
+        }
         return false;
     }
 
@@ -83,12 +49,15 @@ function executeScriptWithTransaction(string $path): bool
         log_message('info', "Could not migrate to $version.");
     }
 
-    $db->transComplete();
+    if ($withTransaction) {
+        $db->transComplete();
+    }
+
     return $success;
 }
 
 /**
- * Drops provided foreign key constraints from given table.
+ * Drops provided foreign key constraints from a given table if the constraint exists.
  * This is required to successfully create the generated unique constraint.
  *
  * @param array $foreignKeys names of the foreign key constraints to drop
@@ -172,6 +141,7 @@ function dropAllForeignKeyConstraints(string $table, string $column): array {
             WHERE kcu.TABLE_SCHEMA = DATABASE()
                 AND ((kcu.REFERENCED_TABLE_NAME = '" . $db->getPrefix() . "$table' AND kcu.REFERENCED_COLUMN_NAME = '$column')
                 OR (kcu.TABLE_NAME = '" . $db->getPrefix() . "$table' AND kcu.COLUMN_NAME = '$column'))
+                AND rc.CONSTRAINT_NAME IS NOT NULL
         ");
 
     $deletedConstraints = [];
diff --git a/app/Helpers/security_helper.php b/app/Helpers/security_helper.php
index cc13796f8..3c384ce75 100644
--- a/app/Helpers/security_helper.php
+++ b/app/Helpers/security_helper.php
@@ -1,111 +1,635 @@
 <?php
 
+use App\Libraries\CI3SecretConverter;
 use CodeIgniter\Encryption\Encryption;
 use Config\Services;
+use Random\RandomException;
 
 /**
- * @return bool
+ * Opens (creating if needed) and exclusively locks a dedicated mutex file
+ * for coordinating .env writes. Windows can't rename/delete a file while
+ * any handle to it is open, so the mutex must be a separate file from
+ * .env itself — never fopen()/flock() .env directly.
+ *
+ * @return resource
  */
-function check_encryption(): bool
+function lockEnvFile()
 {
-    $old_key = config('Encryption')->key;
+    $lockPath = config('SecurityEnv')->lockPath;
 
-    if ((empty($old_key)) || (strlen($old_key) < 64)) {
-        // Create Key
-        $encryption = new Encryption();
-        $key = bin2hex($encryption->createKey());
-        config('Encryption')->key = $key;
+    $handle = @fopen($lockPath, 'c+');
+    if ($handle === false) {
+        $reason = error_get_last()['message'] ?? 'unknown error';
+        log_message('critical', "Unable to open $lockPath: $reason");
 
-        // Write to .env
-        $config_path = ROOTPATH . '.env';
-        $new_config_path = WRITEPATH . '/backup/.env';
-        $backup_path = WRITEPATH . '/backup/.env.bak';
+        throw new RuntimeException(lang('Error.unable_to_open_lock_file', ['filePath' => $lockPath, 'reason' => $reason]));
+    }
 
-        $backup_folder = WRITEPATH . '/backup';
-
-        if (!file_exists($backup_folder) && !mkdir($backup_folder)) {
-            log_message('error', 'Could not create backup folder');
-            return false;
-        }
-
-        if (!copy($config_path, $backup_path)) {
-            log_message('error', "Unable to copy $config_path to $backup_path");
-        }
-
-        // Copy to backup
-        @chmod($config_path, 0660);
-        @chmod($backup_path, 0660);
-
-        $config_file = file_get_contents($config_path);
-        $config_file = preg_replace("/(encryption\.key.*=.*)('.*')/", "$1'$key'", $config_file);
-
-        if (!empty($old_key)) {
-            $old_line = "# encryption.key = '$old_key' REMOVE IF UNNEEDED\r\n";
-            $insertion_point = stripos($config_file, 'encryption.key');
-            $config_file = substr_replace($config_file, $old_line, $insertion_point, 0);
-        }
-
-        $handle = @fopen($config_path, 'w+');
-
-        if (empty($handle)) {
-            log_message('error', "Unable to open $config_path for updating");
-            return false;
-        }
-
-        @chmod($config_path, 0660);
-        $write_failed = !fwrite($handle, $config_file);
+    if (!flock($handle, LOCK_EX)) {
         fclose($handle);
 
-        if ($write_failed) {
-            log_message('error', "Unable to write to $config_path for updating.");
+        $reason = error_get_last()['message'] ?? 'unknown error';
+        log_message('critical', "Unable to lock $lockPath: $reason");
+
+        throw new RuntimeException(lang('Error.unable_to_lock_file', ['filePath' => $lockPath, 'reason' => $reason]));
+    }
+
+    return $handle;
+}
+
+/**
+ * @param resource $handle
+ * @return void
+ */
+function unlockEnvFile($handle): void
+{
+    flock($handle, LOCK_UN);
+    fclose($handle);
+}
+
+/**
+ * Copies .env.example to .env (or creates a stub) if .env does not exist yet.
+ *
+ * @param string $configPath
+ * @return bool true if $configPath exists (already did, or was just created)
+ */
+function initializeEnvFile(string $configPath): bool
+{
+    if (!file_exists($configPath)) {
+        $examplePath = ROOTPATH . '.env.example';
+        if (file_exists($examplePath)) {
+            @copy($examplePath, $configPath);
+        } else {
+            @file_put_contents($configPath, "# OSPOS Configuration\n\n");
+        }
+        @chmod($configPath, 0640);
+    }
+
+    return file_exists($configPath);
+}
+
+/**
+ * Replaces or inserts a single `key='value'` line in .env
+ *
+ * @param string $envKey
+ * @param string $value
+ * @return bool true on success, false if the write could not be completed
+ */
+function writeEnvKey(string $envKey, string $value): bool
+{
+    $configPath = config('SecurityEnv')->envPath;
+
+    if (!initializeEnvFile($configPath)) {
+        return false;
+    }
+
+    $lock = lockEnvFile();
+
+    try {
+        $configFile = @file_get_contents($configPath);
+        if ($configFile === false) {
             return false;
         }
-        log_message('info', "File $config_path has been updated.");
+
+        $updated = applyEnvKeyReplacement($configFile, $envKey, $value);
+        if ($updated === null) {
+            return false;
+        }
+
+        return atomicWriteFile($configPath, $updated);
+    } finally {
+        unlockEnvFile($lock);
+    }
+}
+
+function applyEnvKeyReplacement(string $configFile, string $envKey, string $value): ?string
+{
+    $pattern = '/^\s*' . preg_quote($envKey, '/') . '\s*=.*/m';
+    $escapedValue = str_replace(['\\', '$'], ['\\\\', '\\$'], $value);
+
+    if (preg_match($pattern, $configFile)) {
+        return preg_replace_callback($pattern, static fn () => "$envKey='$escapedValue'", $configFile, 1);
+    }
+
+    // New keys insert right after encryption.key so it stays first for easy backup/rotation.
+    if (preg_match('/^encryption\.key\s*=.*$/m', $configFile, $matches, PREG_OFFSET_CAPTURE)) {
+        $insertAt = (int) $matches[0][1] + strlen($matches[0][0]);
+
+        return substr_replace($configFile, "\n$envKey='$escapedValue'", $insertAt, 0);
+    }
+
+    return $configFile . "\n$envKey='$escapedValue'\n";
+}
+
+/**
+ * Writes $contents to a temp file in the same directory as $path, then
+ * renames it onto $path so readers never observe a partially written file.
+ *
+ * @param string $path
+ * @param string $contents
+ * @return bool
+ * @throws RandomException
+ */
+function atomicWriteFile(string $path, string $contents): bool
+{
+    $tmpPath = $path . '.tmp.' . bin2hex(random_bytes(8));
+
+    $handle = @fopen($tmpPath, 'x');
+    if ($handle === false) {
+        return false;
+    }
+
+    if (!@chmod($tmpPath, 0640)) {
+        fclose($handle);
+        @unlink($tmpPath);
+
+        return false;
+    }
+
+    $written = fwrite($handle, $contents);
+    if ($written === false || $written !== strlen($contents) || !fflush($handle)) {
+        fclose($handle);
+        @unlink($tmpPath);
+
+        return false;
+    }
+
+    if (function_exists('fsync') && !fsync($handle)) {
+        fclose($handle);
+        @unlink($tmpPath);
+
+        return false;
+    }
+
+    fclose($handle);
+
+    // On Windows rename() does not overwrite an existing destination. Fall back to unlink()+rename().
+    if (!@rename($tmpPath, $path)) {
+        if (PHP_OS_FAMILY !== 'Windows' || !@unlink($path) || !@rename($tmpPath, $path)) {
+            @unlink($tmpPath);
+
+            return false;
+        }
+    }
+
+    @chmod($path, 0640);
+
+    return true;
+}
+
+/**
+ * Copies $configPath to $backupPath, creating the backup folder if needed.
+ *
+ * @param string $configPath
+ * @param string $backupPath
+ * @return bool true when the backup exists and is readable, false otherwise
+ */
+function backupEnvFile(string $configPath, string $backupPath): bool
+{
+    $backupFolder = dirname($backupPath);
+
+    if (!file_exists($backupFolder) && !@mkdir($backupFolder, 0750, true)) {
+        return false;
+    }
+
+    if (!@copy($configPath, $backupPath)) {
+        return false;
+    }
+
+    if (!is_readable($backupPath)) {
+        return false;
+    }
+
+    if (@chmod($backupPath, 0640) !== true || @chmod($configPath, 0640) !== true) {
+        return false;
     }
 
     return true;
 }
 
 /**
- * @return void
+ * Applies the new encryption.key to $configFile, preserving $oldKey as a
+ * commented-out backup line immediately before it.
+ *
+ * @param string $configFile
+ * @param string $key
+ * @param string $oldKey
+ * @return string|null updated file contents, or null if the replacement failed
  */
-function abort_encryption_conversion(): void
+function writeNewEncryptionKey(string $configFile, string $key, string $oldKey): ?string
 {
-    $config_path = ROOTPATH . '.env';
-    $backup_path = WRITEPATH . '/backup/.env.bak';
-
-    $config_file = file_get_contents($backup_path);
-
-    $handle = @fopen($config_path, 'w+');
-
-    if (empty($handle)) {
-        log_message('error', "Unable to open $config_path to undo encryption conversion");
-    } else {
-        @chmod($config_path, 0660);
-        $write_failed = !fwrite($handle, $config_file);
-        fclose($handle);
-
-        if ($write_failed) {
-            log_message('error', "Unable to write to $config_path to undo encryption conversion.");
-            return;
-        }
-        log_message('info', "File $config_path has been updated to undo encryption conversion");
+    $updated = applyEnvKeyReplacement($configFile, 'encryption.key', $key);
+    if ($updated === null) {
+        return null;
     }
+
+    if (!empty($oldKey)) {
+        $oldLine = "# encryption.key='$oldKey' REMOVE IF UNNEEDED\r\n";
+        if (preg_match('/^encryption\.key\s*=/m', $updated, $matches, PREG_OFFSET_CAPTURE)) {
+            $updated = substr_replace($updated, $oldLine, $matches[0][1], 0);
+        }
+    }
+
+    return $updated;
+}
+
+/**
+ * Returns true when the current process can write to (or create) .env.
+ *
+ * The write path (temp file + lock, then rename) needs write permission on
+ * the DIRECTORY, not on .env itself — a bind-mounted .env can be writable
+ * while the dir (or a root-owned .env.lock) is not, so .env's own mode is not
+ * a reliable signal.
+ *
+ * @return bool
+ */
+function envFileIsWritable(): bool
+{
+    $configPath = config('SecurityEnv')->envPath;
+    $lockPath   = config('SecurityEnv')->lockPath;
+    $dir        = dirname($configPath);
+
+    if (!is_writable($dir)) {
+        return false;
+    }
+
+    // Windows-only: rename() can't replace a read-only destination, so an
+    // existing .env must itself be writable (POSIX rename() can, if the dir is).
+    if (PHP_OS_FAMILY === 'Windows'
+        && file_exists($configPath)
+        && !is_writable($configPath)
+    ) {
+        return false;
+    }
+
+    // An existing mutex file (e.g. left by a prior root env:provision) must be writable.
+    if (file_exists($lockPath) && !is_writable($lockPath)) {
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * Ensures a usable CI4 encryption key is available.
+ *
+ * Behaviour:
+ * - Key present and >= 64 characters: returns true immediately (no I/O).
+ * - Key missing or CI3-era (< 64 chars) and .env IS writable:
+ *   - Short key: decrypts legacy CI3 secrets, rotates to a fresh CI4 key,
+ *     re-encrypts under the new key, verifies the round-trip, persists result.
+ *   - Missing key: generates a fresh key and persists it.
+ * - Key missing or CI3-era (< 64 chars) and .env NOT writable:
+ *   throws — the key was presumably already provisioned externally
+ *   (e.g. `php spark env:provision` at container startup); the in-memory
+ *   config simply hasn't been reloaded yet.
+ *
+ * @param CI3SecretConverter|null $converter injectable converter used to
+ *                                           decrypt/re-encrypt legacy CI3
+ *                                           secrets in the short-key branch;
+ *                                           defaults to the real converter
+ *                                           (tests may pass a fake to avoid
+ *                                           hitting the database)
+ * @return bool true when a valid key is available
+ * @throws Throwable when .env is not writable or the CI3 -> CI4 conversion fails
+ */
+function checkEncryption(?CI3SecretConverter $converter = null): bool
+{
+    $key = (string) config('Encryption')->key;
+
+    if ($key !== '' && strlen($key) >= 64) {
+        return true;
+    }
+
+    if (!envFileIsWritable()) {
+        log_message('critical', 'Encryption key not provisioned and .env is not writable. Run `php spark env:provision` to generate one.');
+
+        throw new RuntimeException(lang('Error.encryption_key_not_provisioned'));
+    }
+
+    if ($key !== '') {
+        $converter = $converter ?? new CI3SecretConverter();
+
+        // Legacy plaintext is a DB read; safe outside the .env lock (the lock
+        // only guards the .env file write, which the rotation performs).
+        $plain = $converter->decryptAll($key);
+
+        $nonEmpty = false;
+        foreach ($plain as $value) {
+            if ((string) $value !== '') {
+                $nonEmpty = true;
+                break;
+            }
+        }
+
+        // Run the whole backup -> rotate -> re-encrypt -> verify -> persist unit
+        // under a single .env lock. On any failure, the pre-rotation backup is
+        // restored (also in-lock); on success the backup is removed (in-lock).
+        rotateEncryptionKeyTransaction($key, static function () use ($plain, $converter, $nonEmpty): void {
+            $encrypted = $converter->encryptAll($plain);
+
+            if (array_diff_assoc($plain, $converter->verifyAll($encrypted)) !== []) {
+                throw new RuntimeException(lang('Error.unable_to_persist_encryption_key', ['filePath' => config('SecurityEnv')->envPath]));
+            }
+
+            if ($nonEmpty) {
+                $converter->saveAll($encrypted);
+            }
+        });
+    } else {
+        // Fresh key (no old key to decrypt): a single atomic write suffices.
+        rotateEncryptionKey(null);
+    }
+
+    return true;
+}
+
+/**
+ * Returns the persistent HMAC secret used to hash login-throttle cache keys.
+ *
+ * Behaviour:
+ * - Key already present (throttle.key or THROTTLE_KEY): returned immediately (no I/O).
+ * - Key missing and .env IS writable: generates a fresh key and persists it.
+ * - Key missing and .env NOT writable:
+ *   throws — the key was presumably already provisioned externally
+ *   (e.g. `php spark env:provision` at container startup).
+ *
+ * THROTTLE_KEY is a real environment-variable fallback (mirroring ENCRYPTION_KEY):
+ * it is consulted only when throttle.key is empty, so it can be supplied via
+ * Docker/Compose without writing a shared secret into .env.
+ *
+ * @return string the throttle key
+ * @throws RuntimeException if the key cannot be provisioned
+ */
+function checkThrottleEncryption(): string
+{
+    $key = (string) env('throttle.key', '');
+
+    if ($key === '') {
+        $envKey = getenv('THROTTLE_KEY');
+        $key    = $envKey === false ? '' : $envKey;
+    }
+
+    if ($key !== '') {
+        return $key;
+    }
+
+    if (!envFileIsWritable()) {
+        log_message('critical', 'Throttle key not provisioned and .env is not writable. Run `php spark env:provision` to generate one.');
+
+        throw new RuntimeException(lang('Error.throttle_key_not_provisioned'));
+    }
+
+    return provisionThrottleKey();
+}
+
+/**
+ * Generates a strong encryption key, persists it to `.env` (rotating in place
+ * so callers can re-encrypt CI3 data that was sealed with the old key), and
+ * applies it to the running config instance.
+ *
+ * Standalone key-write path: acquires and holds the `.env` mutex for the
+ * duration of the write, so concurrent callers see atomic key writes. Callers
+ * that also run a longer multi-step conversion (re-encrypt, verify, persist)
+ * must use rotateEncryptionKeyTransaction() instead, so a single lock is held
+ * for the whole backup -> rotate -> re-encrypt -> persist unit and the
+ * key-write does not take a nested lock on the same mutex (which would
+ * deadlock).
+ *
+ * @param string|null $oldKey current key to rotate from; when non-empty it is
+ *                            preserved as a commented backup line for the
+ *                            CI3->CI4 re-encryption pass
+ * @return string the newly generated key
+ * @throws RuntimeException if the key could not be generated or persisted
+ * @throws RandomException
+ */
+function rotateEncryptionKey(?string $oldKey = null): string
+{
+    $lock = lockEnvFile();
+
+    try {
+        return rotateEncryptionKeyUnlock($oldKey);
+    } finally {
+        unlockEnvFile($lock);
+    }
+}
+
+/**
+ * Lock-free core of rotateEncryptionKey(): generates a key, backs up .env,
+ * writes the new key (atomic), and applies it to the running config.
+ *
+ * Do not call directly from context that does not already hold the lock —
+ * that leaves a window in which another worker can read or write .env before
+ * the atomic write lands. The two callers, rotateEncryptionKey() and
+ * rotateEncryptionKeyTransaction(), each acquire the lock first and pass the
+ * lock-free core through.
+ *
+ * @param string|null $oldKey current key to rotate from
+ * @return string the newly generated key
+ * @throws RuntimeException if the key could not be generated or persisted
+ * @throws RandomException
+ */
+function rotateEncryptionKeyUnlock(?string $oldKey): string
+{
+    $encryption = new Encryption();
+    $key        = bin2hex($encryption->createKey());
+
+    $configPath = config('SecurityEnv')->envPath;
+    $backupPath = config('SecurityEnv')->backupPath;
+
+    if (!initializeEnvFile($configPath)) {
+        throw new RuntimeException(lang('Error.unable_to_create_env_file', ['filePath' => $configPath]));
+    }
+
+    if (file_exists($configPath)) {
+        if (!backupEnvFile($configPath, $backupPath)) {
+            log_message('critical', "Unable to back up $configPath to $backupPath before rotation; aborting.");
+
+            throw new RuntimeException(lang('Error.unable_to_persist_encryption_key', ['filePath' => $configPath]));
+        }
+    }
+
+    $configFile = @file_get_contents($configPath);
+    if ($configFile === false) {
+        log_message('critical', "Unable to read $configPath before rotation; aborting.");
+
+        throw new RuntimeException(lang('Error.unable_to_read_env_file', ['filePath' => $configPath]));
+    }
+
+    $updated = writeNewEncryptionKey($configFile, $key, (string) $oldKey);
+    if ($updated === null) {
+        throw new RuntimeException(lang('Error.unable_to_persist_encryption_key', ['filePath' => $configPath]));
+    }
+
+    if (!atomicWriteFile($configPath, $updated)) {
+        throw new RuntimeException(lang('Error.unable_to_persist_encryption_key', ['filePath' => $configPath]));
+    }
+
+    config('Encryption')->key = $key;
+
+    log_message('info', "Rotated encryption key in $configPath");
+
+    return $key;
+}
+
+/**
+ * Runs the CI3 -> CI4 key conversion as a single transaction on the `.env`
+ * mutex.
+ *
+ * The lock is acquired BEFORE the .env backup and released only AFTER
+ * $conversion has run, so the entire unit (backup -> rotate -> re-encrypt ->
+ * verify -> persist) is atomic with respect to any other worker that also
+ * takes the lock. The $conversion callback must throw on failure; the caller
+ * is expected to catch the exception and roll back via
+ * abortEncryptionConversion().
+ *
+ * Calls the lock-free rotateEncryptionKeyUnlock() internally so the
+ * transaction lock is not re-acquired on the same mutex (which would deadlock)
+ * — the mutex is held across the backup, the key write, the re-encryption,
+ * verification, and persistence.
+ *
+ * @param string|null $oldKey current key to rotate from
+ * @param callable    $conversion callback(): void, called after the new key
+ *                                has been persisted and applied to the running
+ *                                config; expected to perform re-encryption,
+ *                                verification, and persistence. Must throw on
+ *                                failure; the pre-rotation backup is restored
+ *                                before the exception propagates.
+ * @return string the newly generated key
+ * @throws Throwable from $conversion (the lock is released in `finally`)
+ * @throws RuntimeException
+ * @throws RandomException
+ */
+function rotateEncryptionKeyTransaction(?string $oldKey, callable $conversion): string
+{
+    // Hold one lock for the entire transaction (backup -> rotate -> re-encrypt
+    // -> verify -> persist -> cleanup). If we cannot acquire it, we fail
+    // rather than silently run without synchronisation — the invariant (no
+    // interleaved key + ciphertext writes) requires it.
+    $lock = lockEnvFile();
+
+    try {
+        // Lock-free inner write: the outer lock IS the transaction lock, so no
+        // nested re-acquire on the same mutex (which would deadlock).
+        $newKey = rotateEncryptionKeyUnlock($oldKey);
+
+        // Multi-step conversion (re-encrypt -> verify -> persist) runs while
+        // still holding the lock, so a concurrent worker cannot interleave its
+        // key write between the rotation and this ciphertext save.
+        $conversion();
+
+        // Success: drop the pre-rotation backup, in-lock.
+        removeBackup();
+
+        return $newKey;
+    } catch (Throwable $e) {
+        // Failure (CI4 EncryptionException / ReflectionException from saveAll,
+        // or a failed round-trip verify, or the rotation itself failed):
+        // restore the pre-rotation .env while still holding the lock, then
+        // rethrow. catch runs before finally, so the restore is atomic with
+        // the held lock.
+        abortEncryptionConversion();
+
+        throw $e;
+    } finally {
+        unlockEnvFile($lock);
+    }
+}
+
+/**
+ * Ensures a persistent throttle secret exists, generating and persisting one
+ * to `.env` if it is missing. Idempotent: safe to call on every startup.
+ *
+ * @return string the throttle key
+ * @throws RuntimeException if the key could not be created or persisted
+ */
+function provisionThrottleKey(): string
+{
+    $configPath = config('SecurityEnv')->envPath;
+
+    if (!initializeEnvFile($configPath)) {
+        throw new RuntimeException(lang('Error.unable_to_create_env_file', ['filePath' => $configPath]));
+    }
+
+    $lock = lockEnvFile();
+
+    try {
+        $configFile = @file_get_contents($configPath);
+        if ($configFile === false) {
+            log_message('critical', "Unable to read $configPath while provisioning throttle key; aborting.");
+
+            throw new RuntimeException(lang('Error.unable_to_read_env_file', ['filePath' => $configPath]));
+        }
+
+        $key = '';
+        if (preg_match('/^\s*throttle\.key\s*=\s*[\'"]?([^\'"\r\n]*)/m', $configFile, $matches)) {
+            $existing = trim($matches[1]);
+            if ($existing !== '') {
+                $key = $existing;
+            }
+        }
+
+        if ($key === '') {
+            $key = bin2hex(random_bytes(32));
+        }
+
+        $updated = applyEnvKeyReplacement($configFile, 'throttle.key', $key);
+        if ($updated === null || !atomicWriteFile($configPath, $updated)) {
+            throw new RuntimeException(lang('Error.unable_to_persist_throttle_key', ['filePath' => $configPath]));
+        }
+    } finally {
+        unlockEnvFile($lock);
+    }
+
+    putenv("throttle.key=$key");
+    $_ENV['throttle.key'] = $key;
+    $_SERVER['throttle.key'] = $key;
+
+    log_message('info', 'Provisioned throttle key in ' . config('SecurityEnv')->envPath);
+
+    return $key;
 }
 
 /**
  * @return void
  */
-function remove_backup(): void
+function abortEncryptionConversion(): void
 {
-    $backup_path = WRITEPATH . '/backup/.env.bak';
-    if (! file_exists($backup_path)) {
+    $configPath = config('SecurityEnv')->envPath;
+    $backupPath = config('SecurityEnv')->backupPath;
+
+    if (!file_exists($backupPath)) {
         return;
     }
-    if (!unlink($backup_path)) {
-        log_message('error', "Unable to remove $backup_path.");
-        return;
+
+    // A backup exists, so the restore must succeed or fail loudly; a silent
+    // failure would leave .env holding the new key while the DB still holds the
+    // old ciphertext, making the data undecryptable after the next restart.
+    if (!is_file($backupPath) || !is_readable($backupPath)) {
+        throw new RuntimeException(lang('Error.unable_to_read_env_file', ['filePath' => $backupPath]));
     }
-    log_message('info', "File $backup_path has been removed");
+
+    $configFile = file_get_contents($backupPath);
+    if ($configFile === false) {
+        throw new RuntimeException(lang('Error.unable_to_read_env_file', ['filePath' => $backupPath]));
+    }
+
+    if (!atomicWriteFile($configPath, $configFile)) {
+        throw new RuntimeException(lang('Error.unable_to_persist_encryption_key', ['filePath' => $configPath]));
+    }
+
+    log_message('info', "Restored $configPath from backup");
 }
 
+/**
+ * @return void
+ */
+function removeBackup(): void
+{
+    $backupPath = config('SecurityEnv')->backupPath;
+    if (!file_exists($backupPath)) {
+        return;
+    }
+    @unlink($backupPath);
+    log_message('info', "Removed $backupPath");
+}
diff --git a/app/Helpers/tabular_helper.php b/app/Helpers/tabular_helper.php
index 76b5f8aae..2670929c0 100644
--- a/app/Helpers/tabular_helper.php
+++ b/app/Helpers/tabular_helper.php
@@ -2,9 +2,8 @@
 
 use App\Models\Attribute;
 use App\Models\Employee;
-use App\Models\Item_taxes;
-use App\Models\Tax_category;
 use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\Session\Session;
 use Config\OSPOS;
 use Config\Services;
@@ -60,7 +59,7 @@ function transform_headers(array $headers, bool $readonly = false, bool $editabl
 }
 
 
-function sales_headers(): array
+function salesHeaders(): array
 {
     return [
         ['sale_id'         => lang('Common.id')],
@@ -78,7 +77,7 @@ function sales_headers(): array
  */
 function get_sales_manage_table_headers(): string
 {
-    $headers = sales_headers();
+    $headers = salesHeaders();
     $config = config(OSPOS::class)->settings;
 
     if ($config['invoice_enable']) {
@@ -94,7 +93,7 @@ function get_sales_manage_table_headers(): string
 /**
  * Get the html data row for the sales
  */
-function get_sale_data_row(object $sale): array
+function getSaleDataRow(object $sale): array
 {
     $uri = current_url(true);
     $controller = $uri->getSegment(1);
@@ -144,7 +143,7 @@ function get_sale_data_row(object $sale): array
 /**
  * Get the html data last row for the sales
  */
-function get_sale_data_last_row(ResultInterface $sales): array
+function getSaleDataLastRow(ResultInterface $sales): array
 {
     $sum_amount_due = 0;
     $sum_amount_tendered = 0;
@@ -168,7 +167,7 @@ function get_sale_data_last_row(ResultInterface $sales): array
 /**
  * Get the sales payments summary
  */
-function get_sales_manage_payments_summary(array $payments): string
+function getSalesManagePaymentsSummary(array $payments): string
 {
     $table = '<div id="report_summary">';
     $total = 0;
@@ -225,7 +224,7 @@ function get_person_data_row(object $person): array
         'people.person_id' => $person->person_id,
         'last_name'        => $person->last_name,
         'first_name'       => $person->first_name,
-        'email'            => empty($person->email) ? '' : mailto($person->email, $person->email),
+        'email'            => empty($person->email) ? '' : mailto(esc($person->email), esc($person->email)),
         'phone_number'     => $person->phone_number,
         'messages'         => empty($person->phone_number)
             ? ''
@@ -291,7 +290,7 @@ function get_customer_data_row(object $person, object $stats): array
         'people.person_id' => $person->person_id,
         'last_name'        => $person->last_name,
         'first_name'       => $person->first_name,
-        'email'            => empty($person->email) ? '' : mailto($person->email, $person->email),
+        'email'            => empty($person->email) ? '' : mailto(esc($person->email), esc($person->email)),
         'phone_number'     => $person->phone_number,
         'total'            => to_currency($stats->total),
         'messages'         => empty($person->phone_number)
@@ -362,7 +361,7 @@ function get_supplier_data_row(object $supplier): array
         'category'         => $supplier->category,
         'last_name'        => $supplier->last_name,
         'first_name'       => $supplier->first_name,
-        'email'            => empty($supplier->email) ? '' : mailto($supplier->email, $supplier->email),
+        'email'            => empty($supplier->email) ? '' : mailto(esc($supplier->email), esc($supplier->email)),
         'phone_number'     => $supplier->phone_number,
         'messages'         => empty($supplier->phone_number)
             ? ''
@@ -401,14 +400,37 @@ function item_headers(): array
     ];
 }
 
+/**
+ * Get all sortable column keys for items table, including dynamic attribute columns.
+ *
+ * @param array|null $definitionIds Attribute definition IDs to append as sortable columns.
+ *                                  If null, resolved via a query against SHOW_IN_ITEMS.
+ * @return array Array of column headers in the format sanitizeSortColumn() expects
+ */
+function itemSortColumns(?array $definitionIds = null): array
+{
+    if ($definitionIds === null) {
+        $attribute = model(Attribute::class);
+        $definitionIds = array_keys($attribute->getDefinitionsByFlags($attribute::SHOW_IN_ITEMS));
+    }
+
+    $headers = item_headers();
+
+    foreach ($definitionIds as $definitionId) {
+        $headers[] = [(string) $definitionId => ''];
+    }
+
+    return $headers;
+}
+
 /**
  * Get the header for the items tabular view
  */
-function get_items_manage_table_headers(): string
+function getItemsManageTableHeaders(): string
 {
     $attribute = model(Attribute::class);
     $config = config(OSPOS::class)->settings;
-    $definition_names = $attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS);    // TODO: this should be made into a constant in constants.php
+    $definitionsWithTypes = $attribute->getDefinitionsByFlags($attribute::SHOW_IN_ITEMS, true);
 
     $headers = item_headers();
 
@@ -420,8 +442,8 @@ function get_items_manage_table_headers(): string
 
     $headers[] = ['item_pic' => lang('Items.image'), 'sortable' => false];
 
-    foreach ($definition_names as $definition_id => $definition_name) {
-        $headers[] = [$definition_id => $definition_name, 'sortable' => false];
+    foreach ($definitionsWithTypes as $definitionId => $definitionInfo) {
+        $headers[] = [$definitionId => $definitionInfo['name'], 'sortable' => true];
     }
 
     $headers[] = ['inventory' => '', 'escape' => false];
@@ -432,32 +454,17 @@ function get_items_manage_table_headers(): string
 
 /**
  * Get the html data row for the item
+ *
+ * @param object $item
+ * @param array $definitionNames Attribute definitions with types, keyed by definition_id (see Attribute::getDefinitionsByFlags(..., true))
+ * @param array $taxPercentsByItemId Pre-computed tax percent strings, keyed by item_id (see Items::buildTaxPercentsByItem())
+ * @return array
  */
-function get_item_data_row(object $item): array
+function getItemDataRow(object $item, array $definitionNames, array $taxPercentsByItemId): array
 {
-    $attribute = model(Attribute::class);
-    $item_taxes = model(Item_taxes::class);
-    $tax_category = model(Tax_category::class);
     $config = config(OSPOS::class)->settings;
 
-    if ($config['use_destination_based_tax']) {
-        if ($item->tax_category_id == null) {    // TODO: === ?
-            $tax_percents = '-';
-        } else {
-            $tax_category_info = $tax_category->get_info($item->tax_category_id);
-            $tax_percents = $tax_category_info->tax_category;
-        }
-    } else {
-        $item_tax_info = $item_taxes->get_info($item->item_id);
-        $tax_percents = '';
-        foreach ($item_tax_info as $tax_info) {
-            $tax_percents .= to_tax_decimals($tax_info['percent']) . '%, ';
-        }
-
-        // Remove ', ' from last item
-        $tax_percents = substr($tax_percents, 0, -2);
-        $tax_percents = !$tax_percents ? '-' : $tax_percents;
-    }
+    $taxPercents = $taxPercentsByItemId[$item->item_id] ?? '-';
 
     $controller = get_controller();
 
@@ -470,8 +477,8 @@ function get_item_data_row(object $item): array
             : glob("./uploads/item_pics/$item->pic_filename");
 
         if (sizeof($images) > 0) {
-            $image_path = ltrim($images[0], './');
-            $image .= '<a class="rollover" href="' . base_url(implode('/', array_map('rawurlencode', explode('/', $image_path)))) . '"><img alt="Image thumbnail" src="' . site_url('items/PicThumb/' . rawurlencode(pathinfo($images[0], PATHINFO_BASENAME))) . '"></a>';
+            $imagePath = ltrim($images[0], './');
+            $image .= '<a class="rollover" href="' . base_url(implode('/', array_map('rawurlencode', explode('/', $imagePath)))) . '"><img alt="Image thumbnail" src="' . site_url('items/PicThumb/' . rawurlencode(pathinfo($images[0], PATHINFO_BASENAME))) . '"></a>';
         }
     }
 
@@ -479,8 +486,6 @@ function get_item_data_row(object $item): array
         $item->name .= NAME_SEPARATOR . $item->pack_name;
     }
 
-    $definition_names = $attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS);
-
     $columns = [
         'items.item_id' => $item->item_id,
         'item_number'   => $item->item_number,
@@ -490,7 +495,7 @@ function get_item_data_row(object $item): array
         'cost_price'    => to_currency($item->cost_price),
         'unit_price'    => to_currency($item->unit_price),
         'quantity'      => to_quantity_decimals($item->quantity),
-        'tax_percents'  => !$tax_percents ? '-' : $tax_percents,
+        'tax_percents'  => !$taxPercents ? '-' : $taxPercents,
         'item_pic'      => $image
     ];
 
@@ -523,7 +528,7 @@ function get_item_data_row(object $item): array
         )
     ];
 
-    return $columns + expand_attribute_values($definition_names, (array) $item) + $icons;
+    return $columns + expand_attribute_values($definitionNames, (array) $item) + $icons;
 }
 
 function giftcard_headers(): array
@@ -577,8 +582,8 @@ function item_kit_headers(): array
         ['item_kit_number'  => lang('Item_kits.item_kit_number')],
         ['name'             => lang('Item_kits.name')],
         ['description'      => lang('Item_kits.description')],
-        ['total_cost_price' => lang('Items.cost_price'), 'sortable' => FALSE],
-        ['total_unit_price' => lang('Items.unit_price'), 'sortable' => FALSE]
+        ['total_cost_price' => lang('Items.cost_price'), 'sortable' => false],
+        ['total_unit_price' => lang('Items.unit_price'), 'sortable' => false]
     ];
 }
 
@@ -634,7 +639,7 @@ function parse_attribute_values(array $columns, array $row): array
 }
 
 /**
- * @param array $definition_names
+ * @param array $definition_names Array of definition_id => ['name' => name, 'type' => type] or definition_id => name
  * @param array $row
  * @return array
  */
@@ -651,10 +656,16 @@ function expand_attribute_values(array $definition_names, array $row): array
     }
 
     $attribute_values = [];
-    foreach ($definition_names as $definition_id => $definition_name) {
+    foreach ($definition_names as $definition_id => $definitionInfo) {
         if (isset($indexed_values[$definition_id])) {
-            $attribute_value = $indexed_values[$definition_id];
-            $attribute_values["$definition_id"] = $attribute_value;
+            $raw_value = $indexed_values[$definition_id];
+
+            // Format DECIMAL attributes according to locale
+            if (is_array($definitionInfo) && isset($definitionInfo['type']) && $definitionInfo['type'] === DECIMAL) {
+                $attribute_values["$definition_id"] = to_decimals($raw_value);
+            } else {
+                $attribute_values["$definition_id"] = $raw_value;
+            }
         } else {
             $attribute_values["$definition_id"] = "";
         }
@@ -692,7 +703,7 @@ function get_attribute_definition_data_row(object $attribute_row): array
     $attribute = model(Attribute::class);
     $controller = get_controller();
 
-    if (count($attribute->get_definition_flags()) == 0) {
+    if (count($attribute->getDefinitionFlags()) == 0) {
         $definition_flags = lang('Common.none_selected_text');
     } elseif ($attribute->definition_type == GROUP) {
         $definition_flags = "-";
@@ -736,7 +747,7 @@ function get_expense_category_manage_table_headers(): string
 }
 
 /**
- * Gets the html data row for the expenses category
+ * Gets the html data row for the expense category
  */
 function get_expense_category_data_row(object $expense_category): array
 {
@@ -835,7 +846,7 @@ function get_expenses_data_last_row(object $expense): array
 }
 
 /**
- * Get the expenses payments summary
+ * Get the expense payments summary
  */
 function get_expenses_manage_payments_summary(array $payments, ResultInterface $expenses): string    // TODO: $expenses is passed but never used.
 {
@@ -925,3 +936,24 @@ function get_controller(): string
     $controller_name_parts = explode('\\', $controller_name);
     return end($controller_name_parts);
 }
+
+/**
+ * Restores filter values from the URL query string.
+ *
+ * @param IncomingRequest $request The request object
+ * @return array Array with 'start_date', 'end_date', and 'selected_filters' keys
+ */
+function restoreTableFilters(IncomingRequest $request): array
+{
+    $startDate = $request->getGet('start_date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+    $endDate = $request->getGet('end_date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+    $urlFilters = $request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+
+    return array_filter([
+        'start_date' => $startDate ?: null,
+        'end_date' => $endDate ?: null,
+        'selected_filters' => $urlFilters ?? []
+    ], function ($value) {
+        return $value !== null && $value !== [];
+    });
+}
diff --git a/app/Helpers/tax_helper.php b/app/Helpers/tax_helper.php
index 9e5008e38..d288d7beb 100644
--- a/app/Helpers/tax_helper.php
+++ b/app/Helpers/tax_helper.php
@@ -143,8 +143,7 @@ function get_tax_rates_manage_table_headers(): string
  */
 function get_tax_rates_data_row($tax_rates_row): array
 {
-    $router = service('router');
-    $controller_name = strtolower($router->controllerName());
+    $controller_name = 'taxes';
 
     return [
         'tax_rate_id'        => $tax_rates_row->tax_rate_id,
diff --git a/app/Helpers/url_helper.php b/app/Helpers/url_helper.php
index d0249b2f2..1c411481f 100644
--- a/app/Helpers/url_helper.php
+++ b/app/Helpers/url_helper.php
@@ -7,7 +7,7 @@ if (!function_exists('base64url_encode')) {
      * @param string $data
      * @return string
      */
-    function base64url_encode($data)
+    function base64url_encode(string $data): string
     {
         return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
     }
@@ -20,7 +20,7 @@ if (!function_exists('base64url_decode')) {
      * @param string $data
      * @return string|false
      */
-    function base64url_decode($data)
+    function base64url_decode(string $data): false|string
     {
         $remainder = strlen($data) % 4;
         if ($remainder) {
@@ -28,4 +28,4 @@ if (!function_exists('base64url_decode')) {
         }
         return base64_decode(strtr($data, '-_', '+/'));
     }
-}
\ No newline at end of file
+}
diff --git a/app/Language/ar-EG/Attributes.php b/app/Language/ar-EG/Attributes.php
index 8d184bd9d..c754d6009 100644
--- a/app/Language/ar-EG/Attributes.php
+++ b/app/Language/ar-EG/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "الميزات لا يمكن أن تحتوي على ':' أو'|'",
-    "confirm_delete"                   => "هل أنت متأكد من أنك تريد حذف الميزات المحددة ؟",
-    "confirm_restore"                  => "هل أنت متأكد من أنك تريد استعادة السمة (السمات) المحددة؟",
-    "definition_cannot_be_deleted"     => "لا يمكن حذف السمات المحددة",
-    "definition_error_adding_updating" => "لا يمكن إضافة السمة {0} أو تحديثها. يرجى التحقق من سجل الخطأ.",
-    "definition_flags"                 => "رؤية الميزات",
-    "definition_group"                 => "المجموعة",
-    "definition_id"                    => "كود",
-    "definition_name"                  => "إضافة ميزة",
-    "definition_name_required"         => "اسم الميزة هي خانة اجبارية",
-    "definition_one_or_multiple"       => "ميزة/ميزات",
-    "definition_successful_adding"     => "لقد تم إضافة صنف بنجاح",
-    "definition_successful_deleted"    => "لقد تم حذف ميزة بنجاح",
-    "definition_successful_updating"   => "تم تعديل الميزة بنجاح",
-    "definition_type"                  => "نوع الميزة",
-    "definition_type_required"         => "نوع الميزة هي خانة إجبارية",
-    "definition_unit"                  => "وحدة قياس",
-    "definition_values"                => "قيمة الميزة",
-    "new"                              => "اضافة ميزة جديده",
-    "no_attributes_to_display"         => "لا يوجد اصناف للعرض",
-    "receipt_visibility"               => "وصل",
-    "show_in_items"                    => "اظهار في الصنف",
-    "show_in_items_visibility"         => "الصنف",
-    "show_in_receipt"                  => "اظهار على الوصل",
-    "show_in_receivings"               => "اظهار في استلام البضائع",
-    "show_in_receivings_visibility"    => "استلام البضائع",
-    "show_in_sales"                    => "اظهار خلال البيع",
-    "show_in_sales_visibility"         => "البيع",
-    "update"                           => "تحديث الميزات",
+    'attribute_value_invalid_chars'    => 'الميزات لا يمكن أن تحتوي على \':\' أو\'|\'',
+    'confirm_delete'                   => 'هل أنت متأكد من أنك تريد حذف الميزات المحددة ؟',
+    'confirm_restore'                  => 'هل أنت متأكد من أنك تريد استعادة السمة (السمات) المحددة؟',
+    'definition_cannot_be_deleted'     => 'لا يمكن حذف السمات المحددة',
+    'definition_invalid_group' => 'المجموعة المحددة غير موجودة أو غير صالحة.',
+    'definition_error_adding_updating' => 'لا يمكن إضافة السمة {0} أو تحديثها. يرجى التحقق من سجل الخطأ.',
+    'definition_flags'                 => 'رؤية الميزات',
+    'definition_group'                 => 'المجموعة',
+    'definition_id'                    => 'كود',
+    'definition_name'                  => 'إضافة ميزة',
+    'definition_name_required'         => 'اسم الميزة هي خانة اجبارية',
+    'definition_one_or_multiple'       => 'ميزة/ميزات',
+    'definition_successful_adding'     => 'لقد تم إضافة صنف بنجاح',
+    'definition_successful_deleted'    => 'لقد تم حذف ميزة بنجاح',
+    'definition_successful_updating'   => 'تم تعديل الميزة بنجاح',
+    'definition_type'                  => 'نوع الميزة',
+    'definition_type_required'         => 'نوع الميزة هي خانة إجبارية',
+    'definition_unit'                  => 'وحدة قياس',
+    'definition_values'                => 'قيمة الميزة',
+    'new'                              => 'اضافة ميزة جديده',
+    'no_attributes_to_display'         => 'لا يوجد اصناف للعرض',
+    'receipt_visibility'               => 'وصل',
+    'show_in_items'                    => 'اظهار في الصنف',
+    'show_in_items_visibility'         => 'الصنف',
+    'show_in_receipt'                  => 'اظهار على الوصل',
+    'show_in_receivings'               => 'اظهار في استلام البضائع',
+    'show_in_receivings_visibility'    => 'استلام البضائع',
+    'show_in_sales'                    => 'اظهار خلال البيع',
+    'show_in_sales_visibility'         => 'البيع',
+    'show_in_search'                   => 'اظهار في البحث',
+    'show_in_search_visibility'        => 'بحث',
+    'update'                           => 'تحديث الميزات',
 ];
diff --git a/app/Language/ar-EG/Bootstrap_tables.php b/app/Language/ar-EG/Bootstrap_tables.php
index 785833b6d..26a2bcc3c 100644
--- a/app/Language/ar-EG/Bootstrap_tables.php
+++ b/app/Language/ar-EG/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "الجميع",
-    "columns"              => "أعمدة",
-    "hide_show_pagination" => "عرض/إخفاء أرقام الصفحات",
-    "loading"              => "جارى التحميل، برجاء الإنتظار ...",
-    "page_from_to"         => "عرض {0} إلى {1} من {2} صفوف",
-    "refresh"              => "إعادة تحميل",
-    "rows_per_page"        => "{0} صف بالصفحة",
-    "toggle"               => "تغيير",
+    'all' => "الجميع",
+    'columns' => "أعمدة",
+    'hide_show_pagination' => "عرض/إخفاء أرقام الصفحات",
+    'loading' => "جارى التحميل، برجاء الإنتظار",
+    'page_from_to' => "عرض {0} إلى {1} من {2} صفوف",
+    'refresh' => "إعادة تحميل",
+    'rows_per_page' => "{0} صف بالصفحة",
+    'toggle' => "تغيير",
 ];
diff --git a/app/Language/ar-EG/Calendar.php b/app/Language/ar-EG/Calendar.php
new file mode 100644
index 000000000..6041114d3
--- /dev/null
+++ b/app/Language/ar-EG/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "أحد",
+    "mo"        => "اثنين",
+    "tu"        => "ثلاثاء",
+    "we"        => "أربعاء",
+    "th"        => "خميس",
+    "fr"        => "جمعة",
+    "sa"        => "سبت",
+    "sun"       => "الأحد",
+    "mon"       => "الاثنين",
+    "tue"       => "الثلاثاء",
+    "wed"       => "الأربعاء",
+    "thu"       => "الخميس",
+    "fri"       => "الجمعة",
+    "sat"       => "السبت",
+    "sunday"    => "الأحد",
+    "monday"    => "الاثنين",
+    "tuesday"   => "الثلاثاء",
+    "wednesday" => "الأربعاء",
+    "thursday"  => "الخميس",
+    "friday"    => "الجمعة",
+    "saturday"  => "السبت",
+    "jan"       => "يناير",
+    "feb"       => "فبراير",
+    "mar"       => "مارس",
+    "apr"       => "أبريل",
+    "may"       => "مايو",
+    "jun"       => "يونيو",
+    "jul"       => "يوليو",
+    "aug"       => "أغسطس",
+    "sep"       => "سبتمبر",
+    "oct"       => "أكتوبر",
+    "nov"       => "نوفمبر",
+    "dec"       => "ديسمبر",
+    "january"   => "يناير",
+    "february"  => "فبراير",
+    "march"     => "مارس",
+    "april"     => "أبريل",
+    "mayl"      => "مايو",
+    "june"      => "يونيو",
+    "july"      => "يوليو",
+    "august"    => "أغسطس",
+    "september" => "سبتمبر",
+    "october"   => "أكتوبر",
+    "november"  => "نوفمبر",
+    "december"  => "ديسمبر",
+];
\ No newline at end of file
diff --git a/app/Language/ar-EG/Config.php b/app/Language/ar-EG/Config.php
index 20181b0f0..af96e9bf5 100644
--- a/app/Language/ar-EG/Config.php
+++ b/app/Language/ar-EG/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "عنوان الشركة",
-    "address_required"                          => "عنوان الشركة مطلوب.",
-    "all_set"                                   => "صلاحيات الملفات مضبطة بالطريقه الصحيحه!",
-    "allow_duplicate_barcodes"                  => "السماح بتشابة الباركود",
-    "apostrophe"                                => "الفاصلة",
-    "backup_button"                             => "نسخ إحتياطى",
-    "backup_database"                           => "نسخ إحتياطى لقاعدة البيانات",
-    "barcode"                                   => "باركود",
-    "barcode_company"                           => "اسم الشركة",
-    "barcode_configuration"                     => "اعدادات الباركود",
-    "barcode_content"                           => "محتويات الباركود",
-    "barcode_first_row"                         => "الصف 1",
-    "barcode_font"                              => "الخط",
-    "barcode_formats"                           => "اشكال الادخال",
-    "barcode_generate_if_empty"                 => "توليد اذا كان الباركود فارغ.",
-    "barcode_height"                            => "الارتفاع (px)",
-    "barcode_id"                                => "كود/اسم الصنف",
-    "barcode_info"                              => "معلومات اعدادات الباركود",
-    "barcode_layout"                            => "تخطيط الباركود",
-    "barcode_name"                              => "الاسم",
-    "barcode_number"                            => "الباركود UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "الرقم فى الصف",
-    "barcode_page_cellspacing"                  => "المسافة بين الخلايا فى صفحة العرض.",
-    "barcode_page_width"                        => "عرض الصفحة",
-    "barcode_price"                             => "السعر",
-    "barcode_second_row"                        => "الصف 2",
-    "barcode_third_row"                         => "الصف 3",
-    "barcode_tooltip"                           => "تحذير: قد تؤدي هذه الميزة إلى استيراد اصناف مكررة أو إنشاؤها. لا تستخدمها إذا كنت لا تريد الباركود مكررة.",
-    "barcode_type"                              => "نوعية الباركود",
-    "barcode_width"                             => "العرض (px)",
-    "bottom"                                    => "الأسفل",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "فواصل النقدية",
-    "cash_decimals_tooltip"                     => "إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.",
-    "cash_rounding"                             => "التقريب النقدي",
-    "category_dropdown"                         => "إظهار الفئة كقائمة منسدلة",
-    "center"                                    => "الوسط",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "فاصلة",
-    "company"                                   => "اسم الشركة",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "تغيير الصورة",
-    "company_logo"                              => "شعار الشركة",
-    "company_remove_image"                      => "إزالة الصورة",
-    "company_required"                          => "اسم الشركة مطلوب",
-    "company_select_image"                      => "اختار صورة",
-    "company_website_url"                       => "الموقع الإلكترونى للشركة غير صحيح.",
-    "country_codes"                             => "أكواد الدولة",
-    "country_codes_tooltip"                     => "قائمة مفصولة بفاصلة لاسماء الدول للبحث.",
-    "currency_code"                             => "رمز العملة",
-    "currency_decimals"                         => "العلامة العشرية للعملة",
-    "currency_symbol"                           => "رمز العملة",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "المكافآت",
-    "customer_reward_duplicate"                 => "المكافئة يجب ان تكون فريدة.",
-    "customer_reward_enable"                    => "تمكين مكافآت العميل",
-    "customer_reward_invalid_chars"             => "لا يمكن أن تحتوي المكافأة على '_'",
-    "customer_reward_required"                  => "المكافأة هي حقل مطلوب",
-    "customer_sales_tax_support"                => "دعم الضرائب المبيعات العملاء",
-    "date_or_time_format"                       => "تصفية التاريخ والوقت",
-    "datetimeformat"                            => "شكل الوقت و التاريخ",
-    "decimal_point"                             => "العلامة العشرية",
-    "default_barcode_font_size_number"          => "الحجم الافتراضي لخط الباركود لابد أن يكون رقم.",
-    "default_barcode_font_size_required"        => "الحجم الافتراضي لخط الباركود مطلوب.",
-    "default_barcode_height_number"             => "الارتفاع الافتراضي للباركود لابد ان يكون رقم.",
-    "default_barcode_height_required"           => "الارتفاع الافتراضي للباركود مطلوب.",
-    "default_barcode_num_in_row_number"         => "رقم الباركود فى اى سطر لابد ان يكون رقم.",
-    "default_barcode_num_in_row_required"       => "رقم الباركود فى اى سطر مطلوب.",
-    "default_barcode_page_cellspacing_number"   => "المسافة الافتراضية بين خلايا الباركود لابد أن تكون رقم.",
-    "default_barcode_page_cellspacing_required" => "المسافة الافتراضية بين خلايا الباركود مطلوبة.",
-    "default_barcode_page_width_number"         => "عرض الصفحة الافتراضي للباركود لابد ان يكون رقم.",
-    "default_barcode_page_width_required"       => "عرض الصفحة الافتراضي للباركود مطلوب.",
-    "default_barcode_width_number"              => "العرض الافتراضي للباركود لابد ان يكون رقم.",
-    "default_barcode_width_required"            => "العرض الافتراضي للباركود مطلوب.",
-    "default_item_columns"                      => "الخانات المراد إظهارها",
-    "default_origin_tax_code"                   => "كود الضريبة الاساسي الافتراضي",
-    "default_receivings_discount"               => "خصم الإيصالات الافتراضي",
-    "default_receivings_discount_number"        => "خصم الإيصالات الافتراضي يجب ان يكون رقم.",
-    "default_receivings_discount_required"      => "خصم الإيصالات الافتراضي هي خانة اجبارية.",
-    "default_sales_discount"                    => "نسبة الخصم الافتراضية",
-    "default_sales_discount_number"             => "نسبة الخصم الافتراضية لابد ان تكون رقم.",
-    "default_sales_discount_required"           => "نسبة الخصم الافتراضية مطلوبة.",
-    "default_tax_category"                      => "فئة الضرائب الافتراضية",
-    "default_tax_code"                          => "قانون الضرائب الافتراضي",
-    "default_tax_jurisdiction"                  => "الاختصاص الضريبي الافتراضي",
-    "default_tax_name_number"                   => "يجب أن يكون الاسم الافتراضي للضريبة سلسلة.",
-    "default_tax_name_required"                 => "اسم الضريبة الافتراضية مطلوب.",
-    "default_tax_rate"                          => "معدل الضريبة الافتراضي %",
-    "default_tax_rate_1"                        => "معدل الضريبة 1",
-    "default_tax_rate_2"                        => "معدل الضريبة 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "معدل الضريبة الافتراضي يجب أن يكون رقم.",
-    "default_tax_rate_required"                 => "معدل الضريبة الافتراضي مطلوب.",
-    "derive_sale_quantity"                      => "السماح بأسعار البيع المشتقة",
-    "derive_sale_quantity_tooltip"              => "إذا تم تحديدها، فسيتم توفير نوع جديد من الاصناف للاصناف المطلوبة حسب المبلغ الموسع",
-    "dinner_table"                              => "طاولة",
-    "dinner_table_duplicate"                    => "الطاولة يجب ان تكون فريدة.",
-    "dinner_table_enable"                       => "تمكين جداول الطاولات",
-    "dinner_table_invalid_chars"                => "لا يمكن أن يحتوي اسم الطاولة على '_'.",
-    "dinner_table_required"                     => "الطاولة هو حقل مطلوب.",
-    "dot"                                       => "نقطة",
-    "email"                                     => "البريد الإلكتروني",
-    "email_configuration"                       => "إعدادات البريد الإلكتروني",
-    "email_mailpath"                            => "مسار ارسال البريد",
-    "email_protocol"                            => "بروتوكول",
-    "email_receipt_check_behaviour"             => "ارسال رسائل الكترونية",
-    "email_receipt_check_behaviour_always"      => "مختار دائما",
-    "email_receipt_check_behaviour_last"        => "تذكر آخر إختيار",
-    "email_receipt_check_behaviour_never"       => "دائما غير مختار",
-    "email_smtp_crypto"                         => "تشفير SMTP",
-    "email_smtp_host"                           => "خادم SMTP",
-    "email_smtp_pass"                           => "كلمة سر SMTP",
-    "email_smtp_port"                           => "رقم منفذ SMTP",
-    "email_smtp_timeout"                        => "وقت فشل المحاولة (ثوانى) لـ SMTP",
-    "email_smtp_user"                           => "اسم مستخدم SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "فرض نظام الخصوصية",
-    "enforce_privacy_tooltip"                   => "حماية ملفات ومعلومات المستخدم عند الحذف",
-    "fax"                                       => "الفاكس",
-    "file_perm"                                 => "يوجد خطأ في ضبط اعدادات وصلاحيات الملفات نرجوا إعادة الضبط.",
-    "financial_year"                            => "بداية السنة المالية",
-    "financial_year_apr"                        => "1 أبريل",
-    "financial_year_aug"                        => "1 أغسطس",
-    "financial_year_dec"                        => "1 ديسمبر",
-    "financial_year_feb"                        => "1 فبراير",
-    "financial_year_jan"                        => "1 يناير",
-    "financial_year_jul"                        => "1 يوليو",
-    "financial_year_jun"                        => "1 يونيو",
-    "financial_year_mar"                        => "1 مارس",
-    "financial_year_may"                        => "1 مايو",
-    "financial_year_nov"                        => "1 نوفمبر",
-    "financial_year_oct"                        => "1 أكتوبر",
-    "financial_year_sep"                        => "1 سبتمبر",
-    "floating_labels"                           => "تسميات عائمة",
-    "gcaptcha_enable"                           => "صفحة تسجيل الدخول ريكابتشا",
-    "gcaptcha_secret_key"                       => "مفتاح السرية ريكابتشا",
-    "gcaptcha_secret_key_required"              => "مفتاح السرية ريكابتشا هو حقل مطلوب",
-    "gcaptcha_site_key"                         => "ريكابتشا مفتاح الموقع",
-    "gcaptcha_site_key_required"                => "ريكابتشا مفتاح الموقع هو حقل مطلوب",
-    "gcaptcha_tooltip"                          => "احرص على حماية صفحة تسجيل الدخول باستخدام ريكابتشا من غوغل.",
-    "general"                                   => "عام",
-    "general_configuration"                     => "إعدادات عامة",
-    "giftcard_number"                           => "رقم كارت الهدية",
-    "giftcard_random"                           => "توليد عشوائي",
-    "giftcard_series"                           => "توليد في السلسلة",
-    "image_allowed_file_types"                  => "أنواع الملفات المسموح بها",
-    "image_max_height_tooltip"                  => "أقصى ارتفاع مسموح به لتحميلات الصور بالبكسل (بكسل).",
-    "image_max_size_tooltip"                    => "أقصى حجم مسموح به للملف لتحميل الصور (بالكيلو بايت).",
-    "image_max_width_tooltip"                   => "أقصى عرض مسموح به لتحميلات الصور بالبكسل (بكسل).",
-    "image_restrictions"                        => "قيود تحميل الصور",
-    "include_hsn"                               => "تشمل الدعم لرمز نظام منسق",
-    "info"                                      => "معلومات",
-    "info_configuration"                        => "معلومات الشركة",
-    "input_groups"                              => "مجموعات الإدخال",
-    "integrations"                              => "التكامل",
-    "integrations_configuration"                => "تكامل",
-    "invoice"                                   => "الفاتورة",
-    "invoice_configuration"                     => "إعدادات طباعة الفاتورة",
-    "invoice_default_comments"                  => "التعليق الافتراضي على الفاتورة",
-    "invoice_email_message"                     => "قالب البريد الإلكتروني للفاتورة",
-    "invoice_enable"                            => "تفعيل الفوترة",
-    "invoice_printer"                           => "طابعة الفواتير",
-    "invoice_type"                              => "نوع الفاتورة",
-    "is_readable"                               => "يمكن قراءته ، ولكن تم تعيين الأذونات بشكل غير صحيح. يرجى ضبطه على 640 أو 660 والتحديث.",
-    "is_writable"                               => "ممكن التعديل عليه، لكن الصلاحيات هي اكثر من 750. نرجوا الضبط الى 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟",
-    "language"                                  => "اللغة",
-    "last_used_invoice_number"                  => "اخر رقم مستخدم للفاتورة",
-    "last_used_quote_number"                    => "اخر رقم مستخدم لعرض الاسعار",
-    "last_used_work_order_number"               => "آخر رقم مستخدم في طلبات العمل",
-    "left"                                      => "يسار",
-    "license"                                   => "الرخصة",
-    "license_configuration"                     => "نص الرخصة",
-    "line_sequence"                             => "تسلسل خطي",
-    "lines_per_page"                            => "عدد السطور فى الصفحة",
-    "lines_per_page_number"                     => "عدد السطور فى الصفحة يجب أن يكون رقم.",
-    "lines_per_page_required"                   => "عدد السطور فى الصفحة مطلوب.",
-    "locale"                                    => "إقليمية",
-    "locale_configuration"                      => "الإعدادات الإقليمية",
-    "locale_info"                               => "معلومات التهيئة الإقليمية",
-    "location"                                  => "المخزون",
-    "location_configuration"                    => "أماكن المخزون",
-    "location_info"                             => "معلومات تهيئة الأماكن",
-    "login_form"                                => "نمط نموذج تسجيل الدخول",
-    "logout"                                    => "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.",
-    "mailchimp"                                 => "ميل تشامب",
-    "mailchimp_api_key"                         => "مفتاح ميل شيمب",
-    "mailchimp_configuration"                   => "إعدادات ميل شيمب",
-    "mailchimp_key_successfully"                => "نجاح.",
-    "mailchimp_key_unsuccessfully"              => "فشل.",
-    "mailchimp_lists"                           => "إعدادات ميل شيمب",
-    "mailchimp_tooltip"                         => "انقر على رمز مفتاح API.",
-    "message"                                   => "الرسائل",
-    "message_configuration"                     => "إعدادات الرسائل",
-    "msg_msg"                                   => "الرسائل النصية المحفوظة",
-    "msg_msg_placeholder"                       => "إذا أردت إستخدام قالب للرسائل القصيرة احفظه هنا. عدا ذلك أترك هذا الحقل فارغ.",
-    "msg_pwd"                                   => "SMS-API كلمة السر لـ",
-    "msg_pwd_required"                          => "مطلوب SMS-API كلمة السر لـ",
-    "msg_src"                                   => "SMS-API كود المرسل لـ",
-    "msg_src_required"                          => "مطلوب SMS-API كود المرسل لـ",
-    "msg_uid"                                   => "SMS-API اسم المستخدم لـ",
-    "msg_uid_required"                          => "مطلوب SMS-API اسم المستخدم لـ",
-    "multi_pack_enabled"                        => "رزم متعددة لكل صنف",
-    "no_risk"                                   => "لا يوجد اي مشاكل في صلاحيات الملفات.",
-    "none"                                      => "لايوجد",
-    "notify_alignment"                          => "مكان عرض رسائل المعلومات",
-    "number_format"                             => "شكل الرقم",
-    "number_locale"                             => "التهيئة الاقليمية",
-    "number_locale_invalid"                     => "التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.",
-    "number_locale_required"                    => "رقم التهيئة الإقليمية مطلوب.",
-    "number_locale_tooltip"                     => "إيجاد تهيئة إقليمية مناسبة عبر الرابط.",
-    "os_timezone"                               => "المنطقة الزمنية OSPOS:",
-    "ospos_info"                                => "معلومات التثبيت OSPOS",
-    "payment_options_order"                     => "ترتيب خيارات الدفع",
-    "perm_risk"                                 => "صلاحيات الملفات ممكن ان تشكل خطر في حال كانت غير صحيحة.",
-    "phone"                                     => "هاتف الشركة",
-    "phone_required"                            => "هاتف الشركة مطلوب.",
-    "print_bottom_margin"                       => "الهامش السفلي",
-    "print_bottom_margin_number"                => "الهامش السفلي يجب أن يكون رقم.",
-    "print_bottom_margin_required"              => "الهامش السفلي مطلوب.",
-    "print_delay_autoreturn"                    => "العودة الى عمليات البيع تلقائيا ( عدد الثواني )",
-    "print_delay_autoreturn_number"             => "الزمن المحدد للعودة الى عمليات البيع هو خانة اجبارية.",
-    "print_delay_autoreturn_required"           => "الزمن المحدد للعودة الى عمليات البيع يجب ان يكون رقم.",
-    "print_footer"                              => "طباعة تذييل المتصفح",
-    "print_header"                              => "طباعة ترويسة المتصفح",
-    "print_left_margin"                         => "الهامش الأيسر",
-    "print_left_margin_number"                  => "الهامش الأيسر يجب ان يكون رقم.",
-    "print_left_margin_required"                => "الهامش الأيسر مطلوب.",
-    "print_receipt_check_behaviour"             => "خانة طباعة الفواتير",
-    "print_receipt_check_behaviour_always"      => "دائما مختار",
-    "print_receipt_check_behaviour_last"        => "تذكر آخر اختيار",
-    "print_receipt_check_behaviour_never"       => "دائما ليس مختار",
-    "print_right_margin"                        => "الهامش الأيمن",
-    "print_right_margin_number"                 => "الهامش الأيمن يجب أن يكون رقم.",
-    "print_right_margin_required"               => "الهامش الأيمن مطلوب.",
-    "print_silently"                            => "عرض صندوق حوار طباعة",
-    "print_top_margin"                          => "الهامش العلوى",
-    "print_top_margin_number"                   => "الهامش العلوى يجب أن يكون رقم.",
-    "print_top_margin_required"                 => "الهامش العلوى مطلوب.",
-    "quantity_decimals"                         => "العلامة العشرية للكمية",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "ملاحظات طلبات العمل الثابتة",
-    "receipt"                                   => "الإيصال",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "إعدادات طباعة الايصالات",
-    "receipt_default"                           => "افتراضى",
-    "receipt_font_size"                         => "الخط",
-    "receipt_font_size_number"                  => "رقم الخط يجب ان يكون رقم.",
-    "receipt_font_size_required"                => "رقم الخط مطلوب.",
-    "receipt_info"                              => "معلومات تهيئة الإيصالات",
-    "receipt_printer"                           => "طابعة تذاكر",
-    "receipt_short"                             => "مختصر",
-    "receipt_show_company_name"                 => "عرض اسم الشركة",
-    "receipt_show_description"                  => "عرض الوصف",
-    "receipt_show_serialnumber"                 => "عرض الرقم المسلسل",
-    "receipt_show_tax_ind"                      => "عرض مؤشر الضريبة",
-    "receipt_show_taxes"                        => "عرض الضرائب",
-    "receipt_show_total_discount"               => "عرض إجمالى الخصم",
-    "receipt_template"                          => "قالب الايصال",
-    "receiving_calculate_average_price"         => "حساب متوسط سعر الأصناف المستلمة",
-    "recv_invoice_format"                       => "شكل فاتورة الإستلام",
-    "register_mode_default"                     => "نمط التسجيل الافتراضي",
-    "report_an_issue"                           => "بلغ عن خطأ",
-    "return_policy_required"                    => "سياسة الإسترجاع مطلوب.",
-    "reward"                                    => "المكافاة",
-    "reward_configuration"                      => "اعدادات المكافاة",
-    "right"                                     => "يمين",
-    "sales_invoice_format"                      => "شكل فاتورة البيع",
-    "sales_quote_format"                        => "شكل فاتورة عرض الاسعار",
-    "saved_successfully"                        => "تم حفظ التهيئة بنجاح.",
-    "saved_unsuccessfully"                      => "لم يتم حفظ التهيئة بنجاح.",
-    "security_issue"                            => "تحذير من ثغرة أمنية",
-    "server_notice"                             => "يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "اظهار ايكونة المكتب",
-    "statistics"                                => "إرسال اﻹحصائيات",
-    "statistics_tooltip"                        => "إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.",
-    "stock_location"                            => "مكان المخزون",
-    "stock_location_duplicate"                  => "من فضلك إستخدم اسم مكان غير مكرر.",
-    "stock_location_invalid_chars"              => "مكان المخزون لايمكن أن يحتوى على '_'.",
-    "stock_location_required"                   => "مكان المخزون مطلوب.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "العامود 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "تخطيط اقتراحات البحث",
-    "suggestions_second_column"                 => "العامود 2",
-    "suggestions_third_column"                  => "العامود 3",
-    "system_conf"                               => "اعدادات اخرى",
-    "system_info"                               => "System Info",
-    "table"                                     => "جدول",
-    "table_configuration"                       => "اعدادات الجدول",
-    "takings_printer"                           => "طابعة الإيراد",
-    "tax"                                       => "الضريبة",
-    "tax_category"                              => "تصنيف الضريبة",
-    "tax_category_duplicate"                    => "الفئة الضريبية اللتي تم ادخالها موجودة.",
-    "tax_category_invalid_chars"                => "الفئة الضريبية اللتي تم ادخالها غير صحيحة.",
-    "tax_category_required"                     => "الفئة الضريبية مطلوبة.",
-    "tax_category_used"                         => "الفئة الضريبية اللتي تم تحديدها لا يمكن حذفها لانها قيد الاستعمال.",
-    "tax_configuration"                         => "إعدادات الضريبة",
-    "tax_decimals"                              => "العلامة العشرية للضريبة",
-    "tax_id"                                    => "الرقم الضريبي",
-    "tax_included"                              => "شامل الضريبة",
-    "theme"                                     => "السمة",
-    "theme_preview"                             => "معاينة المظهر:",
-    "thousands_separator"                       => "فاصل الاف",
-    "timezone"                                  => "المنطقة الزمنية",
-    "timezone_error"                            => "تختلف منطقة OSPOS الزمنية عن منطقتك الزمنية المحلية.",
-    "top"                                       => "علوى",
-    "use_destination_based_tax"                 => "استخدام الضريبة المستندة على الوجهة",
-    "user_timezone"                             => "المنطقة الزمنية المحلية:",
-    "website"                                   => "موقع الشركة",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "تفعيل طلبات العمل",
-    "work_order_format"                         => "شكل طلبات العمل",
+    'address'                                   => 'عنوان الشركة',
+    'address_required'                          => 'عنوان الشركة مطلوب.',
+    'all_set'                                   => 'صلاحيات الملفات مضبطة بالطريقه الصحيحه!',
+    'allow_duplicate_barcodes'                  => 'السماح بتشابة الباركود',
+    'apostrophe'                                => 'الفاصلة',
+    'backup_button'                             => 'نسخ إحتياطى',
+    'backup_database'                           => 'نسخ إحتياطى لقاعدة البيانات',
+    'barcode'                                   => 'باركود',
+    'barcode_company'                           => 'اسم الشركة',
+    'barcode_configuration'                     => 'اعدادات الباركود',
+    'barcode_content'                           => 'محتويات الباركود',
+    'barcode_first_row'                         => 'الصف 1',
+    'barcode_font'                              => 'الخط',
+    'barcode_formats'                           => 'اشكال الادخال',
+    'barcode_generate_if_empty'                 => 'توليد اذا كان الباركود فارغ.',
+    'barcode_height'                            => 'الارتفاع (px)',
+    'barcode_id'                                => 'كود/اسم الصنف',
+    'barcode_info'                              => 'معلومات اعدادات الباركود',
+    'barcode_layout'                            => 'تخطيط الباركود',
+    'barcode_name'                              => 'الاسم',
+    'barcode_number'                            => 'الباركود UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'الرقم فى الصف',
+    'barcode_page_cellspacing'                  => 'المسافة بين الخلايا فى صفحة العرض.',
+    'barcode_page_width'                        => 'عرض الصفحة',
+    'barcode_price'                             => 'السعر',
+    'barcode_second_row'                        => 'الصف 2',
+    'barcode_third_row'                         => 'الصف 3',
+    'barcode_tooltip'                           => 'تحذير: قد تؤدي هذه الميزة إلى استيراد اصناف مكررة أو إنشاؤها. لا تستخدمها إذا كنت لا تريد الباركود مكررة.',
+    'barcode_type'                              => 'نوعية الباركود',
+    'barcode_width'                             => 'العرض (px)',
+    'bottom'                                    => 'الأسفل',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'فواصل النقدية',
+    'cash_decimals_tooltip'                     => 'إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.',
+    'cash_rounding'                             => 'التقريب النقدي',
+    'category_dropdown'                         => 'إظهار الفئة كقائمة منسدلة',
+    'center'                                    => 'الوسط',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'فاصلة',
+    'company'                                   => 'اسم الشركة',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'تغيير الصورة',
+    'company_logo'                              => 'شعار الشركة',
+    'company_remove_image'                      => 'إزالة الصورة',
+    'company_required'                          => 'اسم الشركة مطلوب',
+    'company_select_image'                      => 'اختار صورة',
+    'company_website_url'                       => 'الموقع الإلكترونى للشركة غير صحيح.',
+    'country_codes'                             => 'أكواد الدولة',
+    'country_codes_tooltip'                     => 'قائمة مفصولة بفاصلة لاسماء الدول للبحث.',
+    'currency_code'                             => 'رمز العملة',
+    'currency_decimals'                         => 'العلامة العشرية للعملة',
+    'currency_symbol'                           => 'رمز العملة',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'المكافآت',
+    'customer_reward_duplicate'                 => 'المكافئة يجب ان تكون فريدة.',
+    'customer_reward_enable'                    => 'تمكين مكافآت العميل',
+    'customer_reward_invalid_chars'             => "لا يمكن أن تحتوي المكافأة على '_'",
+    'customer_reward_required'                  => 'المكافأة هي حقل مطلوب',
+    'customer_sales_tax_support'                => 'دعم الضرائب المبيعات العملاء',
+    'date_or_time_format'                       => 'تصفية التاريخ والوقت',
+    'datetimeformat'                            => 'شكل الوقت و التاريخ',
+    'decimal_point'                             => 'العلامة العشرية',
+    'default_barcode_font_size_number'          => 'الحجم الافتراضي لخط الباركود لابد أن يكون رقم.',
+    'default_barcode_font_size_required'        => 'الحجم الافتراضي لخط الباركود مطلوب.',
+    'default_barcode_height_number'             => 'الارتفاع الافتراضي للباركود لابد ان يكون رقم.',
+    'default_barcode_height_required'           => 'الارتفاع الافتراضي للباركود مطلوب.',
+    'default_barcode_num_in_row_number'         => 'رقم الباركود فى اى سطر لابد ان يكون رقم.',
+    'default_barcode_num_in_row_required'       => 'رقم الباركود فى اى سطر مطلوب.',
+    'default_barcode_page_cellspacing_number'   => 'المسافة الافتراضية بين خلايا الباركود لابد أن تكون رقم.',
+    'default_barcode_page_cellspacing_required' => 'المسافة الافتراضية بين خلايا الباركود مطلوبة.',
+    'default_barcode_page_width_number'         => 'عرض الصفحة الافتراضي للباركود لابد ان يكون رقم.',
+    'default_barcode_page_width_required'       => 'عرض الصفحة الافتراضي للباركود مطلوب.',
+    'default_barcode_width_number'              => 'العرض الافتراضي للباركود لابد ان يكون رقم.',
+    'default_barcode_width_required'            => 'العرض الافتراضي للباركود مطلوب.',
+    'default_item_columns'                      => 'الخانات المراد إظهارها',
+    'default_origin_tax_code'                   => 'كود الضريبة الاساسي الافتراضي',
+    'default_receivings_discount'               => 'خصم الإيصالات الافتراضي',
+    'default_receivings_discount_number'        => 'خصم الإيصالات الافتراضي يجب ان يكون رقم.',
+    'default_receivings_discount_required'      => 'خصم الإيصالات الافتراضي هي خانة اجبارية.',
+    'default_sales_discount'                    => 'نسبة الخصم الافتراضية',
+    'default_sales_discount_number'             => 'نسبة الخصم الافتراضية لابد ان تكون رقم.',
+    'default_sales_discount_required'           => 'نسبة الخصم الافتراضية مطلوبة.',
+    'default_tax_category'                      => 'فئة الضرائب الافتراضية',
+    'default_tax_code'                          => 'قانون الضرائب الافتراضي',
+    'default_tax_jurisdiction'                  => 'الاختصاص الضريبي الافتراضي',
+    'default_tax_name_number'                   => 'يجب أن يكون الاسم الافتراضي للضريبة سلسلة.',
+    'default_tax_name_required'                 => 'اسم الضريبة الافتراضية مطلوب.',
+    'default_tax_rate'                          => 'معدل الضريبة الافتراضي %',
+    'default_tax_rate_1'                        => 'معدل الضريبة 1',
+    'default_tax_rate_2'                        => 'معدل الضريبة 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'معدل الضريبة الافتراضي يجب أن يكون رقم.',
+    'default_tax_rate_required'                 => 'معدل الضريبة الافتراضي مطلوب.',
+    'derive_sale_quantity'                      => 'السماح بأسعار البيع المشتقة',
+    'derive_sale_quantity_tooltip'              => 'إذا تم تحديدها، فسيتم توفير نوع جديد من الاصناف للاصناف المطلوبة حسب المبلغ الموسع',
+    'dinner_table'                              => 'طاولة',
+    'dinner_table_duplicate'                    => 'الطاولة يجب ان تكون فريدة.',
+    'dinner_table_enable'                       => 'تمكين جداول الطاولات',
+    'dinner_table_invalid_chars'                => "لا يمكن أن يحتوي اسم الطاولة على '_'.",
+    'dinner_table_required'                     => 'الطاولة هو حقل مطلوب.',
+    'dot'                                       => 'نقطة',
+    'email'                                     => 'البريد الإلكتروني',
+    'email_configuration'                       => 'إعدادات البريد الإلكتروني',
+    'email_mailpath'                            => 'مسار ارسال البريد',
+    'email_protocol'                            => 'بروتوكول',
+    'email_receipt_check_behaviour'             => 'ارسال رسائل الكترونية',
+    'email_receipt_check_behaviour_always'      => 'مختار دائما',
+    'email_receipt_check_behaviour_last'        => 'تذكر آخر إختيار',
+    'email_receipt_check_behaviour_never'       => 'دائما غير مختار',
+    'email_smtp_crypto'                         => 'تشفير SMTP',
+    'email_smtp_host'                           => 'خادم SMTP',
+    'email_smtp_pass'                           => 'كلمة سر SMTP',
+    'email_smtp_port'                           => 'رقم منفذ SMTP',
+    'email_smtp_timeout'                        => 'وقت فشل المحاولة (ثوانى) لـ SMTP',
+    'email_smtp_user'                           => 'اسم مستخدم SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'فرض نظام الخصوصية',
+    'enforce_privacy_tooltip'                   => 'حماية ملفات ومعلومات المستخدم عند الحذف',
+    'fax'                                       => 'الفاكس',
+    'file_perm'                                 => 'يوجد خطأ في ضبط اعدادات وصلاحيات الملفات نرجوا إعادة الضبط.',
+    'financial_year'                            => 'بداية السنة المالية',
+    'financial_year_apr'                        => '1 أبريل',
+    'financial_year_aug'                        => '1 أغسطس',
+    'financial_year_dec'                        => '1 ديسمبر',
+    'financial_year_feb'                        => '1 فبراير',
+    'financial_year_jan'                        => '1 يناير',
+    'financial_year_jul'                        => '1 يوليو',
+    'financial_year_jun'                        => '1 يونيو',
+    'financial_year_mar'                        => '1 مارس',
+    'financial_year_may'                        => '1 مايو',
+    'financial_year_nov'                        => '1 نوفمبر',
+    'financial_year_oct'                        => '1 أكتوبر',
+    'financial_year_sep'                        => '1 سبتمبر',
+    'floating_labels'                           => 'تسميات عائمة',
+    'gcaptcha_enable'                           => 'صفحة تسجيل الدخول ريكابتشا',
+    'gcaptcha_secret_key'                       => 'مفتاح السرية ريكابتشا',
+    'gcaptcha_secret_key_required'              => 'مفتاح السرية ريكابتشا هو حقل مطلوب',
+    'gcaptcha_site_key'                         => 'ريكابتشا مفتاح الموقع',
+    'gcaptcha_site_key_required'                => 'ريكابتشا مفتاح الموقع هو حقل مطلوب',
+    'gcaptcha_tooltip'                          => 'احرص على حماية صفحة تسجيل الدخول باستخدام ريكابتشا من غوغل.',
+    'general'                                   => 'عام',
+    'general_configuration'                     => 'إعدادات عامة',
+    'giftcard_number'                           => 'رقم كارت الهدية',
+    'giftcard_random'                           => 'توليد عشوائي',
+    'giftcard_series'                           => 'توليد في السلسلة',
+    'image_allowed_file_types'                  => 'أنواع الملفات المسموح بها',
+    'image_max_height_tooltip'                  => 'أقصى ارتفاع مسموح به لتحميلات الصور بالبكسل (بكسل).',
+    'image_max_size_tooltip'                    => 'أقصى حجم مسموح به للملف لتحميل الصور (بالكيلو بايت).',
+    'image_max_width_tooltip'                   => 'أقصى عرض مسموح به لتحميلات الصور بالبكسل (بكسل).',
+    'image_restrictions'                        => 'قيود تحميل الصور',
+    'include_hsn'                               => 'تشمل الدعم لرمز نظام منسق',
+    'info'                                      => 'معلومات',
+    'info_configuration'                        => 'معلومات الشركة',
+    'input_groups'                              => 'مجموعات الإدخال',
+    'integrations'                              => 'التكامل',
+    'integrations_configuration'                => 'تكامل',
+    'invoice'                                   => 'الفاتورة',
+    'invoice_configuration'                     => 'إعدادات طباعة الفاتورة',
+    'invoice_default_comments'                  => 'التعليق الافتراضي على الفاتورة',
+    'invoice_email_message'                     => 'قالب البريد الإلكتروني للفاتورة',
+    'invoice_enable'                            => 'تفعيل الفوترة',
+    'invoice_printer'                           => 'طابعة الفواتير',
+    'invoice_type'                              => 'نوع الفاتورة',
+    'is_readable'                               => 'يمكن قراءته ، ولكن تم تعيين الأذونات بشكل غير صحيح. يرجى ضبطه على 640 أو 660 والتحديث.',
+    'is_writable'                               => 'ممكن التعديل عليه، لكن الصلاحيات هي اكثر من 750. نرجوا الضبط الى 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟',
+    'language'                                  => 'اللغة',
+    'last_used_invoice_number'                  => 'اخر رقم مستخدم للفاتورة',
+    'last_used_quote_number'                    => 'اخر رقم مستخدم لعرض الاسعار',
+    'last_used_work_order_number'               => 'آخر رقم مستخدم في طلبات العمل',
+    'left'                                      => 'يسار',
+    'license'                                   => 'الرخصة',
+    'license_configuration'                     => 'نص الرخصة',
+    'line_sequence'                             => 'تسلسل خطي',
+    'lines_per_page'                            => 'عدد السطور فى الصفحة',
+    'lines_per_page_number'                     => 'عدد السطور فى الصفحة يجب أن يكون رقم.',
+    'lines_per_page_required'                   => 'عدد السطور فى الصفحة مطلوب.',
+    'locale'                                    => 'إقليمية',
+    'locale_configuration'                      => 'الإعدادات الإقليمية',
+    'locale_info'                               => 'معلومات التهيئة الإقليمية',
+    'location'                                  => 'المخزون',
+    'location_configuration'                    => 'أماكن المخزون',
+    'location_info'                             => 'معلومات تهيئة الأماكن',
+    'login_form'                                => 'نمط نموذج تسجيل الدخول',
+    'logout'                                    => 'هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.',
+    'mailchimp'                                 => 'ميل تشامب',
+    'mailchimp_api_key'                         => 'مفتاح ميل شيمب',
+    'mailchimp_configuration'                   => 'إعدادات ميل شيمب',
+    'mailchimp_key_successfully'                => 'نجاح.',
+    'mailchimp_key_unsuccessfully'              => 'فشل.',
+    'mailchimp_lists'                           => 'إعدادات ميل شيمب',
+    'mailchimp_tooltip'                         => 'انقر على رمز مفتاح API.',
+    'message'                                   => 'الرسائل',
+    'message_configuration'                     => 'إعدادات الرسائل',
+    'msg_msg'                                   => 'الرسائل النصية المحفوظة',
+    'msg_msg_placeholder'                       => 'إذا أردت إستخدام قالب للرسائل القصيرة احفظه هنا. عدا ذلك أترك هذا الحقل فارغ.',
+    'msg_pwd'                                   => 'SMS-API كلمة السر لـ',
+    'msg_src'                                   => 'SMS-API كود المرسل لـ',
+    'msg_src_required'                          => 'مطلوب SMS-API كود المرسل لـ',
+    'msg_uid'                                   => 'SMS-API اسم المستخدم لـ',
+    'msg_uid_required'                          => 'مطلوب SMS-API اسم المستخدم لـ',
+    'multi_pack_enabled'                        => 'رزم متعددة لكل صنف',
+    'no_risk'                                   => 'لا يوجد اي مشاكل في صلاحيات الملفات.',
+    'none'                                      => 'لايوجد',
+    'notify_alignment'                          => 'مكان عرض رسائل المعلومات',
+    'number_format'                             => 'شكل الرقم',
+    'number_locale'                             => 'التهيئة الاقليمية',
+    'number_locale_invalid'                     => 'التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.',
+    'number_locale_required'                    => 'رقم التهيئة الإقليمية مطلوب.',
+    'number_locale_tooltip'                     => 'إيجاد تهيئة إقليمية مناسبة عبر الرابط.',
+    'os_timezone'                               => 'المنطقة الزمنية OSPOS:',
+    'ospos_info'                                => 'معلومات التثبيت OSPOS',
+    'payment_options_order'                     => 'ترتيب خيارات الدفع',
+    'payment_reference_code_length_limits'      => 'كود مرجع الدفع<br>حدود الطول',
+    'payment_reference_code_length_max_label'   => 'الحد الأقصى',
+    'payment_reference_code_length_min_label'   => 'الحد الأدنى',
+    'perm_risk'                                 => 'صلاحيات الملفات ممكن ان تشكل خطر في حال كانت غير صحيحة.',
+    'phone'                                     => 'هاتف الشركة',
+    'phone_required'                            => 'هاتف الشركة مطلوب.',
+    'print_bottom_margin'                       => 'الهامش السفلي',
+    'print_bottom_margin_number'                => 'الهامش السفلي يجب أن يكون رقم.',
+    'print_bottom_margin_required'              => 'الهامش السفلي مطلوب.',
+    'print_delay_autoreturn'                    => 'العودة الى عمليات البيع تلقائيا ( عدد الثواني )',
+    'print_delay_autoreturn_number'             => 'الزمن المحدد للعودة الى عمليات البيع هو خانة اجبارية.',
+    'print_delay_autoreturn_required'           => 'الزمن المحدد للعودة الى عمليات البيع يجب ان يكون رقم.',
+    'print_footer'                              => 'طباعة تذييل المتصفح',
+    'print_header'                              => 'طباعة ترويسة المتصفح',
+    'print_left_margin'                         => 'الهامش الأيسر',
+    'print_left_margin_number'                  => 'الهامش الأيسر يجب ان يكون رقم.',
+    'print_left_margin_required'                => 'الهامش الأيسر مطلوب.',
+    'print_receipt_check_behaviour'             => 'خانة طباعة الفواتير',
+    'print_receipt_check_behaviour_always'      => 'دائما مختار',
+    'print_receipt_check_behaviour_last'        => 'تذكر آخر اختيار',
+    'print_receipt_check_behaviour_never'       => 'دائما ليس مختار',
+    'print_right_margin'                        => 'الهامش الأيمن',
+    'print_right_margin_number'                 => 'الهامش الأيمن يجب أن يكون رقم.',
+    'print_right_margin_required'               => 'الهامش الأيمن مطلوب.',
+    'print_silently'                            => 'عرض صندوق حوار طباعة',
+    'print_top_margin'                          => 'الهامش العلوى',
+    'print_top_margin_number'                   => 'الهامش العلوى يجب أن يكون رقم.',
+    'print_top_margin_required'                 => 'الهامش العلوى مطلوب.',
+    'quantity_decimals'                         => 'العلامة العشرية للكمية',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'ملاحظات طلبات العمل الثابتة',
+    'receipt'                                   => 'الإيصال',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'إعدادات طباعة الايصالات',
+    'receipt_default'                           => 'افتراضى',
+    'receipt_font_size'                         => 'الخط',
+    'receipt_font_size_number'                  => 'رقم الخط يجب ان يكون رقم.',
+    'receipt_font_size_required'                => 'رقم الخط مطلوب.',
+    'receipt_info'                              => 'معلومات تهيئة الإيصالات',
+    'receipt_printer'                           => 'طابعة تذاكر',
+    'receipt_short'                             => 'مختصر',
+    'receipt_show_company_name'                 => 'عرض اسم الشركة',
+    'receipt_show_description'                  => 'عرض الوصف',
+    'receipt_show_serialnumber'                 => 'عرض الرقم المسلسل',
+    'receipt_show_tax_ind'                      => 'عرض مؤشر الضريبة',
+    'receipt_show_taxes'                        => 'عرض الضرائب',
+    'receipt_show_total_discount'               => 'عرض إجمالى الخصم',
+    'receipt_template'                          => 'قالب الايصال',
+    'receiving_calculate_average_price'         => 'حساب متوسط سعر الأصناف المستلمة',
+    'recv_invoice_format'                       => 'شكل فاتورة الإستلام',
+    'register_mode_default'                     => 'نمط التسجيل الافتراضي',
+    'report_an_issue'                           => 'بلغ عن خطأ',
+    'return_policy_required'                    => 'سياسة الإسترجاع مطلوب.',
+    'reward'                                    => 'المكافاة',
+    'reward_configuration'                      => 'اعدادات المكافاة',
+    'right'                                     => 'يمين',
+    'sales_invoice_format'                      => 'شكل فاتورة البيع',
+    'sales_quote_format'                        => 'شكل فاتورة عرض الاسعار',
+    'mailpath_invalid'                          => 'مسار sendmail غير صالح. يُسمح فقط بالحروف والأرقام والشرطات والشرطات السفلية والشرطات المائلة والشرطات المائلة العكسية والنقطتين الرأسيتين والمسافات والنقاط.',
+    'saved_successfully'                        => 'تم حفظ التهيئة بنجاح.',
+    'saved_unsuccessfully'                      => 'لم يتم حفظ التهيئة بنجاح.',
+    'security_issue'                            => 'تحذير من ثغرة أمنية',
+    'server_notice'                             => 'يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'اظهار ايكونة المكتب',
+    'statistics'                                => 'إرسال اﻹحصائيات',
+    'statistics_tooltip'                        => 'إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.',
+    'stock_location'                            => 'مكان المخزون',
+    'stock_location_duplicate'                  => 'من فضلك إستخدم اسم مكان غير مكرر.',
+    'stock_location_invalid_chars'              => "مكان المخزون لايمكن أن يحتوى على '_'.",
+    'stock_location_required'                   => 'مكان المخزون مطلوب.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'العامود 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'تخطيط اقتراحات البحث',
+    'suggestions_second_column'                 => 'العامود 2',
+    'suggestions_third_column'                  => 'العامود 3',
+    'system_conf'                               => 'اعدادات اخرى',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'جدول',
+    'table_configuration'                       => 'اعدادات الجدول',
+    'takings_printer'                           => 'طابعة الإيراد',
+    'tax'                                       => 'الضريبة',
+    'tax_category'                              => 'تصنيف الضريبة',
+    'tax_category_duplicate'                    => 'الفئة الضريبية اللتي تم ادخالها موجودة.',
+    'tax_category_invalid_chars'                => 'الفئة الضريبية اللتي تم ادخالها غير صحيحة.',
+    'tax_category_required'                     => 'الفئة الضريبية مطلوبة.',
+    'tax_category_used'                         => 'الفئة الضريبية اللتي تم تحديدها لا يمكن حذفها لانها قيد الاستعمال.',
+    'tax_configuration'                         => 'إعدادات الضريبة',
+    'tax_decimals'                              => 'العلامة العشرية للضريبة',
+    'tax_id'                                    => 'الرقم الضريبي',
+    'tax_included'                              => 'شامل الضريبة',
+    'theme'                                     => 'السمة',
+    'theme_preview'                             => 'معاينة المظهر:',
+    'thousands_separator'                       => 'فاصل الاف',
+    'timezone'                                  => 'المنطقة الزمنية',
+    'timezone_error'                            => 'تختلف منطقة OSPOS الزمنية عن منطقتك الزمنية المحلية.',
+    'top'                                       => 'علوى',
+    'use_destination_based_tax'                 => 'استخدام الضريبة المستندة على الوجهة',
+    'user_timezone'                             => 'المنطقة الزمنية المحلية:',
+    'website'                                   => 'موقع الشركة',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'تفعيل طلبات العمل',
+    'work_order_format'                         => 'شكل طلبات العمل',
 ];
diff --git a/app/Language/ar-EG/Employees.php b/app/Language/ar-EG/Employees.php
index 3429d9986..1b90804f4 100644
--- a/app/Language/ar-EG/Employees.php
+++ b/app/Language/ar-EG/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "المعلومات الأساسية للموظف",
-    "cannot_be_deleted"            => "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).",
-    "change_employee"              => "",
-    "change_password"              => "تغيير كلمة المرور",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "هل أنت متأكد أنك تريد حذف الموظفين المختارين؟",
-    "confirm_restore"              => "هل انت متاكد من استعادة الموظفين المحددين؟",
-    "current_password"             => "كلمة المرور الحالية",
-    "current_password_invalid"     => "كلمة المرور الحالية غير صحيحة.",
-    "employee"                     => "موظف",
-    "error_adding_updating"        => "خطاء فى إضافة/تعديل موظف.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "لايمكن حذف المستخدم admin الخاص بنسخة العرض.",
-    "error_updating_demo_admin"    => "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.",
-    "language"                     => "اللغة",
-    "login_info"                   => "معلومات دخول الموظف",
-    "manager"                      => "",
-    "new"                          => "موظف جديد",
-    "none_selected"                => "لم تختار أى من الموظفين للحذف.",
-    "one_or_multiple"              => "موظف/موظفين",
-    "password"                     => "كلمة السر",
-    "password_minlength"           => "كلمة السر يجب أن تكون 8 حروف على الأقل.",
-    "password_must_match"          => "كلمتى السر لا تتطابقان.",
-    "password_not_must_match"      => "كلمة المرور الحالية والجديدة يجب ان يكونو فريدين.",
-    "password_required"            => "كلمة السر مطلوبة.",
-    "permission_desc"              => "قم بإضافة الصلاحيات بلإختيار من الأسفل.",
-    "permission_info"              => "اذونات المستخدمين",
-    "repeat_password"              => "كلمة السر مرة اخرى",
-    "subpermission_required"       => "يجب إختيار صلاحية واحدة على الأقل لكل قسم.",
-    "successful_adding"            => "لقد تم إضافة الموظف بنجاح.",
-    "successful_change_password"   => "تم تغيير كلمة المرور بنجاح.",
-    "successful_deleted"           => "لقد تم حذف الموظف بنجاح",
-    "successful_updating"          => "لقد تم تحديث بيانات الموظف بنجاح",
-    "system_language"              => "لغة النظام",
-    "unsuccessful_change_password" => "فشل في تغيير كلمة المرور.",
-    "update"                       => "تحديث بيانات موظف",
-    "username"                     => "اسم المستخدم",
-    "username_duplicate"           => "حساب المحدد هو موجود في قاعدة البيانات. نرجوا استخدام اسم حساب مختلف.",
-    "username_minlength"           => "اسم المستخدم يجب أن يكون 5 حروف على الأقل.",
-    "username_required"            => "اسم المستخدم مطلوب.",
+    'administrator'                          => '',
+    'basic_information'                      => 'المعلومات الأساسية للموظف',
+    'cannot_be_deleted'                      => 'لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).',
+    'change_employee'                        => '',
+    'change_password'                        => 'تغيير كلمة المرور',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'هل أنت متأكد أنك تريد حذف الموظفين المختارين؟',
+    'confirm_restore'                        => 'هل انت متاكد من استعادة الموظفين المحددين؟',
+    'current_password'                       => 'كلمة المرور الحالية',
+    'current_password_invalid'               => 'كلمة المرور الحالية غير صحيحة.',
+    'employee'                               => 'موظف',
+    'error_adding_updating'                  => 'خطاء فى إضافة/تعديل موظف.',
+    'error_cannot_remove_own_minimum_grant'  => 'لا يمكنك إزالة الحد الأدنى من صلاحيات الوصول للوحدات الخاصة بك.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'لايمكن حذف المستخدم admin الخاص بنسخة العرض.',
+    'error_grant_change_disallowed'          => 'تم تعطيل تغييرات المنح في هذه النسخة التجريبية.',
+    'error_password_change_disallowed'       => 'تم تعطيل تغييرات كلمة المرور في هذه النسخة التجريبية.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.',
+    'language'                               => 'اللغة',
+    'login_info'                             => 'معلومات دخول الموظف',
+    'manager'                                => '',
+    'new'                                    => 'موظف جديد',
+    'none_selected'                          => 'لم تختار أى من الموظفين للحذف.',
+    'one_or_multiple'                        => 'موظف/موظفين',
+    'password'                               => 'كلمة السر',
+    'password_minlength'                     => 'كلمة السر يجب أن تكون 8 حروف على الأقل.',
+    'password_must_match'                    => 'كلمتى السر لا تتطابقان.',
+    'password_not_must_match'                => 'كلمة المرور الحالية والجديدة يجب ان يكونو فريدين.',
+    'password_required'                      => 'كلمة السر مطلوبة.',
+    'permission_desc'                        => 'قم بإضافة الصلاحيات بلإختيار من الأسفل.',
+    'permission_info'                        => 'اذونات المستخدمين',
+    'repeat_password'                        => 'كلمة السر مرة اخرى',
+    'subpermission_required'                 => 'يجب إختيار صلاحية واحدة على الأقل لكل قسم.',
+    'successful_adding'                      => 'لقد تم إضافة الموظف بنجاح.',
+    'successful_change_password'             => 'تم تغيير كلمة المرور بنجاح.',
+    'successful_deleted'                     => 'لقد تم حذف الموظف بنجاح',
+    'successful_updating'                    => 'لقد تم تحديث بيانات الموظف بنجاح',
+    'system_language'                        => 'لغة النظام',
+    'unsuccessful_change_password'           => 'فشل في تغيير كلمة المرور.',
+    'update'                                 => 'تحديث بيانات موظف',
+    'username'                               => 'اسم المستخدم',
+    'username_duplicate'                     => 'حساب المحدد هو موجود في قاعدة البيانات. نرجوا استخدام اسم حساب مختلف.',
+    'username_minlength'                     => 'اسم المستخدم يجب أن يكون 5 حروف على الأقل.',
+    'username_required'                      => 'اسم المستخدم مطلوب.',
 ];
diff --git a/app/Language/ar-EG/Error.php b/app/Language/ar-EG/Error.php
index 9c63bccaa..b33d9d526 100644
--- a/app/Language/ar-EG/Error.php
+++ b/app/Language/ar-EG/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "ليس لديك صلاحيات للوصول لهذا القسم",
-    "unknown"              => "غير معروف",
+    'no_permission_module'             => 'ليس لديك صلاحيات للوصول لهذا القسم',
+    'unable_to_create_env_file'        => 'تعذر إنشاء {filePath} لتوفير throttle.key',
+    'unable_to_lock_file'              => 'تعذر قفل {filePath}: {reason}',
+    'unable_to_open_lock_file'         => 'تعذر فتح {filePath}: {reason}',
+    'unable_to_persist_throttle_key'   => 'تعذر حفظ throttle.key في {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned'   => '',
+    'throttle_key_not_provisioned'     => '',
+    'unable_to_read_env_file'          => 'تعذر قراءة {filePath} لتوفير throttle.key',
+    'unknown'                          => 'غير معروف',
 ];
diff --git a/app/Language/ar-EG/Items.php b/app/Language/ar-EG/Items.php
index 29687a579..6b6046e73 100644
--- a/app/Language/ar-EG/Items.php
+++ b/app/Language/ar-EG/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "الكمية المطلوب خصمها أو اضافتها.",
-    "allow_alt_description"              => "السماح بوصف بديل",
-    "amount_entry"                       => "إدخال القيمة",
-    "bulk_edit"                          => "تحرير جماعى",
-    "buy_price_required"                 => "سعر الشراء مطلوب.",
-    "cannot_be_deleted"                  => "لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات.",
-    "cannot_find_item"                   => "لايمكن ايجاد معلومات حول الصنف.",
-    "categories"                         => "",
-    "category"                           => "التصنيف",
-    "category_new"                       => "",
-    "category_required"                  => "التصنيف مطلوب.",
-    "change_all_to_allow_alt_desc"       => "السماح بوصف بديل للجميع.",
-    "change_all_to_not_allow_allow_desc" => "عدم السماح بوصف بديل للجميع.",
-    "change_all_to_serialized"           => "تغير الجميع لمتسلسل",
-    "change_all_to_unserialized"         => "تغيير الجميع لغير متسلسل",
-    "change_image"                       => "تغيير الصورة",
-    "confirm_bulk_edit"                  => "هل أنت متأكد انك تريد تحرير كل الأصناف المختارة؟",
-    "confirm_bulk_edit_wipe_taxes"       => "سوف يتم مسح معلومات الضرائب لجميع الأصناف.",
-    "confirm_delete"                     => "هل أنت متأكد انك تريد حذف كل الأصناف المختارة؟",
-    "confirm_restore"                    => "هل انت متاكد من إستعادة الاصناف المخطارة؟",
-    "cost_price"                         => "سعر التكلفة",
-    "cost_price_number"                  => "سعر التكلفة يجب أن يكون رقم.",
-    "cost_price_required"                => "سعر التكلفة مطلوب.",
-    "count"                              => "تحديث المخزون",
-    "csv_import_failed"                  => "فشل الإستيراد من اكسل",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.",
-    "csv_import_partially_failed"        => "يوجد خطأ بنسبة {0} في استيراد الاصناف في السطر: {1}. لم يتم استيرادهم.",
-    "csv_import_success"                 => "تم استيراد الأصناف بنجاح.",
-    "current_quantity"                   => "الكمية الحالية",
-    "default_pack_name"                  => "كل",
-    "description"                        => "الوصف",
-    "details_count"                      => "حركة الصنف",
-    "do_nothing"                         => "لاتفعل شئ",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة.",
-    "edit_multiple_items"                => "تحريد مجموعة اصناف",
-    "empty_upc_items"                    => "تفريغ اصناف UPC",
-    "error_adding_updating"              => "خطاء فى إضافة/تحديث صنف",
-    "error_updating_multiple"            => "خطاء فى تحديث بيانات أصناف",
-    "generate_barcodes"                  => "توليد أكواد الباركود",
-    "hsn_code"                           => "تسميات النظام المنسق",
-    "image"                              => "صورة",
-    "import_items_csv"                   => "استيراد من اكسل",
-    "info_provided_by"                   => "المعلومات مقدمة بواسطة",
-    "inventory"                          => "المخزن",
-    "inventory_CSV_import_quantity"      => "العدد المستورد من ملفات ال CSV",
-    "inventory_comments"                 => "تعليقات",
-    "inventory_data_tracking"            => "تتبع بيانات المخزون",
-    "inventory_date"                     => "التاريخ",
-    "inventory_employee"                 => "الموظف",
-    "inventory_in_out_quantity"          => "+- كمية",
-    "inventory_remarks"                  => "ملاحظات",
-    "is_deleted"                         => "حذفت",
-    "is_printed"                         => "",
-    "is_serialized"                      => "الصنف له رقم مسلسل",
-    "item"                               => "صنف",
-    "item_id"                            => "",
-    "item_number"                        => "الباركود UPC/EAN/ISBN",
-    "item_number_duplicate"              => "رقم الصنف موجود فى قاعدة البيانات من قبل.",
-    "kit"                                => "مجموعة اصناف",
-    "location"                           => "مكان",
-    "low_inventory_items"                => "الأصناف التى لا يوجد لها مخزون",
-    "low_sell_item"                      => "الصنف المركب",
-    "manually_editing_of_quantity"       => "تحرير الكمية يدوياً",
-    "markup"                             => "",
-    "name"                               => "اسم الصنف",
-    "name_required"                      => "اسم الصنف مطلوب.",
-    "new"                                => "صنف جديد",
-    "no_description_items"               => "الأصناف التى بلا وصف",
-    "no_items_to_display"                => "لايوجد أصناف لعرضها.",
-    "none"                               => "لاشىء",
-    "none_selected"                      => "لم تختار أى أصناف لتحريرها",
-    "nonstock"                           => "غير مخزنة",
-    "number_information"                 => "رقم الصنف",
-    "number_required"                    => "مطلوب UPC/EAN/ISBN رقم الباركود.",
-    "one_or_multiple"                    => "صنف/أصناف",
-    "pack_name"                          => "اسم الحزمة",
-    "qty_per_pack"                       => "العدد بكل الحزمة",
-    "quantity"                           => "الكمية",
-    "quantity_number"                    => "الكمية يجب أن تكون رقم.",
-    "quantity_required"                  => "الكمية مطلوبة.",
-    "receiving_quantity"                 => "الكمية المستلمة",
-    "remove_image"                       => "ازالة الصورة",
-    "reorder_level"                      => "نقطة إعادة الطلب",
-    "reorder_level_number"               => "نقطة إعادة الطلب يجب أن تكون رقم.",
-    "reorder_level_required"             => "نقطة إعادة الطلب مطلوبة.",
-    "retrive_item_info"                  => "الحصول على بيانات الصنف",
-    "sales_tax_1"                        => "ضريبة المبيعات",
-    "sales_tax_2"                        => "ضريبة المبيعات 2",
-    "search_attributes"                  => "بحث الحقول المخصصة",
-    "select_image"                       => "اختار صورة",
-    "serialized_items"                   => "أصناف مسلسلة",
-    "standard"                           => "اساسي",
-    "stock"                              => "مخزن",
-    "stock_location"                     => "مكان المخزون",
-    "stock_type"                         => "نوع المخزن",
-    "successful_adding"                  => "لقد تم إضافة صنف بنجاح",
-    "successful_bulk_edit"               => "لقد تم تحديث بيانات صنف/أصناف بنجاح",
-    "successful_deleted"                 => "لقد تم الحذف بنجاح",
-    "successful_updating"                => "لقد تم تحديث بيانات صنف بنجاح",
-    "supplier"                           => "المورد",
-    "tax_1"                              => "الضريبة 1",
-    "tax_2"                              => "الضريبة 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "الفئة الضريبية",
-    "tax_percent"                        => "نسبة الضريبة",
-    "tax_percent_number"                 => "نسبة الضريبة يجب ان تكون رقم",
-    "tax_percent_required"               => "نسبة الضريبة مطلوبة.",
-    "tax_percents"                       => "نسبة/نسب الضريبة",
-    "temp"                               => "مؤقت",
-    "type"                               => "نوع الصنف",
-    "unit_price"                         => "السعر",
-    "unit_price_number"                  => "السعر يجب أن يكون رقم.",
-    "unit_price_required"                => "السعر مطلوب.",
-    "upc_database"                       => "UPC قاعدة بيانات",
-    "update"                             => "تحديث بيانات صنف",
-    "use_inventory_menu"                 => "استخدام تحديث المخزن",
+    'add_minus'                          => 'الكمية المطلوب خصمها أو اضافتها.',
+    'allow_alt_description'              => 'السماح بوصف بديل',
+    'amount_entry'                       => 'إدخال القيمة',
+    'bulk_edit'                          => 'تحرير جماعى',
+    'buy_price_required'                 => 'سعر الشراء مطلوب.',
+    'cannot_be_deleted'                  => 'لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات.',
+    'cannot_find_item'                   => 'لايمكن ايجاد معلومات حول الصنف.',
+    'categories'                         => '',
+    'category'                           => 'التصنيف',
+    'category_new'                       => '',
+    'category_required'                  => 'التصنيف مطلوب.',
+    'change_all_to_allow_alt_desc'       => 'السماح بوصف بديل للجميع.',
+    'change_all_to_not_allow_allow_desc' => 'عدم السماح بوصف بديل للجميع.',
+    'change_all_to_serialized'           => 'تغير الجميع لمتسلسل',
+    'change_all_to_unserialized'         => 'تغيير الجميع لغير متسلسل',
+    'change_image'                       => 'تغيير الصورة',
+    'confirm_bulk_edit'                  => 'هل أنت متأكد انك تريد تحرير كل الأصناف المختارة؟',
+    'confirm_bulk_edit_wipe_taxes'       => 'سوف يتم مسح معلومات الضرائب لجميع الأصناف.',
+    'confirm_delete'                     => 'هل أنت متأكد انك تريد حذف كل الأصناف المختارة؟',
+    'confirm_restore'                    => 'هل انت متاكد من إستعادة الاصناف المخطارة؟',
+    'cost_price'                         => 'سعر التكلفة',
+    'cost_price_number'                  => 'سعر التكلفة يجب أن يكون رقم.',
+    'cost_price_required'                => 'سعر التكلفة مطلوب.',
+    'count'                              => 'تحديث المخزون',
+    'csv_import_failed'                  => 'فشل الإستيراد من اكسل',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'الملف الذى رفعته إما فارغ أو أنه مختلف البنية.',
+    'csv_import_partially_failed'        => 'يوجد خطأ بنسبة {0} في استيراد الاصناف في السطر: {1}. لم يتم استيرادهم.',
+    'csv_import_success'                 => 'تم استيراد الأصناف بنجاح.',
+    'current_quantity'                   => 'الكمية الحالية',
+    'default_pack_name'                  => 'كل',
+    'description'                        => 'الوصف',
+    'details_count'                      => 'حركة الصنف',
+    'do_nothing'                         => 'لاتفعل شئ',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة.',
+    'edit_multiple_items'                => 'تحريد مجموعة اصناف',
+    'empty_upc_items'                    => 'تفريغ اصناف UPC',
+    'error_adding_updating'              => 'خطاء فى إضافة/تحديث صنف',
+    'error_updating_multiple'            => 'خطاء فى تحديث بيانات أصناف',
+    'generate_barcodes'                  => 'توليد أكواد الباركود',
+    'hsn_code'                           => 'تسميات النظام المنسق',
+    'image'                              => 'صورة',
+    'import_items_csv'                   => 'استيراد من اكسل',
+    'info_provided_by'                   => 'المعلومات مقدمة بواسطة',
+    'inventory'                          => 'المخزن',
+    'inventory_CSV_import_quantity'      => 'العدد المستورد من ملفات ال CSV',
+    'inventory_comments'                 => 'تعليقات',
+    'inventory_data_tracking'            => 'تتبع بيانات المخزون',
+    'inventory_date'                     => 'التاريخ',
+    'inventory_employee'                 => 'الموظف',
+    'inventory_in_out_quantity'          => '+- كمية',
+    'inventory_remarks'                  => 'ملاحظات',
+    'is_deleted'                         => 'حذفت',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'الصنف له رقم مسلسل',
+    'item'                               => 'صنف',
+    'item_id'                            => '',
+    'item_number'                        => 'الباركود UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'رقم الصنف موجود فى قاعدة البيانات من قبل.',
+    'item_number_invalid'                => 'رقم الصنف يحتوي على أحرف غير مسموح بها.',
+    'kit'                                => 'مجموعة اصناف',
+    'location'                           => 'مكان',
+    'low_inventory_items'                => 'الأصناف التى لا يوجد لها مخزون',
+    'low_sell_item'                      => 'الصنف المركب',
+    'manually_editing_of_quantity'       => 'تحرير الكمية يدوياً',
+    'markup'                             => '',
+    'name'                               => 'اسم الصنف',
+    'name_required'                      => 'اسم الصنف مطلوب.',
+    'new'                                => 'صنف جديد',
+    'no_description_items'               => 'الأصناف التى بلا وصف',
+    'no_items_to_display'                => 'لايوجد أصناف لعرضها.',
+    'none'                               => 'لاشىء',
+    'none_selected'                      => 'لم تختار أى أصناف لتحريرها',
+    'nonstock'                           => 'غير مخزنة',
+    'number_information'                 => 'رقم الصنف',
+    'number_required'                    => 'مطلوب UPC/EAN/ISBN رقم الباركود.',
+    'one_or_multiple'                    => 'صنف/أصناف',
+    'pack_name'                          => 'اسم الحزمة',
+    'qty_per_pack'                       => 'العدد بكل الحزمة',
+    'quantity'                           => 'الكمية',
+    'quantity_number'                    => 'الكمية يجب أن تكون رقم.',
+    'quantity_required'                  => 'الكمية مطلوبة.',
+    'receiving_quantity'                 => 'الكمية المستلمة',
+    'remove_image'                       => 'ازالة الصورة',
+    'reorder_level'                      => 'نقطة إعادة الطلب',
+    'reorder_level_number'               => 'نقطة إعادة الطلب يجب أن تكون رقم.',
+    'reorder_level_required'             => 'نقطة إعادة الطلب مطلوبة.',
+    'retrive_item_info'                  => 'الحصول على بيانات الصنف',
+    'sales_tax_1'                        => 'ضريبة المبيعات',
+    'sales_tax_2'                        => 'ضريبة المبيعات 2',
+    'search_attributes'                  => 'بحث الحقول المخصصة',
+    'select_image'                       => 'اختار صورة',
+    'serialized_items'                   => 'أصناف مسلسلة',
+    'standard'                           => 'اساسي',
+    'stock'                              => 'مخزن',
+    'stock_location'                     => 'مكان المخزون',
+    'stock_type'                         => 'نوع المخزن',
+    'successful_adding'                  => 'لقد تم إضافة صنف بنجاح',
+    'successful_bulk_edit'               => 'لقد تم تحديث بيانات صنف/أصناف بنجاح',
+    'successful_deleted'                 => 'لقد تم الحذف بنجاح',
+    'successful_updating'                => 'لقد تم تحديث بيانات صنف بنجاح',
+    'supplier'                           => 'المورد',
+    'tax_1'                              => 'الضريبة 1',
+    'tax_2'                              => 'الضريبة 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'الفئة الضريبية',
+    'tax_name_invalid'                   => 'اسم الضريبة يحتوي على أحرف غير مسموح بها.',
+    'tax_percent'                        => 'نسبة الضريبة',
+    'tax_percent_number'                 => 'نسبة الضريبة يجب ان تكون رقم',
+    'tax_percent_required'               => 'نسبة الضريبة مطلوبة.',
+    'tax_percents'                       => 'نسبة/نسب الضريبة',
+    'temp'                               => 'مؤقت',
+    'type'                               => 'نوع الصنف',
+    'unit_price'                         => 'السعر',
+    'unit_price_number'                  => 'السعر يجب أن يكون رقم.',
+    'unit_price_required'                => 'السعر مطلوب.',
+    'upc_database'                       => 'UPC قاعدة بيانات',
+    'update'                             => 'تحديث بيانات صنف',
+    'use_inventory_menu'                 => 'استخدام تحديث المخزن',
 ];
diff --git a/app/Language/ar-EG/Login.php b/app/Language/ar-EG/Login.php
index 9ca33871f..e2c0c4864 100644
--- a/app/Language/ar-EG/Login.php
+++ b/app/Language/ar-EG/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "أنا لست بوت.",
-    "go"                            => "البدء",
-    "invalid_gcaptcha"              => "يرجى التأكيد على أنك لست روبوتا.",
-    "invalid_installation"          => "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.",
-    "invalid_username_and_password" => "اسم مستخدم/كلمة سر غير صحيح.",
-    "login"                         => "دخول",
-    "logout"                        => "تسجيل خروج",
-    "migration_needed"              => "سيبدأ ترحيل قاعدة البيانات إلى{0} بعد تسجيل الدخول.",
-    "password"                      => "كلمة السر",
-    "required_username"             => "",
-    "username"                      => "اسم المستخدم",
-    "welcome"                       => "مرحباً بك في{0}!",
+    "gcaptcha"                            => "أنا لست بوت.",
+    "go"                                  => "البدء",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "يرجى التأكيد على أنك لست روبوتا.",
+    "invalid_installation"                => "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.",
+    "invalid_username_and_password"       => "اسم مستخدم/كلمة سر غير صحيح.",
+    "login"                               => "دخول",
+    "logout"                              => "تسجيل خروج",
+    "migrating_database"                  => "جارٍ ترحيل قاعدة البيانات",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "تم ترحيل قاعدة البيانات بنجاح!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "سيبدأ ترحيل قاعدة البيانات إلى{0} بعد تسجيل الدخول.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "كلمة السر",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'تم تجاوز عدد المحاولات المسموح بها. يرجى الانتظار قليلاً ثم المحاولة مرة أخرى.',
+    "username"                            => "اسم المستخدم",
+    "welcome"                             => "مرحباً بك في{0}!"
 ];
diff --git a/app/Language/ar-EG/Reports.php b/app/Language/ar-EG/Reports.php
index 2e1d77356..a4580f647 100644
--- a/app/Language/ar-EG/Reports.php
+++ b/app/Language/ar-EG/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "معدل الضريبة",
     "taxes"                                   => "الضرائب",
     "taxes_summary_report"                    => "تقرير ملخص الضرائب",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "الإجمالى",
     "total_inventory_value"                   => "إجمالى قيمة المخزن",
     "total_low_sell_quantity"                 => "مجموع الكميات حسب الصنف الاولي",
diff --git a/app/Language/ar-EG/Sales.php b/app/Language/ar-EG/Sales.php
index bf8d5b7cd..57237178a 100644
--- a/app/Language/ar-EG/Sales.php
+++ b/app/Language/ar-EG/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "النقاط المتاحة",
-    "rewards_package"                  => "فئة المكافئة",
-    "rewards_remaining_balance"        => "رصيد النقاط المتبقي هو ",
-    "account_number"                   => "حساب",
-    "add_payment"                      => "إضافة دفع",
-    "amount_due"                       => "المبلغ المطلوب",
-    "amount_tendered"                  => "المبلغ المدفوع",
-    "authorized_signature"             => "توقيع معتمد",
-    "cancel_sale"                      => "الغاء عملية البيع",
-    "cash"                             => "نقدى",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "تعديل الصندوق",
-    "cash_deposit"                     => "ايداع نقدي",
-    "cash_filter"                      => "نقدى",
-    "change_due"                       => "الباقى",
-    "change_price"                     => "تغيير سعر البيع",
-    "check"                            => "شيك",
-    "check_balance"                    => "تذكير بموعد الشيك",
-    "check_filter"                     => "شيك",
-    "close"                            => "",
-    "comment"                          => "تعليق",
-    "comments"                         => "تعليقات",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "إتمام البيع",
-    "confirm_cancel_sale"              => "هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف.",
-    "confirm_delete"                   => "هل تريد حذف عمليات البيع المختارة؟",
-    "confirm_restore"                  => "هل انت متاكد من استعادة عملية البيع؟",
-    "credit"                           => "بطاقة إئتمانية",
-    "credit_deposit"                   => "ايداع ببطاقة ائتمان",
-    "credit_filter"                    => "بطاقة بنكية",
-    "current_table"                    => "",
-    "customer"                         => "العميل",
-    "customer_address"                 => "العنوان",
-    "customer_discount"                => "الخصم",
-    "customer_email"                   => "البريد الإلكترونى",
-    "customer_location"                => "المكان",
-    "customer_mailchimp_status"        => "حالة بريد ميل تشيمب",
-    "customer_optional"                => "(مطلوب للدفعات المستحقة)",
-    "customer_required"                => "(اجباري)",
-    "customer_total"                   => "المجموع",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "تاريخ البيع",
-    "date_range"                       => "الفترة الزمنية",
-    "date_required"                    => "يجب إدخال تاريخ صحيح.",
-    "date_type"                        => "التاريخ مطلوب.",
-    "debit"                            => "بطاقة خصم",
-    "debit_filter"                     => "",
-    "delete"                           => "اسمح بالمسح",
-    "delete_confirmation"              => "هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف.",
-    "delete_entire_sale"               => "حذف عملية البيع بالكامل",
-    "delete_successful"                => "لقد تم حذف عملية البيع بنجاح.",
-    "delete_unsuccessful"              => "لقد فشل حذف عملية البيع.",
-    "description_abbrv"                => "الوصف.",
-    "discard"                          => "الغاء",
-    "discard_quote"                    => "",
-    "discount"                         => "خصم",
-    "discount_included"                => "% خصم",
-    "discount_short"                   => "%",
-    "due"                              => "مستحق",
-    "due_filter"                       => "مستحق",
-    "edit"                             => "تحرير",
-    "edit_item"                        => "تحرير صنف",
-    "edit_sale"                        => "تحرير عملية بيع",
-    "email_receipt"                    => "إرسال الايصال بالبريد الالكترونى",
-    "employee"                         => "الموظف",
-    "entry"                            => "ادخال",
-    "error_editing_item"               => "خطاء فى تحرير الصنف",
-    "find_or_scan_item"                => "بحث/مسح باركود صنف",
-    "find_or_scan_item_or_receipt"     => "بحث/مسح باركود صنف أو ايصال",
-    "giftcard"                         => "بطاقة هدية",
-    "giftcard_balance"                 => "رصيد بطاقة الهدية",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "رقم بطاقة الهدية",
-    "group_by_category"                => "تصفية حسب الفئة",
-    "group_by_type"                    => "تجميع حسب النوع",
-    "hsn"                              => "رمز نظام منسق",
-    "id"                               => "كود عملية البيع",
-    "include_prices"                   => "يشمل الاسعار؟",
-    "invoice"                          => "فاتورة",
-    "invoice_confirm"                  => "هذه الفاتورة سوف ترسل إلى",
-    "invoice_enable"                   => "إنشاء فاتورة",
-    "invoice_filter"                   => "الفواتير",
-    "invoice_no_email"                 => "هذا العميل ليس لدية بريد الكترونى صالح.",
-    "invoice_number"                   => "فاتورة رقم #",
-    "invoice_number_duplicate"         => "من فضلك أدخل رقم فاتورة غير مكرر.",
-    "invoice_sent"                     => "تم إرسال الفاتورة إلى",
-    "invoice_total"                    => "إجمالي الفاتورة",
-    "invoice_type_custom_invoice"      => "فاتورة مخصصة (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "الفاتورة الضريبية المخصصة (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "الفاتورة (invoice.php)",
-    "invoice_type_tax_invoice"         => "الفاتورة الضريبية (tax_invoice.php)",
-    "invoice_unsent"                   => "فشل إرسال الفاتورة إلى",
-    "invoice_update"                   => "إعادة العد",
-    "item_insufficient_of_stock"       => "لايوجد مخزون كافى من الصنف.",
-    "item_name"                        => "اسم الصنف",
-    "item_number"                      => "صنف #",
-    "item_out_of_stock"                => "لايوجد مخزون من الصنف.",
-    "key_browser"                      => "اختصارات مفيده",
-    "key_cancel"                       => "الغاء عملية البيع/فاتوره/عرض السعار",
-    "key_customer_search"              => "بحث عن عميل",
-    "key_finish_quote"                 => "انهاء عملية البيع/الفاتورة من دون الدفع",
-    "key_finish_sale"                  => "اضافة دفع نقدي كمل واتمام عملية البيع",
-    "key_full"                         => "الإظهار في صفحه كامله",
-    "key_function"                     => "Function",
-    "key_help"                         => "اختصارات",
-    "key_help_modal"                   => "إظهار الاختصارات",
-    "key_in"                           => "تكبير الصفحه",
-    "key_item_search"                  => "بحث حسب الصنف",
-    "key_out"                          => "تصغير الصفحه",
-    "key_payment"                      => "اضافة دفعه",
-    "key_print"                        => "طباعة الصفحة الحالية",
-    "key_restore"                      => "إعادة ضبط اعدادات الصفحه",
-    "key_search"                       => "البحث في التقارير",
-    "key_suspend"                      => "حفط عملية البيع",
-    "key_suspended"                    => "إظهار عمليات البيع المحفظه",
-    "key_system"                       => "اختصارات متاحه",
-    "key_tendered"                     => "تعديل المبلغ المدفوع",
-    "key_title"                        => "اختصارات صفحة المبيعات",
-    "mc"                               => "",
-    "mode"                             => "وضع التسجيل",
-    "must_enter_numeric"               => "يجب إدخال رقم للمبلغ الفعلى المدفوع.",
-    "must_enter_numeric_giftcard"      => "رقم بطاقة الهدية يجب أن يكون رقم.",
-    "new_customer"                     => "عميل جديد",
-    "new_item"                         => "صنف جديد",
-    "no_description"                   => "بدون وصف",
-    "no_filter"                        => "الكل",
-    "no_items_in_cart"                 => "لايوجد أصناف فى السلة.",
-    "no_sales_to_display"              => "لاتوجد عمليات بيع لعرضها.",
-    "none_selected"                    => "لم تقم بإختيار أى عمليات بيع لحذفها.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "هذه العملية لا يمكن فعلها لعدم تخويلك.",
-    "one_or_multiple"                  => "عمليات بيع",
-    "payment"                          => "طريقة الدفع",
-    "payment_amount"                   => "المبلغ",
-    "payment_not_cover_total"          => "المبلغ المدفوع لايغطى المبلغ الإجمالى.",
-    "payment_type"                     => "طريقة",
-    "payments"                         => "",
-    "payments_total"                   => "إجمالى المدفوعات",
-    "price"                            => "السعر",
-    "print_after_sale"                 => "اطبع بعد عملية البيع",
-    "quantity"                         => "الكمية",
-    "quantity_less_than_reorder_level" => "تحذير: الكمية/العدد المطلوب غير متوفر لهذا الصنف.",
-    "quantity_less_than_zero"          => "تحذير! الكمية المطلوبة غير كافية، بإمكانك إتمام عملية البيع ، لكن تحقق من مخزنك.",
-    "quantity_of_items"                => "عدد ال {0} من الاصناف",
-    "quote"                            => "عرض اسعار",
-    "quote_number"                     => "رقم عرض الاسعار",
-    "quote_number_duplicate"           => "رقم عرض الاسعار يجب ان يكون فريد.",
-    "quote_sent"                       => "عرض الاسعار ارسل الى",
-    "quote_unsent"                     => "لم يتم ارسال عرض الاسعار الى",
-    "receipt"                          => "عملية بيع #",
-    "receipt_no_email"                 => "هذا العميل ليس له اي بريد الكتروني صحيح.",
-    "receipt_number"                   => "إيصال بيع",
-    "receipt_sent"                     => "تم إرسال الإيصال إلى",
-    "receipt_unsent"                   => "فشل إرسال الإيصال إلى",
-    "refund"                           => "نوع/سبب الاسترجاع",
-    "register"                         => "مسجل المبيعات",
-    "remove_customer"                  => "حذف عميل",
-    "remove_discount"                  => "",
-    "return"                           => "إرتجاع",
-    "rewards"                          => "نقاط المكافئة",
-    "rewards_balance"                  => "رصيد نقاط المكافئة",
-    "sale"                             => "بيع",
-    "sale_by_invoice"                  => "البيع بفاتورة رسمية",
-    "sale_for_customer"                => "العميل:",
-    "sale_time"                        => "الوقت",
-    "sales_tax"                        => "ضريبة البيع",
-    "sales_total"                      => "",
-    "select_customer"                  => "اختيار عميل (اختياري)",
-    "send_invoice"                     => "إرسال الفاتورة",
-    "send_quote"                       => "ارسال عرض الاسعار",
-    "send_receipt"                     => "إرسال إيصال",
-    "send_work_order"                  => "ارسال طلب عمل",
-    "serial"                           => "مسلسل",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "عرض الفاتورة",
-    "show_receipt"                     => "عرض الإيصال",
-    "start_typing_customer_name"       => "ابداء بكتابة اسم العميل...",
-    "start_typing_item_name"           => "ابداء بكتابة اسم أو مسح باركود الصنف...",
-    "stock"                            => "المخزن",
-    "stock_location"                   => "مكان المخزون",
-    "sub_total"                        => "المجموع الفرعي",
-    "successfully_deleted"             => "لقد تم الحذف بنجاح",
-    "successfully_restored"            => "لقد تمت عملية الاستعادة بنجاح",
-    "successfully_suspended_sale"      => "لقد تم تعليق عملية البيع بنجاح.",
-    "successfully_updated"             => "لقد تم تحديث بيانات عملية البيع بنجاح.",
-    "suspend_sale"                     => "تعليق عملية البيع",
-    "suspended_doc_id"                 => "ملف",
-    "suspended_sale_id"                => "كود عملية البيع",
-    "suspended_sales"                  => "المبيعات المعلقة",
-    "table"                            => "طاولة",
-    "takings"                          => "المبيع اليومي",
-    "tax"                              => "ضريبة",
-    "tax_id"                           => "الرقم الضريبي",
-    "tax_invoice"                      => "فاتورة ضريبية",
-    "tax_percent"                      => "ضريبة %",
-    "taxed_ind"                        => "ض",
-    "total"                            => "المجموع",
-    "total_tax_exclusive"              => "الإجمالى بدون الضرائب",
-    "transaction_failed"               => "فشل حركة البيع.",
-    "unable_to_add_item"               => "غير قادر على إضافة صنف لعملية البيع",
-    "unsuccessfully_deleted"           => "لايمكن حذف عملية/عمليات البيع.",
-    "unsuccessfully_restored"          => "فشل في استعادة عملية البيع.",
-    "unsuccessfully_suspended_sale"    => "فشل تعليق عملية البيع.",
-    "unsuccessfully_updated"           => "فشل تحديث عملية البيع.",
-    "unsuspend"                        => "إلغاء تعليق",
-    "unsuspend_and_delete"             => "إلغاء تعليق وحذف",
-    "update"                           => "تحديث",
-    "upi"                              => "رقم التعريف الشخصي",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "طلب عمل",
-    "work_order_number"                => "رقم طلب العمل",
-    "work_order_number_duplicate"      => "رقم طلب العمل يجب ان يكون فريد.",
-    "work_order_sent"                  => "تم ارسال طلب العمل الى",
-    "work_order_unsent"                => "فشل في ارسال طلب العمل الى",
+    'account_number'                    => 'حساب',
+    'add_payment'                       => 'إضافة دفع',
+    'amount_due'                        => 'المبلغ المطلوب',
+    'amount_due_not_covered'            => 'المدفوعات لا تغطي المبلغ المستحق.',
+    'amount_tendered'                   => 'المبلغ المدفوع',
+    'authorized_signature'              => 'توقيع معتمد',
+    'cancel_sale'                       => 'الغاء عملية البيع',
+    'cash'                              => 'نقدى',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'تعديل الصندوق',
+    'cash_deposit'                      => 'ايداع نقدي',
+    'cash_filter'                       => 'نقدى',
+    'change_due'                        => 'الباقى',
+    'change_price'                      => 'تغيير سعر البيع',
+    'check'                             => 'شيك',
+    'check_balance'                     => 'تذكير بموعد الشيك',
+    'check_filter'                      => 'شيك',
+    'close'                             => '',
+    'comment'                           => 'تعليق',
+    'comments'                          => 'تعليقات',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'إتمام البيع',
+    'confirm_cancel_sale'               => 'هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف.',
+    'confirm_delete'                    => 'هل تريد حذف عمليات البيع المختارة؟',
+    'confirm_restore'                   => 'هل انت متاكد من استعادة عملية البيع؟',
+    'credit'                            => 'بطاقة إئتمانية',
+    'credit_deposit'                    => 'ايداع ببطاقة ائتمان',
+    'credit_filter'                     => 'بطاقة بنكية',
+    'current_table'                     => '',
+    'customer'                          => 'العميل',
+    'customer_address'                  => 'العنوان',
+    'customer_discount'                 => 'الخصم',
+    'customer_email'                    => 'البريد الإلكترونى',
+    'customer_location'                 => 'المكان',
+    'customer_mailchimp_status'         => 'حالة بريد ميل تشيمب',
+    'customer_optional'                 => '(مطلوب للدفعات المستحقة)',
+    'customer_required'                 => '(اجباري)',
+    'customer_total'                    => 'المجموع',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'النقاط المتاحة',
+    'daily_sales'                       => '',
+    'date'                              => 'تاريخ البيع',
+    'date_range'                        => 'الفترة الزمنية',
+    'date_required'                     => 'يجب إدخال تاريخ صحيح.',
+    'date_type'                         => 'التاريخ مطلوب.',
+    'debit'                             => 'بطاقة خصم',
+    'debit_filter'                      => '',
+    'delete'                            => 'اسمح بالمسح',
+    'delete_confirmation'               => 'هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف.',
+    'delete_entire_sale'                => 'حذف عملية البيع بالكامل',
+    'delete_successful'                 => 'لقد تم حذف عملية البيع بنجاح.',
+    'delete_unsuccessful'               => 'لقد فشل حذف عملية البيع.',
+    'description_abbrv'                 => 'الوصف.',
+    'discard'                           => 'الغاء',
+    'discard_quote'                     => '',
+    'discount'                          => 'خصم',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% خصم',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'مستحق',
+    'due_filter'                        => 'مستحق',
+    'edit'                              => 'تحرير',
+    'edit_item'                         => 'تحرير صنف',
+    'edit_sale'                         => 'تحرير عملية بيع',
+    'email_receipt'                     => 'إرسال الايصال بالبريد الالكترونى',
+    'employee'                          => 'الموظف',
+    'entry'                             => 'ادخال',
+    'error_editing_item'                => 'خطاء فى تحرير الصنف',
+    'find_or_scan_item'                 => 'بحث/مسح باركود صنف',
+    'find_or_scan_item_or_receipt'      => 'بحث/مسح باركود صنف أو ايصال',
+    'giftcard'                          => 'بطاقة هدية',
+    'giftcard_balance'                  => 'رصيد بطاقة الهدية',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'رقم بطاقة الهدية',
+    'group_by_category'                 => 'تصفية حسب الفئة',
+    'group_by_type'                     => 'تجميع حسب النوع',
+    'hsn'                               => 'رمز نظام منسق',
+    'id'                                => 'كود عملية البيع',
+    'include_prices'                    => 'يشمل الاسعار؟',
+    'insufficient_giftcard_balance'     => 'رصيد بطاقة الهدية غير كافي لهذه الدفعة.',
+    'insufficient_reward_points'        => 'نقاط المكافأة غير كافية لهذه الدفعة.',
+    'invoice'                           => 'فاتورة',
+    'invoice_confirm'                   => 'هذه الفاتورة سوف ترسل إلى',
+    'invoice_enable'                    => 'إنشاء فاتورة',
+    'invoice_filter'                    => 'الفواتير',
+    'invoice_no_email'                  => 'هذا العميل ليس لدية بريد الكترونى صالح.',
+    'invoice_number'                    => 'فاتورة رقم #',
+    'invoice_number_duplicate'          => 'من فضلك أدخل رقم فاتورة غير مكرر.',
+    'invoice_sent'                      => 'تم إرسال الفاتورة إلى',
+    'invoice_total'                     => 'إجمالي الفاتورة',
+    'invoice_type_custom_invoice'       => 'فاتورة مخصصة (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'الفاتورة الضريبية المخصصة (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'الفاتورة (invoice.php)',
+    'invoice_type_tax_invoice'          => 'الفاتورة الضريبية (tax_invoice.php)',
+    'invoice_unsent'                    => 'فشل إرسال الفاتورة إلى',
+    'invoice_update'                    => 'إعادة العد',
+    'item_insufficient_of_stock'        => 'لايوجد مخزون كافى من الصنف.',
+    'item_name'                         => 'اسم الصنف',
+    'item_number'                       => 'صنف #',
+    'item_out_of_stock'                 => 'لايوجد مخزون من الصنف.',
+    'key_browser'                       => 'اختصارات مفيده',
+    'key_cancel'                        => 'الغاء عملية البيع/فاتوره/عرض السعار',
+    'key_customer_search'               => 'بحث عن عميل',
+    'key_finish_quote'                  => 'انهاء عملية البيع/الفاتورة من دون الدفع',
+    'key_finish_sale'                   => 'اضافة دفع نقدي كمل واتمام عملية البيع',
+    'key_full'                          => 'الإظهار في صفحه كامله',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'اختصارات',
+    'key_help_modal'                    => 'إظهار الاختصارات',
+    'key_in'                            => 'تكبير الصفحه',
+    'key_item_search'                   => 'بحث حسب الصنف',
+    'key_out'                           => 'تصغير الصفحه',
+    'key_payment'                       => 'اضافة دفعه',
+    'key_print'                         => 'طباعة الصفحة الحالية',
+    'key_restore'                       => 'إعادة ضبط اعدادات الصفحه',
+    'key_search'                        => 'البحث في التقارير',
+    'key_suspend'                       => 'حفط عملية البيع',
+    'key_suspended'                     => 'إظهار عمليات البيع المحفظه',
+    'key_system'                        => 'اختصارات متاحه',
+    'key_tendered'                      => 'تعديل المبلغ المدفوع',
+    'key_title'                         => 'اختصارات صفحة المبيعات',
+    'mc'                                => '',
+    'mode'                              => 'وضع التسجيل',
+    'must_enter_numeric'                => 'يجب إدخال رقم للمبلغ الفعلى المدفوع.',
+    'must_enter_numeric_giftcard'       => 'رقم بطاقة الهدية يجب أن يكون رقم.',
+    'must_enter_reference_code'         => 'يجب إدخال رقم المرجع/الاسترداد.',
+    'negative_amount_tendered'          => 'لا يمكن أن يكون المبلغ المدفوع سالبًا.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'عميل جديد',
+    'new_item'                          => 'صنف جديد',
+    'no_description'                    => 'بدون وصف',
+    'no_filter'                         => 'الكل',
+    'no_items_in_cart'                  => 'لايوجد أصناف فى السلة.',
+    'no_sales_to_display'               => 'لاتوجد عمليات بيع لعرضها.',
+    'none_selected'                     => 'لم تقم بإختيار أى عمليات بيع لحذفها.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'هذه العملية لا يمكن فعلها لعدم تخويلك.',
+    'one_or_multiple'                   => 'عمليات بيع',
+    'payment'                           => 'طريقة الدفع',
+    'payment_amount'                    => 'المبلغ',
+    'payment_not_cover_total'           => 'المبلغ المدفوع لايغطى المبلغ الإجمالى.',
+    'payment_type'                      => 'طريقة',
+    'payments'                          => '',
+    'payments_total'                    => 'إجمالى المدفوعات',
+    'price'                             => 'السعر',
+    'print_after_sale'                  => 'اطبع بعد عملية البيع',
+    'quantity'                          => 'الكمية',
+    'quantity_less_than_reorder_level'  => 'تحذير: الكمية/العدد المطلوب غير متوفر لهذا الصنف.',
+    'quantity_less_than_zero'           => 'تحذير! الكمية المطلوبة غير كافية، بإمكانك إتمام عملية البيع ، لكن تحقق من مخزنك.',
+    'quantity_of_items'                 => 'عدد ال {0} من الاصناف',
+    'quote'                             => 'عرض اسعار',
+    'quote_number'                      => 'رقم عرض الاسعار',
+    'quote_number_duplicate'            => 'رقم عرض الاسعار يجب ان يكون فريد.',
+    'quote_sent'                        => 'عرض الاسعار ارسل الى',
+    'quote_unsent'                      => 'لم يتم ارسال عرض الاسعار الى',
+    'receipt'                           => 'عملية بيع #',
+    'receipt_no_email'                  => 'هذا العميل ليس له اي بريد الكتروني صحيح.',
+    'receipt_number'                    => 'إيصال بيع',
+    'receipt_sent'                      => 'تم إرسال الإيصال إلى',
+    'receipt_unsent'                    => 'فشل إرسال الإيصال إلى',
+    'reference_code'                    => 'كود مرجع الدفع',
+    'reference_code_invalid_characters' => 'يجب أن يحتوي كود المرجع على أحرف وأرقام فقط.',
+    'reference_code_length_error'       => 'طول كود المرجع غير صالح.',
+    'refund'                            => 'نوع/سبب الاسترجاع',
+    'register'                          => 'مسجل المبيعات',
+    'remove_customer'                   => 'حذف عميل',
+    'remove_discount'                   => '',
+    'return'                            => 'إرتجاع',
+    'rewards'                           => 'نقاط المكافئة',
+    'rewards_balance'                   => 'رصيد نقاط المكافئة',
+    'rewards_package'                   => 'فئة المكافئة',
+    'rewards_remaining_balance'         => 'رصيد النقاط المتبقي هو ',
+    'sale'                              => 'بيع',
+    'sale_by_invoice'                   => 'البيع بفاتورة رسمية',
+    'sale_for_customer'                 => 'العميل:',
+    'sale_time'                         => 'الوقت',
+    'sales_tax'                         => 'ضريبة البيع',
+    'sales_total'                       => '',
+    'select_customer'                   => 'اختيار عميل (اختياري)',
+    'send_invoice'                      => 'إرسال الفاتورة',
+    'send_quote'                        => 'ارسال عرض الاسعار',
+    'send_receipt'                      => 'إرسال إيصال',
+    'send_work_order'                   => 'ارسال طلب عمل',
+    'serial'                            => 'مسلسل',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'عرض الفاتورة',
+    'show_receipt'                      => 'عرض الإيصال',
+    'start_typing_customer_name'        => 'ابداء بكتابة اسم العميل...',
+    'start_typing_item_name'            => 'ابداء بكتابة اسم أو مسح باركود الصنف...',
+    'stock'                             => 'المخزن',
+    'stock_location'                    => 'مكان المخزون',
+    'sub_total'                         => 'المجموع الفرعي',
+    'successfully_deleted'              => 'لقد تم الحذف بنجاح',
+    'successfully_restored'             => 'لقد تمت عملية الاستعادة بنجاح',
+    'successfully_suspended_sale'       => 'لقد تم تعليق عملية البيع بنجاح.',
+    'successfully_updated'              => 'لقد تم تحديث بيانات عملية البيع بنجاح.',
+    'suspend_sale'                      => 'تعليق عملية البيع',
+    'suspended_doc_id'                  => 'ملف',
+    'suspended_sale_id'                 => 'كود عملية البيع',
+    'suspended_sales'                   => 'المبيعات المعلقة',
+    'table'                             => 'طاولة',
+    'takings'                           => 'المبيع اليومي',
+    'tax'                               => 'ضريبة',
+    'tax_id'                            => 'الرقم الضريبي',
+    'tax_invoice'                       => 'فاتورة ضريبية',
+    'tax_percent'                       => 'ضريبة %',
+    'taxed_ind'                         => 'ض',
+    'total'                             => 'المجموع',
+    'total_tax_exclusive'               => 'الإجمالى بدون الضرائب',
+    'transaction_failed'                => 'فشل حركة البيع.',
+    'unable_to_add_item'                => 'غير قادر على إضافة صنف لعملية البيع',
+    'unsuccessfully_deleted'            => 'لايمكن حذف عملية/عمليات البيع.',
+    'unsuccessfully_restored'           => 'فشل في استعادة عملية البيع.',
+    'unsuccessfully_suspended_sale'     => 'فشل تعليق عملية البيع.',
+    'unsuccessfully_updated'            => 'فشل تحديث عملية البيع.',
+    'unsuspend'                         => 'إلغاء تعليق',
+    'unsuspend_and_delete'              => 'إلغاء تعليق وحذف',
+    'update'                            => 'تحديث',
+    'upi'                               => 'رقم التعريف الشخصي',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'طلب عمل',
+    'work_order_number'                 => 'رقم طلب العمل',
+    'work_order_number_duplicate'       => 'رقم طلب العمل يجب ان يكون فريد.',
+    'work_order_sent'                   => 'تم ارسال طلب العمل الى',
+    'work_order_unsent'                 => 'فشل في ارسال طلب العمل الى',
 ];
diff --git a/app/Language/ar-LB/Attributes.php b/app/Language/ar-LB/Attributes.php
index 8d184bd9d..c754d6009 100644
--- a/app/Language/ar-LB/Attributes.php
+++ b/app/Language/ar-LB/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "الميزات لا يمكن أن تحتوي على ':' أو'|'",
-    "confirm_delete"                   => "هل أنت متأكد من أنك تريد حذف الميزات المحددة ؟",
-    "confirm_restore"                  => "هل أنت متأكد من أنك تريد استعادة السمة (السمات) المحددة؟",
-    "definition_cannot_be_deleted"     => "لا يمكن حذف السمات المحددة",
-    "definition_error_adding_updating" => "لا يمكن إضافة السمة {0} أو تحديثها. يرجى التحقق من سجل الخطأ.",
-    "definition_flags"                 => "رؤية الميزات",
-    "definition_group"                 => "المجموعة",
-    "definition_id"                    => "كود",
-    "definition_name"                  => "إضافة ميزة",
-    "definition_name_required"         => "اسم الميزة هي خانة اجبارية",
-    "definition_one_or_multiple"       => "ميزة/ميزات",
-    "definition_successful_adding"     => "لقد تم إضافة صنف بنجاح",
-    "definition_successful_deleted"    => "لقد تم حذف ميزة بنجاح",
-    "definition_successful_updating"   => "تم تعديل الميزة بنجاح",
-    "definition_type"                  => "نوع الميزة",
-    "definition_type_required"         => "نوع الميزة هي خانة إجبارية",
-    "definition_unit"                  => "وحدة قياس",
-    "definition_values"                => "قيمة الميزة",
-    "new"                              => "اضافة ميزة جديده",
-    "no_attributes_to_display"         => "لا يوجد اصناف للعرض",
-    "receipt_visibility"               => "وصل",
-    "show_in_items"                    => "اظهار في الصنف",
-    "show_in_items_visibility"         => "الصنف",
-    "show_in_receipt"                  => "اظهار على الوصل",
-    "show_in_receivings"               => "اظهار في استلام البضائع",
-    "show_in_receivings_visibility"    => "استلام البضائع",
-    "show_in_sales"                    => "اظهار خلال البيع",
-    "show_in_sales_visibility"         => "البيع",
-    "update"                           => "تحديث الميزات",
+    'attribute_value_invalid_chars'    => 'الميزات لا يمكن أن تحتوي على \':\' أو\'|\'',
+    'confirm_delete'                   => 'هل أنت متأكد من أنك تريد حذف الميزات المحددة ؟',
+    'confirm_restore'                  => 'هل أنت متأكد من أنك تريد استعادة السمة (السمات) المحددة؟',
+    'definition_cannot_be_deleted'     => 'لا يمكن حذف السمات المحددة',
+    'definition_invalid_group' => 'المجموعة المحددة غير موجودة أو غير صالحة.',
+    'definition_error_adding_updating' => 'لا يمكن إضافة السمة {0} أو تحديثها. يرجى التحقق من سجل الخطأ.',
+    'definition_flags'                 => 'رؤية الميزات',
+    'definition_group'                 => 'المجموعة',
+    'definition_id'                    => 'كود',
+    'definition_name'                  => 'إضافة ميزة',
+    'definition_name_required'         => 'اسم الميزة هي خانة اجبارية',
+    'definition_one_or_multiple'       => 'ميزة/ميزات',
+    'definition_successful_adding'     => 'لقد تم إضافة صنف بنجاح',
+    'definition_successful_deleted'    => 'لقد تم حذف ميزة بنجاح',
+    'definition_successful_updating'   => 'تم تعديل الميزة بنجاح',
+    'definition_type'                  => 'نوع الميزة',
+    'definition_type_required'         => 'نوع الميزة هي خانة إجبارية',
+    'definition_unit'                  => 'وحدة قياس',
+    'definition_values'                => 'قيمة الميزة',
+    'new'                              => 'اضافة ميزة جديده',
+    'no_attributes_to_display'         => 'لا يوجد اصناف للعرض',
+    'receipt_visibility'               => 'وصل',
+    'show_in_items'                    => 'اظهار في الصنف',
+    'show_in_items_visibility'         => 'الصنف',
+    'show_in_receipt'                  => 'اظهار على الوصل',
+    'show_in_receivings'               => 'اظهار في استلام البضائع',
+    'show_in_receivings_visibility'    => 'استلام البضائع',
+    'show_in_sales'                    => 'اظهار خلال البيع',
+    'show_in_sales_visibility'         => 'البيع',
+    'show_in_search'                   => 'اظهار في البحث',
+    'show_in_search_visibility'        => 'بحث',
+    'update'                           => 'تحديث الميزات',
 ];
diff --git a/app/Language/ar-LB/Bootstrap_tables.php b/app/Language/ar-LB/Bootstrap_tables.php
index b82b62de4..125bd8ec0 100644
--- a/app/Language/ar-LB/Bootstrap_tables.php
+++ b/app/Language/ar-LB/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "الكل",
-    "columns"              => "أعمدة",
-    "hide_show_pagination" => "عرض/إخفاء أرقام الصفحات",
-    "loading"              => "جارى التحميل، برجاء الإنتظار ...",
-    "page_from_to"         => "عرض {0} إلى {1} من {2} صفوف",
-    "refresh"              => "إعادة تحميل",
-    "rows_per_page"        => "{0} صف بالصفحة",
-    "toggle"               => "تغيير",
+    'all' => "الكل",
+    'columns' => "أعمدة",
+    'hide_show_pagination' => "عرض/إخفاء أرقام الصفحات",
+    'loading' => "جارى التحميل، برجاء الإنتظار",
+    'page_from_to' => "عرض {0} إلى {1} من {2} صفوف",
+    'refresh' => "إعادة تحميل",
+    'rows_per_page' => "{0} صف بالصفحة",
+    'toggle' => "تغيير",
 ];
diff --git a/app/Language/ar-LB/Config.php b/app/Language/ar-LB/Config.php
index d94438af0..7a40b96bf 100644
--- a/app/Language/ar-LB/Config.php
+++ b/app/Language/ar-LB/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "عنوان الشركة",
-    "address_required"                          => "عنوان الشركة مطلوب.",
-    "all_set"                                   => "صلاحيات الملفات مضبطة بالطريقه الصحيحه!",
-    "allow_duplicate_barcodes"                  => "السماح بتشابة الباركود",
-    "apostrophe"                                => "الفاصلة",
-    "backup_button"                             => "نسخ إحتياطى",
-    "backup_database"                           => "نسخ إحتياطى لقاعدة البيانات",
-    "barcode"                                   => "باركود",
-    "barcode_company"                           => "اسم الشركة",
-    "barcode_configuration"                     => "اعدادات الباركود",
-    "barcode_content"                           => "محتويات الباركود",
-    "barcode_first_row"                         => "الصف 1",
-    "barcode_font"                              => "الخط",
-    "barcode_formats"                           => "اشكال الادخال",
-    "barcode_generate_if_empty"                 => "توليد اذا كان الباركود فارغ.",
-    "barcode_height"                            => "الارتفاع (px)",
-    "barcode_id"                                => "كود/اسم الصنف",
-    "barcode_info"                              => "معلومات اعدادات الباركود",
-    "barcode_layout"                            => "تخطيط الباركود",
-    "barcode_name"                              => "الاسم",
-    "barcode_number"                            => "الباركود UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "الرقم فى الصف",
-    "barcode_page_cellspacing"                  => "المسافة بين الخلايا فى صفحة العرض.",
-    "barcode_page_width"                        => "عرض الصفحة",
-    "barcode_price"                             => "السعر",
-    "barcode_second_row"                        => "الصف 2",
-    "barcode_third_row"                         => "الصف 3",
-    "barcode_tooltip"                           => "تحذير: قد تؤدي هذه الميزة إلى استيراد اصناف مكررة أو إنشاؤها. لا تستخدمها إذا كنت لا تريد الباركود مكررة.",
-    "barcode_type"                              => "نوعية الباركود",
-    "barcode_width"                             => "العرض (px)",
-    "bottom"                                    => "الأسفل",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "فواصل النقدية",
-    "cash_decimals_tooltip"                     => "إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.",
-    "cash_rounding"                             => "التقريب النقدي",
-    "category_dropdown"                         => "إظهار الفئة كقائمة منسدلة",
-    "center"                                    => "الوسط",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "فاصلة",
-    "company"                                   => "اسم الشركة",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "تغيير الصورة",
-    "company_logo"                              => "شعار الشركة",
-    "company_remove_image"                      => "إزالة الصورة",
-    "company_required"                          => "اسم الشركة مطلوب",
-    "company_select_image"                      => "اختار صورة",
-    "company_website_url"                       => "الموقع الإلكترونى للشركة غير صحيح.",
-    "country_codes"                             => "أكواد الدولة",
-    "country_codes_tooltip"                     => "قائمة مفصولة بفاصلة لاسماء الدول للبحث.",
-    "currency_code"                             => "رمز العملة",
-    "currency_decimals"                         => "العلامة العشرية للعملة",
-    "currency_symbol"                           => "رمز العملة",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "المكافآت",
-    "customer_reward_duplicate"                 => "المكافئة يجب ان تكون فريدة.",
-    "customer_reward_enable"                    => "تمكين مكافآت العميل",
-    "customer_reward_invalid_chars"             => "لا يمكن أن تحتوي المكافأة على '_'",
-    "customer_reward_required"                  => "المكافأة هي حقل مطلوب",
-    "customer_sales_tax_support"                => "دعم الضرائب المبيعات العملاء",
-    "date_or_time_format"                       => "تصفية التاريخ والوقت",
-    "datetimeformat"                            => "شكل الوقت و التاريخ",
-    "decimal_point"                             => "العلامة العشرية",
-    "default_barcode_font_size_number"          => "الحجم الافتراضي لخط الباركود لابد أن يكون رقم.",
-    "default_barcode_font_size_required"        => "الحجم الافتراضي لخط الباركود مطلوب.",
-    "default_barcode_height_number"             => "الارتفاع الافتراضي للباركود لابد ان يكون رقم.",
-    "default_barcode_height_required"           => "الارتفاع الافتراضي للباركود مطلوب.",
-    "default_barcode_num_in_row_number"         => "رقم الباركود فى اى سطر لابد ان يكون رقم.",
-    "default_barcode_num_in_row_required"       => "رقم الباركود فى اى سطر مطلوب.",
-    "default_barcode_page_cellspacing_number"   => "المسافة الافتراضية بين خلايا الباركود لابد أن تكون رقم.",
-    "default_barcode_page_cellspacing_required" => "المسافة الافتراضية بين خلايا الباركود مطلوبة.",
-    "default_barcode_page_width_number"         => "عرض الصفحة الافتراضي للباركود لابد ان يكون رقم.",
-    "default_barcode_page_width_required"       => "عرض الصفحة الافتراضي للباركود مطلوب.",
-    "default_barcode_width_number"              => "العرض الافتراضي للباركود لابد ان يكون رقم.",
-    "default_barcode_width_required"            => "العرض الافتراضي للباركود مطلوب.",
-    "default_item_columns"                      => "الخانات المراد إظهارها",
-    "default_origin_tax_code"                   => "كود الضريبة الاساسي الافتراضي",
-    "default_receivings_discount"               => "خصم الإيصالات الافتراضي",
-    "default_receivings_discount_number"        => "خصم الإيصالات الافتراضي يجب ان يكون رقم.",
-    "default_receivings_discount_required"      => "خصم الإيصالات الافتراضي هي خانة اجبارية.",
-    "default_sales_discount"                    => "نسبة الخصم الافتراضية",
-    "default_sales_discount_number"             => "نسبة الخصم الافتراضية لابد ان تكون رقم.",
-    "default_sales_discount_required"           => "نسبة الخصم الافتراضية مطلوبة.",
-    "default_tax_category"                      => "فئة الضرائب الافتراضية",
-    "default_tax_code"                          => "قانون الضرائب الافتراضي",
-    "default_tax_jurisdiction"                  => "الاختصاص الضريبي الافتراضي",
-    "default_tax_name_number"                   => "يجب أن يكون الاسم الافتراضي للضريبة سلسلة.",
-    "default_tax_name_required"                 => "اسم الضريبة الافتراضية مطلوب.",
-    "default_tax_rate"                          => "معدل الضريبة الافتراضي %",
-    "default_tax_rate_1"                        => "معدل الضريبة 1",
-    "default_tax_rate_2"                        => "معدل الضريبة 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "معدل الضريبة الافتراضي يجب أن يكون رقم.",
-    "default_tax_rate_required"                 => "معدل الضريبة الافتراضي مطلوب.",
-    "derive_sale_quantity"                      => "السماح بأسعار البيع المشتقة",
-    "derive_sale_quantity_tooltip"              => "إذا تم تحديدها، فسيتم توفير نوع جديد من الاصناف للاصناف المطلوبة حسب المبلغ الموسع",
-    "dinner_table"                              => "طاولة",
-    "dinner_table_duplicate"                    => "الطاولة يجب ان تكون فريدة.",
-    "dinner_table_enable"                       => "تمكين جداول الطاولات",
-    "dinner_table_invalid_chars"                => "لا يمكن أن يحتوي اسم الطاولة على '_'.",
-    "dinner_table_required"                     => "الطاولة هو حقل مطلوب.",
-    "dot"                                       => "نقطة",
-    "email"                                     => "البريد الإلكتروني",
-    "email_configuration"                       => "إعدادات البريد الإلكتروني",
-    "email_mailpath"                            => "مسار ارسال البريد",
-    "email_protocol"                            => "بروتوكول",
-    "email_receipt_check_behaviour"             => "ارسال رسائل الكترونية",
-    "email_receipt_check_behaviour_always"      => "مختار دائما",
-    "email_receipt_check_behaviour_last"        => "تذكر آخر إختيار",
-    "email_receipt_check_behaviour_never"       => "دائما غير مختار",
-    "email_smtp_crypto"                         => "تشفير SMTP",
-    "email_smtp_host"                           => "خادم SMTP",
-    "email_smtp_pass"                           => "كلمة سر SMTP",
-    "email_smtp_port"                           => "رقم منفذ SMTP",
-    "email_smtp_timeout"                        => "وقت فشل المحاولة (ثوانى) لـ SMTP",
-    "email_smtp_user"                           => "اسم مستخدم SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "فرض نظام الخصوصية",
-    "enforce_privacy_tooltip"                   => "حماية ملفات ومعلومات المستخدم عند الحذف",
-    "fax"                                       => "الفاكس",
-    "file_perm"                                 => "يوجد خطأ في ضبط اعدادات وصلاحيات الملفات نرجوا إعادة الضبط.",
-    "financial_year"                            => "بداية السنة المالية",
-    "financial_year_apr"                        => "1 أبريل",
-    "financial_year_aug"                        => "1 أغسطس",
-    "financial_year_dec"                        => "1 ديسمبر",
-    "financial_year_feb"                        => "1 فبراير",
-    "financial_year_jan"                        => "1 يناير",
-    "financial_year_jul"                        => "1 يوليو",
-    "financial_year_jun"                        => "1 يونيو",
-    "financial_year_mar"                        => "1 مارس",
-    "financial_year_may"                        => "1 مايو",
-    "financial_year_nov"                        => "1 نوفمبر",
-    "financial_year_oct"                        => "1 أكتوبر",
-    "financial_year_sep"                        => "1 سبتمبر",
-    "floating_labels"                           => "تسميات عائمة",
-    "gcaptcha_enable"                           => "صفحة تسجيل الدخول ريكابتشا",
-    "gcaptcha_secret_key"                       => "مفتاح السرية ريكابتشا",
-    "gcaptcha_secret_key_required"              => "مفتاح السرية ريكابتشا هو حقل مطلوب",
-    "gcaptcha_site_key"                         => "ريكابتشا مفتاح الموقع",
-    "gcaptcha_site_key_required"                => "ريكابتشا مفتاح الموقع هو حقل مطلوب",
-    "gcaptcha_tooltip"                          => "احرص على حماية صفحة تسجيل الدخول باستخدام ريكابتشا من غوغل.",
-    "general"                                   => "عام",
-    "general_configuration"                     => "إعدادات عامة",
-    "giftcard_number"                           => "رقم كارت الهدية",
-    "giftcard_random"                           => "توليد عشوائي",
-    "giftcard_series"                           => "توليد في السلسلة",
-    "image_allowed_file_types"                  => "أنواع الملفات المسموح بها",
-    "image_max_height_tooltip"                  => "أقصى ارتفاع مسموح به لتحميلات الصور بالبكسل (بكسل).",
-    "image_max_size_tooltip"                    => "أقصى حجم مسموح به للملف لتحميل الصور (بالكيلو بايت).",
-    "image_max_width_tooltip"                   => "أقصى عرض مسموح به لتحميلات الصور بالبكسل (بكسل).",
-    "image_restrictions"                        => "قيود تحميل الصور",
-    "include_hsn"                               => "تشمل الدعم لرمز نظام منسق",
-    "info"                                      => "معلومات",
-    "info_configuration"                        => "معلومات الشركة",
-    "input_groups"                              => "مجموعات الإدخال",
-    "integrations"                              => "التكامل",
-    "integrations_configuration"                => "تكامل",
-    "invoice"                                   => "الفاتورة",
-    "invoice_configuration"                     => "إعدادات طباعة الفاتورة",
-    "invoice_default_comments"                  => "التعليق الافتراضي على الفاتورة",
-    "invoice_email_message"                     => "قالب البريد الإلكتروني للفاتورة",
-    "invoice_enable"                            => "تفعيل الفوترة",
-    "invoice_printer"                           => "طابعة الفواتير",
-    "invoice_type"                              => "نوع الفاتورة",
-    "is_readable"                               => "يمكن قراءته ، ولكن تم تعيين الأذونات بشكل غير صحيح. يرجى ضبطه على 640 أو 660 والتحديث.",
-    "is_writable"                               => "ممكن التعديل عليه، لكن الصلاحيات هي اكثر من 750. نرجوا الضبط الى 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟",
-    "language"                                  => "اللغة",
-    "last_used_invoice_number"                  => "اخر رقم مستخدم للفاتورة",
-    "last_used_quote_number"                    => "اخر رقم مستخدم لعرض الاسعار",
-    "last_used_work_order_number"               => "آخر رقم مستخدم في طلبات العمل",
-    "left"                                      => "يسار",
-    "license"                                   => "الرخصة",
-    "license_configuration"                     => "نص الرخصة",
-    "line_sequence"                             => "تسلسل خطي",
-    "lines_per_page"                            => "عدد السطور فى الصفحة",
-    "lines_per_page_number"                     => "عدد السطور فى الصفحة يجب أن يكون رقم.",
-    "lines_per_page_required"                   => "عدد السطور فى الصفحة مطلوب.",
-    "locale"                                    => "إقليمية",
-    "locale_configuration"                      => "الإعدادات الإقليمية",
-    "locale_info"                               => "معلومات التهيئة الإقليمية",
-    "location"                                  => "المخزون",
-    "location_configuration"                    => "أماكن المخزون",
-    "location_info"                             => "معلومات تهيئة الأماكن",
-    "login_form"                                => "نمط نموذج تسجيل الدخول",
-    "logout"                                    => "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.",
-    "mailchimp"                                 => "ميل تشامب",
-    "mailchimp_api_key"                         => "مفتاح ميل شيمب",
-    "mailchimp_configuration"                   => "إعدادات ميل شيمب",
-    "mailchimp_key_successfully"                => "نجاح.",
-    "mailchimp_key_unsuccessfully"              => "فشل.",
-    "mailchimp_lists"                           => "قوائم ميل شيمب",
-    "mailchimp_tooltip"                         => "انقر على رمز مفتاح API.",
-    "message"                                   => "الرسائل",
-    "message_configuration"                     => "إعدادات الرسائل",
-    "msg_msg"                                   => "الرسائل النصية المحفوظة",
-    "msg_msg_placeholder"                       => "إذا أردت إستخدام قالب للرسائل القصيرة احفظه هنا. عدا ذلك أترك هذا الحقل فارغ.",
-    "msg_pwd"                                   => "SMS-API كلمة السر لـ",
-    "msg_pwd_required"                          => "مطلوب SMS-API كلمة السر لـ",
-    "msg_src"                                   => "SMS-API كود المرسل لـ",
-    "msg_src_required"                          => "مطلوب SMS-API كود المرسل لـ",
-    "msg_uid"                                   => "SMS-API اسم المستخدم لـ",
-    "msg_uid_required"                          => "مطلوب SMS-API اسم المستخدم لـ",
-    "multi_pack_enabled"                        => "رزم متعددة لكل صنف",
-    "no_risk"                                   => "لا يوجد اي مشاكل في صلاحيات الملفات.",
-    "none"                                      => "لايوجد",
-    "notify_alignment"                          => "مكان عرض رسائل المعلومات",
-    "number_format"                             => "شكل الرقم",
-    "number_locale"                             => "التهيئة الاقليمية",
-    "number_locale_invalid"                     => "التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.",
-    "number_locale_required"                    => "رقم التهيئة الإقليمية مطلوب.",
-    "number_locale_tooltip"                     => "إيجاد تهيئة إقليمية مناسبة عبر الرابط.",
-    "os_timezone"                               => "المنطقة الزمنية OSPOS:",
-    "ospos_info"                                => "معلومات التثبيت OSPOS",
-    "payment_options_order"                     => "ترتيب خيارات الدفع",
-    "perm_risk"                                 => "صلاحيات الملفات ممكن ان تشكل خطر في حال كانت غير صحيحة.",
-    "phone"                                     => "هاتف الشركة",
-    "phone_required"                            => "هاتف الشركة مطلوب.",
-    "print_bottom_margin"                       => "الهامش السفلي",
-    "print_bottom_margin_number"                => "الهامش السفلي يجب أن يكون رقم.",
-    "print_bottom_margin_required"              => "الهامش السفلي مطلوب.",
-    "print_delay_autoreturn"                    => "العودة الى عمليات البيع تلقائيا ( عدد الثواني )",
-    "print_delay_autoreturn_number"             => "الزمن المحدد للعودة الى عمليات البيع هو خانة اجبارية.",
-    "print_delay_autoreturn_required"           => "الزمن المحدد للعودة الى عمليات البيع يجب ان يكون رقم.",
-    "print_footer"                              => "طباعة تذييل المتصفح",
-    "print_header"                              => "طباعة ترويسة المتصفح",
-    "print_left_margin"                         => "الهامش الأيسر",
-    "print_left_margin_number"                  => "الهامش الأيسر يجب ان يكون رقم.",
-    "print_left_margin_required"                => "الهامش الأيسر مطلوب.",
-    "print_receipt_check_behaviour"             => "خانة طباعة الفواتير",
-    "print_receipt_check_behaviour_always"      => "دائما مختار",
-    "print_receipt_check_behaviour_last"        => "تذكر آخر اختيار",
-    "print_receipt_check_behaviour_never"       => "دائما ليس مختار",
-    "print_right_margin"                        => "الهامش الأيمن",
-    "print_right_margin_number"                 => "الهامش الأيمن يجب أن يكون رقم.",
-    "print_right_margin_required"               => "الهامش الأيمن مطلوب.",
-    "print_silently"                            => "عرض صندوق حوار طباعة",
-    "print_top_margin"                          => "الهامش العلوى",
-    "print_top_margin_number"                   => "الهامش العلوى يجب أن يكون رقم.",
-    "print_top_margin_required"                 => "الهامش العلوى مطلوب.",
-    "quantity_decimals"                         => "العلامة العشرية للكمية",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "ملاحظات طلبات العمل الثابتة",
-    "receipt"                                   => "الإيصال",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "إعدادات طباعة الايصالات",
-    "receipt_default"                           => "افتراضى",
-    "receipt_font_size"                         => "الخط",
-    "receipt_font_size_number"                  => "رقم الخط يجب ان يكون رقم.",
-    "receipt_font_size_required"                => "رقم الخط مطلوب.",
-    "receipt_info"                              => "معلومات تهيئة الإيصالات",
-    "receipt_printer"                           => "طابعة تذاكر",
-    "receipt_short"                             => "مختصر",
-    "receipt_show_company_name"                 => "عرض اسم الشركة",
-    "receipt_show_description"                  => "عرض الوصف",
-    "receipt_show_serialnumber"                 => "عرض الرقم المسلسل",
-    "receipt_show_tax_ind"                      => "عرض مؤشر الضريبة",
-    "receipt_show_taxes"                        => "عرض الضرائب",
-    "receipt_show_total_discount"               => "عرض إجمالى الخصم",
-    "receipt_template"                          => "قالب الايصال",
-    "receiving_calculate_average_price"         => "حساب متوسط سعر الأصناف المستلمة",
-    "recv_invoice_format"                       => "شكل فاتورة الإستلام",
-    "register_mode_default"                     => "نمط التسجيل الافتراضي",
-    "report_an_issue"                           => "بلغ عن خطأ",
-    "return_policy_required"                    => "سياسة الإسترجاع مطلوب.",
-    "reward"                                    => "المكافاة",
-    "reward_configuration"                      => "اعدادات المكافاة",
-    "right"                                     => "يمين",
-    "sales_invoice_format"                      => "شكل فاتورة البيع",
-    "sales_quote_format"                        => "شكل فاتورة عرض الاسعار",
-    "saved_successfully"                        => "تم حفظ التهيئة بنجاح.",
-    "saved_unsuccessfully"                      => "لم يتم حفظ التهيئة بنجاح.",
-    "security_issue"                            => "تحذير من ثغرة أمنية",
-    "server_notice"                             => "يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "اظهار ايكونة المكتب",
-    "statistics"                                => "إرسال اﻹحصائيات",
-    "statistics_tooltip"                        => "إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.",
-    "stock_location"                            => "مكان المخزون",
-    "stock_location_duplicate"                  => "من فضلك إستخدم اسم مكان غير مكرر.",
-    "stock_location_invalid_chars"              => "مكان المخزون لايمكن أن يحتوى على '_'.",
-    "stock_location_required"                   => "مكان المخزون مطلوب.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "العامود 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "تخطيط اقتراحات البحث",
-    "suggestions_second_column"                 => "العامود 2",
-    "suggestions_third_column"                  => "العامود 3",
-    "system_conf"                               => "اعدادات اخرى",
-    "system_info"                               => "System Info",
-    "table"                                     => "جدول",
-    "table_configuration"                       => "اعدادات الجدول",
-    "takings_printer"                           => "طابعة الإيراد",
-    "tax"                                       => "الضريبة",
-    "tax_category"                              => "تصنيف الضريبة",
-    "tax_category_duplicate"                    => "الفئة الضريبية اللتي تم ادخالها موجودة.",
-    "tax_category_invalid_chars"                => "الفئة الضريبية اللتي تم ادخالها غير صحيحة.",
-    "tax_category_required"                     => "الفئة الضريبية مطلوبة.",
-    "tax_category_used"                         => "الفئة الضريبية اللتي تم تحديدها لا يمكن حذفها لانها قيد الاستعمال.",
-    "tax_configuration"                         => "إعدادات الضريبة",
-    "tax_decimals"                              => "العلامة العشرية للضريبة",
-    "tax_id"                                    => "الرقم الضريبي",
-    "tax_included"                              => "شامل الضريبة",
-    "theme"                                     => "السمة",
-    "theme_preview"                             => "معاينة المظهر:",
-    "thousands_separator"                       => "فاصل الاف",
-    "timezone"                                  => "المنطقة الزمنية",
-    "timezone_error"                            => "تختلف منطقة OSPOS الزمنية عن منطقتك الزمنية المحلية.",
-    "top"                                       => "علوى",
-    "use_destination_based_tax"                 => "استخدام الضريبة المستندة على الوجهة",
-    "user_timezone"                             => "المنطقة الزمنية المحلية:",
-    "website"                                   => "موقع الشركة",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "تفعيل طلبات العمل",
-    "work_order_format"                         => "شكل طلبات العمل",
+    'address'                                   => 'عنوان الشركة',
+    'address_required'                          => 'عنوان الشركة مطلوب.',
+    'all_set'                                   => 'صلاحيات الملفات مضبطة بالطريقه الصحيحه!',
+    'allow_duplicate_barcodes'                  => 'السماح بتشابة الباركود',
+    'apostrophe'                                => 'الفاصلة',
+    'backup_button'                             => 'نسخ إحتياطى',
+    'backup_database'                           => 'نسخ إحتياطى لقاعدة البيانات',
+    'barcode'                                   => 'باركود',
+    'barcode_company'                           => 'اسم الشركة',
+    'barcode_configuration'                     => 'اعدادات الباركود',
+    'barcode_content'                           => 'محتويات الباركود',
+    'barcode_first_row'                         => 'الصف 1',
+    'barcode_font'                              => 'الخط',
+    'barcode_formats'                           => 'اشكال الادخال',
+    'barcode_generate_if_empty'                 => 'توليد اذا كان الباركود فارغ.',
+    'barcode_height'                            => 'الارتفاع (px)',
+    'barcode_id'                                => 'كود/اسم الصنف',
+    'barcode_info'                              => 'معلومات اعدادات الباركود',
+    'barcode_layout'                            => 'تخطيط الباركود',
+    'barcode_name'                              => 'الاسم',
+    'barcode_number'                            => 'الباركود UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'الرقم فى الصف',
+    'barcode_page_cellspacing'                  => 'المسافة بين الخلايا فى صفحة العرض.',
+    'barcode_page_width'                        => 'عرض الصفحة',
+    'barcode_price'                             => 'السعر',
+    'barcode_second_row'                        => 'الصف 2',
+    'barcode_third_row'                         => 'الصف 3',
+    'barcode_tooltip'                           => 'تحذير: قد تؤدي هذه الميزة إلى استيراد اصناف مكررة أو إنشاؤها. لا تستخدمها إذا كنت لا تريد الباركود مكررة.',
+    'barcode_type'                              => 'نوعية الباركود',
+    'barcode_width'                             => 'العرض (px)',
+    'bottom'                                    => 'الأسفل',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'فواصل النقدية',
+    'cash_decimals_tooltip'                     => 'إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.',
+    'cash_rounding'                             => 'التقريب النقدي',
+    'category_dropdown'                         => 'إظهار الفئة كقائمة منسدلة',
+    'center'                                    => 'الوسط',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'فاصلة',
+    'company'                                   => 'اسم الشركة',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'تغيير الصورة',
+    'company_logo'                              => 'شعار الشركة',
+    'company_remove_image'                      => 'إزالة الصورة',
+    'company_required'                          => 'اسم الشركة مطلوب',
+    'company_select_image'                      => 'اختار صورة',
+    'company_website_url'                       => 'الموقع الإلكترونى للشركة غير صحيح.',
+    'country_codes'                             => 'أكواد الدولة',
+    'country_codes_tooltip'                     => 'قائمة مفصولة بفاصلة لاسماء الدول للبحث.',
+    'currency_code'                             => 'رمز العملة',
+    'currency_decimals'                         => 'العلامة العشرية للعملة',
+    'currency_symbol'                           => 'رمز العملة',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'المكافآت',
+    'customer_reward_duplicate'                 => 'المكافئة يجب ان تكون فريدة.',
+    'customer_reward_enable'                    => 'تمكين مكافآت العميل',
+    'customer_reward_invalid_chars'             => "لا يمكن أن تحتوي المكافأة على '_'",
+    'customer_reward_required'                  => 'المكافأة هي حقل مطلوب',
+    'customer_sales_tax_support'                => 'دعم الضرائب المبيعات العملاء',
+    'date_or_time_format'                       => 'تصفية التاريخ والوقت',
+    'datetimeformat'                            => 'شكل الوقت و التاريخ',
+    'decimal_point'                             => 'العلامة العشرية',
+    'default_barcode_font_size_number'          => 'الحجم الافتراضي لخط الباركود لابد أن يكون رقم.',
+    'default_barcode_font_size_required'        => 'الحجم الافتراضي لخط الباركود مطلوب.',
+    'default_barcode_height_number'             => 'الارتفاع الافتراضي للباركود لابد ان يكون رقم.',
+    'default_barcode_height_required'           => 'الارتفاع الافتراضي للباركود مطلوب.',
+    'default_barcode_num_in_row_number'         => 'رقم الباركود فى اى سطر لابد ان يكون رقم.',
+    'default_barcode_num_in_row_required'       => 'رقم الباركود فى اى سطر مطلوب.',
+    'default_barcode_page_cellspacing_number'   => 'المسافة الافتراضية بين خلايا الباركود لابد أن تكون رقم.',
+    'default_barcode_page_cellspacing_required' => 'المسافة الافتراضية بين خلايا الباركود مطلوبة.',
+    'default_barcode_page_width_number'         => 'عرض الصفحة الافتراضي للباركود لابد ان يكون رقم.',
+    'default_barcode_page_width_required'       => 'عرض الصفحة الافتراضي للباركود مطلوب.',
+    'default_barcode_width_number'              => 'العرض الافتراضي للباركود لابد ان يكون رقم.',
+    'default_barcode_width_required'            => 'العرض الافتراضي للباركود مطلوب.',
+    'default_item_columns'                      => 'الخانات المراد إظهارها',
+    'default_origin_tax_code'                   => 'كود الضريبة الاساسي الافتراضي',
+    'default_receivings_discount'               => 'خصم الإيصالات الافتراضي',
+    'default_receivings_discount_number'        => 'خصم الإيصالات الافتراضي يجب ان يكون رقم.',
+    'default_receivings_discount_required'      => 'خصم الإيصالات الافتراضي هي خانة اجبارية.',
+    'default_sales_discount'                    => 'نسبة الخصم الافتراضية',
+    'default_sales_discount_number'             => 'نسبة الخصم الافتراضية لابد ان تكون رقم.',
+    'default_sales_discount_required'           => 'نسبة الخصم الافتراضية مطلوبة.',
+    'default_tax_category'                      => 'فئة الضرائب الافتراضية',
+    'default_tax_code'                          => 'قانون الضرائب الافتراضي',
+    'default_tax_jurisdiction'                  => 'الاختصاص الضريبي الافتراضي',
+    'default_tax_name_number'                   => 'يجب أن يكون الاسم الافتراضي للضريبة سلسلة.',
+    'default_tax_name_required'                 => 'اسم الضريبة الافتراضية مطلوب.',
+    'default_tax_rate'                          => 'معدل الضريبة الافتراضي %',
+    'default_tax_rate_1'                        => 'معدل الضريبة 1',
+    'default_tax_rate_2'                        => 'معدل الضريبة 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'معدل الضريبة الافتراضي يجب أن يكون رقم.',
+    'default_tax_rate_required'                 => 'معدل الضريبة الافتراضي مطلوب.',
+    'derive_sale_quantity'                      => 'السماح بأسعار البيع المشتقة',
+    'derive_sale_quantity_tooltip'              => 'إذا تم تحديدها، فسيتم توفير نوع جديد من الاصناف للاصناف المطلوبة حسب المبلغ الموسع',
+    'dinner_table'                              => 'طاولة',
+    'dinner_table_duplicate'                    => 'الطاولة يجب ان تكون فريدة.',
+    'dinner_table_enable'                       => 'تمكين جداول الطاولات',
+    'dinner_table_invalid_chars'                => "لا يمكن أن يحتوي اسم الطاولة على '_'.",
+    'dinner_table_required'                     => 'الطاولة هو حقل مطلوب.',
+    'dot'                                       => 'نقطة',
+    'email'                                     => 'البريد الإلكتروني',
+    'email_configuration'                       => 'إعدادات البريد الإلكتروني',
+    'email_mailpath'                            => 'مسار ارسال البريد',
+    'email_protocol'                            => 'بروتوكول',
+    'email_receipt_check_behaviour'             => 'ارسال رسائل الكترونية',
+    'email_receipt_check_behaviour_always'      => 'مختار دائما',
+    'email_receipt_check_behaviour_last'        => 'تذكر آخر إختيار',
+    'email_receipt_check_behaviour_never'       => 'دائما غير مختار',
+    'email_smtp_crypto'                         => 'تشفير SMTP',
+    'email_smtp_host'                           => 'خادم SMTP',
+    'email_smtp_pass'                           => 'كلمة سر SMTP',
+    'email_smtp_port'                           => 'رقم منفذ SMTP',
+    'email_smtp_timeout'                        => 'وقت فشل المحاولة (ثوانى) لـ SMTP',
+    'email_smtp_user'                           => 'اسم مستخدم SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'فرض نظام الخصوصية',
+    'enforce_privacy_tooltip'                   => 'حماية ملفات ومعلومات المستخدم عند الحذف',
+    'fax'                                       => 'الفاكس',
+    'file_perm'                                 => 'يوجد خطأ في ضبط اعدادات وصلاحيات الملفات نرجوا إعادة الضبط.',
+    'financial_year'                            => 'بداية السنة المالية',
+    'financial_year_apr'                        => '1 أبريل',
+    'financial_year_aug'                        => '1 أغسطس',
+    'financial_year_dec'                        => '1 ديسمبر',
+    'financial_year_feb'                        => '1 فبراير',
+    'financial_year_jan'                        => '1 يناير',
+    'financial_year_jul'                        => '1 يوليو',
+    'financial_year_jun'                        => '1 يونيو',
+    'financial_year_mar'                        => '1 مارس',
+    'financial_year_may'                        => '1 مايو',
+    'financial_year_nov'                        => '1 نوفمبر',
+    'financial_year_oct'                        => '1 أكتوبر',
+    'financial_year_sep'                        => '1 سبتمبر',
+    'floating_labels'                           => 'تسميات عائمة',
+    'gcaptcha_enable'                           => 'صفحة تسجيل الدخول ريكابتشا',
+    'gcaptcha_secret_key'                       => 'مفتاح السرية ريكابتشا',
+    'gcaptcha_secret_key_required'              => 'مفتاح السرية ريكابتشا هو حقل مطلوب',
+    'gcaptcha_site_key'                         => 'ريكابتشا مفتاح الموقع',
+    'gcaptcha_site_key_required'                => 'ريكابتشا مفتاح الموقع هو حقل مطلوب',
+    'gcaptcha_tooltip'                          => 'احرص على حماية صفحة تسجيل الدخول باستخدام ريكابتشا من غوغل.',
+    'general'                                   => 'عام',
+    'general_configuration'                     => 'إعدادات عامة',
+    'giftcard_number'                           => 'رقم كارت الهدية',
+    'giftcard_random'                           => 'توليد عشوائي',
+    'giftcard_series'                           => 'توليد في السلسلة',
+    'image_allowed_file_types'                  => 'أنواع الملفات المسموح بها',
+    'image_max_height_tooltip'                  => 'أقصى ارتفاع مسموح به لتحميلات الصور بالبكسل (بكسل).',
+    'image_max_size_tooltip'                    => 'أقصى حجم مسموح به للملف لتحميل الصور (بالكيلو بايت).',
+    'image_max_width_tooltip'                   => 'أقصى عرض مسموح به لتحميلات الصور بالبكسل (بكسل).',
+    'image_restrictions'                        => 'قيود تحميل الصور',
+    'include_hsn'                               => 'تشمل الدعم لرمز نظام منسق',
+    'info'                                      => 'معلومات',
+    'info_configuration'                        => 'معلومات الشركة',
+    'input_groups'                              => 'مجموعات الإدخال',
+    'integrations'                              => 'التكامل',
+    'integrations_configuration'                => 'تكامل',
+    'invoice'                                   => 'الفاتورة',
+    'invoice_configuration'                     => 'إعدادات طباعة الفاتورة',
+    'invoice_default_comments'                  => 'التعليق الافتراضي على الفاتورة',
+    'invoice_email_message'                     => 'قالب البريد الإلكتروني للفاتورة',
+    'invoice_enable'                            => 'تفعيل الفوترة',
+    'invoice_printer'                           => 'طابعة الفواتير',
+    'invoice_type'                              => 'نوع الفاتورة',
+    'is_readable'                               => 'يمكن قراءته ، ولكن تم تعيين الأذونات بشكل غير صحيح. يرجى ضبطه على 640 أو 660 والتحديث.',
+    'is_writable'                               => 'ممكن التعديل عليه، لكن الصلاحيات هي اكثر من 750. نرجوا الضبط الى 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟',
+    'language'                                  => 'اللغة',
+    'last_used_invoice_number'                  => 'اخر رقم مستخدم للفاتورة',
+    'last_used_quote_number'                    => 'اخر رقم مستخدم لعرض الاسعار',
+    'last_used_work_order_number'               => 'آخر رقم مستخدم في طلبات العمل',
+    'left'                                      => 'يسار',
+    'license'                                   => 'الرخصة',
+    'license_configuration'                     => 'نص الرخصة',
+    'line_sequence'                             => 'تسلسل خطي',
+    'lines_per_page'                            => 'عدد السطور فى الصفحة',
+    'lines_per_page_number'                     => 'عدد السطور فى الصفحة يجب أن يكون رقم.',
+    'lines_per_page_required'                   => 'عدد السطور فى الصفحة مطلوب.',
+    'locale'                                    => 'إقليمية',
+    'locale_configuration'                      => 'الإعدادات الإقليمية',
+    'locale_info'                               => 'معلومات التهيئة الإقليمية',
+    'location'                                  => 'المخزون',
+    'location_configuration'                    => 'أماكن المخزون',
+    'location_info'                             => 'معلومات تهيئة الأماكن',
+    'login_form'                                => 'نمط نموذج تسجيل الدخول',
+    'logout'                                    => 'هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.',
+    'mailchimp'                                 => 'ميل تشامب',
+    'mailchimp_api_key'                         => 'مفتاح ميل شيمب',
+    'mailchimp_configuration'                   => 'إعدادات ميل شيمب',
+    'mailchimp_key_successfully'                => 'نجاح.',
+    'mailchimp_key_unsuccessfully'              => 'فشل.',
+    'mailchimp_lists'                           => 'قوائم ميل شيمب',
+    'mailchimp_tooltip'                         => 'انقر على رمز مفتاح API.',
+    'message'                                   => 'الرسائل',
+    'message_configuration'                     => 'إعدادات الرسائل',
+    'msg_msg'                                   => 'الرسائل النصية المحفوظة',
+    'msg_msg_placeholder'                       => 'إذا أردت إستخدام قالب للرسائل القصيرة احفظه هنا. عدا ذلك أترك هذا الحقل فارغ.',
+    'msg_pwd'                                   => 'SMS-API كلمة السر لـ',
+    'msg_src'                                   => 'SMS-API كود المرسل لـ',
+    'msg_src_required'                          => 'مطلوب SMS-API كود المرسل لـ',
+    'msg_uid'                                   => 'SMS-API اسم المستخدم لـ',
+    'msg_uid_required'                          => 'مطلوب SMS-API اسم المستخدم لـ',
+    'multi_pack_enabled'                        => 'رزم متعددة لكل صنف',
+    'no_risk'                                   => 'لا يوجد اي مشاكل في صلاحيات الملفات.',
+    'none'                                      => 'لايوجد',
+    'notify_alignment'                          => 'مكان عرض رسائل المعلومات',
+    'number_format'                             => 'شكل الرقم',
+    'number_locale'                             => 'التهيئة الاقليمية',
+    'number_locale_invalid'                     => 'التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.',
+    'number_locale_required'                    => 'رقم التهيئة الإقليمية مطلوب.',
+    'number_locale_tooltip'                     => 'إيجاد تهيئة إقليمية مناسبة عبر الرابط.',
+    'os_timezone'                               => 'المنطقة الزمنية OSPOS:',
+    'ospos_info'                                => 'معلومات التثبيت OSPOS',
+    'payment_options_order'                     => 'ترتيب خيارات الدفع',
+    'payment_reference_code_length_limits'      => 'رمز مرجع الدفع<br>حدود الطول',
+    'payment_reference_code_length_max_label'   => 'الحد الأقصى',
+    'payment_reference_code_length_min_label'   => 'الحد الأدنى',
+    'perm_risk'                                 => 'صلاحيات الملفات ممكن ان تشكل خطر في حال كانت غير صحيحة.',
+    'phone'                                     => 'هاتف الشركة',
+    'phone_required'                            => 'هاتف الشركة مطلوب.',
+    'print_bottom_margin'                       => 'الهامش السفلي',
+    'print_bottom_margin_number'                => 'الهامش السفلي يجب أن يكون رقم.',
+    'print_bottom_margin_required'              => 'الهامش السفلي مطلوب.',
+    'print_delay_autoreturn'                    => 'العودة الى عمليات البيع تلقائيا ( عدد الثواني )',
+    'print_delay_autoreturn_number'             => 'الزمن المحدد للعودة الى عمليات البيع هو خانة اجبارية.',
+    'print_delay_autoreturn_required'           => 'الزمن المحدد للعودة الى عمليات البيع يجب ان يكون رقم.',
+    'print_footer'                              => 'طباعة تذييل المتصفح',
+    'print_header'                              => 'طباعة ترويسة المتصفح',
+    'print_left_margin'                         => 'الهامش الأيسر',
+    'print_left_margin_number'                  => 'الهامش الأيسر يجب ان يكون رقم.',
+    'print_left_margin_required'                => 'الهامش الأيسر مطلوب.',
+    'print_receipt_check_behaviour'             => 'خانة طباعة الفواتير',
+    'print_receipt_check_behaviour_always'      => 'دائما مختار',
+    'print_receipt_check_behaviour_last'        => 'تذكر آخر اختيار',
+    'print_receipt_check_behaviour_never'       => 'دائما ليس مختار',
+    'print_right_margin'                        => 'الهامش الأيمن',
+    'print_right_margin_number'                 => 'الهامش الأيمن يجب أن يكون رقم.',
+    'print_right_margin_required'               => 'الهامش الأيمن مطلوب.',
+    'print_silently'                            => 'عرض صندوق حوار طباعة',
+    'print_top_margin'                          => 'الهامش العلوى',
+    'print_top_margin_number'                   => 'الهامش العلوى يجب أن يكون رقم.',
+    'print_top_margin_required'                 => 'الهامش العلوى مطلوب.',
+    'quantity_decimals'                         => 'العلامة العشرية للكمية',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'ملاحظات طلبات العمل الثابتة',
+    'receipt'                                   => 'الإيصال',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'إعدادات طباعة الايصالات',
+    'receipt_default'                           => 'افتراضى',
+    'receipt_font_size'                         => 'الخط',
+    'receipt_font_size_number'                  => 'رقم الخط يجب ان يكون رقم.',
+    'receipt_font_size_required'                => 'رقم الخط مطلوب.',
+    'receipt_info'                              => 'معلومات تهيئة الإيصالات',
+    'receipt_printer'                           => 'طابعة تذاكر',
+    'receipt_short'                             => 'مختصر',
+    'receipt_show_company_name'                 => 'عرض اسم الشركة',
+    'receipt_show_description'                  => 'عرض الوصف',
+    'receipt_show_serialnumber'                 => 'عرض الرقم المسلسل',
+    'receipt_show_tax_ind'                      => 'عرض مؤشر الضريبة',
+    'receipt_show_taxes'                        => 'عرض الضرائب',
+    'receipt_show_total_discount'               => 'عرض إجمالى الخصم',
+    'receipt_template'                          => 'قالب الايصال',
+    'receiving_calculate_average_price'         => 'حساب متوسط سعر الأصناف المستلمة',
+    'recv_invoice_format'                       => 'شكل فاتورة الإستلام',
+    'register_mode_default'                     => 'نمط التسجيل الافتراضي',
+    'report_an_issue'                           => 'بلغ عن خطأ',
+    'return_policy_required'                    => 'سياسة الإسترجاع مطلوب.',
+    'reward'                                    => 'المكافاة',
+    'reward_configuration'                      => 'اعدادات المكافاة',
+    'right'                                     => 'يمين',
+    'sales_invoice_format'                      => 'شكل فاتورة البيع',
+    'sales_quote_format'                        => 'شكل فاتورة عرض الاسعار',
+    'mailpath_invalid'                          => 'مسار sendmail غير صالح. يُسمح فقط بالحروف والأرقام والشرطات والشرطات السفلية والشرطات المائلة والشرطات المائلة العكسية والنقطتين الرأسيتين والمسافات والنقاط.',
+    'saved_successfully'                        => 'تم حفظ التهيئة بنجاح.',
+    'saved_unsuccessfully'                      => 'لم يتم حفظ التهيئة بنجاح.',
+    'security_issue'                            => 'تحذير من ثغرة أمنية',
+    'server_notice'                             => 'يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'اظهار ايكونة المكتب',
+    'statistics'                                => 'إرسال اﻹحصائيات',
+    'statistics_tooltip'                        => 'إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.',
+    'stock_location'                            => 'مكان المخزون',
+    'stock_location_duplicate'                  => 'من فضلك إستخدم اسم مكان غير مكرر.',
+    'stock_location_invalid_chars'              => "مكان المخزون لايمكن أن يحتوى على '_'.",
+    'stock_location_required'                   => 'مكان المخزون مطلوب.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'العامود 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'تخطيط اقتراحات البحث',
+    'suggestions_second_column'                 => 'العامود 2',
+    'suggestions_third_column'                  => 'العامود 3',
+    'system_conf'                               => 'اعدادات اخرى',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'جدول',
+    'table_configuration'                       => 'اعدادات الجدول',
+    'takings_printer'                           => 'طابعة الإيراد',
+    'tax'                                       => 'الضريبة',
+    'tax_category'                              => 'تصنيف الضريبة',
+    'tax_category_duplicate'                    => 'الفئة الضريبية اللتي تم ادخالها موجودة.',
+    'tax_category_invalid_chars'                => 'الفئة الضريبية اللتي تم ادخالها غير صحيحة.',
+    'tax_category_required'                     => 'الفئة الضريبية مطلوبة.',
+    'tax_category_used'                         => 'الفئة الضريبية اللتي تم تحديدها لا يمكن حذفها لانها قيد الاستعمال.',
+    'tax_configuration'                         => 'إعدادات الضريبة',
+    'tax_decimals'                              => 'العلامة العشرية للضريبة',
+    'tax_id'                                    => 'الرقم الضريبي',
+    'tax_included'                              => 'شامل الضريبة',
+    'theme'                                     => 'السمة',
+    'theme_preview'                             => 'معاينة المظهر:',
+    'thousands_separator'                       => 'فاصل الاف',
+    'timezone'                                  => 'المنطقة الزمنية',
+    'timezone_error'                            => 'تختلف منطقة OSPOS الزمنية عن منطقتك الزمنية المحلية.',
+    'top'                                       => 'علوى',
+    'use_destination_based_tax'                 => 'استخدام الضريبة المستندة على الوجهة',
+    'user_timezone'                             => 'المنطقة الزمنية المحلية:',
+    'website'                                   => 'موقع الشركة',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'تفعيل طلبات العمل',
+    'work_order_format'                         => 'شكل طلبات العمل',
 ];
diff --git a/app/Language/ar-LB/Employees.php b/app/Language/ar-LB/Employees.php
index 3429d9986..134ef251a 100644
--- a/app/Language/ar-LB/Employees.php
+++ b/app/Language/ar-LB/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "المعلومات الأساسية للموظف",
-    "cannot_be_deleted"            => "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).",
-    "change_employee"              => "",
-    "change_password"              => "تغيير كلمة المرور",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "هل أنت متأكد أنك تريد حذف الموظفين المختارين؟",
-    "confirm_restore"              => "هل انت متاكد من استعادة الموظفين المحددين؟",
-    "current_password"             => "كلمة المرور الحالية",
-    "current_password_invalid"     => "كلمة المرور الحالية غير صحيحة.",
-    "employee"                     => "موظف",
-    "error_adding_updating"        => "خطاء فى إضافة/تعديل موظف.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "لايمكن حذف المستخدم admin الخاص بنسخة العرض.",
-    "error_updating_demo_admin"    => "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.",
-    "language"                     => "اللغة",
-    "login_info"                   => "معلومات دخول الموظف",
-    "manager"                      => "",
-    "new"                          => "موظف جديد",
-    "none_selected"                => "لم تختار أى من الموظفين للحذف.",
-    "one_or_multiple"              => "موظف/موظفين",
-    "password"                     => "كلمة السر",
-    "password_minlength"           => "كلمة السر يجب أن تكون 8 حروف على الأقل.",
-    "password_must_match"          => "كلمتى السر لا تتطابقان.",
-    "password_not_must_match"      => "كلمة المرور الحالية والجديدة يجب ان يكونو فريدين.",
-    "password_required"            => "كلمة السر مطلوبة.",
-    "permission_desc"              => "قم بإضافة الصلاحيات بلإختيار من الأسفل.",
-    "permission_info"              => "اذونات المستخدمين",
-    "repeat_password"              => "كلمة السر مرة اخرى",
-    "subpermission_required"       => "يجب إختيار صلاحية واحدة على الأقل لكل قسم.",
-    "successful_adding"            => "لقد تم إضافة الموظف بنجاح.",
-    "successful_change_password"   => "تم تغيير كلمة المرور بنجاح.",
-    "successful_deleted"           => "لقد تم حذف الموظف بنجاح",
-    "successful_updating"          => "لقد تم تحديث بيانات الموظف بنجاح",
-    "system_language"              => "لغة النظام",
-    "unsuccessful_change_password" => "فشل في تغيير كلمة المرور.",
-    "update"                       => "تحديث بيانات موظف",
-    "username"                     => "اسم المستخدم",
-    "username_duplicate"           => "حساب المحدد هو موجود في قاعدة البيانات. نرجوا استخدام اسم حساب مختلف.",
-    "username_minlength"           => "اسم المستخدم يجب أن يكون 5 حروف على الأقل.",
-    "username_required"            => "اسم المستخدم مطلوب.",
+    'administrator'                          => '',
+    'basic_information'                      => 'المعلومات الأساسية للموظف',
+    'cannot_be_deleted'                      => 'لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).',
+    'change_employee'                        => '',
+    'change_password'                        => 'تغيير كلمة المرور',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'هل أنت متأكد أنك تريد حذف الموظفين المختارين؟',
+    'confirm_restore'                        => 'هل انت متاكد من استعادة الموظفين المحددين؟',
+    'current_password'                       => 'كلمة المرور الحالية',
+    'current_password_invalid'               => 'كلمة المرور الحالية غير صحيحة.',
+    'employee'                               => 'موظف',
+    'error_adding_updating'                  => 'خطاء فى إضافة/تعديل موظف.',
+    'error_cannot_remove_own_minimum_grant'  => 'ما فيك تشيل الحد الأدنى من صلاحيات الوصول للموديولات تبعتك.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'لايمكن حذف المستخدم admin الخاص بنسخة العرض.',
+    'error_grant_change_disallowed'          => 'تم تعطيل تغييرات المنح في هذه النسخة التجريبية.',
+    'error_password_change_disallowed'       => 'تم تعطيل تغييرات كلمة المرور في هذه النسخة التجريبية.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.',
+    'language'                               => 'اللغة',
+    'login_info'                             => 'معلومات دخول الموظف',
+    'manager'                                => '',
+    'new'                                    => 'موظف جديد',
+    'none_selected'                          => 'لم تختار أى من الموظفين للحذف.',
+    'one_or_multiple'                        => 'موظف/موظفين',
+    'password'                               => 'كلمة السر',
+    'password_minlength'                     => 'كلمة السر يجب أن تكون 8 حروف على الأقل.',
+    'password_must_match'                    => 'كلمتى السر لا تتطابقان.',
+    'password_not_must_match'                => 'كلمة المرور الحالية والجديدة يجب ان يكونو فريدين.',
+    'password_required'                      => 'كلمة السر مطلوبة.',
+    'permission_desc'                        => 'قم بإضافة الصلاحيات بلإختيار من الأسفل.',
+    'permission_info'                        => 'اذونات المستخدمين',
+    'repeat_password'                        => 'كلمة السر مرة اخرى',
+    'subpermission_required'                 => 'يجب إختيار صلاحية واحدة على الأقل لكل قسم.',
+    'successful_adding'                      => 'لقد تم إضافة الموظف بنجاح.',
+    'successful_change_password'             => 'تم تغيير كلمة المرور بنجاح.',
+    'successful_deleted'                     => 'لقد تم حذف الموظف بنجاح',
+    'successful_updating'                    => 'لقد تم تحديث بيانات الموظف بنجاح',
+    'system_language'                        => 'لغة النظام',
+    'unsuccessful_change_password'           => 'فشل في تغيير كلمة المرور.',
+    'update'                                 => 'تحديث بيانات موظف',
+    'username'                               => 'اسم المستخدم',
+    'username_duplicate'                     => 'حساب المحدد هو موجود في قاعدة البيانات. نرجوا استخدام اسم حساب مختلف.',
+    'username_minlength'                     => 'اسم المستخدم يجب أن يكون 5 حروف على الأقل.',
+    'username_required'                      => 'اسم المستخدم مطلوب.',
 ];
diff --git a/app/Language/ar-LB/Error.php b/app/Language/ar-LB/Error.php
index 9c63bccaa..16e700537 100644
--- a/app/Language/ar-LB/Error.php
+++ b/app/Language/ar-LB/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "ليس لديك صلاحيات للوصول لهذا القسم",
-    "unknown"              => "غير معروف",
+    'no_permission_module'           => 'ليس لديك صلاحيات للوصول لهذا القسم',
+    'unable_to_create_env_file'      => 'تعذر إنشاء {filePath} لتوفير throttle.key',
+    'unable_to_lock_file'            => 'تعذر قفل {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'تعذر فتح {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'تعذر حفظ throttle.key في {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'تعذر قراءة {filePath} لتوفير throttle.key',
+    'unknown'                        => 'غير معروف',
 ];
diff --git a/app/Language/ar-LB/Items.php b/app/Language/ar-LB/Items.php
index 29687a579..6b6046e73 100644
--- a/app/Language/ar-LB/Items.php
+++ b/app/Language/ar-LB/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "الكمية المطلوب خصمها أو اضافتها.",
-    "allow_alt_description"              => "السماح بوصف بديل",
-    "amount_entry"                       => "إدخال القيمة",
-    "bulk_edit"                          => "تحرير جماعى",
-    "buy_price_required"                 => "سعر الشراء مطلوب.",
-    "cannot_be_deleted"                  => "لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات.",
-    "cannot_find_item"                   => "لايمكن ايجاد معلومات حول الصنف.",
-    "categories"                         => "",
-    "category"                           => "التصنيف",
-    "category_new"                       => "",
-    "category_required"                  => "التصنيف مطلوب.",
-    "change_all_to_allow_alt_desc"       => "السماح بوصف بديل للجميع.",
-    "change_all_to_not_allow_allow_desc" => "عدم السماح بوصف بديل للجميع.",
-    "change_all_to_serialized"           => "تغير الجميع لمتسلسل",
-    "change_all_to_unserialized"         => "تغيير الجميع لغير متسلسل",
-    "change_image"                       => "تغيير الصورة",
-    "confirm_bulk_edit"                  => "هل أنت متأكد انك تريد تحرير كل الأصناف المختارة؟",
-    "confirm_bulk_edit_wipe_taxes"       => "سوف يتم مسح معلومات الضرائب لجميع الأصناف.",
-    "confirm_delete"                     => "هل أنت متأكد انك تريد حذف كل الأصناف المختارة؟",
-    "confirm_restore"                    => "هل انت متاكد من إستعادة الاصناف المخطارة؟",
-    "cost_price"                         => "سعر التكلفة",
-    "cost_price_number"                  => "سعر التكلفة يجب أن يكون رقم.",
-    "cost_price_required"                => "سعر التكلفة مطلوب.",
-    "count"                              => "تحديث المخزون",
-    "csv_import_failed"                  => "فشل الإستيراد من اكسل",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.",
-    "csv_import_partially_failed"        => "يوجد خطأ بنسبة {0} في استيراد الاصناف في السطر: {1}. لم يتم استيرادهم.",
-    "csv_import_success"                 => "تم استيراد الأصناف بنجاح.",
-    "current_quantity"                   => "الكمية الحالية",
-    "default_pack_name"                  => "كل",
-    "description"                        => "الوصف",
-    "details_count"                      => "حركة الصنف",
-    "do_nothing"                         => "لاتفعل شئ",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة.",
-    "edit_multiple_items"                => "تحريد مجموعة اصناف",
-    "empty_upc_items"                    => "تفريغ اصناف UPC",
-    "error_adding_updating"              => "خطاء فى إضافة/تحديث صنف",
-    "error_updating_multiple"            => "خطاء فى تحديث بيانات أصناف",
-    "generate_barcodes"                  => "توليد أكواد الباركود",
-    "hsn_code"                           => "تسميات النظام المنسق",
-    "image"                              => "صورة",
-    "import_items_csv"                   => "استيراد من اكسل",
-    "info_provided_by"                   => "المعلومات مقدمة بواسطة",
-    "inventory"                          => "المخزن",
-    "inventory_CSV_import_quantity"      => "العدد المستورد من ملفات ال CSV",
-    "inventory_comments"                 => "تعليقات",
-    "inventory_data_tracking"            => "تتبع بيانات المخزون",
-    "inventory_date"                     => "التاريخ",
-    "inventory_employee"                 => "الموظف",
-    "inventory_in_out_quantity"          => "+- كمية",
-    "inventory_remarks"                  => "ملاحظات",
-    "is_deleted"                         => "حذفت",
-    "is_printed"                         => "",
-    "is_serialized"                      => "الصنف له رقم مسلسل",
-    "item"                               => "صنف",
-    "item_id"                            => "",
-    "item_number"                        => "الباركود UPC/EAN/ISBN",
-    "item_number_duplicate"              => "رقم الصنف موجود فى قاعدة البيانات من قبل.",
-    "kit"                                => "مجموعة اصناف",
-    "location"                           => "مكان",
-    "low_inventory_items"                => "الأصناف التى لا يوجد لها مخزون",
-    "low_sell_item"                      => "الصنف المركب",
-    "manually_editing_of_quantity"       => "تحرير الكمية يدوياً",
-    "markup"                             => "",
-    "name"                               => "اسم الصنف",
-    "name_required"                      => "اسم الصنف مطلوب.",
-    "new"                                => "صنف جديد",
-    "no_description_items"               => "الأصناف التى بلا وصف",
-    "no_items_to_display"                => "لايوجد أصناف لعرضها.",
-    "none"                               => "لاشىء",
-    "none_selected"                      => "لم تختار أى أصناف لتحريرها",
-    "nonstock"                           => "غير مخزنة",
-    "number_information"                 => "رقم الصنف",
-    "number_required"                    => "مطلوب UPC/EAN/ISBN رقم الباركود.",
-    "one_or_multiple"                    => "صنف/أصناف",
-    "pack_name"                          => "اسم الحزمة",
-    "qty_per_pack"                       => "العدد بكل الحزمة",
-    "quantity"                           => "الكمية",
-    "quantity_number"                    => "الكمية يجب أن تكون رقم.",
-    "quantity_required"                  => "الكمية مطلوبة.",
-    "receiving_quantity"                 => "الكمية المستلمة",
-    "remove_image"                       => "ازالة الصورة",
-    "reorder_level"                      => "نقطة إعادة الطلب",
-    "reorder_level_number"               => "نقطة إعادة الطلب يجب أن تكون رقم.",
-    "reorder_level_required"             => "نقطة إعادة الطلب مطلوبة.",
-    "retrive_item_info"                  => "الحصول على بيانات الصنف",
-    "sales_tax_1"                        => "ضريبة المبيعات",
-    "sales_tax_2"                        => "ضريبة المبيعات 2",
-    "search_attributes"                  => "بحث الحقول المخصصة",
-    "select_image"                       => "اختار صورة",
-    "serialized_items"                   => "أصناف مسلسلة",
-    "standard"                           => "اساسي",
-    "stock"                              => "مخزن",
-    "stock_location"                     => "مكان المخزون",
-    "stock_type"                         => "نوع المخزن",
-    "successful_adding"                  => "لقد تم إضافة صنف بنجاح",
-    "successful_bulk_edit"               => "لقد تم تحديث بيانات صنف/أصناف بنجاح",
-    "successful_deleted"                 => "لقد تم الحذف بنجاح",
-    "successful_updating"                => "لقد تم تحديث بيانات صنف بنجاح",
-    "supplier"                           => "المورد",
-    "tax_1"                              => "الضريبة 1",
-    "tax_2"                              => "الضريبة 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "الفئة الضريبية",
-    "tax_percent"                        => "نسبة الضريبة",
-    "tax_percent_number"                 => "نسبة الضريبة يجب ان تكون رقم",
-    "tax_percent_required"               => "نسبة الضريبة مطلوبة.",
-    "tax_percents"                       => "نسبة/نسب الضريبة",
-    "temp"                               => "مؤقت",
-    "type"                               => "نوع الصنف",
-    "unit_price"                         => "السعر",
-    "unit_price_number"                  => "السعر يجب أن يكون رقم.",
-    "unit_price_required"                => "السعر مطلوب.",
-    "upc_database"                       => "UPC قاعدة بيانات",
-    "update"                             => "تحديث بيانات صنف",
-    "use_inventory_menu"                 => "استخدام تحديث المخزن",
+    'add_minus'                          => 'الكمية المطلوب خصمها أو اضافتها.',
+    'allow_alt_description'              => 'السماح بوصف بديل',
+    'amount_entry'                       => 'إدخال القيمة',
+    'bulk_edit'                          => 'تحرير جماعى',
+    'buy_price_required'                 => 'سعر الشراء مطلوب.',
+    'cannot_be_deleted'                  => 'لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات.',
+    'cannot_find_item'                   => 'لايمكن ايجاد معلومات حول الصنف.',
+    'categories'                         => '',
+    'category'                           => 'التصنيف',
+    'category_new'                       => '',
+    'category_required'                  => 'التصنيف مطلوب.',
+    'change_all_to_allow_alt_desc'       => 'السماح بوصف بديل للجميع.',
+    'change_all_to_not_allow_allow_desc' => 'عدم السماح بوصف بديل للجميع.',
+    'change_all_to_serialized'           => 'تغير الجميع لمتسلسل',
+    'change_all_to_unserialized'         => 'تغيير الجميع لغير متسلسل',
+    'change_image'                       => 'تغيير الصورة',
+    'confirm_bulk_edit'                  => 'هل أنت متأكد انك تريد تحرير كل الأصناف المختارة؟',
+    'confirm_bulk_edit_wipe_taxes'       => 'سوف يتم مسح معلومات الضرائب لجميع الأصناف.',
+    'confirm_delete'                     => 'هل أنت متأكد انك تريد حذف كل الأصناف المختارة؟',
+    'confirm_restore'                    => 'هل انت متاكد من إستعادة الاصناف المخطارة؟',
+    'cost_price'                         => 'سعر التكلفة',
+    'cost_price_number'                  => 'سعر التكلفة يجب أن يكون رقم.',
+    'cost_price_required'                => 'سعر التكلفة مطلوب.',
+    'count'                              => 'تحديث المخزون',
+    'csv_import_failed'                  => 'فشل الإستيراد من اكسل',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'الملف الذى رفعته إما فارغ أو أنه مختلف البنية.',
+    'csv_import_partially_failed'        => 'يوجد خطأ بنسبة {0} في استيراد الاصناف في السطر: {1}. لم يتم استيرادهم.',
+    'csv_import_success'                 => 'تم استيراد الأصناف بنجاح.',
+    'current_quantity'                   => 'الكمية الحالية',
+    'default_pack_name'                  => 'كل',
+    'description'                        => 'الوصف',
+    'details_count'                      => 'حركة الصنف',
+    'do_nothing'                         => 'لاتفعل شئ',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة.',
+    'edit_multiple_items'                => 'تحريد مجموعة اصناف',
+    'empty_upc_items'                    => 'تفريغ اصناف UPC',
+    'error_adding_updating'              => 'خطاء فى إضافة/تحديث صنف',
+    'error_updating_multiple'            => 'خطاء فى تحديث بيانات أصناف',
+    'generate_barcodes'                  => 'توليد أكواد الباركود',
+    'hsn_code'                           => 'تسميات النظام المنسق',
+    'image'                              => 'صورة',
+    'import_items_csv'                   => 'استيراد من اكسل',
+    'info_provided_by'                   => 'المعلومات مقدمة بواسطة',
+    'inventory'                          => 'المخزن',
+    'inventory_CSV_import_quantity'      => 'العدد المستورد من ملفات ال CSV',
+    'inventory_comments'                 => 'تعليقات',
+    'inventory_data_tracking'            => 'تتبع بيانات المخزون',
+    'inventory_date'                     => 'التاريخ',
+    'inventory_employee'                 => 'الموظف',
+    'inventory_in_out_quantity'          => '+- كمية',
+    'inventory_remarks'                  => 'ملاحظات',
+    'is_deleted'                         => 'حذفت',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'الصنف له رقم مسلسل',
+    'item'                               => 'صنف',
+    'item_id'                            => '',
+    'item_number'                        => 'الباركود UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'رقم الصنف موجود فى قاعدة البيانات من قبل.',
+    'item_number_invalid'                => 'رقم الصنف يحتوي على أحرف غير مسموح بها.',
+    'kit'                                => 'مجموعة اصناف',
+    'location'                           => 'مكان',
+    'low_inventory_items'                => 'الأصناف التى لا يوجد لها مخزون',
+    'low_sell_item'                      => 'الصنف المركب',
+    'manually_editing_of_quantity'       => 'تحرير الكمية يدوياً',
+    'markup'                             => '',
+    'name'                               => 'اسم الصنف',
+    'name_required'                      => 'اسم الصنف مطلوب.',
+    'new'                                => 'صنف جديد',
+    'no_description_items'               => 'الأصناف التى بلا وصف',
+    'no_items_to_display'                => 'لايوجد أصناف لعرضها.',
+    'none'                               => 'لاشىء',
+    'none_selected'                      => 'لم تختار أى أصناف لتحريرها',
+    'nonstock'                           => 'غير مخزنة',
+    'number_information'                 => 'رقم الصنف',
+    'number_required'                    => 'مطلوب UPC/EAN/ISBN رقم الباركود.',
+    'one_or_multiple'                    => 'صنف/أصناف',
+    'pack_name'                          => 'اسم الحزمة',
+    'qty_per_pack'                       => 'العدد بكل الحزمة',
+    'quantity'                           => 'الكمية',
+    'quantity_number'                    => 'الكمية يجب أن تكون رقم.',
+    'quantity_required'                  => 'الكمية مطلوبة.',
+    'receiving_quantity'                 => 'الكمية المستلمة',
+    'remove_image'                       => 'ازالة الصورة',
+    'reorder_level'                      => 'نقطة إعادة الطلب',
+    'reorder_level_number'               => 'نقطة إعادة الطلب يجب أن تكون رقم.',
+    'reorder_level_required'             => 'نقطة إعادة الطلب مطلوبة.',
+    'retrive_item_info'                  => 'الحصول على بيانات الصنف',
+    'sales_tax_1'                        => 'ضريبة المبيعات',
+    'sales_tax_2'                        => 'ضريبة المبيعات 2',
+    'search_attributes'                  => 'بحث الحقول المخصصة',
+    'select_image'                       => 'اختار صورة',
+    'serialized_items'                   => 'أصناف مسلسلة',
+    'standard'                           => 'اساسي',
+    'stock'                              => 'مخزن',
+    'stock_location'                     => 'مكان المخزون',
+    'stock_type'                         => 'نوع المخزن',
+    'successful_adding'                  => 'لقد تم إضافة صنف بنجاح',
+    'successful_bulk_edit'               => 'لقد تم تحديث بيانات صنف/أصناف بنجاح',
+    'successful_deleted'                 => 'لقد تم الحذف بنجاح',
+    'successful_updating'                => 'لقد تم تحديث بيانات صنف بنجاح',
+    'supplier'                           => 'المورد',
+    'tax_1'                              => 'الضريبة 1',
+    'tax_2'                              => 'الضريبة 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'الفئة الضريبية',
+    'tax_name_invalid'                   => 'اسم الضريبة يحتوي على أحرف غير مسموح بها.',
+    'tax_percent'                        => 'نسبة الضريبة',
+    'tax_percent_number'                 => 'نسبة الضريبة يجب ان تكون رقم',
+    'tax_percent_required'               => 'نسبة الضريبة مطلوبة.',
+    'tax_percents'                       => 'نسبة/نسب الضريبة',
+    'temp'                               => 'مؤقت',
+    'type'                               => 'نوع الصنف',
+    'unit_price'                         => 'السعر',
+    'unit_price_number'                  => 'السعر يجب أن يكون رقم.',
+    'unit_price_required'                => 'السعر مطلوب.',
+    'upc_database'                       => 'UPC قاعدة بيانات',
+    'update'                             => 'تحديث بيانات صنف',
+    'use_inventory_menu'                 => 'استخدام تحديث المخزن',
 ];
diff --git a/app/Language/ar-LB/Login.php b/app/Language/ar-LB/Login.php
index f98db7855..badb896c9 100644
--- a/app/Language/ar-LB/Login.php
+++ b/app/Language/ar-LB/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "أنا لست روبوتاً.",
-    "go"                            => "البَدْء",
-    "invalid_gcaptcha"              => "يرجى التحقق من أنك لست روبوتًا.",
-    "invalid_installation"          => "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.",
-    "invalid_username_and_password" => "اسم المستخدم/كلمة المرور غير صحيحة.",
-    "login"                         => "دخول",
-    "logout"                        => "تسجيل خروج",
-    "migration_needed"              => "سيبدأ ترحيل قاعدة البيانات إلى{0} بعد تسجيل الدخول.",
-    "password"                      => "كلمة السر",
-    "required_username"             => "خانة أسم المستخدم مطلوبة.",
-    "username"                      => "اسم المستخدم",
-    "welcome"                       => "مرحباً بك في{0}!",
+    "gcaptcha"                            => "أنا لست روبوتاً.",
+    "go"                                  => "البَدْء",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "يرجى التحقق من أنك لست روبوتًا.",
+    "invalid_installation"                => "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.",
+    "invalid_username_and_password"       => "اسم المستخدم/كلمة المرور غير صحيحة.",
+    "login"                               => "دخول",
+    "logout"                              => "تسجيل خروج",
+    "migrating_database"                  => "جارٍ ترحيل قاعدة البيانات",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "تم ترحيل قاعدة البيانات بنجاح!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "سيبدأ ترحيل قاعدة البيانات إلى{0} بعد تسجيل الدخول.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "كلمة السر",
+    "required_username"                   => "خانة أسم المستخدم مطلوبة.",
+    'too_many_attempts'                   => 'عدد كبير جدًا من المحاولات. يرجى الانتظار لحظة والمحاولة مرة أخرى.',
+    "username"                            => "اسم المستخدم",
+    "welcome"                             => "مرحباً بك في{0}!"
 ];
diff --git a/app/Language/ar-LB/Reports.php b/app/Language/ar-LB/Reports.php
index 2e1d77356..a4580f647 100644
--- a/app/Language/ar-LB/Reports.php
+++ b/app/Language/ar-LB/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "معدل الضريبة",
     "taxes"                                   => "الضرائب",
     "taxes_summary_report"                    => "تقرير ملخص الضرائب",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "الإجمالى",
     "total_inventory_value"                   => "إجمالى قيمة المخزن",
     "total_low_sell_quantity"                 => "مجموع الكميات حسب الصنف الاولي",
diff --git a/app/Language/ar-LB/Sales.php b/app/Language/ar-LB/Sales.php
index 112838301..f477143fd 100644
--- a/app/Language/ar-LB/Sales.php
+++ b/app/Language/ar-LB/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "النقاط المتاحة",
-    "rewards_package"                  => "فئة المكافئة",
-    "rewards_remaining_balance"        => "رصيد النقاط المتبقي هو ",
-    "account_number"                   => "حساب",
-    "add_payment"                      => "إضافة دفع",
-    "amount_due"                       => "المبلغ المطلوب",
-    "amount_tendered"                  => "المبلغ المدفوع",
-    "authorized_signature"             => "توقيع معتمد",
-    "cancel_sale"                      => "الغاء عملية البيع",
-    "cash"                             => "نقدى",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "تعديل الصندوق",
-    "cash_deposit"                     => "ايداع نقدي",
-    "cash_filter"                      => "نقدى",
-    "change_due"                       => "الباقى",
-    "change_price"                     => "تغيير سعر البيع",
-    "check"                            => "شيك",
-    "check_balance"                    => "تذكير بموعد الشيك",
-    "check_filter"                     => "شيك",
-    "close"                            => "",
-    "comment"                          => "تعليق",
-    "comments"                         => "تعليقات",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "إتمام البيع",
-    "confirm_cancel_sale"              => "هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف.",
-    "confirm_delete"                   => "هل تريد حذف عمليات البيع المختارة؟",
-    "confirm_restore"                  => "هل انت متاكد من استعادة عملية البيع؟",
-    "credit"                           => "بطاقة إئتمانية",
-    "credit_deposit"                   => "ايداع ببطاقة ائتمان",
-    "credit_filter"                    => "بطاقة بنكية",
-    "current_table"                    => "",
-    "customer"                         => "العميل",
-    "customer_address"                 => "العنوان",
-    "customer_discount"                => "الخصم",
-    "customer_email"                   => "البريد الإلكترونى",
-    "customer_location"                => "المكان",
-    "customer_mailchimp_status"        => "حالة بريد ميل تشيمب",
-    "customer_optional"                => "(مطلوب للدفعات المستحقة)",
-    "customer_required"                => "(اجباري)",
-    "customer_total"                   => "المجموع",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "تاريخ البيع",
-    "date_range"                       => "الفترة الزمنية",
-    "date_required"                    => "يجب إدخال تاريخ صحيح.",
-    "date_type"                        => "التاريخ مطلوب.",
-    "debit"                            => "بطاقة خصم",
-    "debit_filter"                     => "",
-    "delete"                           => "اسمح بالمسح",
-    "delete_confirmation"              => "هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف.",
-    "delete_entire_sale"               => "حذف عملية البيع بالكامل",
-    "delete_successful"                => "لقد تم حذف عملية البيع بنجاح.",
-    "delete_unsuccessful"              => "لقد فشل حذف عملية البيع.",
-    "description_abbrv"                => "الوصف.",
-    "discard"                          => "الغاء",
-    "discard_quote"                    => "",
-    "discount"                         => "خصم",
-    "discount_included"                => "% خصم",
-    "discount_short"                   => "%",
-    "due"                              => "مستحق",
-    "due_filter"                       => "مستحق",
-    "edit"                             => "تعديل",
-    "edit_item"                        => "تعديل مادة",
-    "edit_sale"                        => "تعديل عملية بيع",
-    "email_receipt"                    => "إرسال الايصال بالبريد الالكترونى",
-    "employee"                         => "الموظف",
-    "entry"                            => "ادخال",
-    "error_editing_item"               => "خطاء فى تعديل المادة",
-    "find_or_scan_item"                => "بحث/مسح باركود المادة",
-    "find_or_scan_item_or_receipt"     => "بحث/مسح باركود المادة أو الايصال",
-    "giftcard"                         => "بطاقة هدية",
-    "giftcard_balance"                 => "رصيد بطاقة الهدية",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "رقم بطاقة الهدية",
-    "group_by_category"                => "ترتيب حسب الفئة",
-    "group_by_type"                    => "ترتيب حسب النوع",
-    "hsn"                              => "رمز نظام منسق",
-    "id"                               => "رقم عملية البيع",
-    "include_prices"                   => "يشمل الاسعار؟",
-    "invoice"                          => "فاتورة",
-    "invoice_confirm"                  => "هذه الفاتورة سوف ترسل إلى",
-    "invoice_enable"                   => "رقم فاتورة",
-    "invoice_filter"                   => "الفواتير",
-    "invoice_no_email"                 => "هذا العميل ليس لدية بريد الكترونى صالح.",
-    "invoice_number"                   => "فاتورة رقم #",
-    "invoice_number_duplicate"         => "من فضلك أدخل رقم فاتورة غير مكرر.",
-    "invoice_sent"                     => "تم إرسال الفاتورة إلى",
-    "invoice_total"                    => "إجمالي الفاتورة",
-    "invoice_type_custom_invoice"      => "فاتورة مخصصة (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "الفاتورة الضريبية المخصصة (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "الفاتورة (invoice.php)",
-    "invoice_type_tax_invoice"         => "الفاتورة الضريبية (tax_invoice.php)",
-    "invoice_unsent"                   => "فشل إرسال الفاتورة إلى",
-    "invoice_update"                   => "إعادة العد",
-    "item_insufficient_of_stock"       => "لايوجد مخزون كافى من المادة.",
-    "item_name"                        => "اسم المادة",
-    "item_number"                      => "مادة رقم #",
-    "item_out_of_stock"                => "لايوجد مخزون من المادة.",
-    "key_browser"                      => "اختصارات مفيده",
-    "key_cancel"                       => "الغاء عملية البيع/فاتوره/عرض السعار",
-    "key_customer_search"              => "بحث عن عميل",
-    "key_finish_quote"                 => "انهاء عملية البيع/الفاتورة من دون الدفع",
-    "key_finish_sale"                  => "اضافة دفع نقدي كمل واتمام عملية البيع",
-    "key_full"                         => "الإظهار في صفحه كامله",
-    "key_function"                     => "Function",
-    "key_help"                         => "اختصارات",
-    "key_help_modal"                   => "إظهار الاختصارات",
-    "key_in"                           => "تكبير الصفحه",
-    "key_item_search"                  => "بحث حسب الصنف",
-    "key_out"                          => "تصغير الصفحه",
-    "key_payment"                      => "اضافة دفعه",
-    "key_print"                        => "طباعة الصفحة الحالية",
-    "key_restore"                      => "إعادة ضبط اعدادات الصفحه",
-    "key_search"                       => "البحث في التقارير",
-    "key_suspend"                      => "حفط عملية البيع",
-    "key_suspended"                    => "إظهار عمليات البيع المحفظه",
-    "key_system"                       => "اختصارات متاحه",
-    "key_tendered"                     => "تعديل المبلغ المدفوع",
-    "key_title"                        => "اختصارات صفحة المبيعات",
-    "mc"                               => "",
-    "mode"                             => "وضع التسجيل",
-    "must_enter_numeric"               => "يجب إدخال رقم للمبلغ الفعلى المدفوع.",
-    "must_enter_numeric_giftcard"      => "رمز بطاقة الهدية يجب أن يكتون ارقام فقط.",
-    "new_customer"                     => "عميل جديد",
-    "new_item"                         => "مادة جديدة",
-    "no_description"                   => "بدون وصف",
-    "no_filter"                        => "الكل",
-    "no_items_in_cart"                 => "لايوجد اي مادة فى السلة.",
-    "no_sales_to_display"              => "لاتوجد عمليات بيع لعرضها.",
-    "none_selected"                    => "لم تقم بإختيار أى عمليات بيع لحذفها.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "ليس لديك صلاحية.",
-    "one_or_multiple"                  => "عمليات بيع",
-    "payment"                          => "طريقة الدفع",
-    "payment_amount"                   => "القيمة",
-    "payment_not_cover_total"          => "المبلغ المدفوع لايغطى المبلغ الإجمالى.",
-    "payment_type"                     => "طريقة",
-    "payments"                         => "",
-    "payments_total"                   => "إجمالى المدفوعات",
-    "price"                            => "السعر",
-    "print_after_sale"                 => "اطبع بعد عملية البيع",
-    "quantity"                         => "الكمية",
-    "quantity_less_than_reorder_level" => "تحذير: الكمية أقل من الحد المطلوب لهذه المادة.",
-    "quantity_less_than_zero"          => "تحذير! الكمية المطلوبة غير كافية، بإمكانك إتمام عملية البيع ، لكن تحقق من مخزنك.",
-    "quantity_of_items"                => "عدد ال {0} من الاصناف",
-    "quote"                            => "عرض اسعار",
-    "quote_number"                     => "رقم عرض الاسعار",
-    "quote_number_duplicate"           => "رقم عرض الاسعار يجب ان يكون فريد.",
-    "quote_sent"                       => "عرض الاسعار ارسل الى",
-    "quote_unsent"                     => "لم يتم ارسال عرض الاسعار الى",
-    "receipt"                          => "عملية بيع #",
-    "receipt_no_email"                 => "هذا العميل ليس له اي بريد الكتروني صحيح.",
-    "receipt_number"                   => "إيصال بيع",
-    "receipt_sent"                     => "تم إرسال الإيصال إلى",
-    "receipt_unsent"                   => "فشل إرسال الإيصال إلى",
-    "refund"                           => "نوع/سبب الاسترجاع",
-    "register"                         => "سجل المبيعات",
-    "remove_customer"                  => "حذف عميل",
-    "remove_discount"                  => "",
-    "return"                           => "إسترجاع",
-    "rewards"                          => "نقاط المكافئة",
-    "rewards_balance"                  => "رصيد نقاط المكافئة",
-    "sale"                             => "بيع",
-    "sale_by_invoice"                  => "البيع بفاتورة رسمية",
-    "sale_for_customer"                => "العميل:",
-    "sale_time"                        => "الوقت",
-    "sales_tax"                        => "ضريبة البيع",
-    "sales_total"                      => "",
-    "select_customer"                  => "اختيار عميل (اختياري)",
-    "send_invoice"                     => "إرسال الفاتورة",
-    "send_quote"                       => "ارسال عرض الاسعار",
-    "send_receipt"                     => "إرسال إيصال",
-    "send_work_order"                  => "ارسال طلب عمل",
-    "serial"                           => "مسلسل",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "عرض الفاتورة",
-    "show_receipt"                     => "عرض الإيصال",
-    "start_typing_customer_name"       => "ابداء بكتابة اسم العميل...",
-    "start_typing_item_name"           => "ابداء بكتابة اسم أو مسح باركود الصنف...",
-    "stock"                            => "المخزن",
-    "stock_location"                   => "موقع التخزين",
-    "sub_total"                        => "المجموع الفرعي",
-    "successfully_deleted"             => "لقد تم الحذف بنجاح",
-    "successfully_restored"            => "لقد تمت عملية الاستعادة بنجاح",
-    "successfully_suspended_sale"      => "لقد تم تعليق عملية البيع بنجاح.",
-    "successfully_updated"             => "لقد تم تحديث بيانات عملية البيع بنجاح.",
-    "suspend_sale"                     => "تعليق عملية البيع",
-    "suspended_doc_id"                 => "ملف",
-    "suspended_sale_id"                => "كود عملية البيع",
-    "suspended_sales"                  => "المبيعات المعلقة",
-    "table"                            => "طاولة",
-    "takings"                          => "المبيع اليومي",
-    "tax"                              => "ضريبة",
-    "tax_id"                           => "الرقم الضريبي",
-    "tax_invoice"                      => "فاتورة ضريبية",
-    "tax_percent"                      => "ضريبة %",
-    "taxed_ind"                        => "ض",
-    "total"                            => "المجموع",
-    "total_tax_exclusive"              => "الإجمالى بدون الضرائب",
-    "transaction_failed"               => "فشل حركة البيع.",
-    "unable_to_add_item"               => "غير قادر على إضافة صنف لعملية البيع",
-    "unsuccessfully_deleted"           => "لايمكن حذف عملية/عمليات البيع.",
-    "unsuccessfully_restored"          => "فشل في استعادة عملية البيع.",
-    "unsuccessfully_suspended_sale"    => "فشل تعليق عملية البيع.",
-    "unsuccessfully_updated"           => "فشل تحديث عملية البيع.",
-    "unsuspend"                        => "إلغاء تعليق",
-    "unsuspend_and_delete"             => "إلغاء تعليق وحذف",
-    "update"                           => "تحديث",
-    "upi"                              => "رقم التعريف الشخصي",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "طلب عمل",
-    "work_order_number"                => "رقم طلب العمل",
-    "work_order_number_duplicate"      => "رقم طلب العمل يجب ان يكون فريد.",
-    "work_order_sent"                  => "تم ارسال طلب العمل الى",
-    "work_order_unsent"                => "فشل في ارسال طلب العمل الى",
+    'account_number'                    => 'حساب',
+    'add_payment'                       => 'إضافة دفع',
+    'amount_due'                        => 'المبلغ المطلوب',
+    'amount_due_not_covered'            => 'المدفوعات لا تغطي المبلغ المستحق.',
+    'amount_tendered'                   => 'المبلغ المدفوع',
+    'authorized_signature'              => 'توقيع معتمد',
+    'cancel_sale'                       => 'الغاء عملية البيع',
+    'cash'                              => 'نقدى',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'تعديل الصندوق',
+    'cash_deposit'                      => 'ايداع نقدي',
+    'cash_filter'                       => 'نقدى',
+    'change_due'                        => 'الباقى',
+    'change_price'                      => 'تغيير سعر البيع',
+    'check'                             => 'شيك',
+    'check_balance'                     => 'تذكير بموعد الشيك',
+    'check_filter'                      => 'شيك',
+    'close'                             => '',
+    'comment'                           => 'تعليق',
+    'comments'                          => 'تعليقات',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'إتمام البيع',
+    'confirm_cancel_sale'               => 'هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف.',
+    'confirm_delete'                    => 'هل تريد حذف عمليات البيع المختارة؟',
+    'confirm_restore'                   => 'هل انت متاكد من استعادة عملية البيع؟',
+    'credit'                            => 'بطاقة إئتمانية',
+    'credit_deposit'                    => 'ايداع ببطاقة ائتمان',
+    'credit_filter'                     => 'بطاقة بنكية',
+    'current_table'                     => '',
+    'customer'                          => 'العميل',
+    'customer_address'                  => 'العنوان',
+    'customer_discount'                 => 'الخصم',
+    'customer_email'                    => 'البريد الإلكترونى',
+    'customer_location'                 => 'المكان',
+    'customer_mailchimp_status'         => 'حالة بريد ميل تشيمب',
+    'customer_optional'                 => '(مطلوب للدفعات المستحقة)',
+    'customer_required'                 => '(اجباري)',
+    'customer_total'                    => 'المجموع',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'النقاط المتاحة',
+    'daily_sales'                       => '',
+    'date'                              => 'تاريخ البيع',
+    'date_range'                        => 'الفترة الزمنية',
+    'date_required'                     => 'يجب إدخال تاريخ صحيح.',
+    'date_type'                         => 'التاريخ مطلوب.',
+    'debit'                             => 'بطاقة خصم',
+    'debit_filter'                      => '',
+    'delete'                            => 'اسمح بالمسح',
+    'delete_confirmation'               => 'هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف.',
+    'delete_entire_sale'                => 'حذف عملية البيع بالكامل',
+    'delete_successful'                 => 'لقد تم حذف عملية البيع بنجاح.',
+    'delete_unsuccessful'               => 'لقد فشل حذف عملية البيع.',
+    'description_abbrv'                 => 'الوصف.',
+    'discard'                           => 'الغاء',
+    'discard_quote'                     => '',
+    'discount'                          => 'خصم',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% خصم',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'مستحق',
+    'due_filter'                        => 'مستحق',
+    'edit'                              => 'تعديل',
+    'edit_item'                         => 'تعديل مادة',
+    'edit_sale'                         => 'تعديل عملية بيع',
+    'email_receipt'                     => 'إرسال الايصال بالبريد الالكترونى',
+    'employee'                          => 'الموظف',
+    'entry'                             => 'ادخال',
+    'error_editing_item'                => 'خطاء فى تعديل المادة',
+    'find_or_scan_item'                 => 'بحث/مسح باركود المادة',
+    'find_or_scan_item_or_receipt'      => 'بحث/مسح باركود المادة أو الايصال',
+    'giftcard'                          => 'بطاقة هدية',
+    'giftcard_balance'                  => 'رصيد بطاقة الهدية',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'رقم بطاقة الهدية',
+    'group_by_category'                 => 'ترتيب حسب الفئة',
+    'group_by_type'                     => 'ترتيب حسب النوع',
+    'hsn'                               => 'رمز نظام منسق',
+    'id'                                => 'رقم عملية البيع',
+    'include_prices'                    => 'يشمل الاسعار؟',
+    'insufficient_giftcard_balance'     => 'رصيد بطاقة الهدية غير كافي لهذه الدفعة.',
+    'insufficient_reward_points'        => 'نقاط المكافأة غير كافية لهذه الدفعة.',
+    'invoice'                           => 'فاتورة',
+    'invoice_confirm'                   => 'هذه الفاتورة سوف ترسل إلى',
+    'invoice_enable'                    => 'رقم فاتورة',
+    'invoice_filter'                    => 'الفواتير',
+    'invoice_no_email'                  => 'هذا العميل ليس لدية بريد الكترونى صالح.',
+    'invoice_number'                    => 'فاتورة رقم #',
+    'invoice_number_duplicate'          => 'من فضلك أدخل رقم فاتورة غير مكرر.',
+    'invoice_sent'                      => 'تم إرسال الفاتورة إلى',
+    'invoice_total'                     => 'إجمالي الفاتورة',
+    'invoice_type_custom_invoice'       => 'فاتورة مخصصة (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'الفاتورة الضريبية المخصصة (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'الفاتورة (invoice.php)',
+    'invoice_type_tax_invoice'          => 'الفاتورة الضريبية (tax_invoice.php)',
+    'invoice_unsent'                    => 'فشل إرسال الفاتورة إلى',
+    'invoice_update'                    => 'إعادة العد',
+    'item_insufficient_of_stock'        => 'لايوجد مخزون كافى من المادة.',
+    'item_name'                         => 'اسم المادة',
+    'item_number'                       => 'مادة رقم #',
+    'item_out_of_stock'                 => 'لايوجد مخزون من المادة.',
+    'key_browser'                       => 'اختصارات مفيده',
+    'key_cancel'                        => 'الغاء عملية البيع/فاتوره/عرض السعار',
+    'key_customer_search'               => 'بحث عن عميل',
+    'key_finish_quote'                  => 'انهاء عملية البيع/الفاتورة من دون الدفع',
+    'key_finish_sale'                   => 'اضافة دفع نقدي كمل واتمام عملية البيع',
+    'key_full'                          => 'الإظهار في صفحه كامله',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'اختصارات',
+    'key_help_modal'                    => 'إظهار الاختصارات',
+    'key_in'                            => 'تكبير الصفحه',
+    'key_item_search'                   => 'بحث حسب الصنف',
+    'key_out'                           => 'تصغير الصفحه',
+    'key_payment'                       => 'اضافة دفعه',
+    'key_print'                         => 'طباعة الصفحة الحالية',
+    'key_restore'                       => 'إعادة ضبط اعدادات الصفحه',
+    'key_search'                        => 'البحث في التقارير',
+    'key_suspend'                       => 'حفط عملية البيع',
+    'key_suspended'                     => 'إظهار عمليات البيع المحفظه',
+    'key_system'                        => 'اختصارات متاحه',
+    'key_tendered'                      => 'تعديل المبلغ المدفوع',
+    'key_title'                         => 'اختصارات صفحة المبيعات',
+    'mc'                                => '',
+    'mode'                              => 'وضع التسجيل',
+    'must_enter_numeric'                => 'يجب إدخال رقم للمبلغ الفعلى المدفوع.',
+    'must_enter_numeric_giftcard'       => 'رمز بطاقة الهدية يجب أن يكتون ارقام فقط.',
+    'must_enter_reference_code'         => 'يجب إدخال رقم المرجع/الاسترداد.',
+    'negative_amount_tendered'          => 'لا يمكن أن يكون المبلغ المدفوع سالبًا.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'عميل جديد',
+    'new_item'                          => 'مادة جديدة',
+    'no_description'                    => 'بدون وصف',
+    'no_filter'                         => 'الكل',
+    'no_items_in_cart'                  => 'لايوجد اي مادة فى السلة.',
+    'no_sales_to_display'               => 'لاتوجد عمليات بيع لعرضها.',
+    'none_selected'                     => 'لم تقم بإختيار أى عمليات بيع لحذفها.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'ليس لديك صلاحية.',
+    'one_or_multiple'                   => 'عمليات بيع',
+    'payment'                           => 'طريقة الدفع',
+    'payment_amount'                    => 'القيمة',
+    'payment_not_cover_total'           => 'المبلغ المدفوع لايغطى المبلغ الإجمالى.',
+    'payment_type'                      => 'طريقة',
+    'payments'                          => '',
+    'payments_total'                    => 'إجمالى المدفوعات',
+    'price'                             => 'السعر',
+    'print_after_sale'                  => 'اطبع بعد عملية البيع',
+    'quantity'                          => 'الكمية',
+    'quantity_less_than_reorder_level'  => 'تحذير: الكمية أقل من الحد المطلوب لهذه المادة.',
+    'quantity_less_than_zero'           => 'تحذير! الكمية المطلوبة غير كافية، بإمكانك إتمام عملية البيع ، لكن تحقق من مخزنك.',
+    'quantity_of_items'                 => 'عدد ال {0} من الاصناف',
+    'quote'                             => 'عرض اسعار',
+    'quote_number'                      => 'رقم عرض الاسعار',
+    'quote_number_duplicate'            => 'رقم عرض الاسعار يجب ان يكون فريد.',
+    'quote_sent'                        => 'عرض الاسعار ارسل الى',
+    'quote_unsent'                      => 'لم يتم ارسال عرض الاسعار الى',
+    'receipt'                           => 'عملية بيع #',
+    'receipt_no_email'                  => 'هذا العميل ليس له اي بريد الكتروني صحيح.',
+    'receipt_number'                    => 'إيصال بيع',
+    'receipt_sent'                      => 'تم إرسال الإيصال إلى',
+    'receipt_unsent'                    => 'فشل إرسال الإيصال إلى',
+    'reference_code'                    => 'رمز مرجع الدفع',
+    'reference_code_invalid_characters' => 'يجب أن يحتوي رمز المرجع على أحرف وأرقام فقط.',
+    'reference_code_length_error'       => 'طول رمز المرجع غير صالح.',
+    'refund'                            => 'نوع/سبب الاسترجاع',
+    'register'                          => 'سجل المبيعات',
+    'remove_customer'                   => 'حذف عميل',
+    'remove_discount'                   => '',
+    'return'                            => 'إسترجاع',
+    'rewards'                           => 'نقاط المكافئة',
+    'rewards_balance'                   => 'رصيد نقاط المكافئة',
+    'rewards_package'                   => 'فئة المكافئة',
+    'rewards_remaining_balance'         => 'رصيد النقاط المتبقي هو ',
+    'sale'                              => 'بيع',
+    'sale_by_invoice'                   => 'البيع بفاتورة رسمية',
+    'sale_for_customer'                 => 'العميل:',
+    'sale_time'                         => 'الوقت',
+    'sales_tax'                         => 'ضريبة البيع',
+    'sales_total'                       => '',
+    'select_customer'                   => 'اختيار عميل (اختياري)',
+    'send_invoice'                      => 'إرسال الفاتورة',
+    'send_quote'                        => 'ارسال عرض الاسعار',
+    'send_receipt'                      => 'إرسال إيصال',
+    'send_work_order'                   => 'ارسال طلب عمل',
+    'serial'                            => 'مسلسل',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'عرض الفاتورة',
+    'show_receipt'                      => 'عرض الإيصال',
+    'start_typing_customer_name'        => 'ابداء بكتابة اسم العميل...',
+    'start_typing_item_name'            => 'ابداء بكتابة اسم أو مسح باركود الصنف...',
+    'stock'                             => 'المخزن',
+    'stock_location'                    => 'موقع التخزين',
+    'sub_total'                         => 'المجموع الفرعي',
+    'successfully_deleted'              => 'لقد تم الحذف بنجاح',
+    'successfully_restored'             => 'لقد تمت عملية الاستعادة بنجاح',
+    'successfully_suspended_sale'       => 'لقد تم تعليق عملية البيع بنجاح.',
+    'successfully_updated'              => 'لقد تم تحديث بيانات عملية البيع بنجاح.',
+    'suspend_sale'                      => 'تعليق عملية البيع',
+    'suspended_doc_id'                  => 'ملف',
+    'suspended_sale_id'                 => 'كود عملية البيع',
+    'suspended_sales'                   => 'المبيعات المعلقة',
+    'table'                             => 'طاولة',
+    'takings'                           => 'المبيع اليومي',
+    'tax'                               => 'ضريبة',
+    'tax_id'                            => 'الرقم الضريبي',
+    'tax_invoice'                       => 'فاتورة ضريبية',
+    'tax_percent'                       => 'ضريبة %',
+    'taxed_ind'                         => 'ض',
+    'total'                             => 'المجموع',
+    'total_tax_exclusive'               => 'الإجمالى بدون الضرائب',
+    'transaction_failed'                => 'فشل حركة البيع.',
+    'unable_to_add_item'                => 'غير قادر على إضافة صنف لعملية البيع',
+    'unsuccessfully_deleted'            => 'لايمكن حذف عملية/عمليات البيع.',
+    'unsuccessfully_restored'           => 'فشل في استعادة عملية البيع.',
+    'unsuccessfully_suspended_sale'     => 'فشل تعليق عملية البيع.',
+    'unsuccessfully_updated'            => 'فشل تحديث عملية البيع.',
+    'unsuspend'                         => 'إلغاء تعليق',
+    'unsuspend_and_delete'              => 'إلغاء تعليق وحذف',
+    'update'                            => 'تحديث',
+    'upi'                               => 'رقم التعريف الشخصي',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'طلب عمل',
+    'work_order_number'                 => 'رقم طلب العمل',
+    'work_order_number_duplicate'       => 'رقم طلب العمل يجب ان يكون فريد.',
+    'work_order_sent'                   => 'تم ارسال طلب العمل الى',
+    'work_order_unsent'                 => 'فشل في ارسال طلب العمل الى',
 ];
diff --git a/app/Language/az/Attributes.php b/app/Language/az/Attributes.php
index ad86754ca..9f8e336de 100644
--- a/app/Language/az/Attributes.php
+++ b/app/Language/az/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Atribut dəyəri bu ':' və ya '|' olmaz",
-    "confirm_delete"                   => "Seçilmiş Atributları silmək istədiyinizdən əminsinizmi?",
-    "confirm_restore"                  => "Seçilmiş atributları bərpa etmək istədiyinizə əminsinizmi?",
-    "definition_cannot_be_deleted"     => "Seçilmiş xüsusiyyətləri silmək olmadı",
-    "definition_error_adding_updating" => "{0} -in atributları əlavə oluna və yenilənə bilmədi. Lütfən XƏTA loq faylını yoxlayın.",
-    "definition_flags"                 => "Atribut görünüşü",
-    "definition_group"                 => "Qrup",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Atribut əlavə et",
-    "definition_name_required"         => "Atribut adı zəruri bir sahədir",
-    "definition_one_or_multiple"       => "atribut (lar)",
-    "definition_successful_adding"     => "Malı uğurla əlavə etdiniz",
-    "definition_successful_deleted"    => "Siz uğurla sildiniz",
-    "definition_successful_updating"   => "Atributunuzu müvəffəqiyyətlə yenilədiniz",
-    "definition_type"                  => "Atribut Tipi",
-    "definition_type_required"         => "Atribut növü tələb olunan sahədir",
-    "definition_unit"                  => "Ölçü vahidi",
-    "definition_values"                => "Atribut dəyərləri",
-    "new"                              => "Yeni atributlar",
-    "no_attributes_to_display"         => "Göstərmək üçün heç bir element yoxdur",
-    "receipt_visibility"               => "Qəbz",
-    "show_in_items"                    => "Malları göstər",
-    "show_in_items_visibility"         => "Mallar",
-    "show_in_receipt"                  => "Qəbzi göstərin",
-    "show_in_receivings"               => "Alacaqlarda göstərin",
-    "show_in_receivings_visibility"    => "Alınanlar",
-    "show_in_sales"                    => "Satışda göstərin",
-    "show_in_sales_visibility"         => "Satışlar",
-    "update"                           => "Atributları yenilə",
+    'attribute_value_invalid_chars'    => 'Atribut dəyəri bu \':\' və ya \'|\' olmaz',
+    'confirm_delete'                   => 'Seçilmiş Atributları silmək istədiyinizdən əminsinizmi?',
+    'confirm_restore'                  => 'Seçilmiş atributları bərpa etmək istədiyinizə əminsinizmi?',
+    'definition_cannot_be_deleted'     => 'Seçilmiş xüsusiyyətləri silmək olmadı',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => '{0} -in atributları əlavə oluna və yenilənə bilmədi. Lütfən XƏTA loq faylını yoxlayın.',
+    'definition_flags'                 => 'Atribut görünüşü',
+    'definition_group'                 => 'Qrup',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Atribut əlavə et',
+    'definition_name_required'         => 'Atribut adı zəruri bir sahədir',
+    'definition_one_or_multiple'       => 'atribut (lar)',
+    'definition_successful_adding'     => 'Malı uğurla əlavə etdiniz',
+    'definition_successful_deleted'    => 'Siz uğurla sildiniz',
+    'definition_successful_updating'   => 'Atributunuzu müvəffəqiyyətlə yenilədiniz',
+    'definition_type'                  => 'Atribut Tipi',
+    'definition_type_required'         => 'Atribut növü tələb olunan sahədir',
+    'definition_unit'                  => 'Ölçü vahidi',
+    'definition_values'                => 'Atribut dəyərləri',
+    'new'                              => 'Yeni atributlar',
+    'no_attributes_to_display'         => 'Göstərmək üçün heç bir element yoxdur',
+    'receipt_visibility'               => 'Qəbz',
+    'show_in_items'                    => 'Malları göstər',
+    'show_in_items_visibility'         => 'Mallar',
+    'show_in_receipt'                  => 'Qəbzi göstərin',
+    'show_in_receivings'               => 'Alacaqlarda göstərin',
+    'show_in_receivings_visibility'    => 'Alınanlar',
+    'show_in_sales'                    => 'Satışda göstərin',
+    'show_in_sales_visibility'         => 'Satışlar',
+    'show_in_search'                   => 'Axtarışda göstər',
+    'show_in_search_visibility'        => 'Axtarış',
+    'update'                           => 'Atributları yenilə',
 ];
diff --git a/app/Language/az/Bootstrap_tables.php b/app/Language/az/Bootstrap_tables.php
index 13cf78b0c..ebc6fc05c 100644
--- a/app/Language/az/Bootstrap_tables.php
+++ b/app/Language/az/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "hamısı",
-    "columns"              => "Sütunlar",
-    "hide_show_pagination" => "Gizlət/Göstər səhifənin nömrələnməsin",
-    "loading"              => "Lütfən gözləyin, səhifə yüklənir...",
-    "page_from_to"         => "Göstər {0} bundan {1} buna {2} kimi",
-    "refresh"              => "Yenilə",
-    "rows_per_page"        => "{0} yazı səhifədə",
-    "toggle"               => "Keçid",
+    'all' => "hamısı",
+    'columns' => "Sütunlar",
+    'hide_show_pagination' => "Gizlət/Göstər səhifənin nömrələnməsin",
+    'loading' => "Lütfən gözləyin, səhifə yüklənir",
+    'page_from_to' => "Göstər {0} bundan {1} buna {2} kimi",
+    'refresh' => "Yenilə",
+    'rows_per_page' => "{0} yazı səhifədə",
+    'toggle' => "Keçid",
 ];
diff --git a/app/Language/az/Config.php b/app/Language/az/Config.php
index 3d6c5567b..dcfc65a30 100644
--- a/app/Language/az/Config.php
+++ b/app/Language/az/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Şirkət Unvanı",
-    "address_required"                          => "Şirkətin adı olan boşluq sahəsi doldurulmalıdı.",
-    "all_set"                                   => "Bütün fayl icazələri düzgün qurulub!",
-    "allow_duplicate_barcodes"                  => "Dublikat Barkodlarına icazə verin",
-    "apostrophe"                                => "Apastrof",
-    "backup_button"                             => "Ehtiyyat Köçürmə",
-    "backup_database"                           => "Məlumat Bazasını Ehtiyyat Yaddaşına Göndər",
-    "barcode"                                   => "Barkod",
-    "barcode_company"                           => "Şirkətin Adı",
-    "barcode_configuration"                     => "Barkod Konfiqurasiyası",
-    "barcode_content"                           => "Barkod Məzmunu",
-    "barcode_first_row"                         => "Sıra 1",
-    "barcode_font"                              => "Yazı Tipi",
-    "barcode_formats"                           => "Giriş Formatları",
-    "barcode_generate_if_empty"                 => "Boşdursa Yarat.",
-    "barcode_height"                            => "Hündürlük",
-    "barcode_id"                                => "Malın İd/Adı",
-    "barcode_info"                              => "Barkod Konfiqurasiya Məlumatı",
-    "barcode_layout"                            => "Barkod Çərçivəsi",
-    "barcode_name"                              => "Ad",
-    "barcode_number"                            => "Barkod",
-    "barcode_number_in_row"                     => "Sıradakı Nömrə",
-    "barcode_page_cellspacing"                  => "Səhifədə hüceyrə sahəsini göstərin.",
-    "barcode_page_width"                        => "Səyfənin genişliyini göstər",
-    "barcode_price"                             => "Qiymət",
-    "barcode_second_row"                        => "Sıra 2",
-    "barcode_third_row"                         => "Sira 3",
-    "barcode_tooltip"                           => "Diqqət: Bu xüsusiyyət malların dublikat olmaslna, idxal edilməsinə və ya yaradılmasına səbəb ola bilər. Çoğaltıcı barkod istəmirsinizsə istifadə etməyin.",
-    "barcode_type"                              => "Barkod Növü",
-    "barcode_width"                             => "Genişlik",
-    "bottom"                                    => "Aşağı",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Nəğd Pul Cədvəlləri",
-    "cash_decimals_tooltip"                     => "Nağd pul və Məzənnədəki ədədlər eyni olarsa, onda nağd pul yuvarlaqlaşması baş verməz.",
-    "cash_rounding"                             => "Nəğd Pul Yuvarlaqlaşdırılması",
-    "category_dropdown"                         => "Bölməni açılan siyahida göstər",
-    "center"                                    => "Mərkəz",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "vergül",
-    "company"                                   => "Şirkətin Adı",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Şəkili Dəyiş",
-    "company_logo"                              => "Şirkətin Logosu",
-    "company_remove_image"                      => "Şəkili Sil",
-    "company_required"                          => "Şirkətin adı qeyd olunmalıdır",
-    "company_select_image"                      => "Şəkil Seç",
-    "company_website_url"                       => "Şirkətin web saytı düzgün URL deyil.",
-    "country_codes"                             => "Ölkə Kodları",
-    "country_codes_tooltip"                     => "Vergüllə ayrılmış ölkə kodları üçün nominantim adres axtarışı.",
-    "currency_code"                             => "Valyuta Kodu",
-    "currency_decimals"                         => "Məzənnə Rəqəmləri",
-    "currency_symbol"                           => "Valyuta Simvolu",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Mükafat",
-    "customer_reward_duplicate"                 => "Mükafat unikal olmalıdir.",
-    "customer_reward_enable"                    => "Müştəri mükafatlarını aktivləşdirin",
-    "customer_reward_invalid_chars"             => "Mukafat '_ ' təşkil edə bilməz",
-    "customer_reward_required"                  => "Mükafat olan sahə boş qala bilməz",
-    "customer_sales_tax_support"                => "Müştəri Satış Vergi Dəstəyi",
-    "date_or_time_format"                       => "Tarix və Vaxt Filteri",
-    "datetimeformat"                            => "Tarix və Vaxt formatı",
-    "decimal_point"                             => "Ondaliq Nöqtə",
-    "default_barcode_font_size_number"          => "Standart Barkod Yazı Növü Ölçüsü rəqəm ilə olmalıdır.",
-    "default_barcode_font_size_required"        => "Standart Barkod Yazı Növü Ölçüsü olan sahə boş qala bilməz.",
-    "default_barcode_height_number"             => "Standart Barkod hündürlüyü rəqəm ilə olmalıdır.",
-    "default_barcode_height_required"           => "Standart Barkod olan sahə boş qala bilməz.",
-    "default_barcode_num_in_row_number"         => "Sıradakı Barkod Nömrəsi rəqəm ilə olmalıdır.",
-    "default_barcode_num_in_row_required"       => "Standart Barkod Nömrəsi olan sahə boş qala bilməz.",
-    "default_barcode_page_cellspacing_number"   => "Standart Barkod Səhifədki hücrə boşluğu rəqəm ilə olmalıdır.",
-    "default_barcode_page_cellspacing_required" => "Standart Barkod Səhifədəki hücrə boşluğu olan sahə boş qala bilməz.",
-    "default_barcode_page_width_number"         => "Standart Barkod Sahifə genişliyi rəqəm ilə olmalıdır.",
-    "default_barcode_page_width_required"       => "Standart Barkod Səhifə Genişliyi olan sahə boş qala bilməz.",
-    "default_barcode_width_number"              => "Standart Barkod Genişliyi rəqəm ilə olmalıdır.",
-    "default_barcode_width_required"            => "Standart Barkod Genişliyi olan sahə boş qala bilməz.",
-    "default_item_columns"                      => "Sabit Görünür Malların Sütunları",
-    "default_origin_tax_code"                   => "Vergi Kodunun Standart Mənbəyi",
-    "default_receivings_discount"               => "Alışdan sonra standart endirim",
-    "default_receivings_discount_number"        => "Sabit alacaqlar endirimi bir nömrə olmalıdır.",
-    "default_receivings_discount_required"      => "Standart alış endirimi tələb olunan sahədir.",
-    "default_sales_discount"                    => "Standart Satış Endirimi",
-    "default_sales_discount_number"             => "Standart Satış Endirimi rəqəm ilə olmalıdır.",
-    "default_sales_discount_required"           => "Standart Satış Endirimi tələb olunan sahədi.",
-    "default_tax_category"                      => "Standart Vergi Bölməsi",
-    "default_tax_code"                          => "Standart Vergo kodu",
-    "default_tax_jurisdiction"                  => "Standart Vergi Yurisdiksiyası",
-    "default_tax_name_number"                   => "Standart Vergi Adı uzun adlı olmalıdır .",
-    "default_tax_name_required"                 => "Adi vergi mütləq rəqəmlə olmalıdır.",
-    "default_tax_rate"                          => "Adi vergi dərəcəsi %",
-    "default_tax_rate_1"                        => "Vergi Dərəcəsi 1",
-    "default_tax_rate_2"                        => "Vergi Məzənnəsi 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Standart Vergi Məzənnəsi rəqəm ilə olmalıdır.",
-    "default_tax_rate_required"                 => "Standart Vergi Məzənnəsi olan sahə boş qala bilməz.",
-    "derive_sale_quantity"                      => "Tərtib edilmiş satış məbləğinə icazə verin",
-    "derive_sale_quantity_tooltip"              => "Əgər yoxlanılırsa, uzunmüddətli məbləğdə sifariş edilən əşyalar üçün yeni bir mal növü veriləcəkdir",
-    "dinner_table"                              => "Cədvəl",
-    "dinner_table_duplicate"                    => "Cədvəl unikal olmalıdır.",
-    "dinner_table_enable"                       => "Axşam yeməyi masalarını aktiv edin",
-    "dinner_table_invalid_chars"                => "Masanın adı '_' təşkil etməməlidir.",
-    "dinner_table_required"                     => "Masa olan sahə boş qala bilməz.",
-    "dot"                                       => "nöqtə",
-    "email"                                     => "Elektron Adres",
-    "email_configuration"                       => "Elektron Adres Konfiqurasiyası",
-    "email_mailpath"                            => "Email Göndətməyə qısa yol",
-    "email_protocol"                            => "Protokol",
-    "email_receipt_check_behaviour"             => "E-poçt qəbzi qutusu",
-    "email_receipt_check_behaviour_always"      => "Həmişə yoxlanılır",
-    "email_receipt_check_behaviour_last"        => "Son seçimi yadda saxla",
-    "email_receipt_check_behaviour_never"       => "Həmişə aktiv deyil",
-    "email_smtp_crypto"                         => "SMTP Şifrələmə",
-    "email_smtp_host"                           => "SMTP Serveri",
-    "email_smtp_pass"                           => "Faks",
-    "email_smtp_port"                           => "SMTP Portu",
-    "email_smtp_timeout"                        => "STMTP vaxt bitimi (lər)",
-    "email_smtp_user"                           => "SMTP İstifadəçi Adı",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Məxvilik Təmin edin",
-    "enforce_privacy_tooltip"                   => "Müştərilərin gizliliyini qorumaq, silmək halında məlumat şifrələməsini təmin etmək",
-    "fax"                                       => "Faks",
-    "file_perm"                                 => "Fayl icazəsində problem var, lütfən bu səhvləri düzəldib səhifəni yeniləyin.",
-    "financial_year"                            => "Maliyyə İli Başlancığı",
-    "financial_year_apr"                        => "1 Aprel",
-    "financial_year_aug"                        => "1 Avgust",
-    "financial_year_dec"                        => "1 Dekabr",
-    "financial_year_feb"                        => "1 Fevral",
-    "financial_year_jan"                        => "1 Yanvar",
-    "financial_year_jul"                        => "1 İyul",
-    "financial_year_jun"                        => "1 İyun",
-    "financial_year_mar"                        => "1 Mart",
-    "financial_year_may"                        => "1 May",
-    "financial_year_nov"                        => "1 Noyabr",
-    "financial_year_oct"                        => "1 Oktyabr",
-    "financial_year_sep"                        => "1 Sentyabr",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Giriş Səyfəsi reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Gizli Açarı",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Gizli Açar olan sahə boş qala bilməz",
-    "gcaptcha_site_key"                         => "reCAPTCHA Sayt Açarı",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Sayt Açarı olan sahə boş qala bilməz",
-    "gcaptcha_tooltip"                          => "Giriş səhifəsini Google reCAPTCHA ilə qoruyun, APİ açarını uyğunlaşdırmaq üçün işarə ilə göstərilən düyməyə basın.",
-    "general"                                   => "Ümumi",
-    "general_configuration"                     => "Ümumi Konfiqurasiya",
-    "giftcard_number"                           => "Hədiyyə Kartı Nömrəsi",
-    "giftcard_random"                           => "Təsadüfən Yarat",
-    "giftcard_series"                           => "Bölümlərə görə Yarat",
-    "image_allowed_file_types"                  => "İcazəli fayl növləri",
-    "image_max_height_tooltip"                  => "Şəkillərinin maksimum hündürlüyü pikselə(px).",
-    "image_max_size_tooltip"                    => "Şəkil yükləmələrinin maksimum fayl ölçüsü kilobaytla(kb).",
-    "image_max_width_tooltip"                   => "Şəkillərinin maksimum enliliyi pikselə(px).",
-    "image_restrictions"                        => "Şəkil yükləmə məhdudiyyətləri",
-    "include_hsn"                               => "HSN Kodlarına dəstək verin",
-    "info"                                      => "Məlumat",
-    "info_configuration"                        => "Dükan İnformasiyası",
-    "input_groups"                              => "",
-    "integrations"                              => "İnteqrasiya",
-    "integrations_configuration"                => "Üçüncü tərəf inteqrasiya",
-    "invoice"                                   => "Faktura",
-    "invoice_configuration"                     => "Faktura Çap Parametrləri",
-    "invoice_default_comments"                  => "Standart Faktura Şərhləri",
-    "invoice_email_message"                     => "Dil",
-    "invoice_enable"                            => "Fakturanı Aktivləşdir",
-    "invoice_printer"                           => "Faktura Printeri",
-    "invoice_type"                              => "Qaimənin Tipi",
-    "is_readable"                               => "oxunur, lakin icazələr 660-dan yüksəkdir.",
-    "is_writable"                               => "yazılabilir, lakin icazələr 750-dən yüksəkdir.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Xəbərdarlıq: Bu funksiya yalnız FireFox jsPrintSetup addon quraşdırıldığı halda işləyəcəkdir. Yadda saxlanılsın?",
-    "language"                                  => "Dil",
-    "last_used_invoice_number"                  => "Son istifadə edilmiş Faktura nömrəsi",
-    "last_used_quote_number"                    => "Son istifadə edilmiş Kvota sayı",
-    "last_used_work_order_number"               => "Son istifadə edilən W / O sayı",
-    "left"                                      => "Sol",
-    "license"                                   => "Lisenziya",
-    "license_configuration"                     => "Lisenziya bəyanatı",
-    "line_sequence"                             => "Sıra Ardıcıllığı",
-    "lines_per_page"                            => "Səhifə başına xəttlər",
-    "lines_per_page_number"                     => "Səhifə başına sətirlər bir rəqəm ilə olmalıdır.",
-    "lines_per_page_required"                   => "Səyfə Başına olan xəttər sahəsi boş qala bilməz.",
-    "locale"                                    => "Yerləşdirmə",
-    "locale_configuration"                      => "Lokallaşdırma Konfiqurasiyası",
-    "locale_info"                               => "Lokallaşdırma Konfiqurasiya Məlumatı",
-    "location"                                  => "Fond",
-    "location_configuration"                    => "Anbar Yerləri",
-    "location_info"                             => "Yer Konfiqurasiya Məlumatı",
-    "login_form"                                => "",
-    "logout"                                    => "Çıxışdan əvvəl məlumatlari ehtiyat bazasına köçürmək istəyirsinizmi? Çıxış üçün Bekap və ya [Ləğv] üçün [OK]' düyməsinə basın.",
-    "mailchimp"                                 => "Mailçimp",
-    "mailchimp_api_key"                         => "Mailchimp API Açarı",
-    "mailchimp_configuration"                   => "Mailchimp Konfiqurasiyası",
-    "mailchimp_key_successfully"                => "API Açarı etibarlıdır.",
-    "mailchimp_key_unsuccessfully"              => "API Açarı etibarsızdır.",
-    "mailchimp_lists"                           => "Mailchimp siyahısı (lar)",
-    "mailchimp_tooltip"                         => "API Açarının İşarəsinə basın.",
-    "message"                                   => "Mesaj",
-    "message_configuration"                     => "Mesaj Konfiqurasiyası",
-    "msg_msg"                                   => "Saxlanılan Mətn Mesajı",
-    "msg_msg_placeholder"                       => "SMS şablonunu istifadə etmək istəyirsinizsə, mesajınızı buraya qeyd edin, əks halda qutunu boş buraxın.",
-    "msg_pwd"                                   => "SMS-API Şifrəsi",
-    "msg_pwd_required"                          => "SMS-API şifrəsi tələb olunan bir sahədir",
-    "msg_src"                                   => "SMS-API Göndərici ID",
-    "msg_src_required"                          => "SMS-API Göndərici ID tələb olunan sahədir",
-    "msg_uid"                                   => "SMS-API İstifadəçi adı",
-    "msg_uid_required"                          => "SMS-API İstifadəçi adı tələb olunan sahədir",
-    "multi_pack_enabled"                        => "Hər bir elementə birdən çox paket",
-    "no_risk"                                   => "Təhlükəsizlik / zəiflik riski yoxdur.",
-    "none"                                      => "Heç biri",
-    "notify_alignment"                          => "Bildiriş Pəncərə Mövqeyi",
-    "number_format"                             => "Nömrə Formatı",
-    "number_locale"                             => "Yerləşdirmə",
-    "number_locale_invalid"                     => "Kompaniyanın tel.",
-    "number_locale_required"                    => "Şirkət telefonu olan sahə boş qalma bilməz.",
-    "number_locale_tooltip"                     => "Bu link vasitəsilə uyğun bir yer tapın.",
-    "os_timezone"                               => "OSPOS Saat qurşağı:",
-    "ospos_info"                                => "OSPOS quraşdırılması məlumatı",
-    "payment_options_order"                     => "Sifariş üçün Ödəmə Şərtləri",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Şirkətin Telefon Nömrəsi",
-    "phone_required"                            => "Şirkət Telefonu tələb olunan bir sahədir.",
-    "print_bottom_margin"                       => "Çərçivədki aşağı Sərhəd",
-    "print_bottom_margin_number"                => "Aşağıdaki Sərhəd rəqəm ilə olmalıdır.",
-    "print_bottom_margin_required"              => "Aşağıdakı Sərhəd boş qala bilməz.",
-    "print_delay_autoreturn"                    => "Gecikmiş satışa Avto qaytarılma",
-    "print_delay_autoreturn_number"             => "Satışı dayandırmaq üçün autoqaytarılma zəruri bir sahədir.",
-    "print_delay_autoreturn_required"           => "Satışı dayandırmaq üçün autoqaytarılma bir sıra olmalıdır.",
-    "print_footer"                              => "Brauzer Altlığını Çap Et",
-    "print_header"                              => "Brauzer Başlığını çap et",
-    "print_left_margin"                         => "Soldaki Künc",
-    "print_left_margin_number"                  => "Soldaki Künc rəqəm ilə olmalıdır.",
-    "print_left_margin_required"                => "Soldaki Künc olan sahə boş qala bilməz.",
-    "print_receipt_check_behaviour"             => "Qəbzin çapını təsdiqləyin",
-    "print_receipt_check_behaviour_always"      => "Həmişə yoxlanılır",
-    "print_receipt_check_behaviour_last"        => "Son seçimi yadda saxla",
-    "print_receipt_check_behaviour_never"       => "Həmişə təsdiqləsin",
-    "print_right_margin"                        => "Sağdaki Künc",
-    "print_right_margin_number"                 => "Sağdakı Künc rəqəm ilə olmalıdır.",
-    "print_right_margin_required"               => "Sağdakı Künc olan sahə boş qala bilməz.",
-    "print_silently"                            => "Çap Edilmiş Yazışmanı Gostər",
-    "print_top_margin"                          => "Üstdəki Künc",
-    "print_top_margin_number"                   => "Üstdəki Künc rəqəm ilə olmalıdır.",
-    "print_top_margin_required"                 => "Üstdəki Sahə Boş qala bilməz.",
-    "quantity_decimals"                         => "Ondalıqların Miqdarı",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Standart şərhlər",
-    "receipt"                                   => "Çek",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Çek Cap Parametirləri",
-    "receipt_default"                           => "Adi",
-    "receipt_font_size"                         => "Yazı Tipi",
-    "receipt_font_size_number"                  => "Yazı ölçüsü bir sıra olmalıdır.",
-    "receipt_font_size_required"                => "Yazı tipi ölçüsü zəruri bir sahədir.",
-    "receipt_info"                              => "Alınan Konfiqurasiya Məlumatı",
-    "receipt_printer"                           => "Bilet Çap edən",
-    "receipt_short"                             => "Qısa",
-    "receipt_show_company_name"                 => "Şirkətin Adını Göstər",
-    "receipt_show_description"                  => "Təsviri Göstər",
-    "receipt_show_serialnumber"                 => "Serial nömrəsi göstər",
-    "receipt_show_tax_ind"                      => "Vergi göstəricisinə bax",
-    "receipt_show_taxes"                        => "Vergini Göstər",
-    "receipt_show_total_discount"               => "Ümumi Endirim göstər",
-    "receipt_template"                          => "Geri qaytarmaq mütləq məsafə lazımdır",
-    "receiving_calculate_average_price"         => "Otalama Qiyməti Hesabla (Alınan)",
-    "recv_invoice_format"                       => "Alınan Fatura Formatı",
-    "register_mode_default"                     => "Standart Qeydiyyat Rejimi",
-    "report_an_issue"                           => "Bir problemi bildirişi",
-    "return_policy_required"                    => "Geri Qaytarma Qanunu olan sahə zəruri sahədir.",
-    "reward"                                    => "Mükafat",
-    "reward_configuration"                      => "Konfiqurasiya ugurla saxlanıldı",
-    "right"                                     => "Konfiqurasiya ugursuz oldu saxlanilmadi",
-    "sales_invoice_format"                      => "Satış Fatura Formatı",
-    "sales_quote_format"                        => "Satış Sitat Formati",
-    "saved_successfully"                        => "Konfiqurasiya uğurla saxlanıldı.",
-    "saved_unsuccessfully"                      => "Konfiqurasiyanı saxlamq mümkün olmadı.",
-    "security_issue"                            => "Təhlükəsizlik açığı xəbərdarlığı",
-    "server_notice"                             => "Xahiş edirik, hesabatın təqdim edilməsi üçün aşağıdakı məlumatı istifadə edin.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Ofis İşarəsini Göstər",
-    "statistics"                                => "Statistikalari Göndər",
-    "statistics_tooltip"                        => "İnkişaf və xüsusiyyət təkmilləşdirilməsi məqsədi ilə statistika göndərin.",
-    "stock_location"                            => "Ehtiyyat Yeri",
-    "stock_location_duplicate"                  => "Ehtiyyat Olan Yer Unikal Olmalıdir.",
-    "stock_location_invalid_chars"              => "Ehtiyyat Yeri təşkil etməməlidir '_'.",
-    "stock_location_required"                   => "Ehtiyyat Yeri Olan Sahə boş qala bilməz.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Sütun 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Təklif Çərçivələrini Axtar",
-    "suggestions_second_column"                 => "Sütun 2",
-    "suggestions_third_column"                  => "Sütun 3",
-    "system_conf"                               => "Quraşdırma və Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Masa",
-    "table_configuration"                       => "Cədvəl Konfiqurasiyası",
-    "takings_printer"                           => "Printer Çeki",
-    "tax"                                       => "Vergi",
-    "tax_category"                              => "Vergi Kategoriyasi",
-    "tax_category_duplicate"                    => "Daxil edilən vergi kategoriyası artıq mövcuddur.",
-    "tax_category_invalid_chars"                => "Daxil edilən vergi kategoriyası səhvdir.",
-    "tax_category_required"                     => "Vergi Kategoriyası tələb olunur.",
-    "tax_category_used"                         => "Vergi kateqoriyası istifadə olunduğu üçün silinə bilməz.",
-    "tax_configuration"                         => "Vergi Konfiqurasiyası",
-    "tax_decimals"                              => "Vaxt",
-    "tax_id"                                    => "Vergi İD",
-    "tax_included"                              => "Vergi Daxildir",
-    "theme"                                     => "Vebsayt",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Minliklər Ayıran",
-    "timezone"                                  => "Vaxt Zonası",
-    "timezone_error"                            => "OSPOS Saat qurşağı Yerli saat qurşağınızdan fərqlidir.",
-    "top"                                       => "Yuxarı",
-    "use_destination_based_tax"                 => "Təyinatından vergi istifadə edin",
-    "user_timezone"                             => "Yerli saat qurşağı:",
-    "website"                                   => "Vebsayt",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "İş Sifariş Dəstəyi",
-    "work_order_format"                         => "İş Sifarş Farmatı",
+    'address'                                   => 'Şirkət Unvanı',
+    'address_required'                          => 'Şirkətin adı olan boşluq sahəsi doldurulmalıdı.',
+    'all_set'                                   => 'Bütün fayl icazələri düzgün qurulub!',
+    'allow_duplicate_barcodes'                  => 'Dublikat Barkodlarına icazə verin',
+    'apostrophe'                                => 'Apastrof',
+    'backup_button'                             => 'Ehtiyyat Köçürmə',
+    'backup_database'                           => 'Məlumat Bazasını Ehtiyyat Yaddaşına Göndər',
+    'barcode'                                   => 'Barkod',
+    'barcode_company'                           => 'Şirkətin Adı',
+    'barcode_configuration'                     => 'Barkod Konfiqurasiyası',
+    'barcode_content'                           => 'Barkod Məzmunu',
+    'barcode_first_row'                         => 'Sıra 1',
+    'barcode_font'                              => 'Yazı Tipi',
+    'barcode_formats'                           => 'Giriş Formatları',
+    'barcode_generate_if_empty'                 => 'Boşdursa Yarat.',
+    'barcode_height'                            => 'Hündürlük',
+    'barcode_id'                                => 'Malın İd/Adı',
+    'barcode_info'                              => 'Barkod Konfiqurasiya Məlumatı',
+    'barcode_layout'                            => 'Barkod Çərçivəsi',
+    'barcode_name'                              => 'Ad',
+    'barcode_number'                            => 'Barkod',
+    'barcode_number_in_row'                     => 'Sıradakı Nömrə',
+    'barcode_page_cellspacing'                  => 'Səhifədə hüceyrə sahəsini göstərin.',
+    'barcode_page_width'                        => 'Səyfənin genişliyini göstər',
+    'barcode_price'                             => 'Qiymət',
+    'barcode_second_row'                        => 'Sıra 2',
+    'barcode_third_row'                         => 'Sira 3',
+    'barcode_tooltip'                           => 'Diqqət: Bu xüsusiyyət malların dublikat olmaslna, idxal edilməsinə və ya yaradılmasına səbəb ola bilər. Çoğaltıcı barkod istəmirsinizsə istifadə etməyin.',
+    'barcode_type'                              => 'Barkod Növü',
+    'barcode_width'                             => 'Genişlik',
+    'bottom'                                    => 'Aşağı',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Nəğd Pul Cədvəlləri',
+    'cash_decimals_tooltip'                     => 'Nağd pul və Məzənnədəki ədədlər eyni olarsa, onda nağd pul yuvarlaqlaşması baş verməz.',
+    'cash_rounding'                             => 'Nəğd Pul Yuvarlaqlaşdırılması',
+    'category_dropdown'                         => 'Bölməni açılan siyahida göstər',
+    'center'                                    => 'Mərkəz',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'vergül',
+    'company'                                   => 'Şirkətin Adı',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Şəkili Dəyiş',
+    'company_logo'                              => 'Şirkətin Logosu',
+    'company_remove_image'                      => 'Şəkili Sil',
+    'company_required'                          => 'Şirkətin adı qeyd olunmalıdır',
+    'company_select_image'                      => 'Şəkil Seç',
+    'company_website_url'                       => 'Şirkətin web saytı düzgün URL deyil.',
+    'country_codes'                             => 'Ölkə Kodları',
+    'country_codes_tooltip'                     => 'Vergüllə ayrılmış ölkə kodları üçün nominantim adres axtarışı.',
+    'currency_code'                             => 'Valyuta Kodu',
+    'currency_decimals'                         => 'Məzənnə Rəqəmləri',
+    'currency_symbol'                           => 'Valyuta Simvolu',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Mükafat',
+    'customer_reward_duplicate'                 => 'Mükafat unikal olmalıdir.',
+    'customer_reward_enable'                    => 'Müştəri mükafatlarını aktivləşdirin',
+    'customer_reward_invalid_chars'             => "Mukafat '_ ' təşkil edə bilməz",
+    'customer_reward_required'                  => 'Mükafat olan sahə boş qala bilməz',
+    'customer_sales_tax_support'                => 'Müştəri Satış Vergi Dəstəyi',
+    'date_or_time_format'                       => 'Tarix və Vaxt Filteri',
+    'datetimeformat'                            => 'Tarix və Vaxt formatı',
+    'decimal_point'                             => 'Ondaliq Nöqtə',
+    'default_barcode_font_size_number'          => 'Standart Barkod Yazı Növü Ölçüsü rəqəm ilə olmalıdır.',
+    'default_barcode_font_size_required'        => 'Standart Barkod Yazı Növü Ölçüsü olan sahə boş qala bilməz.',
+    'default_barcode_height_number'             => 'Standart Barkod hündürlüyü rəqəm ilə olmalıdır.',
+    'default_barcode_height_required'           => 'Standart Barkod olan sahə boş qala bilməz.',
+    'default_barcode_num_in_row_number'         => 'Sıradakı Barkod Nömrəsi rəqəm ilə olmalıdır.',
+    'default_barcode_num_in_row_required'       => 'Standart Barkod Nömrəsi olan sahə boş qala bilməz.',
+    'default_barcode_page_cellspacing_number'   => 'Standart Barkod Səhifədki hücrə boşluğu rəqəm ilə olmalıdır.',
+    'default_barcode_page_cellspacing_required' => 'Standart Barkod Səhifədəki hücrə boşluğu olan sahə boş qala bilməz.',
+    'default_barcode_page_width_number'         => 'Standart Barkod Sahifə genişliyi rəqəm ilə olmalıdır.',
+    'default_barcode_page_width_required'       => 'Standart Barkod Səhifə Genişliyi olan sahə boş qala bilməz.',
+    'default_barcode_width_number'              => 'Standart Barkod Genişliyi rəqəm ilə olmalıdır.',
+    'default_barcode_width_required'            => 'Standart Barkod Genişliyi olan sahə boş qala bilməz.',
+    'default_item_columns'                      => 'Sabit Görünür Malların Sütunları',
+    'default_origin_tax_code'                   => 'Vergi Kodunun Standart Mənbəyi',
+    'default_receivings_discount'               => 'Alışdan sonra standart endirim',
+    'default_receivings_discount_number'        => 'Sabit alacaqlar endirimi bir nömrə olmalıdır.',
+    'default_receivings_discount_required'      => 'Standart alış endirimi tələb olunan sahədir.',
+    'default_sales_discount'                    => 'Standart Satış Endirimi',
+    'default_sales_discount_number'             => 'Standart Satış Endirimi rəqəm ilə olmalıdır.',
+    'default_sales_discount_required'           => 'Standart Satış Endirimi tələb olunan sahədi.',
+    'default_tax_category'                      => 'Standart Vergi Bölməsi',
+    'default_tax_code'                          => 'Standart Vergo kodu',
+    'default_tax_jurisdiction'                  => 'Standart Vergi Yurisdiksiyası',
+    'default_tax_name_number'                   => 'Standart Vergi Adı uzun adlı olmalıdır .',
+    'default_tax_name_required'                 => 'Adi vergi mütləq rəqəmlə olmalıdır.',
+    'default_tax_rate'                          => 'Adi vergi dərəcəsi %',
+    'default_tax_rate_1'                        => 'Vergi Dərəcəsi 1',
+    'default_tax_rate_2'                        => 'Vergi Məzənnəsi 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Standart Vergi Məzənnəsi rəqəm ilə olmalıdır.',
+    'default_tax_rate_required'                 => 'Standart Vergi Məzənnəsi olan sahə boş qala bilməz.',
+    'derive_sale_quantity'                      => 'Tərtib edilmiş satış məbləğinə icazə verin',
+    'derive_sale_quantity_tooltip'              => 'Əgər yoxlanılırsa, uzunmüddətli məbləğdə sifariş edilən əşyalar üçün yeni bir mal növü veriləcəkdir',
+    'dinner_table'                              => 'Cədvəl',
+    'dinner_table_duplicate'                    => 'Cədvəl unikal olmalıdır.',
+    'dinner_table_enable'                       => 'Axşam yeməyi masalarını aktiv edin',
+    'dinner_table_invalid_chars'                => "Masanın adı '_' təşkil etməməlidir.",
+    'dinner_table_required'                     => 'Masa olan sahə boş qala bilməz.',
+    'dot'                                       => 'nöqtə',
+    'email'                                     => 'Elektron Adres',
+    'email_configuration'                       => 'Elektron Adres Konfiqurasiyası',
+    'email_mailpath'                            => 'Email Göndərməyə qısa yol',
+    'email_protocol'                            => 'Protokol',
+    'email_receipt_check_behaviour'             => 'E-poçt qəbzi qutusu',
+    'email_receipt_check_behaviour_always'      => 'Həmişə yoxlanılır',
+    'email_receipt_check_behaviour_last'        => 'Son seçimi yadda saxla',
+    'email_receipt_check_behaviour_never'       => 'Həmişə aktiv deyil',
+    'email_smtp_crypto'                         => 'SMTP Şifrələmə',
+    'email_smtp_host'                           => 'SMTP Serveri',
+    'email_smtp_pass'                           => 'SMTP Şifrəsi',
+    'email_smtp_port'                           => 'SMTP Portu',
+    'email_smtp_timeout'                        => 'STMTP vaxt bitimi (lər)',
+    'email_smtp_user'                           => 'SMTP İstifadəçi Adı',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Məxvilik Təmin edin',
+    'enforce_privacy_tooltip'                   => 'Müştərilərin gizliliyini qorumaq, silmək halında məlumat şifrələməsini təmin etmək',
+    'fax'                                       => 'Faks',
+    'file_perm'                                 => 'Fayl icazəsində problem var, lütfən bu səhvləri düzəldib səhifəni yeniləyin.',
+    'financial_year'                            => 'Maliyyə İli Başlancığı',
+    'financial_year_apr'                        => '1 Aprel',
+    'financial_year_aug'                        => '1 Avgust',
+    'financial_year_dec'                        => '1 Dekabr',
+    'financial_year_feb'                        => '1 Fevral',
+    'financial_year_jan'                        => '1 Yanvar',
+    'financial_year_jul'                        => '1 İyul',
+    'financial_year_jun'                        => '1 İyun',
+    'financial_year_mar'                        => '1 Mart',
+    'financial_year_may'                        => '1 May',
+    'financial_year_nov'                        => '1 Noyabr',
+    'financial_year_oct'                        => '1 Oktyabr',
+    'financial_year_sep'                        => '1 Sentyabr',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Giriş Səyfəsi reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Gizli Açarı',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Gizli Açar olan sahə boş qala bilməz',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Sayt Açarı',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Sayt Açarı olan sahə boş qala bilməz',
+    'gcaptcha_tooltip'                          => 'Giriş səhifəsini Google reCAPTCHA ilə qoruyun, APİ açarını uyğunlaşdırmaq üçün işarə ilə göstərilən düyməyə basın.',
+    'general'                                   => 'Ümumi',
+    'general_configuration'                     => 'Ümumi Konfiqurasiya',
+    'giftcard_number'                           => 'Hədiyyə Kartı Nömrəsi',
+    'giftcard_random'                           => 'Təsadüfən Yarat',
+    'giftcard_series'                           => 'Bölümlərə görə Yarat',
+    'image_allowed_file_types'                  => 'İcazəli fayl növləri',
+    'image_max_height_tooltip'                  => 'Şəkillərinin maksimum hündürlüyü pikselə(px).',
+    'image_max_size_tooltip'                    => 'Şəkil yükləmələrinin maksimum fayl ölçüsü kilobaytla(kb).',
+    'image_max_width_tooltip'                   => 'Şəkillərinin maksimum enliliyi pikselə(px).',
+    'image_restrictions'                        => 'Şəkil yükləmə məhdudiyyətləri',
+    'include_hsn'                               => 'HSN Kodlarına dəstək verin',
+    'info'                                      => 'Məlumat',
+    'info_configuration'                        => 'Dükan İnformasiyası',
+    'input_groups'                              => '',
+    'integrations'                              => 'İnteqrasiya',
+    'integrations_configuration'                => 'Üçüncü tərəf inteqrasiya',
+    'invoice'                                   => 'Faktura',
+    'invoice_configuration'                     => 'Faktura Çap Parametrləri',
+    'invoice_default_comments'                  => 'Standart Faktura Şərhləri',
+    'invoice_email_message'                     => 'Faktura E-poçt Şablonu',
+    'invoice_enable'                            => 'Fakturanı Aktivləşdir',
+    'invoice_printer'                           => 'Faktura Printeri',
+    'invoice_type'                              => 'Qaimənin Tipi',
+    'is_readable'                               => 'oxunur, lakin icazələr 660-dan yüksəkdir.',
+    'is_writable'                               => 'yazılabilir, lakin icazələr 750-dən yüksəkdir.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Xəbərdarlıq: Bu funksiya yalnız FireFox jsPrintSetup addon quraşdırıldığı halda işləyəcəkdir. Yadda saxlanılsın?',
+    'language'                                  => 'Dil',
+    'last_used_invoice_number'                  => 'Son istifadə edilmiş Faktura nömrəsi',
+    'last_used_quote_number'                    => 'Son istifadə edilmiş Kvota sayı',
+    'last_used_work_order_number'               => 'Son istifadə edilən W / O sayı',
+    'left'                                      => 'Sol',
+    'license'                                   => 'Lisenziya',
+    'license_configuration'                     => 'Lisenziya bəyanatı',
+    'line_sequence'                             => 'Sıra Ardıcıllığı',
+    'lines_per_page'                            => 'Səhifə başına xəttlər',
+    'lines_per_page_number'                     => 'Səhifə başına sətirlər bir rəqəm ilə olmalıdır.',
+    'lines_per_page_required'                   => 'Səyfə Başına olan xəttər sahəsi boş qala bilməz.',
+    'locale'                                    => 'Yerləşdirmə',
+    'locale_configuration'                      => 'Lokallaşdırma Konfiqurasiyası',
+    'locale_info'                               => 'Lokallaşdırma Konfiqurasiya Məlumatı',
+    'location'                                  => 'Fond',
+    'location_configuration'                    => 'Anbar Yerləri',
+    'location_info'                             => 'Yer Konfiqurasiya Məlumatı',
+    'login_form'                                => '',
+    'logout'                                    => "Çıxışdan əvvəl məlumatlari ehtiyat bazasına köçürmək istəyirsinizmi? Çıxış üçün Bekap və ya [Ləğv] üçün [OK]' düyməsinə basın.",
+    'mailchimp'                                 => 'Mailçimp',
+    'mailchimp_api_key'                         => 'Mailchimp API Açarı',
+    'mailchimp_configuration'                   => 'Mailchimp Konfiqurasiyası',
+    'mailchimp_key_successfully'                => 'API Açarı etibarlıdır.',
+    'mailchimp_key_unsuccessfully'              => 'API Açarı etibarsızdır.',
+    'mailchimp_lists'                           => 'Mailchimp siyahısı (lar)',
+    'mailchimp_tooltip'                         => 'API Açarının İşarəsinə basın.',
+    'message'                                   => 'Mesaj',
+    'message_configuration'                     => 'Mesaj Konfiqurasiyası',
+    'msg_msg'                                   => 'Saxlanılan Mətn Mesajı',
+    'msg_msg_placeholder'                       => 'SMS şablonunu istifadə etmək istəyirsinizsə, mesajınızı buraya qeyd edin, əks halda qutunu boş buraxın.',
+    'msg_pwd'                                   => 'SMS-API Şifrəsi',
+    'msg_src'                                   => 'SMS-API Göndərici ID',
+    'msg_src_required'                          => 'SMS-API Göndərici ID tələb olunan sahədir',
+    'msg_uid'                                   => 'SMS-API İstifadəçi adı',
+    'msg_uid_required'                          => 'SMS-API İstifadəçi adı tələb olunan sahədir',
+    'multi_pack_enabled'                        => 'Hər bir elementə birdən çox paket',
+    'no_risk'                                   => 'Təhlükəsizlik / zəiflik riski yoxdur.',
+    'none'                                      => 'Heç biri',
+    'notify_alignment'                          => 'Bildiriş Pəncərə Mövqeyi',
+    'number_format'                             => 'Nömrə Formatı',
+    'number_locale'                             => 'Yerləşdirmə',
+    'number_locale_invalid'                     => 'Daxil edilən yerləşdirmə etibarsızdır.',
+    'number_locale_required'                    => 'Yerləşdirmə tələb olunan sahədir.',
+    'number_locale_tooltip'                     => 'Bu link vasitəsilə uyğun bir yer tapın.',
+    'os_timezone'                               => 'OSPOS Saat qurşağı:',
+    'ospos_info'                                => 'OSPOS quraşdırılması məlumatı',
+    'payment_options_order'                     => 'Sifariş üçün Ödəmə Şərtləri',
+    'payment_reference_code_length_limits'      => 'Ödəniş İstinad Kodu<br>Uzunluq Limitləri',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Şirkətin Telefon Nömrəsi',
+    'phone_required'                            => 'Şirkət Telefonu tələb olunan bir sahədir.',
+    'print_bottom_margin'                       => 'Çərçivədki aşağı Sərhəd',
+    'print_bottom_margin_number'                => 'Aşağıdaki Sərhəd rəqəm ilə olmalıdır.',
+    'print_bottom_margin_required'              => 'Aşağıdakı Sərhəd boş qala bilməz.',
+    'print_delay_autoreturn'                    => 'Gecikmiş satışa Avto qaytarılma',
+    'print_delay_autoreturn_number'             => 'Satışı dayandırmaq üçün autoqaytarılma zəruri bir sahədir.',
+    'print_delay_autoreturn_required'           => 'Satışı dayandırmaq üçün autoqaytarılma bir sıra olmalıdır.',
+    'print_footer'                              => 'Brauzer Altlığını Çap Et',
+    'print_header'                              => 'Brauzer Başlığını çap et',
+    'print_left_margin'                         => 'Soldaki Künc',
+    'print_left_margin_number'                  => 'Soldaki Künc rəqəm ilə olmalıdır.',
+    'print_left_margin_required'                => 'Soldaki Künc olan sahə boş qala bilməz.',
+    'print_receipt_check_behaviour'             => 'Qəbzin çapını təsdiqləyin',
+    'print_receipt_check_behaviour_always'      => 'Həmişə yoxlanılır',
+    'print_receipt_check_behaviour_last'        => 'Son seçimi yadda saxla',
+    'print_receipt_check_behaviour_never'       => 'Həmişə təsdiqləsin',
+    'print_right_margin'                        => 'Sağdaki Künc',
+    'print_right_margin_number'                 => 'Sağdakı Künc rəqəm ilə olmalıdır.',
+    'print_right_margin_required'               => 'Sağdakı Künc olan sahə boş qala bilməz.',
+    'print_silently'                            => 'Çap Edilmiş Yazışmanı Gostər',
+    'print_top_margin'                          => 'Üstdəki Künc',
+    'print_top_margin_number'                   => 'Üstdəki Künc rəqəm ilə olmalıdır.',
+    'print_top_margin_required'                 => 'Üstdəki Sahə Boş qala bilməz.',
+    'quantity_decimals'                         => 'Ondalıqların Miqdarı',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Standart şərhlər',
+    'receipt'                                   => 'Çek',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Çek Cap Parametirləri',
+    'receipt_default'                           => 'Adi',
+    'receipt_font_size'                         => 'Yazı Tipi',
+    'receipt_font_size_number'                  => 'Yazı ölçüsü bir sıra olmalıdır.',
+    'receipt_font_size_required'                => 'Yazı tipi ölçüsü zəruri bir sahədir.',
+    'receipt_info'                              => 'Alınan Konfiqurasiya Məlumatı',
+    'receipt_printer'                           => 'Bilet Çap edən',
+    'receipt_short'                             => 'Qısa',
+    'receipt_show_company_name'                 => 'Şirkətin Adını Göstər',
+    'receipt_show_description'                  => 'Təsviri Göstər',
+    'receipt_show_serialnumber'                 => 'Serial nömrəsi göstər',
+    'receipt_show_tax_ind'                      => 'Vergi göstəricisinə bax',
+    'receipt_show_taxes'                        => 'Vergini Göstər',
+    'receipt_show_total_discount'               => 'Ümumi Endirim göstər',
+    'receipt_template'                          => 'Qəbz Şablonu',
+    'receiving_calculate_average_price'         => 'Otalama Qiyməti Hesabla (Alınan)',
+    'recv_invoice_format'                       => 'Alınan Fatura Formatı',
+    'register_mode_default'                     => 'Standart Qeydiyyat Rejimi',
+    'report_an_issue'                           => 'Bir problemi bildirişi',
+    'return_policy_required'                    => 'Geri Qaytarma Qanunu olan sahə zəruri sahədir.',
+    'reward'                                    => 'Mükafat',
+    'reward_configuration'                      => 'Mükafat Konfiqurasiyası',
+    'right'                                     => 'Sağ',
+    'sales_invoice_format'                      => 'Satış Fatura Formatı',
+    'sales_quote_format'                        => 'Satış Sitat Formati',
+    'mailpath_invalid'                          => 'Yanlış sendmail yolu. Yalnız hərflərə, rəqəmlərə, tirelərə, alt xətlərə, əyri xətlərə, tərs əyri xətlərə, iki nöqtəyə, boşluqlara və nöqtələrə icazə verilir.',
+    'saved_successfully'                        => 'Konfiqurasiya uğurla saxlanıldı.',
+    'saved_unsuccessfully'                      => 'Konfiqurasiyanı saxlamq mümkün olmadı.',
+    'security_issue'                            => 'Təhlükəsizlik açığı xəbərdarlığı',
+    'server_notice'                             => 'Xahiş edirik, hesabatın təqdim edilməsi üçün aşağıdakı məlumatı istifadə edin.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Ofis İşarəsini Göstər',
+    'statistics'                                => 'Statistikalari Göndər',
+    'statistics_tooltip'                        => 'İnkişaf və xüsusiyyət təkmilləşdirilməsi məqsədi ilə statistika göndərin.',
+    'stock_location'                            => 'Ehtiyyat Yeri',
+    'stock_location_duplicate'                  => 'Ehtiyyat Olan Yer Unikal Olmalıdir.',
+    'stock_location_invalid_chars'              => "Ehtiyyat Yeri təşkil etməməlidir '_'.",
+    'stock_location_required'                   => 'Ehtiyyat Yeri Olan Sahə boş qala bilməz.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Sütun 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Təklif Çərçivələrini Axtar',
+    'suggestions_second_column'                 => 'Sütun 2',
+    'suggestions_third_column'                  => 'Sütun 3',
+    'system_conf'                               => 'Quraşdırma və Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Masa',
+    'table_configuration'                       => 'Cədvəl Konfiqurasiyası',
+    'takings_printer'                           => 'Printer Çeki',
+    'tax'                                       => 'Vergi',
+    'tax_category'                              => 'Vergi Kategoriyasi',
+    'tax_category_duplicate'                    => 'Daxil edilən vergi kategoriyası artıq mövcuddur.',
+    'tax_category_invalid_chars'                => 'Daxil edilən vergi kategoriyası səhvdir.',
+    'tax_category_required'                     => 'Vergi Kategoriyası tələb olunur.',
+    'tax_category_used'                         => 'Vergi kateqoriyası istifadə olunduğu üçün silinə bilməz.',
+    'tax_configuration'                         => 'Vergi Konfiqurasiyası',
+    'tax_decimals'                              => 'Vergi Rəqəmləri',
+    'tax_id'                                    => 'Vergi İD',
+    'tax_included'                              => 'Vergi Daxildir',
+    'theme'                                     => 'Mövzu',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Minliklər Ayıran',
+    'timezone'                                  => 'Vaxt Zonası',
+    'timezone_error'                            => 'OSPOS Saat qurşağı Yerli saat qurşağınızdan fərqlidir.',
+    'top'                                       => 'Yuxarı',
+    'use_destination_based_tax'                 => 'Təyinatından vergi istifadə edin',
+    'user_timezone'                             => 'Yerli saat qurşağı:',
+    'website'                                   => 'Vebsayt',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'İş Sifariş Dəstəyi',
+    'work_order_format'                         => 'İş Sifarş Farmatı',
 ];
diff --git a/app/Language/az/Employees.php b/app/Language/az/Employees.php
index c9f8b698b..a9ac99058 100644
--- a/app/Language/az/Employees.php
+++ b/app/Language/az/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Məlumat",
-    "cannot_be_deleted"            => "Seçilmiş əməkdaş (lar) silinə bilməz, bir və ya birdən çox əməkdaş satışlar edib, əks halda siz öz heasabınızı silməyə çalışırsınız.",
-    "change_employee"              => "",
-    "change_password"              => "Şifrəni Dəyiş",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Siz əminsiniz ki seçilmiş əməkdaşları silmək istəyirsiniz?",
-    "confirm_restore"              => "Seçilmiş əməkdaşı (lar) yenidən bərpa etməyinizə əminsinizmi?",
-    "current_password"             => "İndiki Şifrə",
-    "current_password_invalid"     => "Hazirki Şifrə düzgün deyil.",
-    "employee"                     => "Əməkdaş",
-    "error_adding_updating"        => "Əməkdaş əlavə etməsk və ya yeniləməsi baş vermədi.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Demo administrator istifadəçisini silə bilməzsiniz.",
-    "error_updating_demo_admin"    => "Demo administrator istifadəçisini dəyişə bilməzsiniz.",
-    "language"                     => "Dil",
-    "login_info"                   => "Daxil Ol",
-    "manager"                      => "",
-    "new"                          => "Yeni Əməkdaş",
-    "none_selected"                => "Silmək üçün heç bir işçi (lər) seçməmisiniz.",
-    "one_or_multiple"              => "İşçi (lər)",
-    "password"                     => "Şifrə",
-    "password_minlength"           => "Şifrə ən azı 8 simvol olmalıdır.",
-    "password_must_match"          => "Şifrələr uyğun gəlmir.",
-    "password_not_must_match"      => "Hazırki şifrə və yeni şifrə unikal olmalıdır.",
-    "password_required"            => "Şifrə tələb olunur.",
-    "permission_desc"              => "Modullara giriş imkanı vermək üçün aşağıdakı qutuları yoxlayın.",
-    "permission_info"              => "İcazələr",
-    "repeat_password"              => "Şifrəni yenidən təkrar edin",
-    "subpermission_required"       => "Hər bir modul üçün ən azı bir qrant əlavə edin.",
-    "successful_adding"            => "Əməkdaş müvəffəqiyyətə əlavə olundu.",
-    "successful_change_password"   => "Şifrə müvəffəqiyyətlə dəyişildi.",
-    "successful_deleted"           => "Siz uğurla sildiniz",
-    "successful_updating"          => "Siz uğurla əməkdaşı yenilədiniz",
-    "system_language"              => "Sistem Dili",
-    "unsuccessful_change_password" => "Şifrə dəyişməsi uğursuz oldu.",
-    "update"                       => "İşçini yeniləyin",
-    "username"                     => "İstifadəçi Adı",
-    "username_duplicate"           => "",
-    "username_minlength"           => "İstifadəçi adı ən azı 5 simvol olmalıdır.",
-    "username_required"            => "İstifadəçi adı tələb olunan sahədir.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Məlumat',
+    'cannot_be_deleted'                      => 'Seçilmiş əməkdaş (lar) silinə bilməz, bir və ya birdən çox əməkdaş satışlar edib, əks halda siz öz hesabınızı silməyə çalışırsınız.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Şifrəni Dəyiş',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Siz əminsiniz ki seçilmiş əməkdaşları silmək istəyirsiniz?',
+    'confirm_restore'                        => 'Seçilmiş əməkdaşı (lar) yenidən bərpa etməyinizə əminsinizmi?',
+    'current_password'                       => 'İndiki Şifrə',
+    'current_password_invalid'               => 'Hazirki Şifrə düzgün deyil.',
+    'employee'                               => 'Əməkdaş',
+    'error_adding_updating'                  => 'Əməkdaş əlavə etməsk və ya yeniləməsi baş vermədi.',
+    'error_cannot_remove_own_minimum_grant'  => 'Öz minimum modul giriş qrantlarınızı silə bilməzsiniz.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Demo administrator istifadəçisini silə bilməzsiniz.',
+    'error_grant_change_disallowed'          => 'Bu demodan icazə dəyişiklikləri deaktivdir.',
+    'error_password_change_disallowed'       => 'Bu demodan şifrə dəyişiklikləri deaktivdir.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Demo administrator istifadəçisini dəyişə bilməzsiniz.',
+    'language'                               => 'Dil',
+    'login_info'                             => 'Daxil Ol',
+    'manager'                                => '',
+    'new'                                    => 'Yeni Əməkdaş',
+    'none_selected'                          => 'Silmək üçün heç bir işçi (lər) seçməmisiniz.',
+    'one_or_multiple'                        => 'İşçi (lər)',
+    'password'                               => 'Şifrə',
+    'password_minlength'                     => 'Şifrə ən azı 8 simvol olmalıdır.',
+    'password_must_match'                    => 'Şifrələr uyğun gəlmir.',
+    'password_not_must_match'                => 'Hazırki şifrə və yeni şifrə unikal olmalıdır.',
+    'password_required'                      => 'Şifrə tələb olunur.',
+    'permission_desc'                        => 'Modullara giriş imkanı vermək üçün aşağıdakı qutuları yoxlayın.',
+    'permission_info'                        => 'İcazələr',
+    'repeat_password'                        => 'Şifrəni yenidən təkrar edin',
+    'subpermission_required'                 => 'Hər bir modul üçün ən azı bir qrant əlavə edin.',
+    'successful_adding'                      => 'Əməkdaş müvəffəqiyyətə əlavə olundu.',
+    'successful_change_password'             => 'Şifrə müvəffəqiyyətlə dəyişildi.',
+    'successful_deleted'                     => 'Siz uğurla sildiniz',
+    'successful_updating'                    => 'Siz uğurla əməkdaşı yenilədiniz',
+    'system_language'                        => 'Sistem Dili',
+    'unsuccessful_change_password'           => 'Şifrə dəyişməsi uğursuz oldu.',
+    'update'                                 => 'İşçini yeniləyin',
+    'username'                               => 'İstifadəçi Adı',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'İstifadəçi adı ən azı 5 simvol olmalıdır.',
+    'username_required'                      => 'İstifadəçi adı tələb olunan sahədir.',
 ];
diff --git a/app/Language/az/Error.php b/app/Language/az/Error.php
index 383c3771a..32fd7658a 100644
--- a/app/Language/az/Error.php
+++ b/app/Language/az/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "sizin icazəniz yoxdur",
-    "unknown"              => "naməlum",
+    'no_permission_module'           => 'sizin icazəniz yoxdur',
+    'unable_to_create_env_file'      => 'throttle.key təmin etmək üçün {filePath} yaradıla bilmədi',
+    'unable_to_lock_file'            => '{filePath} kilidlənə bilmədi: {reason}',
+    'unable_to_open_lock_file'       => '{filePath} açıla bilmədi: {reason}',
+    'unable_to_persist_throttle_key' => 'throttle.key {filePath} faylına yazıla bilmədi',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'throttle.key təmin etmək üçün {filePath} oxuna bilmədi',
+    'unknown'                        => 'naməlum',
 ];
diff --git a/app/Language/az/Items.php b/app/Language/az/Items.php
index f3a91610e..eec45975b 100644
--- a/app/Language/az/Items.php
+++ b/app/Language/az/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "İnventar + Topla və ya - Çıx.",
-    "allow_alt_description"              => "Alternativ təsvirə icazə verin",
-    "amount_entry"                       => "Məbləğ Əlavəsi",
-    "bulk_edit"                          => "Kütləvi Redaktə",
-    "buy_price_required"                 => "Alış qiyməti tələb olunan sahədir.",
-    "cannot_be_deleted"                  => "Seçilmiş Mal (lar) silmək mükün deyil, bir və ya birdən çox Mallarda Satışlar var.",
-    "cannot_find_item"                   => "Mal Tapılmadı.",
-    "categories"                         => "",
-    "category"                           => "Bolmə",
-    "category_new"                       => "",
-    "category_required"                  => "Bölmə sahəsi boş qala bilməz.",
-    "change_all_to_allow_alt_desc"       => "Hamısı üçün Alternativ Təsvirə İcazə Verin.",
-    "change_all_to_not_allow_allow_desc" => "Hamısı üçün Alternativ Təsvirə İcazə Verməyin.",
-    "change_all_to_serialized"           => "Hamısını Seriyalaşdırılmışa görə dəyişin",
-    "change_all_to_unserialized"         => "Qeyri Seriyalara görə dəyiş",
-    "change_image"                       => "Şəkili Dəyiş",
-    "confirm_bulk_edit"                  => "Siz əminsinizmi ki işarələnmiş butun malları redaktə etmək istəyirsiniz?",
-    "confirm_bulk_edit_wipe_taxes"       => "Bütün Məhsul Vergisi məlumatları dəyişdiriləcək.",
-    "confirm_delete"                     => "Seçilmiş element(ləri) silmək istədiyinizə əminsiniz?",
-    "confirm_restore"                    => "Seçilmiş element (lər) bərpa etmək istədiyinizə əminsinizmi?",
-    "cost_price"                         => "Topdan Satış qiyməti",
-    "cost_price_number"                  => "Topdansatış qiyməti rəqəm olmalıdır.",
-    "cost_price_required"                => "Topdan satiış - doldurulması vacib sahə.",
-    "count"                              => "inventorun yenilənməsi",
-    "csv_import_failed"                  => "səhv csv import",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Yüklənmiş faylda məlumat yoxdur və ya düzgün formatlanmır.",
-    "csv_import_partially_failed"        => "Xətlərdə {0} element idxalı uğursuzluq (lar) var: {1}. Heç bir sıra idxal edilmədi.",
-    "csv_import_success"                 => "Malların İdxalı Uğurla Həyata Keçdi.",
-    "current_quantity"                   => "indiki say",
-    "default_pack_name"                  => "Hər biri",
-    "description"                        => "təsvir",
-    "details_count"                      => "detallı inventor sayı",
-    "do_nothing"                         => "heç nə etməmək",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Seçilmiş məhsullar üçün tələb olunan sahələri redaktə edin.",
-    "edit_multiple_items"                => "bir neçə malın redaktəsi",
-    "empty_upc_items"                    => "Boş Barkod Malları",
-    "error_adding_updating"              => "mal əlavə etməkdə və ya yeniləməkdə səhv var",
-    "error_updating_multiple"            => "malların yenilənməsində səhv var",
-    "generate_barcodes"                  => "şifrə yarat",
-    "hsn_code"                           => "Harmonize Sistem Nomenklaturası",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "CSVdən Malları İdxal Et",
-    "info_provided_by"                   => "Məlumat təqdim olundu",
-    "inventory"                          => "inventor",
-    "inventory_CSV_import_quantity"      => "Miqdarı CSV-dən idxal olunur",
-    "inventory_comments"                 => "komentariyalar",
-    "inventory_data_tracking"            => "İnventarlaşdırma Üçün Məlumat İzləmə",
-    "inventory_date"                     => "Tarix",
-    "inventory_employee"                 => "Əmakdaş",
-    "inventory_in_out_quantity"          => "Daxili və Xarici Say",
-    "inventory_remarks"                  => "Qeydlər",
-    "is_deleted"                         => "Silindi",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Malın Seriya Nömrəsi var",
-    "item"                               => "Mal",
-    "item_id"                            => "",
-    "item_number"                        => "Barkod",
-    "item_number_duplicate"              => "Malın Nömrəsi artiq Məlumat bazasında var.",
-    "kit"                                => "Dəst",
-    "location"                           => "Yer",
-    "low_inventory_items"                => "Bitmış Mallar",
-    "low_sell_item"                      => "Malların aşağı qiy. satışı",
-    "manually_editing_of_quantity"       => "Sayı Əl ilə Redeaktə Etmək",
-    "markup"                             => "",
-    "name"                               => "Malın Adı",
-    "name_required"                      => "Malın adı olan sahə boş qala bilməz.",
-    "new"                                => "Yeni Mal",
-    "no_description_items"               => "Mallar haqqında Təsvir Yoxdur",
-    "no_items_to_display"                => "Mallar Göstərilmir.",
-    "none"                               => "Heçnə",
-    "none_selected"                      => "Siz redaktə etmək üçün hər hansı bir mal seçməmisiniz",
-    "nonstock"                           => "Əldə Olmayan",
-    "number_information"                 => "Malın Nömrəsi",
-    "number_required"                    => "Barkod tələb olunan sahədir.",
-    "one_or_multiple"                    => "Mal (lar)",
-    "pack_name"                          => "Paket Adı",
-    "qty_per_pack"                       => "Paketin miqdarı",
-    "quantity"                           => "Sayı",
-    "quantity_number"                    => "Miqdarı mütləq rəqəmlə olmalıdır.",
-    "quantity_required"                  => "Miqyas tələb olunan sahədir.",
-    "receiving_quantity"                 => "Qəbul Olunan Miqdar",
-    "remove_image"                       => "Şəkili Sil",
-    "reorder_level"                      => "Səviyyani yenidən düzəlt",
-    "reorder_level_number"               => "Yenidən sıralama səviyyəsi rəqəmlə olmalıdır.",
-    "reorder_level_required"             => "Düzəliş Səviyyəsi zəruri bir sahədir.",
-    "retrive_item_info"                  => "Mal Haqqında Məlumat",
-    "sales_tax_1"                        => "Satış Vergisi",
-    "sales_tax_2"                        => "Satış Vergisi 2",
-    "search_attributes"                  => "Atributları Axtar",
-    "select_image"                       => "Şəkil Seç",
-    "serialized_items"                   => "Seriyalı Mallar",
-    "standard"                           => "Standart",
-    "stock"                              => "Ehtiyyat",
-    "stock_location"                     => "Ehtiyyatın Yerləşdiyi Yer",
-    "stock_type"                         => "Ehtiyyatda olanın Növü",
-    "successful_adding"                  => "Siz uğurla malı əlavə etdiniz",
-    "successful_bulk_edit"               => "Siz uğurla bütun mallari yenilədiniz",
-    "successful_deleted"                 => "Siz uğurla sildiniz",
-    "successful_updating"                => "Siz uğurla malı yenilədiniz",
-    "supplier"                           => "Təchizatcı",
-    "tax_1"                              => "Vergi 1",
-    "tax_2"                              => "Vergi 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Vergi Bolməsi",
-    "tax_percent"                        => "Vergi Faizi",
-    "tax_percent_number"                 => "Vergi Faizi rəqəmli dəyər vahidi olmalıdir",
-    "tax_percent_required"               => "Vergi Faizi tələb olunan sahədir.",
-    "tax_percents"                       => "Vergi Faiz(lər) i",
-    "temp"                               => "Müvəqqəti",
-    "type"                               => "Malın Növü",
-    "unit_price"                         => "Pərakəndə Satış",
-    "unit_price_number"                  => "Vahid qiyməti rəqəmlə olmalıdır.",
-    "unit_price_required"                => "Pərakəndə qiymət - vacib sahədir.",
-    "upc_database"                       => "Barkod Məlumat Bazası",
-    "update"                             => "Malı Yenilə",
-    "use_inventory_menu"                 => "İnvertizasiya Menyusundan İstifadə Et",
+    'add_minus'                          => 'İnventar + Topla və ya - Çıx.',
+    'allow_alt_description'              => 'Alternativ təsvirə icazə verin',
+    'amount_entry'                       => 'Məbləğ Əlavəsi',
+    'bulk_edit'                          => 'Kütləvi Redaktə',
+    'buy_price_required'                 => 'Alış qiyməti tələb olunan sahədir.',
+    'cannot_be_deleted'                  => 'Seçilmiş Mal (lar) silmək mükün deyil, bir və ya birdən çox Mallarda Satışlar var.',
+    'cannot_find_item'                   => 'Mal Tapılmadı.',
+    'categories'                         => '',
+    'category'                           => 'Bolmə',
+    'category_new'                       => '',
+    'category_required'                  => 'Bölmə sahəsi boş qala bilməz.',
+    'change_all_to_allow_alt_desc'       => 'Hamısı üçün Alternativ Təsvirə İcazə Verin.',
+    'change_all_to_not_allow_allow_desc' => 'Hamısı üçün Alternativ Təsvirə İcazə Verməyin.',
+    'change_all_to_serialized'           => 'Hamısını Seriyalaşdırılmışa görə dəyişin',
+    'change_all_to_unserialized'         => 'Qeyri Seriyalara görə dəyiş',
+    'change_image'                       => 'Şəkili Dəyiş',
+    'confirm_bulk_edit'                  => 'Siz əminsinizmi ki işarələnmiş butun malları redaktə etmək istəyirsiniz?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Bütün Məhsul Vergisi məlumatları dəyişdiriləcək.',
+    'confirm_delete'                     => 'Seçilmiş element(ləri) silmək istədiyinizə əminsiniz?',
+    'confirm_restore'                    => 'Seçilmiş element (lər) bərpa etmək istədiyinizə əminsinizmi?',
+    'cost_price'                         => 'Topdan Satış qiyməti',
+    'cost_price_number'                  => 'Topdansatış qiyməti rəqəm olmalıdır.',
+    'cost_price_required'                => 'Topdan satiış - doldurulması vacib sahə.',
+    'count'                              => 'inventorun yenilənməsi',
+    'csv_import_failed'                  => 'səhv csv import',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Yüklənmiş faylda məlumat yoxdur və ya düzgün formatlanmır.',
+    'csv_import_partially_failed'        => 'Xətlərdə {0} element idxalı uğursuzluq (lar) var: {1}. Heç bir sıra idxal edilmədi.',
+    'csv_import_success'                 => 'Malların İdxalı Uğurla Həyata Keçdi.',
+    'current_quantity'                   => 'indiki say',
+    'default_pack_name'                  => 'Hər biri',
+    'description'                        => 'təsvir',
+    'details_count'                      => 'detallı inventor sayı',
+    'do_nothing'                         => 'heç nə etməmək',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Seçilmiş məhsullar üçün tələb olunan sahələri redaktə edin.',
+    'edit_multiple_items'                => 'bir neçə malın redaktəsi',
+    'empty_upc_items'                    => 'Boş Barkod Malları',
+    'error_adding_updating'              => 'mal əlavə etməkdə və ya yeniləməkdə səhv var',
+    'error_updating_multiple'            => 'malların yenilənməsində səhv var',
+    'generate_barcodes'                  => 'şifrə yarat',
+    'hsn_code'                           => 'Harmonize Sistem Nomenklaturası',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'CSVdən Malları İdxal Et',
+    'info_provided_by'                   => 'Məlumat təqdim olundu',
+    'inventory'                          => 'inventor',
+    'inventory_CSV_import_quantity'      => 'Miqdarı CSV-dən idxal olunur',
+    'inventory_comments'                 => 'komentariyalar',
+    'inventory_data_tracking'            => 'İnventarlaşdırma Üçün Məlumat İzləmə',
+    'inventory_date'                     => 'Tarix',
+    'inventory_employee'                 => 'Əmakdaş',
+    'inventory_in_out_quantity'          => 'Daxili və Xarici Say',
+    'inventory_remarks'                  => 'Qeydlər',
+    'is_deleted'                         => 'Silindi',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Malın Seriya Nömrəsi var',
+    'item'                               => 'Mal',
+    'item_id'                            => '',
+    'item_number'                        => 'Barkod',
+    'item_number_duplicate'              => 'Malın Nömrəsi artiq Məlumat bazasında var.',
+    'item_number_invalid'                => 'Malın Nömrəsində icazə verilməyən simvollar var.',
+    'kit'                                => 'Dəst',
+    'location'                           => 'Yer',
+    'low_inventory_items'                => 'Bitmış Mallar',
+    'low_sell_item'                      => 'Malların aşağı qiy. satışı',
+    'manually_editing_of_quantity'       => 'Sayı Əl ilə Redeaktə Etmək',
+    'markup'                             => '',
+    'name'                               => 'Malın Adı',
+    'name_required'                      => 'Malın adı olan sahə boş qala bilməz.',
+    'new'                                => 'Yeni Mal',
+    'no_description_items'               => 'Mallar haqqında Təsvir Yoxdur',
+    'no_items_to_display'                => 'Mallar Göstərilmir.',
+    'none'                               => 'Heçnə',
+    'none_selected'                      => 'Siz redaktə etmək üçün hər hansı bir mal seçməmisiniz',
+    'nonstock'                           => 'Əldə Olmayan',
+    'number_information'                 => 'Malın Nömrəsi',
+    'number_required'                    => 'Barkod tələb olunan sahədir.',
+    'one_or_multiple'                    => 'Mal (lar)',
+    'pack_name'                          => 'Paket Adı',
+    'qty_per_pack'                       => 'Paketin miqdarı',
+    'quantity'                           => 'Sayı',
+    'quantity_number'                    => 'Miqdarı mütləq rəqəmlə olmalıdır.',
+    'quantity_required'                  => 'Miqyas tələb olunan sahədir.',
+    'receiving_quantity'                 => 'Qəbul Olunan Miqdar',
+    'remove_image'                       => 'Şəkili Sil',
+    'reorder_level'                      => 'Səviyyani yenidən düzəlt',
+    'reorder_level_number'               => 'Yenidən sıralama səviyyəsi rəqəmlə olmalıdır.',
+    'reorder_level_required'             => 'Düzəliş Səviyyəsi zəruri bir sahədir.',
+    'retrive_item_info'                  => 'Mal Haqqında Məlumat',
+    'sales_tax_1'                        => 'Satış Vergisi',
+    'sales_tax_2'                        => 'Satış Vergisi 2',
+    'search_attributes'                  => 'Atributları Axtar',
+    'select_image'                       => 'Şəkil Seç',
+    'serialized_items'                   => 'Seriyalı Mallar',
+    'standard'                           => 'Standart',
+    'stock'                              => 'Ehtiyyat',
+    'stock_location'                     => 'Ehtiyyatın Yerləşdiyi Yer',
+    'stock_type'                         => 'Ehtiyyatda olanın Növü',
+    'successful_adding'                  => 'Siz uğurla malı əlavə etdiniz',
+    'successful_bulk_edit'               => 'Siz uğurla bütun mallari yenilədiniz',
+    'successful_deleted'                 => 'Siz uğurla sildiniz',
+    'successful_updating'                => 'Siz uğurla malı yenilədiniz',
+    'supplier'                           => 'Təchizatcı',
+    'tax_1'                              => 'Vergi 1',
+    'tax_2'                              => 'Vergi 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Vergi Bolməsi',
+    'tax_name_invalid'                   => 'Vergi adında icazə verilməyən simvollar var.',
+    'tax_percent'                        => 'Vergi Faizi',
+    'tax_percent_number'                 => 'Vergi Faizi rəqəmli dəyər vahidi olmalıdir',
+    'tax_percent_required'               => 'Vergi Faizi tələb olunan sahədir.',
+    'tax_percents'                       => 'Vergi Faiz(lər) i',
+    'temp'                               => 'Müvəqqəti',
+    'type'                               => 'Malın Növü',
+    'unit_price'                         => 'Pərakəndə Satış',
+    'unit_price_number'                  => 'Vahid qiyməti rəqəmlə olmalıdır.',
+    'unit_price_required'                => 'Pərakəndə qiymət - vacib sahədir.',
+    'upc_database'                       => 'Barkod Məlumat Bazası',
+    'update'                             => 'Malı Yenilə',
+    'use_inventory_menu'                 => 'İnvertizasiya Menyusundan İstifadə Et',
 ];
diff --git a/app/Language/az/Login.php b/app/Language/az/Login.php
index 0f43adac9..cd5905d3d 100644
--- a/app/Language/az/Login.php
+++ b/app/Language/az/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Mən robot deyiləm.",
-    "go"                            => "daxil ol",
-    "invalid_gcaptcha"              => "Robot olmadığınızı təsdiqləyin.",
-    "invalid_installation"          => "Quraşdırma düzgün deyil, php.ini faylını yoxlayın.",
-    "invalid_username_and_password" => "Yanlış istifadəçi adı və ya şifrə.",
-    "login"                         => "Giriş",
-    "logout"                        => "Çıxış",
-    "migration_needed"              => "{0} -ə daxil olandan sonra verilənlər bazası miqrasiyası başlayacaq.",
-    "password"                      => "Şifrə",
-    "required_username"             => "",
-    "username"                      => "İstifadəçi",
-    "welcome"                       => "{0} -ə xoş gəlmisiniz!",
+    "gcaptcha"                            => "Mən robot deyiləm.",
+    "go"                                  => "daxil ol",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Robot olmadığınızı təsdiqləyin.",
+    "invalid_installation"                => "Quraşdırma düzgün deyil, php.ini faylını yoxlayın.",
+    "invalid_username_and_password"       => "Yanlış istifadəçi adı və ya şifrə.",
+    "login"                               => "Giriş",
+    "logout"                              => "Çıxış",
+    "migrating_database"                  => "Verilənlər bazası miqrasiya edilir",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Verilənlər bazası uğurla miqrasiya edildi!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "{0} -ə daxil olandan sonra verilənlər bazası miqrasiyası başlayacaq.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Şifrə",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Həddindən artıq cəhd. Zəhmət olmasa bir az gözləyib yenidən cəhd edin.',
+    "username"                            => "İstifadəçi",
+    "welcome"                             => "{0} -ə xoş gəlmisiniz!"
 ];
diff --git a/app/Language/az/Sales.php b/app/Language/az/Sales.php
index 4ab9586c9..e76719aa6 100644
--- a/app/Language/az/Sales.php
+++ b/app/Language/az/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Mövcud ballar",
-    "rewards_package"                  => "Mükafatlar",
-    "rewards_remaining_balance"        => "Mükafatın yerdə qalan bal dəyəri ",
-    "account_number"                   => "Hesab #",
-    "add_payment"                      => "Ödəniş Əlavə Etmək",
-    "amount_due"                       => "Qalıq",
-    "amount_tendered"                  => "Ödənilən məbləğ",
-    "authorized_signature"             => "Səlahiyyətli İmza",
-    "cancel_sale"                      => "İmtina",
-    "cash"                             => "Nəğd pullar",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Nağd pulun tənzimlənməsi",
-    "cash_deposit"                     => "Nağd depozit",
-    "cash_filter"                      => "Nəğd Pul",
-    "change_due"                       => "Qalıq",
-    "change_price"                     => "Satış qiymətini dəyiş",
-    "check"                            => "Çek",
-    "check_balance"                    => "Çek Xatırladan",
-    "check_filter"                     => "Çek",
-    "close"                            => "",
-    "comment"                          => "Şərh",
-    "comments"                         => "Şərhlər",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Tamamlayın",
-    "confirm_cancel_sale"              => "Siz əminsiniz ki,satışı ləğv etmək istəyirsiniz? Bütün detallar silinəcək.",
-    "confirm_delete"                   => "Siz əminsiniz ki seçilmiş satışı (lar) silmək istəyirsiz?",
-    "confirm_restore"                  => "Seçilmiş Satışları bərpa etmək istədiyinizə əminsinizmi?",
-    "credit"                           => "Kredit kartı",
-    "credit_deposit"                   => "Kredit Depoziti",
-    "credit_filter"                    => "Kredit kartı",
-    "current_table"                    => "",
-    "customer"                         => "Ad",
-    "customer_address"                 => "Ünvan",
-    "customer_discount"                => "Endirim",
-    "customer_email"                   => "E-poçt",
-    "customer_location"                => "Yer",
-    "customer_mailchimp_status"        => "Mailchimp Statusu",
-    "customer_optional"                => "(Ödənişlərdə tələb olunur)",
-    "customer_required"                => "(Vacib)",
-    "customer_total"                   => "Cəmi",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Satış Tarixi",
-    "date_range"                       => "Tarix Aralığı",
-    "date_required"                    => "Düzgün tarix daxil edilməlidir.",
-    "date_type"                        => "Boşluğa tarix əlavə edilməlidir.",
-    "debit"                            => "Debit kart",
-    "debit_filter"                     => "",
-    "delete"                           => "Silməyə izin ver",
-    "delete_confirmation"              => "Siz bu satışı silmək istəyinizə əminsiniz? Bu əməlliyat bərpa edilməyəcək.",
-    "delete_entire_sale"               => "Bütün Satışı Silmək",
-    "delete_successful"                => "Siz uğurla satışı sildiniz.",
-    "delete_unsuccessful"              => "Satışın silinməsi uğursuz oldu.",
-    "description_abbrv"                => "Təsvir.",
-    "discard"                          => "İmtina",
-    "discard_quote"                    => "",
-    "discount"                         => "Disk",
-    "discount_included"                => "% Endirim",
-    "discount_short"                   => "%",
-    "due"                              => "Görə",
-    "due_filter"                       => "Görə",
-    "edit"                             => "Redaktə",
-    "edit_item"                        => "Malın Redaktəsi",
-    "edit_sale"                        => "Satışın Redaktəsi",
-    "email_receipt"                    => "E-poçt Qəbz",
-    "employee"                         => "Əməkdaş",
-    "entry"                            => "Daxil",
-    "error_editing_item"               => "XƏTA Malın redaktəsində",
-    "find_or_scan_item"                => "Malın axtarışı",
-    "find_or_scan_item_or_receipt"     => "Tapmaq skan etmək və ya kvitansiya",
-    "giftcard"                         => "Hədiyyə Kartı",
-    "giftcard_balance"                 => "Hədiyyə Kartı Balansı",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Hədiyyə kartının nömrəsi",
-    "group_by_category"                => "Bölməyə görə grup",
-    "group_by_type"                    => "Növə görə qrup",
-    "hsn"                              => "HSN",
-    "id"                               => "Satış İD",
-    "include_prices"                   => "Qiymətlər daxildir?",
-    "invoice"                          => "Qaimə",
-    "invoice_confirm"                  => "Bu qaimə göndəriləcək",
-    "invoice_enable"                   => "Qaimə Yarat",
-    "invoice_filter"                   => "Qaimələr",
-    "invoice_no_email"                 => "Bu müştərinin elektron ünvanı düzgün deyil.",
-    "invoice_number"                   => "Qaimə #",
-    "invoice_number_duplicate"         => "Qaimə nömrəsi unikal olmalıdır.",
-    "invoice_sent"                     => "Qaimə göndərildi",
-    "invoice_total"                    => "Qaimə Çəmi",
-    "invoice_type_custom_invoice"      => "Fərqli Qaimə (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Fərqli Vergi Qaiməsi (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Qaimə (invoice.php)",
-    "invoice_type_tax_invoice"         => "Vergi Qaiməsi (tax_invoice.php)",
-    "invoice_unsent"                   => "Qaimə göndərilə bilmədi",
-    "invoice_update"                   => "Yeniden say",
-    "item_insufficient_of_stock"       => "Anbarda kifayət qədər mal yoxdur.",
-    "item_name"                        => "Malın adı",
-    "item_number"                      => "Mal #",
-    "item_out_of_stock"                => "Mal satılıb.",
-    "key_browser"                      => "Faydalı Qısayollar",
-    "key_cancel"                       => "Cari Kotirovka/Fatura/Satışı ləğv edir",
-    "key_customer_search"              => "Müştəri Axtarışı",
-    "key_finish_quote"                 => "Ödəniş etmədən Kotirovka/Faturanı tamamlayın",
-    "key_finish_sale"                  => "Ödəniş əlavə edib, faktura/satışı tamamlayın",
-    "key_full"                         => "Tam Ekran rejimində açın",
-    "key_function"                     => "Function",
-    "key_help"                         => "Qısa yollar",
-    "key_help_modal"                   => "Qısa yollar pəncərəsini açın",
-    "key_in"                           => "Yaxınlaşdır",
-    "key_item_search"                  => "Element Axtarışı",
-    "key_out"                          => "Uzaqlaşdır",
-    "key_payment"                      => "Ödəniş əlavə et",
-    "key_print"                        => "Cari səhifəni çap et",
-    "key_restore"                      => "Orjinal ekran ölçüsünə qayıt",
-    "key_search"                       => "Axtarışın hesabat cədvəlləri",
-    "key_suspend"                      => "Cari satışı dayandırın",
-    "key_suspended"                    => "Dayandırılmış Satışları göstər",
-    "key_system"                       => "Sistem Qısayolları",
-    "key_tendered"                     => "Təklif olunan məbləği dəyişdirin",
-    "key_title"                        => "Satış üçün klaviatura qısa yolları",
-    "mc"                               => "",
-    "mode"                             => "Qeydiyyat Rejimi",
-    "must_enter_numeric"               => "Ödəniş məbləği rəqəm ilə olmalıdır.",
-    "must_enter_numeric_giftcard"      => "Hədiyyə Kartın nömrəsi rəqəmlə olmalıdır.",
-    "new_customer"                     => "Yeni Müştəri",
-    "new_item"                         => "Yeni Mal",
-    "no_description"                   => "Heç Biri",
-    "no_filter"                        => "Hamısı",
-    "no_items_in_cart"                 => "Səbətdə heç bir mal yoxdur.",
-    "no_sales_to_display"              => "Satış yoxdur.",
-    "none_selected"                    => "Silmək üçün hər hansı bir Satış (lar) seçmədiniz.",
-    "nontaxed_ind"                     => " . ",
-    "not_authorized"                   => "Bu hərəkət səlahiyyətli deyil.",
-    "one_or_multiple"                  => "Satış (lar)",
-    "payment"                          => "Ödəniş Növü",
-    "payment_amount"                   => "Məbləğ",
-    "payment_not_cover_total"          => "Ödəmə məbləği Toplamdan çox və ya bərabər olmalıdır.",
-    "payment_type"                     => "Növ",
-    "payments"                         => "",
-    "payments_total"                   => "Cəmi Ödənilənlər",
-    "price"                            => "Qiymət",
-    "print_after_sale"                 => "Satışdan sonra Çap edin",
-    "quantity"                         => "Miqdarı",
-    "quantity_less_than_reorder_level" => "Diqqət: İstədiyinizin Miqdarı bu Öhdəlik üçün Yenidən Səviyyə səviyyəsindən aşağıdadır.",
-    "quantity_less_than_zero"          => "Xəbərdarlıq: İstədiyiniz miqdar kifayət deyil. Siz hələ də satışı edə bilərsiniz, lakin malın sayını yoxlayın.",
-    "quantity_of_items"                => "{0} Məhsulların miqdarı",
-    "quote"                            => "Qiymət ver",
-    "quote_number"                     => "Sitat Nömrəsi",
-    "quote_number_duplicate"           => "Sitatın nömrəsi unikal olmalıdır.",
-    "quote_sent"                       => "Sitat göndərildi",
-    "quote_unsent"                     => "Sitat göndırilə bilmədi",
-    "receipt"                          => "malın çeki",
-    "receipt_no_email"                 => "Bu müştərinin etibarlı bir e-poçt ünvanı yoxdur.",
-    "receipt_number"                   => "Satış №",
-    "receipt_sent"                     => "Çek Göndərildi",
-    "receipt_unsent"                   => "Çek göndərilə Bilmədi",
-    "refund"                           => "Qaytarılma növü",
-    "register"                         => "jurnal satışı",
-    "remove_customer"                  => "müştəriləri silmək",
-    "remove_discount"                  => "",
-    "return"                           => "qaytarmaq",
-    "rewards"                          => "Mükafat Balları",
-    "rewards_balance"                  => "Mükafat Balları Balansı",
-    "sale"                             => "satış",
-    "sale_by_invoice"                  => "Faktura ilə Satış",
-    "sale_for_customer"                => "Müştəri:",
-    "sale_time"                        => "Vaxt",
-    "sales_tax"                        => "Satış Vergisi",
-    "sales_total"                      => "",
-    "select_customer"                  => "Müştəri seçmək",
-    "send_invoice"                     => "Faktura Göndər",
-    "send_quote"                       => "Sitat Göndər",
-    "send_receipt"                     => "Çek Göndər",
-    "send_work_order"                  => "İş Sifarişini Göndərin",
-    "serial"                           => "seriya nömrəsi",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Fakturanı Göstər",
-    "show_receipt"                     => "Çek Göstər",
-    "start_typing_customer_name"       => "müştəri adını çap etməyə başlayın...",
-    "start_typing_item_name"           => "Malın adın başlayın çap etməyə yada skan edin şifrəni...",
-    "stock"                            => "Anbar",
-    "stock_location"                   => "Ehtiyyatın Yeri",
-    "sub_total"                        => "yekun",
-    "successfully_deleted"             => "satış",
-    "successfully_restored"            => "Siz uğurla bərpa etdimiz",
-    "successfully_suspended_sale"      => "Sizin satışınız uğurla dayandırıldı.",
-    "successfully_updated"             => "Satış uğurla yeniləndi.",
-    "suspend_sale"                     => "Dayandırmaq",
-    "suspended_doc_id"                 => "Sənəd",
-    "suspended_sale_id"                => "Satış dayandırıldı İD",
-    "suspended_sales"                  => "satış dayandırıldı",
-    "table"                            => "Masa",
-    "takings"                          => "Gündəlik Satışlar",
-    "tax"                              => "vergi",
-    "tax_id"                           => "Vergi İD",
-    "tax_invoice"                      => "Vergi Qaimə",
-    "tax_percent"                      => "vergi %",
-    "taxed_ind"                        => "T",
-    "total"                            => "cəm",
-    "total_tax_exclusive"              => "Vergi Xaric",
-    "transaction_failed"               => "Satış əməliyyatı uğursuz oldu.",
-    "unable_to_add_item"               => "Satışa əlavə edilən məhsul uğursuz oldu",
-    "unsuccessfully_deleted"           => "Satış (lar) silmək uğursuz oldu.",
-    "unsuccessfully_restored"          => "Satış (lar) bərpa olunmadı.",
-    "unsuccessfully_suspended_sale"    => "Satış dayandırıla bilmədi.",
-    "unsuccessfully_updated"           => "Satış yeniləməsi uğursuz oldu.",
-    "unsuspend"                        => "blok etmək",
-    "unsuspend_and_delete"             => "blok etmək və silmək",
-    "update"                           => "Yenilə",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "İş Sifarişi",
-    "work_order_number"                => "Sifariş nömrəsi",
-    "work_order_number_duplicate"      => "İş sifarişinin nömrəsi unikal olmalıdır.",
-    "work_order_sent"                  => "İş sifarişi göndərildi",
-    "work_order_unsent"                => "İş Sifarişi göndərilməmişdi",
+    'account_number'                    => 'Hesab #',
+    'add_payment'                       => 'Ödəniş Əlavə Etmək',
+    'amount_due'                        => 'Qalıq',
+    'amount_due_not_covered'            => 'Ödənişlər ödəniləcək məbləği əhatə etmir.',
+    'amount_tendered'                   => 'Ödənilən məbləğ',
+    'authorized_signature'              => 'Səlahiyyətli İmza',
+    'cancel_sale'                       => 'İmtina',
+    'cash'                              => 'Nəğd pullar',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Nağd pulun tənzimlənməsi',
+    'cash_deposit'                      => 'Nağd depozit',
+    'cash_filter'                       => 'Nəğd Pul',
+    'change_due'                        => 'Qalıq',
+    'change_price'                      => 'Satış qiymətini dəyiş',
+    'check'                             => 'Çek',
+    'check_balance'                     => 'Çek Xatırladan',
+    'check_filter'                      => 'Çek',
+    'close'                             => '',
+    'comment'                           => 'Şərh',
+    'comments'                          => 'Şərhlər',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Tamamlayın',
+    'confirm_cancel_sale'               => 'Siz əminsiniz ki,satışı ləğv etmək istəyirsiniz? Bütün detallar silinəcək.',
+    'confirm_delete'                    => 'Siz əminsiniz ki seçilmiş satışı (lar) silmək istəyirsiz?',
+    'confirm_restore'                   => 'Seçilmiş Satışları bərpa etmək istədiyinizə əminsinizmi?',
+    'credit'                            => 'Kredit kartı',
+    'credit_deposit'                    => 'Kredit Depoziti',
+    'credit_filter'                     => 'Kredit kartı',
+    'current_table'                     => '',
+    'customer'                          => 'Ad',
+    'customer_address'                  => 'Ünvan',
+    'customer_discount'                 => 'Endirim',
+    'customer_email'                    => 'E-poçt',
+    'customer_location'                 => 'Yer',
+    'customer_mailchimp_status'         => 'Mailchimp Statusu',
+    'customer_optional'                 => '(Ödənişlərdə tələb olunur)',
+    'customer_required'                 => '(Vacib)',
+    'customer_total'                    => 'Cəmi',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Mövcud ballar',
+    'daily_sales'                       => '',
+    'date'                              => 'Satış Tarixi',
+    'date_range'                        => 'Tarix Aralığı',
+    'date_required'                     => 'Düzgün tarix daxil edilməlidir.',
+    'date_type'                         => 'Boşluğa tarix əlavə edilməlidir.',
+    'debit'                             => 'Debit kart',
+    'debit_filter'                      => '',
+    'delete'                            => 'Silməyə izin ver',
+    'delete_confirmation'               => 'Siz bu satışı silmək istəyinizə əminsiniz? Bu əməlliyat bərpa edilməyəcək.',
+    'delete_entire_sale'                => 'Bütün Satışı Silmək',
+    'delete_successful'                 => 'Siz uğurla satışı sildiniz.',
+    'delete_unsuccessful'               => 'Satışın silinməsi uğursuz oldu.',
+    'description_abbrv'                 => 'Təsvir.',
+    'discard'                           => 'İmtina',
+    'discard_quote'                     => '',
+    'discount'                          => 'Disk',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Endirim',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Görə',
+    'due_filter'                        => 'Görə',
+    'edit'                              => 'Redaktə',
+    'edit_item'                         => 'Malın Redaktəsi',
+    'edit_sale'                         => 'Satışın Redaktəsi',
+    'email_receipt'                     => 'E-poçt Qəbz',
+    'employee'                          => 'Əməkdaş',
+    'entry'                             => 'Daxil',
+    'error_editing_item'                => 'XƏTA Malın redaktəsində',
+    'find_or_scan_item'                 => 'Malın axtarışı',
+    'find_or_scan_item_or_receipt'      => 'Tapmaq skan etmək və ya kvitansiya',
+    'giftcard'                          => 'Hədiyyə Kartı',
+    'giftcard_balance'                  => 'Hədiyyə Kartı Balansı',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Hədiyyə kartının nömrəsi',
+    'group_by_category'                 => 'Bölməyə görə grup',
+    'group_by_type'                     => 'Növə görə qrup',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Satış İD',
+    'include_prices'                    => 'Qiymətlər daxildir?',
+    'insufficient_giftcard_balance'     => 'Bu ödeme için yetersiz hediye kartı bakiyesi.',
+    'insufficient_reward_points'        => 'Bu ödeme için yetersiz ödül puanları.',
+    'invoice'                           => 'Qaimə',
+    'invoice_confirm'                   => 'Bu qaimə göndəriləcək',
+    'invoice_enable'                    => 'Qaimə Yarat',
+    'invoice_filter'                    => 'Qaimələr',
+    'invoice_no_email'                  => 'Bu müştərinin elektron ünvanı düzgün deyil.',
+    'invoice_number'                    => 'Qaimə #',
+    'invoice_number_duplicate'          => 'Qaimə nömrəsi unikal olmalıdır.',
+    'invoice_sent'                      => 'Qaimə göndərildi',
+    'invoice_total'                     => 'Qaimə Çəmi',
+    'invoice_type_custom_invoice'       => 'Fərqli Qaimə (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Fərqli Vergi Qaiməsi (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Qaimə (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Vergi Qaiməsi (tax_invoice.php)',
+    'invoice_unsent'                    => 'Qaimə göndərilə bilmədi',
+    'invoice_update'                    => 'Yeniden say',
+    'item_insufficient_of_stock'        => 'Anbarda kifayət qədər mal yoxdur.',
+    'item_name'                         => 'Malın adı',
+    'item_number'                       => 'Mal #',
+    'item_out_of_stock'                 => 'Mal satılıb.',
+    'key_browser'                       => 'Faydalı Qısayollar',
+    'key_cancel'                        => 'Cari Kotirovka/Fatura/Satışı ləğv edir',
+    'key_customer_search'               => 'Müştəri Axtarışı',
+    'key_finish_quote'                  => 'Ödəniş etmədən Kotirovka/Faturanı tamamlayın',
+    'key_finish_sale'                   => 'Ödəniş əlavə edib, faktura/satışı tamamlayın',
+    'key_full'                          => 'Tam Ekran rejimində açın',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Qısa yollar',
+    'key_help_modal'                    => 'Qısa yollar pəncərəsini açın',
+    'key_in'                            => 'Yaxınlaşdır',
+    'key_item_search'                   => 'Element Axtarışı',
+    'key_out'                           => 'Uzaqlaşdır',
+    'key_payment'                       => 'Ödəniş əlavə et',
+    'key_print'                         => 'Cari səhifəni çap et',
+    'key_restore'                       => 'Orjinal ekran ölçüsünə qayıt',
+    'key_search'                        => 'Axtarışın hesabat cədvəlləri',
+    'key_suspend'                       => 'Cari satışı dayandırın',
+    'key_suspended'                     => 'Dayandırılmış Satışları göstər',
+    'key_system'                        => 'Sistem Qısayolları',
+    'key_tendered'                      => 'Təklif olunan məbləği dəyişdirin',
+    'key_title'                         => 'Satış üçün klaviatura qısa yolları',
+    'mc'                                => '',
+    'mode'                              => 'Qeydiyyat Rejimi',
+    'must_enter_numeric'                => 'Ödəniş məbləği rəqəm ilə olmalıdır.',
+    'must_enter_numeric_giftcard'       => 'Hədiyyə Kartın nömrəsi rəqəmlə olmalıdır.',
+    'must_enter_reference_code'         => 'İstinad/Axtarış nömrəsi daxil edilməlidir.',
+    'negative_amount_tendered'          => 'Ödənilən məbləğ mənfi ola bilməz.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Yeni Müştəri',
+    'new_item'                          => 'Yeni Mal',
+    'no_description'                    => 'Heç Biri',
+    'no_filter'                         => 'Hamısı',
+    'no_items_in_cart'                  => 'Səbətdə heç bir mal yoxdur.',
+    'no_sales_to_display'               => 'Satış yoxdur.',
+    'none_selected'                     => 'Silmək üçün hər hansı bir Satış (lar) seçmədiniz.',
+    'nontaxed_ind'                      => ' . ',
+    'not_authorized'                    => 'Bu hərəkət səlahiyyətli deyil.',
+    'one_or_multiple'                   => 'Satış (lar)',
+    'payment'                           => 'Ödəniş Növü',
+    'payment_amount'                    => 'Məbləğ',
+    'payment_not_cover_total'           => 'Ödəmə məbləği Toplamdan çox və ya bərabər olmalıdır.',
+    'payment_type'                      => 'Növ',
+    'payments'                          => '',
+    'payments_total'                    => 'Cəmi Ödənilənlər',
+    'price'                             => 'Qiymət',
+    'print_after_sale'                  => 'Satışdan sonra Çap edin',
+    'quantity'                          => 'Miqdarı',
+    'quantity_less_than_reorder_level'  => 'Diqqət: İstədiyinizin Miqdarı bu Öhdəlik üçün Yenidən Səviyyə səviyyəsindən aşağıdadır.',
+    'quantity_less_than_zero'           => 'Xəbərdarlıq: İstədiyiniz miqdar kifayət deyil. Siz hələ də satışı edə bilərsiniz, lakin malın sayını yoxlayın.',
+    'quantity_of_items'                 => '{0} Məhsulların miqdarı',
+    'quote'                             => 'Qiymət ver',
+    'quote_number'                      => 'Sitat Nömrəsi',
+    'quote_number_duplicate'            => 'Sitatın nömrəsi unikal olmalıdır.',
+    'quote_sent'                        => 'Sitat göndərildi',
+    'quote_unsent'                      => 'Sitat göndırilə bilmədi',
+    'receipt'                           => 'malın çeki',
+    'receipt_no_email'                  => 'Bu müştərinin etibarlı bir e-poçt ünvanı yoxdur.',
+    'receipt_number'                    => 'Satış №',
+    'receipt_sent'                      => 'Çek Göndərildi',
+    'receipt_unsent'                    => 'Çek göndərilə Bilmədi',
+    'reference_code'                    => 'Ödəniş İstinad Kodu',
+    'reference_code_invalid_characters' => 'İstinad kodu yalnız hərf və rəqəmlərdən ibarət olmalıdır.',
+    'reference_code_length_error'       => 'İstinad kodunun uzunluğu etibarsızdır.',
+    'refund'                            => 'Qaytarılma növü',
+    'register'                          => 'jurnal satışı',
+    'remove_customer'                   => 'müştəriləri silmək',
+    'remove_discount'                   => '',
+    'return'                            => 'qaytarmaq',
+    'rewards'                           => 'Mükafat Balları',
+    'rewards_balance'                   => 'Mükafat Balları Balansı',
+    'rewards_package'                   => 'Mükafatlar',
+    'rewards_remaining_balance'         => 'Mükafatın yerdə qalan bal dəyəri ',
+    'sale'                              => 'satış',
+    'sale_by_invoice'                   => 'Faktura ilə Satış',
+    'sale_for_customer'                 => 'Müştəri:',
+    'sale_time'                         => 'Vaxt',
+    'sales_tax'                         => 'Satış Vergisi',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Müştəri seçmək',
+    'send_invoice'                      => 'Faktura Göndər',
+    'send_quote'                        => 'Sitat Göndər',
+    'send_receipt'                      => 'Çek Göndər',
+    'send_work_order'                   => 'İş Sifarişini Göndərin',
+    'serial'                            => 'seriya nömrəsi',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Fakturanı Göstər',
+    'show_receipt'                      => 'Çek Göstər',
+    'start_typing_customer_name'        => 'müştəri adını çap etməyə başlayın...',
+    'start_typing_item_name'            => 'Malın adın başlayın çap etməyə yada skan edin şifrəni...',
+    'stock'                             => 'Anbar',
+    'stock_location'                    => 'Ehtiyyatın Yeri',
+    'sub_total'                         => 'yekun',
+    'successfully_deleted'              => 'satış',
+    'successfully_restored'             => 'Siz uğurla bərpa etdimiz',
+    'successfully_suspended_sale'       => 'Sizin satışınız uğurla dayandırıldı.',
+    'successfully_updated'              => 'Satış uğurla yeniləndi.',
+    'suspend_sale'                      => 'Dayandırmaq',
+    'suspended_doc_id'                  => 'Sənəd',
+    'suspended_sale_id'                 => 'Satış dayandırıldı İD',
+    'suspended_sales'                   => 'satış dayandırıldı',
+    'table'                             => 'Masa',
+    'takings'                           => 'Gündəlik Satışlar',
+    'tax'                               => 'vergi',
+    'tax_id'                            => 'Vergi İD',
+    'tax_invoice'                       => 'Vergi Qaimə',
+    'tax_percent'                       => 'vergi %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'cəm',
+    'total_tax_exclusive'               => 'Vergi Xaric',
+    'transaction_failed'                => 'Satış əməliyyatı uğursuz oldu.',
+    'unable_to_add_item'                => 'Satışa əlavə edilən məhsul uğursuz oldu',
+    'unsuccessfully_deleted'            => 'Satış (lar) silmək uğursuz oldu.',
+    'unsuccessfully_restored'           => 'Satış (lar) bərpa olunmadı.',
+    'unsuccessfully_suspended_sale'     => 'Satış dayandırıla bilmədi.',
+    'unsuccessfully_updated'            => 'Satış yeniləməsi uğursuz oldu.',
+    'unsuspend'                         => 'blok etmək',
+    'unsuspend_and_delete'              => 'blok etmək və silmək',
+    'update'                            => 'Yenilə',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'İş Sifarişi',
+    'work_order_number'                 => 'Sifariş nömrəsi',
+    'work_order_number_duplicate'       => 'İş sifarişinin nömrəsi unikal olmalıdır.',
+    'work_order_sent'                   => 'İş sifarişi göndərildi',
+    'work_order_unsent'                 => 'İş Sifarişi göndərilməmişdi',
 ];
diff --git a/app/Language/bg/Attributes.php b/app/Language/bg/Attributes.php
index 093e018ab..0342064f7 100644
--- a/app/Language/bg/Attributes.php
+++ b/app/Language/bg/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "definition_cannot_be_deleted"     => "",
-    "definition_error_adding_updating" => "",
-    "definition_flags"                 => "",
-    "definition_group"                 => "",
-    "definition_id"                    => "",
-    "definition_name"                  => "",
-    "definition_name_required"         => "",
-    "definition_one_or_multiple"       => "",
-    "definition_successful_adding"     => "",
-    "definition_successful_deleted"    => "",
-    "definition_successful_updating"   => "",
-    "definition_type"                  => "",
-    "definition_type_required"         => "",
-    "definition_unit"                  => "",
-    "definition_values"                => "",
-    "new"                              => "",
-    "no_attributes_to_display"         => "",
-    "receipt_visibility"               => "",
-    "show_in_items"                    => "",
-    "show_in_items_visibility"         => "",
-    "show_in_receipt"                  => "",
-    "show_in_receivings"               => "",
-    "show_in_receivings_visibility"    => "",
-    "show_in_sales"                    => "",
-    "show_in_sales_visibility"         => "",
-    "update"                           => "",
+    'attribute_value_invalid_chars'    => '',
+    'confirm_delete'                   => '',
+    'confirm_restore'                  => '',
+    'definition_cannot_be_deleted'     => '',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => '',
+    'definition_flags'                 => '',
+    'definition_group'                 => '',
+    'definition_id'                    => '',
+    'definition_name'                  => '',
+    'definition_name_required'         => '',
+    'definition_one_or_multiple'       => '',
+    'definition_successful_adding'     => '',
+    'definition_successful_deleted'    => '',
+    'definition_successful_updating'   => '',
+    'definition_type'                  => '',
+    'definition_type_required'         => '',
+    'definition_unit'                  => '',
+    'definition_values'                => '',
+    'new'                              => '',
+    'no_attributes_to_display'         => '',
+    'receipt_visibility'               => '',
+    'show_in_items'                    => '',
+    'show_in_items_visibility'         => '',
+    'show_in_receipt'                  => '',
+    'show_in_receivings'               => '',
+    'show_in_receivings_visibility'    => '',
+    'show_in_sales'                    => '',
+    'show_in_sales_visibility'         => '',
+    'show_in_search'                   => 'Показване в търсенето',
+    'show_in_search_visibility'        => 'Търсене',
+    'update'                           => '',
 ];
diff --git a/app/Language/bg/Bootstrap_tables.php b/app/Language/bg/Bootstrap_tables.php
index c36f882de..a9871a0e2 100644
--- a/app/Language/bg/Bootstrap_tables.php
+++ b/app/Language/bg/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Всичко/и",
-    "columns"              => "Колони",
-    "hide_show_pagination" => "Скриване / Показване на страници",
-    "loading"              => "Зареждане, моля изчакайте...",
-    "page_from_to"         => "Показани са {0} до {1} от {2} реда",
-    "refresh"              => "Опресняване",
-    "rows_per_page"        => "{0} редове на страница",
-    "toggle"               => "Щифт",
+    'all' => "Всичко/и",
+    'columns' => "Колони",
+    'hide_show_pagination' => "Скриване / Показване на страници",
+    'loading' => "Зареждане, моля изчакайте",
+    'page_from_to' => "Показани са {0} до {1} от {2} реда",
+    'refresh' => "Опресняване",
+    'rows_per_page' => "{0} редове на страница",
+    'toggle' => "Щифт",
 ];
diff --git a/app/Language/bg/Config.php b/app/Language/bg/Config.php
index 089e01e2f..9bf239650 100644
--- a/app/Language/bg/Config.php
+++ b/app/Language/bg/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Адрес на компанията",
-    "address_required"                          => "Адресът на компанията е задължително поле.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Разрешаване на дублирани баркодове",
-    "apostrophe"                                => "апостроф",
-    "backup_button"                             => "резервно копие",
-    "backup_database"                           => "Резервно копие база данни",
-    "barcode"                                   => "Баркод",
-    "barcode_company"                           => "Име на компанията",
-    "barcode_configuration"                     => "Конфигуриране на баркод",
-    "barcode_content"                           => "Съдържание на баркод",
-    "barcode_first_row"                         => "Ред 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Input Formats",
-    "barcode_generate_if_empty"                 => "Generate if empty.",
-    "barcode_height"                            => "Height (px)",
-    "barcode_id"                                => "Item Id/Name",
-    "barcode_info"                              => "Barcode Configuration Information",
-    "barcode_layout"                            => "Barcode Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "Barcode",
-    "barcode_number_in_row"                     => "Number in row",
-    "barcode_page_cellspacing"                  => "Display page cellspacing.",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "Price",
-    "barcode_second_row"                        => "Row 2",
-    "barcode_third_row"                         => "Row 3",
-    "barcode_tooltip"                           => "Warning: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.",
-    "barcode_type"                              => "Barcode Type",
-    "barcode_width"                             => "Width (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Cash Decimals",
-    "cash_decimals_tooltip"                     => "If Cash Decimals and Currency Decimals are the same then no cash rounding will take place.",
-    "cash_rounding"                             => "Cash Rounding",
-    "category_dropdown"                         => "",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Company Name",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Company Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "Company name is a required field",
-    "company_select_image"                      => "Select Image",
-    "company_website_url"                       => "Company website is not a valid URL (http://...).",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Currency Symbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Reward",
-    "customer_reward_duplicate"                 => "Reward must be unique.",
-    "customer_reward_enable"                    => "Enable Customer Rewards",
-    "customer_reward_invalid_chars"             => "Reward can not contain '_'",
-    "customer_reward_required"                  => "Reward is a required field",
-    "customer_sales_tax_support"                => "Customer Sales Tax Support",
-    "date_or_time_format"                       => "Date and Time Filter",
-    "datetimeformat"                            => "Date and Time Format",
-    "decimal_point"                             => "Decimal Point",
-    "default_barcode_font_size_number"          => "Default Barcode Font Size must be a number.",
-    "default_barcode_font_size_required"        => "Default Barcode Font Size is a required field.",
-    "default_barcode_height_number"             => "Default Barcode Height must be a number.",
-    "default_barcode_height_required"           => "Default Barcode Height is a required field.",
-    "default_barcode_num_in_row_number"         => "Default Barcode Number in Row must be a number.",
-    "default_barcode_num_in_row_required"       => "Default Barcode Number in Row is a required field.",
-    "default_barcode_page_cellspacing_number"   => "Default Barcode Page Cellspacing must be a number.",
-    "default_barcode_page_cellspacing_required" => "Default Barcode Page Cellspacing is a required field.",
-    "default_barcode_page_width_number"         => "Default Barcode Page Width must be a number.",
-    "default_barcode_page_width_required"       => "Default Barcode Page Width is a required field.",
-    "default_barcode_width_number"              => "Default Barcode Width must be a number.",
-    "default_barcode_width_required"            => "Default Barcode Width is a required field.",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "Default Origin Tax Code",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "Default Sales Discount %",
-    "default_sales_discount_number"             => "Default Sales Discount must be a number.",
-    "default_sales_discount_required"           => "Default Sales Discount is a required field.",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "Default Tax Name must be a string.",
-    "default_tax_name_required"                 => "Default Tax Name is a required field.",
-    "default_tax_rate"                          => "Default Tax Rate %",
-    "default_tax_rate_1"                        => "Tax 1 Rate",
-    "default_tax_rate_2"                        => "Tax 2 Rate",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Default Tax Rate must be a number.",
-    "default_tax_rate_required"                 => "Default Tax Rate is a required field.",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "Table",
-    "dinner_table_duplicate"                    => "Table must be unique.",
-    "dinner_table_enable"                       => "Enable Dinner Tables",
-    "dinner_table_invalid_chars"                => "Table Name can not contain '_'.",
-    "dinner_table_required"                     => "Table is a required field.",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Fiscal Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "Линиите на страница трябва да са число.",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Localization Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp API Key",
-    "mailchimp_configuration"                   => "Mailchimp Configuration",
-    "mailchimp_key_successfully"                => "API Key is valid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
-    "mailchimp_lists"                           => "Mailchimp List(s)",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
-    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Left must be a number.",
-    "print_left_margin_required"                => "Margin Left is a required field.",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Right must be a number.",
-    "print_right_margin_required"               => "Margin Right is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Top must be a number.",
-    "print_top_margin_required"                 => "Margin Top is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'Адрес на компанията',
+    'address_required'                          => 'Адресът на компанията е задължително поле.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Разрешаване на дублирани баркодове',
+    'apostrophe'                                => 'апостроф',
+    'backup_button'                             => 'резервно копие',
+    'backup_database'                           => 'Резервно копие база данни',
+    'barcode'                                   => 'Баркод',
+    'barcode_company'                           => 'Име на компанията',
+    'barcode_configuration'                     => 'Конфигуриране на баркод',
+    'barcode_content'                           => 'Съдържание на баркод',
+    'barcode_first_row'                         => 'Ред 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Input Formats',
+    'barcode_generate_if_empty'                 => 'Generate if empty.',
+    'barcode_height'                            => 'Height (px)',
+    'barcode_id'                                => 'Item Id/Name',
+    'barcode_info'                              => 'Barcode Configuration Information',
+    'barcode_layout'                            => 'Barcode Layout',
+    'barcode_name'                              => 'Name',
+    'barcode_number'                            => 'Barcode',
+    'barcode_number_in_row'                     => 'Number in row',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing.',
+    'barcode_page_width'                        => 'Display page width',
+    'barcode_price'                             => 'Price',
+    'barcode_second_row'                        => 'Row 2',
+    'barcode_third_row'                         => 'Row 3',
+    'barcode_tooltip'                           => 'Warning: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.',
+    'barcode_type'                              => 'Barcode Type',
+    'barcode_width'                             => 'Width (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Cash Decimals',
+    'cash_decimals_tooltip'                     => 'If Cash Decimals and Currency Decimals are the same then no cash rounding will take place.',
+    'cash_rounding'                             => 'Cash Rounding',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Center',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => 'Company Name',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Change Image',
+    'company_logo'                              => 'Company Logo',
+    'company_remove_image'                      => 'Remove Image',
+    'company_required'                          => 'Company name is a required field',
+    'company_select_image'                      => 'Select Image',
+    'company_website_url'                       => 'Company website is not a valid URL (http://...).',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => '',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => 'Currency Symbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Reward',
+    'customer_reward_duplicate'                 => 'Reward must be unique.',
+    'customer_reward_enable'                    => 'Enable Customer Rewards',
+    'customer_reward_invalid_chars'             => "Reward can not contain '_'",
+    'customer_reward_required'                  => 'Reward is a required field',
+    'customer_sales_tax_support'                => 'Customer Sales Tax Support',
+    'date_or_time_format'                       => 'Date and Time Filter',
+    'datetimeformat'                            => 'Date and Time Format',
+    'decimal_point'                             => 'Decimal Point',
+    'default_barcode_font_size_number'          => 'Default Barcode Font Size must be a number.',
+    'default_barcode_font_size_required'        => 'Default Barcode Font Size is a required field.',
+    'default_barcode_height_number'             => 'Default Barcode Height must be a number.',
+    'default_barcode_height_required'           => 'Default Barcode Height is a required field.',
+    'default_barcode_num_in_row_number'         => 'Default Barcode Number in Row must be a number.',
+    'default_barcode_num_in_row_required'       => 'Default Barcode Number in Row is a required field.',
+    'default_barcode_page_cellspacing_number'   => 'Default Barcode Page Cellspacing must be a number.',
+    'default_barcode_page_cellspacing_required' => 'Default Barcode Page Cellspacing is a required field.',
+    'default_barcode_page_width_number'         => 'Default Barcode Page Width must be a number.',
+    'default_barcode_page_width_required'       => 'Default Barcode Page Width is a required field.',
+    'default_barcode_width_number'              => 'Default Barcode Width must be a number.',
+    'default_barcode_width_required'            => 'Default Barcode Width is a required field.',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => 'Default Origin Tax Code',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => 'Default Sales Discount %',
+    'default_sales_discount_number'             => 'Default Sales Discount must be a number.',
+    'default_sales_discount_required'           => 'Default Sales Discount is a required field.',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => 'Default Tax Name must be a string.',
+    'default_tax_name_required'                 => 'Default Tax Name is a required field.',
+    'default_tax_rate'                          => 'Default Tax Rate %',
+    'default_tax_rate_1'                        => 'Tax 1 Rate',
+    'default_tax_rate_2'                        => 'Tax 2 Rate',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Default Tax Rate must be a number.',
+    'default_tax_rate_required'                 => 'Default Tax Rate is a required field.',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => 'Table',
+    'dinner_table_duplicate'                    => 'Table must be unique.',
+    'dinner_table_enable'                       => 'Enable Dinner Tables',
+    'dinner_table_invalid_chars'                => "Table Name can not contain '_'.",
+    'dinner_table_required'                     => 'Table is a required field.',
+    'dot'                                       => 'dot',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Fiscal Year Start',
+    'financial_year_apr'                        => '1st of April',
+    'financial_year_aug'                        => '1st of August',
+    'financial_year_dec'                        => '1st of December',
+    'financial_year_feb'                        => '1st of February',
+    'financial_year_jan'                        => '1st of January',
+    'financial_year_jul'                        => '1st of July',
+    'financial_year_jun'                        => '1st of June',
+    'financial_year_mar'                        => '1st of March',
+    'financial_year_may'                        => '1st of May',
+    'financial_year_nov'                        => '1st of November',
+    'financial_year_oct'                        => '1st of October',
+    'financial_year_sep'                        => '1st of September',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key is a required field',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Store Information',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines per Page',
+    'lines_per_page_number'                     => 'Линиите на страница трябва да са число.',
+    'lines_per_page_required'                   => 'Lines per Page is a required field.',
+    'locale'                                    => 'Localization',
+    'locale_configuration'                      => 'Localization Configuration',
+    'locale_info'                               => 'Localization Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => '',
+    'logout'                                    => 'Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp API Key',
+    'mailchimp_configuration'                   => 'Mailchimp Configuration',
+    'mailchimp_key_successfully'                => 'API Key is valid.',
+    'mailchimp_key_unsuccessfully'              => 'API Key is invalid.',
+    'mailchimp_lists'                           => 'Mailchimp List(s)',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here, otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localization',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a valid locale.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Референтен код на плащане<br>Ограничения на дължината',
+    'payment_reference_code_length_max_label'   => 'Макс',
+    'payment_reference_code_length_min_label'   => 'Мин',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Phone is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Margin Bottom must be a number.',
+    'print_bottom_margin_required'              => 'Margin Bottom is a required field.',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Margin Left must be a number.',
+    'print_left_margin_required'                => 'Margin Left is a required field.',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Margin Right must be a number.',
+    'print_right_margin_required'               => 'Margin Right is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Margin Top must be a number.',
+    'print_top_margin_required'                 => 'Margin Top is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Calc avg. Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'Невалиден път до sendmail. Разрешени са само букви, цифри, тирета, долни черти, наклонени черти, обратни наклонени черти, двоеточия, интервали и точки.',
+    'saved_successfully'                        => 'Configuration save successful.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Stock location',
+    'stock_location_duplicate'                  => 'Stock Location must be unique.',
+    'stock_location_invalid_chars'              => "Stock Location can not contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 2',
+    'suggestions_third_column'                  => 'Column 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Receipt Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => 'Tax category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Tax Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => '',
+    'tax_included'                              => 'Tax Included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/bg/Employees.php b/app/Language/bg/Employees.php
index fc0320bf1..3bc79b603 100644
--- a/app/Language/bg/Employees.php
+++ b/app/Language/bg/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Информация",
-    "cannot_be_deleted"            => "Невъзможно е да изтриете избрани служители, един или повече от тях са обработили продажби или се опитвате да изтриете профила си.",
-    "change_employee"              => "",
-    "change_password"              => "Промяна на паролата",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Наистина ли искате да изтриете избрания служител (и)?",
-    "confirm_restore"              => "Наистина ли искате да възстановите избраните служители?",
-    "current_password"             => "Настояща парола",
-    "current_password_invalid"     => "Текущата парола е невалидна.",
-    "employee"                     => "Служител",
-    "error_adding_updating"        => "Добавянето или актуализирането на служителите е неуспешно.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Не може да изтриете Пробният Администратор.",
-    "error_updating_demo_admin"    => "Не може да промените Пробният Администратор.",
-    "language"                     => "Език",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "Нов служител",
-    "none_selected"                => "Не сте избрали служител (и), който да изтриете.",
-    "one_or_multiple"              => "служител (и)",
-    "password"                     => "Password",
-    "password_minlength"           => "Паролата трябва да е с дължина най-малко 8 знака.",
-    "password_must_match"          => "Паролите не съвпадат.",
-    "password_not_must_match"      => "Текущата парола и новата парола трябва да са уникални.",
-    "password_required"            => "Изисква се парола.",
-    "permission_desc"              => "Поставете отметка в квадратчетата по-долу, за да получите достъп до модулите.",
-    "permission_info"              => "Разрешения",
-    "repeat_password"              => "Паролата отново",
-    "subpermission_required"       => "Добавете поне един грант за всеки модул.",
-    "successful_adding"            => "Служителя е добавен успешно.",
-    "successful_change_password"   => "Промяна на паролата е успешна.",
-    "successful_deleted"           => "Вие успешно сте изтрили",
-    "successful_updating"          => "Успешно сте актуализирали служител",
-    "system_language"              => "Системен език",
-    "unsuccessful_change_password" => "Промяната на паролата се провали.",
-    "update"                       => "Актуализиране на служителя",
-    "username"                     => "Потребител",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Потребителското име трябва да е с дължина най-малко 5 знака.",
-    "username_required"            => "Потребителското име е задължително поле.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Информация',
+    'cannot_be_deleted'                      => 'Невъзможно е да изтриете избрани служители, един или повече от тях са обработили продажби или се опитвате да изтриете профила си.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Промяна на паролата',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Наистина ли искате да изтриете избрания служител (и)?',
+    'confirm_restore'                        => 'Наистина ли искате да възстановите избраните служители?',
+    'current_password'                       => 'Настояща парола',
+    'current_password_invalid'               => 'Текущата парола е невалидна.',
+    'employee'                               => 'Служител',
+    'error_adding_updating'                  => 'Добавянето или актуализирането на служителите е неуспешно.',
+    'error_cannot_remove_own_minimum_grant'  => 'Не можете да премахнете минималните си права за достъп до модулите.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Не може да изтриете Пробният Администратор.',
+    'error_grant_change_disallowed'          => 'Промените на правата са заключени в това демо.',
+    'error_password_change_disallowed'       => 'Промените на пароли са заключени в това демо.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Не може да промените Пробният Администратор.',
+    'language'                               => 'Език',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'Нов служител',
+    'none_selected'                          => 'Не сте избрали служител (и), който да изтриете.',
+    'one_or_multiple'                        => 'служител (и)',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'Паролата трябва да е с дължина най-малко 8 знака.',
+    'password_must_match'                    => 'Паролите не съвпадат.',
+    'password_not_must_match'                => 'Текущата парола и новата парола трябва да са уникални.',
+    'password_required'                      => 'Изисква се парола.',
+    'permission_desc'                        => 'Поставете отметка в квадратчетата по-долу, за да получите достъп до модулите.',
+    'permission_info'                        => 'Разрешения',
+    'repeat_password'                        => 'Паролата отново',
+    'subpermission_required'                 => 'Добавете поне един грант за всеки модул.',
+    'successful_adding'                      => 'Служителя е добавен успешно.',
+    'successful_change_password'             => 'Промяна на паролата е успешна.',
+    'successful_deleted'                     => 'Вие успешно сте изтрили',
+    'successful_updating'                    => 'Успешно сте актуализирали служител',
+    'system_language'                        => 'Системен език',
+    'unsuccessful_change_password'           => 'Промяната на паролата се провали.',
+    'update'                                 => 'Актуализиране на служителя',
+    'username'                               => 'Потребител',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Потребителското име трябва да е с дължина най-малко 5 знака.',
+    'username_required'                      => 'Потребителското име е задължително поле.',
 ];
diff --git a/app/Language/bg/Error.php b/app/Language/bg/Error.php
index 1c95b608d..bf53a7687 100644
--- a/app/Language/bg/Error.php
+++ b/app/Language/bg/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Нямате разрешение за достъп до модула с име",
-    "unknown"              => "Неизвестна грешка",
+    'no_permission_module'           => 'Нямате разрешение за достъп до модула с име',
+    'unable_to_create_env_file'      => 'Неуспешно създаване на {filePath} за осигуряване на throttle.key',
+    'unable_to_lock_file'            => 'Неуспешно заключване на {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Неуспешно отваряне на {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Неуспешно записване на throttle.key в {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Неуспешно четене на {filePath} за осигуряване на throttle.key',
+    'unknown'                        => 'Неизвестна грешка',
 ];
diff --git a/app/Language/bg/Items.php b/app/Language/bg/Items.php
index 2a6e02a82..42dc06790 100644
--- a/app/Language/bg/Items.php
+++ b/app/Language/bg/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventory to add or subtract.",
-    "allow_alt_description"              => "Allow Alternate Description",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "Bulk Edit",
-    "buy_price_required"                 => "Purchase Price is a required field.",
-    "cannot_be_deleted"                  => "Could not delete selected Item(s), one or more of the selected Items have sales.",
-    "cannot_find_item"                   => "Item not found.",
-    "categories"                         => "",
-    "category"                           => "Category",
-    "category_new"                       => "",
-    "category_required"                  => "Category is a required field.",
-    "change_all_to_allow_alt_desc"       => "Allow Alternate Description for all.",
-    "change_all_to_not_allow_allow_desc" => "Do not allow Alternate Description for all.",
-    "change_all_to_serialized"           => "Change all to Serialized",
-    "change_all_to_unserialized"         => "Change all to Unserialized",
-    "change_image"                       => "Change Image",
-    "confirm_bulk_edit"                  => "Are you sure you want to edit selected Item(s)?",
-    "confirm_bulk_edit_wipe_taxes"       => "All Item Tax information will be replaced.",
-    "confirm_delete"                     => "Are you sure you want to delete selected item(s)?",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "Wholesale Price",
-    "cost_price_number"                  => "Wholesale Price must be a number.",
-    "cost_price_required"                => "Wholesale Price is a required field.",
-    "count"                              => "Update Inventory",
-    "csv_import_failed"                  => "CSV import failed",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "The uploaded file has no data or is formatted incorrectly.",
-    "csv_import_partially_failed"        => "Item import successful with some failures:",
-    "csv_import_success"                 => "Item import successful.",
-    "current_quantity"                   => "Current Quantity",
-    "default_pack_name"                  => "",
-    "description"                        => "Description",
-    "details_count"                      => "Inventory Count Details",
-    "do_nothing"                         => "Do Nothing",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit the desired fields for selected item(s).",
-    "edit_multiple_items"                => "Editing Multiple Items",
-    "empty_upc_items"                    => "Empty Barcode Items",
-    "error_adding_updating"              => "Error adding/updating item",
-    "error_updating_multiple"            => "Error updating items",
-    "generate_barcodes"                  => "Generate Barcodes",
-    "hsn_code"                           => "",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Item Import from CSV",
-    "info_provided_by"                   => "Information provided by",
-    "inventory"                          => "Inventory",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Comments",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Date",
-    "inventory_employee"                 => "Employee",
-    "inventory_in_out_quantity"          => "In/Out Quantity",
-    "inventory_remarks"                  => "Remarks",
-    "is_deleted"                         => "Deleted",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item has Serial Number",
-    "item"                               => "Item",
-    "item_id"                            => "",
-    "item_number"                        => "Barcode",
-    "item_number_duplicate"              => "Item Number is already present in the database.",
-    "kit"                                => "Kit",
-    "location"                           => "Location",
-    "low_inventory_items"                => "Out Of Stock Items",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "Manual Edit of Quantity",
-    "markup"                             => "",
-    "name"                               => "Item Name",
-    "name_required"                      => "Item Name is a required field.",
-    "new"                                => "New Item",
-    "no_description_items"               => "No Description Items",
-    "no_items_to_display"                => "No Items to display.",
-    "none"                               => "None",
-    "none_selected"                      => "You have not selected any Item(s) to edit",
-    "nonstock"                           => "Non-stocked",
-    "number_information"                 => "Item Number",
-    "number_required"                    => "Barcode is a required field.",
-    "one_or_multiple"                    => "item(s)",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "Quantity",
-    "quantity_number"                    => "Quantity must be a number.",
-    "quantity_required"                  => "Quantity is a required field.",
-    "receiving_quantity"                 => "Receiving Quantity",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "Reorder Level",
-    "reorder_level_number"               => "Reorder Level must be a number.",
-    "reorder_level_required"             => "Reorder Level is a required field.",
-    "retrive_item_info"                  => "Retrive Item Info",
-    "sales_tax_1"                        => "Sales Tax",
-    "sales_tax_2"                        => "Sales Tax 2",
-    "search_attributes"                  => "Search Attributes",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "Serialized Items",
-    "standard"                           => "Standard",
-    "stock"                              => "Stock",
-    "stock_location"                     => "Stock location",
-    "stock_type"                         => "Stock Type",
-    "successful_adding"                  => "You have successfully added item",
-    "successful_bulk_edit"               => "You have successfully updated the selected item(s)",
-    "successful_deleted"                 => "You have successfully deleted",
-    "successful_updating"                => "You have successfully updated item",
-    "supplier"                           => "Supplier",
-    "tax_1"                              => "Tax 1",
-    "tax_2"                              => "Tax 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "Tax Percent",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "Tax Percent is a required field.",
-    "tax_percents"                       => "Tax Percent(s)",
-    "temp"                               => "",
-    "type"                               => "Item Type",
-    "unit_price"                         => "Retail Price",
-    "unit_price_number"                  => "Unit price must be a number.",
-    "unit_price_required"                => "Retail Price is a required field.",
-    "upc_database"                       => "Barcode Database",
-    "update"                             => "Update Item",
-    "use_inventory_menu"                 => "Use Inventory Menu",
+    'add_minus'                          => 'Inventory to add or subtract.',
+    'allow_alt_description'              => 'Allow Alternate Description',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => 'Bulk Edit',
+    'buy_price_required'                 => 'Purchase Price is a required field.',
+    'cannot_be_deleted'                  => 'Could not delete selected Item(s), one or more of the selected Items have sales.',
+    'cannot_find_item'                   => 'Item not found.',
+    'categories'                         => '',
+    'category'                           => 'Category',
+    'category_new'                       => '',
+    'category_required'                  => 'Category is a required field.',
+    'change_all_to_allow_alt_desc'       => 'Allow Alternate Description for all.',
+    'change_all_to_not_allow_allow_desc' => 'Do not allow Alternate Description for all.',
+    'change_all_to_serialized'           => 'Change all to Serialized',
+    'change_all_to_unserialized'         => 'Change all to Unserialized',
+    'change_image'                       => 'Change Image',
+    'confirm_bulk_edit'                  => 'Are you sure you want to edit selected Item(s)?',
+    'confirm_bulk_edit_wipe_taxes'       => 'All Item Tax information will be replaced.',
+    'confirm_delete'                     => 'Are you sure you want to delete selected item(s)?',
+    'confirm_restore'                    => '',
+    'cost_price'                         => 'Wholesale Price',
+    'cost_price_number'                  => 'Wholesale Price must be a number.',
+    'cost_price_required'                => 'Wholesale Price is a required field.',
+    'count'                              => 'Update Inventory',
+    'csv_import_failed'                  => 'CSV import failed',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'The uploaded file has no data or is formatted incorrectly.',
+    'csv_import_partially_failed'        => 'Item import successful with some failures:',
+    'csv_import_success'                 => 'Item import successful.',
+    'current_quantity'                   => 'Current Quantity',
+    'default_pack_name'                  => '',
+    'description'                        => 'Description',
+    'details_count'                      => 'Inventory Count Details',
+    'do_nothing'                         => 'Do Nothing',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit the desired fields for selected item(s).',
+    'edit_multiple_items'                => 'Editing Multiple Items',
+    'empty_upc_items'                    => 'Empty Barcode Items',
+    'error_adding_updating'              => 'Error adding/updating item',
+    'error_updating_multiple'            => 'Error updating items',
+    'generate_barcodes'                  => 'Generate Barcodes',
+    'hsn_code'                           => '',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Item Import from CSV',
+    'info_provided_by'                   => 'Information provided by',
+    'inventory'                          => 'Inventory',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Comments',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Date',
+    'inventory_employee'                 => 'Employee',
+    'inventory_in_out_quantity'          => 'In/Out Quantity',
+    'inventory_remarks'                  => 'Remarks',
+    'is_deleted'                         => 'Deleted',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item has Serial Number',
+    'item'                               => 'Item',
+    'item_id'                            => '',
+    'item_number'                        => 'Barcode',
+    'item_number_duplicate'              => 'Item Number is already present in the database.',
+    'item_number_invalid'                => 'Item Number contains disallowed characters.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Location',
+    'low_inventory_items'                => 'Out Of Stock Items',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => 'Manual Edit of Quantity',
+    'markup'                             => '',
+    'name'                               => 'Item Name',
+    'name_required'                      => 'Item Name is a required field.',
+    'new'                                => 'New Item',
+    'no_description_items'               => 'No Description Items',
+    'no_items_to_display'                => 'No Items to display.',
+    'none'                               => 'None',
+    'none_selected'                      => 'You have not selected any Item(s) to edit',
+    'nonstock'                           => 'Non-stocked',
+    'number_information'                 => 'Item Number',
+    'number_required'                    => 'Barcode is a required field.',
+    'one_or_multiple'                    => 'item(s)',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => 'Quantity',
+    'quantity_number'                    => 'Quantity must be a number.',
+    'quantity_required'                  => 'Quantity is a required field.',
+    'receiving_quantity'                 => 'Receiving Quantity',
+    'remove_image'                       => 'Remove Image',
+    'reorder_level'                      => 'Reorder Level',
+    'reorder_level_number'               => 'Reorder Level must be a number.',
+    'reorder_level_required'             => 'Reorder Level is a required field.',
+    'retrive_item_info'                  => 'Retrive Item Info',
+    'sales_tax_1'                        => 'Sales Tax',
+    'sales_tax_2'                        => 'Sales Tax 2',
+    'search_attributes'                  => 'Search Attributes',
+    'select_image'                       => 'Select Image',
+    'serialized_items'                   => 'Serialized Items',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Stock',
+    'stock_location'                     => 'Stock location',
+    'stock_type'                         => 'Stock Type',
+    'successful_adding'                  => 'You have successfully added item',
+    'successful_bulk_edit'               => 'You have successfully updated the selected item(s)',
+    'successful_deleted'                 => 'You have successfully deleted',
+    'successful_updating'                => 'You have successfully updated item',
+    'supplier'                           => 'Supplier',
+    'tax_1'                              => 'Tax 1',
+    'tax_2'                              => 'Tax 2',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Името на данъка съдържа непозволени символи.',
+    'tax_percent'                        => 'Tax Percent',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => 'Tax Percent is a required field.',
+    'tax_percents'                       => 'Tax Percent(s)',
+    'temp'                               => '',
+    'type'                               => 'Item Type',
+    'unit_price'                         => 'Retail Price',
+    'unit_price_number'                  => 'Unit price must be a number.',
+    'unit_price_required'                => 'Retail Price is a required field.',
+    'upc_database'                       => 'Barcode Database',
+    'update'                             => 'Update Item',
+    'use_inventory_menu'                 => 'Use Inventory Menu',
 ];
diff --git a/app/Language/bg/Login.php b/app/Language/bg/Login.php
index 7c1d4ee26..ba8fb67ae 100644
--- a/app/Language/bg/Login.php
+++ b/app/Language/bg/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Не съм робот.",
-    "go"                            => "Go",
-    "invalid_gcaptcha"              => "Invalid I'm not a robot.",
-    "invalid_installation"          => "The installation is not correct, check your php.ini file.",
-    "invalid_username_and_password" => "Invalid Username or Password.",
-    "login"                         => "Login",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Password",
-    "required_username"             => "",
-    "username"                      => "Username",
-    "welcome"                       => "",
+    "gcaptcha"                            => "Не съм робот.",
+    "go"                                  => "Go",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Invalid I'm not a robot.",
+    "invalid_installation"                => "The installation is not correct, check your php.ini file.",
+    "invalid_username_and_password"       => "Invalid Username or Password.",
+    "login"                               => "Login",
+    "logout"                              => "",
+    "migrating_database"                  => "Мигриране на базата данни",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Базата данни е мигрирана успешно!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Password",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Твърде много опити. Моля, изчакайте малко и опитайте отново.',
+    "username"                            => "Username",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/bg/Reports.php b/app/Language/bg/Reports.php
index fa31c61b5..581bb197d 100644
--- a/app/Language/bg/Reports.php
+++ b/app/Language/bg/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "Taxes",
     "taxes_summary_report"                    => "Taxes Summary Report",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Total Inventory Value",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/bg/Sales.php b/app/Language/bg/Sales.php
index 43293ef6f..81ed92ac6 100644
--- a/app/Language/bg/Sales.php
+++ b/app/Language/bg/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Налични точки",
-    "rewards_package"                  => "Награди",
-    "rewards_remaining_balance"        => "Оставащата стойност на точките за награда е ",
-    "account_number"                   => "Номер на акаунт",
-    "add_payment"                      => "Добавяне на плащане",
-    "amount_due"                       => "Дължима сума",
-    "amount_tendered"                  => "Предоставена сума",
-    "authorized_signature"             => "Оторизиран подпис",
-    "cancel_sale"                      => "Отказ",
-    "cash"                             => "В брой",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Корекция на пари в брой",
-    "cash_deposit"                     => "Депозит в брой",
-    "cash_filter"                      => "В брой",
-    "change_due"                       => "Промяна на дължимото",
-    "change_price"                     => "Промяна на продажната цена",
-    "check"                            => "Проверка",
-    "check_balance"                    => "Проверете остатъка",
-    "check_filter"                     => "Проверка",
-    "close"                            => "",
-    "comment"                          => "Коментар",
-    "comments"                         => "Коментари",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Завършен",
-    "confirm_cancel_sale"              => "Сигурни ли сте, че искате да изчистите тази продажба? Всичко ще бъде изтрито.",
-    "confirm_delete"                   => "Наистина ли искате да изтриете избраната Продажба (и)?",
-    "confirm_restore"                  => "Наистина ли искате да възстановите избраната Продажба (и)?",
-    "credit"                           => "Кредитна карта",
-    "credit_deposit"                   => "Кредитен депозит",
-    "credit_filter"                    => "Кредитна карта",
-    "current_table"                    => "",
-    "customer"                         => "Име",
-    "customer_address"                 => "Адрес",
-    "customer_discount"                => "Намаление",
-    "customer_email"                   => "Електронна поща",
-    "customer_location"                => "Местоположение",
-    "customer_mailchimp_status"        => "Състояние на Mailchimp",
-    "customer_optional"                => "(Незадължително)",
-    "customer_required"                => "(Задължително)",
-    "customer_total"                   => "Обща сума",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Дата на продажба",
-    "date_range"                       => "Период от време",
-    "date_required"                    => "Трябва да въведете правилна дата.",
-    "date_type"                        => "Датата е задължително поле.",
-    "debit"                            => "Дебитна карта",
-    "debit_filter"                     => "",
-    "delete"                           => "Разреши изтриване",
-    "delete_confirmation"              => "Наистина ли искате да изтриете тази продажба? Това действие не може да бъде отменено.",
-    "delete_entire_sale"               => "Изтриване на цялата продажба",
-    "delete_successful"                => "Продажбата е изтрита успешно.",
-    "delete_unsuccessful"              => "Изтриването на продажба не бе успешно.",
-    "description_abbrv"                => "Описание.",
-    "discard"                          => "Разпродажба",
-    "discard_quote"                    => "",
-    "discount"                         => "Намаление%",
-    "discount_included"                => "% Отстъпка",
-    "discount_short"                   => "%",
-    "due"                              => "Дължимото",
-    "due_filter"                       => "Дължимо",
-    "edit"                             => "Редактиране",
-    "edit_item"                        => "Редактиране на елемент",
-    "edit_sale"                        => "Редактиране на продажбата",
-    "email_receipt"                    => "Електронна разписка",
-    "employee"                         => "Служител",
-    "entry"                            => "Вход",
-    "error_editing_item"               => "Грешка при редактирането на елемента",
-    "find_or_scan_item"                => "Намерете или сканирайте елемента",
-    "find_or_scan_item_or_receipt"     => "Намерете или сканирайте елемент или разпис",
-    "giftcard"                         => "Gift Карта",
-    "giftcard_balance"                 => "Gift Card Баланс",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gift Card Номер",
-    "group_by_category"                => "Групирайте по категория",
-    "group_by_type"                    => "Групиране по тип",
-    "hsn"                              => "HSN",
-    "id"                               => "Номер на продажба",
-    "include_prices"                   => "Включва цени?",
-    "invoice"                          => "Фактура",
-    "invoice_confirm"                  => "Тази фактура ще бъде изпратена до",
-    "invoice_enable"                   => "Създаване на фактура",
-    "invoice_filter"                   => "Фактури",
-    "invoice_no_email"                 => "Този клиент няма валиден имейл адрес.",
-    "invoice_number"                   => "Фактура #",
-    "invoice_number_duplicate"         => "Номерът на фактурите трябва да е уникален.",
-    "invoice_sent"                     => "Фактура, изпратена до",
-    "invoice_total"                    => "Фактура общо",
-    "invoice_type_custom_invoice"      => "Ръчна фактура",
-    "invoice_type_custom_tax_invoice"  => "Фактура по избор(custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Фактура",
-    "invoice_type_tax_invoice"         => "Данъчна фактура (tax_invoice.php)",
-    "invoice_unsent"                   => "Фактурата не можа да бъде изпратена до",
-    "invoice_update"                   => "Преизчисляване",
-    "item_insufficient_of_stock"       => "Елементът има недостатъчен запас.",
-    "item_name"                        => "Име на предмета",
-    "item_number"                      => "Предмет #",
-    "item_out_of_stock"                => "Елементът е изчерпан.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Режим на регистрация",
-    "must_enter_numeric"               => "Сумата Предложена трябва да е число.",
-    "must_enter_numeric_giftcard"      => "Gift Card номера трябва да бъде число.",
-    "new_customer"                     => "Нов клиент",
-    "new_item"                         => "Нов продукт",
-    "no_description"                   => "Нито един",
-    "no_filter"                        => "Всичко",
-    "no_items_in_cart"                 => "В количката няма продукти.",
-    "no_sales_to_display"              => "Няма продажби за показване .",
-    "none_selected"                    => "Не сте избрали каквито и да е Продажби за изтриване.",
-    "nontaxed_ind"                     => " sales nontaxed ind ",
-    "not_authorized"                   => "Това действие не е разрешено.",
-    "one_or_multiple"                  => "Продажба (и)",
-    "payment"                          => "Вид плащане",
-    "payment_amount"                   => "Количество",
-    "payment_not_cover_total"          => "Сумата за плащане трябва да е по-голяма или равна на цялата сума.",
-    "payment_type"                     => "Тип",
-    "payments"                         => "",
-    "payments_total"                   => "Общо плащания",
-    "price"                            => "Цена",
-    "print_after_sale"                 => "Печат след продажбата",
-    "quantity"                         => "Количество",
-    "quantity_less_than_reorder_level" => "Предупреждение: Желаното количество е под нивото на зареждане за тази позиция.",
-    "quantity_less_than_zero"          => "Предупреждение: Желаното количество е недостатъчно. Все още можете да обработвате продажбата, но одитирайте инвентара си.",
-    "quantity_of_items"                => "Количество{0} елементи",
-    "quote"                            => "Цитат",
-    "quote_number"                     => "Номер на цитата",
-    "quote_number_duplicate"           => "Номерът на Цитат трябва да е уникален.",
-    "quote_sent"                       => "Цитат изпратен до",
-    "quote_unsent"                     => "Цитатът не можа да бъде изпратен до",
-    "receipt"                          => "Касова бележка",
-    "receipt_no_email"                 => "Този клиент няма валиден имейл адрес.",
-    "receipt_number"                   => "Продажба #",
-    "receipt_sent"                     => "Разписката  е изпратена до",
-    "receipt_unsent"                   => "Разписката  не бе изпратена до",
-    "refund"                           => "Вид на въстановяването",
-    "register"                         => "Регистър на продажбите",
-    "remove_customer"                  => "Премахване на клиент",
-    "remove_discount"                  => "",
-    "return"                           => "Връщане",
-    "rewards"                          => "Наградни точки",
-    "rewards_balance"                  => "Reward Points Баланс",
-    "sale"                             => "Продажба",
-    "sale_by_invoice"                  => "Продажба по фактура",
-    "sale_for_customer"                => "Клиент:",
-    "sale_time"                        => "Време",
-    "sales_tax"                        => "Данък върху продажбите",
-    "sales_total"                      => "",
-    "select_customer"                  => "Изберете клиент (по избор)",
-    "send_invoice"                     => "Изпратете фактура",
-    "send_quote"                       => "Изпрати цитат",
-    "send_receipt"                     => "Изпращане на разписка",
-    "send_work_order"                  => "Изпращане на поръчка за работа",
-    "serial"                           => "Сериен",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Показване на фактурата",
-    "show_receipt"                     => "Показване на разписката",
-    "start_typing_customer_name"       => "Започнете да пишете подробности за клиента ...",
-    "start_typing_item_name"           => "Започнете да въвеждате името на елемента или да сканирате баркод ...",
-    "stock"                            => "Наличност",
-    "stock_location"                   => "Местоположение на наличност",
-    "sub_total"                        => "Междинна сума",
-    "successfully_deleted"             => "Вие успешно сте изтрили",
-    "successfully_restored"            => "Вие успешно сте възстановили",
-    "successfully_suspended_sale"      => "Успешно спиране на продажбата.",
-    "successfully_updated"             => "Обновихте продажбата успешно.",
-    "suspend_sale"                     => "Задържане",
-    "suspended_doc_id"                 => "Документ",
-    "suspended_sale_id"                => "Номер",
-    "suspended_sales"                  => "Преустановен",
-    "table"                            => "Маса",
-    "takings"                          => "Ежедневни продажби",
-    "tax"                              => "Данък",
-    "tax_id"                           => "Данъчен номер",
-    "tax_invoice"                      => "Данъчна фактура",
-    "tax_percent"                      => "Данък %",
-    "taxed_ind"                        => "",
-    "total"                            => "Обща сума",
-    "total_tax_exclusive"              => "Без данък",
-    "transaction_failed"               => "Продажната транзакция е неуспешна.",
-    "unable_to_add_item"               => "Добавянето на продукта към продажбата не бе успешно",
-    "unsuccessfully_deleted"           => "Изтриването на продажба (и) не бе успешно.",
-    "unsuccessfully_restored"          => "Възстановяването на Продажбата (ите) не бе успешна.",
-    "unsuccessfully_suspended_sale"    => "Преустановяването на продажбата бе неуспешно.",
-    "unsuccessfully_updated"           => "Актуализацията на продажбата не бе успешна.",
-    "unsuspend"                        => "Възстановяване",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Актуализация",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Работна поръчка",
-    "work_order_number"                => "Номер работна поръчка",
-    "work_order_number_duplicate"      => "Номерът на работната поръчка трябва да е уникален.",
-    "work_order_sent"                  => "Работната поръчка е изпратена до",
-    "work_order_unsent"                => "Работната поръчка не бе изпратена до",
+    'account_number'                    => 'Номер на акаунт',
+    'add_payment'                       => 'Добавяне на плащане',
+    'amount_due'                        => 'Дължима сума',
+    'amount_due_not_covered'            => 'Плащанията не покриват дължимата сума.',
+    'amount_tendered'                   => 'Предоставена сума',
+    'authorized_signature'              => 'Оторизиран подпис',
+    'cancel_sale'                       => 'Отказ',
+    'cash'                              => 'В брой',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Корекция на пари в брой',
+    'cash_deposit'                      => 'Депозит в брой',
+    'cash_filter'                       => 'В брой',
+    'change_due'                        => 'Промяна на дължимото',
+    'change_price'                      => 'Промяна на продажната цена',
+    'check'                             => 'Проверка',
+    'check_balance'                     => 'Проверете остатъка',
+    'check_filter'                      => 'Проверка',
+    'close'                             => '',
+    'comment'                           => 'Коментар',
+    'comments'                          => 'Коментари',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Завършен',
+    'confirm_cancel_sale'               => 'Сигурни ли сте, че искате да изчистите тази продажба? Всичко ще бъде изтрито.',
+    'confirm_delete'                    => 'Наистина ли искате да изтриете избраната Продажба (и)?',
+    'confirm_restore'                   => 'Наистина ли искате да възстановите избраната Продажба (и)?',
+    'credit'                            => 'Кредитна карта',
+    'credit_deposit'                    => 'Кредитен депозит',
+    'credit_filter'                     => 'Кредитна карта',
+    'current_table'                     => '',
+    'customer'                          => 'Име',
+    'customer_address'                  => 'Адрес',
+    'customer_discount'                 => 'Намаление',
+    'customer_email'                    => 'Електронна поща',
+    'customer_location'                 => 'Местоположение',
+    'customer_mailchimp_status'         => 'Състояние на Mailchimp',
+    'customer_optional'                 => '(Незадължително)',
+    'customer_required'                 => '(Задължително)',
+    'customer_total'                    => 'Обща сума',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Налични точки',
+    'daily_sales'                       => '',
+    'date'                              => 'Дата на продажба',
+    'date_range'                        => 'Период от време',
+    'date_required'                     => 'Трябва да въведете правилна дата.',
+    'date_type'                         => 'Датата е задължително поле.',
+    'debit'                             => 'Дебитна карта',
+    'debit_filter'                      => '',
+    'delete'                            => 'Разреши изтриване',
+    'delete_confirmation'               => 'Наистина ли искате да изтриете тази продажба? Това действие не може да бъде отменено.',
+    'delete_entire_sale'                => 'Изтриване на цялата продажба',
+    'delete_successful'                 => 'Продажбата е изтрита успешно.',
+    'delete_unsuccessful'               => 'Изтриването на продажба не бе успешно.',
+    'description_abbrv'                 => 'Описание.',
+    'discard'                           => 'Разпродажба',
+    'discard_quote'                     => '',
+    'discount'                          => 'Намаление%',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Отстъпка',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Дължимото',
+    'due_filter'                        => 'Дължимо',
+    'edit'                              => 'Редактиране',
+    'edit_item'                         => 'Редактиране на елемент',
+    'edit_sale'                         => 'Редактиране на продажбата',
+    'email_receipt'                     => 'Електронна разписка',
+    'employee'                          => 'Служител',
+    'entry'                             => 'Вход',
+    'error_editing_item'                => 'Грешка при редактирането на елемента',
+    'find_or_scan_item'                 => 'Намерете или сканирайте елемента',
+    'find_or_scan_item_or_receipt'      => 'Намерете или сканирайте елемент или разпис',
+    'giftcard'                          => 'Gift Карта',
+    'giftcard_balance'                  => 'Gift Card Баланс',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Gift Card Номер',
+    'group_by_category'                 => 'Групирайте по категория',
+    'group_by_type'                     => 'Групиране по тип',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Номер на продажба',
+    'include_prices'                    => 'Включва цени?',
+    'insufficient_giftcard_balance'     => 'Недостатъчен баланс на подаръчната карта за това плащане.',
+    'insufficient_reward_points'        => 'Недостатъчни наградни точки за това плащане.',
+    'invoice'                           => 'Фактура',
+    'invoice_confirm'                   => 'Тази фактура ще бъде изпратена до',
+    'invoice_enable'                    => 'Създаване на фактура',
+    'invoice_filter'                    => 'Фактури',
+    'invoice_no_email'                  => 'Този клиент няма валиден имейл адрес.',
+    'invoice_number'                    => 'Фактура #',
+    'invoice_number_duplicate'          => 'Номерът на фактурите трябва да е уникален.',
+    'invoice_sent'                      => 'Фактура, изпратена до',
+    'invoice_total'                     => 'Фактура общо',
+    'invoice_type_custom_invoice'       => 'Ръчна фактура',
+    'invoice_type_custom_tax_invoice'   => 'Фактура по избор(custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Фактура',
+    'invoice_type_tax_invoice'          => 'Данъчна фактура (tax_invoice.php)',
+    'invoice_unsent'                    => 'Фактурата не можа да бъде изпратена до',
+    'invoice_update'                    => 'Преизчисляване',
+    'item_insufficient_of_stock'        => 'Елементът има недостатъчен запас.',
+    'item_name'                         => 'Име на предмета',
+    'item_number'                       => 'Предмет #',
+    'item_out_of_stock'                 => 'Елементът е изчерпан.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Режим на регистрация',
+    'must_enter_numeric'                => 'Сумата Предложена трябва да е число.',
+    'must_enter_numeric_giftcard'       => 'Gift Card номера трябва да бъде число.',
+    'must_enter_reference_code'         => 'Трябва да се въведе референтен/извличащ номер.',
+    'negative_amount_tendered'          => 'Предоставената сума не може да бъде отрицателна.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Нов клиент',
+    'new_item'                          => 'Нов продукт',
+    'no_description'                    => 'Нито един',
+    'no_filter'                         => 'Всичко',
+    'no_items_in_cart'                  => 'В количката няма продукти.',
+    'no_sales_to_display'               => 'Няма продажби за показване .',
+    'none_selected'                     => 'Не сте избрали каквито и да е Продажби за изтриване.',
+    'nontaxed_ind'                      => ' sales nontaxed ind ',
+    'not_authorized'                    => 'Това действие не е разрешено.',
+    'one_or_multiple'                   => 'Продажба (и)',
+    'payment'                           => 'Вид плащане',
+    'payment_amount'                    => 'Количество',
+    'payment_not_cover_total'           => 'Сумата за плащане трябва да е по-голяма или равна на цялата сума.',
+    'payment_type'                      => 'Тип',
+    'payments'                          => '',
+    'payments_total'                    => 'Общо плащания',
+    'price'                             => 'Цена',
+    'print_after_sale'                  => 'Печат след продажбата',
+    'quantity'                          => 'Количество',
+    'quantity_less_than_reorder_level'  => 'Предупреждение: Желаното количество е под нивото на зареждане за тази позиция.',
+    'quantity_less_than_zero'           => 'Предупреждение: Желаното количество е недостатъчно. Все още можете да обработвате продажбата, но одитирайте инвентара си.',
+    'quantity_of_items'                 => 'Количество{0} елементи',
+    'quote'                             => 'Цитат',
+    'quote_number'                      => 'Номер на цитата',
+    'quote_number_duplicate'            => 'Номерът на Цитат трябва да е уникален.',
+    'quote_sent'                        => 'Цитат изпратен до',
+    'quote_unsent'                      => 'Цитатът не можа да бъде изпратен до',
+    'receipt'                           => 'Касова бележка',
+    'receipt_no_email'                  => 'Този клиент няма валиден имейл адрес.',
+    'receipt_number'                    => 'Продажба #',
+    'receipt_sent'                      => 'Разписката  е изпратена до',
+    'receipt_unsent'                    => 'Разписката  не бе изпратена до',
+    'reference_code'                    => 'Референтен код на плащане',
+    'reference_code_invalid_characters' => 'Референтният код трябва да съдържа само букви и цифри.',
+    'reference_code_length_error'       => 'Дължината на референтния код е невалидна.',
+    'refund'                            => 'Вид на въстановяването',
+    'register'                          => 'Регистър на продажбите',
+    'remove_customer'                   => 'Премахване на клиент',
+    'remove_discount'                   => '',
+    'return'                            => 'Връщане',
+    'rewards'                           => 'Наградни точки',
+    'rewards_balance'                   => 'Reward Points Баланс',
+    'rewards_package'                   => 'Награди',
+    'rewards_remaining_balance'         => 'Оставащата стойност на точките за награда е ',
+    'sale'                              => 'Продажба',
+    'sale_by_invoice'                   => 'Продажба по фактура',
+    'sale_for_customer'                 => 'Клиент:',
+    'sale_time'                         => 'Време',
+    'sales_tax'                         => 'Данък върху продажбите',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Изберете клиент (по избор)',
+    'send_invoice'                      => 'Изпратете фактура',
+    'send_quote'                        => 'Изпрати цитат',
+    'send_receipt'                      => 'Изпращане на разписка',
+    'send_work_order'                   => 'Изпращане на поръчка за работа',
+    'serial'                            => 'Сериен',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Показване на фактурата',
+    'show_receipt'                      => 'Показване на разписката',
+    'start_typing_customer_name'        => 'Започнете да пишете подробности за клиента ...',
+    'start_typing_item_name'            => 'Започнете да въвеждате името на елемента или да сканирате баркод ...',
+    'stock'                             => 'Наличност',
+    'stock_location'                    => 'Местоположение на наличност',
+    'sub_total'                         => 'Междинна сума',
+    'successfully_deleted'              => 'Вие успешно сте изтрили',
+    'successfully_restored'             => 'Вие успешно сте възстановили',
+    'successfully_suspended_sale'       => 'Успешно спиране на продажбата.',
+    'successfully_updated'              => 'Обновихте продажбата успешно.',
+    'suspend_sale'                      => 'Задържане',
+    'suspended_doc_id'                  => 'Документ',
+    'suspended_sale_id'                 => 'Номер',
+    'suspended_sales'                   => 'Преустановен',
+    'table'                             => 'Маса',
+    'takings'                           => 'Ежедневни продажби',
+    'tax'                               => 'Данък',
+    'tax_id'                            => 'Данъчен номер',
+    'tax_invoice'                       => 'Данъчна фактура',
+    'tax_percent'                       => 'Данък %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Обща сума',
+    'total_tax_exclusive'               => 'Без данък',
+    'transaction_failed'                => 'Продажната транзакция е неуспешна.',
+    'unable_to_add_item'                => 'Добавянето на продукта към продажбата не бе успешно',
+    'unsuccessfully_deleted'            => 'Изтриването на продажба (и) не бе успешно.',
+    'unsuccessfully_restored'           => 'Възстановяването на Продажбата (ите) не бе успешна.',
+    'unsuccessfully_suspended_sale'     => 'Преустановяването на продажбата бе неуспешно.',
+    'unsuccessfully_updated'            => 'Актуализацията на продажбата не бе успешна.',
+    'unsuspend'                         => 'Възстановяване',
+    'unsuspend_and_delete'              => 'Action',
+    'update'                            => 'Актуализация',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Работна поръчка',
+    'work_order_number'                 => 'Номер работна поръчка',
+    'work_order_number_duplicate'       => 'Номерът на работната поръчка трябва да е уникален.',
+    'work_order_sent'                   => 'Работната поръчка е изпратена до',
+    'work_order_unsent'                 => 'Работната поръчка не бе изпратена до',
 ];
diff --git a/app/Language/bs/Attributes.php b/app/Language/bs/Attributes.php
index d0b9fa4a5..662b6954c 100644
--- a/app/Language/bs/Attributes.php
+++ b/app/Language/bs/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Vrijednost atributa ne može sadržavati ':' ili '|'",
-    "confirm_delete"                   => "Da li ste sigurni da želite da izbrišete izabrani atribut?",
-    "confirm_restore"                  => "Da li ste sigurni da želite vratiti izabrane atribute?",
-    "definition_cannot_be_deleted"     => "Nije moguće izbrisati izabrane atribut",
-    "definition_error_adding_updating" => "Atribut {0} nije moguće dodati ili ažurirati. Molimo provjerite dnevnik grešaka.",
-    "definition_flags"                 => "Vidljivost atributa",
-    "definition_group"                 => "Grupa",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Dodaj Atribut",
-    "definition_name_required"         => "Ime atributa je obavezno polje",
-    "definition_one_or_multiple"       => "atributi",
-    "definition_successful_adding"     => "Uspješno ste dodali stavku",
-    "definition_successful_deleted"    => "Uspješno ste izbrisali",
-    "definition_successful_updating"   => "Uspješno ste ažurirali atribute",
-    "definition_type"                  => "Tip atributa",
-    "definition_type_required"         => "Tip atributa je obavezno polje",
-    "definition_unit"                  => "Jedinice mjere",
-    "definition_values"                => "Vrijednosti atributa",
-    "new"                              => "Novi atribut",
-    "no_attributes_to_display"         => "Nema stavki za prikaz",
-    "receipt_visibility"               => "Račun",
-    "show_in_items"                    => "Prikaži u stavkama",
-    "show_in_items_visibility"         => "Stavka",
-    "show_in_receipt"                  => "Prikaži u računu",
-    "show_in_receivings"               => "Prikaži na ulazima",
-    "show_in_receivings_visibility"    => "Ulazi",
-    "show_in_sales"                    => "Prikaži u prodaji",
-    "show_in_sales_visibility"         => "Prodaja",
-    "update"                           => "Ažuriraj atribut",
+    'attribute_value_invalid_chars'    => 'Vrijednost atributa ne može sadržavati \':\' ili \'|\'',
+    'confirm_delete'                   => 'Da li ste sigurni da želite da izbrišete izabrani atribut?',
+    'confirm_restore'                  => 'Da li ste sigurni da želite vratiti izabrane atribute?',
+    'definition_cannot_be_deleted'     => 'Nije moguće izbrisati izabrane atribut',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'Atribut {0} nije moguće dodati ili ažurirati. Molimo provjerite dnevnik grešaka.',
+    'definition_flags'                 => 'Vidljivost atributa',
+    'definition_group'                 => 'Grupa',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Dodaj Atribut',
+    'definition_name_required'         => 'Ime atributa je obavezno polje',
+    'definition_one_or_multiple'       => 'atributi',
+    'definition_successful_adding'     => 'Uspješno ste dodali stavku',
+    'definition_successful_deleted'    => 'Uspješno ste izbrisali',
+    'definition_successful_updating'   => 'Uspješno ste ažurirali atribute',
+    'definition_type'                  => 'Tip atributa',
+    'definition_type_required'         => 'Tip atributa je obavezno polje',
+    'definition_unit'                  => 'Jedinice mjere',
+    'definition_values'                => 'Vrijednosti atributa',
+    'new'                              => 'Novi atribut',
+    'no_attributes_to_display'         => 'Nema stavki za prikaz',
+    'receipt_visibility'               => 'Račun',
+    'show_in_items'                    => 'Prikaži u stavkama',
+    'show_in_items_visibility'         => 'Stavka',
+    'show_in_receipt'                  => 'Prikaži u računu',
+    'show_in_receivings'               => 'Prikaži na ulazima',
+    'show_in_receivings_visibility'    => 'Ulazi',
+    'show_in_sales'                    => 'Prikaži u prodaji',
+    'show_in_sales_visibility'         => 'Prodaja',
+    'show_in_search'                   => 'Prikaži u pretrazi',
+    'show_in_search_visibility'        => 'Pretraga',
+    'update'                           => 'Ažuriraj atribut',
 ];
diff --git a/app/Language/bs/Bootstrap_tables.php b/app/Language/bs/Bootstrap_tables.php
index f42ecf151..d1bf36b68 100644
--- a/app/Language/bs/Bootstrap_tables.php
+++ b/app/Language/bs/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Sve",
-    "columns"              => "Kolone",
-    "hide_show_pagination" => "Sakrij / prikaži paginaciju",
-    "loading"              => "Učitavanje sačekajte...",
-    "page_from_to"         => "Prikazivanje {0} do {1} od {2} redova",
-    "refresh"              => "Osvježi",
-    "rows_per_page"        => "{0} redova po stranici",
-    "toggle"               => "Promijeni prikaz",
+    'all' => "Sve",
+    'columns' => "Kolone",
+    'hide_show_pagination' => "Sakrij / prikaži paginaciju",
+    'loading' => "Učitavanje sačekajte",
+    'page_from_to' => "Prikazivanje {0} do {1} od {2} redova",
+    'refresh' => "Osvježi",
+    'rows_per_page' => "{0} redova po stranici",
+    'toggle' => "Promijeni prikaz",
 ];
diff --git a/app/Language/bs/Config.php b/app/Language/bs/Config.php
index 6fe6542cc..bc30c80aa 100644
--- a/app/Language/bs/Config.php
+++ b/app/Language/bs/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adresa kompanije",
-    "address_required"                          => "Adresa kompanije je obavezno polje.",
-    "all_set"                                   => "Sva su dopuštenja datoteka ispravno postavljena!",
-    "allow_duplicate_barcodes"                  => "Dozvoli dvostruke barkodove",
-    "apostrophe"                                => "apostrof",
-    "backup_button"                             => "Rezervna kopija",
-    "backup_database"                           => "Rezervna kopija baze podataka",
-    "barcode"                                   => "Barkod",
-    "barcode_company"                           => "Kompanija",
-    "barcode_configuration"                     => "Konfiguracija barkoda",
-    "barcode_content"                           => "Sadržaj barkoda",
-    "barcode_first_row"                         => "1 red",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Unesi format",
-    "barcode_generate_if_empty"                 => "Generiši ako je prazno.",
-    "barcode_height"                            => "Visina(px)",
-    "barcode_id"                                => "Id / naziv artikla",
-    "barcode_info"                              => "Informacije o konfiguraciji barkoda",
-    "barcode_layout"                            => "Izgled barkoda",
-    "barcode_name"                              => "Naziv",
-    "barcode_number"                            => "Barkod",
-    "barcode_number_in_row"                     => "Broj u redu",
-    "barcode_page_cellspacing"                  => "Prikaži razmak ćelija na stranici.",
-    "barcode_page_width"                        => "Širina stranice",
-    "barcode_price"                             => "Cijena",
-    "barcode_second_row"                        => "2.red",
-    "barcode_third_row"                         => "3.red",
-    "barcode_tooltip"                           => "Upozorenje: Ova funkcija može prouzrokovati uvoz ili kreiranje duplikata. Ne koristite ako ne želite duple barkodove.",
-    "barcode_type"                              => "Tip barkoda",
-    "barcode_width"                             => "Širina (px)",
-    "bottom"                                    => "Dno",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Decimale gotovine",
-    "cash_decimals_tooltip"                     => "Ako su Decimale gotovine i Valutne decimale iste, onda neće biti zaokruživanja gotovine.",
-    "cash_rounding"                             => "Zaokruživanje gotovine",
-    "category_dropdown"                         => "Prikaži kategoriju kao padajući meni",
-    "center"                                    => "Centar",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "zarez",
-    "company"                                   => "Kompanija",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Promijeni logo",
-    "company_logo"                              => "Logo kompanije",
-    "company_remove_image"                      => "Ukloni logo",
-    "company_required"                          => "Naziv kompanije je obavezno polje",
-    "company_select_image"                      => "Izaberite sliku",
-    "company_website_url"                       => "Veb lokacija kompanije nije važeća URL adresa (http://...).",
-    "country_codes"                             => "Kod zemlje",
-    "country_codes_tooltip"                     => "Lista kodova zemalja odvojena zarezima za traženje nominalnih adresa.",
-    "currency_code"                             => "Kod valute",
-    "currency_decimals"                         => "Velutne decimale",
-    "currency_symbol"                           => "Simbol valute",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Nagrada",
-    "customer_reward_duplicate"                 => "Nagrada mora biti jedinstvena.",
-    "customer_reward_enable"                    => "Omogući nagrade kupcima",
-    "customer_reward_invalid_chars"             => "Nagrada ne može sadržavati '_'",
-    "customer_reward_required"                  => "Nagrada je obavezno polje",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Filter datuma i vremena",
-    "datetimeformat"                            => "Format datuma i vremena",
-    "decimal_point"                             => "Decimalna točka",
-    "default_barcode_font_size_number"          => "Veličina fonta za barkod mora biti broj.",
-    "default_barcode_font_size_required"        => "Veličina fonta barkoda je obavezno polje.",
-    "default_barcode_height_number"             => "Visina barkoda mora biti broj.",
-    "default_barcode_height_required"           => "Visina barkoda je obavezno polje.",
-    "default_barcode_num_in_row_number"         => "Broj barkoda u redu mora biti broj.",
-    "default_barcode_num_in_row_required"       => "Broj barkoda u redu je obavezno polje.",
-    "default_barcode_page_cellspacing_number"   => "Razmak između ćelija sa barkodom mora biti broj.",
-    "default_barcode_page_cellspacing_required" => "Rastojanje ćelija na stranici sa barkodom je obavezno polje.",
-    "default_barcode_page_width_number"         => "Širina stranice sa bar kodom mora biti broj.",
-    "default_barcode_page_width_required"       => "Širina stranice sa barkodom je obavezno polje.",
-    "default_barcode_width_number"              => "Standardna širina barkoda mora biti broj.",
-    "default_barcode_width_required"            => "Širina barkoda je obavezno polje.",
-    "default_item_columns"                      => "Vidljiva stavka kolone",
-    "default_origin_tax_code"                   => "Šifra poreza",
-    "default_receivings_discount"               => "Popust za ulaze",
-    "default_receivings_discount_number"        => "Popust za ulaz mora biti broj.",
-    "default_receivings_discount_required"      => "Popust za ulaz je obavezno polje.",
-    "default_sales_discount"                    => "Popust na prodaju",
-    "default_sales_discount_number"             => "Popust na prodaju mora biti broj.",
-    "default_sales_discount_required"           => "Popust na prodaju je obavezno polje.",
-    "default_tax_category"                      => "Poreska kategorija",
-    "default_tax_code"                          => "Poreska šifra",
-    "default_tax_jurisdiction"                  => "Poreska uprava",
-    "default_tax_name_number"                   => "Naziv poreza mora biti string.",
-    "default_tax_name_required"                 => "Naziv poreza je obavezno polje.",
-    "default_tax_rate"                          => "Stopa poreza %",
-    "default_tax_rate_1"                        => "Stopa poreza 1 %",
-    "default_tax_rate_2"                        => "Stopa poreza 2 %",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Stopa poreza mora biti broj.",
-    "default_tax_rate_required"                 => "Stopa poreza je obavezno polje.",
-    "derive_sale_quantity"                      => "Dozvoli izvedenu količinu prodaje",
-    "derive_sale_quantity_tooltip"              => "Ako se izabere, za artikle naručene po produženom iznosu biće obezbjeđen novi tip artikla",
-    "dinner_table"                              => "Sto",
-    "dinner_table_duplicate"                    => "Sto mora biti jedinstven.",
-    "dinner_table_enable"                       => "Omogući stolove za večeru",
-    "dinner_table_invalid_chars"                => "Naziv stola ne može sadržavati '_'.",
-    "dinner_table_required"                     => "Sto je obavezno polje.",
-    "dot"                                       => "tačka",
-    "email"                                     => "E-mail",
-    "email_configuration"                       => "Konfiguracija e-mail",
-    "email_mailpath"                            => "Putanja do Sendmaila",
-    "email_protocol"                            => "Protokol",
-    "email_receipt_check_behaviour"             => "Polje za potvrdu e-mail",
-    "email_receipt_check_behaviour_always"      => "Uvijek potvrđeno",
-    "email_receipt_check_behaviour_last"        => "Zapamti poslednji izbor",
-    "email_receipt_check_behaviour_never"       => "Uvijek nepotvrđeno",
-    "email_smtp_crypto"                         => "SMTP šifriranje",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Lozinka",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP pauza",
-    "email_smtp_user"                           => "SMTP Korisničko ime",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Ostvarite privatnost",
-    "enforce_privacy_tooltip"                   => "Zaštitite privatnost kupaca primjenjujući kodiranje podataka u slučaju brisanja njihovih podataka",
-    "fax"                                       => "Faks",
-    "file_perm"                                 => "Postoje problemi sa dozvolama za datoteke, popravite i ponovo učitajte ovu stranicu.",
-    "financial_year"                            => "Početak fiskalne godine",
-    "financial_year_apr"                        => "1. April",
-    "financial_year_aug"                        => "1. Avgust",
-    "financial_year_dec"                        => "1. Decembar",
-    "financial_year_feb"                        => "1. Februar",
-    "financial_year_jan"                        => "1. Januar",
-    "financial_year_jul"                        => "1. Juli",
-    "financial_year_jun"                        => "1. Juni",
-    "financial_year_mar"                        => "1. Mart",
-    "financial_year_may"                        => "1. Maj",
-    "financial_year_nov"                        => "1. Novembar",
-    "financial_year_oct"                        => "1. Oktobar",
-    "financial_year_sep"                        => "1. Septembar",
-    "floating_labels"                           => "Plutajuće etikete",
-    "gcaptcha_enable"                           => "Stranica za prijavu reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA tajni ključ",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA tajni ključ je obavezno polje",
-    "gcaptcha_site_key"                         => "reCAPTCHA ključ sajta",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Ključ sajta je obavezno polje",
-    "gcaptcha_tooltip"                          => "Zaštitite stranicu za prijavu pomoću Google reCAPTCHA, kliknite na ikonu za par API ključeva.",
-    "general"                                   => "Generalno",
-    "general_configuration"                     => "Opšta konfiguracija",
-    "giftcard_number"                           => "Broj poklon kartice",
-    "giftcard_random"                           => "Generiši nasumice",
-    "giftcard_series"                           => "Generiši u seriji",
-    "image_allowed_file_types"                  => "Dozvoljeni tipovi datoteka",
-    "image_max_height_tooltip"                  => "Maksimalna dozvoljena visina učitavanja slike u pikselima (px).",
-    "image_max_size_tooltip"                    => "Maksimalna dozvoljena veličina datoteke za prijenos slike u kilobajtima (kb).",
-    "image_max_width_tooltip"                   => "Maksimalna dozvoljena širina slike u pikselima (px).",
-    "image_restrictions"                        => "Ograničenja za učitavanje slike",
-    "include_hsn"                               => "Uključite podršku za HSN kodove",
-    "info"                                      => "Informacije",
-    "info_configuration"                        => "Info o web trgovini",
-    "input_groups"                              => "Grupe unosa",
-    "integrations"                              => "Integracije",
-    "integrations_configuration"                => "Integracije trećih strana",
-    "invoice"                                   => "Faktura",
-    "invoice_configuration"                     => "Podešavanja štamapnja",
-    "invoice_default_comments"                  => "Komentar na fakturi",
-    "invoice_email_message"                     => "Predložak e-mail za fakture",
-    "invoice_enable"                            => "Omogući fakturisanje",
-    "invoice_printer"                           => "Štampanje faktura",
-    "invoice_type"                              => "Tip fakture",
-    "is_readable"                               => "čitljiv je, ali dozvole su veće od 660.",
-    "is_writable"                               => "može se napisati, ali dozvole su veće od 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Upozorenje! Onemogućene opcije će raditi samo ako imate instaliran FireFox jsPrintSetup dodatak. Svakako snimiti?",
-    "language"                                  => "Jezik",
-    "last_used_invoice_number"                  => "Zadnji korišćeni broj fakture",
-    "last_used_quote_number"                    => "Zadnji korišćeni broj citata",
-    "last_used_work_order_number"               => "Zadnji korišćeni broj R/N",
-    "left"                                      => "Lijevo",
-    "license"                                   => "Licenca",
-    "license_configuration"                     => "Izjava o licenci",
-    "line_sequence"                             => "Redoslijed linija",
-    "lines_per_page"                            => "Linija po stranici",
-    "lines_per_page_number"                     => "Redovi po stranici moraju biti broj.",
-    "lines_per_page_required"                   => "Broj linija po stranici je obavezno polje.",
-    "locale"                                    => "Lokalizacija",
-    "locale_configuration"                      => "Konfiguracija",
-    "locale_info"                               => "Info o lokalnoj konfiguraciji",
-    "location"                                  => "Skladište",
-    "location_configuration"                    => "Lokacije skladišta",
-    "location_info"                             => "Informacije o konfiguraciji lokacije",
-    "login_form"                                => "Stil formulara za prijavu",
-    "logout"                                    => "Zar ne želite da napravite rezervnu kopiju prije odjave? Kliknite [OK] za sigurnosnu kopiju, [Cancel] da biste se odjavili.",
-    "mailchimp"                                 => "MeilChimp",
-    "mailchimp_api_key"                         => "MailChimp API ključ",
-    "mailchimp_configuration"                   => "MailChimp konfiguracija",
-    "mailchimp_key_successfully"                => "API ključ je važeći.",
-    "mailchimp_key_unsuccessfully"              => "API ključ je nevažeći.",
-    "mailchimp_lists"                           => "MailChimp lista(e)",
-    "mailchimp_tooltip"                         => "Kliknite na ikonu za API ključ.",
-    "message"                                   => "Poruke",
-    "message_configuration"                     => "Konfigurisanje poruke",
-    "msg_msg"                                   => "Snimljena tekst poruka",
-    "msg_msg_placeholder"                       => "Ako želite koristiti SMS šablon, snimite poruku ovdje. U suprotnom ostavite prazno polje.",
-    "msg_pwd"                                   => "SMS-API lozinke",
-    "msg_pwd_required"                          => "SMS-API lozinke je obavezno polje",
-    "msg_src"                                   => "SMS-API ID pošiljaoca",
-    "msg_src_required"                          => "SMS-API Id pošiljaoca je obavezno polje",
-    "msg_uid"                                   => "SMS-API korisnika",
-    "msg_uid_required"                          => "SMS-API korisnika je obavezno polje",
-    "multi_pack_enabled"                        => "Više pakovanja po stavci",
-    "no_risk"                                   => "Nema rizika / ugroženosti.",
-    "none"                                      => "nijedan",
-    "notify_alignment"                          => "Položaj iskačuće obavijesti",
-    "number_format"                             => "Format broja",
-    "number_locale"                             => "Lokalizacija",
-    "number_locale_invalid"                     => "Unijeti jezik je nevažeći. Provjerite vezu u opisu alatke da biste pronašli važeći jezik.",
-    "number_locale_required"                    => "Broj lokacije je obavezno polje.",
-    "number_locale_tooltip"                     => "Pronađite odgovarajuću lokaciju na ovom linku.",
-    "os_timezone"                               => "OSPOS vremenska zona:",
-    "ospos_info"                                => "OSPOS instalacione informacije",
-    "payment_options_order"                     => "Narudžba opcije plaćanja",
-    "perm_risk"                                 => "Dozvole veće od 750 za pisanje i 660 za čitanje dovode ovaj program u rizik.",
-    "phone"                                     => "Telefon kompanije",
-    "phone_required"                            => "Telefon kompanije je obavezno polje.",
-    "print_bottom_margin"                       => "Donja margina",
-    "print_bottom_margin_number"                => "Donja margina mora biti broj.",
-    "print_bottom_margin_required"              => "Donja margina je obavezno polje.",
-    "print_delay_autoreturn"                    => "Automatski povratak na odgodu prodaje",
-    "print_delay_autoreturn_number"             => "Odgoda automatskog povratka na prodaju je obavezno polje.",
-    "print_delay_autoreturn_required"           => "Odlaganje automatskog povratka na prodaju mora biti broj.",
-    "print_footer"                              => "Štampanje podnožja",
-    "print_header"                              => "Štampanje zaglavlja",
-    "print_left_margin"                         => "Lijeva margina",
-    "print_left_margin_number"                  => "Lijeva margina mora biti broj.",
-    "print_left_margin_required"                => "Lijeva margina je obavezno polje.",
-    "print_receipt_check_behaviour"             => "Polje za potvrdu štampanja računa",
-    "print_receipt_check_behaviour_always"      => "Uvijek potvrđeno",
-    "print_receipt_check_behaviour_last"        => "Zapamti poslednji izbor",
-    "print_receipt_check_behaviour_never"       => "Uvijek nepotvrđeno",
-    "print_right_margin"                        => "Desna margina",
-    "print_right_margin_number"                 => "Desna margina mora biti broj.",
-    "print_right_margin_required"               => "Desna margina je obavezno polje.",
-    "print_silently"                            => "Prikaži dijalog za štampanje",
-    "print_top_margin"                          => "Gornja margina",
-    "print_top_margin_number"                   => "Gornja margina mora biti broj.",
-    "print_top_margin_required"                 => "Gornja margina je obavezno polje.",
-    "quantity_decimals"                         => "Decimale količine",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Difoltni komentari citata",
-    "receipt"                                   => "Račun",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Podešavanja štamapnja",
-    "receipt_default"                           => "Podrazumijevano",
-    "receipt_font_size"                         => "Veličina fonta",
-    "receipt_font_size_number"                  => "Veličina fonta mora biti broj.",
-    "receipt_font_size_required"                => "Veličina fonta je obavezno polje.",
-    "receipt_info"                              => "Informacije o POS računu",
-    "receipt_printer"                           => "POS štampač",
-    "receipt_short"                             => "Kratko",
-    "receipt_show_company_name"                 => "Prikaži kompaniju",
-    "receipt_show_description"                  => "Prikaži opis",
-    "receipt_show_serialnumber"                 => "Prikaži serijski broj",
-    "receipt_show_tax_ind"                      => "Prikaži poreski indikator",
-    "receipt_show_taxes"                        => "Prikaži porez",
-    "receipt_show_total_discount"               => "Prikaži ukupni popust",
-    "receipt_template"                          => "Šablon računa",
-    "receiving_calculate_average_price"         => "Izrač. prosječnih cijena (ulaza)",
-    "recv_invoice_format"                       => "Format računa fakture",
-    "register_mode_default"                     => "Mod registracije",
-    "report_an_issue"                           => "Prijavi problem",
-    "return_policy_required"                    => "Politika povrata je obavezno polje.",
-    "reward"                                    => "Nagrada",
-    "reward_configuration"                      => "Konfigurisanje poklona",
-    "right"                                     => "Desno",
-    "sales_invoice_format"                      => "Format fakture",
-    "sales_quote_format"                        => "Format navedene prodaje",
-    "saved_successfully"                        => "Konfiguracija je uspješno snimljena.",
-    "saved_unsuccessfully"                      => "Konfiguracija nije uspješno snimljena.",
-    "security_issue"                            => "Upozorenje o sigurnosnoj ranjivosti",
-    "server_notice"                             => "Koristite informacije u nastavku za prijavljivanje problema.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Prikaži ikonu kancelarije",
-    "statistics"                                => "Pošalji statistiku",
-    "statistics_tooltip"                        => "Pošaljite statistiku u svrhu razvoja i poboljšanja funkcija.",
-    "stock_location"                            => "Lokacija skladišta",
-    "stock_location_duplicate"                  => "Lokacija zaliha mora biti jedinstvena.",
-    "stock_location_invalid_chars"              => "Lokacija skaldišta ne može sadržavati '_'.",
-    "stock_location_required"                   => "Lokacija skladišta je obavezno polje.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Kolona 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Prijedlozi za pretraživanje",
-    "suggestions_second_column"                 => "Kolona 2",
-    "suggestions_third_column"                  => "Kolona 3",
-    "system_conf"                               => "Podešavanja & Konf",
-    "system_info"                               => "Sistem Info",
-    "table"                                     => "Sto",
-    "table_configuration"                       => "Konfigurisanje stola",
-    "takings_printer"                           => "Štampanje računa",
-    "tax"                                       => "Porez",
-    "tax_category"                              => "Kategorija",
-    "tax_category_duplicate"                    => "Unesena kategorija već postoji.",
-    "tax_category_invalid_chars"                => "Unesena kategorija je nevažeća.",
-    "tax_category_required"                     => "Obavezna je kategorija.",
-    "tax_category_used"                         => "Kategorija se ne može izbrisati jer se koristi.",
-    "tax_configuration"                         => "Konfigurisanje poreza",
-    "tax_decimals"                              => "Poreske decimale",
-    "tax_id"                                    => "ID poreza",
-    "tax_included"                              => "Uključen porez",
-    "theme"                                     => "Tema",
-    "theme_preview"                             => "Pregled teme:",
-    "thousands_separator"                       => "Separator za hiljade",
-    "timezone"                                  => "Vremenska zona",
-    "timezone_error"                            => "Vremenska zona OSPOS razlikuje se od vaše lokalne vremenske zone.",
-    "top"                                       => "Vrh",
-    "use_destination_based_tax"                 => "Koristite porez na osnovu odredišta",
-    "user_timezone"                             => "Lokalna vremenska zona:",
-    "website"                                   => "web stranica",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Podnošenje radnog naloga",
-    "work_order_format"                         => "Format radnog naloga",
+    'address'                                   => 'Adresa kompanije',
+    'address_required'                          => 'Adresa kompanije je obavezno polje.',
+    'all_set'                                   => 'Sva su dopuštenja datoteka ispravno postavljena!',
+    'allow_duplicate_barcodes'                  => 'Dozvoli dvostruke barkodove',
+    'apostrophe'                                => 'apostrof',
+    'backup_button'                             => 'Rezervna kopija',
+    'backup_database'                           => 'Rezervna kopija baze podataka',
+    'barcode'                                   => 'Barkod',
+    'barcode_company'                           => 'Kompanija',
+    'barcode_configuration'                     => 'Konfiguracija barkoda',
+    'barcode_content'                           => 'Sadržaj barkoda',
+    'barcode_first_row'                         => '1 red',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Unesi format',
+    'barcode_generate_if_empty'                 => 'Generiši ako je prazno.',
+    'barcode_height'                            => 'Visina(px)',
+    'barcode_id'                                => 'Id / naziv artikla',
+    'barcode_info'                              => 'Informacije o konfiguraciji barkoda',
+    'barcode_layout'                            => 'Izgled barkoda',
+    'barcode_name'                              => 'Naziv',
+    'barcode_number'                            => 'Barkod',
+    'barcode_number_in_row'                     => 'Broj u redu',
+    'barcode_page_cellspacing'                  => 'Prikaži razmak ćelija na stranici.',
+    'barcode_page_width'                        => 'Širina stranice',
+    'barcode_price'                             => 'Cijena',
+    'barcode_second_row'                        => '2.red',
+    'barcode_third_row'                         => '3.red',
+    'barcode_tooltip'                           => 'Upozorenje: Ova funkcija može prouzrokovati uvoz ili kreiranje duplikata. Ne koristite ako ne želite duple barkodove.',
+    'barcode_type'                              => 'Tip barkoda',
+    'barcode_width'                             => 'Širina (px)',
+    'bottom'                                    => 'Dno',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Decimale gotovine',
+    'cash_decimals_tooltip'                     => 'Ako su Decimale gotovine i Valutne decimale iste, onda neće biti zaokruživanja gotovine.',
+    'cash_rounding'                             => 'Zaokruživanje gotovine',
+    'category_dropdown'                         => 'Prikaži kategoriju kao padajući meni',
+    'center'                                    => 'Centar',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'zarez',
+    'company'                                   => 'Kompanija',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Promijeni logo',
+    'company_logo'                              => 'Logo kompanije',
+    'company_remove_image'                      => 'Ukloni logo',
+    'company_required'                          => 'Naziv kompanije je obavezno polje',
+    'company_select_image'                      => 'Izaberite sliku',
+    'company_website_url'                       => 'Veb lokacija kompanije nije važeća URL adresa (http://...).',
+    'country_codes'                             => 'Kod zemlje',
+    'country_codes_tooltip'                     => 'Lista kodova zemalja odvojena zarezima za traženje nominalnih adresa.',
+    'currency_code'                             => 'Kod valute',
+    'currency_decimals'                         => 'Velutne decimale',
+    'currency_symbol'                           => 'Simbol valute',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Nagrada',
+    'customer_reward_duplicate'                 => 'Nagrada mora biti jedinstvena.',
+    'customer_reward_enable'                    => 'Omogući nagrade kupcima',
+    'customer_reward_invalid_chars'             => "Nagrada ne može sadržavati '_'",
+    'customer_reward_required'                  => 'Nagrada je obavezno polje',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Filter datuma i vremena',
+    'datetimeformat'                            => 'Format datuma i vremena',
+    'decimal_point'                             => 'Decimalna točka',
+    'default_barcode_font_size_number'          => 'Veličina fonta za barkod mora biti broj.',
+    'default_barcode_font_size_required'        => 'Veličina fonta barkoda je obavezno polje.',
+    'default_barcode_height_number'             => 'Visina barkoda mora biti broj.',
+    'default_barcode_height_required'           => 'Visina barkoda je obavezno polje.',
+    'default_barcode_num_in_row_number'         => 'Broj barkoda u redu mora biti broj.',
+    'default_barcode_num_in_row_required'       => 'Broj barkoda u redu je obavezno polje.',
+    'default_barcode_page_cellspacing_number'   => 'Razmak između ćelija sa barkodom mora biti broj.',
+    'default_barcode_page_cellspacing_required' => 'Rastojanje ćelija na stranici sa barkodom je obavezno polje.',
+    'default_barcode_page_width_number'         => 'Širina stranice sa bar kodom mora biti broj.',
+    'default_barcode_page_width_required'       => 'Širina stranice sa barkodom je obavezno polje.',
+    'default_barcode_width_number'              => 'Standardna širina barkoda mora biti broj.',
+    'default_barcode_width_required'            => 'Širina barkoda je obavezno polje.',
+    'default_item_columns'                      => 'Vidljiva stavka kolone',
+    'default_origin_tax_code'                   => 'Šifra poreza',
+    'default_receivings_discount'               => 'Popust za ulaze',
+    'default_receivings_discount_number'        => 'Popust za ulaz mora biti broj.',
+    'default_receivings_discount_required'      => 'Popust za ulaz je obavezno polje.',
+    'default_sales_discount'                    => 'Popust na prodaju',
+    'default_sales_discount_number'             => 'Popust na prodaju mora biti broj.',
+    'default_sales_discount_required'           => 'Popust na prodaju je obavezno polje.',
+    'default_tax_category'                      => 'Poreska kategorija',
+    'default_tax_code'                          => 'Poreska šifra',
+    'default_tax_jurisdiction'                  => 'Poreska uprava',
+    'default_tax_name_number'                   => 'Naziv poreza mora biti string.',
+    'default_tax_name_required'                 => 'Naziv poreza je obavezno polje.',
+    'default_tax_rate'                          => 'Stopa poreza %',
+    'default_tax_rate_1'                        => 'Stopa poreza 1 %',
+    'default_tax_rate_2'                        => 'Stopa poreza 2 %',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Stopa poreza mora biti broj.',
+    'default_tax_rate_required'                 => 'Stopa poreza je obavezno polje.',
+    'derive_sale_quantity'                      => 'Dozvoli izvedenu količinu prodaje',
+    'derive_sale_quantity_tooltip'              => 'Ako se izabere, za artikle naručene po produženom iznosu biće obezbjeđen novi tip artikla',
+    'dinner_table'                              => 'Sto',
+    'dinner_table_duplicate'                    => 'Sto mora biti jedinstven.',
+    'dinner_table_enable'                       => 'Omogući stolove za večeru',
+    'dinner_table_invalid_chars'                => "Naziv stola ne može sadržavati '_'.",
+    'dinner_table_required'                     => 'Sto je obavezno polje.',
+    'dot'                                       => 'tačka',
+    'email'                                     => 'E-mail',
+    'email_configuration'                       => 'Konfiguracija e-mail',
+    'email_mailpath'                            => 'Putanja do Sendmaila',
+    'email_protocol'                            => 'Protokol',
+    'email_receipt_check_behaviour'             => 'Polje za potvrdu e-mail',
+    'email_receipt_check_behaviour_always'      => 'Uvijek potvrđeno',
+    'email_receipt_check_behaviour_last'        => 'Zapamti poslednji izbor',
+    'email_receipt_check_behaviour_never'       => 'Uvijek nepotvrđeno',
+    'email_smtp_crypto'                         => 'SMTP šifriranje',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Lozinka',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP pauza',
+    'email_smtp_user'                           => 'SMTP Korisničko ime',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Ostvarite privatnost',
+    'enforce_privacy_tooltip'                   => 'Zaštitite privatnost kupaca primjenjujući kodiranje podataka u slučaju brisanja njihovih podataka',
+    'fax'                                       => 'Faks',
+    'file_perm'                                 => 'Postoje problemi sa dozvolama za datoteke, popravite i ponovo učitajte ovu stranicu.',
+    'financial_year'                            => 'Početak fiskalne godine',
+    'financial_year_apr'                        => '1. April',
+    'financial_year_aug'                        => '1. Avgust',
+    'financial_year_dec'                        => '1. Decembar',
+    'financial_year_feb'                        => '1. Februar',
+    'financial_year_jan'                        => '1. Januar',
+    'financial_year_jul'                        => '1. Juli',
+    'financial_year_jun'                        => '1. Juni',
+    'financial_year_mar'                        => '1. Mart',
+    'financial_year_may'                        => '1. Maj',
+    'financial_year_nov'                        => '1. Novembar',
+    'financial_year_oct'                        => '1. Oktobar',
+    'financial_year_sep'                        => '1. Septembar',
+    'floating_labels'                           => 'Plutajuće etikete',
+    'gcaptcha_enable'                           => 'Stranica za prijavu reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA tajni ključ',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA tajni ključ je obavezno polje',
+    'gcaptcha_site_key'                         => 'reCAPTCHA ključ sajta',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Ključ sajta je obavezno polje',
+    'gcaptcha_tooltip'                          => 'Zaštitite stranicu za prijavu pomoću Google reCAPTCHA, kliknite na ikonu za par API ključeva.',
+    'general'                                   => 'Generalno',
+    'general_configuration'                     => 'Opšta konfiguracija',
+    'giftcard_number'                           => 'Broj poklon kartice',
+    'giftcard_random'                           => 'Generiši nasumice',
+    'giftcard_series'                           => 'Generiši u seriji',
+    'image_allowed_file_types'                  => 'Dozvoljeni tipovi datoteka',
+    'image_max_height_tooltip'                  => 'Maksimalna dozvoljena visina učitavanja slike u pikselima (px).',
+    'image_max_size_tooltip'                    => 'Maksimalna dozvoljena veličina datoteke za prijenos slike u kilobajtima (kb).',
+    'image_max_width_tooltip'                   => 'Maksimalna dozvoljena širina slike u pikselima (px).',
+    'image_restrictions'                        => 'Ograničenja za učitavanje slike',
+    'include_hsn'                               => 'Uključite podršku za HSN kodove',
+    'info'                                      => 'Informacije',
+    'info_configuration'                        => 'Info o web trgovini',
+    'input_groups'                              => 'Grupe unosa',
+    'integrations'                              => 'Integracije',
+    'integrations_configuration'                => 'Integracije trećih strana',
+    'invoice'                                   => 'Faktura',
+    'invoice_configuration'                     => 'Podešavanja štamapnja',
+    'invoice_default_comments'                  => 'Komentar na fakturi',
+    'invoice_email_message'                     => 'Predložak e-mail za fakture',
+    'invoice_enable'                            => 'Omogući fakturisanje',
+    'invoice_printer'                           => 'Štampanje faktura',
+    'invoice_type'                              => 'Tip fakture',
+    'is_readable'                               => 'čitljiv je, ali dozvole su veće od 660.',
+    'is_writable'                               => 'može se napisati, ali dozvole su veće od 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Upozorenje! Onemogućene opcije će raditi samo ako imate instaliran FireFox jsPrintSetup dodatak. Svakako snimiti?',
+    'language'                                  => 'Jezik',
+    'last_used_invoice_number'                  => 'Zadnji korišćeni broj fakture',
+    'last_used_quote_number'                    => 'Zadnji korišćeni broj citata',
+    'last_used_work_order_number'               => 'Zadnji korišćeni broj R/N',
+    'left'                                      => 'Lijevo',
+    'license'                                   => 'Licenca',
+    'license_configuration'                     => 'Izjava o licenci',
+    'line_sequence'                             => 'Redoslijed linija',
+    'lines_per_page'                            => 'Linija po stranici',
+    'lines_per_page_number'                     => 'Redovi po stranici moraju biti broj.',
+    'lines_per_page_required'                   => 'Broj linija po stranici je obavezno polje.',
+    'locale'                                    => 'Lokalizacija',
+    'locale_configuration'                      => 'Konfiguracija',
+    'locale_info'                               => 'Info o lokalnoj konfiguraciji',
+    'location'                                  => 'Skladište',
+    'location_configuration'                    => 'Lokacije skladišta',
+    'location_info'                             => 'Informacije o konfiguraciji lokacije',
+    'login_form'                                => 'Stil formulara za prijavu',
+    'logout'                                    => 'Zar ne želite da napravite rezervnu kopiju prije odjave? Kliknite [OK] za sigurnosnu kopiju, [Cancel] da biste se odjavili.',
+    'mailchimp'                                 => 'MeilChimp',
+    'mailchimp_api_key'                         => 'MailChimp API ključ',
+    'mailchimp_configuration'                   => 'MailChimp konfiguracija',
+    'mailchimp_key_successfully'                => 'API ključ je važeći.',
+    'mailchimp_key_unsuccessfully'              => 'API ključ je nevažeći.',
+    'mailchimp_lists'                           => 'MailChimp lista(e)',
+    'mailchimp_tooltip'                         => 'Kliknite na ikonu za API ključ.',
+    'message'                                   => 'Poruke',
+    'message_configuration'                     => 'Konfigurisanje poruke',
+    'msg_msg'                                   => 'Snimljena tekst poruka',
+    'msg_msg_placeholder'                       => 'Ako želite koristiti SMS šablon, snimite poruku ovdje. U suprotnom ostavite prazno polje.',
+    'msg_pwd'                                   => 'SMS-API lozinke',
+    'msg_src'                                   => 'SMS-API ID pošiljaoca',
+    'msg_src_required'                          => 'SMS-API Id pošiljaoca je obavezno polje',
+    'msg_uid'                                   => 'SMS-API korisnika',
+    'msg_uid_required'                          => 'SMS-API korisnika je obavezno polje',
+    'multi_pack_enabled'                        => 'Više pakovanja po stavci',
+    'no_risk'                                   => 'Nema rizika / ugroženosti.',
+    'none'                                      => 'nijedan',
+    'notify_alignment'                          => 'Položaj iskačuće obavijesti',
+    'number_format'                             => 'Format broja',
+    'number_locale'                             => 'Lokalizacija',
+    'number_locale_invalid'                     => 'Unijeti jezik je nevažeći. Provjerite vezu u opisu alatke da biste pronašli važeći jezik.',
+    'number_locale_required'                    => 'Broj lokacije je obavezno polje.',
+    'number_locale_tooltip'                     => 'Pronađite odgovarajuću lokaciju na ovom linku.',
+    'os_timezone'                               => 'OSPOS vremenska zona:',
+    'ospos_info'                                => 'OSPOS instalacione informacije',
+    'payment_options_order'                     => 'Narudžba opcije plaćanja',
+    'payment_reference_code_length_limits'      => 'Referentni kod plaćanja<br>Ograničenja duljine',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Dozvole veće od 750 za pisanje i 660 za čitanje dovode ovaj program u rizik.',
+    'phone'                                     => 'Telefon kompanije',
+    'phone_required'                            => 'Telefon kompanije je obavezno polje.',
+    'print_bottom_margin'                       => 'Donja margina',
+    'print_bottom_margin_number'                => 'Donja margina mora biti broj.',
+    'print_bottom_margin_required'              => 'Donja margina je obavezno polje.',
+    'print_delay_autoreturn'                    => 'Automatski povratak na odgodu prodaje',
+    'print_delay_autoreturn_number'             => 'Odgoda automatskog povratka na prodaju je obavezno polje.',
+    'print_delay_autoreturn_required'           => 'Odlaganje automatskog povratka na prodaju mora biti broj.',
+    'print_footer'                              => 'Štampanje podnožja',
+    'print_header'                              => 'Štampanje zaglavlja',
+    'print_left_margin'                         => 'Lijeva margina',
+    'print_left_margin_number'                  => 'Lijeva margina mora biti broj.',
+    'print_left_margin_required'                => 'Lijeva margina je obavezno polje.',
+    'print_receipt_check_behaviour'             => 'Polje za potvrdu štampanja računa',
+    'print_receipt_check_behaviour_always'      => 'Uvijek potvrđeno',
+    'print_receipt_check_behaviour_last'        => 'Zapamti poslednji izbor',
+    'print_receipt_check_behaviour_never'       => 'Uvijek nepotvrđeno',
+    'print_right_margin'                        => 'Desna margina',
+    'print_right_margin_number'                 => 'Desna margina mora biti broj.',
+    'print_right_margin_required'               => 'Desna margina je obavezno polje.',
+    'print_silently'                            => 'Prikaži dijalog za štampanje',
+    'print_top_margin'                          => 'Gornja margina',
+    'print_top_margin_number'                   => 'Gornja margina mora biti broj.',
+    'print_top_margin_required'                 => 'Gornja margina je obavezno polje.',
+    'quantity_decimals'                         => 'Decimale količine',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Difoltni komentari citata',
+    'receipt'                                   => 'Račun',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Podešavanja štamapnja',
+    'receipt_default'                           => 'Podrazumijevano',
+    'receipt_font_size'                         => 'Veličina fonta',
+    'receipt_font_size_number'                  => 'Veličina fonta mora biti broj.',
+    'receipt_font_size_required'                => 'Veličina fonta je obavezno polje.',
+    'receipt_info'                              => 'Informacije o POS računu',
+    'receipt_printer'                           => 'POS štampač',
+    'receipt_short'                             => 'Kratko',
+    'receipt_show_company_name'                 => 'Prikaži kompaniju',
+    'receipt_show_description'                  => 'Prikaži opis',
+    'receipt_show_serialnumber'                 => 'Prikaži serijski broj',
+    'receipt_show_tax_ind'                      => 'Prikaži poreski indikator',
+    'receipt_show_taxes'                        => 'Prikaži porez',
+    'receipt_show_total_discount'               => 'Prikaži ukupni popust',
+    'receipt_template'                          => 'Šablon računa',
+    'receiving_calculate_average_price'         => 'Izrač. prosječnih cijena (ulaza)',
+    'recv_invoice_format'                       => 'Format računa fakture',
+    'register_mode_default'                     => 'Mod registracije',
+    'report_an_issue'                           => 'Prijavi problem',
+    'return_policy_required'                    => 'Politika povrata je obavezno polje.',
+    'reward'                                    => 'Nagrada',
+    'reward_configuration'                      => 'Konfigurisanje poklona',
+    'right'                                     => 'Desno',
+    'sales_invoice_format'                      => 'Format fakture',
+    'sales_quote_format'                        => 'Format navedene prodaje',
+    'mailpath_invalid'                          => 'Nevažeća sendmail putanja. Dozvoljena su samo slova, brojevi, crtice, donje crte, kose crte, obrnute kose crte, dvotačke, razmaci i tačke.',
+    'saved_successfully'                        => 'Konfiguracija je uspješno snimljena.',
+    'saved_unsuccessfully'                      => 'Konfiguracija nije uspješno snimljena.',
+    'security_issue'                            => 'Upozorenje o sigurnosnoj ranjivosti',
+    'server_notice'                             => 'Koristite informacije u nastavku za prijavljivanje problema.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Prikaži ikonu kancelarije',
+    'statistics'                                => 'Pošalji statistiku',
+    'statistics_tooltip'                        => 'Pošaljite statistiku u svrhu razvoja i poboljšanja funkcija.',
+    'stock_location'                            => 'Lokacija skladišta',
+    'stock_location_duplicate'                  => 'Lokacija zaliha mora biti jedinstvena.',
+    'stock_location_invalid_chars'              => "Lokacija skaldišta ne može sadržavati '_'.",
+    'stock_location_required'                   => 'Lokacija skladišta je obavezno polje.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Kolona 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Prijedlozi za pretraživanje',
+    'suggestions_second_column'                 => 'Kolona 2',
+    'suggestions_third_column'                  => 'Kolona 3',
+    'system_conf'                               => 'Podešavanja & Konf',
+    'system_info'                               => 'Sistem Info',
+    'table'                                     => 'Sto',
+    'table_configuration'                       => 'Konfigurisanje stola',
+    'takings_printer'                           => 'Štampanje računa',
+    'tax'                                       => 'Porez',
+    'tax_category'                              => 'Kategorija',
+    'tax_category_duplicate'                    => 'Unesena kategorija već postoji.',
+    'tax_category_invalid_chars'                => 'Unesena kategorija je nevažeća.',
+    'tax_category_required'                     => 'Obavezna je kategorija.',
+    'tax_category_used'                         => 'Kategorija se ne može izbrisati jer se koristi.',
+    'tax_configuration'                         => 'Konfigurisanje poreza',
+    'tax_decimals'                              => 'Poreske decimale',
+    'tax_id'                                    => 'ID poreza',
+    'tax_included'                              => 'Uključen porez',
+    'theme'                                     => 'Tema',
+    'theme_preview'                             => 'Pregled teme:',
+    'thousands_separator'                       => 'Separator za hiljade',
+    'timezone'                                  => 'Vremenska zona',
+    'timezone_error'                            => 'Vremenska zona OSPOS razlikuje se od vaše lokalne vremenske zone.',
+    'top'                                       => 'Vrh',
+    'use_destination_based_tax'                 => 'Koristite porez na osnovu odredišta',
+    'user_timezone'                             => 'Lokalna vremenska zona:',
+    'website'                                   => 'web stranica',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Podnošenje radnog naloga',
+    'work_order_format'                         => 'Format radnog naloga',
 ];
diff --git a/app/Language/bs/Employees.php b/app/Language/bs/Employees.php
index 17ea3bf77..440c7b631 100644
--- a/app/Language/bs/Employees.php
+++ b/app/Language/bs/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informacije",
-    "cannot_be_deleted"            => "Nije moguće izbrisati odabrane zaposlenike, jedan ili više njih su obradili prodaju ili pokušavate izbrisati svoj nalog.",
-    "change_employee"              => "",
-    "change_password"              => "Promijeni lozinku",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Da li ste zaista sigurni da želite da izbrišete izabranog zaposlenika?",
-    "confirm_restore"              => "Da li ste sigurni da želite da vratite izabranog zaposlenika?",
-    "current_password"             => "Trenutna lozinka",
-    "current_password_invalid"     => "Trenutna lozinka je nevažeća.",
-    "employee"                     => "Zaposlenik",
-    "error_adding_updating"        => "Dodavanje ili ažuriranje zaposlenika nije uspjelo.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Ne možete izbrisati demo korisnika administratora.",
-    "error_updating_demo_admin"    => "Ne možete promijeniti korisnika demo administratora.",
-    "language"                     => "Jezik",
-    "login_info"                   => "Prijava",
-    "manager"                      => "",
-    "new"                          => "Novi zaposlenik",
-    "none_selected"                => "Nije izabran nijedan zaposlenik za brisanje.",
-    "one_or_multiple"              => "Zaposlenici",
-    "password"                     => "Lozinka",
-    "password_minlength"           => "Lozinka mora imati najmanje 8 znakova.",
-    "password_must_match"          => "Lozinke se ne podudaraju.",
-    "password_not_must_match"      => "Trenutna lozinka i nova lozinka moraju biti jedinstvene.",
-    "password_required"            => "Lozinka je obavezna.",
-    "permission_desc"              => "Označite polja u nastavku da biste odobrili pristup modulima.",
-    "permission_info"              => "Dozvole",
-    "repeat_password"              => "Ponovite lozinku",
-    "subpermission_required"       => "Dodajte najmanje jedno odobrenje za svaki modul.",
-    "successful_adding"            => "Uspješno ste dodali zaposlenika.",
-    "successful_change_password"   => "Promjena lozinke je uspješna.",
-    "successful_deleted"           => "Uspješno ste izbrisali zaposlenika",
-    "successful_updating"          => "Uspješno ste ažurirali zaposlenika",
-    "system_language"              => "Sistemski jezik",
-    "unsuccessful_change_password" => "Promjena lozinke nije uspjela.",
-    "update"                       => "Ažuriraj zaposlenika",
-    "username"                     => "Korisničko ime",
-    "username_duplicate"           => "Korisničko ime zaposlenog je već u upotrebi. Molimo izaberite drugo.",
-    "username_minlength"           => "Korisničko ime mora imati najmanje 5 znakova.",
-    "username_required"            => "Korisničko ime je obavezno polje.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Informacije',
+    'cannot_be_deleted'                      => 'Nije moguće izbrisati odabrane zaposlenike, jedan ili više njih su obradili prodaju ili pokušavate izbrisati svoj nalog.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Promijeni lozinku',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Da li ste zaista sigurni da želite da izbrišete izabranog zaposlenika?',
+    'confirm_restore'                        => 'Da li ste sigurni da želite da vratite izabranog zaposlenika?',
+    'current_password'                       => 'Trenutna lozinka',
+    'current_password_invalid'               => 'Trenutna lozinka je nevažeća.',
+    'employee'                               => 'Zaposlenik',
+    'error_adding_updating'                  => 'Dodavanje ili ažuriranje zaposlenika nije uspjelo.',
+    'error_cannot_remove_own_minimum_grant'  => 'Ne možete ukloniti sopstvena minimalna odobrenja pristupa modulima.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Ne možete izbrisati demo korisnika administratora.',
+    'error_grant_change_disallowed'          => 'Izmene dozvola su onemogućene u ovoj demo verziji.',
+    'error_password_change_disallowed'       => 'Izmene lozinke su onemogućene u ovoj demo verziji.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Ne možete promijeniti korisnika demo administratora.',
+    'language'                               => 'Jezik',
+    'login_info'                             => 'Prijava',
+    'manager'                                => '',
+    'new'                                    => 'Novi zaposlenik',
+    'none_selected'                          => 'Nije izabran nijedan zaposlenik za brisanje.',
+    'one_or_multiple'                        => 'Zaposlenici',
+    'password'                               => 'Lozinka',
+    'password_minlength'                     => 'Lozinka mora imati najmanje 8 znakova.',
+    'password_must_match'                    => 'Lozinke se ne podudaraju.',
+    'password_not_must_match'                => 'Trenutna lozinka i nova lozinka moraju biti jedinstvene.',
+    'password_required'                      => 'Lozinka je obavezna.',
+    'permission_desc'                        => 'Označite polja u nastavku da biste odobrili pristup modulima.',
+    'permission_info'                        => 'Dozvole',
+    'repeat_password'                        => 'Ponovite lozinku',
+    'subpermission_required'                 => 'Dodajte najmanje jedno odobrenje za svaki modul.',
+    'successful_adding'                      => 'Uspješno ste dodali zaposlenika.',
+    'successful_change_password'             => 'Promjena lozinke je uspješna.',
+    'successful_deleted'                     => 'Uspješno ste izbrisali zaposlenika',
+    'successful_updating'                    => 'Uspješno ste ažurirali zaposlenika',
+    'system_language'                        => 'Sistemski jezik',
+    'unsuccessful_change_password'           => 'Promjena lozinke nije uspjela.',
+    'update'                                 => 'Ažuriraj zaposlenika',
+    'username'                               => 'Korisničko ime',
+    'username_duplicate'                     => 'Korisničko ime zaposlenog je već u upotrebi. Molimo izaberite drugo.',
+    'username_minlength'                     => 'Korisničko ime mora imati najmanje 5 znakova.',
+    'username_required'                      => 'Korisničko ime je obavezno polje.',
 ];
diff --git a/app/Language/bs/Error.php b/app/Language/bs/Error.php
index 7ed5adf4e..865a963bd 100644
--- a/app/Language/bs/Error.php
+++ b/app/Language/bs/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Nemate dozvolu za pristup modulu",
-    "unknown"              => "Neočekivana greška",
+    'no_permission_module'           => 'Nemate dozvolu za pristup modulu',
+    'unable_to_create_env_file'      => 'Nije moguće kreirati {filePath} za obezbjeđivanje throttle.key',
+    'unable_to_lock_file'            => 'Nije moguće zaključati {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Nije moguće otvoriti {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Nije moguće trajno sačuvati throttle.key u {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Nije moguće pročitati {filePath} za obezbjeđivanje throttle.key',
+    'unknown'                        => 'Neočekivana greška',
 ];
diff --git a/app/Language/bs/Items.php b/app/Language/bs/Items.php
index 7dbb34518..d258a71af 100644
--- a/app/Language/bs/Items.php
+++ b/app/Language/bs/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Zaliha za dodavanje ili oduzimanje.",
-    "allow_alt_description"              => "Dozvoli Alt opis",
-    "amount_entry"                       => "Unos iznosa",
-    "bulk_edit"                          => "Skupno uređivanje",
-    "buy_price_required"                 => "Nabavna cijena je obavezno polje.",
-    "cannot_be_deleted"                  => "Nije moguće izbrisati izabrane artikle, jedan ili više izabranih predmeta imaju prodaju.",
-    "cannot_find_item"                   => "Artikal nije pronađen.",
-    "categories"                         => "",
-    "category"                           => "Kategorija",
-    "category_new"                       => "",
-    "category_required"                  => "Kategorija je obavezno polje.",
-    "change_all_to_allow_alt_desc"       => "Dozvoli alternativni opis za sve.",
-    "change_all_to_not_allow_allow_desc" => "Ne dozvoli alternativni opis za sve.",
-    "change_all_to_serialized"           => "Promijeni sve u seriju",
-    "change_all_to_unserialized"         => "Promijenite sve u ne seriju",
-    "change_image"                       => "Promijeni sliku",
-    "confirm_bulk_edit"                  => "Da li ste sigurni da želite urediti izabrane artikle?",
-    "confirm_bulk_edit_wipe_taxes"       => "Sve informacije o porezu na artikal biće zamjenjene.",
-    "confirm_delete"                     => "Da li ste sigurni da želite izbrisati izabrani artikal?",
-    "confirm_restore"                    => "Da li ste sigurni da želite da vratite izabrani artikal?",
-    "cost_price"                         => "Fakturna cijena",
-    "cost_price_number"                  => "Fakturna cijena mora biti broj.",
-    "cost_price_required"                => "Fakturna cijena je obavezno polje.",
-    "count"                              => "Ažuriraj zalihu",
-    "csv_import_failed"                  => "Uvoz CSV-a nije uspio",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Učitana CSV datoteka nema podatke ili je pogrešno formatirana.",
-    "csv_import_partially_failed"        => "Bilo je {0} grešaka pri uvozu stavke na liniji: {1}. Nijedan red nije uvezen.",
-    "csv_import_success"                 => "Uvoz CSV stavke je uspješan.",
-    "current_quantity"                   => "Trenutna količina",
-    "default_pack_name"                  => "Svaki",
-    "description"                        => "Opis",
-    "details_count"                      => "Detalji o količinama zalihe",
-    "do_nothing"                         => "Ne radi ništa",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Uredite željena polja za odabrane artikle.",
-    "edit_multiple_items"                => "Uređivanje više artikala",
-    "empty_upc_items"                    => "Artikli sa praznim barkodom",
-    "error_adding_updating"              => "Greška pri dodavanju / ažuriranju artikla",
-    "error_updating_multiple"            => "Greška pri ažuriranju artikala",
-    "generate_barcodes"                  => "Generiši barkod",
-    "hsn_code"                           => "Nomenklatura sistema usklađena",
-    "image"                              => "Slika",
-    "import_items_csv"                   => "Uvezi artikle iz CSV datoteke",
-    "info_provided_by"                   => "Informacije pruža",
-    "inventory"                          => "Zaliha",
-    "inventory_CSV_import_quantity"      => "Količina uvezena iz CSV-a",
-    "inventory_comments"                 => "Komentari",
-    "inventory_data_tracking"            => "Praćenje podataka zalihe",
-    "inventory_date"                     => "Datum",
-    "inventory_employee"                 => "Zaposlenik",
-    "inventory_in_out_quantity"          => "Količina ulaz/izlaz",
-    "inventory_remarks"                  => "Napomene",
-    "is_deleted"                         => "Izbrisano",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Artikal ima ser. broj",
-    "item"                               => "Artikal",
-    "item_id"                            => "",
-    "item_number"                        => "Barkod",
-    "item_number_duplicate"              => "Broj artikla već postoji u bazi podataka.",
-    "kit"                                => "Komplet",
-    "location"                           => "Mjesto",
-    "low_inventory_items"                => "Prodaja artikala",
-    "low_sell_item"                      => "Niska prodaja artikla",
-    "manually_editing_of_quantity"       => "Ručno uređivanje količine",
-    "markup"                             => "",
-    "name"                               => "Naziv artikla",
-    "name_required"                      => "Naziv artikla je obavezno polje.",
-    "new"                                => "Novi artikal",
-    "no_description_items"               => "Artikal nema opisa",
-    "no_items_to_display"                => "Nema artikala za prikaz.",
-    "none"                               => "Nijedan",
-    "none_selected"                      => "Niste odabrali nijedan artikal za uređivanje",
-    "nonstock"                           => "Bez zaliha",
-    "number_information"                 => "Redni broj",
-    "number_required"                    => "Barkod je obavezno polje.",
-    "one_or_multiple"                    => "artikal(i)",
-    "pack_name"                          => "Naziv pakovanja",
-    "qty_per_pack"                       => "Količina po pakovanju",
-    "quantity"                           => "Količina",
-    "quantity_number"                    => "Količina mora biti broj.",
-    "quantity_required"                  => "Količina je obavezno polje.",
-    "receiving_quantity"                 => "Zaprimljena količina",
-    "remove_image"                       => "Ukloni sliku",
-    "reorder_level"                      => "Minimalna zaliha",
-    "reorder_level_number"               => "Nivo preuređivanja mora biti broj.",
-    "reorder_level_required"             => "Nivo preuređivanja je obavezno polje.",
-    "retrive_item_info"                  => "Preuzmi informacije o artiklu",
-    "sales_tax_1"                        => "Prodajni porez",
-    "sales_tax_2"                        => "Prodajni porez 2",
-    "search_attributes"                  => "Pretraživanje atributa",
-    "select_image"                       => "Izaberite sliku",
-    "serialized_items"                   => "Artikal ima ser. broj",
-    "standard"                           => "Standard",
-    "stock"                              => "Skladište",
-    "stock_location"                     => "Mjesto skladišta",
-    "stock_type"                         => "Vrsta zalihe",
-    "successful_adding"                  => "Uspješno ste dodali artikal",
-    "successful_bulk_edit"               => "Uspješno ste ažurirali izabrane artikle",
-    "successful_deleted"                 => "Uspješno ste izbrisali artikal",
-    "successful_updating"                => "Uspješno ste ažurirali artikal",
-    "supplier"                           => "Dobavljač",
-    "tax_1"                              => "Porez 1",
-    "tax_2"                              => "Porez 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Kategorija poreza",
-    "tax_percent"                        => "Procenat poreza",
-    "tax_percent_number"                 => "Procenat poreza mora biti numerička vrijednost",
-    "tax_percent_required"               => "Procenat poreza je obavezno polje.",
-    "tax_percents"                       => "Porez %",
-    "temp"                               => "Privremeno",
-    "type"                               => "Vrsta artikla",
-    "unit_price"                         => "Maloprodajna cijena",
-    "unit_price_number"                  => "Jedinična cijena mora biti broj.",
-    "unit_price_required"                => "Maloprodajna cijena je obavezno polje.",
-    "upc_database"                       => "Baza podataka bar-kodova",
-    "update"                             => "Ažuriraj artikal",
-    "use_inventory_menu"                 => "Koristite meni zalihe",
+    'add_minus'                          => 'Zaliha za dodavanje ili oduzimanje.',
+    'allow_alt_description'              => 'Dozvoli Alt opis',
+    'amount_entry'                       => 'Unos iznosa',
+    'bulk_edit'                          => 'Skupno uređivanje',
+    'buy_price_required'                 => 'Nabavna cijena je obavezno polje.',
+    'cannot_be_deleted'                  => 'Nije moguće izbrisati izabrane artikle, jedan ili više izabranih predmeta imaju prodaju.',
+    'cannot_find_item'                   => 'Artikal nije pronađen.',
+    'categories'                         => '',
+    'category'                           => 'Kategorija',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategorija je obavezno polje.',
+    'change_all_to_allow_alt_desc'       => 'Dozvoli alternativni opis za sve.',
+    'change_all_to_not_allow_allow_desc' => 'Ne dozvoli alternativni opis za sve.',
+    'change_all_to_serialized'           => 'Promijeni sve u seriju',
+    'change_all_to_unserialized'         => 'Promijenite sve u ne seriju',
+    'change_image'                       => 'Promijeni sliku',
+    'confirm_bulk_edit'                  => 'Da li ste sigurni da želite urediti izabrane artikle?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Sve informacije o porezu na artikal biće zamjenjene.',
+    'confirm_delete'                     => 'Da li ste sigurni da želite izbrisati izabrani artikal?',
+    'confirm_restore'                    => 'Da li ste sigurni da želite da vratite izabrani artikal?',
+    'cost_price'                         => 'Fakturna cijena',
+    'cost_price_number'                  => 'Fakturna cijena mora biti broj.',
+    'cost_price_required'                => 'Fakturna cijena je obavezno polje.',
+    'count'                              => 'Ažuriraj zalihu',
+    'csv_import_failed'                  => 'Uvoz CSV-a nije uspio',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Učitana CSV datoteka nema podatke ili je pogrešno formatirana.',
+    'csv_import_partially_failed'        => 'Bilo je {0} grešaka pri uvozu stavke na liniji: {1}. Nijedan red nije uvezen.',
+    'csv_import_success'                 => 'Uvoz CSV stavke je uspješan.',
+    'current_quantity'                   => 'Trenutna količina',
+    'default_pack_name'                  => 'Svaki',
+    'description'                        => 'Opis',
+    'details_count'                      => 'Detalji o količinama zalihe',
+    'do_nothing'                         => 'Ne radi ništa',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Uredite željena polja za odabrane artikle.',
+    'edit_multiple_items'                => 'Uređivanje više artikala',
+    'empty_upc_items'                    => 'Artikli sa praznim barkodom',
+    'error_adding_updating'              => 'Greška pri dodavanju / ažuriranju artikla',
+    'error_updating_multiple'            => 'Greška pri ažuriranju artikala',
+    'generate_barcodes'                  => 'Generiši barkod',
+    'hsn_code'                           => 'Nomenklatura sistema usklađena',
+    'image'                              => 'Slika',
+    'import_items_csv'                   => 'Uvezi artikle iz CSV datoteke',
+    'info_provided_by'                   => 'Informacije pruža',
+    'inventory'                          => 'Zaliha',
+    'inventory_CSV_import_quantity'      => 'Količina uvezena iz CSV-a',
+    'inventory_comments'                 => 'Komentari',
+    'inventory_data_tracking'            => 'Praćenje podataka zalihe',
+    'inventory_date'                     => 'Datum',
+    'inventory_employee'                 => 'Zaposlenik',
+    'inventory_in_out_quantity'          => 'Količina ulaz/izlaz',
+    'inventory_remarks'                  => 'Napomene',
+    'is_deleted'                         => 'Izbrisano',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Artikal ima ser. broj',
+    'item'                               => 'Artikal',
+    'item_id'                            => '',
+    'item_number'                        => 'Barkod',
+    'item_number_duplicate'              => 'Broj artikla već postoji u bazi podataka.',
+    'item_number_invalid'                => 'Broj artikla sadrži nedozvoljene znakove.',
+    'kit'                                => 'Komplet',
+    'location'                           => 'Mjesto',
+    'low_inventory_items'                => 'Prodaja artikala',
+    'low_sell_item'                      => 'Niska prodaja artikla',
+    'manually_editing_of_quantity'       => 'Ručno uređivanje količine',
+    'markup'                             => '',
+    'name'                               => 'Naziv artikla',
+    'name_required'                      => 'Naziv artikla je obavezno polje.',
+    'new'                                => 'Novi artikal',
+    'no_description_items'               => 'Artikal nema opisa',
+    'no_items_to_display'                => 'Nema artikala za prikaz.',
+    'none'                               => 'Nijedan',
+    'none_selected'                      => 'Niste odabrali nijedan artikal za uređivanje',
+    'nonstock'                           => 'Bez zaliha',
+    'number_information'                 => 'Redni broj',
+    'number_required'                    => 'Barkod je obavezno polje.',
+    'one_or_multiple'                    => 'artikal(i)',
+    'pack_name'                          => 'Naziv pakovanja',
+    'qty_per_pack'                       => 'Količina po pakovanju',
+    'quantity'                           => 'Količina',
+    'quantity_number'                    => 'Količina mora biti broj.',
+    'quantity_required'                  => 'Količina je obavezno polje.',
+    'receiving_quantity'                 => 'Zaprimljena količina',
+    'remove_image'                       => 'Ukloni sliku',
+    'reorder_level'                      => 'Minimalna zaliha',
+    'reorder_level_number'               => 'Nivo preuređivanja mora biti broj.',
+    'reorder_level_required'             => 'Nivo preuređivanja je obavezno polje.',
+    'retrive_item_info'                  => 'Preuzmi informacije o artiklu',
+    'sales_tax_1'                        => 'Prodajni porez',
+    'sales_tax_2'                        => 'Prodajni porez 2',
+    'search_attributes'                  => 'Pretraživanje atributa',
+    'select_image'                       => 'Izaberite sliku',
+    'serialized_items'                   => 'Artikal ima ser. broj',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Skladište',
+    'stock_location'                     => 'Mjesto skladišta',
+    'stock_type'                         => 'Vrsta zalihe',
+    'successful_adding'                  => 'Uspješno ste dodali artikal',
+    'successful_bulk_edit'               => 'Uspješno ste ažurirali izabrane artikle',
+    'successful_deleted'                 => 'Uspješno ste izbrisali artikal',
+    'successful_updating'                => 'Uspješno ste ažurirali artikal',
+    'supplier'                           => 'Dobavljač',
+    'tax_1'                              => 'Porez 1',
+    'tax_2'                              => 'Porez 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Kategorija poreza',
+    'tax_name_invalid'                   => 'Naziv poreza sadrži nedozvoljene znakove.',
+    'tax_percent'                        => 'Procenat poreza',
+    'tax_percent_number'                 => 'Procenat poreza mora biti numerička vrijednost',
+    'tax_percent_required'               => 'Procenat poreza je obavezno polje.',
+    'tax_percents'                       => 'Porez %',
+    'temp'                               => 'Privremeno',
+    'type'                               => 'Vrsta artikla',
+    'unit_price'                         => 'Maloprodajna cijena',
+    'unit_price_number'                  => 'Jedinična cijena mora biti broj.',
+    'unit_price_required'                => 'Maloprodajna cijena je obavezno polje.',
+    'upc_database'                       => 'Baza podataka bar-kodova',
+    'update'                             => 'Ažuriraj artikal',
+    'use_inventory_menu'                 => 'Koristite meni zalihe',
 ];
diff --git a/app/Language/bs/Login.php b/app/Language/bs/Login.php
index 467964cce..e7e2fdfc0 100644
--- a/app/Language/bs/Login.php
+++ b/app/Language/bs/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Ja nisam robot.",
-    "go"                            => "Idi",
-    "invalid_gcaptcha"              => "Molimo potvrdite da niste robot.",
-    "invalid_installation"          => "Instalacija nije ispravna, provjerite vašu php.ini datoteku.",
-    "invalid_username_and_password" => "Pogrešno korisničko ime i/ili lozinka.",
-    "login"                         => "Prijava",
-    "logout"                        => "Odjava",
-    "migration_needed"              => "Migracija baze podataka na {0} će početi nakon prijavljivanja.",
-    "password"                      => "Lozinka",
-    "required_username"             => "",
-    "username"                      => "Korisničko ime",
-    "welcome"                       => "Dobrodošli u {0}!",
+    "gcaptcha"                            => "Ja nisam robot.",
+    "go"                                  => "Idi",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Molimo potvrdite da niste robot.",
+    "invalid_installation"                => "Instalacija nije ispravna, provjerite vašu php.ini datoteku.",
+    "invalid_username_and_password"       => "Pogrešno korisničko ime i/ili lozinka.",
+    "login"                               => "Prijava",
+    "logout"                              => "Odjava",
+    "migrating_database"                  => "Migracija baze podataka",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Baza podataka je uspješno migrirana!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "Migracija baze podataka na {0} će početi nakon prijavljivanja.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Lozinka",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Previše pokušaja. Molimo pričekajte trenutak i pokušajte ponovo.',
+    "username"                            => "Korisničko ime",
+    "welcome"                             => "Dobrodošli u {0}!"
 ];
diff --git a/app/Language/bs/Reports.php b/app/Language/bs/Reports.php
index 77e34226c..ab5369986 100644
--- a/app/Language/bs/Reports.php
+++ b/app/Language/bs/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Poreska stopa",
     "taxes"                                   => "Porezi",
     "taxes_summary_report"                    => "Zbirni izvještaj poreza",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Ukupno",
     "total_inventory_value"                   => "Ukupan iznos zalihe",
     "total_low_sell_quantity"                 => "Ukupno količina niskih prodaja",
diff --git a/app/Language/bs/Sales.php b/app/Language/bs/Sales.php
index f623af079..1e9c74e64 100644
--- a/app/Language/bs/Sales.php
+++ b/app/Language/bs/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Dostupni poeni",
-    "rewards_package"                  => "Nagrade",
-    "rewards_remaining_balance"        => "Preostala vrijednost nagradnih bodova je ",
-    "account_number"                   => "Broj računa",
-    "add_payment"                      => "Plaćanje",
-    "amount_due"                       => "Iznos duga",
-    "amount_tendered"                  => "Ponuđeni iznos",
-    "authorized_signature"             => "Ovlašćeni potpis",
-    "cancel_sale"                      => "Otkaži",
-    "cash"                             => "Gotovina",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Usklađivanje gotovine",
-    "cash_deposit"                     => "Polog gotovine",
-    "cash_filter"                      => "Gotovina",
-    "change_due"                       => "Kusur",
-    "change_price"                     => "Promjena prodajne cijene",
-    "check"                            => "Ček",
-    "check_balance"                    => "Provjeri razliku",
-    "check_filter"                     => "Ček",
-    "close"                            => "",
-    "comment"                          => "Komentar",
-    "comments"                         => "Komentari",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Završeno",
-    "confirm_cancel_sale"              => "Da li ste sigurni da želite da očistite ovu prodaju? Sve stavke će biti izbrisane.",
-    "confirm_delete"                   => "Da li ste sigurni da želite da izbrišete izabranu prodaju?",
-    "confirm_restore"                  => "Da li ste sigurni da želite da vratite izabranu prodaju?",
-    "credit"                           => "Kreditna kartica",
-    "credit_deposit"                   => "Kreditni depozit",
-    "credit_filter"                    => "Kreditna kartica",
-    "current_table"                    => "",
-    "customer"                         => "Kupac",
-    "customer_address"                 => "Adresa kupca",
-    "customer_discount"                => "Popust",
-    "customer_email"                   => "E-mail kupca",
-    "customer_location"                => "Mjesto kupca",
-    "customer_mailchimp_status"        => "Status MailChimp-a",
-    "customer_optional"                => "(Potrebno za odloženo plaćanje)",
-    "customer_required"                => "Obavezno",
-    "customer_total"                   => "Ukupno",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Datum prodaje",
-    "date_range"                       => "Period",
-    "date_required"                    => "Morate unijeti ispravan datum.",
-    "date_type"                        => "Datum je obavezno polje.",
-    "debit"                            => "Dugovna kartica",
-    "debit_filter"                     => "",
-    "delete"                           => "Dozvoli brisanje",
-    "delete_confirmation"              => "Da li ste sigurni da želite da izbrišete ovu prodaju? Ova radnja se ne može opozvati.",
-    "delete_entire_sale"               => "Izbriši cijelu prodaju",
-    "delete_successful"                => "Prodaja je uspješno izbrisana.",
-    "delete_unsuccessful"              => "Brisanje prodaje nije uspjelo.",
-    "description_abbrv"                => "Opis",
-    "discard"                          => "Odbaci",
-    "discard_quote"                    => "",
-    "discount"                         => "Popust",
-    "discount_included"                => "% Rabat",
-    "discount_short"                   => "%",
-    "due"                              => "Dug",
-    "due_filter"                       => "Dug",
-    "edit"                             => "Uredi",
-    "edit_item"                        => "Uredi artikal",
-    "edit_sale"                        => "Uredi prodaju",
-    "email_receipt"                    => "Potvrda putem e-mail",
-    "employee"                         => "Zaposlenik",
-    "entry"                            => "Ulaz",
-    "error_editing_item"               => "Greška pri uređivanju artikla",
-    "find_or_scan_item"                => "Pronađi/Skeniraj artikal",
-    "find_or_scan_item_or_receipt"     => "Pronađi/Skeniraj artikal ili priznanicu",
-    "giftcard"                         => "Poklon kartica",
-    "giftcard_balance"                 => "Saldo poklon kartice",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Broj poklon kartice",
-    "group_by_category"                => "Grupiraj po kategoriji",
-    "group_by_type"                    => "Grupiraj po tipu",
-    "hsn"                              => "HSN",
-    "id"                               => "ID prodaje",
-    "include_prices"                   => "Uključi cijene?",
-    "invoice"                          => "Faktura",
-    "invoice_confirm"                  => "Ova faktura će biti poslata na",
-    "invoice_enable"                   => "Broj fakture",
-    "invoice_filter"                   => "Fakture",
-    "invoice_no_email"                 => "Kupac nema važeću adresu e-pošte.",
-    "invoice_number"                   => "Broj fakture",
-    "invoice_number_duplicate"         => "Broj fakture {0} mora biti jedinstven.",
-    "invoice_sent"                     => "Faktura poslata",
-    "invoice_total"                    => "Ukupan iznos fakture",
-    "invoice_type_custom_invoice"      => "Prilagođena faktura (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Prilagođena poreska faktura (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Faktura (invoice.php)",
-    "invoice_type_tax_invoice"         => "Poreska faktura (tax_invoice.php)",
-    "invoice_unsent"                   => "Faktura nije poslata",
-    "invoice_update"                   => "Ažuriranje",
-    "item_insufficient_of_stock"       => "Artikla nema dovoljno na zalihi.",
-    "item_name"                        => "Naziv artikla",
-    "item_number"                      => "Barkod",
-    "item_out_of_stock"                => "Artikal je rasprodan.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Mod registrovanja",
-    "must_enter_numeric"               => "Ponuđeni iznos mora biti broj.",
-    "must_enter_numeric_giftcard"      => "Broj poklon kartice mora biti broj.",
-    "new_customer"                     => "Novi kupac",
-    "new_item"                         => "Novi artikal",
-    "no_description"                   => "Nema opisa",
-    "no_filter"                        => "Svi",
-    "no_items_in_cart"                 => "Nema artikala u korpi.",
-    "no_sales_to_display"              => "Nema prodaje za prikaz.",
-    "none_selected"                    => "Niste izabrali nijedu prodaju za brisanje.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "Ova radnja nije ovlašćena.",
-    "one_or_multiple"                  => "Prodaja",
-    "payment"                          => "Tip plaćanja",
-    "payment_amount"                   => "Iznos",
-    "payment_not_cover_total"          => "Iznos plaćanja mora biti veći ili jednak ukupnom iznosu.",
-    "payment_type"                     => "Tip",
-    "payments"                         => "",
-    "payments_total"                   => "Ukupno plaćeno",
-    "price"                            => "Cijena",
-    "print_after_sale"                 => "Štampaj poslije prodaje",
-    "quantity"                         => "Količina",
-    "quantity_less_than_reorder_level" => "Upozorenje! Željena količina je ispod minimalne.",
-    "quantity_less_than_zero"          => "Upozorenje: Željena količina je nedovoljna. Možete nastaviti prodaju, ali provjerite svoju zalihu.",
-    "quantity_of_items"                => "Količina od {0} stavke(i)",
-    "quote"                            => "Ponuda",
-    "quote_number"                     => "Broj ponude",
-    "quote_number_duplicate"           => "Broj ponude mora biti jedinstven.",
-    "quote_sent"                       => "Ponuda poslata na",
-    "quote_unsent"                     => "Ponuda nije poslata na",
-    "receipt"                          => "Račun",
-    "receipt_no_email"                 => "Ovaj kupac nema važeću e-mail adresu.",
-    "receipt_number"                   => "Rasprodaja #",
-    "receipt_sent"                     => "Račun poslat",
-    "receipt_unsent"                   => "Račun nije poslat",
-    "refund"                           => "Tip povrata",
-    "register"                         => "Registar prodaje",
-    "remove_customer"                  => "Uklonite kupca",
-    "remove_discount"                  => "",
-    "return"                           => "Povrat",
-    "rewards"                          => "Nagradni bodovi",
-    "rewards_balance"                  => "Bilans nagradnih bodova",
-    "sale"                             => "Prodaja",
-    "sale_by_invoice"                  => "Prodaja po fakturi",
-    "sale_for_customer"                => "Kupac:",
-    "sale_time"                        => "Vrijeme",
-    "sales_tax"                        => "Porez na promet",
-    "sales_total"                      => "",
-    "select_customer"                  => "Odaberi kupca",
-    "send_invoice"                     => "Pošalji fakturu",
-    "send_quote"                       => "Pošalji ponudu",
-    "send_receipt"                     => "Pošalji račun",
-    "send_work_order"                  => "Pošalji radni nalog",
-    "serial"                           => "Serijski broj",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Pokaži fakturu",
-    "show_receipt"                     => "Pokaži račun",
-    "start_typing_customer_name"       => "Počnite upisivati naziv kupca ...",
-    "start_typing_item_name"           => "Počnite upisivati naziv artikla ili skenirajte barkod...",
-    "stock"                            => "Zaliha",
-    "stock_location"                   => "Lokacija skladišta",
-    "sub_total"                        => "Međuzbir",
-    "successfully_deleted"             => "Uspješno ste izbrisali",
-    "successfully_restored"            => "Uspješno ste obnovili",
-    "successfully_suspended_sale"      => "Obustava prodaje je uspjela.",
-    "successfully_updated"             => "Prodaja je uspješno ažurirana.",
-    "suspend_sale"                     => "Obustavi",
-    "suspended_doc_id"                 => "Dokument",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Obustavljeno",
-    "table"                            => "Sto",
-    "takings"                          => "Dnevna prodaja",
-    "tax"                              => "Porez",
-    "tax_id"                           => "Porez Id",
-    "tax_invoice"                      => "Poreska faktura",
-    "tax_percent"                      => "Porez %",
-    "taxed_ind"                        => "P",
-    "total"                            => "Ukupno",
-    "total_tax_exclusive"              => "Porez isključen",
-    "transaction_failed"               => "Obrada nije ispravna.",
-    "unable_to_add_item"               => "Dodavanje artikla u rasprodaju nije uspjelo",
-    "unsuccessfully_deleted"           => "Brisanje prodaje nije uspjelo.",
-    "unsuccessfully_restored"          => "Obnova prodaje(a) nije uspjela.",
-    "unsuccessfully_suspended_sale"    => "Obustava prodaje nije uspjela.",
-    "unsuccessfully_updated"           => "Ažuriranje prodaje nije uspjelo.",
-    "unsuspend"                        => "Odustani",
-    "unsuspend_and_delete"             => "Akcija",
-    "update"                           => "Ažuriranje",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Radni nalog",
-    "work_order_number"                => "Broj radnog naloga",
-    "work_order_number_duplicate"      => "Broj radnog naloga mora biti jedinstven.",
-    "work_order_sent"                  => "Radni nalog poslat na",
-    "work_order_unsent"                => "Slanje radnog naloga nije uspjelo",
+    'account_number'                    => 'Broj računa',
+    'add_payment'                       => 'Plaćanje',
+    'amount_due'                        => 'Iznos duga',
+    'amount_due_not_covered'            => 'Uplate ne pokrivaju dospjeli iznos.',
+    'amount_tendered'                   => 'Ponuđeni iznos',
+    'authorized_signature'              => 'Ovlašćeni potpis',
+    'cancel_sale'                       => 'Otkaži',
+    'cash'                              => 'Gotovina',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Usklađivanje gotovine',
+    'cash_deposit'                      => 'Polog gotovine',
+    'cash_filter'                       => 'Gotovina',
+    'change_due'                        => 'Kusur',
+    'change_price'                      => 'Promjena prodajne cijene',
+    'check'                             => 'Ček',
+    'check_balance'                     => 'Provjeri razliku',
+    'check_filter'                      => 'Ček',
+    'close'                             => '',
+    'comment'                           => 'Komentar',
+    'comments'                          => 'Komentari',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Završeno',
+    'confirm_cancel_sale'               => 'Da li ste sigurni da želite da očistite ovu prodaju? Sve stavke će biti izbrisane.',
+    'confirm_delete'                    => 'Da li ste sigurni da želite da izbrišete izabranu prodaju?',
+    'confirm_restore'                   => 'Da li ste sigurni da želite da vratite izabranu prodaju?',
+    'credit'                            => 'Kreditna kartica',
+    'credit_deposit'                    => 'Kreditni depozit',
+    'credit_filter'                     => 'Kreditna kartica',
+    'current_table'                     => '',
+    'customer'                          => 'Kupac',
+    'customer_address'                  => 'Adresa kupca',
+    'customer_discount'                 => 'Popust',
+    'customer_email'                    => 'E-mail kupca',
+    'customer_location'                 => 'Mjesto kupca',
+    'customer_mailchimp_status'         => 'Status MailChimp-a',
+    'customer_optional'                 => '(Potrebno za odloženo plaćanje)',
+    'customer_required'                 => 'Obavezno',
+    'customer_total'                    => 'Ukupno',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Dostupni poeni',
+    'daily_sales'                       => '',
+    'date'                              => 'Datum prodaje',
+    'date_range'                        => 'Period',
+    'date_required'                     => 'Morate unijeti ispravan datum.',
+    'date_type'                         => 'Datum je obavezno polje.',
+    'debit'                             => 'Dugovna kartica',
+    'debit_filter'                      => '',
+    'delete'                            => 'Dozvoli brisanje',
+    'delete_confirmation'               => 'Da li ste sigurni da želite da izbrišete ovu prodaju? Ova radnja se ne može opozvati.',
+    'delete_entire_sale'                => 'Izbriši cijelu prodaju',
+    'delete_successful'                 => 'Prodaja je uspješno izbrisana.',
+    'delete_unsuccessful'               => 'Brisanje prodaje nije uspjelo.',
+    'description_abbrv'                 => 'Opis',
+    'discard'                           => 'Odbaci',
+    'discard_quote'                     => '',
+    'discount'                          => 'Popust',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Rabat',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Dug',
+    'due_filter'                        => 'Dug',
+    'edit'                              => 'Uredi',
+    'edit_item'                         => 'Uredi artikal',
+    'edit_sale'                         => 'Uredi prodaju',
+    'email_receipt'                     => 'Potvrda putem e-mail',
+    'employee'                          => 'Zaposlenik',
+    'entry'                             => 'Ulaz',
+    'error_editing_item'                => 'Greška pri uređivanju artikla',
+    'find_or_scan_item'                 => 'Pronađi/Skeniraj artikal',
+    'find_or_scan_item_or_receipt'      => 'Pronađi/Skeniraj artikal ili priznanicu',
+    'giftcard'                          => 'Poklon kartica',
+    'giftcard_balance'                  => 'Saldo poklon kartice',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Broj poklon kartice',
+    'group_by_category'                 => 'Grupiraj po kategoriji',
+    'group_by_type'                     => 'Grupiraj po tipu',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID prodaje',
+    'include_prices'                    => 'Uključi cijene?',
+    'insufficient_giftcard_balance'     => 'Nezadovoljavajući saldo poklon kartice za ovu uplatu.',
+    'insufficient_reward_points'        => 'Nedovoljna nagradna bodova za ovu uplatu.',
+    'invoice'                           => 'Faktura',
+    'invoice_confirm'                   => 'Ova faktura će biti poslata na',
+    'invoice_enable'                    => 'Broj fakture',
+    'invoice_filter'                    => 'Fakture',
+    'invoice_no_email'                  => 'Kupac nema važeću adresu e-pošte.',
+    'invoice_number'                    => 'Broj fakture',
+    'invoice_number_duplicate'          => 'Broj fakture {0} mora biti jedinstven.',
+    'invoice_sent'                      => 'Faktura poslata',
+    'invoice_total'                     => 'Ukupan iznos fakture',
+    'invoice_type_custom_invoice'       => 'Prilagođena faktura (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Prilagođena poreska faktura (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Faktura (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Poreska faktura (tax_invoice.php)',
+    'invoice_unsent'                    => 'Faktura nije poslata',
+    'invoice_update'                    => 'Ažuriranje',
+    'item_insufficient_of_stock'        => 'Artikla nema dovoljno na zalihi.',
+    'item_name'                         => 'Naziv artikla',
+    'item_number'                       => 'Barkod',
+    'item_out_of_stock'                 => 'Artikal je rasprodan.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Mod registrovanja',
+    'must_enter_numeric'                => 'Ponuđeni iznos mora biti broj.',
+    'must_enter_numeric_giftcard'       => 'Broj poklon kartice mora biti broj.',
+    'must_enter_reference_code'         => 'Referentni/broj za preuzimanje mora biti unesen.',
+    'negative_amount_tendered'          => 'Ponuđeni iznos ne može biti negativan.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Novi kupac',
+    'new_item'                          => 'Novi artikal',
+    'no_description'                    => 'Nema opisa',
+    'no_filter'                         => 'Svi',
+    'no_items_in_cart'                  => 'Nema artikala u korpi.',
+    'no_sales_to_display'               => 'Nema prodaje za prikaz.',
+    'none_selected'                     => 'Niste izabrali nijedu prodaju za brisanje.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'Ova radnja nije ovlašćena.',
+    'one_or_multiple'                   => 'Prodaja',
+    'payment'                           => 'Tip plaćanja',
+    'payment_amount'                    => 'Iznos',
+    'payment_not_cover_total'           => 'Iznos plaćanja mora biti veći ili jednak ukupnom iznosu.',
+    'payment_type'                      => 'Tip',
+    'payments'                          => '',
+    'payments_total'                    => 'Ukupno plaćeno',
+    'price'                             => 'Cijena',
+    'print_after_sale'                  => 'Štampaj poslije prodaje',
+    'quantity'                          => 'Količina',
+    'quantity_less_than_reorder_level'  => 'Upozorenje! Željena količina je ispod minimalne.',
+    'quantity_less_than_zero'           => 'Upozorenje: Željena količina je nedovoljna. Možete nastaviti prodaju, ali provjerite svoju zalihu.',
+    'quantity_of_items'                 => 'Količina od {0} stavke(i)',
+    'quote'                             => 'Ponuda',
+    'quote_number'                      => 'Broj ponude',
+    'quote_number_duplicate'            => 'Broj ponude mora biti jedinstven.',
+    'quote_sent'                        => 'Ponuda poslata na',
+    'quote_unsent'                      => 'Ponuda nije poslata na',
+    'receipt'                           => 'Račun',
+    'receipt_no_email'                  => 'Ovaj kupac nema važeću e-mail adresu.',
+    'receipt_number'                    => 'Rasprodaja #',
+    'receipt_sent'                      => 'Račun poslat',
+    'receipt_unsent'                    => 'Račun nije poslat',
+    'reference_code'                    => 'Referentni kod plaćanja',
+    'reference_code_invalid_characters' => 'Referentni kod smije sadržavati samo slova i brojeve.',
+    'reference_code_length_error'       => 'Duljina referentnog koda nije ispravna.',
+    'refund'                            => 'Tip povrata',
+    'register'                          => 'Registar prodaje',
+    'remove_customer'                   => 'Uklonite kupca',
+    'remove_discount'                   => '',
+    'return'                            => 'Povrat',
+    'rewards'                           => 'Nagradni bodovi',
+    'rewards_balance'                   => 'Bilans nagradnih bodova',
+    'rewards_package'                   => 'Nagrade',
+    'rewards_remaining_balance'         => 'Preostala vrijednost nagradnih bodova je ',
+    'sale'                              => 'Prodaja',
+    'sale_by_invoice'                   => 'Prodaja po fakturi',
+    'sale_for_customer'                 => 'Kupac:',
+    'sale_time'                         => 'Vrijeme',
+    'sales_tax'                         => 'Porez na promet',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Odaberi kupca',
+    'send_invoice'                      => 'Pošalji fakturu',
+    'send_quote'                        => 'Pošalji ponudu',
+    'send_receipt'                      => 'Pošalji račun',
+    'send_work_order'                   => 'Pošalji radni nalog',
+    'serial'                            => 'Serijski broj',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Pokaži fakturu',
+    'show_receipt'                      => 'Pokaži račun',
+    'start_typing_customer_name'        => 'Počnite upisivati naziv kupca ...',
+    'start_typing_item_name'            => 'Počnite upisivati naziv artikla ili skenirajte barkod...',
+    'stock'                             => 'Zaliha',
+    'stock_location'                    => 'Lokacija skladišta',
+    'sub_total'                         => 'Međuzbir',
+    'successfully_deleted'              => 'Uspješno ste izbrisali',
+    'successfully_restored'             => 'Uspješno ste obnovili',
+    'successfully_suspended_sale'       => 'Obustava prodaje je uspjela.',
+    'successfully_updated'              => 'Prodaja je uspješno ažurirana.',
+    'suspend_sale'                      => 'Obustavi',
+    'suspended_doc_id'                  => 'Dokument',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Obustavljeno',
+    'table'                             => 'Sto',
+    'takings'                           => 'Dnevna prodaja',
+    'tax'                               => 'Porez',
+    'tax_id'                            => 'Porez Id',
+    'tax_invoice'                       => 'Poreska faktura',
+    'tax_percent'                       => 'Porez %',
+    'taxed_ind'                         => 'P',
+    'total'                             => 'Ukupno',
+    'total_tax_exclusive'               => 'Porez isključen',
+    'transaction_failed'                => 'Obrada nije ispravna.',
+    'unable_to_add_item'                => 'Dodavanje artikla u rasprodaju nije uspjelo',
+    'unsuccessfully_deleted'            => 'Brisanje prodaje nije uspjelo.',
+    'unsuccessfully_restored'           => 'Obnova prodaje(a) nije uspjela.',
+    'unsuccessfully_suspended_sale'     => 'Obustava prodaje nije uspjela.',
+    'unsuccessfully_updated'            => 'Ažuriranje prodaje nije uspjelo.',
+    'unsuspend'                         => 'Odustani',
+    'unsuspend_and_delete'              => 'Akcija',
+    'update'                            => 'Ažuriranje',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Radni nalog',
+    'work_order_number'                 => 'Broj radnog naloga',
+    'work_order_number_duplicate'       => 'Broj radnog naloga mora biti jedinstven.',
+    'work_order_sent'                   => 'Radni nalog poslat na',
+    'work_order_unsent'                 => 'Slanje radnog naloga nije uspjelo',
 ];
diff --git a/app/Language/ckb/Attributes.php b/app/Language/ckb/Attributes.php
index 1dbabcbf9..d5ba8eaa9 100644
--- a/app/Language/ckb/Attributes.php
+++ b/app/Language/ckb/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "بەهای تایبەتمەندیی ناتوانێت '_' یان ' لەخۆبگرێت|'",
-    "confirm_delete"                   => "ئایا دڵنیای کە دەتەوێت تایبەتمەندییە هەڵبژێردراوەکە(کان) بسڕیتەوە؟",
-    "confirm_restore"                  => "ئایا دڵنیای کە دەتەوێت تایبەتمەندییە هەڵبژێردراوەکە(کان) بگەڕێنیتەوە؟",
-    "definition_cannot_be_deleted"     => "نەتوانرا تایبەتمەندی هەڵبژێردراو بسڕدرێتەوە",
-    "definition_error_adding_updating" => "تایبەتمەندی {0} نەتوانرا زیاد بکرێت یان نوێ بکرێتەوە. تکایە لیستی هەڵەکان بپشکنە.",
-    "definition_flags"                 => "توانای بینراویی تایبەتمەندی",
-    "definition_group"                 => "گروپ",
-    "definition_id"                    => "ناسنامە",
-    "definition_name"                  => "تایبەتمەندی زیاد بکە",
-    "definition_name_required"         => "ناوی تایبەتمەندی خانەیەکی پێویستە",
-    "definition_one_or_multiple"       => "تایبەتمەندی(ەکان)",
-    "definition_successful_adding"     => "بەسەرکەوتوویی ئایتمەکەت زیادکرد",
-    "definition_successful_deleted"    => "بەسەرکەوتوویی سڕیوتەتەوە",
-    "definition_successful_updating"   => "بەسەرکەوتوویی تایبەتمەندیت نوێ کردووەتەوە",
-    "definition_type"                  => "جۆری تایبەتمەندی",
-    "definition_type_required"         => "جۆری تایبەتمەندی خانەیەکی پێویستە",
-    "definition_unit"                  => "یەکەی پێوانەکردن",
-    "definition_values"                => "بەهاکانی تایبەتمەندی",
-    "new"                              => "تایبەتمەندی نوێ",
-    "no_attributes_to_display"         => "هیچ تایبەتمەندییەک نییە بۆ پیشاندان",
-    "receipt_visibility"               => "ڕەچەتە",
-    "show_in_items"                    => "لەناو ئایتمەکان نیشانی بدە",
-    "show_in_items_visibility"         => "ئایتمەکان",
-    "show_in_receipt"                  => "لە ڕەچەتەکەدا نیشانی بدە",
-    "show_in_receivings"               => "لە بەدەستگەیشتووەکاندا نیشانی بدە",
-    "show_in_receivings_visibility"    => "بەدەستگەیشتووکان",
-    "show_in_sales"                    => "لە فرۆشتندا نیشانی بدە",
-    "show_in_sales_visibility"         => "فرۆشتن",
-    "update"                           => "تایبەتمەندی نوێ بکەرەوە",
+    'attribute_value_invalid_chars'    => 'بەهای تایبەتمەندیی ناتوانێت \'_\' یان \' لەخۆبگرێت|\'',
+    'confirm_delete'                   => 'ئایا دڵنیای کە دەتەوێت تایبەتمەندییە هەڵبژێردراوەکە(کان) بسڕیتەوە؟',
+    'confirm_restore'                  => 'ئایا دڵنیای کە دەتەوێت تایبەتمەندییە هەڵبژێردراوەکە(کان) بگەڕێنیتەوە؟',
+    'definition_cannot_be_deleted'     => 'نەتوانرا تایبەتمەندی هەڵبژێردراو بسڕدرێتەوە',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'تایبەتمەندی {0} نەتوانرا زیاد بکرێت یان نوێ بکرێتەوە. تکایە لیستی هەڵەکان بپشکنە.',
+    'definition_flags'                 => 'توانای بینراویی تایبەتمەندی',
+    'definition_group'                 => 'گروپ',
+    'definition_id'                    => 'ناسنامە',
+    'definition_name'                  => 'تایبەتمەندی زیاد بکە',
+    'definition_name_required'         => 'ناوی تایبەتمەندی خانەیەکی پێویستە',
+    'definition_one_or_multiple'       => 'تایبەتمەندی(ەکان)',
+    'definition_successful_adding'     => 'بەسەرکەوتوویی ئایتمەکەت زیادکرد',
+    'definition_successful_deleted'    => 'بەسەرکەوتوویی سڕیوتەتەوە',
+    'definition_successful_updating'   => 'بەسەرکەوتوویی تایبەتمەندیت نوێ کردووەتەوە',
+    'definition_type'                  => 'جۆری تایبەتمەندی',
+    'definition_type_required'         => 'جۆری تایبەتمەندی خانەیەکی پێویستە',
+    'definition_unit'                  => 'یەکەی پێوانەکردن',
+    'definition_values'                => 'بەهاکانی تایبەتمەندی',
+    'new'                              => 'تایبەتمەندی نوێ',
+    'no_attributes_to_display'         => 'هیچ تایبەتمەندییەک نییە بۆ پیشاندان',
+    'receipt_visibility'               => 'ڕەچەتە',
+    'show_in_items'                    => 'لەناو ئایتمەکان نیشانی بدە',
+    'show_in_items_visibility'         => 'ئایتمەکان',
+    'show_in_receipt'                  => 'لە ڕەچەتەکەدا نیشانی بدە',
+    'show_in_receivings'               => 'لە بەدەستگەیشتووەکاندا نیشانی بدە',
+    'show_in_receivings_visibility'    => 'بەدەستگەیشتووکان',
+    'show_in_sales'                    => 'لە فرۆشتندا نیشانی بدە',
+    'show_in_sales_visibility'         => 'فرۆشتن',
+    'show_in_search'                   => 'لە گەڕاندا نیشانی بدە',
+    'show_in_search_visibility'        => 'گەڕان',
+    'update'                           => 'تایبەتمەندی نوێ بکەرەوە',
 ];
diff --git a/app/Language/ckb/Bootstrap_tables.php b/app/Language/ckb/Bootstrap_tables.php
index 60a8fc5e0..9283ea741 100644
--- a/app/Language/ckb/Bootstrap_tables.php
+++ b/app/Language/ckb/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "هەموو",
-    "columns"              => "ستنوونەکان",
-    "hide_show_pagination" => "شاردنەوە/پێشاندانی لاپەڕەسازی",
-    "loading"              => "بارکردن، تکایە چاوەڕوان بن...",
-    "page_from_to"         => "پیشاندانی {0} بۆ {1} لە {2} ڕیزەکان",
-    "refresh"              => "ڕفرێش",
-    "rows_per_page"        => "{0} ڕیز بۆ هەر لاپەڕەیەک",
-    "toggle"               => "دوگمە",
+    'all' => "هەموو",
+    'columns' => "ستنوونەکان",
+    'hide_show_pagination' => "شاردنەوە/پێشاندانی لاپەڕەسازی",
+    'loading' => "بارکردن، تکایە چاوەڕوان بن",
+    'page_from_to' => "پیشاندانی {0} بۆ {1} لە {2} ڕیزەکان",
+    'refresh' => "ڕفرێش",
+    'rows_per_page' => "{0} ڕیز بۆ هەر لاپەڕەیەک",
+    'toggle' => "دوگمە",
 ];
diff --git a/app/Language/ckb/Config.php b/app/Language/ckb/Config.php
index f2ccefcbc..b58331d09 100644
--- a/app/Language/ckb/Config.php
+++ b/app/Language/ckb/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    'address' => "ناونیشانی کۆمپانیا",
-    'address_required' => "ناونیشانی کۆمپانیا خانەیەکی پێویستە.",
-    'all_set' => "هەموو ڕێگەپێدانەکانی فایلەکان بە دروستی دانراون!",
-    'allow_duplicate_barcodes' => "ڕێگە بە لەبەرگرتنەوەی باڕکۆدەکان بدە",
-    'apostrophe' => "وێرگوڵ",
-    'backup_button' => "پاڵپشت",
-    'backup_database' => "بنکەدراوەی پاڵپشت",
-    'barcode' => "باڕکۆد",
-    'barcode_company' => "ناوی کۆمپانیا",
-    'barcode_configuration' => "داڕشتنی باڕکۆد",
-    'barcode_content' => "ناوەڕۆکی باڕکۆد",
-    'barcode_first_row' => "ڕیزی ١",
-    'barcode_font' => "فۆنت",
-    'barcode_formats' => "فۆڕماتە پێدراوەکان",
-    'barcode_generate_if_empty' => "ئەگەر بەتاڵ بوو دروستی بکە.",
-    'barcode_height' => "بەرزی (پیکسڵ)",
-    'barcode_id' => "ناسنامە/ناوی ئایتم",
-    'barcode_info' => "زانیاریی داڕشتنی باڕکۆد",
-    'barcode_layout' => "کڵێشەی باڕکۆد",
-    'barcode_name' => "ناو",
-    'barcode_number' => "باڕکۆد",
-    'barcode_number_in_row' => "ژمارە لە ڕیزدا",
-    'barcode_page_cellspacing' => "دووری خانەکانی لاپەڕە پیشان بدە.",
-    'barcode_page_width' => "پانایی لاپەڕە پیشان بدە",
-    'barcode_price' => "نرخ",
-    'barcode_second_row' => "ڕیزی ٢",
-    'barcode_third_row' => "ڕیزی ٣",
-    'barcode_tooltip' => "ئاگاداری: ئەم تایبەتمەندییە دەتوانێت ببێتە هۆی هاوردەکردن یان دروستکردنی ئایتمی لەبەرگیراو. ئەگەر بارکۆدی لەبەرگیراوت ناوێت بەکاری مەهێنە.",
-    'barcode_type' => "جۆری باڕکۆد",
-    'barcode_width' => "پانی (پیکسڵ)",
-    'bottom' => "ژێرەوە",
-    'cash_button' => "",
-    'cash_button_1' => "",
-    'cash_button_2' => "",
-    'cash_button_3' => "",
-    'cash_button_4' => "",
-    'cash_button_5' => "",
-    'cash_button_6' => "",
-    'cash_decimals' => "خانەی دەیانی نەختینەیی",
-    'cash_decimals_tooltip' => "ئەگەر دەیانیی نەختینەیی و دەیانیی دراو وەک یەک بن ئەوا هیچ گەورەکردنێکی نەختینەیی دەستپێناکات، مەگەر گەورەکردنی نەختینە لەسەر نیوەی پێنج دانرابێت.",
-    'cash_rounding' => "گەورەکردنی نەختینەیی",
-    'category_dropdown' => "پۆلێنەکە وەک درۆپداون نیشان بدە",
-    'center' => "ناوەند",
-    'change_apperance_tooltip' => "",
-    'comma' => "کۆما",
-    'company' => "ناوی کۆمپانیا",
-    'company_avatar' => "",
-    'company_change_image' => "وێنەکە بگۆڕە",
-    'company_logo' => "لۆگۆی کۆمپانیا",
-    'company_remove_image' => "وێنەکە لابەرە",
-    'company_required' => "ناوی کۆمپانیا خانەیەکی پێویستە",
-    'company_select_image' => "وێنە هەڵبژێرە",
-    'company_website_url' => "ماڵپەڕی کۆمپانیا یوئارئێلێکی (http://...) دروست نییە.",
-    'country_codes' => "کۆدی وڵات",
-    'country_codes_tooltip' => "لیستی ناوی وڵاتان کە بە کۆما جیاکراونەتەوە بۆ گەڕان.",
-    'currency_code' => "کۆدی دراو",
-    'currency_decimals' => "دەیانیی دراو",
-    'currency_symbol' => "‌‎هێمای دراو",
-    'current_employee_only' => "",
-    'customer_reward' => "پاداشت",
-    'customer_reward_duplicate' => "پاداشت دەبێت بێهاوتا بێت.",
-    'customer_reward_enable' => "پاداشتی کڕیار چالاک بکە",
-    'customer_reward_invalid_chars' => "پاداشت ناتوانێت '_' لەخۆبگرێت",
-    'customer_reward_required' => "پاداشت خانەیەکی پێویستە",
-    'customer_sales_tax_support' => "",
-    'date_or_time_format' => "فلتەری بەروار و کات",
-    'datetimeformat' => "فۆڕماتی بەروار و کات",
-    'decimal_point' => "خاڵی دەیانیی",
-    'default_barcode_font_size_number' => "بارکۆدی بنەڕەتیی قەبارەی فۆنت دەبێت ژمارە بێت.",
-    'default_barcode_font_size_required' => "بارکۆدی بنەڕەتیی قەبارەی فۆنت خانەیەکی پێویستە.",
-    'default_barcode_height_number' => "بارکۆدی بنەڕەتیی بەرزی دەبێت ژمارە بێت.",
-    'default_barcode_height_required' => "بارکۆدی بنەڕەتیی بەرزی خانەیەکی پێویستە.",
-    'default_barcode_num_in_row_number' => "ژمارەی بارکۆدی بنەڕەتی لە ڕیزدا دەبێت ژمارە بێت.",
-    'default_barcode_num_in_row_required' => "ژمارەی بارکۆدی بنەڕەتی لە ڕیزدا خانەیەکی پێویستە.",
-    'default_barcode_page_cellspacing_number' => "بارکۆدی بنەڕەتیی دووری خانەکانی لاپەڕە دەبێت ژمارە بێت.",
-    'default_barcode_page_cellspacing_required' => "بارکۆدی بنەڕەتیی دووری خانەکانی لاپەڕە خانەیەکی پێویستە.",
-    'default_barcode_page_width_number' => "بارکۆدی بنەڕەتیی پانی لاپەڕە دەبێت ژمارە بێت.",
-    'default_barcode_page_width_required' => "بارکۆدی بنەڕەتیی پانی لاپەڕە خانەیەکی پێویستە.",
-    'default_barcode_width_number' => "بارکۆدی بنەڕەتیی پانی دەبێت ژمارە بێت.",
-    'default_barcode_width_required' => "بارکۆدی بنەڕەتیی پانی خانەیەکی پێویستە.",
-    'default_item_columns' => "ستوونی ئایتمی بینراوی بنەڕەتی",
-    'default_origin_tax_code' => "کۆدی باجی ئەسڵی بنەڕەتیی",
-    'default_receivings_discount' => "داشکاندنی بنەڕەتیی وەرگیراوەکان",
-    'default_receivings_discount_number' => "داشکاندنی بنەڕەتیی وەرگیراوەکان دەبێت ژمارە بێت.",
-    'default_receivings_discount_required' => "داشکاندنی بنەڕەتیی وەرگیراوەکان خانەیەکی پێویستە.",
-    'default_sales_discount' => "داشکاندنی بنەڕەتیی فرۆشتن",
-    'default_sales_discount_number' => "داشکاندنی بنەڕەتیی فرۆشتن دەبێت ژمارە بێت.",
-    'default_sales_discount_required' => "داشکاندنی بنەڕەتیی فرۆشتن خانەیەکی پێویستە.",
-    'default_tax_category' => "پۆلێنی باجی بنەڕەتی",
-    'default_tax_code' => "کۆدی باجی بنەڕەتی",
-    'default_tax_jurisdiction' => "دەسەڵاتی دادوەری باجی بنەڕەتی",
-    'default_tax_name_number' => "ناوی باجی بنەڕەتی دەبێت دەقێک بێت.",
-    'default_tax_name_required' => "ناوی باجی بنەڕەتی خانەیەکی پێویستە.",
-    'default_tax_rate' => "ڕێژەی باجی بنەڕەتی %",
-    'default_tax_rate_1' => "ڕێژەی باجی ١",
-    'default_tax_rate_2' => "ڕێژەی باجی ٢",
-    'default_tax_rate_3' => "",
-    'default_tax_rate_number' => "ڕێژەی باجی بنەڕەتی دەبێت ژمارە بێت.",
-    'default_tax_rate_required' => "ڕێژەی باجی بنەڕەتی خانەیەکی پێویستە.",
-    'derive_sale_quantity' => "ڕێگە بدە بە بڕی فرۆشتنی وەرگیراو",
-    'derive_sale_quantity_tooltip' => "ئەگەر پشکنین بکرێت ئەوا جۆرێکی نوێی ئایتم دابین دەکرێت بۆ ئەو ئایتمانەی کە بە بڕی درێژکراوە داواکراون",
-    'dinner_table' => "مێز",
-    'dinner_table_duplicate' => "مێز دەبێت بێهاوتا بێت.",
-    'dinner_table_enable' => "مێزەکانی نانی ئێوارە چالاک بکە",
-    'dinner_table_invalid_chars' => "ناوی مێز ناتوانێت '_' لەخۆبگرێت.",
-    'dinner_table_required' => "مێز خانەیەکی پێویستە.",
-    'dot' => "دۆت",
-    'email' => "ئیمەیڵ",
-    'email_configuration' => "ڕێکخستنی ئیمەیڵ",
-    'email_mailpath' => "ڕێگای چوونە سەر بەرنامەی سێندمەیڵ",
-    'email_protocol' => "پڕۆتۆکۆڵ",
-    'email_receipt_check_behaviour' => "خانەی وەرگرتنی ئیمەیڵ",
-    'email_receipt_check_behaviour_always' => "هەمیشە هەڵبژێردراوە",
-    'email_receipt_check_behaviour_last' => "کۆتا هەڵبژاردنت بیر بێت",
-    'email_receipt_check_behaviour_never' => "هەرگیز هەڵنەبژێردراوە",
-    'email_smtp_crypto' => "بەشفرەکردنی پڕۆتۆکۆڵی SMTP",
-    'email_smtp_host' => "سێرڤەری SMTP",
-    'email_smtp_pass' => "وشەی نهێنی SMTP",
-    'email_smtp_port' => "پۆرتی SMTP",
-    'email_smtp_timeout' => "کاتی شکستی SMTP (چرکە)",
-    'email_smtp_user' => "ناوی بەکارهێنەری SMTP",
-    'enable_avatar' => "",
-    'enable_avatar_tooltip' => "",
-    'enable_dropdown_tooltip' => "",
-    'enable_new_look' => "",
-    'enable_right_bar' => "",
-    'enable_right_bar_tooltip' => "",
-    'enforce_privacy' => "پاراستنی نهێنی جێبەجێ بکە",
-    'enforce_privacy_tooltip' => "پاراستنی نهێنی کڕیاران لە ڕێگەی جێبەجێکردنی تێکەڵکردنی داتاکان لە ئەگەری سڕانەوەی داتاکانیان",
-    'fax' => "فاکس",
-    'file_perm' => "کێشە لە ڕێگەپێدانەکانی فایل هەیە. تکایە ئەم پەڕەیە چاک بکەوە و دووبارە باری بکەوە.",
-    'financial_year' => "دەستپێکردنی ساڵی دارایی",
-    'financial_year_apr' => "١ی نیسان",
-    'financial_year_aug' => "١ی ئاب",
-    'financial_year_dec' => "١ی کانوونی یەکەم",
-    'financial_year_feb' => "١ی شوبات",
-    'financial_year_jan' => "١ی کانوونی دووەم",
-    'financial_year_jul' => "١ی تەمووز",
-    'financial_year_jun' => "١ی حوزەیران",
-    'financial_year_mar' => "١ی ئازار",
-    'financial_year_may' => "١ی ئایار",
-    'financial_year_nov' => "١ی تشرینی دووەم",
-    'financial_year_oct' => "١ی تشرینی یەکەم",
-    'financial_year_sep' => "١ی ئەیلوول",
-    'floating_labels' => "لەیبڵە هەڵفڕیوەکان",
-    'gcaptcha_enable' => "پەڕەی چوونەژوورەوەی ڕیکاپچا",
-    'gcaptcha_secret_key' => "کلیلی نهێنی ڕیکاپچا",
-    'gcaptcha_secret_key_required' => "خانەی کلیلی نهێنی ڕیکاپچا پێویستە",
-    'gcaptcha_site_key' => "کلیلی سایتی ڕیکاپچا",
-    'gcaptcha_site_key_required' => "خانەی کلیلی سایتی ڕیکاپچا پێویستە",
-    'gcaptcha_tooltip' => "لاپەڕەی چوونەژوورەوە لەڕێی گوگڵ ڕیکاپچا بپارێزە، کرتە لە ئایکۆنەکە بکە بۆ جووتە کلیلی ئای پی ئەی.",
-    'general' => "گشتی",
-    'general_configuration' => "ڕێکخستنی گشتی",
-    'giftcard_number' => "ژمارەی کارتی دیاری",
-    'giftcard_random' => "دروستکردنی هەڕەمەکی",
-    'giftcard_series' => "دروستکردن بە زنجیرە",
-    'image_allowed_file_types' => "جۆری فایلە ڕێگەپێدراوەکان",
-    'image_max_height_tooltip' => "زۆرترین بەرزیی رێگەپێدراو بۆ بارکردنی وێنە بە پیکسڵ (پیکس).",
-    'image_max_size_tooltip' => "زۆرترین قەبارەی رێگەپێدراوی فایلی بارکردنی وێنە بە کیلۆبایت (کب).",
-    'image_max_width_tooltip' => "زۆرترین پانی ڕێگەپێدراوی بارکردنی وێنە بە پێکسڵ (پیکس).",
-    'image_restrictions' => "سنووربەندییەکانی بارکردنی وێنە",
-    'include_hsn' => "پاڵپشتی بۆ کۆدەکانی (ئێیچ ئێس ئێن) لەخۆ بگرە",
-    'info' => "زانیاری",
-    'info_configuration' => "زانیاری فڕۆشتگا",
-    'input_groups' => "گروپەکانی زانیارییە پێدراوەکان",
-    'integrations' => "یەکگرتنەکان",
-    'integrations_configuration' => "یەکگرتنەکانی لایەنی سێیەم",
-    'invoice' => "فاکتۆرە",
-    'invoice_configuration' => "ڕێکخستنەکانی چاپی فاکتورە",
-    'invoice_default_comments' => "سەرنجەکانی فاکتۆرەی بنەڕەتیی",
-    'invoice_email_message' => "تێمپڵەیتی ئیمەیڵی فاکتۆرە",
-    'invoice_enable' => "بەفاکتۆرەکردن چالاک بکە",
-    'invoice_printer' => "پرنتەری فاکتۆرە",
-    'invoice_type' => "جۆری فاکتۆرە",
-    'is_readable' => "دەتواندرێت بخوێندرێتەوە، بەڵام ڕێگەپێدانەکان بەهەڵە داندراون. تکایە لەسەر ٦٤٠ یان ٦٦٠ دایبنێ و ڕفرێشی بکەوە.",
-    'is_writable' => "دەتوانرێت بنووسرێتەوە، بەڵام ڕێگەپێدانەکان بەهەڵە دانراون. تکایە لەسەر ٧٥٠ دایبنێ و ڕفرێشی بکەوە.",
-    'item_markup' => "",
-    'jsprintsetup_required' => "ئاگاداری: ئەم کاراییە تەنها لەو کاتەدا کاردەکات کە زیادکراوی FireFox jsPrintSetupت دامەزرابێت. سەرەڕای ئەمە هێشتا دەتەوێت پاشەکەوتی بکە؟",
-    'language' => "زمان",
-    'last_used_invoice_number' => "کۆتا ژمارەی فاکتۆرەی بەکارهاتوو",
-    'last_used_quote_number' => "کۆتا ژمارەی دەرخستەی نرخەکانی بەکارهاتوو",
-    'last_used_work_order_number' => "کۆتا ژمارەی بەکارهاتووی داواکاری کار",
-    'left' => "چەپ",
-    'license' => "مۆڵەت",
-    'license_configuration' => "بەیاننامەی مۆڵەت",
-    'line_sequence' => "زنجیرەی هێڵ",
-    'lines_per_page' => "هێڵەکانی هەر پەڕەیەک",
-    'lines_per_page_number' => "هێڵەکانی هەر پەڕەیەک دەبێت ژمارە بێت.",
-    'lines_per_page_required' => "خانەی هێڵەکانی هەر پەڕەیەک پێویستە.",
-    'locale' => "خۆماڵیکردن",
-    'locale_configuration' => "ڕێکخستنی خۆماڵیکردن",
-    'locale_info' => "زانیاریی ڕێکخستنی خۆماڵیکردن",
-    'location' => "کۆگا",
-    'location_configuration' => "شوێنی کۆگا",
-    'location_info' => "زانیاری ڕێکخستنی شوێن",
-    'login_form' => "ستایلی فۆڕمی چوونەژوورەوە",
-    'logout' => "دەتەوێت پاڵپشت دروست بکەیت پێش چوونە دەرەوە؟ کرتە بکە لەسەر [باشە] بۆ پاڵپشت دروستکردن یان [هەڵوەشاندنەوە] بۆ چوونە دەرەوە.",
-    'mailchimp' => "مەیڵچیمپ",
-    'mailchimp_api_key' => "کلیلی (ئەی پی ئای)ی مەیڵچیمپ",
-    'mailchimp_configuration' => "ڕێکخستنی مەیڵچیمپ",
-    'mailchimp_key_successfully' => "کلیلی (ئەی پی ئای) دروستە.",
-    'mailchimp_key_unsuccessfully' => "کلیلی (ئەی پی ئای) نادروستە.",
-    'mailchimp_lists' => "لیست(ەکان)ی مەیڵچیمپ",
-    'mailchimp_tooltip' => "کرتە لەسەر ئایکۆنی کلیلی (ئەی پی ئای) بکە.",
-    'message' => "نامە",
-    'message_configuration' => "ڕێکخستنی نامە",
-    'msg_msg' => "دەقی نامەی پاشەکەوتکراو",
-    'msg_msg_placeholder' => "ئەگەر دەتەوێت تێمپڵەیتی کورتەنامە بەکاربهێنیت ئەوا نامەکەت لێرەدا پاشەکەوت بکە، ئەگەرنا خانەکە بە بەتاڵی بهێڵەرەوە.",
-    'msg_pwd' => "وشەی نهێنی کورتەنامە-ئەی پی ئای",
-    'msg_pwd_required' => "خانەی وشەی نهێنی کورتەنامە-ئەی پی ئای پێویستە",
-    'msg_src' => "ناسنامەی نێردەری کورتەنامە-ئەی پی ئای",
-    'msg_src_required' => "خانەی ناسنامەی کورتەنامە-ئەی پی ئای پێویستە",
-    'msg_uid' => "ناوی بەکارهێنەری کورتەنامە-ئەی پی ئای",
-    'msg_uid_required' => "خانەی ناوی بەکارهێنەری کورتەنامە-ئەی پی ئای پێویستە",
-    'multi_pack_enabled' => "چەندین پاکێج بۆ هەر ئایتمێک",
-    'no_risk' => "هیچ مەترسیەکی ئاسایش یا لاوازبوون نییە.",
-    'none' => "هیچ",
-    'notify_alignment' => "شوێنی دەرکەوتنی ئاگادارکردنەوە",
-    'number_format' => "فۆڕماتی ژمارە",
-    'number_locale' => "خۆماڵیکردن",
-    'number_locale_invalid' => "ناوچەی داخڵکراو نادروستە. بۆ دۆزینەوەی ناوچەیەکی دروست، بەستەرەکەی ناو ئامرازەکە بپشکنە.",
-    'number_locale_required' => "خانەی ژمارەی ناوچە پێویستە.",
-    'number_locale_tooltip' => "لە ڕێگەی ئەم بەستەرەوە ناوچەی گونجاو بدۆزەرەوە.",
-    'os_timezone' => "ناوچەی کاتی OSPOS:",
-    'ospos_info' => "زانیاری دامەزراندنی OSPOS",
-    'payment_options_order' => "ڕیزبەندی بژاردەکانی پارەدان",
-    'perm_risk' => "ڕێگەپێدانی هەڵە ئەم نەرمەکاڵایە دەخاتە مەترسییەوە.",
-    'phone' => "تەلەفوونی کۆمپانیا",
-    'phone_required' => "خانەی تەلەفوونی کۆمپانیا پێویستە.",
-    'print_bottom_margin' => "پەراوێزی خوارەوە",
-    'print_bottom_margin_number' => "پەراوێزی خوارەوە دەبێت ژمارە بێت.",
-    'print_bottom_margin_required' => "خانەی پەراوێزی خوارەوە پێویستە.",
-    'print_delay_autoreturn' => "گەڕانەوەی خۆکارانە بۆ دواکەوتنی فرۆشتن",
-    'print_delay_autoreturn_number' => "خانەی گەڕانەوەی خۆکارانە بۆ دواکەوتنی فرۆشتن پێویستە.",
-    'print_delay_autoreturn_required' => "گەڕانەوەی خۆکارانە بۆ دواکەوتنی فرۆشتن دەبێت ژمارە بێت.",
-    'print_footer' => "چاپی فووتەری وێبگەڕ",
-    'print_header' => "چاپی هێدەری وێبگەڕ",
-    'print_left_margin' => "پەراوێزی چەپ",
-    'print_left_margin_number' => "پەراوێزی چەپ دەبێت ژمارە بێت.",
-    'print_left_margin_required' => "خانەی پەراوێزی چەپ پێویستە.",
-    'print_receipt_check_behaviour' => "چاپی خانەی هەڵبژاردنی فاکتورە",
-    'print_receipt_check_behaviour_always' => "هەمیشە هەڵبژێردراوە",
-    'print_receipt_check_behaviour_last' => "کۆتا هەڵبژاردنت بیر بێت",
-    'print_receipt_check_behaviour_never' => "هەرگیز هەڵنەبژێردراوە",
-    'print_right_margin' => "پەراوێزی ڕاست",
-    'print_right_margin_number' => "پەراوێزی ڕاست ئەبێت ژمارە بێت.",
-    'print_right_margin_required' => "خانەی پەراوێزی ڕاست پێویستە.",
-    'print_silently' => "دیالۆگی چاپ نیشان بدە",
-    'print_top_margin' => "پەراوێزی سەرەوە",
-    'print_top_margin_number' => "پەراوێزی سەرەوە دەبێت ژمارە بێت.",
-    'print_top_margin_required' => "خانەی پەراوێزی سەرەوە پێویستە.",
-    'quantity_decimals' => "ژمارەی خانەی دەیان",
-    'quick_cash_enable' => "",
-    'quote_default_comments' => "سەرنجە بنەڕەتییەکانی دەرخستەی نرخەکان",
-    'receipt' => "پسوڵە",
-    'receipt_category' => "",
-    'receipt_configuration' => "ڕێکخستنەکانی چاپی پسوڵە",
-    'receipt_default' => "بنەڕەتیی",
-    'receipt_font_size' => "قەبارەی فۆنت",
-    'receipt_font_size_number' => "قەبارەی فۆنت دەبێت ژمارە بێت.",
-    'receipt_font_size_required' => "خانەی قەبارەی فۆنت پێویستە.",
-    'receipt_info' => "زانیاری ڕێکخستنی پسوڵە",
-    'receipt_printer' => "چاپکەری بلیت",
-    'receipt_short' => "کورت",
-    'receipt_show_company_name' => "ناوی کۆمپانیا نیشان بدە",
-    'receipt_show_description' => "دەربارە نیشان بدە",
-    'receipt_show_serialnumber' => "ژمارەی زنجیرەیی نیشان بدە",
-    'receipt_show_tax_ind' => "دەرخەری باج نیشان بدە",
-    'receipt_show_taxes' => "باجەکان نیشان بدە",
-    'receipt_show_total_discount' => "داشکاندنی گشتی نیشان بدە",
-    'receipt_template' => "تێمپڵەیتی پسوڵە",
-    'receiving_calculate_average_price' => "هەژمارکردنی نرخی تێکڕا (وەرگیراوەکان)",
-    'recv_invoice_format' => "فۆڕماتی فاکتورەی وەرگیراوەکان",
-    'register_mode_default' => "دۆخی تۆمارکردنی بنەڕەتیی",
-    'report_an_issue' => "ڕاپۆرتکردنی کێشەیەک",
-    'return_policy_required' => "خانەی ڕێکاری گەڕانەوە پێویستە.",
-    'reward' => "پاداشت",
-    'reward_configuration' => "ڕێکخستنی پاداشت",
-    'right' => "ڕاست",
-    'sales_invoice_format' => "فۆڕماتی فاکتورەی فرۆشتن",
-    'sales_quote_format' => "فۆڕماتی دەرخستەی نرخەکانی فرۆشتن",
-    'saved_successfully' => "پاشەکەوتکردنی ڕێکخستن سەرکەوتوو بوو.",
-    'saved_unsuccessfully' => "پاشەکەوتکردنی ڕێکخستن سەرکەوتوو نەبوو.",
-    'security_issue' => "ئاگادارکردنەوەی لاوازی ئاسایش",
-    'server_notice' => "تکایە ئەم زانیاریانەی خوارەوە بەکاربهێنە بۆ ڕاپۆرتکردنی کێشە.",
-    'service_charge' => "",
-    'show_due_enable' => "",
-    'show_office_group' => "ئایکۆنی ئۆفیس پیشان بدە",
-    'statistics' => "ناردنی ئامار",
-    'statistics_tooltip' => "ناردنی ئامارەکان بە مەبەستی پەرەپێدان و باشترکردنی تایبەتمەندییەکان.",
-    'stock_location' => "شوێنی کۆگا",
-    'stock_location_duplicate' => "شوێنی کۆگا دەبێت بێهاوتا بێت.",
-    'stock_location_invalid_chars' => "شوێنی کۆگا ناتوانێت '_' لەخۆبگرێت.",
-    'stock_location_required' => "خانەی شوێنی کۆگا پێویستە.",
-    'suggestions_fifth_column' => "",
-    'suggestions_first_column' => "ستوونی ١",
-    'suggestions_fourth_column' => "",
-    'suggestions_layout' => "نەخشەی پێشنیارەکانی گەڕان",
-    'suggestions_second_column' => "ستوونی ٢",
-    'suggestions_third_column' => "ستوونی ٣",
-    'system_conf' => "دامەزراندن و ڕێکخستن",
-    'system_info' => "زانیاری سیستەم",
-    'table' => "مێز",
-    'table_configuration' => "ڕێکخستنی جەدۆل",
-    'takings_printer' => "چاپکەری پسوڵە",
-    'tax' => "باج",
-    'tax_category' => "پۆلێنی باج",
-    'tax_category_duplicate' => "پۆلێنی باجی داخڵکراو پێشتر بوونی هەیە.",
-    'tax_category_invalid_chars' => "پلێنی باجی داخڵکراو نادروستە.",
-    'tax_category_required' => "پۆلێنی باج پێویستە.",
-    'tax_category_used' => "پۆلێنی باج ناتوانرێت بسڕدرێتەوە چونکە بەکاردەهێنرێت.",
-    'tax_configuration' => "ڕێکخستنی باج",
-    'tax_decimals' => "خانەی دەیانی باج",
-    'tax_id' => "ناسنامەی باج",
-    'tax_included' => "باج لەخۆدەگرێت",
-    'theme' => "ڕووکار",
-    'theme_preview' => "پێشبینینی ڕووکار:",
-    'thousands_separator' => "جیاکەرەوەی هەزاران",
-    'timezone' => "ناوچەی کات",
-    'timezone_error' => "ناوچەی کاتی OSPOS جیاوازە لە ناوچەی کاتی ناوخۆیی خۆت.",
-    'top' => "سەرەوە",
-    'use_destination_based_tax' => "بەکارهێنانی باجی بنەمادار بە شوێنی مەبەست",
-    'user_timezone' => "ناوچەی کاتی ناوخۆیی:",
-    'website' => "ماڵپەڕ",
-    'wholesale_markup' => "",
-    'work_order_enable' => "پاڵپشتی داواکاری کار",
-    'work_order_format' => "فۆڕماتی داواکاری کار",
+    'address'                                   => 'ناونیشانی کۆمپانیا',
+    'address_required'                          => 'ناونیشانی کۆمپانیا خانەیەکی پێویستە.',
+    'all_set'                                   => 'هەموو ڕێگەپێدانەکانی فایلەکان بە دروستی دانراون!',
+    'allow_duplicate_barcodes'                  => 'ڕێگە بە لەبەرگرتنەوەی باڕکۆدەکان بدە',
+    'apostrophe'                                => 'وێرگوڵ',
+    'backup_button'                             => 'پاڵپشت',
+    'backup_database'                           => 'بنکەدراوەی پاڵپشت',
+    'barcode'                                   => 'باڕکۆد',
+    'barcode_company'                           => 'ناوی کۆمپانیا',
+    'barcode_configuration'                     => 'داڕشتنی باڕکۆد',
+    'barcode_content'                           => 'ناوەڕۆکی باڕکۆد',
+    'barcode_first_row'                         => 'ڕیزی ١',
+    'barcode_font'                              => 'فۆنت',
+    'barcode_formats'                           => 'فۆڕماتە پێدراوەکان',
+    'barcode_generate_if_empty'                 => 'ئەگەر بەتاڵ بوو دروستی بکە.',
+    'barcode_height'                            => 'بەرزی (پیکسڵ)',
+    'barcode_id'                                => 'ناسنامە/ناوی ئایتم',
+    'barcode_info'                              => 'زانیاریی داڕشتنی باڕکۆد',
+    'barcode_layout'                            => 'کڵێشەی باڕکۆد',
+    'barcode_name'                              => 'ناو',
+    'barcode_number'                            => 'باڕکۆد',
+    'barcode_number_in_row'                     => 'ژمارە لە ڕیزدا',
+    'barcode_page_cellspacing'                  => 'دووری خانەکانی لاپەڕە پیشان بدە.',
+    'barcode_page_width'                        => 'پانایی لاپەڕە پیشان بدە',
+    'barcode_price'                             => 'نرخ',
+    'barcode_second_row'                        => 'ڕیزی ٢',
+    'barcode_third_row'                         => 'ڕیزی ٣',
+    'barcode_tooltip'                           => 'ئاگاداری: ئەم تایبەتمەندییە دەتوانێت ببێتە هۆی هاوردەکردن یان دروستکردنی ئایتمی لەبەرگیراو. ئەگەر بارکۆدی لەبەرگیراوت ناوێت بەکاری مەهێنە.',
+    'barcode_type'                              => 'جۆری باڕکۆد',
+    'barcode_width'                             => 'پانی (پیکسڵ)',
+    'bottom'                                    => 'ژێرەوە',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'خانەی دەیانی نەختینەیی',
+    'cash_decimals_tooltip'                     => 'ئەگەر دەیانیی نەختینەیی و دەیانیی دراو وەک یەک بن ئەوا هیچ گەورەکردنێکی نەختینەیی دەستپێناکات، مەگەر گەورەکردنی نەختینە لەسەر نیوەی پێنج دانرابێت.',
+    'cash_rounding'                             => 'گەورەکردنی نەختینەیی',
+    'category_dropdown'                         => 'پۆلێنەکە وەک درۆپداون نیشان بدە',
+    'center'                                    => 'ناوەند',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'کۆما',
+    'company'                                   => 'ناوی کۆمپانیا',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'وێنەکە بگۆڕە',
+    'company_logo'                              => 'لۆگۆی کۆمپانیا',
+    'company_remove_image'                      => 'وێنەکە لابەرە',
+    'company_required'                          => 'ناوی کۆمپانیا خانەیەکی پێویستە',
+    'company_select_image'                      => 'وێنە هەڵبژێرە',
+    'company_website_url'                       => 'ماڵپەڕی کۆمپانیا یوئارئێلێکی (http://...) دروست نییە.',
+    'country_codes'                             => 'کۆدی وڵات',
+    'country_codes_tooltip'                     => 'لیستی ناوی وڵاتان کە بە کۆما جیاکراونەتەوە بۆ گەڕان.',
+    'currency_code'                             => 'کۆدی دراو',
+    'currency_decimals'                         => 'دەیانیی دراو',
+    'currency_symbol'                           => '‌‎هێمای دراو',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'پاداشت',
+    'customer_reward_duplicate'                 => 'پاداشت دەبێت بێهاوتا بێت.',
+    'customer_reward_enable'                    => 'پاداشتی کڕیار چالاک بکە',
+    'customer_reward_invalid_chars'             => "پاداشت ناتوانێت '_' لەخۆبگرێت",
+    'customer_reward_required'                  => 'پاداشت خانەیەکی پێویستە',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'فلتەری بەروار و کات',
+    'datetimeformat'                            => 'فۆڕماتی بەروار و کات',
+    'decimal_point'                             => 'خاڵی دەیانیی',
+    'default_barcode_font_size_number'          => 'بارکۆدی بنەڕەتیی قەبارەی فۆنت دەبێت ژمارە بێت.',
+    'default_barcode_font_size_required'        => 'بارکۆدی بنەڕەتیی قەبارەی فۆنت خانەیەکی پێویستە.',
+    'default_barcode_height_number'             => 'بارکۆدی بنەڕەتیی بەرزی دەبێت ژمارە بێت.',
+    'default_barcode_height_required'           => 'بارکۆدی بنەڕەتیی بەرزی خانەیەکی پێویستە.',
+    'default_barcode_num_in_row_number'         => 'ژمارەی بارکۆدی بنەڕەتی لە ڕیزدا دەبێت ژمارە بێت.',
+    'default_barcode_num_in_row_required'       => 'ژمارەی بارکۆدی بنەڕەتی لە ڕیزدا خانەیەکی پێویستە.',
+    'default_barcode_page_cellspacing_number'   => 'بارکۆدی بنەڕەتیی دووری خانەکانی لاپەڕە دەبێت ژمارە بێت.',
+    'default_barcode_page_cellspacing_required' => 'بارکۆدی بنەڕەتیی دووری خانەکانی لاپەڕە خانەیەکی پێویستە.',
+    'default_barcode_page_width_number'         => 'بارکۆدی بنەڕەتیی پانی لاپەڕە دەبێت ژمارە بێت.',
+    'default_barcode_page_width_required'       => 'بارکۆدی بنەڕەتیی پانی لاپەڕە خانەیەکی پێویستە.',
+    'default_barcode_width_number'              => 'بارکۆدی بنەڕەتیی پانی دەبێت ژمارە بێت.',
+    'default_barcode_width_required'            => 'بارکۆدی بنەڕەتیی پانی خانەیەکی پێویستە.',
+    'default_item_columns'                      => 'ستوونی ئایتمی بینراوی بنەڕەتی',
+    'default_origin_tax_code'                   => 'کۆدی باجی ئەسڵی بنەڕەتیی',
+    'default_receivings_discount'               => 'داشکاندنی بنەڕەتیی وەرگیراوەکان',
+    'default_receivings_discount_number'        => 'داشکاندنی بنەڕەتیی وەرگیراوەکان دەبێت ژمارە بێت.',
+    'default_receivings_discount_required'      => 'داشکاندنی بنەڕەتیی وەرگیراوەکان خانەیەکی پێویستە.',
+    'default_sales_discount'                    => 'داشکاندنی بنەڕەتیی فرۆشتن',
+    'default_sales_discount_number'             => 'داشکاندنی بنەڕەتیی فرۆشتن دەبێت ژمارە بێت.',
+    'default_sales_discount_required'           => 'داشکاندنی بنەڕەتیی فرۆشتن خانەیەکی پێویستە.',
+    'default_tax_category'                      => 'پۆلێنی باجی بنەڕەتی',
+    'default_tax_code'                          => 'کۆدی باجی بنەڕەتی',
+    'default_tax_jurisdiction'                  => 'دەسەڵاتی دادوەری باجی بنەڕەتی',
+    'default_tax_name_number'                   => 'ناوی باجی بنەڕەتی دەبێت دەقێک بێت.',
+    'default_tax_name_required'                 => 'ناوی باجی بنەڕەتی خانەیەکی پێویستە.',
+    'default_tax_rate'                          => 'ڕێژەی باجی بنەڕەتی %',
+    'default_tax_rate_1'                        => 'ڕێژەی باجی ١',
+    'default_tax_rate_2'                        => 'ڕێژەی باجی ٢',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'ڕێژەی باجی بنەڕەتی دەبێت ژمارە بێت.',
+    'default_tax_rate_required'                 => 'ڕێژەی باجی بنەڕەتی خانەیەکی پێویستە.',
+    'derive_sale_quantity'                      => 'ڕێگە بدە بە بڕی فرۆشتنی وەرگیراو',
+    'derive_sale_quantity_tooltip'              => 'ئەگەر پشکنین بکرێت ئەوا جۆرێکی نوێی ئایتم دابین دەکرێت بۆ ئەو ئایتمانەی کە بە بڕی درێژکراوە داواکراون',
+    'dinner_table'                              => 'مێز',
+    'dinner_table_duplicate'                    => 'مێز دەبێت بێهاوتا بێت.',
+    'dinner_table_enable'                       => 'مێزەکانی نانی ئێوارە چالاک بکە',
+    'dinner_table_invalid_chars'                => "ناوی مێز ناتوانێت '_' لەخۆبگرێت.",
+    'dinner_table_required'                     => 'مێز خانەیەکی پێویستە.',
+    'dot'                                       => 'دۆت',
+    'email'                                     => 'ئیمەیڵ',
+    'email_configuration'                       => 'ڕێکخستنی ئیمەیڵ',
+    'email_mailpath'                            => 'ڕێگای چوونە سەر بەرنامەی سێندمەیڵ',
+    'email_protocol'                            => 'پڕۆتۆکۆڵ',
+    'email_receipt_check_behaviour'             => 'خانەی وەرگرتنی ئیمەیڵ',
+    'email_receipt_check_behaviour_always'      => 'هەمیشە هەڵبژێردراوە',
+    'email_receipt_check_behaviour_last'        => 'کۆتا هەڵبژاردنت بیر بێت',
+    'email_receipt_check_behaviour_never'       => 'هەرگیز هەڵنەبژێردراوە',
+    'email_smtp_crypto'                         => 'بەشفرەکردنی پڕۆتۆکۆڵی SMTP',
+    'email_smtp_host'                           => 'سێرڤەری SMTP',
+    'email_smtp_pass'                           => 'وشەی نهێنی SMTP',
+    'email_smtp_port'                           => 'پۆرتی SMTP',
+    'email_smtp_timeout'                        => 'کاتی شکستی SMTP (چرکە)',
+    'email_smtp_user'                           => 'ناوی بەکارهێنەری SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'پاراستنی نهێنی جێبەجێ بکە',
+    'enforce_privacy_tooltip'                   => 'پاراستنی نهێنی کڕیاران لە ڕێگەی جێبەجێکردنی تێکەڵکردنی داتاکان لە ئەگەری سڕانەوەی داتاکانیان',
+    'fax'                                       => 'فاکس',
+    'file_perm'                                 => 'کێشە لە ڕێگەپێدانەکانی فایل هەیە. تکایە ئەم پەڕەیە چاک بکەوە و دووبارە باری بکەوە.',
+    'financial_year'                            => 'دەستپێکردنی ساڵی دارایی',
+    'financial_year_apr'                        => '١ی نیسان',
+    'financial_year_aug'                        => '١ی ئاب',
+    'financial_year_dec'                        => '١ی کانوونی یەکەم',
+    'financial_year_feb'                        => '١ی شوبات',
+    'financial_year_jan'                        => '١ی کانوونی دووەم',
+    'financial_year_jul'                        => '١ی تەمووز',
+    'financial_year_jun'                        => '١ی حوزەیران',
+    'financial_year_mar'                        => '١ی ئازار',
+    'financial_year_may'                        => '١ی ئایار',
+    'financial_year_nov'                        => '١ی تشرینی دووەم',
+    'financial_year_oct'                        => '١ی تشرینی یەکەم',
+    'financial_year_sep'                        => '١ی ئەیلوول',
+    'floating_labels'                           => 'لەیبڵە هەڵفڕیوەکان',
+    'gcaptcha_enable'                           => 'پەڕەی چوونەژوورەوەی ڕیکاپچا',
+    'gcaptcha_secret_key'                       => 'کلیلی نهێنی ڕیکاپچا',
+    'gcaptcha_secret_key_required'              => 'خانەی کلیلی نهێنی ڕیکاپچا پێویستە',
+    'gcaptcha_site_key'                         => 'کلیلی سایتی ڕیکاپچا',
+    'gcaptcha_site_key_required'                => 'خانەی کلیلی سایتی ڕیکاپچا پێویستە',
+    'gcaptcha_tooltip'                          => 'لاپەڕەی چوونەژوورەوە لەڕێی گوگڵ ڕیکاپچا بپارێزە، کرتە لە ئایکۆنەکە بکە بۆ جووتە کلیلی ئای پی ئەی.',
+    'general'                                   => 'گشتی',
+    'general_configuration'                     => 'ڕێکخستنی گشتی',
+    'giftcard_number'                           => 'ژمارەی کارتی دیاری',
+    'giftcard_random'                           => 'دروستکردنی هەڕەمەکی',
+    'giftcard_series'                           => 'دروستکردن بە زنجیرە',
+    'image_allowed_file_types'                  => 'جۆری فایلە ڕێگەپێدراوەکان',
+    'image_max_height_tooltip'                  => 'زۆرترین بەرزیی رێگەپێدراو بۆ بارکردنی وێنە بە پیکسڵ (پیکس).',
+    'image_max_size_tooltip'                    => 'زۆرترین قەبارەی رێگەپێدراوی فایلی بارکردنی وێنە بە کیلۆبایت (کب).',
+    'image_max_width_tooltip'                   => 'زۆرترین پانی ڕێگەپێدراوی بارکردنی وێنە بە پێکسڵ (پیکس).',
+    'image_restrictions'                        => 'سنووربەندییەکانی بارکردنی وێنە',
+    'include_hsn'                               => 'پاڵپشتی بۆ کۆدەکانی (ئێیچ ئێس ئێن) لەخۆ بگرە',
+    'info'                                      => 'زانیاری',
+    'info_configuration'                        => 'زانیاری فڕۆشتگا',
+    'input_groups'                              => 'گروپەکانی زانیارییە پێدراوەکان',
+    'integrations'                              => 'یەکگرتنەکان',
+    'integrations_configuration'                => 'یەکگرتنەکانی لایەنی سێیەم',
+    'invoice'                                   => 'فاکتۆرە',
+    'invoice_configuration'                     => 'ڕێکخستنەکانی چاپی فاکتورە',
+    'invoice_default_comments'                  => 'سەرنجەکانی فاکتۆرەی بنەڕەتیی',
+    'invoice_email_message'                     => 'تێمپڵەیتی ئیمەیڵی فاکتۆرە',
+    'invoice_enable'                            => 'بەفاکتۆرەکردن چالاک بکە',
+    'invoice_printer'                           => 'پرنتەری فاکتۆرە',
+    'invoice_type'                              => 'جۆری فاکتۆرە',
+    'is_readable'                               => 'دەتواندرێت بخوێندرێتەوە، بەڵام ڕێگەپێدانەکان بەهەڵە داندراون. تکایە لەسەر ٦٤٠ یان ٦٦٠ دایبنێ و ڕفرێشی بکەوە.',
+    'is_writable'                               => 'دەتوانرێت بنووسرێتەوە، بەڵام ڕێگەپێدانەکان بەهەڵە دانراون. تکایە لەسەر ٧٥٠ دایبنێ و ڕفرێشی بکەوە.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'ئاگاداری: ئەم کاراییە تەنها لەو کاتەدا کاردەکات کە زیادکراوی FireFox jsPrintSetupت دامەزرابێت. سەرەڕای ئەمە هێشتا دەتەوێت پاشەکەوتی بکە؟',
+    'language'                                  => 'زمان',
+    'last_used_invoice_number'                  => 'کۆتا ژمارەی فاکتۆرەی بەکارهاتوو',
+    'last_used_quote_number'                    => 'کۆتا ژمارەی دەرخستەی نرخەکانی بەکارهاتوو',
+    'last_used_work_order_number'               => 'کۆتا ژمارەی بەکارهاتووی داواکاری کار',
+    'left'                                      => 'چەپ',
+    'license'                                   => 'مۆڵەت',
+    'license_configuration'                     => 'بەیاننامەی مۆڵەت',
+    'line_sequence'                             => 'زنجیرەی هێڵ',
+    'lines_per_page'                            => 'هێڵەکانی هەر پەڕەیەک',
+    'lines_per_page_number'                     => 'هێڵەکانی هەر پەڕەیەک دەبێت ژمارە بێت.',
+    'lines_per_page_required'                   => 'خانەی هێڵەکانی هەر پەڕەیەک پێویستە.',
+    'locale'                                    => 'خۆماڵیکردن',
+    'locale_configuration'                      => 'ڕێکخستنی خۆماڵیکردن',
+    'locale_info'                               => 'زانیاریی ڕێکخستنی خۆماڵیکردن',
+    'location'                                  => 'کۆگا',
+    'location_configuration'                    => 'شوێنی کۆگا',
+    'location_info'                             => 'زانیاری ڕێکخستنی شوێن',
+    'login_form'                                => 'ستایلی فۆڕمی چوونەژوورەوە',
+    'logout'                                    => 'دەتەوێت پاڵپشت دروست بکەیت پێش چوونە دەرەوە؟ کرتە بکە لەسەر [باشە] بۆ پاڵپشت دروستکردن یان [هەڵوەشاندنەوە] بۆ چوونە دەرەوە.',
+    'mailchimp'                                 => 'مەیڵچیمپ',
+    'mailchimp_api_key'                         => 'کلیلی (ئەی پی ئای)ی مەیڵچیمپ',
+    'mailchimp_configuration'                   => 'ڕێکخستنی مەیڵچیمپ',
+    'mailchimp_key_successfully'                => 'کلیلی (ئەی پی ئای) دروستە.',
+    'mailchimp_key_unsuccessfully'              => 'کلیلی (ئەی پی ئای) نادروستە.',
+    'mailchimp_lists'                           => 'لیست(ەکان)ی مەیڵچیمپ',
+    'mailchimp_tooltip'                         => 'کرتە لەسەر ئایکۆنی کلیلی (ئەی پی ئای) بکە.',
+    'message'                                   => 'نامە',
+    'message_configuration'                     => 'ڕێکخستنی نامە',
+    'msg_msg'                                   => 'دەقی نامەی پاشەکەوتکراو',
+    'msg_msg_placeholder'                       => 'ئەگەر دەتەوێت تێمپڵەیتی کورتەنامە بەکاربهێنیت ئەوا نامەکەت لێرەدا پاشەکەوت بکە، ئەگەرنا خانەکە بە بەتاڵی بهێڵەرەوە.',
+    'msg_pwd'                                   => 'وشەی نهێنی کورتەنامە-ئەی پی ئای',
+    'msg_src'                                   => 'ناسنامەی نێردەری کورتەنامە-ئەی پی ئای',
+    'msg_src_required'                          => 'خانەی ناسنامەی کورتەنامە-ئەی پی ئای پێویستە',
+    'msg_uid'                                   => 'ناوی بەکارهێنەری کورتەنامە-ئەی پی ئای',
+    'msg_uid_required'                          => 'خانەی ناوی بەکارهێنەری کورتەنامە-ئەی پی ئای پێویستە',
+    'multi_pack_enabled'                        => 'چەندین پاکێج بۆ هەر ئایتمێک',
+    'no_risk'                                   => 'هیچ مەترسیەکی ئاسایش یا لاوازبوون نییە.',
+    'none'                                      => 'هیچ',
+    'notify_alignment'                          => 'شوێنی دەرکەوتنی ئاگادارکردنەوە',
+    'number_format'                             => 'فۆڕماتی ژمارە',
+    'number_locale'                             => 'خۆماڵیکردن',
+    'number_locale_invalid'                     => 'ناوچەی داخڵکراو نادروستە. بۆ دۆزینەوەی ناوچەیەکی دروست، بەستەرەکەی ناو ئامرازەکە بپشکنە.',
+    'number_locale_required'                    => 'خانەی ژمارەی ناوچە پێویستە.',
+    'number_locale_tooltip'                     => 'لە ڕێگەی ئەم بەستەرەوە ناوچەی گونجاو بدۆزەرەوە.',
+    'os_timezone'                               => 'ناوچەی کاتی OSPOS:',
+    'ospos_info'                                => 'زانیاری دامەزراندنی OSPOS',
+    'payment_options_order'                     => 'ڕیزبەندی بژاردەکانی پارەدان',
+    'payment_reference_code_length_limits'      => 'کۆدی مەرجعی پارەدان<br>سنووری درێژی',
+    'payment_reference_code_length_max_label'   => 'زۆرترین',
+    'payment_reference_code_length_min_label'   => 'کەمترین',
+    'perm_risk'                                 => 'ڕێگەپێدانی هەڵە ئەم نەرمەکاڵایە دەخاتە مەترسییەوە.',
+    'phone'                                     => 'تەلەفوونی کۆمپانیا',
+    'phone_required'                            => 'خانەی تەلەفوونی کۆمپانیا پێویستە.',
+    'print_bottom_margin'                       => 'پەراوێزی خوارەوە',
+    'print_bottom_margin_number'                => 'پەراوێزی خوارەوە دەبێت ژمارە بێت.',
+    'print_bottom_margin_required'              => 'خانەی پەراوێزی خوارەوە پێویستە.',
+    'print_delay_autoreturn'                    => 'گەڕانەوەی خۆکارانە بۆ دواکەوتنی فرۆشتن',
+    'print_delay_autoreturn_number'             => 'خانەی گەڕانەوەی خۆکارانە بۆ دواکەوتنی فرۆشتن پێویستە.',
+    'print_delay_autoreturn_required'           => 'گەڕانەوەی خۆکارانە بۆ دواکەوتنی فرۆشتن دەبێت ژمارە بێت.',
+    'print_footer'                              => 'چاپی فووتەری وێبگەڕ',
+    'print_header'                              => 'چاپی هێدەری وێبگەڕ',
+    'print_left_margin'                         => 'پەراوێزی چەپ',
+    'print_left_margin_number'                  => 'پەراوێزی چەپ دەبێت ژمارە بێت.',
+    'print_left_margin_required'                => 'خانەی پەراوێزی چەپ پێویستە.',
+    'print_receipt_check_behaviour'             => 'چاپی خانەی هەڵبژاردنی فاکتورە',
+    'print_receipt_check_behaviour_always'      => 'هەمیشە هەڵبژێردراوە',
+    'print_receipt_check_behaviour_last'        => 'کۆتا هەڵبژاردنت بیر بێت',
+    'print_receipt_check_behaviour_never'       => 'هەرگیز هەڵنەبژێردراوە',
+    'print_right_margin'                        => 'پەراوێزی ڕاست',
+    'print_right_margin_number'                 => 'پەراوێزی ڕاست ئەبێت ژمارە بێت.',
+    'print_right_margin_required'               => 'خانەی پەراوێزی ڕاست پێویستە.',
+    'print_silently'                            => 'دیالۆگی چاپ نیشان بدە',
+    'print_top_margin'                          => 'پەراوێزی سەرەوە',
+    'print_top_margin_number'                   => 'پەراوێزی سەرەوە دەبێت ژمارە بێت.',
+    'print_top_margin_required'                 => 'خانەی پەراوێزی سەرەوە پێویستە.',
+    'quantity_decimals'                         => 'ژمارەی خانەی دەیان',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'سەرنجە بنەڕەتییەکانی دەرخستەی نرخەکان',
+    'receipt'                                   => 'پسوڵە',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'ڕێکخستنەکانی چاپی پسوڵە',
+    'receipt_default'                           => 'بنەڕەتیی',
+    'receipt_font_size'                         => 'قەبارەی فۆنت',
+    'receipt_font_size_number'                  => 'قەبارەی فۆنت دەبێت ژمارە بێت.',
+    'receipt_font_size_required'                => 'خانەی قەبارەی فۆنت پێویستە.',
+    'receipt_info'                              => 'زانیاری ڕێکخستنی پسوڵە',
+    'receipt_printer'                           => 'چاپکەری بلیت',
+    'receipt_short'                             => 'کورت',
+    'receipt_show_company_name'                 => 'ناوی کۆمپانیا نیشان بدە',
+    'receipt_show_description'                  => 'دەربارە نیشان بدە',
+    'receipt_show_serialnumber'                 => 'ژمارەی زنجیرەیی نیشان بدە',
+    'receipt_show_tax_ind'                      => 'دەرخەری باج نیشان بدە',
+    'receipt_show_taxes'                        => 'باجەکان نیشان بدە',
+    'receipt_show_total_discount'               => 'داشکاندنی گشتی نیشان بدە',
+    'receipt_template'                          => 'تێمپڵەیتی پسوڵە',
+    'receiving_calculate_average_price'         => 'هەژمارکردنی نرخی تێکڕا (وەرگیراوەکان)',
+    'recv_invoice_format'                       => 'فۆڕماتی فاکتورەی وەرگیراوەکان',
+    'register_mode_default'                     => 'دۆخی تۆمارکردنی بنەڕەتیی',
+    'report_an_issue'                           => 'ڕاپۆرتکردنی کێشەیەک',
+    'return_policy_required'                    => 'خانەی ڕێکاری گەڕانەوە پێویستە.',
+    'reward'                                    => 'پاداشت',
+    'reward_configuration'                      => 'ڕێکخستنی پاداشت',
+    'right'                                     => 'ڕاست',
+    'sales_invoice_format'                      => 'فۆڕماتی فاکتورەی فرۆشتن',
+    'sales_quote_format'                        => 'فۆڕماتی دەرخستەی نرخەکانی فرۆشتن',
+    'mailpath_invalid'                          => 'ڕێچکەی sendmail نادروستە. تەنها پیت، ژمارە، هێڵی بەستەرەوە، هێڵی ژێرەوە، سلاشی ڕاست، سلاشی چەپ، دوو خاڵ، بۆشایی و خاڵ ڕێگەپێدراون.',
+    'saved_successfully'                        => 'پاشەکەوتکردنی ڕێکخستن سەرکەوتوو بوو.',
+    'saved_unsuccessfully'                      => 'پاشەکەوتکردنی ڕێکخستن سەرکەوتوو نەبوو.',
+    'security_issue'                            => 'ئاگادارکردنەوەی لاوازی ئاسایش',
+    'server_notice'                             => 'تکایە ئەم زانیاریانەی خوارەوە بەکاربهێنە بۆ ڕاپۆرتکردنی کێشە.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'ئایکۆنی ئۆفیس پیشان بدە',
+    'statistics'                                => 'ناردنی ئامار',
+    'statistics_tooltip'                        => 'ناردنی ئامارەکان بە مەبەستی پەرەپێدان و باشترکردنی تایبەتمەندییەکان.',
+    'stock_location'                            => 'شوێنی کۆگا',
+    'stock_location_duplicate'                  => 'شوێنی کۆگا دەبێت بێهاوتا بێت.',
+    'stock_location_invalid_chars'              => "شوێنی کۆگا ناتوانێت '_' لەخۆبگرێت.",
+    'stock_location_required'                   => 'خانەی شوێنی کۆگا پێویستە.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'ستوونی ١',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'نەخشەی پێشنیارەکانی گەڕان',
+    'suggestions_second_column'                 => 'ستوونی ٢',
+    'suggestions_third_column'                  => 'ستوونی ٣',
+    'system_conf'                               => 'دامەزراندن و ڕێکخستن',
+    'system_info'                               => 'زانیاری سیستەم',
+    'table'                                     => 'مێز',
+    'table_configuration'                       => 'ڕێکخستنی جەدۆل',
+    'takings_printer'                           => 'چاپکەری پسوڵە',
+    'tax'                                       => 'باج',
+    'tax_category'                              => 'پۆلێنی باج',
+    'tax_category_duplicate'                    => 'پۆلێنی باجی داخڵکراو پێشتر بوونی هەیە.',
+    'tax_category_invalid_chars'                => 'پلێنی باجی داخڵکراو نادروستە.',
+    'tax_category_required'                     => 'پۆلێنی باج پێویستە.',
+    'tax_category_used'                         => 'پۆلێنی باج ناتوانرێت بسڕدرێتەوە چونکە بەکاردەهێنرێت.',
+    'tax_configuration'                         => 'ڕێکخستنی باج',
+    'tax_decimals'                              => 'خانەی دەیانی باج',
+    'tax_id'                                    => 'ناسنامەی باج',
+    'tax_included'                              => 'باج لەخۆدەگرێت',
+    'theme'                                     => 'ڕووکار',
+    'theme_preview'                             => 'پێشبینینی ڕووکار:',
+    'thousands_separator'                       => 'جیاکەرەوەی هەزاران',
+    'timezone'                                  => 'ناوچەی کات',
+    'timezone_error'                            => 'ناوچەی کاتی OSPOS جیاوازە لە ناوچەی کاتی ناوخۆیی خۆت.',
+    'top'                                       => 'سەرەوە',
+    'use_destination_based_tax'                 => 'بەکارهێنانی باجی بنەمادار بە شوێنی مەبەست',
+    'user_timezone'                             => 'ناوچەی کاتی ناوخۆیی:',
+    'website'                                   => 'ماڵپەڕ',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'پاڵپشتی داواکاری کار',
+    'work_order_format'                         => 'فۆڕماتی داواکاری کار',
 ];
diff --git a/app/Language/ckb/Employees.php b/app/Language/ckb/Employees.php
index bc20abf3f..5f41e1708 100644
--- a/app/Language/ckb/Employees.php
+++ b/app/Language/ckb/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    'administrator' => "",
-    'basic_information' => "زانیاری",
-    'cannot_be_deleted' => "ناتوانیت کارمەند(ەکان)ی هەڵبژێردراو بسڕیتەوە، یەکێک یان زیاتر لەوانە فرۆشتنی پرۆسێس کردووە یان تۆ هەوڵی سڕینەوەی هەژمارەکەت دەدەیت.",
-    'change_employee' => "",
-    'change_password' => "وشەی نهێنی بگۆڕە",
-    'clerk' => "",
-    'commission' => "",
-    'confirm_delete' => "‌ئایا دڵنیای کە دەتەوێت کارمەند(ەکان)ی هەڵبژێردراو بسڕیتەوە؟",
-    'confirm_restore' => "ئایا دڵنیای کە دەتەوێت کارمەند(ەکان)ی هەڵبژێردراو بگەڕێنیتەوە؟",
-    'current_password' => "وشەی نهێنی ئێستا",
-    'current_password_invalid' => "وشەی نهێنی ئێستا نادروستە.",
-    'employee' => "فەرمانبەر",
-    'error_adding_updating' => "زیادکردن یان نوێکردنەوەی کارمەند سەرکەوتوو نەبوو.",
-    'error_deleting_admin' => "",
-    'error_updating_admin' => "",
-    'error_deleting_demo_admin' => "ناتوانیت بەکارهێنەری ئەدمینی تاقیکردنەوەیی بسڕیتەوە.",
-    'error_updating_demo_admin' => "ناتوانیت بەکارهێنەری ئەدمین تاقیکردنەوەیی بگۆڕیت.",
-    'language' => "زمان",
-    'login_info' => "چوونەژوورەوە",
-    'manager' => "",
-    'new' => "فەرمانبەری نوێ",
-    'none_selected' => "هیچ فەرمانبەرێک(کان)ت هەڵنەبژاردووە بۆ سڕینەوە.",
-    'one_or_multiple' => "فەرمانبەر(ان)",
-    'password' => "وشەی نهێنی",
-    'password_minlength' => "وشەی نهێنی دەبێت بەلایەنی کەمەوە ٨ پیت بێت.",
-    'password_must_match' => "وشەی نهێنییەکان هاوشێوە نین.",
-    'password_not_must_match' => "وشەی نهێنی ئێستا و وشەی نهێنی نوێ دەبێت بێهاوتابن.",
-    'password_required' => "وشەی نهێنی پێویستە.",
-    'permission_desc' => "چوارگۆشەکانی خوارەوە دیاری بکە بۆ پێدانی دەستگەیشتن بە مۆدیولەکان.",
-    'permission_info' => "ڕێپێدانەکان",
-    'repeat_password' => "دووبارە وشەی نهێنی",
-    'subpermission_required' => "بۆ هەر مۆدیولێک بەلایەنی کەمەوە یەک پێدان زیاد بکە.",
-    'successful_adding' => "زیادکردنی فەرمانبەر سەرکەوتوو بوو.",
-    'successful_change_password' => "گۆڕینی وشەی نهێنی سەرکەوتوو بوو.",
-    'successful_deleted' => "بەسەرکەوتووی سڕیتەوە",
-    'successful_updating' => "بەسەرکەوتوویی فەرمانبەرەکەت نوێ کردۆتەوە",
-    'system_language' => "زمانی سیستەم",
-    'unsuccessful_change_password' => "گۆڕینی وشەی نهێنی سەرکەوتوو نەبوو.",
-    'update' => "فەرمانبەر نوێبکەوە",
-    'username' => "ناوی بەکارهێنەر",
-    'username_duplicate' => "ناوی بەکارهێنەری فەرمانبەر پێشتر بەکارهاتووە. تکایە یەکێکی تر هەڵبژێرە.",
-    'username_minlength' => "ناوی بەکارهێنەر دەبێت لانیکەم ٥ پیت درێژ بێت.",
-    'username_required' => "ناوی بەکارهێنەر خانەیەکی پێویستە.",
+    'administrator'                          => '',
+    'basic_information'                      => 'زانیاری',
+    'cannot_be_deleted'                      => 'ناتوانیت کارمەند(ەکان)ی هەڵبژێردراو بسڕیتەوە، یەکێک یان زیاتر لەوانە فرۆشتنی پرۆسێس کردووە یان تۆ هەوڵی سڕینەوەی هەژمارەکەت دەدەیت.',
+    'change_employee'                        => '',
+    'change_password'                        => 'وشەی نهێنی بگۆڕە',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '‌ئایا دڵنیای کە دەتەوێت کارمەند(ەکان)ی هەڵبژێردراو بسڕیتەوە؟',
+    'confirm_restore'                        => 'ئایا دڵنیای کە دەتەوێت کارمەند(ەکان)ی هەڵبژێردراو بگەڕێنیتەوە؟',
+    'current_password'                       => 'وشەی نهێنی ئێستا',
+    'current_password_invalid'               => 'وشەی نهێنی ئێستا نادروستە.',
+    'employee'                               => 'فەرمانبەر',
+    'error_adding_updating'                  => 'زیادکردن یان نوێکردنەوەی کارمەند سەرکەوتوو نەبوو.',
+    'error_cannot_remove_own_minimum_grant'  => 'ناتوانیت کەمترین پێدانی دەستگەیشتنی مۆدیولەکانی خۆت لاببەیت.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'ناتوانیت بەکارهێنەری ئەدمینی تاقیکردنەوەیی بسڕیتەوە.',
+    'error_grant_change_disallowed'          => 'گۆڕینی دەستگەیشتن لە ئەم دیموێدا ناتوانی لێدرایت.',
+    'error_password_change_disallowed'       => 'گۆڕینی وشەی نهێنی لە ئەم دیموێدا ناتوانی لێدرایت.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'ناتوانیت بەکارهێنەری ئەدمین تاقیکردنەوەیی بگۆڕیت.',
+    'language'                               => 'زمان',
+    'login_info'                             => 'چوونەژوورەوە',
+    'manager'                                => '',
+    'new'                                    => 'فەرمانبەری نوێ',
+    'none_selected'                          => 'هیچ فەرمانبەرێک(کان)ت هەڵنەبژاردووە بۆ سڕینەوە.',
+    'one_or_multiple'                        => 'فەرمانبەر(ان)',
+    'password'                               => 'وشەی نهێنی',
+    'password_minlength'                     => 'وشەی نهێنی دەبێت بەلایەنی کەمەوە ٨ پیت بێت.',
+    'password_must_match'                    => 'وشەی نهێنییەکان هاوشێوە نین.',
+    'password_not_must_match'                => 'وشەی نهێنی ئێستا و وشەی نهێنی نوێ دەبێت بێهاوتابن.',
+    'password_required'                      => 'وشەی نهێنی پێویستە.',
+    'permission_desc'                        => 'چوارگۆشەکانی خوارەوە دیاری بکە بۆ پێدانی دەستگەیشتن بە مۆدیولەکان.',
+    'permission_info'                        => 'ڕێپێدانەکان',
+    'repeat_password'                        => 'دووبارە وشەی نهێنی',
+    'subpermission_required'                 => 'بۆ هەر مۆدیولێک بەلایەنی کەمەوە یەک پێدان زیاد بکە.',
+    'successful_adding'                      => 'زیادکردنی فەرمانبەر سەرکەوتوو بوو.',
+    'successful_change_password'             => 'گۆڕینی وشەی نهێنی سەرکەوتوو بوو.',
+    'successful_deleted'                     => 'بەسەرکەوتووی سڕیتەوە',
+    'successful_updating'                    => 'بەسەرکەوتوویی فەرمانبەرەکەت نوێ کردۆتەوە',
+    'system_language'                        => 'زمانی سیستەم',
+    'unsuccessful_change_password'           => 'گۆڕینی وشەی نهێنی سەرکەوتوو نەبوو.',
+    'update'                                 => 'فەرمانبەر نوێبکەوە',
+    'username'                               => 'ناوی بەکارهێنەر',
+    'username_duplicate'                     => 'ناوی بەکارهێنەری فەرمانبەر پێشتر بەکارهاتووە. تکایە یەکێکی تر هەڵبژێرە.',
+    'username_minlength'                     => 'ناوی بەکارهێنەر دەبێت لانیکەم ٥ پیت درێژ بێت.',
+    'username_required'                      => 'ناوی بەکارهێنەر خانەیەکی پێویستە.',
 ];
diff --git a/app/Language/ckb/Error.php b/app/Language/ckb/Error.php
index 5e5bf4ce5..dd1f9db1d 100644
--- a/app/Language/ckb/Error.php
+++ b/app/Language/ckb/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "تۆ ڕێگەپێدانت نییە بۆ دەستگەیشتن بەو مۆدیولەی کە ناوی لێنراوە",
-    "unknown"              => "هەڵەیەکی چاوەڕواننەکراو",
+    'no_permission_module'           => 'تۆ ڕێگەپێدانت نییە بۆ دەستگەیشتن بەو مۆدیولەی کە ناوی لێنراوە',
+    'unable_to_create_env_file'      => 'نەتوانرا {filePath} دروست بکرێت بۆ دابینکردنی throttle.key',
+    'unable_to_lock_file'            => 'نەتوانرا {filePath} قوفڵ بکرێت: {reason}',
+    'unable_to_open_lock_file'       => 'نەتوانرا {filePath} کرایەوە: {reason}',
+    'unable_to_persist_throttle_key' => 'نەتوانرا throttle.key لە {filePath} پاشەکەوت بکرێت',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'نەتوانرا {filePath} بخوێنرێتەوە بۆ دابینکردنی throttle.key',
+    'unknown'                        => 'هەڵەیەکی چاوەڕواننەکراو',
 ];
diff --git a/app/Language/ckb/Items.php b/app/Language/ckb/Items.php
index 59d42abf1..ae99a785c 100644
--- a/app/Language/ckb/Items.php
+++ b/app/Language/ckb/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    'add_minus' => "زیادکردن یان کەمکردنی جەرد.",
-    'allow_alt_description' => "ڕێگە بدە بە دەربارەی جێگرەوە",
-    'amount_entry' => "داخڵکردنی بڕی پارە",
-    'bulk_edit' => "دەستکاریکردنی بە کۆمەڵ",
-    'buy_price_required' => "نرخی کڕین خانەیەکی پێویستە.",
-    'cannot_be_deleted' => "نەتوانرا بابەتی هەڵبژێردراو بسڕدرێتەوە، یەکێک یان زیاتر لە بابەتە هەڵبژێردراوەکان فرۆشتنیان هەیە.",
-    'cannot_find_item' => "ئایتم نەدۆزرایەوە.",
-    'categories' => "",
-    'category' => "پۆلێن",
-    'category_new' => "",
-    'category_required' => "پۆل خانەیەکی پێویستە.",
-    'change_all_to_allow_alt_desc' => "ڕێگە بە وەسفێکی جێگرەوە بدە بۆ هەمووان.",
-    'change_all_to_not_allow_allow_desc' => "ڕێگە مەدە بە وەسفی جێگرەوە بۆ هەمووان.",
-    'change_all_to_serialized' => "هەمووی بگۆڕە بۆ بەزنجیرەکراو",
-    'change_all_to_unserialized' => "هەمووی بگۆڕە بۆ بەزنجیرەنەکراوە",
-    'change_image' => "وێنەکە بگۆڕە",
-    'confirm_bulk_edit' => "ئایا دڵنیای کە دەتەوێت دەستکاری ئایتم(ەکان)ی هەڵبژێردراو بکەیت؟",
-    'confirm_bulk_edit_wipe_taxes' => "هەموو زانیارییەکانی باجی ئایتم شوێنیان دەگیرێتەوە.",
-    'confirm_delete' => "ئایا دڵنیای کە دەتەوێت ئایتم(ەکان)ی هەڵبژێردراو بسڕیتەوە؟",
-    'confirm_restore' => "ئایا دڵنیای کە دەتەوێت ئایتم(ەکان)ی هەڵبژێردراو بگەڕێنیتەوە؟",
-    'cost_price' => "نرخی جوملە",
-    'cost_price_number' => "نرخی جوملە دەبێت ژمارە بێت.",
-    'cost_price_required' => "نرخی جوملە خانەیەکی پێویستە.",
-    'count' => "جەرد نوێ بکەوە",
-    'csv_import_failed' => "هاوردەکردنی CSV سەرکەوتوو نەبوو",
-    'csv_import_invalid_location' => "",
-    'csv_import_nodata_wrongformat' => "پەڕگەی CSV بارکراو هیچ داتایەکی نییە یان بە هەڵە فۆرمات کراوە.",
-    'csv_import_partially_failed' => "{0} شکستی هاوردەکردنی بابەتی لەسەر هێڵەکان هەبوو: {1}. هیچ ڕیزێک هاوردە نەکرا.",
-    'csv_import_success' => "بابەتی هاوردەکردنی CSV سەرکەوتوو بوو.",
-    'current_quantity' => "چەندێتی ئێستە",
-    'default_pack_name' => "هەریەک",
-    'description' => "دەربارە",
-    'details_count' => "وردەکاری ژمارەی جەرد",
-    'do_nothing' => "هیچ مەکە",
-    'edit' => "",
-    'edit_fields_you_want_to_update' => "دەستکاری خانەی دڵخوازت بکە بۆ ئایتمی هەڵبژێردراو.",
-    'edit_multiple_items' => "دەسکاریکردنی چەندین ئایتم",
-    'empty_upc_items' => "ئایتمی باڕکۆدی بەتاڵ",
-    'error_adding_updating' => "لە زیادکردنی/نوێکردنەوەی ئایتم هەڵە هەیە",
-    'error_updating_multiple' => "لە نوێکردنەوەی ئایتم هەڵە هەیە",
-    'generate_barcodes' => "دروستکردنی بارکۆدەکان",
-    'hsn_code' => "ناونانی سیستەمی هاوسەنگکراو",
-    'image' => "وێنە",
-    'import_items_csv' => "هاوردەکردنی ئایتم لە CSV",
-    'info_provided_by' => "زانیاری دراوە لەلایەن",
-    'inventory' => "جەرد",
-    'inventory_CSV_import_quantity' => "چەندێتی هاوردەکراو لە CSV",
-    'inventory_comments' => "کۆمێنتەکان",
-    'inventory_data_tracking' => "بەدواداچوون بۆ داتاکانی جەرد",
-    'inventory_date' => "بەرورار",
-    'inventory_employee' => "فەرمانبەر",
-    'inventory_in_out_quantity' => "چەندێتی هاتوو/ڕۆیشتوو",
-    'inventory_remarks' => "تێبینییەکان",
-    'is_deleted' => "سڕاوەتەوە",
-    'is_printed' => "",
-    'is_serialized' => "ئایتم ژمارەی زنجیرەیی هەیە",
-    'item' => "ئایتم",
-    'item_id' => "",
-    'item_number' => "باڕکۆد",
-    'item_number_duplicate' => "ژمارەی ئایتم پێشتر لە داتابەیسدا ئامادەبووە.",
-    'kit' => "کیت",
-    'location' => "شوێن",
-    'low_inventory_items' => "ئایتمەکانی لە کۆگادا نەماون",
-    'low_sell_item' => "ئایتمی فرۆش کەم",
-    'manually_editing_of_quantity' => "دەستکاریکردنی دەستی چەندێتی",
-    'markup' => "",
-    'name' => "ناوی ئایتم",
-    'name_required' => "ناوی ئایتم خانەیەکی پێویستە.",
-    'new' => "ئایتمی نوێ",
-    'no_description_items' => "ئایتمەکانی دەربارە(وەسف)یان نییە",
-    'no_items_to_display' => "هیچ ئایتمێک نییە بۆ نیشاندان.",
-    'none' => "هیچیان",
-    'none_selected' => "تۆ هیچ ئایتمێکت هەڵنەبژاردووە بۆ دەستکاریکردن",
-    'nonstock' => "لە کۆگادانەنراو",
-    'number_information' => "ژمارەی ئایتم",
-    'number_required' => "خانەی باڕکۆد پێویستە.",
-    'one_or_multiple' => "ئایتم(ەکان)",
-    'pack_name' => "ناوی پاکەت",
-    'qty_per_pack' => "چەندێتی(ژمارە-بڕ) بۆ هەر پاکەتێک",
-    'quantity' => "بڕ",
-    'quantity_number' => "چەندێتی دەبێت ژمارە بێت.",
-    'quantity_required' => "چەندێتی خانەیەکی پێویستە.",
-    'receiving_quantity' => "وەرگرتنی چەندێتی",
-    'remove_image' => "لابردنی وێنە",
-    'reorder_level' => "ئاست ڕێکخستنەوە",
-    'reorder_level_number' => "ئاست ڕێکخستنەوە دەبێت ژمارە بێت.",
-    'reorder_level_required' => "ئاست ڕێکخستنەوە خانەیەکی پێویستە.",
-    'retrive_item_info' => "گەڕاندنەوەی زانیاری ئایتم",
-    'sales_tax_1' => "باجی فرۆشتن",
-    'sales_tax_2' => "باجی فرۆشتن ٢",
-    'search_attributes' => "تایبەتمەندی گەڕان",
-    'select_image' => "وێنە هەڵبژێرە",
-    'serialized_items' => "ئایتمە بەزنجیرەکراوەکان",
-    'standard' => "ستاندارد",
-    'stock' => "کۆگا",
-    'stock_location' => "شوێنی کۆگا",
-    'stock_type' => "جۆری کۆگا",
-    'successful_adding' => "بەسەرکەوتوویی ئایتمت زیادکردوە",
-    'successful_bulk_edit' => "بەسەرکەوتوویی ئایتم(ەکان)ی هەڵبژێردراوت نوێ کردەوە",
-    'successful_deleted' => "بەسەرکەوتووی سڕیتەوە",
-    'successful_updating' => "بەسەرکەوتووی ئایتمت نوێ کردەوە",
-    'supplier' => "دابینکار",
-    'tax_1' => "باج ١",
-    'tax_2' => "باج ٢",
-    'tax_3' => "",
-    'tax_category' => "پۆلێنی باج",
-    'tax_percent' => "",
-    'tax_percent_number' => "ڕێژەی سەدی باج دەبێت بەهایەکی ژمارەیی بێت",
-    'tax_percent_required' => "ڕێژەی سەدی باج خانەیەکی پێویستە.",
-    'tax_percents' => "ڕێژەی سەدی(یەکان)ی باج",
-    'temp' => "کاتیی",
-    'type' => "جۆری ئایتم",
-    'unit_price' => "نرخی وردە فرۆشی",
-    'unit_price_number' => "نرخی یەکە دەبێت ژمارە بێت.",
-    'unit_price_required' => "نرخی تاکفرۆشی خانەیەکی پێویستە.",
-    'upc_database' => "داتابەیسی باڕکۆد",
-    'update' => "نوێکردنەوەی ئایتم",
-    'use_inventory_menu' => "لیستەی جەرد بەکاربهێنە",
+    'add_minus' => 'زیادکردن یان کەمکردنی جەرد.',
+    'allow_alt_description' => 'ڕێگە بدە بە دەربارەی جێگرەوە',
+    'amount_entry' => 'داخڵکردنی بڕی پارە',
+    'bulk_edit' => 'دەستکاریکردنی بە کۆمەڵ',
+    'buy_price_required' => 'نرخی کڕین خانەیەکی پێویستە.',
+    'cannot_be_deleted' => 'نەتوانرا بابەتی هەڵبژێردراو بسڕدرێتەوە، یەکێک یان زیاتر لە بابەتە هەڵبژێردراوەکان فرۆشتنیان هەیە.',
+    'cannot_find_item' => 'ئایتم نەدۆزرایەوە.',
+    'categories' => '',
+    'category' => 'پۆلێن',
+    'category_new' => '',
+    'category_required' => 'پۆل خانەیەکی پێویستە.',
+    'change_all_to_allow_alt_desc' => 'ڕێگە بە وەسفێکی جێگرەوە بدە بۆ هەمووان.',
+    'change_all_to_not_allow_allow_desc' => 'ڕێگە مەدە بە وەسفی جێگرەوە بۆ هەمووان.',
+    'change_all_to_serialized' => 'هەمووی بگۆڕە بۆ بەزنجیرەکراو',
+    'change_all_to_unserialized' => 'هەمووی بگۆڕە بۆ بەزنجیرەنەکراوە',
+    'change_image' => 'وێنەکە بگۆڕە',
+    'confirm_bulk_edit' => 'ئایا دڵنیای کە دەتەوێت دەستکاری ئایتم(ەکان)ی هەڵبژێردراو بکەیت؟',
+    'confirm_bulk_edit_wipe_taxes' => 'هەموو زانیارییەکانی باجی ئایتم شوێنیان دەگیرێتەوە.',
+    'confirm_delete' => 'ئایا دڵنیای کە دەتەوێت ئایتم(ەکان)ی هەڵبژێردراو بسڕیتەوە؟',
+    'confirm_restore' => 'ئایا دڵنیای کە دەتەوێت ئایتم(ەکان)ی هەڵبژێردراو بگەڕێنیتەوە؟',
+    'cost_price' => 'نرخی جوملە',
+    'cost_price_number' => 'نرخی جوملە دەبێت ژمارە بێت.',
+    'cost_price_required' => 'نرخی جوملە خانەیەکی پێویستە.',
+    'count' => 'جەرد نوێ بکەوە',
+    'csv_import_failed' => 'هاوردەکردنی CSV سەرکەوتوو نەبوو',
+    'csv_import_invalid_location' => '',
+    'csv_import_nodata_wrongformat' => 'پەڕگەی CSV بارکراو هیچ داتایەکی نییە یان بە هەڵە فۆرمات کراوە.',
+    'csv_import_partially_failed' => '{0} شکستی هاوردەکردنی بابەتی لەسەر هێڵەکان هەبوو: {1}. هیچ ڕیزێک هاوردە نەکرا.',
+    'csv_import_success' => 'بابەتی هاوردەکردنی CSV سەرکەوتوو بوو.',
+    'current_quantity' => 'چەندێتی ئێستە',
+    'default_pack_name' => 'هەریەک',
+    'description' => 'دەربارە',
+    'details_count' => 'وردەکاری ژمارەی جەرد',
+    'do_nothing' => 'هیچ مەکە',
+    'edit' => '',
+    'edit_fields_you_want_to_update' => 'دەستکاری خانەی دڵخوازت بکە بۆ ئایتمی هەڵبژێردراو.',
+    'edit_multiple_items' => 'دەسکاریکردنی چەندین ئایتم',
+    'empty_upc_items' => 'ئایتمی باڕکۆدی بەتاڵ',
+    'error_adding_updating' => 'لە زیادکردنی/نوێکردنەوەی ئایتم هەڵە هەیە',
+    'error_updating_multiple' => 'لە نوێکردنەوەی ئایتم هەڵە هەیە',
+    'generate_barcodes' => 'دروستکردنی بارکۆدەکان',
+    'hsn_code' => 'ناونانی سیستەمی هاوسەنگکراو',
+    'image' => 'وێنە',
+    'import_items_csv' => 'هاوردەکردنی ئایتم لە CSV',
+    'info_provided_by' => 'زانیاری دراوە لەلایەن',
+    'inventory' => 'جەرد',
+    'inventory_CSV_import_quantity' => 'چەندێتی هاوردەکراو لە CSV',
+    'inventory_comments' => 'کۆمێنتەکان',
+    'inventory_data_tracking' => 'بەدواداچوون بۆ داتاکانی جەرد',
+    'inventory_date' => 'بەرورار',
+    'inventory_employee' => 'فەرمانبەر',
+    'inventory_in_out_quantity' => 'چەندێتی هاتوو/ڕۆیشتوو',
+    'inventory_remarks' => 'تێبینییەکان',
+    'is_deleted' => 'سڕاوەتەوە',
+    'is_printed' => '',
+    'is_serialized' => 'ئایتم ژمارەی زنجیرەیی هەیە',
+    'item' => 'ئایتم',
+    'item_id' => '',
+    'item_number' => 'باڕکۆد',
+    'item_number_duplicate' => 'ژمارەی ئایتم پێشتر لە داتابەیسدا ئامادەبووە.',
+    'item_number_invalid' => 'ژمارەی ئایتم پیتی ڕێگەپێنەدراوی تێدایە.',
+    'kit' => 'کیت',
+    'location' => 'شوێن',
+    'low_inventory_items' => 'ئایتمەکانی لە کۆگادا نەماون',
+    'low_sell_item' => 'ئایتمی فرۆش کەم',
+    'manually_editing_of_quantity' => 'دەستکاریکردنی دەستی چەندێتی',
+    'markup' => '',
+    'name' => 'ناوی ئایتم',
+    'name_required' => 'ناوی ئایتم خانەیەکی پێویستە.',
+    'new' => 'ئایتمی نوێ',
+    'no_description_items' => 'ئایتمەکانی دەربارە(وەسف)یان نییە',
+    'no_items_to_display' => 'هیچ ئایتمێک نییە بۆ نیشاندان.',
+    'none' => 'هیچیان',
+    'none_selected' => 'تۆ هیچ ئایتمێکت هەڵنەبژاردووە بۆ دەستکاریکردن',
+    'nonstock' => 'لە کۆگادانەنراو',
+    'number_information' => 'ژمارەی ئایتم',
+    'number_required' => 'خانەی باڕکۆد پێویستە.',
+    'one_or_multiple' => 'ئایتم(ەکان)',
+    'pack_name' => 'ناوی پاکەت',
+    'qty_per_pack' => 'چەندێتی(ژمارە-بڕ) بۆ هەر پاکەتێک',
+    'quantity' => 'بڕ',
+    'quantity_number' => 'چەندێتی دەبێت ژمارە بێت.',
+    'quantity_required' => 'چەندێتی خانەیەکی پێویستە.',
+    'receiving_quantity' => 'وەرگرتنی چەندێتی',
+    'remove_image' => 'لابردنی وێنە',
+    'reorder_level' => 'ئاست ڕێکخستنەوە',
+    'reorder_level_number' => 'ئاست ڕێکخستنەوە دەبێت ژمارە بێت.',
+    'reorder_level_required' => 'ئاست ڕێکخستنەوە خانەیەکی پێویستە.',
+    'retrive_item_info' => 'گەڕاندنەوەی زانیاری ئایتم',
+    'sales_tax_1' => 'باجی فرۆشتن',
+    'sales_tax_2' => 'باجی فرۆشتن ٢',
+    'search_attributes' => 'تایبەتمەندی گەڕان',
+    'select_image' => 'وێنە هەڵبژێرە',
+    'serialized_items' => 'ئایتمە بەزنجیرەکراوەکان',
+    'standard' => 'ستاندارد',
+    'stock' => 'کۆگا',
+    'stock_location' => 'شوێنی کۆگا',
+    'stock_type' => 'جۆری کۆگا',
+    'successful_adding' => 'بەسەرکەوتوویی ئایتمت زیادکردوە',
+    'successful_bulk_edit' => 'بەسەرکەوتوویی ئایتم(ەکان)ی هەڵبژێردراوت نوێ کردەوە',
+    'successful_deleted' => 'بەسەرکەوتووی سڕیتەوە',
+    'successful_updating' => 'بەسەرکەوتووی ئایتمت نوێ کردەوە',
+    'supplier' => 'دابینکار',
+    'tax_1' => 'باج ١',
+    'tax_2' => 'باج ٢',
+    'tax_3' => '',
+    'tax_category' => 'پۆلێنی باج',
+    'tax_name_invalid' => 'ناوی باج پیتی ڕێگە پێنەدراوی تێدایە.',
+    'tax_percent' => '',
+    'tax_percent_number' => 'ڕێژەی سەدی باج دەبێت بەهایەکی ژمارەیی بێت',
+    'tax_percent_required' => 'ڕێژەی سەدی باج خانەیەکی پێویستە.',
+    'tax_percents' => 'ڕێژەی سەدی(یەکان)ی باج',
+    'temp' => 'کاتیی',
+    'type' => 'جۆری ئایتم',
+    'unit_price' => 'نرخی وردە فرۆشی',
+    'unit_price_number' => 'نرخی یەکە دەبێت ژمارە بێت.',
+    'unit_price_required' => 'نرخی تاکفرۆشی خانەیەکی پێویستە.',
+    'upc_database' => 'داتابەیسی باڕکۆد',
+    'update' => 'نوێکردنەوەی ئایتم',
+    'use_inventory_menu' => 'لیستەی جەرد بەکاربهێنە',
 ];
diff --git a/app/Language/ckb/Login.php b/app/Language/ckb/Login.php
index 985c9351c..773210f7d 100644
--- a/app/Language/ckb/Login.php
+++ b/app/Language/ckb/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    'gcaptcha' => "من ڕۆبۆت نیم.",
-    'go' => "بەردەوامبە",
-    'invalid_gcaptcha' => "تکایە دڵنیابکەرەوە لەوەی کە تۆ ڕۆبۆت نیت.",
-    'invalid_installation' => "دابەزاندن دروست نییە، فایلیphp.ini ـەکەت بپشکنە.",
-    'invalid_username_and_password' => "ناوی بەکارهێنەر و/یان وشەی نهێنی نادروست.",
-    'login' => "چوونەژوورەوە",
-    'logout' => "چوونەدەرەوە",
-    'migration_needed' => "گواستنەوەی داتابەیس بۆ {0} دوای چوونەژوورەوە دەست پێدەکات.",
-    'password' => "وشەی نهێنی",
-    'required_username' => "خانەی ناوی بەکارهێنەر پێویستە.",
-    'username' => "ناوی بەکارهێنەر",
-    'welcome' => "بەخێربێن بۆ {0}!",
+    "gcaptcha"                            => "من ڕۆبۆت نیم.",
+    "go"                                  => "بەردەوامبە",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "تکایە دڵنیابکەرەوە لەوەی کە تۆ ڕۆبۆت نیت.",
+    "invalid_installation"                => "دابەزاندن دروست نییە، فایلیphp.ini ـەکەت بپشکنە.",
+    "invalid_username_and_password"       => "ناوی بەکارهێنەر و/یان وشەی نهێنی نادروست.",
+    "login"                               => "چوونەژوورەوە",
+    "logout"                              => "چوونەدەرەوە",
+    "migrating_database"                  => "",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "گواستنەوەی داتابەیس بۆ {0} دوای چوونەژوورەوە دەست پێدەکات.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "وشەی نهێنی",
+    "required_username"                   => "خانەی ناوی بەکارهێنەر پێویستە.",
+    'too_many_attempts'                   => 'هەوڵدانی زۆر زیادە. تکایە کەمێک چاوەڕێ بکە و دووبارە هەوڵ بدەرەوە.',
+    "username"                            => "ناوی بەکارهێنەر",
+    "welcome"                             => "بەخێربێن بۆ {0}!"
 ];
diff --git a/app/Language/ckb/Reports.php b/app/Language/ckb/Reports.php
index 9b76e1d11..5f11f141b 100644
--- a/app/Language/ckb/Reports.php
+++ b/app/Language/ckb/Reports.php
@@ -128,6 +128,7 @@ return [
     'tax_rate' => "ڕێژەی باج",
     'taxes' => "باجەکان",
     'taxes_summary_report' => "‎ڕاپۆرتی پوختەی باجەکان",
+    'toggle_cost_and_profit' => "",
     'total' => "گشتی",
     'total_inventory_value' => "کۆی بەهای جەرد",
     'total_low_sell_quantity' => "کۆی گشتی بڕی فرۆشتنی کەم",
diff --git a/app/Language/ckb/Sales.php b/app/Language/ckb/Sales.php
index 7f5d46dc2..e95e0c7be 100644
--- a/app/Language/ckb/Sales.php
+++ b/app/Language/ckb/Sales.php
@@ -1,226 +1,240 @@
 <?php
 
 return [
-    'customers_available_points' => "خاڵە بەردەستەکان",
-    'rewards_package' => "پاداشتەکان",
-    'rewards_remaining_balance' => "بەهای پاداشتی خاڵە ماووەکان بریتییە لە ",
-    'account_number' => "هەژمار #",
-    'add_payment' => "زیادکردنی پارەدان",
-    'amount_due' => "بڕی پارە کە دەبێ بدرێت",
-    'amount_tendered' => "بڕی پێشکەشکراو",
-    'authorized_signature' => "واژۆی ڕێگەپێدراو",
-    'cancel_sale' => "هەڵوەشاندنەوە",
-    'cash' => "پارەی نەختینە",
-    'cash_1' => "",
-    'cash_2' => "",
-    'cash_3' => "",
-    'cash_4' => "",
-    'cash_adjustment' => "ڕێکخستنی پارەی نەختینە",
-    'cash_deposit' => "پارەی نەختینەی دانراو",
-    'cash_filter' => "نەختینە",
-    'change_due' => "ئەو گۆڕانکارییانەی دەبێت بکرێت",
-    'change_price' => "گۆڕینی نرخی فرۆشتن",
-    'check' => "چەکی پارە",
-    'check_balance' => "پاشماوەی چەکی پارە",
-    'check_filter' => "چەکی پارە",
-    'close' => "",
-    'comment' => "سەرنج",
-    'comments' => "سەرنجەکان",
-    'company_name' => "",
-    'complete' => "",
-    'complete_sale' => "تەواو",
-    'confirm_cancel_sale' => "دڵنیایت دەتەوێت ئەم فرۆشتنە بسڕیتەوە؟ هەموو کاڵاکان دەسڕێنەوە.",
-    'confirm_delete' => "ئایا دڵنیای کە دەتەوێت فرۆشتنە هەڵبژێردراوەکان بسڕیتەوە؟",
-    'confirm_restore' => "ئایا دڵنیای کە دەتەوێت فرۆشتنە هەڵبژێردراوەکان بگەڕێنیتەوە؟",
-    'credit' => "کارتی کرێدت",
-    'credit_deposit' => "دانانی کرێدت",
-    'credit_filter' => "کارتی کرێدت",
-    'current_table' => "",
-    'customer' => "کڕیار",
-    'customer_address' => "ناونیشان",
-    'customer_discount' => "داشکاندن",
-    'customer_email' => "ئیمەیڵ",
-    'customer_location' => "ناونیشان",
-    'customer_mailchimp_status' => "دۆخی بەکارهێنان مایلچیمپ",
-    'customer_optional' => "(پێویستە بۆئەو پارانەی دەبێت بدرێت)",
-    'customer_required' => "(پێویستە)",
-    'customer_total' => "کۆی گشتی",
-    'customer_total_spent' => "",
-    'daily_sales' => "",
-    'date' => "بەرواری فرۆشتن",
-    'date_range' => "مەودای بەروار",
-    'date_required' => "دەبێت بەروارێکی دروست داخڵ بکرێت.",
-    'date_type' => "بەروار خانەیەکی پێویستە.",
-    'debit' => "کارتی دێبت",
-    'debit_filter' => "",
-    'delete' => "ڕێگە بدە بە سڕینەوە",
-    'delete_confirmation' => "دڵنیای کە دەتەوێت ئەم فرۆشتنە بسڕیتەوە؟ ئەم کارە ناتوانرێت پووچەڵ بکرێتەوە.",
-    'delete_entire_sale' => "هەموو فرۆشتنەکە بسڕەوە",
-    'delete_successful' => "سڕینەوەی فرۆشتن سەرکەوتوو بوو.",
-    'delete_unsuccessful' => "سڕینەوەی فرۆشتن شکستی هێنا.",
-    'description_abbrv' => "وەسف.",
-    'discard' => "ڕەتکردنەوە",
-    'discard_quote' => "",
-    'discount' => "داشکاندن",
-    'discount_included' => "% داشکاندن",
-    'discount_short' => "%",
-    'due' => "ئەو بڕەی پێویستە بدرێت",
-    'due_filter' => "ئەو بڕەی پێویستە بدرێت",
-    'edit' => "دەستکاری",
-    'edit_item' => "دەستکاریکردنی ئایتم",
-    'edit_sale' => "دەستکاریکردنی فرۆشتن",
-    'email_receipt' => "وەسڵی ئیمەیڵ",
-    'employee' => "فەرمانبەر",
-    'entry' => "تۆمار",
-    'error_editing_item' => "هەڵە لە دەستکاریکردنی ئایتم",
-    'find_or_scan_item' => "دۆزینەوە یان سکانکردنی ئایتم",
-    'find_or_scan_item_or_receipt' => "دۆزینەوە یان سکانکردنی ئایتم یان پسوڵە",
-    'giftcard' => "کارتی دیاری",
-    'giftcard_balance' => "باڵانسی کارتی دیاری",
-    'giftcard_filter' => "",
-    'giftcard_number' => "ژمارەی کارتی دیاری",
-    'group_by_category' => "گروپ بەپێی پۆلێن",
-    'group_by_type' => "گروپ بەپێی جۆر",
-    'hsn' => "کۆدی سیستەمی هارمونیزە",
-    'id' => "ناسنامەی فرۆشتن",
-    'include_prices' => "نرخەکان لەخۆ بگرێت؟",
-    'invoice' => "فاکتۆرە",
-    'invoice_confirm' => "ئەم فاکتورەیە دەنێردرێت بۆ",
-    'invoice_enable' => "ژمارەی فاکتورە",
-    'invoice_filter' => "فاکتۆرەکان",
-    'invoice_no_email' => "ئەم کڕیارە ناونیشانی ئیمەیڵی دروستی نییە.",
-    'invoice_number' => "فاکتورە #",
-    'invoice_number_duplicate' => "ژمارەی فاکتورە {0} دەبێت تایبەت بێت.",
-    'invoice_sent' => "فاکتورە نێردراوە بۆ",
-    'invoice_total' => "کۆی گشتی فاکتورە",
-    'invoice_type_custom_invoice' => "فاکتورەی تایبەت (custom_invoice.php)",
-    'invoice_type_custom_tax_invoice' => "فاکتورەی باجی تایبەتمەند (custom_tax_invoice.php)",
-    'invoice_type_invoice' => "فاکتورە (invoice.php)",
-    'invoice_type_tax_invoice' => "فاکتورەی باج (tax_invoice.php)",
-    'invoice_unsent' => "فاکتورە نەتوانرا بنێردریت بۆ",
-    'invoice_update' => "ژماردنەوەی دووبارە",
-    'item_insufficient_of_stock' => "ئایتمەکە بڕی پێویستی نییە لە کۆگا.",
-    'item_name' => "ناوی ئایتم",
-    'item_number' => "ئایتم #",
-    'item_out_of_stock' => "ئایتم لە کۆگادا تەواو بووە.",
-    'key_browser' => "کورتە ڕێگای یارمەتیدەر",
-    'key_cancel' => "هەڵوەشاندنەوەی دەرخستەی نرخ/فاکتورە/فرۆشتن",
-    'key_customer_search' => "گەڕان بەدوای کڕیاردا",
-    'key_finish_quote' => "تەواوکردنی دەرخستەی نرخ/فاکتورە بەبێ پارەدان",
-    'key_finish_sale' => "زیادکردنی پارەدان و تەواوکردنی فاکتورە/فرۆشتن",
-    'key_full' => "لە دۆخی تەواوی شاشەدا بیکەرەوە",
-    'key_function' => "فرمان",
-    'key_help' => "کورتە ڕێگاکان",
-    'key_help_modal' => "پەنجەرەی کورتە ڕێگاکان بکەرەوە",
-    'key_in' => "نزیک کردنەوە",
-    'key_item_search' => "گەڕان بەدوای ئایتم",
-    'key_out' => "دوورخستنەوە",
-    'key_payment' => "زیادکردنی پارەدان",
-    'key_print' => "لاپەڕەی ئێستا چاپ بکە",
-    'key_restore' => "گەڕاندنەوەی پیشاندانی ئەسڵی/زووم",
-    'key_search' => "خشتەکانی ڕاپۆرتەکانی گەڕان",
-    'key_suspend' => "فرۆشتنی ئێستا ڕابگرە",
-    'key_suspended' => "فرۆشتنی ڕاگیراو پیشان بدە",
-    'key_system' => "کورتە ڕێگاکانی سیستەم",
-    'key_tendered' => "دەسکاریکردنی بڕی پێشکەشکراو",
-    'key_title' => "کورتە ڕێگاکانی تەختەکلیلی فرۆشتن",
-    'mc' => "",
-    'mode' => "دۆخی تۆمارکردن",
-    'must_enter_numeric' => "بڕی پێشکەشکراو دەبێت ژمارەیەک بێت.",
-    'must_enter_numeric_giftcard' => "ژمارەی کارتی دیاری دەبێت ژمارەیەک بێت.",
-    'new_customer' => "کڕیاری نوێ",
-    'new_item' => "ئایتمی نوێ",
-    'no_description' => "هیچ وەسفێک نییە",
-    'no_filter' => "هەموو",
-    'no_items_in_cart' => "هیچ ئایتمێک لە عەرەبانەکەدا نییە.",
-    'no_sales_to_display' => "هیچ فرۆشتنێک نییە بۆ پیشاندان.",
-    'none_selected' => "تۆ هیچ فرۆشتنێکت هەڵنەبژاردووە بۆ سڕینەوە.",
-    'nontaxed_ind' => " ",
-    'not_authorized' => "ئەم کارە ڕێگەپێدراو نییە.",
-    'one_or_multiple' => "فرۆشتن(ەکان)",
-    'payment' => "جۆری پارەدان",
-    'payment_amount' => "بڕ",
-    'payment_not_cover_total' => "بڕی پارەدان دەبێت زیاتر بێت یان یەکسان بێت بە کۆی گشتی.",
-    'payment_type' => "جۆر",
-    'payments' => "",
-    'payments_total' => "کۆی پارەدانەکان",
-    'price' => "نرخ",
-    'print_after_sale' => "چاپکردن دوای فرۆشتن",
-    'quantity' => "بڕ",
-    'quantity_less_than_reorder_level' => "ئاگاداری: بڕی خوازراو لە خوار ئاستی پێویستەوەیە بۆ ئەو ئایتمە.",
-    'quantity_less_than_zero' => "ئاگاداری: بڕی خوازراو بەس نییە. هێشتا دەتوانیت فرۆشتنەکە پڕۆسێس بکەیت، بەڵام دەبێت وردبینی بۆ کۆگاکەت بکەیت.",
-    'quantity_of_items' => "بڕی {0} ئایتم",
-    'quote' => "دەرخستەی نرخ",
-    'quote_number' => "ژمارەی دەرخستەی نرخ",
-    'quote_number_duplicate' => "ژمارەی دەرخستەی نرخ دەبێت تایبەت بێت.",
-    'quote_sent' => "دەرخستەی نرخ نێردرا بۆ",
-    'quote_unsent' => "دەرخستەی نرخ شکستی هێنا لە ناردنی بۆ",
-    'receipt' => "پسوڵەی فرۆشتن",
-    'receipt_no_email' => "ئەم کڕیارە ناونیشانی ئیمەیڵی دروستی نییە.",
-    'receipt_number' => "فرۆشتن #",
-    'receipt_sent' => "پسوڵەی نێردرا بۆ",
-    'receipt_unsent' => "پسوڵەکە شکستی هێنا لە ناردنی بۆ",
-    'refund' => "جۆری گەڕاندنەوەی پارە",
-    'register' => "تۆماری فرۆشتن",
-    'remove_customer' => "لابردنی کڕیار",
-    'remove_discount' => "",
-    'return' => "گەڕانەوە",
-    'rewards' => "خاڵەکانی پاداشت",
-    'rewards_balance' => "باڵانسی خاڵەکانی پاداشت",
-    'sale' => "فرۆشتن",
-    'sale_by_invoice' => "فرۆشتن بە فاکتورە",
-    'sale_for_customer' => "کڕیار:",
-    'sale_time' => "کات",
-    'sales_tax' => "باجی فرۆشتن",
-    'sales_total' => "",
-    'select_customer' => "کڕیار هەڵبژێرە",
-    'selected_customer' => "کڕیاری هەڵبژێردراو",
-    'send_invoice' => "فاکتورە بنێرە",
-    'send_quote' => "دەرخستەی نرخ بنێرە",
-    'send_receipt' => "پسوڵە بنێرە",
-    'send_work_order' => "داواکاری کار بنێرە",
-    'serial' => "زنجیرەیی",
-    'service_charge' => "",
-    'show_due' => "",
-    'show_invoice' => "فاکتورە پیشان بدە",
-    'show_receipt' => "فاکتورە پیشان بدە",
-    'start_typing_customer_name' => "دەست بکە بە نووسینی وردەکارییەکانی کڕیار...",
-    'start_typing_item_name' => "دەست بکە بە نووسینی ناوی ئایتم یان بارکۆد سکان بکە...",
-    'stock' => "کۆگا",
-    'stock_location' => "ناونیشانی کۆگا",
-    'sub_total' => "کۆی سەرەتایی",
-    'successfully_deleted' => "بەسەرکەوتوویی سڕیتەوە",
-    'successfully_restored' => "بەسەرکەوتوویی گەڕاندتەوە",
-    'successfully_suspended_sale' => "فرۆشتن بەسەرکەوتوویی راگیرا.",
-    'successfully_updated' => "فرۆشتن بەسەرکەوتوویی تازەکرایەوە.",
-    'suspend_sale' => "ڕاگرتن",
-    'suspended_doc_id' => "بەڵگەنامە",
-    'suspended_sale_id' => "ناسنامە",
-    'suspended_sales' => "ڕاگیرا",
-    'table' => "مێز",
-    'takings' => "فرۆشتنی ڕۆژانە",
-    'tax' => "باج",
-    'tax_id' => "ناسنامەی باج",
-    'tax_invoice' => "فاکتورەی باج",
-    'tax_percent' => "باج %",
-    'taxed_ind' => "T",
-    'total' => "گشتی",
-    'total_tax_exclusive' => "باج لەخۆناگرێت",
-    'transaction_failed' => "مامەڵەی فرۆشتن شکستی هێنا.",
-    'unable_to_add_item' => "زیادکردنی ئایتم بۆ فرۆشتن شکستی هێنا",
-    'unsuccessfully_deleted' => "سڕینەوەی فرۆشتن(ەکان) شکستی هێنا.",
-    'unsuccessfully_restored' => "گەڕاندنەوەی فرۆشتن(ەکان) شکستی هێنا.",
-    'unsuccessfully_suspended_sale' => "ڕاگرتنی فرۆشتن شکستی هێنا.",
-    'unsuccessfully_updated' => "نوێکردنەوەی فرۆشتن شکستی هێنا.",
-    'unsuspend' => "ڕاگرتن هەڵبوەشێنەوە",
-    'unsuspend_and_delete' => "کردار",
-    'update' => "نوێکردنەوە",
-    'upi' => "UPI (سیستەمی پارەدان بەهۆکاری یەکگرتوو)",
-    'visa' => "",
-    'wholesale' => "",
-    'work_order' => "داواکاری کار",
-    'work_order_number' => "ژامرەی داواکاری کار",
-    'work_order_number_duplicate' => "ژمارەی داواکاری کار دەبێت تایبەت بێت.",
-    'work_order_sent' => "داواکاری کار نێردرا بۆ",
-    'work_order_unsent' => "داواکاری کار شکستی هێنا لە ناردنی بۆ",
+    'account_number'                    => 'هەژمار #',
+    'add_payment'                       => 'زیادکردنی پارەدان',
+    'amount_due'                        => 'بڕی پارە کە دەبێ بدرێت',
+    'amount_due_not_covered'            => 'پارەدانەکان بڕی پێویست دانپۆشین نەکردووە.',
+    'amount_tendered'                   => 'بڕی پێشکەشکراو',
+    'authorized_signature'              => 'واژۆی ڕێگەپێدراو',
+    'cancel_sale'                       => 'هەڵوەشاندنەوە',
+    'cash'                              => 'پارەی نەختینە',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'ڕێکخستنی پارەی نەختینە',
+    'cash_deposit'                      => 'پارەی نەختینەی دانراو',
+    'cash_filter'                       => 'نەختینە',
+    'change_due'                        => 'ئەو گۆڕانکارییانەی دەبێت بکرێت',
+    'change_price'                      => 'گۆڕینی نرخی فرۆشتن',
+    'check'                             => 'چەکی پارە',
+    'check_balance'                     => 'پاشماوەی چەکی پارە',
+    'check_filter'                      => 'چەکی پارە',
+    'close'                             => '',
+    'comment'                           => 'سەرنج',
+    'comments'                          => 'سەرنجەکان',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'تەواو',
+    'confirm_cancel_sale'               => 'دڵنیایت دەتەوێت ئەم فرۆشتنە بسڕیتەوە؟ هەموو کاڵاکان دەسڕێنەوە.',
+    'confirm_delete'                    => 'ئایا دڵنیای کە دەتەوێت فرۆشتنە هەڵبژێردراوەکان بسڕیتەوە؟',
+    'confirm_restore'                   => 'ئایا دڵنیای کە دەتەوێت فرۆشتنە هەڵبژێردراوەکان بگەڕێنیتەوە؟',
+    'credit'                            => 'کارتی کرێدت',
+    'credit_deposit'                    => 'دانانی کرێدت',
+    'credit_filter'                     => 'کارتی کرێدت',
+    'current_table'                     => '',
+    'customer'                          => 'کڕیار',
+    'customer_address'                  => 'ناونیشان',
+    'customer_discount'                 => 'داشکاندن',
+    'customer_email'                    => 'ئیمەیڵ',
+    'customer_location'                 => 'ناونیشان',
+    'customer_mailchimp_status'         => 'دۆخی بەکارهێنان مایلچیمپ',
+    'customer_optional'                 => '(پێویستە بۆئەو پارانەی دەبێت بدرێت)',
+    'customer_required'                 => '(پێویستە)',
+    'customer_total'                    => 'کۆی گشتی',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'خاڵە بەردەستەکان',
+    'daily_sales'                       => '',
+    'date'                              => 'بەرواری فرۆشتن',
+    'date_range'                        => 'مەودای بەروار',
+    'date_required'                     => 'دەبێت بەروارێکی دروست داخڵ بکرێت.',
+    'date_type'                         => 'بەروار خانەیەکی پێویستە.',
+    'debit'                             => 'کارتی دێبت',
+    'debit_filter'                      => '',
+    'delete'                            => 'ڕێگە بدە بە سڕینەوە',
+    'delete_confirmation'               => 'دڵنیای کە دەتەوێت ئەم فرۆشتنە بسڕیتەوە؟ ئەم کارە ناتوانرێت پووچەڵ بکرێتەوە.',
+    'delete_entire_sale'                => 'هەموو فرۆشتنەکە بسڕەوە',
+    'delete_successful'                 => 'سڕینەوەی فرۆشتن سەرکەوتوو بوو.',
+    'delete_unsuccessful'               => 'سڕینەوەی فرۆشتن شکستی هێنا.',
+    'description_abbrv'                 => 'وەسف.',
+    'discard'                           => 'ڕەتکردنەوە',
+    'discard_quote'                     => '',
+    'discount'                          => 'داشکاندن',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% داشکاندن',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'ئەو بڕەی پێویستە بدرێت',
+    'due_filter'                        => 'ئەو بڕەی پێویستە بدرێت',
+    'edit'                              => 'دەستکاری',
+    'edit_item'                         => 'دەستکاریکردنی ئایتم',
+    'edit_sale'                         => 'دەستکاریکردنی فرۆشتن',
+    'email_receipt'                     => 'وەسڵی ئیمەیڵ',
+    'employee'                          => 'فەرمانبەر',
+    'entry'                             => 'تۆمار',
+    'error_editing_item'                => 'هەڵە لە دەستکاریکردنی ئایتم',
+    'find_or_scan_item'                 => 'دۆزینەوە یان سکانکردنی ئایتم',
+    'find_or_scan_item_or_receipt'      => 'دۆزینەوە یان سکانکردنی ئایتم یان پسوڵە',
+    'giftcard'                          => 'کارتی دیاری',
+    'giftcard_balance'                  => 'باڵانسی کارتی دیاری',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'ژمارەی کارتی دیاری',
+    'group_by_category'                 => 'گروپ بەپێی پۆلێن',
+    'group_by_type'                     => 'گروپ بەپێی جۆر',
+    'hsn'                               => 'کۆدی سیستەمی هارمونیزە',
+    'id'                                => 'ناسنامەی فرۆشتن',
+    'include_prices'                    => 'نرخەکان لەخۆ بگرێت؟',
+    'insufficient_giftcard_balance'     => 'بێ لە پاقسەی فریوی تیکۆ بۆ ئەم دانە گوڕانکاری.',
+    'insufficient_reward_points'        => 'نقاط المكافأة غير كافية لهذه الدفعة.',
+    'invoice'                           => 'فاکتۆرە',
+    'invoice_confirm'                   => 'ئەم فاکتورەیە دەنێردرێت بۆ',
+    'invoice_enable'                    => 'ژمارەی فاکتورە',
+    'invoice_filter'                    => 'فاکتۆرەکان',
+    'invoice_no_email'                  => 'ئەم کڕیارە ناونیشانی ئیمەیڵی دروستی نییە.',
+    'invoice_number'                    => 'فاکتورە #',
+    'invoice_number_duplicate'          => 'ژمارەی فاکتورە {0} دەبێت تایبەت بێت.',
+    'invoice_sent'                      => 'فاکتورە نێردراوە بۆ',
+    'invoice_total'                     => 'کۆی گشتی فاکتورە',
+    'invoice_type_custom_invoice'       => 'فاکتورەی تایبەت (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'فاکتورەی باجی تایبەتمەند (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'فاکتورە (invoice.php)',
+    'invoice_type_tax_invoice'          => 'فاکتورەی باج (tax_invoice.php)',
+    'invoice_unsent'                    => 'فاکتورە نەتوانرا بنێردریت بۆ',
+    'invoice_update'                    => 'ژماردنەوەی دووبارە',
+    'item_insufficient_of_stock'        => 'ئایتمەکە بڕی پێویستی نییە لە کۆگا.',
+    'item_name'                         => 'ناوی ئایتم',
+    'item_number'                       => 'ئایتم #',
+    'item_out_of_stock'                 => 'ئایتم لە کۆگادا تەواو بووە.',
+    'key_browser'                       => 'کورتە ڕێگای یارمەتیدەر',
+    'key_cancel'                        => 'هەڵوەشاندنەوەی دەرخستەی نرخ/فاکتورە/فرۆشتن',
+    'key_customer_search'               => 'گەڕان بەدوای کڕیاردا',
+    'key_finish_quote'                  => 'تەواوکردنی دەرخستەی نرخ/فاکتورە بەبێ پارەدان',
+    'key_finish_sale'                   => 'زیادکردنی پارەدان و تەواوکردنی فاکتورە/فرۆشتن',
+    'key_full'                          => 'لە دۆخی تەواوی شاشەدا بیکەرەوە',
+    'key_function'                      => 'فرمان',
+    'key_help'                          => 'کورتە ڕێگاکان',
+    'key_help_modal'                    => 'پەنجەرەی کورتە ڕێگاکان بکەرەوە',
+    'key_in'                            => 'نزیک کردنەوە',
+    'key_item_search'                   => 'گەڕان بەدوای ئایتم',
+    'key_out'                           => 'دوورخستنەوە',
+    'key_payment'                       => 'زیادکردنی پارەدان',
+    'key_print'                         => 'لاپەڕەی ئێستا چاپ بکە',
+    'key_restore'                       => 'گەڕاندنەوەی پیشاندانی ئەسڵی/زووم',
+    'key_search'                        => 'خشتەکانی ڕاپۆرتەکانی گەڕان',
+    'key_suspend'                       => 'فرۆشتنی ئێستا ڕابگرە',
+    'key_suspended'                     => 'فرۆشتنی ڕاگیراو پیشان بدە',
+    'key_system'                        => 'کورتە ڕێگاکانی سیستەم',
+    'key_tendered'                      => 'دەسکاریکردنی بڕی پێشکەشکراو',
+    'key_title'                         => 'کورتە ڕێگاکانی تەختەکلیلی فرۆشتن',
+    'mc'                                => '',
+    'mode'                              => 'دۆخی تۆمارکردن',
+    'must_enter_numeric'                => 'بڕی پێشکەشکراو دەبێت ژمارەیەک بێت.',
+    'must_enter_numeric_giftcard'       => 'ژمارەی کارتی دیاری دەبێت ژمارەیەک بێت.',
+    'must_enter_reference_code'         => 'ژمارەی مەرجع/وەرگرتن دەبێت بنووسرێت.',
+    'negative_amount_tendered'          => 'بڕی پێشکەشکراو ناتوانێت نەرێنی بێت.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'کڕیاری نوێ',
+    'new_item'                          => 'ئایتمی نوێ',
+    'no_description'                    => 'هیچ وەسفێک نییە',
+    'no_filter'                         => 'هەموو',
+    'no_items_in_cart'                  => 'هیچ ئایتمێک لە عەرەبانەکەدا نییە.',
+    'no_sales_to_display'               => 'هیچ فرۆشتنێک نییە بۆ پیشاندان.',
+    'none_selected'                     => 'تۆ هیچ فرۆشتنێکت هەڵنەبژاردووە بۆ سڕینەوە.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'ئەم کارە ڕێگەپێدراو نییە.',
+    'one_or_multiple'                   => 'فرۆشتن(ەکان)',
+    'payment'                           => 'جۆری پارەدان',
+    'payment_amount'                    => 'بڕ',
+    'payment_not_cover_total'           => 'بڕی پارەدان دەبێت زیاتر بێت یان یەکسان بێت بە کۆی گشتی.',
+    'payment_type'                      => 'جۆر',
+    'payments'                          => '',
+    'payments_total'                    => 'کۆی پارەدانەکان',
+    'price'                             => 'نرخ',
+    'print_after_sale'                  => 'چاپکردن دوای فرۆشتن',
+    'quantity'                          => 'بڕ',
+    'quantity_less_than_reorder_level'  => 'ئاگاداری: بڕی خوازراو لە خوار ئاستی پێویستەوەیە بۆ ئەو ئایتمە.',
+    'quantity_less_than_zero'           => 'ئاگاداری: بڕی خوازراو بەس نییە. هێشتا دەتوانیت فرۆشتنەکە پڕۆسێس بکەیت، بەڵام دەبێت وردبینی بۆ کۆگاکەت بکەیت.',
+    'quantity_of_items'                 => 'بڕی {0} ئایتم',
+    'quote'                             => 'دەرخستەی نرخ',
+    'quote_number'                      => 'ژمارەی دەرخستەی نرخ',
+    'quote_number_duplicate'            => 'ژمارەی دەرخستەی نرخ دەبێت تایبەت بێت.',
+    'quote_sent'                        => 'دەرخستەی نرخ نێردرا بۆ',
+    'quote_unsent'                      => 'دەرخستەی نرخ شکستی هێنا لە ناردنی بۆ',
+    'receipt'                           => 'پسوڵەی فرۆشتن',
+    'receipt_no_email'                  => 'ئەم کڕیارە ناونیشانی ئیمەیڵی دروستی نییە.',
+    'receipt_number'                    => 'فرۆشتن #',
+    'receipt_sent'                      => 'پسوڵەی نێردرا بۆ',
+    'receipt_unsent'                    => 'پسوڵەکە شکستی هێنا لە ناردنی بۆ',
+    'reference_code'                    => 'کۆدی مەرجعی پارەدان',
+    'reference_code_invalid_characters' => 'کۆدی مەرجع دەبێت تەنها پیت و ژمارە لەخۆ بگرێت.',
+    'reference_code_length_error'       => 'درێژی کۆدی مەرجع دروست نییە.',
+    'refund'                            => 'جۆری گەڕاندنەوەی پارە',
+    'register'                          => 'تۆماری فرۆشتن',
+    'remove_customer'                   => 'لابردنی کڕیار',
+    'remove_discount'                   => '',
+    'return'                            => 'گەڕانەوە',
+    'rewards'                           => 'خاڵەکانی پاداشت',
+    'rewards_balance'                   => 'باڵانسی خاڵەکانی پاداشت',
+    'rewards_package'                   => 'پاداشتەکان',
+    'rewards_remaining_balance'         => 'بەهای پاداشتی خاڵە ماووەکان بریتییە لە ',
+    'sale'                              => 'فرۆشتن',
+    'sale_by_invoice'                   => 'فرۆشتن بە فاکتورە',
+    'sale_for_customer'                 => 'کڕیار:',
+    'sale_time'                         => 'کات',
+    'sales_tax'                         => 'باجی فرۆشتن',
+    'sales_total'                       => '',
+    'select_customer'                   => 'کڕیار هەڵبژێرە',
+    'selected_customer'                 => 'کڕیاری هەڵبژێردراو',
+    'send_invoice'                      => 'فاکتورە بنێرە',
+    'send_quote'                        => 'دەرخستەی نرخ بنێرە',
+    'send_receipt'                      => 'پسوڵە بنێرە',
+    'send_work_order'                   => 'داواکاری کار بنێرە',
+    'serial'                            => 'زنجیرەیی',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'فاکتورە پیشان بدە',
+    'show_receipt'                      => 'فاکتورە پیشان بدە',
+    'start_typing_customer_name'        => 'دەست بکە بە نووسینی وردەکارییەکانی کڕیار...',
+    'start_typing_item_name'            => 'دەست بکە بە نووسینی ناوی ئایتم یان بارکۆد سکان بکە...',
+    'stock'                             => 'کۆگا',
+    'stock_location'                    => 'ناونیشانی کۆگا',
+    'sub_total'                         => 'کۆی سەرەتایی',
+    'successfully_deleted'              => 'بەسەرکەوتوویی سڕیتەوە',
+    'successfully_restored'             => 'بەسەرکەوتوویی گەڕاندتەوە',
+    'successfully_suspended_sale'       => 'فرۆشتن بەسەرکەوتوویی راگیرا.',
+    'successfully_updated'              => 'فرۆشتن بەسەرکەوتوویی تازەکرایەوە.',
+    'suspend_sale'                      => 'ڕاگرتن',
+    'suspended_doc_id'                  => 'بەڵگەنامە',
+    'suspended_sale_id'                 => 'ناسنامە',
+    'suspended_sales'                   => 'ڕاگیرا',
+    'table'                             => 'مێز',
+    'takings'                           => 'فرۆشتنی ڕۆژانە',
+    'tax'                               => 'باج',
+    'tax_id'                            => 'ناسنامەی باج',
+    'tax_invoice'                       => 'فاکتورەی باج',
+    'tax_percent'                       => 'باج %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'گشتی',
+    'total_tax_exclusive'               => 'باج لەخۆناگرێت',
+    'transaction_failed'                => 'مامەڵەی فرۆشتن شکستی هێنا.',
+    'unable_to_add_item'                => 'زیادکردنی ئایتم بۆ فرۆشتن شکستی هێنا',
+    'unsuccessfully_deleted'            => 'سڕینەوەی فرۆشتن(ەکان) شکستی هێنا.',
+    'unsuccessfully_restored'           => 'گەڕاندنەوەی فرۆشتن(ەکان) شکستی هێنا.',
+    'unsuccessfully_suspended_sale'     => 'ڕاگرتنی فرۆشتن شکستی هێنا.',
+    'unsuccessfully_updated'            => 'نوێکردنەوەی فرۆشتن شکستی هێنا.',
+    'unsuspend'                         => 'ڕاگرتن هەڵبوەشێنەوە',
+    'unsuspend_and_delete'              => 'کردار',
+    'update'                            => 'نوێکردنەوە',
+    'upi'                               => 'UPI (سیستەمی پارەدان بەهۆکاری یەکگرتوو)',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'داواکاری کار',
+    'work_order_number'                 => 'ژامرەی داواکاری کار',
+    'work_order_number_duplicate'       => 'ژمارەی داواکاری کار دەبێت تایبەت بێت.',
+    'work_order_sent'                   => 'داواکاری کار نێردرا بۆ',
+    'work_order_unsent'                 => 'داواکاری کار شکستی هێنا لە ناردنی بۆ',
 ];
diff --git a/app/Language/cs/Attributes.php b/app/Language/cs/Attributes.php
index 093e018ab..8af0b2289 100644
--- a/app/Language/cs/Attributes.php
+++ b/app/Language/cs/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "definition_cannot_be_deleted"     => "",
-    "definition_error_adding_updating" => "",
-    "definition_flags"                 => "",
-    "definition_group"                 => "",
-    "definition_id"                    => "",
-    "definition_name"                  => "",
-    "definition_name_required"         => "",
-    "definition_one_or_multiple"       => "",
-    "definition_successful_adding"     => "",
-    "definition_successful_deleted"    => "",
-    "definition_successful_updating"   => "",
-    "definition_type"                  => "",
-    "definition_type_required"         => "",
-    "definition_unit"                  => "",
-    "definition_values"                => "",
-    "new"                              => "",
-    "no_attributes_to_display"         => "",
-    "receipt_visibility"               => "",
-    "show_in_items"                    => "",
-    "show_in_items_visibility"         => "",
-    "show_in_receipt"                  => "",
-    "show_in_receivings"               => "",
-    "show_in_receivings_visibility"    => "",
-    "show_in_sales"                    => "",
-    "show_in_sales_visibility"         => "",
-    "update"                           => "",
+    'attribute_value_invalid_chars'    => '',
+    'confirm_delete'                   => '',
+    'confirm_restore'                  => '',
+    'definition_cannot_be_deleted'     => '',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => '',
+    'definition_flags'                 => '',
+    'definition_group'                 => '',
+    'definition_id'                    => '',
+    'definition_name'                  => '',
+    'definition_name_required'         => '',
+    'definition_one_or_multiple'       => '',
+    'definition_successful_adding'     => '',
+    'definition_successful_deleted'    => '',
+    'definition_successful_updating'   => '',
+    'definition_type'                  => '',
+    'definition_type_required'         => '',
+    'definition_unit'                  => '',
+    'definition_values'                => '',
+    'new'                              => '',
+    'no_attributes_to_display'         => '',
+    'receipt_visibility'               => '',
+    'show_in_items'                    => '',
+    'show_in_items_visibility'         => '',
+    'show_in_receipt'                  => '',
+    'show_in_receivings'               => '',
+    'show_in_receivings_visibility'    => '',
+    'show_in_sales'                    => '',
+    'show_in_sales_visibility'         => '',
+    'show_in_search'                   => 'Zobrazit ve vyhledávání',
+    'show_in_search_visibility'        => 'Vyhledávání',
+    'update'                           => '',
 ];
diff --git a/app/Language/cs/Bootstrap_tables.php b/app/Language/cs/Bootstrap_tables.php
index 39863833e..776144c35 100644
--- a/app/Language/cs/Bootstrap_tables.php
+++ b/app/Language/cs/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Vše",
-    "columns"              => "Sloupce",
-    "hide_show_pagination" => "Zobrazit/skrýt stránkování",
-    "loading"              => "Nahrávám, prosím počkejte...",
-    "page_from_to"         => "Zobrazeno {0} až {1} z {2} řádků",
-    "refresh"              => "Obnovit",
-    "rows_per_page"        => "{0} řádků na stránku",
-    "toggle"               => "Přepnout",
+    'all' => "Vše",
+    'columns' => "Sloupce",
+    'hide_show_pagination' => "Zobrazit/skrýt stránkování",
+    'loading' => "Nahrávám, prosím počkejte",
+    'page_from_to' => "Zobrazeno {0} až {1} z {2} řádků",
+    'refresh' => "Obnovit",
+    'rows_per_page' => "{0} řádků na stránku",
+    'toggle' => "Přepnout",
 ];
diff --git a/app/Language/cs/Config.php b/app/Language/cs/Config.php
index 5359ec4b0..8f92eae0e 100644
--- a/app/Language/cs/Config.php
+++ b/app/Language/cs/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adresa společnosti",
-    "address_required"                          => "",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => 'Adresa společnosti',
+    'address_required'                          => '',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'Referenční kód platby<br>Omezení délky',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Neplatná cesta k sendmailu. Povolena jsou pouze písmena, číslice, pomlčky, podtržítka, lomítka, zpětná lomítka, dvojtečky, mezery a tečky.',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/cs/Employees.php b/app/Language/cs/Employees.php
index 34a418062..8ac03593f 100644
--- a/app/Language/cs/Employees.php
+++ b/app/Language/cs/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'Nemůžete odebrat svá vlastní minimální oprávnění pro přístup k modulům.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'Změny oprávnění jsou v tomto demonu zakázány.',
+    'error_password_change_disallowed'       => 'Změny hesla jsou v tomto demonu zakázány.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/cs/Error.php b/app/Language/cs/Error.php
index 64ebe1e41..8693db278 100644
--- a/app/Language/cs/Error.php
+++ b/app/Language/cs/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "",
-    "unknown"              => "",
+    'no_permission_module'           => 'Nemáte oprávnění přistupovat k modulu s názvem',
+    'unable_to_create_env_file'      => 'Nelze vytvořit {filePath} pro zajištění throttle.key',
+    'unable_to_lock_file'            => 'Nelze uzamknout {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Nelze otevřít {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Nelze trvale uložit throttle.key do {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Nelze přečíst {filePath} pro zajištění throttle.key',
+    'unknown'                        => 'Neočekávaná chyba',
 ];
diff --git a/app/Language/cs/Items.php b/app/Language/cs/Items.php
index 8fa27d1fc..ac6f1e4fc 100644
--- a/app/Language/cs/Items.php
+++ b/app/Language/cs/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Změna množství.",
-    "allow_alt_description"              => "Povolit alternativní popis",
-    "amount_entry"                       => "Množství",
-    "bulk_edit"                          => "Hromadná editace",
-    "buy_price_required"                 => "Je nutno zadat nákupní cenu.",
-    "cannot_be_deleted"                  => "Nelze smazat vybrané pokožky protože již mají záznamy o prodeji.",
-    "cannot_find_item"                   => "Položka nenalezena.",
-    "categories"                         => "",
-    "category"                           => "Kategorie",
-    "category_new"                       => "",
-    "category_required"                  => "Je nutno zadat kategorii.",
-    "change_all_to_allow_alt_desc"       => "Povolit pro všechny alternativní popis.",
-    "change_all_to_not_allow_allow_desc" => "Nepovolit alternativní popis pro všechny.",
-    "change_all_to_serialized"           => "Upravit vše na položky se sériovým číslem",
-    "change_all_to_unserialized"         => "Upravit vše na položky bez sériového čísla",
-    "change_image"                       => "Změnit obrázek",
-    "confirm_bulk_edit"                  => "Opravdu chcete upravit vybrané položky?",
-    "confirm_bulk_edit_wipe_taxes"       => "Všechny záznamy o daních u položky budou nahrazeny.",
-    "confirm_delete"                     => "Opravdu chcete smazat vybrané položky?",
-    "confirm_restore"                    => "Opravdu chcete obnovit vybrané položky?",
-    "cost_price"                         => "Nákupní cena",
-    "cost_price_number"                  => "Nákupní cena musí být číslo.",
-    "cost_price_required"                => "Musíte zadat nákupní cenu.",
-    "count"                              => "Upravit množství",
-    "csv_import_failed"                  => "Import z CSVu se nepovedl",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Nahraný soubor neobsahuje žádná data nebo má špatný formát.",
-    "csv_import_partially_failed"        => "Při importu položek došlo k několika chybám:",
-    "csv_import_success"                 => "Import položek proběhl bez chyby.",
-    "current_quantity"                   => "Množství skladem",
-    "default_pack_name"                  => "",
-    "description"                        => "Popis",
-    "details_count"                      => "Další informace o množství na skladě",
-    "do_nothing"                         => "Nedělat nic",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "Úpravy více položek",
-    "empty_upc_items"                    => "Položky bez čárového kódu",
-    "error_adding_updating"              => "Chyba při přidávání či úpravě položek",
-    "error_updating_multiple"            => "Chyba při úpravě položek",
-    "generate_barcodes"                  => "Vytvořit čárový kód",
-    "hsn_code"                           => "",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Import položek z CSVu",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Komentář",
-    "inventory_data_tracking"            => "Pohyby na skladu",
-    "inventory_date"                     => "Datum",
-    "inventory_employee"                 => "Uživatel",
-    "inventory_in_out_quantity"          => "Změna ks",
-    "inventory_remarks"                  => "Poznámky",
-    "is_deleted"                         => "Smazáno",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Položka má sériové číslo",
-    "item"                               => "Položka",
-    "item_id"                            => "",
-    "item_number"                        => "Čárový kód",
-    "item_number_duplicate"              => "Položka už je v databázi.",
-    "kit"                                => "Sada",
-    "location"                           => "Umístění",
-    "low_inventory_items"                => "Položky co nejsou skladem",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "Ruční úprava množství",
-    "markup"                             => "",
-    "name"                               => "Název položky",
-    "name_required"                      => "Musíte zadat název položky.",
-    "new"                                => "Nová položka",
-    "no_description_items"               => "Položky bez popisu",
-    "no_items_to_display"                => "Žádné položky k zobrazení.",
-    "none"                               => "Žádný",
-    "none_selected"                      => "",
-    "nonstock"                           => "Neskladová",
-    "number_information"                 => "Číslo položky",
-    "number_required"                    => "Musíte zadat čárový kód.",
-    "one_or_multiple"                    => "Položky",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "Množství",
-    "quantity_number"                    => "Množství musí být číslo.",
-    "quantity_required"                  => "Musíte zadat množství.",
-    "receiving_quantity"                 => "Kusů přijato",
-    "remove_image"                       => "Odstranit obrázek",
-    "reorder_level"                      => "Množství pro další objednávku",
-    "reorder_level_number"               => "Množství pro další objednávku musí být číslo.",
-    "reorder_level_required"             => "Musíte zadat množství pro další objednávku.",
-    "retrive_item_info"                  => "Získat informace o položce",
-    "sales_tax_1"                        => "DPH",
-    "sales_tax_2"                        => "DPH 2",
-    "search_attributes"                  => "",
-    "select_image"                       => "Vybrat obrázek",
-    "serialized_items"                   => "Položky se sériovým číslem",
-    "standard"                           => "Běžná",
-    "stock"                              => "Skladová",
-    "stock_location"                     => "Umístění skladu",
-    "stock_type"                         => "Druh evidence",
-    "successful_adding"                  => "Položka byla úspěšně přidána",
-    "successful_bulk_edit"               => "Položka byla úspěšně upravena",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "Položka byla upravena",
-    "supplier"                           => "Dodavatel",
-    "tax_1"                              => "DPH základní",
-    "tax_2"                              => "DPH snížená",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "Sazba (procenta)",
-    "tax_percent_number"                 => "Sazba daně musí být číslo",
-    "tax_percent_required"               => "Musíte zadat sazbu daně.",
-    "tax_percents"                       => "Sazba daně",
-    "temp"                               => "",
-    "type"                               => "Typ položky",
-    "unit_price"                         => "Koncová cena (vč. DPH)",
-    "unit_price_number"                  => "Cena musí být číslo.",
-    "unit_price_required"                => "Musíte zadat koncovou cenu.",
-    "upc_database"                       => "Databáze čárových kódů",
-    "update"                             => "Upravit položku",
-    "use_inventory_menu"                 => "Použít nabídku Sklad",
+    'add_minus'                          => 'Změna množství.',
+    'allow_alt_description'              => 'Povolit alternativní popis',
+    'amount_entry'                       => 'Množství',
+    'bulk_edit'                          => 'Hromadná editace',
+    'buy_price_required'                 => 'Je nutno zadat nákupní cenu.',
+    'cannot_be_deleted'                  => 'Nelze smazat vybrané pokožky protože již mají záznamy o prodeji.',
+    'cannot_find_item'                   => 'Položka nenalezena.',
+    'categories'                         => '',
+    'category'                           => 'Kategorie',
+    'category_new'                       => '',
+    'category_required'                  => 'Je nutno zadat kategorii.',
+    'change_all_to_allow_alt_desc'       => 'Povolit pro všechny alternativní popis.',
+    'change_all_to_not_allow_allow_desc' => 'Nepovolit alternativní popis pro všechny.',
+    'change_all_to_serialized'           => 'Upravit vše na položky se sériovým číslem',
+    'change_all_to_unserialized'         => 'Upravit vše na položky bez sériového čísla',
+    'change_image'                       => 'Změnit obrázek',
+    'confirm_bulk_edit'                  => 'Opravdu chcete upravit vybrané položky?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Všechny záznamy o daních u položky budou nahrazeny.',
+    'confirm_delete'                     => 'Opravdu chcete smazat vybrané položky?',
+    'confirm_restore'                    => 'Opravdu chcete obnovit vybrané položky?',
+    'cost_price'                         => 'Nákupní cena',
+    'cost_price_number'                  => 'Nákupní cena musí být číslo.',
+    'cost_price_required'                => 'Musíte zadat nákupní cenu.',
+    'count'                              => 'Upravit množství',
+    'csv_import_failed'                  => 'Import z CSVu se nepovedl',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Nahraný soubor neobsahuje žádná data nebo má špatný formát.',
+    'csv_import_partially_failed'        => 'Při importu položek došlo k několika chybám:',
+    'csv_import_success'                 => 'Import položek proběhl bez chyby.',
+    'current_quantity'                   => 'Množství skladem',
+    'default_pack_name'                  => '',
+    'description'                        => 'Popis',
+    'details_count'                      => 'Další informace o množství na skladě',
+    'do_nothing'                         => 'Nedělat nic',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => 'Úpravy více položek',
+    'empty_upc_items'                    => 'Položky bez čárového kódu',
+    'error_adding_updating'              => 'Chyba při přidávání či úpravě položek',
+    'error_updating_multiple'            => 'Chyba při úpravě položek',
+    'generate_barcodes'                  => 'Vytvořit čárový kód',
+    'hsn_code'                           => '',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Import položek z CSVu',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Komentář',
+    'inventory_data_tracking'            => 'Pohyby na skladu',
+    'inventory_date'                     => 'Datum',
+    'inventory_employee'                 => 'Uživatel',
+    'inventory_in_out_quantity'          => 'Změna ks',
+    'inventory_remarks'                  => 'Poznámky',
+    'is_deleted'                         => 'Smazáno',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Položka má sériové číslo',
+    'item'                               => 'Položka',
+    'item_id'                            => '',
+    'item_number'                        => 'Čárový kód',
+    'item_number_duplicate'              => 'Položka už je v databázi.',
+    'item_number_invalid'                => 'Číslo položky obsahuje nepovolené znaky.',
+    'kit'                                => 'Sada',
+    'location'                           => 'Umístění',
+    'low_inventory_items'                => 'Položky co nejsou skladem',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => 'Ruční úprava množství',
+    'markup'                             => '',
+    'name'                               => 'Název položky',
+    'name_required'                      => 'Musíte zadat název položky.',
+    'new'                                => 'Nová položka',
+    'no_description_items'               => 'Položky bez popisu',
+    'no_items_to_display'                => 'Žádné položky k zobrazení.',
+    'none'                               => 'Žádný',
+    'none_selected'                      => '',
+    'nonstock'                           => 'Neskladová',
+    'number_information'                 => 'Číslo položky',
+    'number_required'                    => 'Musíte zadat čárový kód.',
+    'one_or_multiple'                    => 'Položky',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => 'Množství',
+    'quantity_number'                    => 'Množství musí být číslo.',
+    'quantity_required'                  => 'Musíte zadat množství.',
+    'receiving_quantity'                 => 'Kusů přijato',
+    'remove_image'                       => 'Odstranit obrázek',
+    'reorder_level'                      => 'Množství pro další objednávku',
+    'reorder_level_number'               => 'Množství pro další objednávku musí být číslo.',
+    'reorder_level_required'             => 'Musíte zadat množství pro další objednávku.',
+    'retrive_item_info'                  => 'Získat informace o položce',
+    'sales_tax_1'                        => 'DPH',
+    'sales_tax_2'                        => 'DPH 2',
+    'search_attributes'                  => '',
+    'select_image'                       => 'Vybrat obrázek',
+    'serialized_items'                   => 'Položky se sériovým číslem',
+    'standard'                           => 'Běžná',
+    'stock'                              => 'Skladová',
+    'stock_location'                     => 'Umístění skladu',
+    'stock_type'                         => 'Druh evidence',
+    'successful_adding'                  => 'Položka byla úspěšně přidána',
+    'successful_bulk_edit'               => 'Položka byla úspěšně upravena',
+    'successful_deleted'                 => '',
+    'successful_updating'                => 'Položka byla upravena',
+    'supplier'                           => 'Dodavatel',
+    'tax_1'                              => 'DPH základní',
+    'tax_2'                              => 'DPH snížená',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Název daně obsahuje nepovolené znaky.',
+    'tax_percent'                        => 'Sazba (procenta)',
+    'tax_percent_number'                 => 'Sazba daně musí být číslo',
+    'tax_percent_required'               => 'Musíte zadat sazbu daně.',
+    'tax_percents'                       => 'Sazba daně',
+    'temp'                               => '',
+    'type'                               => 'Typ položky',
+    'unit_price'                         => 'Koncová cena (vč. DPH)',
+    'unit_price_number'                  => 'Cena musí být číslo.',
+    'unit_price_required'                => 'Musíte zadat koncovou cenu.',
+    'upc_database'                       => 'Databáze čárových kódů',
+    'update'                             => 'Upravit položku',
+    'use_inventory_menu'                 => 'Použít nabídku Sklad',
 ];
diff --git a/app/Language/cs/Login.php b/app/Language/cs/Login.php
index 0ecd8cdfa..70865477a 100644
--- a/app/Language/cs/Login.php
+++ b/app/Language/cs/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Nejsem robot.",
-    "go"                            => "Přihlásit",
-    "invalid_gcaptcha"              => "Špatné zadání.",
-    "invalid_installation"          => "Instalace není v pořádku, zkontrolujte soubor php.ini.",
-    "invalid_username_and_password" => "Neplatné jméno nebo heslo.",
-    "login"                         => "Login",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Heslo",
-    "required_username"             => "",
-    "username"                      => "Uživatelské jméno",
-    "welcome"                       => "",
+    "gcaptcha"                            => "Nejsem robot.",
+    "go"                                  => "Přihlásit",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Špatné zadání.",
+    "invalid_installation"                => "Instalace není v pořádku, zkontrolujte soubor php.ini.",
+    "invalid_username_and_password"       => "Neplatné jméno nebo heslo.",
+    "login"                               => "Login",
+    "logout"                              => "",
+    "migrating_database"                  => "Migrace databáze",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Databáze byla úspěšně migrována!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Heslo",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Příliš mnoho pokusů. Počkejte chvíli a zkuste to znovu.',
+    "username"                            => "Uživatelské jméno",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/cs/Reports.php b/app/Language/cs/Reports.php
index 21f5c3157..3bc924d36 100644
--- a/app/Language/cs/Reports.php
+++ b/app/Language/cs/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "Daně",
     "taxes_summary_report"                    => "Přehled podle DPH",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Celkem",
     "total_inventory_value"                   => "Celková cena skladu",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/cs/Sales.php b/app/Language/cs/Sales.php
index 623446543..916f9dd67 100644
--- a/app/Language/cs/Sales.php
+++ b/app/Language/cs/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Dostupné body",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "Přidat platbu",
-    "amount_due"                       => "K úhradě",
-    "amount_tendered"                  => "Uhrazeno",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "Zrušit",
-    "cash"                             => "Hotovost",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "Hotově",
-    "change_due"                       => "Zbývá",
-    "change_price"                     => "",
-    "check"                            => "Bankovním převodem",
-    "check_balance"                    => "",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "Komentář",
-    "comments"                         => "Komentář",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Dokončit",
-    "confirm_cancel_sale"              => "Opravdu chcete zrušit účtenku? Všechny položky budou smazány.",
-    "confirm_delete"                   => "Opravdu chcete smazat vybranou účtenku?",
-    "confirm_restore"                  => "Opravdu chcete obnovit vybranou účtenku?",
-    "credit"                           => "Kreditní karta",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Jméno",
-    "customer_address"                 => "Adresa",
-    "customer_discount"                => "Sleva",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Místo",
-    "customer_mailchimp_status"        => "Stav mailchimp",
-    "customer_optional"                => "(Volitelné)",
-    "customer_required"                => "(Vyžadováno)",
-    "customer_total"                   => "Celkem",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Datum prodeje",
-    "date_range"                       => "Rozsah data",
-    "date_required"                    => "Musí být vloženo správné datum.",
-    "date_type"                        => "Datum je nutno zadat.",
-    "debit"                            => "Debetní karta",
-    "debit_filter"                     => "",
-    "delete"                           => "Povolit mazání",
-    "delete_confirmation"              => "Opravdu chcete smazat tuto účtenku? Tato operace není vratná.",
-    "delete_entire_sale"               => "Zrušit celou účtenku",
-    "delete_successful"                => "Účtenka byla smazána.",
-    "delete_unsuccessful"              => "Účtenka nebyla smazána.",
-    "description_abbrv"                => "Položka.",
-    "discard"                          => "Zrušit",
-    "discard_quote"                    => "",
-    "discount"                         => "Sleva %",
-    "discount_included"                => "% Sleva",
-    "discount_short"                   => "%",
-    "due"                              => "",
-    "due_filter"                       => "Neuhrazeno",
-    "edit"                             => "Upravit",
-    "edit_item"                        => "Upravit položku",
-    "edit_sale"                        => "Upravit účtenku",
-    "email_receipt"                    => "Odeslat účtenku",
-    "employee"                         => "Prodávající",
-    "entry"                            => "Záznam",
-    "error_editing_item"               => "Chyba při úpravě položky",
-    "find_or_scan_item"                => "Najít nebo skenovat položku",
-    "find_or_scan_item_or_receipt"     => "Najít nebo skenovat položku či účtenku",
-    "giftcard"                         => "Dárkový poukaz",
-    "giftcard_balance"                 => "",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Číslo dárkového poukazu",
-    "group_by_category"                => "Seskupit podle kategorií",
-    "group_by_type"                    => "Seskupit podle typu",
-    "hsn"                              => "",
-    "id"                               => "Číslo dokladu",
-    "include_prices"                   => "",
-    "invoice"                          => "Faktura",
-    "invoice_confirm"                  => "Tato faktura bude odeslána",
-    "invoice_enable"                   => "Vytvořit fakturu",
-    "invoice_filter"                   => "Faktury",
-    "invoice_no_email"                 => "Zákazníl nemá platný e-mail.",
-    "invoice_number"                   => "Faktura č",
-    "invoice_number_duplicate"         => "Číslo faktury musí být jedinečné.",
-    "invoice_sent"                     => "Faktura odeslána",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "Fakturu se nepodařilo odeslat",
-    "invoice_update"                   => "Přepočítat",
-    "item_insufficient_of_stock"       => "Není dostatek kusů na skladě.",
-    "item_name"                        => "Název položky",
-    "item_number"                      => "Číslo položky",
-    "item_out_of_stock"                => "Položka není skladem.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Typ dokladu",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "Číslo dárkového poukazu musí být číslo.",
-    "new_customer"                     => "Nový zákazník",
-    "new_item"                         => "Nová položka",
-    "no_description"                   => "Žádný",
-    "no_filter"                        => "Vše",
-    "no_items_in_cart"                 => "Nejsou zde žádné položky.",
-    "no_sales_to_display"              => "Žádné účtenky k zobrazení.",
-    "none_selected"                    => "Nebylo nic vybráno ke smazání.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "Tato akce nebyla povolena.",
-    "one_or_multiple"                  => "",
-    "payment"                          => "Způsob platby",
-    "payment_amount"                   => "Částka",
-    "payment_not_cover_total"          => "Zaplacená částka musí být stejná nebo větší než celková částka.",
-    "payment_type"                     => "Typ",
-    "payments"                         => "",
-    "payments_total"                   => "Uhrazeno",
-    "price"                            => "Cena",
-    "print_after_sale"                 => "Vytisknout automaticky",
-    "quantity"                         => "ks",
-    "quantity_less_than_reorder_level" => "Upozornění: Množství zboží je pod nastavenou úrovní pro doobjednání.",
-    "quantity_less_than_zero"          => "Pozor: Není dostatek zboží. Můžete pokračovat v prodeji, ale zkontrolujte si stav skladu.",
-    "quantity_of_items"                => "Množství položek {0}",
-    "quote"                            => "Nabídka",
-    "quote_number"                     => "Číslo nabídky",
-    "quote_number_duplicate"           => "Číslo nabídky musí být jedinečné.",
-    "quote_sent"                       => "Nabidku odeslat",
-    "quote_unsent"                     => "Nabídku odeslat",
-    "receipt"                          => "Účtenka",
-    "receipt_no_email"                 => "Zákazníl nemá platný e-mail.",
-    "receipt_number"                   => "Číslo dokladu",
-    "receipt_sent"                     => "Účtenku odeslat",
-    "receipt_unsent"                   => "Účtenku nelze odeslat",
-    "refund"                           => "",
-    "register"                         => "Pokladna",
-    "remove_customer"                  => "Odebrat zákazníka",
-    "remove_discount"                  => "",
-    "return"                           => "Vratka",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "Zákazník:",
-    "sale_time"                        => "Čas",
-    "sales_tax"                        => "DPH",
-    "sales_total"                      => "",
-    "select_customer"                  => "Vyberte zákazníka",
-    "send_invoice"                     => "Odeslat fakturu",
-    "send_quote"                       => "Odeslat nabídku",
-    "send_receipt"                     => "Odeslat účtenku",
-    "send_work_order"                  => "",
-    "serial"                           => "Sériové číslo",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Zobrazit fakturu",
-    "show_receipt"                     => "Zobrazit účtenku",
-    "start_typing_customer_name"       => "Vložte podrobnosti o zákazníkovi...",
-    "start_typing_item_name"           => "Napište název položky nebo naskenujte čárový kód..",
-    "stock"                            => "Sklad",
-    "stock_location"                   => "Umístění skladu",
-    "sub_total"                        => "Bez DPH",
-    "successfully_deleted"             => "Bylo uspěšně smazáno",
-    "successfully_restored"            => "Bylo úspěšně obnoveno",
-    "successfully_suspended_sale"      => "Prodej byl úspěšně zaparkován.",
-    "successfully_updated"             => "Účtenka byla upravena.",
-    "suspend_sale"                     => "Zaparkovat",
-    "suspended_doc_id"                 => "Dokument",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Zaparkovat",
-    "table"                            => "Stůl",
-    "takings"                          => "Transakce",
-    "tax"                              => "DPH",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "DPH %",
-    "taxed_ind"                        => "",
-    "total"                            => "Celkem",
-    "total_tax_exclusive"              => "Bez DPH",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "Přidání položky se nepovedlo",
-    "unsuccessfully_deleted"           => "Účtenka nebyla smazána.",
-    "unsuccessfully_restored"          => "Účtenka nebyla obnovena.",
-    "unsuccessfully_suspended_sale"    => "Prodej se nepovedlo zaparkovat.",
-    "unsuccessfully_updated"           => "Účtenka nebyla upravena.",
-    "unsuspend"                        => "Odparkovat",
-    "unsuspend_and_delete"             => "Akce",
-    "update"                           => "Obnovit",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => 'Přidat platbu',
+    'amount_due'                        => 'K úhradě',
+    'amount_due_not_covered'            => 'Platby nepokrývají splatnou částku.',
+    'amount_tendered'                   => 'Uhrazeno',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => 'Zrušit',
+    'cash'                              => 'Hotovost',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => 'Hotově',
+    'change_due'                        => 'Zbývá',
+    'change_price'                      => '',
+    'check'                             => 'Bankovním převodem',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => 'Komentář',
+    'comments'                          => 'Komentář',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Dokončit',
+    'confirm_cancel_sale'               => 'Opravdu chcete zrušit účtenku? Všechny položky budou smazány.',
+    'confirm_delete'                    => 'Opravdu chcete smazat vybranou účtenku?',
+    'confirm_restore'                   => 'Opravdu chcete obnovit vybranou účtenku?',
+    'credit'                            => 'Kreditní karta',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Jméno',
+    'customer_address'                  => 'Adresa',
+    'customer_discount'                 => 'Sleva',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Místo',
+    'customer_mailchimp_status'         => 'Stav mailchimp',
+    'customer_optional'                 => '(Volitelné)',
+    'customer_required'                 => '(Vyžadováno)',
+    'customer_total'                    => 'Celkem',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Dostupné body',
+    'daily_sales'                       => '',
+    'date'                              => 'Datum prodeje',
+    'date_range'                        => 'Rozsah data',
+    'date_required'                     => 'Musí být vloženo správné datum.',
+    'date_type'                         => 'Datum je nutno zadat.',
+    'debit'                             => 'Debetní karta',
+    'debit_filter'                      => '',
+    'delete'                            => 'Povolit mazání',
+    'delete_confirmation'               => 'Opravdu chcete smazat tuto účtenku? Tato operace není vratná.',
+    'delete_entire_sale'                => 'Zrušit celou účtenku',
+    'delete_successful'                 => 'Účtenka byla smazána.',
+    'delete_unsuccessful'               => 'Účtenka nebyla smazána.',
+    'description_abbrv'                 => 'Položka.',
+    'discard'                           => 'Zrušit',
+    'discard_quote'                     => '',
+    'discount'                          => 'Sleva %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Sleva',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => '',
+    'due_filter'                        => 'Neuhrazeno',
+    'edit'                              => 'Upravit',
+    'edit_item'                         => 'Upravit položku',
+    'edit_sale'                         => 'Upravit účtenku',
+    'email_receipt'                     => 'Odeslat účtenku',
+    'employee'                          => 'Prodávající',
+    'entry'                             => 'Záznam',
+    'error_editing_item'                => 'Chyba při úpravě položky',
+    'find_or_scan_item'                 => 'Najít nebo skenovat položku',
+    'find_or_scan_item_or_receipt'      => 'Najít nebo skenovat položku či účtenku',
+    'giftcard'                          => 'Dárkový poukaz',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Číslo dárkového poukazu',
+    'group_by_category'                 => 'Seskupit podle kategorií',
+    'group_by_type'                     => 'Seskupit podle typu',
+    'hsn'                               => '',
+    'id'                                => 'Číslo dokladu',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Nedostatečný zůstatek na dárkové kartě pro tuto platbu.',
+    'insufficient_reward_points'        => 'Nedostatečné body odměny pro tuto platbu.',
+    'invoice'                           => 'Faktura',
+    'invoice_confirm'                   => 'Tato faktura bude odeslána',
+    'invoice_enable'                    => 'Vytvořit fakturu',
+    'invoice_filter'                    => 'Faktury',
+    'invoice_no_email'                  => 'Zákazníl nemá platný e-mail.',
+    'invoice_number'                    => 'Faktura č',
+    'invoice_number_duplicate'          => 'Číslo faktury musí být jedinečné.',
+    'invoice_sent'                      => 'Faktura odeslána',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => 'Fakturu se nepodařilo odeslat',
+    'invoice_update'                    => 'Přepočítat',
+    'item_insufficient_of_stock'        => 'Není dostatek kusů na skladě.',
+    'item_name'                         => 'Název položky',
+    'item_number'                       => 'Číslo položky',
+    'item_out_of_stock'                 => 'Položka není skladem.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Typ dokladu',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => 'Číslo dárkového poukazu musí být číslo.',
+    'must_enter_reference_code'         => 'Je nutné zadat referenční/vyhledávací číslo.',
+    'negative_amount_tendered'          => 'Uhrazená částka nemůže být záporná.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Nový zákazník',
+    'new_item'                          => 'Nová položka',
+    'no_description'                    => 'Žádný',
+    'no_filter'                         => 'Vše',
+    'no_items_in_cart'                  => 'Nejsou zde žádné položky.',
+    'no_sales_to_display'               => 'Žádné účtenky k zobrazení.',
+    'none_selected'                     => 'Nebylo nic vybráno ke smazání.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'Tato akce nebyla povolena.',
+    'one_or_multiple'                   => '',
+    'payment'                           => 'Způsob platby',
+    'payment_amount'                    => 'Částka',
+    'payment_not_cover_total'           => 'Zaplacená částka musí být stejná nebo větší než celková částka.',
+    'payment_type'                      => 'Typ',
+    'payments'                          => '',
+    'payments_total'                    => 'Uhrazeno',
+    'price'                             => 'Cena',
+    'print_after_sale'                  => 'Vytisknout automaticky',
+    'quantity'                          => 'ks',
+    'quantity_less_than_reorder_level'  => 'Upozornění: Množství zboží je pod nastavenou úrovní pro doobjednání.',
+    'quantity_less_than_zero'           => 'Pozor: Není dostatek zboží. Můžete pokračovat v prodeji, ale zkontrolujte si stav skladu.',
+    'quantity_of_items'                 => 'Množství položek {0}',
+    'quote'                             => 'Nabídka',
+    'quote_number'                      => 'Číslo nabídky',
+    'quote_number_duplicate'            => 'Číslo nabídky musí být jedinečné.',
+    'quote_sent'                        => 'Nabidku odeslat',
+    'quote_unsent'                      => 'Nabídku odeslat',
+    'receipt'                           => 'Účtenka',
+    'receipt_no_email'                  => 'Zákazníl nemá platný e-mail.',
+    'receipt_number'                    => 'Číslo dokladu',
+    'receipt_sent'                      => 'Účtenku odeslat',
+    'receipt_unsent'                    => 'Účtenku nelze odeslat',
+    'reference_code'                    => 'Referenční kód platby',
+    'reference_code_invalid_characters' => 'Referenční kód smí obsahovat pouze písmena a číslice.',
+    'reference_code_length_error'       => 'Délka referenčního kódu je neplatná.',
+    'refund'                            => '',
+    'register'                          => 'Pokladna',
+    'remove_customer'                   => 'Odebrat zákazníka',
+    'remove_discount'                   => '',
+    'return'                            => 'Vratka',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => 'Zákazník:',
+    'sale_time'                         => 'Čas',
+    'sales_tax'                         => 'DPH',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Vyberte zákazníka',
+    'send_invoice'                      => 'Odeslat fakturu',
+    'send_quote'                        => 'Odeslat nabídku',
+    'send_receipt'                      => 'Odeslat účtenku',
+    'send_work_order'                   => '',
+    'serial'                            => 'Sériové číslo',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Zobrazit fakturu',
+    'show_receipt'                      => 'Zobrazit účtenku',
+    'start_typing_customer_name'        => 'Vložte podrobnosti o zákazníkovi...',
+    'start_typing_item_name'            => 'Napište název položky nebo naskenujte čárový kód..',
+    'stock'                             => 'Sklad',
+    'stock_location'                    => 'Umístění skladu',
+    'sub_total'                         => 'Bez DPH',
+    'successfully_deleted'              => 'Bylo uspěšně smazáno',
+    'successfully_restored'             => 'Bylo úspěšně obnoveno',
+    'successfully_suspended_sale'       => 'Prodej byl úspěšně zaparkován.',
+    'successfully_updated'              => 'Účtenka byla upravena.',
+    'suspend_sale'                      => 'Zaparkovat',
+    'suspended_doc_id'                  => 'Dokument',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Zaparkovat',
+    'table'                             => 'Stůl',
+    'takings'                           => 'Transakce',
+    'tax'                               => 'DPH',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => 'DPH %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Celkem',
+    'total_tax_exclusive'               => 'Bez DPH',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => 'Přidání položky se nepovedlo',
+    'unsuccessfully_deleted'            => 'Účtenka nebyla smazána.',
+    'unsuccessfully_restored'           => 'Účtenka nebyla obnovena.',
+    'unsuccessfully_suspended_sale'     => 'Prodej se nepovedlo zaparkovat.',
+    'unsuccessfully_updated'            => 'Účtenka nebyla upravena.',
+    'unsuspend'                         => 'Odparkovat',
+    'unsuspend_and_delete'              => 'Akce',
+    'update'                            => 'Obnovit',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/da/Attributes.php b/app/Language/da/Attributes.php
index 8deefef87..8944f7498 100644
--- a/app/Language/da/Attributes.php
+++ b/app/Language/da/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Egenskabens værdi kan ikke indeholde ':' or '|'",
-    "confirm_delete"                   => "Er du sikker på, at du vil slette de valgte egenskaber?",
-    "confirm_restore"                  => "Er du sikker på, at du vil gendanne de valgte egenskaber?",
-    "definition_cannot_be_deleted"     => "De valgte egenskaber kunne ikke slettes",
-    "definition_error_adding_updating" => "Egenskab {0} Kunne ikke tilføjes eller opdateres. Tjek venligst fejlprotokollen.",
-    "definition_flags"                 => "Egenskabens Synlighed",
-    "definition_group"                 => "Gruppe",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Tilføj egenskab",
-    "definition_name_required"         => "Egenskabens navn er et obligatorisk felt",
-    "definition_one_or_multiple"       => "Egenskab(er)",
-    "definition_successful_adding"     => "Du har tilføjet en genstand",
-    "definition_successful_deleted"    => "Du har slettet en genstand",
-    "definition_successful_updating"   => "Du har opdateret en egenskab",
-    "definition_type"                  => "Egenskabs-type",
-    "definition_type_required"         => "Egenskabs-type er et obligatorisk felt",
-    "definition_unit"                  => "Måleenhed",
-    "definition_values"                => "Egenskabens værdier",
-    "new"                              => "Ny egenskab",
-    "no_attributes_to_display"         => "Ingen genstande at vise",
-    "receipt_visibility"               => "Kvittering",
-    "show_in_items"                    => "Vis i genstande",
-    "show_in_items_visibility"         => "Genstande",
-    "show_in_receipt"                  => "Vis i kvittering",
-    "show_in_receivings"               => "Vis i modtagelser",
-    "show_in_receivings_visibility"    => "Modtagelser",
-    "show_in_sales"                    => "Vis i salg",
-    "show_in_sales_visibility"         => "Salg",
-    "update"                           => "Opdater egenskab",
+    'attribute_value_invalid_chars'    => 'Egenskabens værdi kan ikke indeholde \':\' or \'|\'',
+    'confirm_delete'                   => 'Er du sikker på, at du vil slette de valgte egenskaber?',
+    'confirm_restore'                  => 'Er du sikker på, at du vil gendanne de valgte egenskaber?',
+    'definition_cannot_be_deleted'     => 'De valgte egenskaber kunne ikke slettes',
+    'definition_invalid_group' => 'Den valgte gruppe findes ikke eller er ugyldig.',
+    'definition_error_adding_updating' => 'Egenskab {0} Kunne ikke tilføjes eller opdateres. Tjek venligst fejlprotokollen.',
+    'definition_flags'                 => 'Egenskabens Synlighed',
+    'definition_group'                 => 'Gruppe',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Tilføj egenskab',
+    'definition_name_required'         => 'Egenskabens navn er et obligatorisk felt',
+    'definition_one_or_multiple'       => 'Egenskab(er)',
+    'definition_successful_adding'     => 'Du har tilføjet en genstand',
+    'definition_successful_deleted'    => 'Du har slettet en genstand',
+    'definition_successful_updating'   => 'Du har opdateret en egenskab',
+    'definition_type'                  => 'Egenskabs-type',
+    'definition_type_required'         => 'Egenskabs-type er et obligatorisk felt',
+    'definition_unit'                  => 'Måleenhed',
+    'definition_values'                => 'Egenskabens værdier',
+    'new'                              => 'Ny egenskab',
+    'no_attributes_to_display'         => 'Ingen genstande at vise',
+    'receipt_visibility'               => 'Kvittering',
+    'show_in_items'                    => 'Vis i genstande',
+    'show_in_items_visibility'         => 'Genstande',
+    'show_in_receipt'                  => 'Vis i kvittering',
+    'show_in_receivings'               => 'Vis i modtagelser',
+    'show_in_receivings_visibility'    => 'Modtagelser',
+    'show_in_sales'                    => 'Vis i salg',
+    'show_in_sales_visibility'         => 'Salg',
+    'show_in_search'                   => 'Vis i søgning',
+    'show_in_search_visibility'        => 'Søgning',
+    'update'                           => 'Opdater egenskab',
 ];
diff --git a/app/Language/da/Bootstrap_tables.php b/app/Language/da/Bootstrap_tables.php
index df61ca720..b398a49ae 100644
--- a/app/Language/da/Bootstrap_tables.php
+++ b/app/Language/da/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Alle",
-    "columns"              => "Kolonner",
-    "hide_show_pagination" => "Gem/Vis sideinddeling",
-    "loading"              => "Indlæser, vent venligst...",
-    "page_from_to"         => "Viser {0} to {1} af {2} rækker",
-    "refresh"              => "Opdater",
-    "rows_per_page"        => "{0} rækker per side",
-    "toggle"               => "Skift",
+    'all' => "Alle",
+    'columns' => "Kolonner",
+    'hide_show_pagination' => "Gem/Vis sideinddeling",
+    'loading' => "Indlæser, vent venligst",
+    'page_from_to' => "Viser {0} to {1} af {2} rækker",
+    'refresh' => "Opdater",
+    'rows_per_page' => "{0} rækker per side",
+    'toggle' => "Skift",
 ];
diff --git a/app/Language/da/Config.php b/app/Language/da/Config.php
index 05636ddb7..fd7e90a0a 100644
--- a/app/Language/da/Config.php
+++ b/app/Language/da/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Firma adresse",
-    "address_required"                          => "Firma adresse er et obligatorisk felt.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Tillad duplikatstregkoder",
-    "apostrophe"                                => "apostrof",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "Stregkode",
-    "barcode_company"                           => "Firmanavn",
-    "barcode_configuration"                     => "Stregkode konfiguration",
-    "barcode_content"                           => "Stregkode indhold",
-    "barcode_first_row"                         => "Række 1",
-    "barcode_font"                              => "Skrifttype",
-    "barcode_formats"                           => "Inputformater",
-    "barcode_generate_if_empty"                 => "Generer hvis tom.",
-    "barcode_height"                            => "Højde (px)",
-    "barcode_id"                                => "Genstands Id/navn",
-    "barcode_info"                              => "Information om stregkode konfiguration",
-    "barcode_layout"                            => "Stregkode layout",
-    "barcode_name"                              => "Navn",
-    "barcode_number"                            => "Stregkode",
-    "barcode_number_in_row"                     => "Nummer i rækken",
-    "barcode_page_cellspacing"                  => "Vis sidens celleafstand.",
-    "barcode_page_width"                        => "Vis sidens bredde",
-    "barcode_price"                             => "Pris",
-    "barcode_second_row"                        => "Række 2",
-    "barcode_third_row"                         => "Række 3",
-    "barcode_tooltip"                           => "Advarsel: Denne funktion kan forårsage, at duplikerede genstande vil blive importeret eller oprettet. Anvend ikke hvis du ikke vil have duplikerede stregkoder.",
-    "barcode_type"                              => "Stregkode type",
-    "barcode_width"                             => "Bredde (px)",
-    "bottom"                                    => "Bund",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Kontante decimaler",
-    "cash_decimals_tooltip"                     => "Hvis kontante decimaler og valuta decimaler er de samme, kan kontanterne ikke rundes op.",
-    "cash_rounding"                             => "Kontant afrunding",
-    "category_dropdown"                         => "",
-    "center"                                    => "Centrum",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "Komma",
-    "company"                                   => "Firma navn",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Skift billede",
-    "company_logo"                              => "Firma logo",
-    "company_remove_image"                      => "Fjern billede",
-    "company_required"                          => "Firma navn er et obligatorisk",
-    "company_select_image"                      => "Vælg billede",
-    "company_website_url"                       => "Firma hjemmeside er ikke en gyldig URL (http://...).",
-    "country_codes"                             => "Landekoder",
-    "country_codes_tooltip"                     => "Kommasepareret liste af landekoder til nominatim adresse søgning.",
-    "currency_code"                             => "Valuta kode",
-    "currency_decimals"                         => "Valuta decimaler",
-    "currency_symbol"                           => "Valuta symbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Belønning",
-    "customer_reward_duplicate"                 => "Belønning skal være unik.",
-    "customer_reward_enable"                    => "Aktiver kunde belønninger",
-    "customer_reward_invalid_chars"             => "Belønning må ikke indholde '_'",
-    "customer_reward_required"                  => "Belønning er et obligatorisk felt",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Dato- og tidfilter",
-    "datetimeformat"                            => "Dato og tid format",
-    "decimal_point"                             => "Decimaltegn",
-    "default_barcode_font_size_number"          => "Standard stregkode skriftstørrelse skal være et tal",
-    "default_barcode_font_size_required"        => "Standard stregkode skriftstørrelse er et obligatorisk felt",
-    "default_barcode_height_number"             => "Standard stregkode højde skal være et tal",
-    "default_barcode_height_required"           => "Standard stegkode højde er et obligatorisk felt",
-    "default_barcode_num_in_row_number"         => "Standard stregkode tal i en række skal være et tal",
-    "default_barcode_num_in_row_required"       => "Standard stregkode tal i en række er et obligatorisk felt",
-    "default_barcode_page_cellspacing_number"   => "Standard stregkodeside-celleafstand skal være et tal",
-    "default_barcode_page_cellspacing_required" => "Standard stegkodeside-celleafstand er et obligatorisk felt",
-    "default_barcode_page_width_number"         => "Standard stregkode side bredde skal være et tal",
-    "default_barcode_page_width_required"       => "Standard stregkode side bredde er et obligatorisk felt",
-    "default_barcode_width_number"              => "Standard stregkode bredde skal være et tal",
-    "default_barcode_width_required"            => "Standard stregkode bredde er et obligatorisk felt",
-    "default_item_columns"                      => "Standard synlige genstands-kolonner",
-    "default_origin_tax_code"                   => "Standard oprindelse af afgiftskode",
-    "default_receivings_discount"               => "Standard modtagelsesrabat",
-    "default_receivings_discount_number"        => "Standard modtagelsesrabat skal være et tal",
-    "default_receivings_discount_required"      => "Standard modtagelsesrabat er et obligatorisk felt",
-    "default_sales_discount"                    => "Standard salgsrabat",
-    "default_sales_discount_number"             => "Standard salgsrabat skal være et tal",
-    "default_sales_discount_required"           => "Standard salgsrabat er et obligatorisk felt",
-    "default_tax_category"                      => "Standard afgiftskategori",
-    "default_tax_code"                          => "Standard afgiftskode",
-    "default_tax_jurisdiction"                  => "Standard afgift jurisdiktion",
-    "default_tax_name_number"                   => "Standard afgiftsnavn skal være en streng",
-    "default_tax_name_required"                 => "Standard afgiftsnavn er et obligatorisk felt",
-    "default_tax_rate"                          => "Standard afgiftsrate %",
-    "default_tax_rate_1"                        => "Afgift 1 procent",
-    "default_tax_rate_2"                        => "Afgift 2 procent",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Standard afgiftsrate skal være et tal",
-    "default_tax_rate_required"                 => "Standard afgiftsrate er et obligatorisk felt",
-    "derive_sale_quantity"                      => "Tillad afledt salgsmængde",
-    "derive_sale_quantity_tooltip"              => "Hvis markeret, vil en ny varetype blive stillet til rådighed for varer bestilt med et udvidet beløb",
-    "dinner_table"                              => "Tabel",
-    "dinner_table_duplicate"                    => "Tabel skal være unik",
-    "dinner_table_enable"                       => "Enable Dinner Tables",
-    "dinner_table_invalid_chars"                => "Table Name can not contain '_'.",
-    "dinner_table_required"                     => "Table is a required field.",
-    "dot"                                       => "punktum",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email konfiguration",
-    "email_mailpath"                            => "Stig til Sendmail",
-    "email_protocol"                            => "Protokol",
-    "email_receipt_check_behaviour"             => "Email kvitteringsfelt",
-    "email_receipt_check_behaviour_always"      => "Altid markeret",
-    "email_receipt_check_behaviour_last"        => "Husk sidste valg",
-    "email_receipt_check_behaviour_never"       => "Aldrig markeret",
-    "email_smtp_crypto"                         => "SMTP Kryptering",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Kodeord",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (sekunder)",
-    "email_smtp_user"                           => "SMTP Brugernavn",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Håndhæv privathed",
-    "enforce_privacy_tooltip"                   => "Beskyt kunders privatliv, der håndhæver datascrambling i tilfælde af, at deres data bliver slettet",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Fiscal Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "Include Support for HSN Codes",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "",
-    "integrations"                              => "Integrations",
-    "integrations_configuration"                => "Third Party Integrations",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "Invoice Type",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "Lines per Page must be a number.",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Localization Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp API Key",
-    "mailchimp_configuration"                   => "Mailchimp Configuration",
-    "mailchimp_key_successfully"                => "API Key is valid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
-    "mailchimp_lists"                           => "Mailchimp List(s)",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "Multiple Packages per Item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "OSPOS Installation Info",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
-    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
-    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
-    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Left must be a number.",
-    "print_left_margin_required"                => "Margin Left is a required field.",
-    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
-    "print_receipt_check_behaviour_always"      => "Always checked",
-    "print_receipt_check_behaviour_last"        => "Remember last selection",
-    "print_receipt_check_behaviour_never"       => "Always unchecked",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Right must be a number.",
-    "print_right_margin_required"               => "Margin Right is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Top must be a number.",
-    "print_top_margin_required"                 => "Margin Top is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Default Quote Comments",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "Show Tax Indicator",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "The entered tax category already exists.",
-    "tax_category_invalid_chars"                => "The entered tax category is invalid.",
-    "tax_category_required"                     => "The tax category is required.",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "Tax Id",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Use Destination Based Tax",
-    "user_timezone"                             => "",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'Firma adresse',
+    'address_required'                          => 'Firma adresse er et obligatorisk felt.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Tillad duplikatstregkoder',
+    'apostrophe'                                => 'apostrof',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => 'Stregkode',
+    'barcode_company'                           => 'Firmanavn',
+    'barcode_configuration'                     => 'Stregkode konfiguration',
+    'barcode_content'                           => 'Stregkode indhold',
+    'barcode_first_row'                         => 'Række 1',
+    'barcode_font'                              => 'Skrifttype',
+    'barcode_formats'                           => 'Inputformater',
+    'barcode_generate_if_empty'                 => 'Generer hvis tom.',
+    'barcode_height'                            => 'Højde (px)',
+    'barcode_id'                                => 'Genstands Id/navn',
+    'barcode_info'                              => 'Information om stregkode konfiguration',
+    'barcode_layout'                            => 'Stregkode layout',
+    'barcode_name'                              => 'Navn',
+    'barcode_number'                            => 'Stregkode',
+    'barcode_number_in_row'                     => 'Nummer i rækken',
+    'barcode_page_cellspacing'                  => 'Vis sidens celleafstand.',
+    'barcode_page_width'                        => 'Vis sidens bredde',
+    'barcode_price'                             => 'Pris',
+    'barcode_second_row'                        => 'Række 2',
+    'barcode_third_row'                         => 'Række 3',
+    'barcode_tooltip'                           => 'Advarsel: Denne funktion kan forårsage, at duplikerede genstande vil blive importeret eller oprettet. Anvend ikke hvis du ikke vil have duplikerede stregkoder.',
+    'barcode_type'                              => 'Stregkode type',
+    'barcode_width'                             => 'Bredde (px)',
+    'bottom'                                    => 'Bund',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Kontante decimaler',
+    'cash_decimals_tooltip'                     => 'Hvis kontante decimaler og valuta decimaler er de samme, kan kontanterne ikke rundes op.',
+    'cash_rounding'                             => 'Kontant afrunding',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Centrum',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'Komma',
+    'company'                                   => 'Firma navn',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Skift billede',
+    'company_logo'                              => 'Firma logo',
+    'company_remove_image'                      => 'Fjern billede',
+    'company_required'                          => 'Firma navn er et obligatorisk',
+    'company_select_image'                      => 'Vælg billede',
+    'company_website_url'                       => 'Firma hjemmeside er ikke en gyldig URL (http://...).',
+    'country_codes'                             => 'Landekoder',
+    'country_codes_tooltip'                     => 'Kommasepareret liste af landekoder til nominatim adresse søgning.',
+    'currency_code'                             => 'Valuta kode',
+    'currency_decimals'                         => 'Valuta decimaler',
+    'currency_symbol'                           => 'Valuta symbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Belønning',
+    'customer_reward_duplicate'                 => 'Belønning skal være unik.',
+    'customer_reward_enable'                    => 'Aktiver kunde belønninger',
+    'customer_reward_invalid_chars'             => "Belønning må ikke indholde '_'",
+    'customer_reward_required'                  => 'Belønning er et obligatorisk felt',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Dato- og tidfilter',
+    'datetimeformat'                            => 'Dato og tid format',
+    'decimal_point'                             => 'Decimaltegn',
+    'default_barcode_font_size_number'          => 'Standard stregkode skriftstørrelse skal være et tal',
+    'default_barcode_font_size_required'        => 'Standard stregkode skriftstørrelse er et obligatorisk felt',
+    'default_barcode_height_number'             => 'Standard stregkode højde skal være et tal',
+    'default_barcode_height_required'           => 'Standard stegkode højde er et obligatorisk felt',
+    'default_barcode_num_in_row_number'         => 'Standard stregkode tal i en række skal være et tal',
+    'default_barcode_num_in_row_required'       => 'Standard stregkode tal i en række er et obligatorisk felt',
+    'default_barcode_page_cellspacing_number'   => 'Standard stregkodeside-celleafstand skal være et tal',
+    'default_barcode_page_cellspacing_required' => 'Standard stegkodeside-celleafstand er et obligatorisk felt',
+    'default_barcode_page_width_number'         => 'Standard stregkode side bredde skal være et tal',
+    'default_barcode_page_width_required'       => 'Standard stregkode side bredde er et obligatorisk felt',
+    'default_barcode_width_number'              => 'Standard stregkode bredde skal være et tal',
+    'default_barcode_width_required'            => 'Standard stregkode bredde er et obligatorisk felt',
+    'default_item_columns'                      => 'Standard synlige genstands-kolonner',
+    'default_origin_tax_code'                   => 'Standard oprindelse af afgiftskode',
+    'default_receivings_discount'               => 'Standard modtagelsesrabat',
+    'default_receivings_discount_number'        => 'Standard modtagelsesrabat skal være et tal',
+    'default_receivings_discount_required'      => 'Standard modtagelsesrabat er et obligatorisk felt',
+    'default_sales_discount'                    => 'Standard salgsrabat',
+    'default_sales_discount_number'             => 'Standard salgsrabat skal være et tal',
+    'default_sales_discount_required'           => 'Standard salgsrabat er et obligatorisk felt',
+    'default_tax_category'                      => 'Standard afgiftskategori',
+    'default_tax_code'                          => 'Standard afgiftskode',
+    'default_tax_jurisdiction'                  => 'Standard afgift jurisdiktion',
+    'default_tax_name_number'                   => 'Standard afgiftsnavn skal være en streng',
+    'default_tax_name_required'                 => 'Standard afgiftsnavn er et obligatorisk felt',
+    'default_tax_rate'                          => 'Standard afgiftsrate %',
+    'default_tax_rate_1'                        => 'Afgift 1 procent',
+    'default_tax_rate_2'                        => 'Afgift 2 procent',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Standard afgiftsrate skal være et tal',
+    'default_tax_rate_required'                 => 'Standard afgiftsrate er et obligatorisk felt',
+    'derive_sale_quantity'                      => 'Tillad afledt salgsmængde',
+    'derive_sale_quantity_tooltip'              => 'Hvis markeret, vil en ny varetype blive stillet til rådighed for varer bestilt med et udvidet beløb',
+    'dinner_table'                              => 'Tabel',
+    'dinner_table_duplicate'                    => 'Tabel skal være unik',
+    'dinner_table_enable'                       => 'Enable Dinner Tables',
+    'dinner_table_invalid_chars'                => "Table Name can not contain '_'.",
+    'dinner_table_required'                     => 'Table is a required field.',
+    'dot'                                       => 'punktum',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email konfiguration',
+    'email_mailpath'                            => 'Stig til Sendmail',
+    'email_protocol'                            => 'Protokol',
+    'email_receipt_check_behaviour'             => 'Email kvitteringsfelt',
+    'email_receipt_check_behaviour_always'      => 'Altid markeret',
+    'email_receipt_check_behaviour_last'        => 'Husk sidste valg',
+    'email_receipt_check_behaviour_never'       => 'Aldrig markeret',
+    'email_smtp_crypto'                         => 'SMTP Kryptering',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Kodeord',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (sekunder)',
+    'email_smtp_user'                           => 'SMTP Brugernavn',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Håndhæv privathed',
+    'enforce_privacy_tooltip'                   => 'Beskyt kunders privatliv, der håndhæver datascrambling i tilfælde af, at deres data bliver slettet',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Fiscal Year Start',
+    'financial_year_apr'                        => '1st of April',
+    'financial_year_aug'                        => '1st of August',
+    'financial_year_dec'                        => '1st of December',
+    'financial_year_feb'                        => '1st of February',
+    'financial_year_jan'                        => '1st of January',
+    'financial_year_jul'                        => '1st of July',
+    'financial_year_jun'                        => '1st of June',
+    'financial_year_mar'                        => '1st of March',
+    'financial_year_may'                        => '1st of May',
+    'financial_year_nov'                        => '1st of November',
+    'financial_year_oct'                        => '1st of October',
+    'financial_year_sep'                        => '1st of September',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key is a required field',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => 'Include Support for HSN Codes',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Store Information',
+    'input_groups'                              => '',
+    'integrations'                              => 'Integrations',
+    'integrations_configuration'                => 'Third Party Integrations',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => 'Invoice Type',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines per Page',
+    'lines_per_page_number'                     => 'Lines per Page must be a number.',
+    'lines_per_page_required'                   => 'Lines per Page is a required field.',
+    'locale'                                    => 'Localization',
+    'locale_configuration'                      => 'Localization Configuration',
+    'locale_info'                               => 'Localization Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => '',
+    'logout'                                    => 'Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp API Key',
+    'mailchimp_configuration'                   => 'Mailchimp Configuration',
+    'mailchimp_key_successfully'                => 'API Key is valid.',
+    'mailchimp_key_unsuccessfully'              => 'API Key is invalid.',
+    'mailchimp_lists'                           => 'Mailchimp List(s)',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here, otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => 'Multiple Packages per Item',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localization',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a valid locale.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => '',
+    'ospos_info'                                => 'OSPOS Installation Info',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Betalingsreferencekode<br>Længdegrænser',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Phone is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Margin Bottom must be a number.',
+    'print_bottom_margin_required'              => 'Margin Bottom is a required field.',
+    'print_delay_autoreturn'                    => 'Autoreturn to Sale delay',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Margin Left must be a number.',
+    'print_left_margin_required'                => 'Margin Left is a required field.',
+    'print_receipt_check_behaviour'             => 'Print Receipt checkbox',
+    'print_receipt_check_behaviour_always'      => 'Always checked',
+    'print_receipt_check_behaviour_last'        => 'Remember last selection',
+    'print_receipt_check_behaviour_never'       => 'Always unchecked',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Margin Right must be a number.',
+    'print_right_margin_required'               => 'Margin Right is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Margin Top must be a number.',
+    'print_top_margin_required'                 => 'Margin Top is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Default Quote Comments',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => 'Show Tax Indicator',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Calc avg. Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'Ugyldig sendmail-sti. Kun bogstaver, tal, bindestreger, understregninger, skråstreger, omvendte skråstreger, kolon, mellemrum og punktummer er tilladt.',
+    'saved_successfully'                        => 'Configuration save successful.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Stock location',
+    'stock_location_duplicate'                  => 'Stock Location must be unique.',
+    'stock_location_invalid_chars'              => "Stock Location can not contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 2',
+    'suggestions_third_column'                  => 'Column 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Receipt Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => 'The entered tax category already exists.',
+    'tax_category_invalid_chars'                => 'The entered tax category is invalid.',
+    'tax_category_required'                     => 'The tax category is required.',
+    'tax_category_used'                         => 'Tax category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Tax Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => 'Tax Id',
+    'tax_included'                              => 'Tax Included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => 'Use Destination Based Tax',
+    'user_timezone'                             => '',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/da/Employees.php b/app/Language/da/Employees.php
index 59828d128..a9a5d7180 100644
--- a/app/Language/da/Employees.php
+++ b/app/Language/da/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Information",
-    "cannot_be_deleted"            => "Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account.",
-    "change_employee"              => "",
-    "change_password"              => "Change Password",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Are you sure you want to delete the selected employee(s)?",
-    "confirm_restore"              => "Are you sure you want to restore selected employee(s)?",
-    "current_password"             => "Current Password",
-    "current_password_invalid"     => "Current Password is invalid.",
-    "employee"                     => "Employee",
-    "error_adding_updating"        => "Employee add or update failed.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "You can not delete the demo admin user.",
-    "error_updating_demo_admin"    => "You can not change the demo admin user.",
-    "language"                     => "Language",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "New Employee",
-    "none_selected"                => "You have not selected any employee(s) to delete.",
-    "one_or_multiple"              => "employee(s)",
-    "password"                     => "Password",
-    "password_minlength"           => "Password must be at least 8 characters in length.",
-    "password_must_match"          => "Passwords do not match.",
-    "password_not_must_match"      => "Current password and new password must be unique.",
-    "password_required"            => "Password is required.",
-    "permission_desc"              => "Check the boxes below to grant access to modules.",
-    "permission_info"              => "Permissions",
-    "repeat_password"              => "Password Again",
-    "subpermission_required"       => "Add at least one grant for each module.",
-    "successful_adding"            => "Employee add successful.",
-    "successful_change_password"   => "Password change successful.",
-    "successful_deleted"           => "You have successfully deleted",
-    "successful_updating"          => "You have successfully updated employee",
-    "system_language"              => "System Language",
-    "unsuccessful_change_password" => "Password change failed.",
-    "update"                       => "Update Employee",
-    "username"                     => "Username",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Username must be at least 5 characters in length.",
-    "username_required"            => "Username is a required field.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Information',
+    'cannot_be_deleted'                      => 'Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Change Password',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Are you sure you want to delete the selected employee(s)?',
+    'confirm_restore'                        => 'Are you sure you want to restore selected employee(s)?',
+    'current_password'                       => 'Current Password',
+    'current_password_invalid'               => 'Current Password is invalid.',
+    'employee'                               => 'Employee',
+    'error_adding_updating'                  => 'Employee add or update failed.',
+    'error_cannot_remove_own_minimum_grant'  => 'Du kan ikke fjerne dine egne minimumsrettigheder til moduladgang.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'You can not delete the demo admin user.',
+    'error_grant_change_disallowed'          => 'Rettighedsændringer er deaktiveret i denne demo.',
+    'error_password_change_disallowed'       => 'Adgangskodeændringer er deaktiveret i denne demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'You can not change the demo admin user.',
+    'language'                               => 'Language',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'New Employee',
+    'none_selected'                          => 'You have not selected any employee(s) to delete.',
+    'one_or_multiple'                        => 'employee(s)',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'Password must be at least 8 characters in length.',
+    'password_must_match'                    => 'Passwords do not match.',
+    'password_not_must_match'                => 'Current password and new password must be unique.',
+    'password_required'                      => 'Password is required.',
+    'permission_desc'                        => 'Check the boxes below to grant access to modules.',
+    'permission_info'                        => 'Permissions',
+    'repeat_password'                        => 'Password Again',
+    'subpermission_required'                 => 'Add at least one grant for each module.',
+    'successful_adding'                      => 'Employee add successful.',
+    'successful_change_password'             => 'Password change successful.',
+    'successful_deleted'                     => 'You have successfully deleted',
+    'successful_updating'                    => 'You have successfully updated employee',
+    'system_language'                        => 'System Language',
+    'unsuccessful_change_password'           => 'Password change failed.',
+    'update'                                 => 'Update Employee',
+    'username'                               => 'Username',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Username must be at least 5 characters in length.',
+    'username_required'                      => 'Username is a required field.',
 ];
diff --git a/app/Language/da/Error.php b/app/Language/da/Error.php
index ace67fbb1..04ce0fc09 100644
--- a/app/Language/da/Error.php
+++ b/app/Language/da/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "You do not have permission to access the module named",
-    "unknown"              => "Unexpected error",
+    'no_permission_module'           => 'Du har ikke tilladelse til at tilgå det navngivne modul',
+    'unable_to_create_env_file'      => 'Kunne ikke oprette {filePath} for at klargøre throttle.key',
+    'unable_to_lock_file'            => 'Kunne ikke låse {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Kunne ikke åbne {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Kunne ikke gemme throttle.key i {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Kunne ikke læse {filePath} for at klargøre throttle.key',
+    'unknown'                        => 'Uventet fejl',
 ];
diff --git a/app/Language/da/Items.php b/app/Language/da/Items.php
index 42b2152bb..f413d7c5d 100644
--- a/app/Language/da/Items.php
+++ b/app/Language/da/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "",
-    "category"                           => "",
-    "category_new"                       => "",
-    "category_required"                  => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_bulk_edit_wipe_taxes"       => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => '',
+    'category'                           => '',
+    'category_new'                       => '',
+    'category_required'                  => '',
+    'change_all_to_allow_alt_desc'       => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => '',
+    'confirm_bulk_edit'                  => '',
+    'confirm_bulk_edit_wipe_taxes'       => '',
+    'confirm_delete'                     => '',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => 'Varenummer indeholder ikke-tilladte tegn.',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Momsnavn indeholder ikke-tilladte tegn.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/da/Login.php b/app/Language/da/Login.php
index d443ab5b5..5f73f74e7 100644
--- a/app/Language/da/Login.php
+++ b/app/Language/da/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "",
-    "login"                         => "",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "",
-    "required_username"             => "",
-    "username"                      => "",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "",
+    "login"                               => "",
+    "logout"                              => "",
+    "migrating_database"                  => "Migrerer database",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Database migreret!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'For mange forsøg. Vent et øjeblik, og prøv igen.',
+    "username"                            => "",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/da/Reports.php b/app/Language/da/Reports.php
index c45e50b78..9cf1665e2 100644
--- a/app/Language/da/Reports.php
+++ b/app/Language/da/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/da/Sales.php b/app/Language/da/Sales.php
index ee07a62eb..206d5451e 100644
--- a/app/Language/da/Sales.php
+++ b/app/Language/da/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "",
-    "amount_due"                       => "",
-    "amount_tendered"                  => "",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "",
-    "cash"                             => "Kontant",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "",
-    "change_due"                       => "",
-    "change_price"                     => "",
-    "check"                            => "",
-    "check_balance"                    => "",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "Kommentar",
-    "comments"                         => "Kommentarer",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "",
-    "confirm_cancel_sale"              => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "credit"                           => "",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "",
-    "customer_address"                 => "",
-    "customer_discount"                => "Rabat",
-    "customer_email"                   => "",
-    "customer_location"                => "",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "",
-    "date_range"                       => "",
-    "date_required"                    => "",
-    "date_type"                        => "",
-    "debit"                            => "Debit kort",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "Er du sikker på at du ønsker at slette dette salg? Dette kan ikke fortrydes.",
-    "delete_entire_sale"               => "Slet hele salget",
-    "delete_successful"                => "Salg slettet succesfuldt.",
-    "delete_unsuccessful"              => "Sletning af salg fejlede.",
-    "description_abbrv"                => "Beskr.",
-    "discard"                          => "Kassér",
-    "discard_quote"                    => "",
-    "discount"                         => "",
-    "discount_included"                => "",
-    "discount_short"                   => "",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "",
-    "edit_item"                        => "",
-    "edit_sale"                        => "",
-    "email_receipt"                    => "",
-    "employee"                         => "",
-    "entry"                            => "",
-    "error_editing_item"               => "",
-    "find_or_scan_item"                => "",
-    "find_or_scan_item_or_receipt"     => "",
-    "giftcard"                         => "Gavekort",
-    "giftcard_balance"                 => "",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "",
-    "include_prices"                   => "",
-    "invoice"                          => "",
-    "invoice_confirm"                  => "",
-    "invoice_enable"                   => "",
-    "invoice_filter"                   => "",
-    "invoice_no_email"                 => "",
-    "invoice_number"                   => "",
-    "invoice_number_duplicate"         => "",
-    "invoice_sent"                     => "",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "",
-    "invoice_update"                   => "",
-    "item_insufficient_of_stock"       => "",
-    "item_name"                        => "",
-    "item_number"                      => "",
-    "item_out_of_stock"                => "",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "",
-    "new_customer"                     => "",
-    "new_item"                         => "",
-    "no_description"                   => "",
-    "no_filter"                        => "",
-    "no_items_in_cart"                 => "",
-    "no_sales_to_display"              => "",
-    "none_selected"                    => "",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "",
-    "payment_amount"                   => "",
-    "payment_not_cover_total"          => "",
-    "payment_type"                     => "",
-    "payments"                         => "",
-    "payments_total"                   => "",
-    "price"                            => "",
-    "print_after_sale"                 => "",
-    "quantity"                         => "",
-    "quantity_less_than_reorder_level" => "",
-    "quantity_less_than_zero"          => "",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "",
-    "receipt_sent"                     => "",
-    "receipt_unsent"                   => "",
-    "refund"                           => "",
-    "register"                         => "",
-    "remove_customer"                  => "",
-    "remove_discount"                  => "",
-    "return"                           => "",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "",
-    "sale_time"                        => "",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "",
-    "send_invoice"                     => "",
-    "send_quote"                       => "",
-    "send_receipt"                     => "",
-    "send_work_order"                  => "",
-    "serial"                           => "",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "",
-    "show_receipt"                     => "",
-    "start_typing_customer_name"       => "",
-    "start_typing_item_name"           => "",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "",
-    "successfully_deleted"             => "",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "",
-    "successfully_updated"             => "",
-    "suspend_sale"                     => "",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "",
-    "suspended_sales"                  => "",
-    "table"                            => "",
-    "takings"                          => "",
-    "tax"                              => "",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "",
-    "taxed_ind"                        => "",
-    "total"                            => "",
-    "total_tax_exclusive"              => "",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "",
-    "unsuccessfully_deleted"           => "",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "",
-    "unsuccessfully_updated"           => "",
-    "unsuspend"                        => "",
-    "unsuspend_and_delete"             => "",
-    "update"                           => "",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => '',
+    'amount_due'                        => '',
+    'amount_due_not_covered'            => 'Betalingerne dækker ikke det skyldige beløb.',
+    'amount_tendered'                   => '',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => '',
+    'cash'                              => 'Kontant',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '',
+    'change_due'                        => '',
+    'change_price'                      => '',
+    'check'                             => '',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => 'Kommentar',
+    'comments'                          => 'Kommentarer',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '',
+    'confirm_cancel_sale'               => '',
+    'confirm_delete'                    => '',
+    'confirm_restore'                   => '',
+    'credit'                            => '',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '',
+    'customer_address'                  => '',
+    'customer_discount'                 => 'Rabat',
+    'customer_email'                    => '',
+    'customer_location'                 => '',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => '',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => '',
+    'date_range'                        => '',
+    'date_required'                     => '',
+    'date_type'                         => '',
+    'debit'                             => 'Debit kort',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => 'Er du sikker på at du ønsker at slette dette salg? Dette kan ikke fortrydes.',
+    'delete_entire_sale'                => 'Slet hele salget',
+    'delete_successful'                 => 'Salg slettet succesfuldt.',
+    'delete_unsuccessful'               => 'Sletning af salg fejlede.',
+    'description_abbrv'                 => 'Beskr.',
+    'discard'                           => 'Kassér',
+    'discard_quote'                     => '',
+    'discount'                          => '',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '',
+    'edit_item'                         => '',
+    'edit_sale'                         => '',
+    'email_receipt'                     => '',
+    'employee'                          => '',
+    'entry'                             => '',
+    'error_editing_item'                => '',
+    'find_or_scan_item'                 => '',
+    'find_or_scan_item_or_receipt'      => '',
+    'giftcard'                          => 'Gavekort',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Utilstrækkelig gavekortsaldo til denne betaling.',
+    'insufficient_reward_points'        => 'Utilstrækkelige belønningspoint til denne betaling.',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'Reference-/hentningsnummer skal angives.',
+    'negative_amount_tendered'          => 'Det modtagne beløb kan ikke være negativt.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => '',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'Betalingsreferencekode',
+    'reference_code_invalid_characters' => 'Referencekoden må kun indeholde bogstaver og tal.',
+    'reference_code_length_error'       => 'Referencekodets længde er ugyldig.',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/de-CH/Attributes.php b/app/Language/de-CH/Attributes.php
index 093e018ab..f25b7bf63 100644
--- a/app/Language/de-CH/Attributes.php
+++ b/app/Language/de-CH/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "definition_cannot_be_deleted"     => "",
-    "definition_error_adding_updating" => "",
-    "definition_flags"                 => "",
-    "definition_group"                 => "",
-    "definition_id"                    => "",
-    "definition_name"                  => "",
-    "definition_name_required"         => "",
-    "definition_one_or_multiple"       => "",
-    "definition_successful_adding"     => "",
-    "definition_successful_deleted"    => "",
-    "definition_successful_updating"   => "",
-    "definition_type"                  => "",
-    "definition_type_required"         => "",
-    "definition_unit"                  => "",
-    "definition_values"                => "",
-    "new"                              => "",
-    "no_attributes_to_display"         => "",
-    "receipt_visibility"               => "",
-    "show_in_items"                    => "",
-    "show_in_items_visibility"         => "",
-    "show_in_receipt"                  => "",
-    "show_in_receivings"               => "",
-    "show_in_receivings_visibility"    => "",
-    "show_in_sales"                    => "",
-    "show_in_sales_visibility"         => "",
-    "update"                           => "",
+    'attribute_value_invalid_chars'    => '',
+    'confirm_delete'                   => '',
+    'confirm_restore'                  => '',
+    'definition_cannot_be_deleted'     => '',
+    'definition_invalid_group' => 'Die ausgewählte Gruppe existiert nicht oder ist ungültig.',
+    'definition_error_adding_updating' => '',
+    'definition_flags'                 => '',
+    'definition_group'                 => '',
+    'definition_id'                    => '',
+    'definition_name'                  => '',
+    'definition_name_required'         => '',
+    'definition_one_or_multiple'       => '',
+    'definition_successful_adding'     => '',
+    'definition_successful_deleted'    => '',
+    'definition_successful_updating'   => '',
+    'definition_type'                  => '',
+    'definition_type_required'         => '',
+    'definition_unit'                  => '',
+    'definition_values'                => '',
+    'new'                              => '',
+    'no_attributes_to_display'         => '',
+    'receipt_visibility'               => '',
+    'show_in_items'                    => '',
+    'show_in_items_visibility'         => '',
+    'show_in_receipt'                  => '',
+    'show_in_receivings'               => '',
+    'show_in_receivings_visibility'    => '',
+    'show_in_sales'                    => '',
+    'show_in_sales_visibility'         => '',
+    'show_in_search'                   => 'In Suche anzeigen',
+    'show_in_search_visibility'        => 'Suche',
+    'update'                           => '',
 ];
diff --git a/app/Language/de-CH/Bootstrap_tables.php b/app/Language/de-CH/Bootstrap_tables.php
index 2efa8834f..11726f0ce 100644
--- a/app/Language/de-CH/Bootstrap_tables.php
+++ b/app/Language/de-CH/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "All",
-    "columns"              => "Spalten",
-    "hide_show_pagination" => "Hide/Show pagination",
-    "loading"              => "Lade, bitte warten...",
-    "page_from_to"         => "Zeige {0} bis {1} von {2} Zeile(n)",
-    "refresh"              => "Refresh",
-    "rows_per_page"        => "{0} Einträge pro Seite",
-    "toggle"               => "Umschalten",
+    'all' => "All",
+    'columns' => "Spalten",
+    'hide_show_pagination' => "Hide/Show pagination",
+    'loading' => "Lade, bitte warten",
+    'page_from_to' => "Zeige {0} bis {1} von {2} Zeile(n)",
+    'refresh' => "Refresh",
+    'rows_per_page' => "{0} Einträge pro Seite",
+    'toggle' => "Umschalten",
 ];
diff --git a/app/Language/de-CH/Config.php b/app/Language/de-CH/Config.php
index 394c5c42c..f02abe48e 100644
--- a/app/Language/de-CH/Config.php
+++ b/app/Language/de-CH/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adresse",
-    "address_required"                          => "Adresse ist erforderlich",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Sicherung",
-    "backup_database"                           => "Sicherungs-Datenbank",
-    "barcode"                                   => "Barcodes",
-    "barcode_company"                           => "Firmenname",
-    "barcode_configuration"                     => "Barcodes",
-    "barcode_content"                           => "Barcode Inhalt",
-    "barcode_first_row"                         => "Erste Zeile",
-    "barcode_font"                              => "Schrift",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "Generiere Barcode wenn leer",
-    "barcode_height"                            => "Höhe",
-    "barcode_id"                                => "Artikel-Nr/Name",
-    "barcode_info"                              => "Barcode Einstellung",
-    "barcode_layout"                            => "Barcode Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Nummer in Zeile",
-    "barcode_page_cellspacing"                  => "Zellenabstand auf Seite",
-    "barcode_page_width"                        => "Seitenbreite",
-    "barcode_price"                             => "Preis",
-    "barcode_second_row"                        => "Zeile 2",
-    "barcode_third_row"                         => "Zeile 3",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "Barcode Typ",
-    "barcode_width"                             => "Breite (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Firmenname",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "Firmenname ist erforderlich",
-    "company_select_image"                      => "Select Image",
-    "company_website_url"                       => "Webseite ist nicht in korrektem Format",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Währungssymbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "Datum und Zeit",
-    "decimal_point"                             => "Dezimaltrennzeichen",
-    "default_barcode_font_size_number"          => "Die Barcode Schriftgrösse muss eine Zahl sein",
-    "default_barcode_font_size_required"        => "Die Barcode Schriftgrösse ist erforderlich",
-    "default_barcode_height_number"             => "Die Barcode Höhe muss eine Zahl sein",
-    "default_barcode_height_required"           => "Die Barcode Höhe ist erforderlich",
-    "default_barcode_num_in_row_number"         => "Die Barcode Num muss eine Zahl sein",
-    "default_barcode_num_in_row_required"       => "Die Barcode Num ist erforderlich",
-    "default_barcode_page_cellspacing_number"   => "Der Barcode Zellabstand muss eine Zahl sein",
-    "default_barcode_page_cellspacing_required" => "Der Barcode Zellabstand ist erforderlich",
-    "default_barcode_page_width_number"         => "Die Barcode Seitenbreite muss eine Zahl sein",
-    "default_barcode_page_width_required"       => "Die Barcode Seitenbreite ist erforderlich",
-    "default_barcode_width_number"              => "Die Barcode Breite muss eine Zahl sein",
-    "default_barcode_width_required"            => "Die Barcode Breite ist erforderlich",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "Standard Verkaufsrabatt",
-    "default_sales_discount_number"             => "Der Standard Verkaufsrabatt muss eine Zahl sein",
-    "default_sales_discount_required"           => "Der Standard Verkaufsrabatt ist erforderlich",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "The default tax name is a required field",
-    "default_tax_rate"                          => "MWSt %",
-    "default_tax_rate_1"                        => "MWSt 1",
-    "default_tax_rate_2"                        => "MWSt 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "MWSt Rate",
-    "default_tax_rate_required"                 => "MWSt ist erforderlich",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "Einstellungen",
-    "general_configuration"                     => "Einstellungen",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "Instellungen",
-    "info_configuration"                        => "Instellungen",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "Rechnungs",
-    "invoice_configuration"                     => "Druckereinstellungen",
-    "invoice_default_comments"                  => "Rechnungskommentar",
-    "invoice_email_message"                     => "Rechnungsvorlage (Email)",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Rechnungsdrucker",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warnung! Diese Funktion ist nur funktionsfähig",
-    "language"                                  => "Sprache",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "Zeilen pro Seite",
-    "lines_per_page_number"                     => "Zeilen pro Seite muss eine Zahl sein",
-    "lines_per_page_required"                   => "Zeilen pro Seite ist erforderlich",
-    "locale"                                    => "Länder",
-    "locale_configuration"                      => "Länderkonfiguration",
-    "locale_info"                               => "Info Länderkonfiguration",
-    "location"                                  => "Lagerort",
-    "location_configuration"                    => "Lagerort",
-    "location_info"                             => "Lagerort-Information",
-    "login_form"                                => "",
-    "logout"                                    => "Wollen Sie eine Sicherung machen vor dem Beenden? Klicke [OK] für Sicherung",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here. Otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Zahlenformat",
-    "number_locale"                             => "Länderkonfiguration",
-    "number_locale_invalid"                     => "Die eingegebene Lokale ist falsch. Bitte sehen Sie sich den Link tim Tooltip an um einen korrekten Wert zu finden",
-    "number_locale_required"                    => "Localennummer ist ein Pflichtfeld",
-    "number_locale_tooltip"                     => "Finden Sie eine korrekte Lokale über diesen Link",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Telefon",
-    "phone_required"                            => "Telefon ist erforderlich",
-    "print_bottom_margin"                       => "Unterer Rand",
-    "print_bottom_margin_number"                => "Unterer Rand muss eine Zahl sein",
-    "print_bottom_margin_required"              => "Unterer Rand ist erforderlich",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "Drucke Browser Fusszeile",
-    "print_header"                              => "Drucke Browser Kopfzeile",
-    "print_left_margin"                         => "Rand links",
-    "print_left_margin_number"                  => "Rand links muss eine Zahl sein",
-    "print_left_margin_required"                => "Rand links ist erforderlich",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "Rand rechts",
-    "print_right_margin_number"                 => "Rand rechts muss eine Zahl sein",
-    "print_right_margin_required"               => "Rand rechts ist erforderlich",
-    "print_silently"                            => "Zeige Druckdialog",
-    "print_top_margin"                          => "Rand oben",
-    "print_top_margin_number"                   => "Rand oben muss eine Zahl sein",
-    "print_top_margin_required"                 => "Rand oben ist erforderlich",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "Eingang",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Druckereinstellungen",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "Quittungsinformation",
-    "receipt_printer"                           => "Quittungsdrucker",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "Zeige MWSt",
-    "receipt_show_total_discount"               => "Zeige Gesamtrabatt",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Berechne Durchschnittseinkaufspreis",
-    "recv_invoice_format"                       => "Format Eingangsrechnung",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Rücknahmepolitik erforderlich",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Format Verkaufsrechnung",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "Einstellungen erfolgreich gesichert",
-    "saved_unsuccessfully"                      => "Einstellungen konnten nicht gesichert werden",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "Send statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes",
-    "stock_location"                            => "Lagerort",
-    "stock_location_duplicate"                  => "Bitte verwenden Sie einen eindeutigen Lagerort",
-    "stock_location_invalid_chars"              => "Der Lagerort kann keine Unterstriche enthalten",
-    "stock_location_required"                   => "Lagerort Nummer ist erforderlich",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "Takings Printer",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "",
-    "tax_included"                              => "MWSt inbegriffen",
-    "theme"                                     => "Design",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Tausendertrennzeichen",
-    "timezone"                                  => "Zeitzone",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => 'Adresse',
+    'address_required'                          => 'Adresse ist erforderlich',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Sicherung',
+    'backup_database'                           => 'Sicherungs-Datenbank',
+    'barcode'                                   => 'Barcodes',
+    'barcode_company'                           => 'Firmenname',
+    'barcode_configuration'                     => 'Barcodes',
+    'barcode_content'                           => 'Barcode Inhalt',
+    'barcode_first_row'                         => 'Erste Zeile',
+    'barcode_font'                              => 'Schrift',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => 'Generiere Barcode wenn leer',
+    'barcode_height'                            => 'Höhe',
+    'barcode_id'                                => 'Artikel-Nr/Name',
+    'barcode_info'                              => 'Barcode Einstellung',
+    'barcode_layout'                            => 'Barcode Layout',
+    'barcode_name'                              => 'Name',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Nummer in Zeile',
+    'barcode_page_cellspacing'                  => 'Zellenabstand auf Seite',
+    'barcode_page_width'                        => 'Seitenbreite',
+    'barcode_price'                             => 'Preis',
+    'barcode_second_row'                        => 'Zeile 2',
+    'barcode_third_row'                         => 'Zeile 3',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => 'Barcode Typ',
+    'barcode_width'                             => 'Breite (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Center',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => 'Firmenname',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Change Image',
+    'company_logo'                              => 'Logo',
+    'company_remove_image'                      => 'Remove Image',
+    'company_required'                          => 'Firmenname ist erforderlich',
+    'company_select_image'                      => 'Select Image',
+    'company_website_url'                       => 'Webseite ist nicht in korrektem Format',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => '',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => 'Währungssymbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => 'Datum und Zeit',
+    'decimal_point'                             => 'Dezimaltrennzeichen',
+    'default_barcode_font_size_number'          => 'Die Barcode Schriftgrösse muss eine Zahl sein',
+    'default_barcode_font_size_required'        => 'Die Barcode Schriftgrösse ist erforderlich',
+    'default_barcode_height_number'             => 'Die Barcode Höhe muss eine Zahl sein',
+    'default_barcode_height_required'           => 'Die Barcode Höhe ist erforderlich',
+    'default_barcode_num_in_row_number'         => 'Die Barcode Num muss eine Zahl sein',
+    'default_barcode_num_in_row_required'       => 'Die Barcode Num ist erforderlich',
+    'default_barcode_page_cellspacing_number'   => 'Der Barcode Zellabstand muss eine Zahl sein',
+    'default_barcode_page_cellspacing_required' => 'Der Barcode Zellabstand ist erforderlich',
+    'default_barcode_page_width_number'         => 'Die Barcode Seitenbreite muss eine Zahl sein',
+    'default_barcode_page_width_required'       => 'Die Barcode Seitenbreite ist erforderlich',
+    'default_barcode_width_number'              => 'Die Barcode Breite muss eine Zahl sein',
+    'default_barcode_width_required'            => 'Die Barcode Breite ist erforderlich',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => 'Standard Verkaufsrabatt',
+    'default_sales_discount_number'             => 'Der Standard Verkaufsrabatt muss eine Zahl sein',
+    'default_sales_discount_required'           => 'Der Standard Verkaufsrabatt ist erforderlich',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => 'The default tax name is a required field',
+    'default_tax_rate'                          => 'MWSt %',
+    'default_tax_rate_1'                        => 'MWSt 1',
+    'default_tax_rate_2'                        => 'MWSt 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'MWSt Rate',
+    'default_tax_rate_required'                 => 'MWSt ist erforderlich',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => 'dot',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => 'Einstellungen',
+    'general_configuration'                     => 'Einstellungen',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => 'Instellungen',
+    'info_configuration'                        => 'Instellungen',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => 'Rechnungs',
+    'invoice_configuration'                     => 'Druckereinstellungen',
+    'invoice_default_comments'                  => 'Rechnungskommentar',
+    'invoice_email_message'                     => 'Rechnungsvorlage (Email)',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Rechnungsdrucker',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warnung! Diese Funktion ist nur funktionsfähig',
+    'language'                                  => 'Sprache',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => 'Zeilen pro Seite',
+    'lines_per_page_number'                     => 'Zeilen pro Seite muss eine Zahl sein',
+    'lines_per_page_required'                   => 'Zeilen pro Seite ist erforderlich',
+    'locale'                                    => 'Länder',
+    'locale_configuration'                      => 'Länderkonfiguration',
+    'locale_info'                               => 'Info Länderkonfiguration',
+    'location'                                  => 'Lagerort',
+    'location_configuration'                    => 'Lagerort',
+    'location_info'                             => 'Lagerort-Information',
+    'login_form'                                => '',
+    'logout'                                    => 'Wollen Sie eine Sicherung machen vor dem Beenden? Klicke [OK] für Sicherung',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here. Otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Zahlenformat',
+    'number_locale'                             => 'Länderkonfiguration',
+    'number_locale_invalid'                     => 'Die eingegebene Lokale ist falsch. Bitte sehen Sie sich den Link tim Tooltip an um einen korrekten Wert zu finden',
+    'number_locale_required'                    => 'Localennummer ist ein Pflichtfeld',
+    'number_locale_tooltip'                     => 'Finden Sie eine korrekte Lokale über diesen Link',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Zahlungsreferenzcode<br>Längenbeschränkungen',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Telefon',
+    'phone_required'                            => 'Telefon ist erforderlich',
+    'print_bottom_margin'                       => 'Unterer Rand',
+    'print_bottom_margin_number'                => 'Unterer Rand muss eine Zahl sein',
+    'print_bottom_margin_required'              => 'Unterer Rand ist erforderlich',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Drucke Browser Fusszeile',
+    'print_header'                              => 'Drucke Browser Kopfzeile',
+    'print_left_margin'                         => 'Rand links',
+    'print_left_margin_number'                  => 'Rand links muss eine Zahl sein',
+    'print_left_margin_required'                => 'Rand links ist erforderlich',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => 'Rand rechts',
+    'print_right_margin_number'                 => 'Rand rechts muss eine Zahl sein',
+    'print_right_margin_required'               => 'Rand rechts ist erforderlich',
+    'print_silently'                            => 'Zeige Druckdialog',
+    'print_top_margin'                          => 'Rand oben',
+    'print_top_margin_number'                   => 'Rand oben muss eine Zahl sein',
+    'print_top_margin_required'                 => 'Rand oben ist erforderlich',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => 'Eingang',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Druckereinstellungen',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => 'Quittungsinformation',
+    'receipt_printer'                           => 'Quittungsdrucker',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'Zeige MWSt',
+    'receipt_show_total_discount'               => 'Zeige Gesamtrabatt',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Berechne Durchschnittseinkaufspreis',
+    'recv_invoice_format'                       => 'Format Eingangsrechnung',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Rücknahmepolitik erforderlich',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Format Verkaufsrechnung',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Ungültiger Sendmail-Pfad. Nur Buchstaben, Zahlen, Bindestriche, Unterstriche, Schrägstriche, Rückwärtsschrägstriche, Doppelpunkte, Leerzeichen und Punkte sind erlaubt.',
+    'saved_successfully'                        => 'Einstellungen erfolgreich gesichert',
+    'saved_unsuccessfully'                      => 'Einstellungen konnten nicht gesichert werden',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => 'Send statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes',
+    'stock_location'                            => 'Lagerort',
+    'stock_location_duplicate'                  => 'Bitte verwenden Sie einen eindeutigen Lagerort',
+    'stock_location_invalid_chars'              => 'Der Lagerort kann keine Unterstriche enthalten',
+    'stock_location_required'                   => 'Lagerort Nummer ist erforderlich',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => 'Takings Printer',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => '',
+    'tax_included'                              => 'MWSt inbegriffen',
+    'theme'                                     => 'Design',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Tausendertrennzeichen',
+    'timezone'                                  => 'Zeitzone',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/de-CH/Employees.php b/app/Language/de-CH/Employees.php
index 765b2e241..de8068828 100644
--- a/app/Language/de-CH/Employees.php
+++ b/app/Language/de-CH/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Mitarbeiter-Information",
-    "cannot_be_deleted"            => "Konnte gewählten Mitarbeiter nicht löschen, einer oder mehrere weisen Verkäufe aus.",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Wollen Sie diesen Mitarbeiter wirklich löschen?",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "Mitarbeiter",
-    "error_adding_updating"        => "Fehler beim Hinzufügen/Ändern",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Sie können den Admin nicht löschen",
-    "error_updating_demo_admin"    => "Sie können den Admin nicht ändern",
-    "language"                     => "",
-    "login_info"                   => "Mitarbeiter Login",
-    "manager"                      => "",
-    "new"                          => "Neuer Mitarbeiter",
-    "none_selected"                => "Sie haben keinen Mitarbeiter zum Löschen gewählt",
-    "one_or_multiple"              => "Mitarbeiter",
-    "password"                     => "Passwort",
-    "password_minlength"           => "Passwort muss mindestens 8 Zeichen lang sein",
-    "password_must_match"          => "Passwörter passen nicht überein",
-    "password_not_must_match"      => "",
-    "password_required"            => "Passwort ist erforderlich",
-    "permission_desc"              => "Klicken Sie unten, um die jeweiligen Zugangsrechte zu aktivieren",
-    "permission_info"              => "Mitarbeiter Zugangsrechte",
-    "repeat_password"              => "Wiederhole Passwort",
-    "subpermission_required"       => "Fügen Sie mindestens ein Zugangsrecht pro Modul hinzu",
-    "successful_adding"            => "Hinzufügen erfolgreich",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "Löschung erfolgreich",
-    "successful_updating"          => "Änderung erfolgreich",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "Mitarbeiter ändern",
-    "username"                     => "Benutzername",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Benutzername muss mindestens 5 Zeichen lang sein",
-    "username_required"            => "Benutzername ist erforderlich",
+    'administrator'                          => '',
+    'basic_information'                      => 'Mitarbeiter-Information',
+    'cannot_be_deleted'                      => 'Konnte gewählten Mitarbeiter nicht löschen, einer oder mehrere weisen Verkäufe aus.',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Wollen Sie diesen Mitarbeiter wirklich löschen?',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => 'Mitarbeiter',
+    'error_adding_updating'                  => 'Fehler beim Hinzufügen/Ändern',
+    'error_cannot_remove_own_minimum_grant'  => 'Sie können Ihre eigenen minimalen Zugangsrechte für Module nicht entfernen.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Sie können den Admin nicht löschen',
+    'error_grant_change_disallowed'          => 'Berechtigungsänderungen sind in dieser Demo deaktiviert.',
+    'error_password_change_disallowed'       => 'Passwortänderungen sind in dieser Demo deaktiviert.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Sie können den Admin nicht ändern',
+    'language'                               => '',
+    'login_info'                             => 'Mitarbeiter Login',
+    'manager'                                => '',
+    'new'                                    => 'Neuer Mitarbeiter',
+    'none_selected'                          => 'Sie haben keinen Mitarbeiter zum Löschen gewählt',
+    'one_or_multiple'                        => 'Mitarbeiter',
+    'password'                               => 'Passwort',
+    'password_minlength'                     => 'Passwort muss mindestens 8 Zeichen lang sein',
+    'password_must_match'                    => 'Passwörter passen nicht überein',
+    'password_not_must_match'                => '',
+    'password_required'                      => 'Passwort ist erforderlich',
+    'permission_desc'                        => 'Klicken Sie unten, um die jeweiligen Zugangsrechte zu aktivieren',
+    'permission_info'                        => 'Mitarbeiter Zugangsrechte',
+    'repeat_password'                        => 'Wiederhole Passwort',
+    'subpermission_required'                 => 'Fügen Sie mindestens ein Zugangsrecht pro Modul hinzu',
+    'successful_adding'                      => 'Hinzufügen erfolgreich',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => 'Löschung erfolgreich',
+    'successful_updating'                    => 'Änderung erfolgreich',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => 'Mitarbeiter ändern',
+    'username'                               => 'Benutzername',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Benutzername muss mindestens 5 Zeichen lang sein',
+    'username_required'                      => 'Benutzername ist erforderlich',
 ];
diff --git a/app/Language/de-CH/Error.php b/app/Language/de-CH/Error.php
index 23b161b63..60b048711 100644
--- a/app/Language/de-CH/Error.php
+++ b/app/Language/de-CH/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Sie haben nicht die Zugangsrechte für das gewählte Modul",
-    "unknown"              => "Unbekannter Fehler",
+    'no_permission_module'           => 'Sie haben nicht die Zugangsrechte für das gewählte Modul',
+    'unable_to_create_env_file'      => '{filePath} konnte nicht erstellt werden, um throttle.key bereitzustellen',
+    'unable_to_lock_file'            => '{filePath} konnte nicht gesperrt werden: {reason}',
+    'unable_to_open_lock_file'       => '{filePath} konnte nicht geöffnet werden: {reason}',
+    'unable_to_persist_throttle_key' => 'throttle.key konnte nicht in {filePath} gespeichert werden',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => '{filePath} konnte nicht gelesen werden, um throttle.key bereitzustellen',
+    'unknown'                        => 'Unbekannter Fehler',
 ];
diff --git a/app/Language/de-CH/Items.php b/app/Language/de-CH/Items.php
index 52e963ee5..00ba32569 100644
--- a/app/Language/de-CH/Items.php
+++ b/app/Language/de-CH/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Bestandsänderung",
-    "allow_alt_description"              => "Erlaube Alt. Bez.",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "Sammeländerung",
-    "buy_price_required"                 => "Einkaufspreis ist erforderlich",
-    "cannot_be_deleted"                  => "Gewählte Artikel können nicht gelöscht werden, einer odere mehrere weisen Verkäufe auf",
-    "cannot_find_item"                   => "Konnte Artikel nicht finden",
-    "categories"                         => "",
-    "category"                           => "Kategorie",
-    "category_new"                       => "",
-    "category_required"                  => "Kategorie ist erforderlich",
-    "change_all_to_allow_alt_desc"       => "Ändere alle zu Erlaube Alt. Bez.",
-    "change_all_to_not_allow_allow_desc" => "Ändere alle zu NICHT Erlaube Alt. Bez.",
-    "change_all_to_serialized"           => "Ändere alle zu serialisiert",
-    "change_all_to_unserialized"         => "Ändere alle zu nicht serialisiert",
-    "change_image"                       => "Change Image",
-    "confirm_bulk_edit"                  => "Wollen Sie alle gewählten Artikel ändern?",
-    "confirm_bulk_edit_wipe_taxes"       => "All item tax information will be replaced!",
-    "confirm_delete"                     => "Wollen Sie alle gewählten Artikel löschen?",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "Einstandspreis",
-    "cost_price_number"                  => "Einstandspresi muss eine Zahl sein",
-    "cost_price_required"                => "Einstandspreis ist erforderlich",
-    "count"                              => "Ändere Bestand",
-    "csv_import_failed"                  => "CSV Import fehlerhaft",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Your uploaded file has no data or wrong format",
-    "csv_import_partially_failed"        => "Most Items imported. But some were not, here is the list",
-    "csv_import_success"                 => "Import of Items successful",
-    "current_quantity"                   => "Aktuelle Menge",
-    "default_pack_name"                  => "",
-    "description"                        => "Bezeichnung",
-    "details_count"                      => "Lagerbestandsdetails",
-    "do_nothing"                         => "Tue nichts",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Ändern Sie die Felder für ALLE gewählten Artikel?",
-    "edit_multiple_items"                => "Sammeländerung",
-    "empty_upc_items"                    => "Leere UPC Artikel",
-    "error_adding_updating"              => "Fehler beim Hinzufügen/Ändern",
-    "error_updating_multiple"            => "Fehler beim Ändern",
-    "generate_barcodes"                  => "Generiere Barcodes",
-    "hsn_code"                           => "",
-    "image"                              => "Bild",
-    "import_items_csv"                   => "Importiere Artikel mit CSV Datei",
-    "info_provided_by"                   => "Info provided by",
-    "inventory"                          => "Lagerbestand",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Bemerkungen",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "Gelöscht",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Artikel hat Serien-Nr.",
-    "item"                               => "Artikel",
-    "item_id"                            => "",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "Die Artikelnummer existiert bereits in der Datenbank",
-    "kit"                                => "",
-    "location"                           => "Ort",
-    "low_inventory_items"                => "nicht am Lager",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "Manuelle Bestandesänderung",
-    "markup"                             => "",
-    "name"                               => "Artikelname",
-    "name_required"                      => "Artikelname ist erforderlich",
-    "new"                                => "Neuer Artikel",
-    "no_description_items"               => "Artikel ohne Bezeichnung",
-    "no_items_to_display"                => "Keine Artikel zum Anzeigen",
-    "none"                               => "Nichts",
-    "none_selected"                      => "Sie haben keine Artikel zum Ändern gewählt",
-    "nonstock"                           => "",
-    "number_information"                 => "Artikelnummer",
-    "number_required"                    => "UPC/EAN/ISBN ist erforderlich",
-    "one_or_multiple"                    => "Artikel",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "Menge",
-    "quantity_number"                    => "Menge muss eine Zahl sein",
-    "quantity_required"                  => "Menge ist erforderlich",
-    "receiving_quantity"                 => "Eingangsmenge",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "Mindestbestand",
-    "reorder_level_number"               => "Mindestbestand muss eine Zahl sein",
-    "reorder_level_required"             => "Mindestbestand ist erforderlich",
-    "retrive_item_info"                  => "Artikelinformation",
-    "sales_tax_1"                        => "Umsatzsteuer 1",
-    "sales_tax_2"                        => "Umsatzsteuer 2",
-    "search_attributes"                  => "Suche in Zusatzfeldern",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "Serialisierte Artikel",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "Lagerort",
-    "stock_type"                         => "",
-    "successful_adding"                  => "Artikel erfolgreich hinzugefügt",
-    "successful_bulk_edit"               => "Die gewählten Artikel wurden erforlgreich geändert",
-    "successful_deleted"                 => "Löschung erfolgreich",
-    "successful_updating"                => "Änderung erfolgreich",
-    "supplier"                           => "Lieferant",
-    "tax_1"                              => "MWSt 1",
-    "tax_2"                              => "MWSt 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "MWSt %",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "MWSt % ist erforderlich",
-    "tax_percents"                       => "Steuerprozent(e)",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "Preis",
-    "unit_price_number"                  => "Preis muss eine Zahl sein",
-    "unit_price_required"                => "Preis ist erforderlich",
-    "upc_database"                       => "UPC Datenbank",
-    "update"                             => "Ändere Artikel",
-    "use_inventory_menu"                 => "Verwende Bestandesmenu",
+    'add_minus'                          => 'Bestandsänderung',
+    'allow_alt_description'              => 'Erlaube Alt. Bez.',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => 'Sammeländerung',
+    'buy_price_required'                 => 'Einkaufspreis ist erforderlich',
+    'cannot_be_deleted'                  => 'Gewählte Artikel können nicht gelöscht werden, einer odere mehrere weisen Verkäufe auf',
+    'cannot_find_item'                   => 'Konnte Artikel nicht finden',
+    'categories'                         => '',
+    'category'                           => 'Kategorie',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategorie ist erforderlich',
+    'change_all_to_allow_alt_desc'       => 'Ändere alle zu Erlaube Alt. Bez.',
+    'change_all_to_not_allow_allow_desc' => 'Ändere alle zu NICHT Erlaube Alt. Bez.',
+    'change_all_to_serialized'           => 'Ändere alle zu serialisiert',
+    'change_all_to_unserialized'         => 'Ändere alle zu nicht serialisiert',
+    'change_image'                       => 'Bild ändern',
+    'confirm_bulk_edit'                  => 'Wollen Sie alle gewählten Artikel ändern?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Alle Artikel-Steuerinformationen werden ersetzt.',
+    'confirm_delete'                     => 'Wollen Sie alle gewählten Artikel löschen?',
+    'confirm_restore'                    => '',
+    'cost_price'                         => 'Einstandspreis',
+    'cost_price_number'                  => 'Einstandspresi muss eine Zahl sein',
+    'cost_price_required'                => 'Einstandspreis ist erforderlich',
+    'count'                              => 'Ändere Bestand',
+    'csv_import_failed'                  => 'CSV Import fehlerhaft',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Die hochgeladene Datei enthält keine Daten oder ist falsch formatiert.',
+    'csv_import_partially_failed'        => 'Bei {0} Artikelimporten sind in den Zeilen {1} Fehler aufgetreten. Es wurden keine Zeilen importiert.',
+    'csv_import_success'                 => 'Artikelimport erfolgreich.',
+    'current_quantity'                   => 'Aktuelle Menge',
+    'default_pack_name'                  => '',
+    'description'                        => 'Bezeichnung',
+    'details_count'                      => 'Lagerbestandsdetails',
+    'do_nothing'                         => 'Tue nichts',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Ändern Sie die Felder für ALLE gewählten Artikel?',
+    'edit_multiple_items'                => 'Sammeländerung',
+    'empty_upc_items'                    => 'Leere UPC Artikel',
+    'error_adding_updating'              => 'Fehler beim Hinzufügen/Ändern',
+    'error_updating_multiple'            => 'Fehler beim Ändern',
+    'generate_barcodes'                  => 'Generiere Barcodes',
+    'hsn_code'                           => '',
+    'image'                              => 'Bild',
+    'import_items_csv'                   => 'Importiere Artikel mit CSV Datei',
+    'info_provided_by'                   => 'Informationen bereitgestellt von',
+    'inventory'                          => 'Lagerbestand',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Bemerkungen',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => 'Gelöscht',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Artikel hat Serien-Nr.',
+    'item'                               => 'Artikel',
+    'item_id'                            => '',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'Die Artikelnummer existiert bereits in der Datenbank',
+    'item_number_invalid'                => 'Die Artikelnummer enthält nicht zulässige Zeichen.',
+    'kit'                                => '',
+    'location'                           => 'Ort',
+    'low_inventory_items'                => 'nicht am Lager',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => 'Manuelle Bestandesänderung',
+    'markup'                             => '',
+    'name'                               => 'Artikelname',
+    'name_required'                      => 'Artikelname ist erforderlich',
+    'new'                                => 'Neuer Artikel',
+    'no_description_items'               => 'Artikel ohne Bezeichnung',
+    'no_items_to_display'                => 'Keine Artikel zum Anzeigen',
+    'none'                               => 'Nichts',
+    'none_selected'                      => 'Sie haben keine Artikel zum Ändern gewählt',
+    'nonstock'                           => '',
+    'number_information'                 => 'Artikelnummer',
+    'number_required'                    => 'UPC/EAN/ISBN ist erforderlich',
+    'one_or_multiple'                    => 'Artikel',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => 'Menge',
+    'quantity_number'                    => 'Menge muss eine Zahl sein',
+    'quantity_required'                  => 'Menge ist erforderlich',
+    'receiving_quantity'                 => 'Eingangsmenge',
+    'remove_image'                       => 'Bild löschen',
+    'reorder_level'                      => 'Mindestbestand',
+    'reorder_level_number'               => 'Mindestbestand muss eine Zahl sein',
+    'reorder_level_required'             => 'Mindestbestand ist erforderlich',
+    'retrive_item_info'                  => 'Artikelinformation',
+    'sales_tax_1'                        => 'Umsatzsteuer 1',
+    'sales_tax_2'                        => 'Umsatzsteuer 2',
+    'search_attributes'                  => 'Suche in Zusatzfeldern',
+    'select_image'                       => 'Bild auswählen',
+    'serialized_items'                   => 'Serialisierte Artikel',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => 'Lagerort',
+    'stock_type'                         => '',
+    'successful_adding'                  => 'Artikel erfolgreich hinzugefügt',
+    'successful_bulk_edit'               => 'Die gewählten Artikel wurden erforlgreich geändert',
+    'successful_deleted'                 => 'Löschung erfolgreich',
+    'successful_updating'                => 'Änderung erfolgreich',
+    'supplier'                           => 'Lieferant',
+    'tax_1'                              => 'MWSt 1',
+    'tax_2'                              => 'MWSt 2',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Der Steuername enthält nicht erlaubte Zeichen.',
+    'tax_percent'                        => 'MWSt %',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => 'MWSt % ist erforderlich',
+    'tax_percents'                       => 'Steuerprozent(e)',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => 'Preis',
+    'unit_price_number'                  => 'Preis muss eine Zahl sein',
+    'unit_price_required'                => 'Preis ist erforderlich',
+    'upc_database'                       => 'UPC Datenbank',
+    'update'                             => 'Ändere Artikel',
+    'use_inventory_menu'                 => 'Verwende Bestandesmenu',
 ];
diff --git a/app/Language/de-CH/Login.php b/app/Language/de-CH/Login.php
index 78c7e5c58..d7ba28728 100644
--- a/app/Language/de-CH/Login.php
+++ b/app/Language/de-CH/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "Start",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "Ungültiger Benutzername/Passwort",
-    "login"                         => "Login",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Passwort",
-    "required_username"             => "",
-    "username"                      => "Benutzername",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "Start",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "Ungültiger Benutzername/Passwort",
+    "login"                               => "Login",
+    "logout"                              => "Abmelden",
+    "migrating_database"                  => "Datenbank wird migriert",
+    "migration_auth_message"              => "Administrator-Anmeldedaten sind erforderlich, um die Datenbank-Migration auf Version {0} zu autorisieren. Bitte melden Sie sich an, um fortzufahren.",
+    "migration_complete"                  => "Datenbank erfolgreich initialisiert!",
+    "migration_complete_login"            => "Sie können sich jetzt anmelden.",
+    "migration_complete_migrate"          => "Datenbank erfolgreich migriert!",
+    "migration_complete_redirect"         => "Migration abgeschlossen. Weiterleitung zur Anmeldung...",
+    "migration_error_connection"          => "Verbindungsfehler. Bitte versuchen Sie es erneut.",
+    "migration_failed"                    => "Migration fehlgeschlagen",
+    "migration_initializing"              => "Datenbank wird initialisiert",
+    "migration_needed"                    => "Eine Datenbank-Migration auf {0} wird nach der Anmeldung gestartet.",
+    "migration_required"                  => "Datenbank-Migration erforderlich",
+    "migration_running"                   => "Datenbank-Migrationen werden ausgeführt...",
+    "password"                            => "Passwort",
+    "required_username"                   => "Das Feld Benutzername ist erforderlich.",
+    'too_many_attempts'                   => 'Zu viele Versuche. Bitte warten Sie einen Moment und versuchen Sie es erneut.',
+    "username"                            => "Benutzername",
+    "welcome"                             => "Willkommen bei {0}!"
 ];
diff --git a/app/Language/de-CH/Reports.php b/app/Language/de-CH/Reports.php
index cb31a533e..ef4717c2a 100644
--- a/app/Language/de-CH/Reports.php
+++ b/app/Language/de-CH/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "Steuern",
     "taxes_summary_report"                    => "Bericht: Steuern (summarisch)",
+    "toggle_cost_and_profit"                  => "Kosten & Gewinn umschalten",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Total Inventarwert",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/de-CH/Sales.php b/app/Language/de-CH/Sales.php
index 32d1cc228..df9860977 100644
--- a/app/Language/de-CH/Sales.php
+++ b/app/Language/de-CH/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "Zahlung",
-    "amount_due"                       => "fälliger Betrag",
-    "amount_tendered"                  => "Erhalten",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "Annullieren",
-    "cash"                             => "Bar",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "Bar",
-    "change_due"                       => "Wechselgeld",
-    "change_price"                     => "",
-    "check"                            => "Scheck",
-    "check_balance"                    => "Scheck-Differenz",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "Bemerkung",
-    "comments"                         => "Bemerkungen",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Abschliessen",
-    "confirm_cancel_sale"              => "Wollen Sie diesen Verkauf abschliessen? Alle Artikeleinträge werden entfernt",
-    "confirm_delete"                   => "Wollen Sie die gewählten Aufträge löschen?",
-    "confirm_restore"                  => "",
-    "credit"                           => "Kreditkarte",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Kunde",
-    "customer_address"                 => "Customer Address",
-    "customer_discount"                => "Discount",
-    "customer_email"                   => "Customer Email",
-    "customer_location"                => "Customer Location",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Datum",
-    "date_range"                       => "Zeitrahmen",
-    "date_required"                    => "Ein korrektas Datum ist erforderlich",
-    "date_type"                        => "Datum ist erforderlich",
-    "debit"                            => "Debitkarte",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "Wollen Sie diesen Auftrag löschen? Rückgängig unmöglich",
-    "delete_entire_sale"               => "Auftrag löschen",
-    "delete_successful"                => "Löschung erfolgreich",
-    "delete_unsuccessful"              => "Löschung nicht erfolgreich",
-    "description_abbrv"                => "Bez.",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "%",
-    "discount_included"                => "Rabatt %",
-    "discount_short"                   => "%",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "Ändern",
-    "edit_item"                        => "Ändere Art.",
-    "edit_sale"                        => "Auftrag ändern",
-    "email_receipt"                    => "Quittung per Email",
-    "employee"                         => "Mitarbeiter",
-    "entry"                            => "",
-    "error_editing_item"               => "Fehler beim Ändern des Artikels",
-    "find_or_scan_item"                => "Finde/Scanne Artikel",
-    "find_or_scan_item_or_receipt"     => "Finde/Scanne Artikel oder Quittung",
-    "giftcard"                         => "Gutschein",
-    "giftcard_balance"                 => "Gutschein Restwert",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gutschein Nr.",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "ID",
-    "include_prices"                   => "",
-    "invoice"                          => "Rechnung",
-    "invoice_confirm"                  => "Diese rechnung wird gesendet an",
-    "invoice_enable"                   => "Erzeuge Rechnung",
-    "invoice_filter"                   => "Rechnungen",
-    "invoice_no_email"                 => "Dieser Kunde hat keine gültige Email Adresse",
-    "invoice_number"                   => "Rechnungs-Nr.",
-    "invoice_number_duplicate"         => "Bitte geben Sie eine eindeutige Rechnungsnummer ein",
-    "invoice_sent"                     => "Rechnung gesendet an",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "Rechnung nicht gesendet",
-    "invoice_update"                   => "Aktualisieren",
-    "item_insufficient_of_stock"       => "Artikel hat Unterbestand",
-    "item_name"                        => "Artikelname",
-    "item_number"                      => "Artikel-Nr.",
-    "item_out_of_stock"                => "Artikel ist nicht am Lager",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Verkaufstyp",
-    "must_enter_numeric"               => "Eingabe muss eine Zahl sein",
-    "must_enter_numeric_giftcard"      => "Gutschein-Nr. muss eine Zahl sein",
-    "new_customer"                     => "Neuer Kunde",
-    "new_item"                         => "Neuer Artikel",
-    "no_description"                   => "nichts",
-    "no_filter"                        => "Alle",
-    "no_items_in_cart"                 => "Warenkorb ist leer",
-    "no_sales_to_display"              => "Keine Artikel zum Anzeigen",
-    "none_selected"                    => "Sie haben keinen Auftrag zum Löschen ausgewählt",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "Verkäufe",
-    "payment"                          => "Zahlungsart",
-    "payment_amount"                   => "Betrag",
-    "payment_not_cover_total"          => "Betrag deckt Rechnungsbetrag nicht",
-    "payment_type"                     => "Typ",
-    "payments"                         => "",
-    "payments_total"                   => "Zahlung Total",
-    "price"                            => "Preis",
-    "print_after_sale"                 => "Drucke Bon nach Verkauf",
-    "quantity"                         => "Menge",
-    "quantity_less_than_reorder_level" => "Warnung: Gewünschte Menge ist nicht verfügbar.",
-    "quantity_less_than_zero"          => "Warnung: Gewünschte Menge ist nicht verfügbar. Sie können den Verkauf fortsetzen, dennoch prüfen Sie bitte den Lagerbestand.",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "Quittung",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "Quittung Nr.",
-    "receipt_sent"                     => "Quittung gesendet an",
-    "receipt_unsent"                   => "Quittung nicht gesendet",
-    "refund"                           => "",
-    "register"                         => "Kasse",
-    "remove_customer"                  => "Entferne Kunde",
-    "remove_discount"                  => "",
-    "return"                           => "Retoure",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "Verkauf",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "Kunde:",
-    "sale_time"                        => "Zeit",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "Wähle Kunde (optional)",
-    "send_invoice"                     => "Sende Rechnung",
-    "send_quote"                       => "",
-    "send_receipt"                     => "Sende Quittung",
-    "send_work_order"                  => "",
-    "serial"                           => "Seriennummer",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Rechnung",
-    "show_receipt"                     => "Quittung",
-    "start_typing_customer_name"       => "Geben Sie den Kundennamen ein...",
-    "start_typing_item_name"           => "Geben Sie den Artikel ein oder scannen Sie ihn...",
-    "stock"                            => "",
-    "stock_location"                   => "Lagerort",
-    "sub_total"                        => "Zwischentotal",
-    "successfully_deleted"             => "Löschung erfolgreich",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "Auftrag wurde erfolgreich pendent gehalten",
-    "successfully_updated"             => "Änderung erfolgreich",
-    "suspend_sale"                     => "->Pendent",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Pendente Aufträge",
-    "table"                            => "",
-    "takings"                          => "Einnahmen",
-    "tax"                              => "MWSt",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "MWSt %",
-    "taxed_ind"                        => "",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Total exkl. MWSt.",
-    "transaction_failed"               => "Verarbeitung fehlerhaft",
-    "unable_to_add_item"               => "Kann Artikel nicht zum Auftrag hinzufügen",
-    "unsuccessfully_deleted"           => "Löschung nicht erfolgreich",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "Auftrag wurde erfolgreich pendent gehalten",
-    "unsuccessfully_updated"           => "Änderung nicht erfolgreich",
-    "unsuspend"                        => "Aktivieren",
-    "unsuspend_and_delete"             => "Aktivieren und löschen",
-    "update"                           => "Ändern",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => 'Zahlung',
+    'amount_due'                        => 'fälliger Betrag',
+    'amount_due_not_covered'            => 'Die Zahlungen decken den fälligen Betrag nicht.',
+    'amount_tendered'                   => 'Erhalten',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => 'Annullieren',
+    'cash'                              => 'Bar',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => 'Bar',
+    'change_due'                        => 'Wechselgeld',
+    'change_price'                      => '',
+    'check'                             => 'Scheck',
+    'check_balance'                     => 'Scheck-Differenz',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => 'Bemerkung',
+    'comments'                          => 'Bemerkungen',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Abschliessen',
+    'confirm_cancel_sale'               => 'Wollen Sie diesen Verkauf abschliessen? Alle Artikeleinträge werden entfernt',
+    'confirm_delete'                    => 'Wollen Sie die gewählten Aufträge löschen?',
+    'confirm_restore'                   => '',
+    'credit'                            => 'Kreditkarte',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Kunde',
+    'customer_address'                  => 'Customer Address',
+    'customer_discount'                 => 'Discount',
+    'customer_email'                    => 'Customer Email',
+    'customer_location'                 => 'Customer Location',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => 'Datum',
+    'date_range'                        => 'Zeitrahmen',
+    'date_required'                     => 'Ein korrektas Datum ist erforderlich',
+    'date_type'                         => 'Datum ist erforderlich',
+    'debit'                             => 'Debitkarte',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => 'Wollen Sie diesen Auftrag löschen? Rückgängig unmöglich',
+    'delete_entire_sale'                => 'Auftrag löschen',
+    'delete_successful'                 => 'Löschung erfolgreich',
+    'delete_unsuccessful'               => 'Löschung nicht erfolgreich',
+    'description_abbrv'                 => 'Bez.',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '%',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => 'Rabatt %',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => 'Ändern',
+    'edit_item'                         => 'Ändere Art.',
+    'edit_sale'                         => 'Auftrag ändern',
+    'email_receipt'                     => 'Quittung per Email',
+    'employee'                          => 'Mitarbeiter',
+    'entry'                             => '',
+    'error_editing_item'                => 'Fehler beim Ändern des Artikels',
+    'find_or_scan_item'                 => 'Finde/Scanne Artikel',
+    'find_or_scan_item_or_receipt'      => 'Finde/Scanne Artikel oder Quittung',
+    'giftcard'                          => 'Gutschein',
+    'giftcard_balance'                  => 'Gutschein Restwert',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Gutschein Nr.',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => 'ID',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Unzureichendes Geschenkguthaben für diese Zahlung.',
+    'insufficient_reward_points'        => 'Unzureichende Prämienpunkte für diese Zahlung.',
+    'invoice'                           => 'Rechnung',
+    'invoice_confirm'                   => 'Diese rechnung wird gesendet an',
+    'invoice_enable'                    => 'Erzeuge Rechnung',
+    'invoice_filter'                    => 'Rechnungen',
+    'invoice_no_email'                  => 'Dieser Kunde hat keine gültige Email Adresse',
+    'invoice_number'                    => 'Rechnungs-Nr.',
+    'invoice_number_duplicate'          => 'Bitte geben Sie eine eindeutige Rechnungsnummer ein',
+    'invoice_sent'                      => 'Rechnung gesendet an',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => 'Rechnung nicht gesendet',
+    'invoice_update'                    => 'Aktualisieren',
+    'item_insufficient_of_stock'        => 'Artikel hat Unterbestand',
+    'item_name'                         => 'Artikelname',
+    'item_number'                       => 'Artikel-Nr.',
+    'item_out_of_stock'                 => 'Artikel ist nicht am Lager',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Verkaufstyp',
+    'must_enter_numeric'                => 'Eingabe muss eine Zahl sein',
+    'must_enter_numeric_giftcard'       => 'Gutschein-Nr. muss eine Zahl sein',
+    'must_enter_reference_code'         => 'Referenz-/Abrufnummer muss eingegeben werden.',
+    'negative_amount_tendered'          => 'Der erhaltene Betrag darf nicht negativ sein.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Neuer Kunde',
+    'new_item'                          => 'Neuer Artikel',
+    'no_description'                    => 'nichts',
+    'no_filter'                         => 'Alle',
+    'no_items_in_cart'                  => 'Warenkorb ist leer',
+    'no_sales_to_display'               => 'Keine Artikel zum Anzeigen',
+    'none_selected'                     => 'Sie haben keinen Auftrag zum Löschen ausgewählt',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => 'Verkäufe',
+    'payment'                           => 'Zahlungsart',
+    'payment_amount'                    => 'Betrag',
+    'payment_not_cover_total'           => 'Betrag deckt Rechnungsbetrag nicht',
+    'payment_type'                      => 'Typ',
+    'payments'                          => '',
+    'payments_total'                    => 'Zahlung Total',
+    'price'                             => 'Preis',
+    'print_after_sale'                  => 'Drucke Bon nach Verkauf',
+    'quantity'                          => 'Menge',
+    'quantity_less_than_reorder_level'  => 'Warnung: Gewünschte Menge ist nicht verfügbar.',
+    'quantity_less_than_zero'           => 'Warnung: Gewünschte Menge ist nicht verfügbar. Sie können den Verkauf fortsetzen, dennoch prüfen Sie bitte den Lagerbestand.',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => 'Quittung',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => 'Quittung Nr.',
+    'receipt_sent'                      => 'Quittung gesendet an',
+    'receipt_unsent'                    => 'Quittung nicht gesendet',
+    'reference_code'                    => 'Zahlungsreferenzcode',
+    'reference_code_invalid_characters' => 'Der Referenzcode darf nur Buchstaben und Zahlen enthalten.',
+    'reference_code_length_error'       => 'Die Länge des Referenzcodes ist ungültig.',
+    'refund'                            => '',
+    'register'                          => 'Kasse',
+    'remove_customer'                   => 'Entferne Kunde',
+    'remove_discount'                   => '',
+    'return'                            => 'Retoure',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => 'Verkauf',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => 'Kunde:',
+    'sale_time'                         => 'Zeit',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Wähle Kunde (optional)',
+    'send_invoice'                      => 'Sende Rechnung',
+    'send_quote'                        => '',
+    'send_receipt'                      => 'Sende Quittung',
+    'send_work_order'                   => '',
+    'serial'                            => 'Seriennummer',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Rechnung',
+    'show_receipt'                      => 'Quittung',
+    'start_typing_customer_name'        => 'Geben Sie den Kundennamen ein...',
+    'start_typing_item_name'            => 'Geben Sie den Artikel ein oder scannen Sie ihn...',
+    'stock'                             => '',
+    'stock_location'                    => 'Lagerort',
+    'sub_total'                         => 'Zwischentotal',
+    'successfully_deleted'              => 'Löschung erfolgreich',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => 'Auftrag wurde erfolgreich pendent gehalten',
+    'successfully_updated'              => 'Änderung erfolgreich',
+    'suspend_sale'                      => '->Pendent',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Pendente Aufträge',
+    'table'                             => '',
+    'takings'                           => 'Einnahmen',
+    'tax'                               => 'MWSt',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => 'MWSt %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Total exkl. MWSt.',
+    'transaction_failed'                => 'Verarbeitung fehlerhaft',
+    'unable_to_add_item'                => 'Kann Artikel nicht zum Auftrag hinzufügen',
+    'unsuccessfully_deleted'            => 'Löschung nicht erfolgreich',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => 'Auftrag wurde erfolgreich pendent gehalten',
+    'unsuccessfully_updated'            => 'Änderung nicht erfolgreich',
+    'unsuspend'                         => 'Aktivieren',
+    'unsuspend_and_delete'              => 'Aktivieren und löschen',
+    'update'                            => 'Ändern',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/de-DE/Attributes.php b/app/Language/de-DE/Attributes.php
index d6e9606c2..4afd86482 100644
--- a/app/Language/de-DE/Attributes.php
+++ b/app/Language/de-DE/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attributwert darf nicht ':' oder '|' enthalten",
-    "confirm_delete"                   => "Sind Sie sicher, dass Sie die ausgewählten Attribute löschen möchten?",
-    "confirm_restore"                  => "Sind Sie sicher, dass Sie die ausgewählten Attribute wiederherstellen möchten?",
-    "definition_cannot_be_deleted"     => "Ausgewählte Attribute konnten nicht gelöscht werden",
-    "definition_error_adding_updating" => "Das Attribut {0} konnte nicht hinzugefügt oder aktualisiert werden. Bitte überprüfen Sie den Error-Log.",
-    "definition_flags"                 => "Attribut Sichtbarkeit",
-    "definition_group"                 => "Gruppe",
-    "definition_id"                    => "ID",
-    "definition_name"                  => "Attribut hinzufügen",
-    "definition_name_required"         => "Attributname ist ein Pflichtfeld",
-    "definition_one_or_multiple"       => "Attribut(e)",
-    "definition_successful_adding"     => "Artikel erfolgreich hinzugefügt",
-    "definition_successful_deleted"    => "Löschung erfolgreich",
-    "definition_successful_updating"   => "Sie haben das Attributerfolgreich aktualisiert",
-    "definition_type"                  => "Attribut Typ",
-    "definition_type_required"         => "Attribut ist ein Pflichtfeld",
-    "definition_unit"                  => "Maßeinheit",
-    "definition_values"                => "Attribut Werte",
-    "new"                              => "Neues Attribut",
-    "no_attributes_to_display"         => "Keine Elemente zum Anzeigen",
-    "receipt_visibility"               => "Quittung",
-    "show_in_items"                    => "In Artikeln anzeigen",
-    "show_in_items_visibility"         => "Artikel",
-    "show_in_receipt"                  => "In Quittung anzeigen",
-    "show_in_receivings"               => "In Eingängen anzeigen",
-    "show_in_receivings_visibility"    => "Eingänge",
-    "show_in_sales"                    => "In Verkäufen anzeigen",
-    "show_in_sales_visibility"         => "Verkauf",
-    "update"                           => "Attribut aktualisieren",
+    'attribute_value_invalid_chars'    => 'Attributwert darf nicht \':\' oder \'|\' enthalten',
+    'confirm_delete'                   => 'Sind Sie sicher, dass Sie die ausgewählten Attribute löschen möchten?',
+    'confirm_restore'                  => 'Sind Sie sicher, dass Sie die ausgewählten Attribute wiederherstellen möchten?',
+    'definition_cannot_be_deleted'     => 'Ausgewählte Attribute konnten nicht gelöscht werden',
+    'definition_invalid_group' => 'Die ausgewählte Gruppe existiert nicht oder ist ungültig.',
+    'definition_error_adding_updating' => 'Das Attribut {0} konnte nicht hinzugefügt oder aktualisiert werden. Bitte überprüfen Sie den Error-Log.',
+    'definition_flags'                 => 'Attribut Sichtbarkeit',
+    'definition_group'                 => 'Gruppe',
+    'definition_id'                    => 'ID',
+    'definition_name'                  => 'Attribut hinzufügen',
+    'definition_name_required'         => 'Attributname ist ein Pflichtfeld',
+    'definition_one_or_multiple'       => 'Attribut(e)',
+    'definition_successful_adding'     => 'Artikel erfolgreich hinzugefügt',
+    'definition_successful_deleted'    => 'Löschung erfolgreich',
+    'definition_successful_updating'   => 'Sie haben das Attributerfolgreich aktualisiert',
+    'definition_type'                  => 'Attribut Typ',
+    'definition_type_required'         => 'Attribut ist ein Pflichtfeld',
+    'definition_unit'                  => 'Maßeinheit',
+    'definition_values'                => 'Attribut Werte',
+    'new'                              => 'Neues Attribut',
+    'no_attributes_to_display'         => 'Keine Elemente zum Anzeigen',
+    'receipt_visibility'               => 'Quittung',
+    'show_in_items'                    => 'In Artikeln anzeigen',
+    'show_in_items_visibility'         => 'Artikel',
+    'show_in_receipt'                  => 'In Quittung anzeigen',
+    'show_in_receivings'               => 'In Eingängen anzeigen',
+    'show_in_receivings_visibility'    => 'Eingänge',
+    'show_in_sales'                    => 'In Verkäufen anzeigen',
+    'show_in_sales_visibility'         => 'Verkauf',
+    'show_in_search'                   => 'In Suche anzeigen',
+    'show_in_search_visibility'        => 'Suche',
+    'update'                           => 'Attribut aktualisieren',
 ];
diff --git a/app/Language/de-DE/Bootstrap_tables.php b/app/Language/de-DE/Bootstrap_tables.php
index f860f9e9d..d5035bb86 100644
--- a/app/Language/de-DE/Bootstrap_tables.php
+++ b/app/Language/de-DE/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Alle",
-    "columns"              => "Spalten",
-    "hide_show_pagination" => "Seitenzahlen anzeigen/verbergen",
-    "loading"              => "Lade, bitte warten...",
-    "page_from_to"         => "Zeige {0} bis {1} von {2} Zeile(n)",
-    "refresh"              => "Aktualisieren",
-    "rows_per_page"        => "{0} Einträge pro Seite",
-    "toggle"               => "Umschalten",
+    'all' => "Alle",
+    'columns' => "Spalten",
+    'hide_show_pagination' => "Seitenzahlen anzeigen/verbergen",
+    'loading' => "Lade, bitte warten",
+    'page_from_to' => "Zeige {0} bis {1} von {2} Zeile(n)",
+    'refresh' => "Aktualisieren",
+    'rows_per_page' => "{0} Einträge pro Seite",
+    'toggle' => "Umschalten",
 ];
diff --git a/app/Language/de-DE/Calendar.php b/app/Language/de-DE/Calendar.php
new file mode 100644
index 000000000..7c95a27e6
--- /dev/null
+++ b/app/Language/de-DE/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "So",
+    "mo"        => "Mo",
+    "tu"        => "Di",
+    "we"        => "Mi",
+    "th"        => "Do",
+    "fr"        => "Fr",
+    "sa"        => "Sa",
+    "sun"       => "Son",
+    "mon"       => "Mon",
+    "tue"       => "Die",
+    "wed"       => "Mit",
+    "thu"       => "Don",
+    "fri"       => "Fre",
+    "sat"       => "Sam",
+    "sunday"    => "Sonntag",
+    "monday"    => "Montag",
+    "tuesday"   => "Dienstag",
+    "wednesday" => "Mittwoch",
+    "thursday"  => "Donnerstag",
+    "friday"    => "Freitag",
+    "saturday"  => "Samstag",
+    "jan"       => "Jan",
+    "feb"       => "Feb",
+    "mar"       => "Mär",
+    "apr"       => "Apr",
+    "may"       => "Mai",
+    "jun"       => "Jun",
+    "jul"       => "Jul",
+    "aug"       => "Aug",
+    "sep"       => "Sep",
+    "oct"       => "Okt",
+    "nov"       => "Nov",
+    "dec"       => "Dez",
+    "january"   => "Januar",
+    "february"  => "Februar",
+    "march"     => "März",
+    "april"     => "April",
+    "mayl"      => "Mai",
+    "june"      => "Juni",
+    "july"      => "Juli",
+    "august"    => "August",
+    "september" => "September",
+    "october"   => "Oktober",
+    "november"  => "November",
+    "december"  => "Dezember",
+];
\ No newline at end of file
diff --git a/app/Language/de-DE/Common.php b/app/Language/de-DE/Common.php
index f5204dde7..8f70d5ef6 100644
--- a/app/Language/de-DE/Common.php
+++ b/app/Language/de-DE/Common.php
@@ -3,18 +3,18 @@
 return [
     "address_1"                      => "Adresse 1",
     "address_2"                      => "Adresse 2",
-    "admin"                          => "",
+    "admin"                          => "Administrator",
     "city"                           => "Stadt",
-    "clerk"                          => "",
+    "clerk"                          => "Angestellter",
     "close"                          => "Schließen",
-    "color"                          => "",
+    "color"                          => "Theme-Farben",
     "comments"                       => "Kommentare",
     "common"                         => "Allgemein",
     "confirm_search"                 => "Sie haben eine oder mehrere Zeilen gewählt. Nach der Verarbeitung werden diese nicht mehr ausgewählt sein. Wollen Sie die Suche dennoch verarbeiten?",
     "copyrights"                     => "© 2010 - {0}",
     "correct_errors"                 => "Bitte korrigieren Sie vor dem Speichern die angezeigten Fehler",
     "country"                        => "Land",
-    "dashboard"                      => "",
+    "dashboard"                      => "Dashboard",
     "date"                           => "Datum",
     "delete"                         => "Löschen",
     "det"                            => "Details",
@@ -26,15 +26,15 @@ return [
     "export_csv_no"                  => "Nein",
     "export_csv_yes"                 => "Ja",
     "fields_required_message"        => "Die Felder in rot sind erforderlich",
-    "fields_required_message_unique" => "",
+    "fields_required_message_unique" => "Die rot markierten Felder sind erforderlich und müssen eindeutig sein",
     "first_name"                     => "Vorname",
     "first_name_required"            => "Vorname ist erforderlich.",
     "first_page"                     => "Erste",
     "gender"                         => "Geschlecht",
     "gender_female"                  => "W",
     "gender_male"                    => "M",
-    "gender_undefined"               => "",
-    "icon"                           => "",
+    "gender_undefined"               => "Undefiniert",
+    "icon"                           => "Symbol",
     "id"                             => "ID",
     "import"                         => "Import",
     "import_change_file"             => "Ändern",
@@ -48,21 +48,21 @@ return [
     "last_page"                      => "Letzte",
     "learn_about_project"            => "für neueste Nachrichten zum Projekt.",
     "list_of"                        => "Liste von",
-    "logo"                           => "",
-    "logo_mark"                      => "",
+    "logo"                           => "Logo",
+    "logo_mark"                      => "Marke",
     "logout"                         => "Ausloggen",
-    "manager"                        => "",
+    "manager"                        => "Manager",
     "migration_needed"               => "Eine Datenbankmigration auf {0} wird nach der Anmeldung gestartet.",
     "new"                            => "Neu",
-    "no"                             => "",
+    "no"                             => "Nein",
     "no_persons_to_display"          => "Keine Personen zum Anzeigen.",
     "none_selected_text"             => "[auswählen]",
     "or"                             => "Oder",
-    "people"                         => "",
+    "people"                         => "Personen",
     "phone_number"                   => "Telefon",
     "phone_number_required"          => "Telefon ist erforderlich",
     "please_visit_my"                => "Bitte beuschen Sie",
-    "position"                       => "",
+    "position"                       => "Position",
     "powered_by"                     => "Unterstützt von",
     "price"                          => "Preis",
     "print"                          => "Drucken",
@@ -73,8 +73,8 @@ return [
     "search"                         => "Suche",
     "search_options"                 => "Suchkriterien",
     "searched_for"                   => "Gescuht nach",
-    "software_short"                 => "",
-    "software_title"                 => "",
+    "software_short"                 => "OSPOS",
+    "software_title"                 => "Open Source Point of Sale",
     "state"                          => "BL/Kanton",
     "submit"                         => "Senden",
     "total_spent"                    => "Gesamtausgaben",
@@ -83,7 +83,7 @@ return [
     "website"                        => "Website",
     "welcome"                        => "Willkommen",
     "welcome_message"                => "Willkommen bei OSPOS, zum Beginnen auf ein Modul klicken.",
-    "yes"                            => "",
+    "yes"                            => "Ja",
     "you_are_using_ospos"            => "Sie verwenden Open Source Point Of Sale Version",
     "zip"                            => "PLZ",
 ];
diff --git a/app/Language/de-DE/Config.php b/app/Language/de-DE/Config.php
index 3f4600e7d..b4effff6e 100644
--- a/app/Language/de-DE/Config.php
+++ b/app/Language/de-DE/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adresse",
-    "address_required"                          => "Adresse ist erforderlich.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Erlaube doppelte Barcodes",
-    "apostrophe"                                => "Apostroph",
-    "backup_button"                             => "Sicherung",
-    "backup_database"                           => "Sicherungs-Datenbank",
-    "barcode"                                   => "Barcodes",
-    "barcode_company"                           => "Firmenname",
-    "barcode_configuration"                     => "Barcodes",
-    "barcode_content"                           => "Barcode Inhalt",
-    "barcode_first_row"                         => "Erste Zeile",
-    "barcode_font"                              => "Schrift",
-    "barcode_formats"                           => "Eingabeformate",
-    "barcode_generate_if_empty"                 => "Generiere Barcode wenn leer.",
-    "barcode_height"                            => "Höhe",
-    "barcode_id"                                => "Artikel-Nr/Name",
-    "barcode_info"                              => "Barcode Einstellung",
-    "barcode_layout"                            => "Barcode-Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Nummer in Zeile",
-    "barcode_page_cellspacing"                  => "Zellenabstand auf Seite.",
-    "barcode_page_width"                        => "Seitenbreite",
-    "barcode_price"                             => "Preis",
-    "barcode_second_row"                        => "Zeile 2",
-    "barcode_third_row"                         => "Zeile 3",
-    "barcode_tooltip"                           => "Warnung: Diese Funktion kann dazu führen, dass doppelte Elemente importiert oder erstellt werden.  Nicht verwenden, wenn Sie keine doppelten Barcodes wünschen.",
-    "barcode_type"                              => "Barcode Typ",
-    "barcode_width"                             => "Breite (px)",
-    "bottom"                                    => "Unten",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Bargeld Dezimalstellen",
-    "cash_decimals_tooltip"                     => "Wenn Währung und Bargeld die gleiche Anzahl Dezimalstellen haben, wird nicht gerundet.",
-    "cash_rounding"                             => "Bargeld Rundung",
-    "category_dropdown"                         => "",
-    "center"                                    => "Mitte",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "Komma",
-    "company"                                   => "Firmenname",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Bild ändern",
-    "company_logo"                              => "Logo",
-    "company_remove_image"                      => "Bild löschen",
-    "company_required"                          => "Firmenname ist erforderlich",
-    "company_select_image"                      => "Bild auswählen",
-    "company_website_url"                       => "Webseite ist nicht in korrektem Format (http://...).",
-    "country_codes"                             => "Ländercodes",
-    "country_codes_tooltip"                     => "Kommagetrennte Liste der Ländercodes für den Adressvergleich.",
-    "currency_code"                             => "Währungscode",
-    "currency_decimals"                         => "Währungsdezimalzahlen",
-    "currency_symbol"                           => "Währungssymbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Prämie",
-    "customer_reward_duplicate"                 => "Die Prämie muss eindeutig sein.",
-    "customer_reward_enable"                    => "Kundenprämien aktivieren",
-    "customer_reward_invalid_chars"             => "Eine Prämie darf kein '_' enthalten",
-    "customer_reward_required"                  => "Prämie ist erforderlich",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Datum und Uhrzeit Filter",
-    "datetimeformat"                            => "Datum und Zeit Format",
-    "decimal_point"                             => "Dezimaltrennzeichen",
-    "default_barcode_font_size_number"          => "Standard Barcode Schriftgröße muss eine Zahl sein.",
-    "default_barcode_font_size_required"        => "Standard Barcode Schriftgröße ist erforderlich.",
-    "default_barcode_height_number"             => "Standard Barcode Höhe muss eine Zahl sein.",
-    "default_barcode_height_required"           => "Standard Barcode Höhe ist erforderlich.",
-    "default_barcode_num_in_row_number"         => "Standard Barcode Nummer muss eine Zahl sein.",
-    "default_barcode_num_in_row_required"       => "Die Barcode Nummer ist erforderlich.",
-    "default_barcode_page_cellspacing_number"   => "Standard Barcode Zellabstand muss eine Zahl sein.",
-    "default_barcode_page_cellspacing_required" => "Der Barcode Zellabstand ist erforderlich.",
-    "default_barcode_page_width_number"         => "Standard Barcode Seitenbreite muss eine Zahl sein.",
-    "default_barcode_page_width_required"       => "Die Barcode Seitenbreite ist erforderlich.",
-    "default_barcode_width_number"              => "Standard Barcode Breite muss eine Zahl sein.",
-    "default_barcode_width_required"            => "Standard Barcode Breite ist erforderlich.",
-    "default_item_columns"                      => "Standardmäßig sichtbare Spalten für Artikel",
-    "default_origin_tax_code"                   => "Standard Steuer Kürzel",
-    "default_receivings_discount"               => "Standard Rabatt für Eingänge",
-    "default_receivings_discount_number"        => "Standard Rabatt für Eingänge muss eine Zahl sein.",
-    "default_receivings_discount_required"      => "Standard Rabatt für Eingänge ist erforderlich.",
-    "default_sales_discount"                    => "Standard Verkaufsrabatt",
-    "default_sales_discount_number"             => "Der Standard Verkaufsrabatt muss eine Zahl sein.",
-    "default_sales_discount_required"           => "Der Standard Verkaufsrabatt ist erforderlich.",
-    "default_tax_category"                      => "Standard-Steuerkategorie",
-    "default_tax_code"                          => "Standard Steuercode",
-    "default_tax_jurisdiction"                  => "Standard Steuerbehörde",
-    "default_tax_name_number"                   => "Standard Steuer Name muss ein String sein.",
-    "default_tax_name_required"                 => "Standardsteuerfeld ist erforderlich.",
-    "default_tax_rate"                          => "MWSt %",
-    "default_tax_rate_1"                        => "MWSt 1",
-    "default_tax_rate_2"                        => "MWSt 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Standard Steuersatz muss eine Zahl sein.",
-    "default_tax_rate_required"                 => "Standard Steuersatz ist erforderlich.",
-    "derive_sale_quantity"                      => "Aus Gesamtbetrag abgeleitete Verkaufsmengen",
-    "derive_sale_quantity_tooltip"              => "Falls ausgewählt wird ein neuer Artikeltyp für nach Gesamtbetrag bestellte Artikel bereitgestellt",
-    "dinner_table"                              => "Tisch",
-    "dinner_table_duplicate"                    => "Tisch muss eindeutig sein.",
-    "dinner_table_enable"                       => "Esstische aktivieren",
-    "dinner_table_invalid_chars"                => "Tischname darf kein '_' enthalten.",
-    "dinner_table_required"                     => "Tisch wird benötigt.",
-    "dot"                                       => "Punkt",
-    "email"                                     => "eMail",
-    "email_configuration"                       => "Email Konfiguration",
-    "email_mailpath"                            => "Pfad zu Sendmail",
-    "email_protocol"                            => "Protokoll",
-    "email_receipt_check_behaviour"             => "Kontrollkästchen E-Mail-Empfangsbestätigung",
-    "email_receipt_check_behaviour_always"      => "Immer ausgewählt",
-    "email_receipt_check_behaviour_last"        => "Letzte Auswahl speichern",
-    "email_receipt_check_behaviour_never"       => "Nie ausgewählt",
-    "email_smtp_crypto"                         => "SMTP Verschlüsselung",
-    "email_smtp_host"                           => "SMTP-Server",
-    "email_smtp_pass"                           => "SMTP Passwort",
-    "email_smtp_port"                           => "SMTP-Port",
-    "email_smtp_timeout"                        => "SMTP-Timeout",
-    "email_smtp_user"                           => "SMTP Benutzername",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Datenschutz durchsetzen",
-    "enforce_privacy_tooltip"                   => "Schützen Sie die Privatsphäre Ihrer Kunden und erzwingen Sie die Verschlüsselung von Daten im Falle der Löschung ihrer Daten",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Beginn Geschäftsjahr",
-    "financial_year_apr"                        => "1. April",
-    "financial_year_aug"                        => "1. August",
-    "financial_year_dec"                        => "1. Dezember",
-    "financial_year_feb"                        => "1. Februar",
-    "financial_year_jan"                        => "1. Januar",
-    "financial_year_jul"                        => "1. Juli",
-    "financial_year_jun"                        => "1. Juni",
-    "financial_year_mar"                        => "1. März",
-    "financial_year_may"                        => "1. Mai",
-    "financial_year_nov"                        => "1. November",
-    "financial_year_oct"                        => "1. Oktober",
-    "financial_year_sep"                        => "1. September",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Login reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA: Geheimer Schlüssel",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key wird benötigt",
-    "gcaptcha_site_key"                         => "reCAPTCHA: Seitenschlüssel",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key wird benötigt",
-    "gcaptcha_tooltip"                          => "Login mit Google reCAPTCHA schützen, das Icon anklicken um ein Schlüsselpaar zu erhalten.",
-    "general"                                   => "Allgemeines",
-    "general_configuration"                     => "Allgemeine Konfiguration",
-    "giftcard_number"                           => "Gutscheinnummer",
-    "giftcard_random"                           => "Zufällig Erzeugen",
-    "giftcard_series"                           => "Serie Erzeugen",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "Unterstützung für HSN-Codes einbinden",
-    "info"                                      => "Informationen",
-    "info_configuration"                        => "Generelle Einstellungen",
-    "input_groups"                              => "",
-    "integrations"                              => "Integrationen",
-    "integrations_configuration"                => "Drittanbieter Integrationen",
-    "invoice"                                   => "Rechnungs",
-    "invoice_configuration"                     => "Druckereinstellungen",
-    "invoice_default_comments"                  => "Rechnungskommentar",
-    "invoice_email_message"                     => "Rechnungsvorlage (Email)",
-    "invoice_enable"                            => "Rechnungsstellung einschalten",
-    "invoice_printer"                           => "Rechnungsdrucker",
-    "invoice_type"                              => "Rechnungsart",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warnung: Diese Funktion benötigt das Firefox jsPrintSetup addon. Trotzdem speichern?",
-    "language"                                  => "Sprache",
-    "last_used_invoice_number"                  => "Zuletzt verwendete Rechnungsnummer",
-    "last_used_quote_number"                    => "Zuletzt verwendete Angebotsnummer",
-    "last_used_work_order_number"               => "Zuletzt verwendete Arbeitsauftragsnummer",
-    "left"                                      => "Links",
-    "license"                                   => "Lizenz",
-    "license_configuration"                     => "Lizenzvereinbarung",
-    "line_sequence"                             => "Zeilenfolge",
-    "lines_per_page"                            => "Zeilen pro Seite",
-    "lines_per_page_number"                     => "Zeilen pro Seite muss eine Zahl sein.",
-    "lines_per_page_required"                   => "Zeilen pro Seite ist erforderlich.",
-    "locale"                                    => "Länder",
-    "locale_configuration"                      => "Länderkonfiguration",
-    "locale_info"                               => "Info Länderkonfiguration",
-    "location"                                  => "Lagerort",
-    "location_configuration"                    => "Lagerort",
-    "location_info"                             => "Lagerort-Information",
-    "login_form"                                => "",
-    "logout"                                    => "Wollen Sie vor dem Beenden eine Sicherung erstellen? Klicke [OK] für Sicherung.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp API Schlüssel",
-    "mailchimp_configuration"                   => "Mailchimp Konfiguration",
-    "mailchimp_key_successfully"                => "API Key ist gültig.",
-    "mailchimp_key_unsuccessfully"              => "API Key ist ungültig.",
-    "mailchimp_lists"                           => "Mailchimp Liste(n)",
-    "mailchimp_tooltip"                         => "Icon anklicken um API Key zu erhalten.",
-    "message"                                   => "Nachricht",
-    "message_configuration"                     => "Nachrichtenkonfiguration",
-    "msg_msg"                                   => "Gespeicherte Nachricht",
-    "msg_msg_placeholder"                       => "Wenn Sie eine SMS Vorlage benutzen wollen, geben Sie diese hier ein, ansonsten lassen Sie dieses Feld frei.",
-    "msg_pwd"                                   => "SMS-API Passwort",
-    "msg_pwd_required"                          => "SMS-API Passwort ist ein Pflichtfeld",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID ist ein Pflichtfeld",
-    "msg_uid"                                   => "SMS-API Benutzername",
-    "msg_uid_required"                          => "SMS-API Benutzername ist ein Pflichtfeld",
-    "multi_pack_enabled"                        => "Mehrere Pakete pro Artikel",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Benachrichtigungs Popup Position",
-    "number_format"                             => "Zahlenformat",
-    "number_locale"                             => "Länderkonfiguration",
-    "number_locale_invalid"                     => "Die eingegebene Lokale ist falsch. Bitte sehen Sie sich den Link im Tooltip an um einen korrekten Wert zu finden.",
-    "number_locale_required"                    => "Locale-Nummer ist ein Pflichtfeld.",
-    "number_locale_tooltip"                     => "Finden Sie eine korrekte Lokale über diesen Link.",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "OSPOS Installations Information",
-    "payment_options_order"                     => "Zahlungsarten Reihenfolge",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Telefon",
-    "phone_required"                            => "Telefon ist erforderlich.",
-    "print_bottom_margin"                       => "Unterer Rand",
-    "print_bottom_margin_number"                => "Unterer Rand muss eine Zahl sein.",
-    "print_bottom_margin_required"              => "Unterer Rand ist erforderlich.",
-    "print_delay_autoreturn"                    => "Automatisch zu 'Verkauf' zurückkehren nach",
-    "print_delay_autoreturn_number"             => "Automatisch zu 'Verkauf' zurückkehren nach ist erforderlich.",
-    "print_delay_autoreturn_required"           => "Automatisch zu 'Verkauf' zurückkehren nach muss eine Zahl sein.",
-    "print_footer"                              => "Drucke Browser Fusszeile",
-    "print_header"                              => "Drucke Browser Kopfzeile",
-    "print_left_margin"                         => "Rand links",
-    "print_left_margin_number"                  => "Rand links muss eine Zahl sein.",
-    "print_left_margin_required"                => "Rand links ist erforderlich.",
-    "print_receipt_check_behaviour"             => "Quittung drucken",
-    "print_receipt_check_behaviour_always"      => "Immer ausgewählt",
-    "print_receipt_check_behaviour_last"        => "Letzte Auswahl speichern",
-    "print_receipt_check_behaviour_never"       => "Nie ausgewählt",
-    "print_right_margin"                        => "Rand rechts",
-    "print_right_margin_number"                 => "Rand rechts muss eine Zahl sein.",
-    "print_right_margin_required"               => "Rand rechts ist erforderlich.",
-    "print_silently"                            => "Zeige Druckdialog",
-    "print_top_margin"                          => "Rand oben",
-    "print_top_margin_number"                   => "Rand oben muss eine Zahl sein.",
-    "print_top_margin_required"                 => "Rand oben ist erforderlich.",
-    "quantity_decimals"                         => "Mengendezimalstellen",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Angebot Standard-Kommentare",
-    "receipt"                                   => "Eingang",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Druckereinstellungen",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Schriftgröße",
-    "receipt_font_size_number"                  => "Schriftgröße muss eine Zahl sein.",
-    "receipt_font_size_required"                => "Schriftgröße ist erforderlich.",
-    "receipt_info"                              => "Quittungsinformation",
-    "receipt_printer"                           => "Quittungsdrucker",
-    "receipt_short"                             => "Kurz",
-    "receipt_show_company_name"                 => "Firmenname anzeigen",
-    "receipt_show_description"                  => "Beschreibung anzeigen",
-    "receipt_show_serialnumber"                 => "Seriennummer anzeigen",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "Zeige MWSt",
-    "receipt_show_total_discount"               => "Zeige Gesamtrabatt",
-    "receipt_template"                          => "Quittungs Template",
-    "receiving_calculate_average_price"         => "Berechne Durchschnittseinkaufspreis",
-    "recv_invoice_format"                       => "Format Eingangsrechnung",
-    "register_mode_default"                     => "Standard Kassenmodus",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Rücknahmebedingungen sind erforderlich.",
-    "reward"                                    => "Prämie",
-    "reward_configuration"                      => "Prämien Konfiguration",
-    "right"                                     => "Rechts",
-    "sales_invoice_format"                      => "Format Verkaufsrechnung",
-    "sales_quote_format"                        => "Angebotsformat",
-    "saved_successfully"                        => "Einstellungen erfolgreich gesichert.",
-    "saved_unsuccessfully"                      => "Einstellungen konnten nicht gesichert werden.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Bitte nutzen Sie die unten genannten Informationen für Problemberichterstattung.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Verwaltungssymbol anzeigen",
-    "statistics"                                => "Statistiken Senden",
-    "statistics_tooltip"                        => "Statistiken Senden für programierung und verbesserungen.",
-    "stock_location"                            => "Lagerort",
-    "stock_location_duplicate"                  => "Bitte verwenden Sie einen eindeutigen Lagerort.",
-    "stock_location_invalid_chars"              => "Der Lagerort kann keine Unterstriche enthalten.",
-    "stock_location_required"                   => "Lagerort Nummer ist erforderlich.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Spalte 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Vorschläge Layout",
-    "suggestions_second_column"                 => "Spalte 2",
-    "suggestions_third_column"                  => "Spalte 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Tabelle",
-    "table_configuration"                       => "Tabelle konfigurieren",
-    "takings_printer"                           => "Einnahmendrucker",
-    "tax"                                       => "Steuer",
-    "tax_category"                              => "Steuerkategorie",
-    "tax_category_duplicate"                    => "Die eingegebene Steuerkategorie existiert bereits.",
-    "tax_category_invalid_chars"                => "Die eingegebene Steuerkategorie ist ungültig.",
-    "tax_category_required"                     => "Die Steuerkategorie ist erforderlich.",
-    "tax_category_used"                         => "Die Steuerkategorie kann nicht gelöscht werden, da sie in Benutzung ist.",
-    "tax_configuration"                         => "Steuer-Konfiguration",
-    "tax_decimals"                              => "Steuer Dezimalstellen",
-    "tax_id"                                    => "Steuer ID",
-    "tax_included"                              => "MWSt inbegriffen",
-    "theme"                                     => "Design",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Tausendertrennzeichen",
-    "timezone"                                  => "Zeitzone",
-    "timezone_error"                            => "",
-    "top"                                       => "Oben",
-    "use_destination_based_tax"                 => "Zielabhängige Steuer verwenden",
-    "user_timezone"                             => "",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Unterstützung von Arbeitsaufträgen",
-    "work_order_format"                         => "Arbeitsauftragsformat",
+    'address'                                   => 'Adresse',
+    'address_required'                          => 'Adresse ist erforderlich.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Erlaube doppelte Barcodes',
+    'apostrophe'                                => 'Apostroph',
+    'backup_button'                             => 'Sicherung',
+    'backup_database'                           => 'Sicherungs-Datenbank',
+    'barcode'                                   => 'Barcodes',
+    'barcode_company'                           => 'Firmenname',
+    'barcode_configuration'                     => 'Barcodes',
+    'barcode_content'                           => 'Barcode Inhalt',
+    'barcode_first_row'                         => 'Erste Zeile',
+    'barcode_font'                              => 'Schrift',
+    'barcode_formats'                           => 'Eingabeformate',
+    'barcode_generate_if_empty'                 => 'Generiere Barcode wenn leer.',
+    'barcode_height'                            => 'Höhe',
+    'barcode_id'                                => 'Artikel-Nr/Name',
+    'barcode_info'                              => 'Barcode Einstellung',
+    'barcode_layout'                            => 'Barcode-Layout',
+    'barcode_name'                              => 'Name',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Nummer in Zeile',
+    'barcode_page_cellspacing'                  => 'Zellenabstand auf Seite.',
+    'barcode_page_width'                        => 'Seitenbreite',
+    'barcode_price'                             => 'Preis',
+    'barcode_second_row'                        => 'Zeile 2',
+    'barcode_third_row'                         => 'Zeile 3',
+    'barcode_tooltip'                           => 'Warnung: Diese Funktion kann dazu führen, dass doppelte Elemente importiert oder erstellt werden.  Nicht verwenden, wenn Sie keine doppelten Barcodes wünschen.',
+    'barcode_type'                              => 'Barcode Typ',
+    'barcode_width'                             => 'Breite (px)',
+    'bottom'                                    => 'Unten',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Bargeld Dezimalstellen',
+    'cash_decimals_tooltip'                     => 'Wenn Währung und Bargeld die gleiche Anzahl Dezimalstellen haben, wird nicht gerundet.',
+    'cash_rounding'                             => 'Bargeld Rundung',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Mitte',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'Komma',
+    'company'                                   => 'Firmenname',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Bild ändern',
+    'company_logo'                              => 'Logo',
+    'company_remove_image'                      => 'Bild löschen',
+    'company_required'                          => 'Firmenname ist erforderlich',
+    'company_select_image'                      => 'Bild auswählen',
+    'company_website_url'                       => 'Webseite ist nicht in korrektem Format (http://...).',
+    'country_codes'                             => 'Ländercodes',
+    'country_codes_tooltip'                     => 'Kommagetrennte Liste der Ländercodes für den Adressvergleich.',
+    'currency_code'                             => 'Währungscode',
+    'currency_decimals'                         => 'Währungsdezimalzahlen',
+    'currency_symbol'                           => 'Währungssymbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Prämie',
+    'customer_reward_duplicate'                 => 'Die Prämie muss eindeutig sein.',
+    'customer_reward_enable'                    => 'Kundenprämien aktivieren',
+    'customer_reward_invalid_chars'             => "Eine Prämie darf kein '_' enthalten",
+    'customer_reward_required'                  => 'Prämie ist erforderlich',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Datum und Uhrzeit Filter',
+    'datetimeformat'                            => 'Datum und Zeit Format',
+    'decimal_point'                             => 'Dezimaltrennzeichen',
+    'default_barcode_font_size_number'          => 'Standard Barcode Schriftgröße muss eine Zahl sein.',
+    'default_barcode_font_size_required'        => 'Standard Barcode Schriftgröße ist erforderlich.',
+    'default_barcode_height_number'             => 'Standard Barcode Höhe muss eine Zahl sein.',
+    'default_barcode_height_required'           => 'Standard Barcode Höhe ist erforderlich.',
+    'default_barcode_num_in_row_number'         => 'Standard Barcode Nummer muss eine Zahl sein.',
+    'default_barcode_num_in_row_required'       => 'Die Barcode Nummer ist erforderlich.',
+    'default_barcode_page_cellspacing_number'   => 'Standard Barcode Zellabstand muss eine Zahl sein.',
+    'default_barcode_page_cellspacing_required' => 'Der Barcode Zellabstand ist erforderlich.',
+    'default_barcode_page_width_number'         => 'Standard Barcode Seitenbreite muss eine Zahl sein.',
+    'default_barcode_page_width_required'       => 'Die Barcode Seitenbreite ist erforderlich.',
+    'default_barcode_width_number'              => 'Standard Barcode Breite muss eine Zahl sein.',
+    'default_barcode_width_required'            => 'Standard Barcode Breite ist erforderlich.',
+    'default_item_columns'                      => 'Standardmäßig sichtbare Spalten für Artikel',
+    'default_origin_tax_code'                   => 'Standard Steuer Kürzel',
+    'default_receivings_discount'               => 'Standard Rabatt für Eingänge',
+    'default_receivings_discount_number'        => 'Standard Rabatt für Eingänge muss eine Zahl sein.',
+    'default_receivings_discount_required'      => 'Standard Rabatt für Eingänge ist erforderlich.',
+    'default_sales_discount'                    => 'Standard Verkaufsrabatt',
+    'default_sales_discount_number'             => 'Der Standard Verkaufsrabatt muss eine Zahl sein.',
+    'default_sales_discount_required'           => 'Der Standard Verkaufsrabatt ist erforderlich.',
+    'default_tax_category'                      => 'Standard-Steuerkategorie',
+    'default_tax_code'                          => 'Standard Steuercode',
+    'default_tax_jurisdiction'                  => 'Standard Steuerbehörde',
+    'default_tax_name_number'                   => 'Standard Steuer Name muss ein String sein.',
+    'default_tax_name_required'                 => 'Standardsteuerfeld ist erforderlich.',
+    'default_tax_rate'                          => 'MWSt %',
+    'default_tax_rate_1'                        => 'MWSt 1',
+    'default_tax_rate_2'                        => 'MWSt 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Standard Steuersatz muss eine Zahl sein.',
+    'default_tax_rate_required'                 => 'Standard Steuersatz ist erforderlich.',
+    'derive_sale_quantity'                      => 'Aus Gesamtbetrag abgeleitete Verkaufsmengen',
+    'derive_sale_quantity_tooltip'              => 'Falls ausgewählt wird ein neuer Artikeltyp für nach Gesamtbetrag bestellte Artikel bereitgestellt',
+    'dinner_table'                              => 'Tisch',
+    'dinner_table_duplicate'                    => 'Tisch muss eindeutig sein.',
+    'dinner_table_enable'                       => 'Esstische aktivieren',
+    'dinner_table_invalid_chars'                => "Tischname darf kein '_' enthalten.",
+    'dinner_table_required'                     => 'Tisch wird benötigt.',
+    'dot'                                       => 'Punkt',
+    'email'                                     => 'eMail',
+    'email_configuration'                       => 'Email Konfiguration',
+    'email_mailpath'                            => 'Pfad zu Sendmail',
+    'email_protocol'                            => 'Protokoll',
+    'email_receipt_check_behaviour'             => 'Kontrollkästchen E-Mail-Empfangsbestätigung',
+    'email_receipt_check_behaviour_always'      => 'Immer ausgewählt',
+    'email_receipt_check_behaviour_last'        => 'Letzte Auswahl speichern',
+    'email_receipt_check_behaviour_never'       => 'Nie ausgewählt',
+    'email_smtp_crypto'                         => 'SMTP Verschlüsselung',
+    'email_smtp_host'                           => 'SMTP-Server',
+    'email_smtp_pass'                           => 'SMTP Passwort',
+    'email_smtp_port'                           => 'SMTP-Port',
+    'email_smtp_timeout'                        => 'SMTP-Timeout',
+    'email_smtp_user'                           => 'SMTP Benutzername',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Datenschutz durchsetzen',
+    'enforce_privacy_tooltip'                   => 'Schützen Sie die Privatsphäre Ihrer Kunden und erzwingen Sie die Verschlüsselung von Daten im Falle der Löschung ihrer Daten',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Beginn Geschäftsjahr',
+    'financial_year_apr'                        => '1. April',
+    'financial_year_aug'                        => '1. August',
+    'financial_year_dec'                        => '1. Dezember',
+    'financial_year_feb'                        => '1. Februar',
+    'financial_year_jan'                        => '1. Januar',
+    'financial_year_jul'                        => '1. Juli',
+    'financial_year_jun'                        => '1. Juni',
+    'financial_year_mar'                        => '1. März',
+    'financial_year_may'                        => '1. Mai',
+    'financial_year_nov'                        => '1. November',
+    'financial_year_oct'                        => '1. Oktober',
+    'financial_year_sep'                        => '1. September',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Login reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA: Geheimer Schlüssel',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key wird benötigt',
+    'gcaptcha_site_key'                         => 'reCAPTCHA: Seitenschlüssel',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key wird benötigt',
+    'gcaptcha_tooltip'                          => 'Login mit Google reCAPTCHA schützen, das Icon anklicken um ein Schlüsselpaar zu erhalten.',
+    'general'                                   => 'Allgemeines',
+    'general_configuration'                     => 'Allgemeine Konfiguration',
+    'giftcard_number'                           => 'Gutscheinnummer',
+    'giftcard_random'                           => 'Zufällig Erzeugen',
+    'giftcard_series'                           => 'Serie Erzeugen',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => 'Unterstützung für HSN-Codes einbinden',
+    'info'                                      => 'Informationen',
+    'info_configuration'                        => 'Generelle Einstellungen',
+    'input_groups'                              => '',
+    'integrations'                              => 'Integrationen',
+    'integrations_configuration'                => 'Drittanbieter Integrationen',
+    'invoice'                                   => 'Rechnungs',
+    'invoice_configuration'                     => 'Druckereinstellungen',
+    'invoice_default_comments'                  => 'Rechnungskommentar',
+    'invoice_email_message'                     => 'Rechnungsvorlage (Email)',
+    'invoice_enable'                            => 'Rechnungsstellung einschalten',
+    'invoice_printer'                           => 'Rechnungsdrucker',
+    'invoice_type'                              => 'Rechnungsart',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warnung: Diese Funktion benötigt das Firefox jsPrintSetup addon. Trotzdem speichern?',
+    'language'                                  => 'Sprache',
+    'last_used_invoice_number'                  => 'Zuletzt verwendete Rechnungsnummer',
+    'last_used_quote_number'                    => 'Zuletzt verwendete Angebotsnummer',
+    'last_used_work_order_number'               => 'Zuletzt verwendete Arbeitsauftragsnummer',
+    'left'                                      => 'Links',
+    'license'                                   => 'Lizenz',
+    'license_configuration'                     => 'Lizenzvereinbarung',
+    'line_sequence'                             => 'Zeilenfolge',
+    'lines_per_page'                            => 'Zeilen pro Seite',
+    'lines_per_page_number'                     => 'Zeilen pro Seite muss eine Zahl sein.',
+    'lines_per_page_required'                   => 'Zeilen pro Seite ist erforderlich.',
+    'locale'                                    => 'Länder',
+    'locale_configuration'                      => 'Länderkonfiguration',
+    'locale_info'                               => 'Info Länderkonfiguration',
+    'location'                                  => 'Lagerort',
+    'location_configuration'                    => 'Lagerort',
+    'location_info'                             => 'Lagerort-Information',
+    'login_form'                                => '',
+    'logout'                                    => 'Wollen Sie vor dem Beenden eine Sicherung erstellen? Klicke [OK] für Sicherung.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp API Schlüssel',
+    'mailchimp_configuration'                   => 'Mailchimp Konfiguration',
+    'mailchimp_key_successfully'                => 'API Key ist gültig.',
+    'mailchimp_key_unsuccessfully'              => 'API Key ist ungültig.',
+    'mailchimp_lists'                           => 'Mailchimp Liste(n)',
+    'mailchimp_tooltip'                         => 'Icon anklicken um API Key zu erhalten.',
+    'message'                                   => 'Nachricht',
+    'message_configuration'                     => 'Nachrichtenkonfiguration',
+    'msg_msg'                                   => 'Gespeicherte Nachricht',
+    'msg_msg_placeholder'                       => 'Wenn Sie eine SMS Vorlage benutzen wollen, geben Sie diese hier ein, ansonsten lassen Sie dieses Feld frei.',
+    'msg_pwd'                                   => 'SMS-API Passwort',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID ist ein Pflichtfeld',
+    'msg_uid'                                   => 'SMS-API Benutzername',
+    'msg_uid_required'                          => 'SMS-API Benutzername ist ein Pflichtfeld',
+    'multi_pack_enabled'                        => 'Mehrere Pakete pro Artikel',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Benachrichtigungs Popup Position',
+    'number_format'                             => 'Zahlenformat',
+    'number_locale'                             => 'Länderkonfiguration',
+    'number_locale_invalid'                     => 'Die eingegebene Lokale ist falsch. Bitte sehen Sie sich den Link im Tooltip an um einen korrekten Wert zu finden.',
+    'number_locale_required'                    => 'Locale-Nummer ist ein Pflichtfeld.',
+    'number_locale_tooltip'                     => 'Finden Sie eine korrekte Lokale über diesen Link.',
+    'os_timezone'                               => '',
+    'ospos_info'                                => 'OSPOS Installations Information',
+    'payment_options_order'                     => 'Zahlungsarten Reihenfolge',
+    'payment_reference_code_length_limits'      => 'Zahlungsreferenzcode<br>Längenbeschränkungen',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Telefon',
+    'phone_required'                            => 'Telefon ist erforderlich.',
+    'print_bottom_margin'                       => 'Unterer Rand',
+    'print_bottom_margin_number'                => 'Unterer Rand muss eine Zahl sein.',
+    'print_bottom_margin_required'              => 'Unterer Rand ist erforderlich.',
+    'print_delay_autoreturn'                    => "Automatisch zu 'Verkauf' zurückkehren nach",
+    'print_delay_autoreturn_number'             => "Automatisch zu 'Verkauf' zurückkehren nach ist erforderlich.",
+    'print_delay_autoreturn_required'           => "Automatisch zu 'Verkauf' zurückkehren nach muss eine Zahl sein.",
+    'print_footer'                              => 'Drucke Browser Fusszeile',
+    'print_header'                              => 'Drucke Browser Kopfzeile',
+    'print_left_margin'                         => 'Rand links',
+    'print_left_margin_number'                  => 'Rand links muss eine Zahl sein.',
+    'print_left_margin_required'                => 'Rand links ist erforderlich.',
+    'print_receipt_check_behaviour'             => 'Quittung drucken',
+    'print_receipt_check_behaviour_always'      => 'Immer ausgewählt',
+    'print_receipt_check_behaviour_last'        => 'Letzte Auswahl speichern',
+    'print_receipt_check_behaviour_never'       => 'Nie ausgewählt',
+    'print_right_margin'                        => 'Rand rechts',
+    'print_right_margin_number'                 => 'Rand rechts muss eine Zahl sein.',
+    'print_right_margin_required'               => 'Rand rechts ist erforderlich.',
+    'print_silently'                            => 'Zeige Druckdialog',
+    'print_top_margin'                          => 'Rand oben',
+    'print_top_margin_number'                   => 'Rand oben muss eine Zahl sein.',
+    'print_top_margin_required'                 => 'Rand oben ist erforderlich.',
+    'quantity_decimals'                         => 'Mengendezimalstellen',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Angebot Standard-Kommentare',
+    'receipt'                                   => 'Eingang',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Druckereinstellungen',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Schriftgröße',
+    'receipt_font_size_number'                  => 'Schriftgröße muss eine Zahl sein.',
+    'receipt_font_size_required'                => 'Schriftgröße ist erforderlich.',
+    'receipt_info'                              => 'Quittungsinformation',
+    'receipt_printer'                           => 'Quittungsdrucker',
+    'receipt_short'                             => 'Kurz',
+    'receipt_show_company_name'                 => 'Firmenname anzeigen',
+    'receipt_show_description'                  => 'Beschreibung anzeigen',
+    'receipt_show_serialnumber'                 => 'Seriennummer anzeigen',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'Zeige MWSt',
+    'receipt_show_total_discount'               => 'Zeige Gesamtrabatt',
+    'receipt_template'                          => 'Quittungs Template',
+    'receiving_calculate_average_price'         => 'Berechne Durchschnittseinkaufspreis',
+    'recv_invoice_format'                       => 'Format Eingangsrechnung',
+    'register_mode_default'                     => 'Standard Kassenmodus',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Rücknahmebedingungen sind erforderlich.',
+    'reward'                                    => 'Prämie',
+    'reward_configuration'                      => 'Prämien Konfiguration',
+    'right'                                     => 'Rechts',
+    'sales_invoice_format'                      => 'Format Verkaufsrechnung',
+    'sales_quote_format'                        => 'Angebotsformat',
+    'mailpath_invalid'                          => 'Ungültiger Sendmail-Pfad. Nur Buchstaben, Zahlen, Bindestriche, Unterstriche, Schrägstriche, Rückwärtsschrägstriche, Doppelpunkte, Leerzeichen und Punkte sind erlaubt.',
+    'saved_successfully'                        => 'Einstellungen erfolgreich gesichert.',
+    'saved_unsuccessfully'                      => 'Einstellungen konnten nicht gesichert werden.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Bitte nutzen Sie die unten genannten Informationen für Problemberichterstattung.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Verwaltungssymbol anzeigen',
+    'statistics'                                => 'Statistiken Senden',
+    'statistics_tooltip'                        => 'Statistiken Senden für programierung und verbesserungen.',
+    'stock_location'                            => 'Lagerort',
+    'stock_location_duplicate'                  => 'Bitte verwenden Sie einen eindeutigen Lagerort.',
+    'stock_location_invalid_chars'              => 'Der Lagerort kann keine Unterstriche enthalten.',
+    'stock_location_required'                   => 'Lagerort Nummer ist erforderlich.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Spalte 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Vorschläge Layout',
+    'suggestions_second_column'                 => 'Spalte 2',
+    'suggestions_third_column'                  => 'Spalte 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Tabelle',
+    'table_configuration'                       => 'Tabelle konfigurieren',
+    'takings_printer'                           => 'Einnahmendrucker',
+    'tax'                                       => 'Steuer',
+    'tax_category'                              => 'Steuerkategorie',
+    'tax_category_duplicate'                    => 'Die eingegebene Steuerkategorie existiert bereits.',
+    'tax_category_invalid_chars'                => 'Die eingegebene Steuerkategorie ist ungültig.',
+    'tax_category_required'                     => 'Die Steuerkategorie ist erforderlich.',
+    'tax_category_used'                         => 'Die Steuerkategorie kann nicht gelöscht werden, da sie in Benutzung ist.',
+    'tax_configuration'                         => 'Steuer-Konfiguration',
+    'tax_decimals'                              => 'Steuer Dezimalstellen',
+    'tax_id'                                    => 'Steuer ID',
+    'tax_included'                              => 'MWSt inbegriffen',
+    'theme'                                     => 'Design',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Tausendertrennzeichen',
+    'timezone'                                  => 'Zeitzone',
+    'timezone_error'                            => '',
+    'top'                                       => 'Oben',
+    'use_destination_based_tax'                 => 'Zielabhängige Steuer verwenden',
+    'user_timezone'                             => '',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Unterstützung von Arbeitsaufträgen',
+    'work_order_format'                         => 'Arbeitsauftragsformat',
 ];
diff --git a/app/Language/de-DE/Employees.php b/app/Language/de-DE/Employees.php
index bfc49ff9c..30bf3ef60 100644
--- a/app/Language/de-DE/Employees.php
+++ b/app/Language/de-DE/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Mitarbeiter-Information",
-    "cannot_be_deleted"            => "Konnte gewählten Mitarbeiter nicht löschen, einer oder mehrere weisen Verkäufe aus.",
-    "change_employee"              => "",
-    "change_password"              => "Passwort Ändern",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Wollen Sie diesen Mitarbeiter wirklich löschen?",
-    "confirm_restore"              => "Möchten Sie die ausgewählten Mitarbeiter wiederherstellen?",
-    "current_password"             => "Aktuelles Passwort",
-    "current_password_invalid"     => "Aktuelles Passwort ist ungültig.",
-    "employee"                     => "Mitarbeiter",
-    "error_adding_updating"        => "Fehler beim Hinzufügen/Ändern.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Sie können den Demo-Administrator nicht löschen.",
-    "error_updating_demo_admin"    => "Sie können den Demo-Administrator nicht verändern.",
-    "language"                     => "Sprache",
-    "login_info"                   => "Mitarbeiter Login",
-    "manager"                      => "",
-    "new"                          => "Neuer Mitarbeiter",
-    "none_selected"                => "Sie haben keine Mitarbeiter zum Löschen gewählt.",
-    "one_or_multiple"              => "Mitarbeiter",
-    "password"                     => "Passwort",
-    "password_minlength"           => "Das Passwort muss mindestens 8 Zeichen lang sein.",
-    "password_must_match"          => "Passwörter stimmen nicht überein.",
-    "password_not_must_match"      => "Altes und neues Passwort dürfen nicht gleich sein.",
-    "password_required"            => "Passwort ist erforderlich.",
-    "permission_desc"              => "Klicken Sie unten, um die jeweiligen Zugangsrechte zu aktivieren.",
-    "permission_info"              => "Mitarbeiter Zugangsrechte",
-    "repeat_password"              => "Wiederhole Passwort",
-    "subpermission_required"       => "Fügen Sie mindestens ein Zugangsrecht pro Modul hinzu.",
-    "successful_adding"            => "Hinzufügen erfolgreich.",
-    "successful_change_password"   => "Passwort erfolgreich geändert.",
-    "successful_deleted"           => "Löschung erfolgreich",
-    "successful_updating"          => "Änderung erfolgreich",
-    "system_language"              => "System Sprache",
-    "unsuccessful_change_password" => "Passwort ändern fehlgeschlagen.",
-    "update"                       => "Mitarbeiter ändern",
-    "username"                     => "Benutzername",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Benutzername muss mindestens 5 Zeichen lang sein.",
-    "username_required"            => "Benutzername ist erforderlich.",
+    'administrator'                          => 'Administrator',
+    'basic_information'                      => 'Mitarbeiter-Information',
+    'cannot_be_deleted'                      => 'Konnte gewählten Mitarbeiter nicht löschen, einer oder mehrere weisen Verkäufe aus.',
+    'change_employee'                        => 'Mitarbeiter ändern',
+    'change_password'                        => 'Passwort Ändern',
+    'clerk'                                  => 'Angestellter',
+    'commission'                             => 'Provision',
+    'confirm_delete'                         => 'Wollen Sie diesen Mitarbeiter wirklich löschen?',
+    'confirm_restore'                        => 'Möchten Sie die ausgewählten Mitarbeiter wiederherstellen?',
+    'current_password'                       => 'Aktuelles Passwort',
+    'current_password_invalid'               => 'Aktuelles Passwort ist ungültig.',
+    'employee'                               => 'Mitarbeiter',
+    'error_adding_updating'                  => 'Fehler beim Hinzufügen/Ändern.',
+    'error_cannot_remove_own_minimum_grant'  => 'Sie können Ihre eigenen minimalen Zugangsrechte für Module nicht entfernen.',
+    'error_deleting_admin'                   => 'Sie können keinen Administrator löschen.',
+    'error_deleting_demo_admin'              => 'Sie können den Demo-Administrator nicht löschen.',
+    'error_grant_change_disallowed'          => 'Berechtigungsänderungen sind in dieser Demo deaktiviert.',
+    'error_password_change_disallowed'       => 'Passwortänderungen sind in dieser Demo deaktiviert.',
+    'error_updating_admin'                   => 'Sie können keinen Administrator ändern.',
+    'error_updating_demo_admin'              => 'Sie können den Demo-Administrator nicht verändern.',
+    'language'                               => 'Sprache',
+    'login_info'                             => 'Mitarbeiter Login',
+    'manager'                                => 'Manager',
+    'new'                                    => 'Neuer Mitarbeiter',
+    'none_selected'                          => 'Sie haben keine Mitarbeiter zum Löschen gewählt.',
+    'one_or_multiple'                        => 'Mitarbeiter',
+    'password'                               => 'Passwort',
+    'password_minlength'                     => 'Das Passwort muss mindestens 8 Zeichen lang sein.',
+    'password_must_match'                    => 'Passwörter stimmen nicht überein.',
+    'password_not_must_match'                => 'Altes und neues Passwort dürfen nicht gleich sein.',
+    'password_required'                      => 'Passwort ist erforderlich.',
+    'permission_desc'                        => 'Klicken Sie unten, um die jeweiligen Zugangsrechte zu aktivieren.',
+    'permission_info'                        => 'Mitarbeiter Zugangsrechte',
+    'repeat_password'                        => 'Wiederhole Passwort',
+    'subpermission_required'                 => 'Fügen Sie mindestens ein Zugangsrecht pro Modul hinzu.',
+    'successful_adding'                      => 'Hinzufügen erfolgreich.',
+    'successful_change_password'             => 'Passwort erfolgreich geändert.',
+    'successful_deleted'                     => 'Löschung erfolgreich',
+    'successful_updating'                    => 'Änderung erfolgreich',
+    'system_language'                        => 'System Sprache',
+    'unsuccessful_change_password'           => 'Passwort ändern fehlgeschlagen.',
+    'update'                                 => 'Mitarbeiter ändern',
+    'username'                               => 'Benutzername',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Benutzername muss mindestens 5 Zeichen lang sein.',
+    'username_required'                      => 'Benutzername ist erforderlich.',
 ];
diff --git a/app/Language/de-DE/Error.php b/app/Language/de-DE/Error.php
index 23b161b63..60b048711 100644
--- a/app/Language/de-DE/Error.php
+++ b/app/Language/de-DE/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Sie haben nicht die Zugangsrechte für das gewählte Modul",
-    "unknown"              => "Unbekannter Fehler",
+    'no_permission_module'           => 'Sie haben nicht die Zugangsrechte für das gewählte Modul',
+    'unable_to_create_env_file'      => '{filePath} konnte nicht erstellt werden, um throttle.key bereitzustellen',
+    'unable_to_lock_file'            => '{filePath} konnte nicht gesperrt werden: {reason}',
+    'unable_to_open_lock_file'       => '{filePath} konnte nicht geöffnet werden: {reason}',
+    'unable_to_persist_throttle_key' => 'throttle.key konnte nicht in {filePath} gespeichert werden',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => '{filePath} konnte nicht gelesen werden, um throttle.key bereitzustellen',
+    'unknown'                        => 'Unbekannter Fehler',
 ];
diff --git a/app/Language/de-DE/Items.php b/app/Language/de-DE/Items.php
index 371067ed3..3b2ddd538 100644
--- a/app/Language/de-DE/Items.php
+++ b/app/Language/de-DE/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Bestandsänderung.",
-    "allow_alt_description"              => "Alternative Beschreibung zulassen",
-    "amount_entry"                       => "Anzahl Eingang",
-    "bulk_edit"                          => "Sammeländerung",
-    "buy_price_required"                 => "Der Einkaufspreis ist ein Pflichtfeld.",
-    "cannot_be_deleted"                  => "Ausgewählte Artikel konnten nicht gelöscht werden, einer oder mehrere der ausgewählten Artikel haben Verkäufe.",
-    "cannot_find_item"                   => "Artikel nicht gefunden.",
-    "categories"                         => "",
-    "category"                           => "Kategorie",
-    "category_new"                       => "",
-    "category_required"                  => "Kategorie ist ein Pflichtfeld.",
-    "change_all_to_allow_alt_desc"       => "Alternative Beschreibung für alle zulassen.",
-    "change_all_to_not_allow_allow_desc" => "Keine alternative Beschreibung für alle zulassen.",
-    "change_all_to_serialized"           => "Ändere alle zu serialisiert",
-    "change_all_to_unserialized"         => "Ändere alle zu nicht serialisiert",
-    "change_image"                       => "Bild ändern",
-    "confirm_bulk_edit"                  => "Wollen Sie alle gewählten Artikel ändern?",
-    "confirm_bulk_edit_wipe_taxes"       => "Alle Artikel-Steuerinformationen werden ersetzt.",
-    "confirm_delete"                     => "Wollen Sie alle gewählten Artikel löschen?",
-    "confirm_restore"                    => "Möchten Sie die ausgewählten Artikel wirklich wiederherstellen?",
-    "cost_price"                         => "Großhandelspreis",
-    "cost_price_number"                  => "Großhandelspreis muss eine Nummer sein.",
-    "cost_price_required"                => "Der Großhandelspreis ist ein Pflichtfeld.",
-    "count"                              => "Ändere Bestand",
-    "csv_import_failed"                  => "CSV Import fehlgeschlagen",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Die hochgeladene Datei enthält keine Daten oder ist falsch formatiert.",
-    "csv_import_partially_failed"        => "{0} Artikel-Import Fehler in Zeile: {1}. Keine Reihen wurden importiert.",
-    "csv_import_success"                 => "Artikelimport erfolgreich.",
-    "current_quantity"                   => "Aktuelle Menge",
-    "default_pack_name"                  => "Jedes",
-    "description"                        => "Beschreibung",
-    "details_count"                      => "Lagerbestandsdetails",
-    "do_nothing"                         => "Tue nichts",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Ändern Sie die Felder für die ausgewählten Artikel.",
-    "edit_multiple_items"                => "Mehrere Artikel bearbeiten",
-    "empty_upc_items"                    => "Artikel ohne Barcode",
-    "error_adding_updating"              => "Fehler beim Hinzufügen/Ändern",
-    "error_updating_multiple"            => "Fehler beim Ändern",
-    "generate_barcodes"                  => "Generiere Barcodes",
-    "hsn_code"                           => "Harmonisierte System Nomenklatur",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Importiere Artikel mit CSV Datei",
-    "info_provided_by"                   => "Informationen bereitgestellt von",
-    "inventory"                          => "Lagerbestand",
-    "inventory_CSV_import_quantity"      => "Anzahl der Importe aus CSV",
-    "inventory_comments"                 => "Bemerkungen",
-    "inventory_data_tracking"            => "Bestandsdatenverfolgung",
-    "inventory_date"                     => "Datum",
-    "inventory_employee"                 => "Mitarbeiter",
-    "inventory_in_out_quantity"          => "Ein-/ Ausgabemenge",
-    "inventory_remarks"                  => "Bemerkungen",
-    "is_deleted"                         => "Gelöscht",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Artikel hat Seriennummer",
-    "item"                               => "Artikel",
-    "item_id"                            => "",
-    "item_number"                        => "Barcode",
-    "item_number_duplicate"              => "Die Artikelnummer existiert bereits in der Datenbank.",
-    "kit"                                => "Satz",
-    "location"                           => "Ort",
-    "low_inventory_items"                => "Nicht vorrätige Artikel",
-    "low_sell_item"                      => "Wenig verkaufter Artikel",
-    "manually_editing_of_quantity"       => "Manuelle Bestandesänderung",
-    "markup"                             => "",
-    "name"                               => "Artikelname",
-    "name_required"                      => "Der Artikelname ist ein Pflichtfeld.",
-    "new"                                => "Neuer Artikel",
-    "no_description_items"               => "Artikel ohne Bezeichnung",
-    "no_items_to_display"                => "Keine Artikel zum Anzeigen.",
-    "none"                               => "Nichts",
-    "none_selected"                      => "Sie haben keine Artikel zum Ändern gewählt",
-    "nonstock"                           => "Nicht lagernd",
-    "number_information"                 => "Artikelnummer",
-    "number_required"                    => "Barcode ist ein Pflichtfeld.",
-    "one_or_multiple"                    => "Artikel",
-    "pack_name"                          => "Paketname",
-    "qty_per_pack"                       => "Menge pro Packung",
-    "quantity"                           => "Menge",
-    "quantity_number"                    => "Menge muss eine Zahl sein.",
-    "quantity_required"                  => "Die Menge ist ein Pflichtfeld.",
-    "receiving_quantity"                 => "Eingangsmenge",
-    "remove_image"                       => "Bild löschen",
-    "reorder_level"                      => "Mindestbestand",
-    "reorder_level_number"               => "Mindestbestand muss eine Zahl sein.",
-    "reorder_level_required"             => "Der Mindestbestand ist ein Pflichtfeld.",
-    "retrive_item_info"                  => "Artikelinformation",
-    "sales_tax_1"                        => "Umsatzsteuer",
-    "sales_tax_2"                        => "Umsatzsteuer 2",
-    "search_attributes"                  => "Suche Attribute",
-    "select_image"                       => "Bild auswählen",
-    "serialized_items"                   => "Serialisierte Artikel",
-    "standard"                           => "Standard",
-    "stock"                              => "Bestand",
-    "stock_location"                     => "Lagerort",
-    "stock_type"                         => "Bestandstyp",
-    "successful_adding"                  => "Artikel erfolgreich hinzugefügt",
-    "successful_bulk_edit"               => "Die gewählten Artikel wurden erforlgreich geändert",
-    "successful_deleted"                 => "Löschung erfolgreich",
-    "successful_updating"                => "Änderung erfolgreich",
-    "supplier"                           => "Lieferant",
-    "tax_1"                              => "Steuer 1",
-    "tax_2"                              => "Steuer 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Steuerkategorie",
-    "tax_percent"                        => "MWSt %",
-    "tax_percent_number"                 => "Steuer Prozent muss ein Zahlenwert sein",
-    "tax_percent_required"               => "Steuerprozentsatz ist ein Pflichtfeld.",
-    "tax_percents"                       => "Steuerprozent(e)",
-    "temp"                               => "Vorübergehend",
-    "type"                               => "Artikeltyp",
-    "unit_price"                         => "Verkaufspreis",
-    "unit_price_number"                  => "Der Stückpreis muss eine Zahl sein.",
-    "unit_price_required"                => "Der Verkaufspreis ist ein Pflichtfeld.",
-    "upc_database"                       => "Barcode Datenbank",
-    "update"                             => "Ändere Artikel",
-    "use_inventory_menu"                 => "Verwende Bestandesmenu",
+    'add_minus'                          => 'Bestandsänderung.',
+    'allow_alt_description'              => 'Alternative Beschreibung zulassen',
+    'amount_entry'                       => 'Anzahl Eingang',
+    'bulk_edit'                          => 'Sammeländerung',
+    'buy_price_required'                 => 'Der Einkaufspreis ist ein Pflichtfeld.',
+    'cannot_be_deleted'                  => 'Ausgewählte Artikel konnten nicht gelöscht werden, einer oder mehrere der ausgewählten Artikel haben Verkäufe.',
+    'cannot_find_item'                   => 'Artikel nicht gefunden.',
+    'categories'                         => '',
+    'category'                           => 'Kategorie',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategorie ist ein Pflichtfeld.',
+    'change_all_to_allow_alt_desc'       => 'Alternative Beschreibung für alle zulassen.',
+    'change_all_to_not_allow_allow_desc' => 'Keine alternative Beschreibung für alle zulassen.',
+    'change_all_to_serialized'           => 'Ändere alle zu serialisiert',
+    'change_all_to_unserialized'         => 'Ändere alle zu nicht serialisiert',
+    'change_image'                       => 'Bild ändern',
+    'confirm_bulk_edit'                  => 'Wollen Sie alle gewählten Artikel ändern?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Alle Artikel-Steuerinformationen werden ersetzt.',
+    'confirm_delete'                     => 'Wollen Sie alle gewählten Artikel löschen?',
+    'confirm_restore'                    => 'Möchten Sie die ausgewählten Artikel wirklich wiederherstellen?',
+    'cost_price'                         => 'Großhandelspreis',
+    'cost_price_number'                  => 'Großhandelspreis muss eine Nummer sein.',
+    'cost_price_required'                => 'Der Großhandelspreis ist ein Pflichtfeld.',
+    'count'                              => 'Ändere Bestand',
+    'csv_import_failed'                  => 'CSV Import fehlgeschlagen',
+    'csv_import_invalid_location'        => 'Ungültige Lagerorte gefunden: {0}. Nur gültige Lagerorte sind erlaubt.',
+    'csv_import_nodata_wrongformat'      => 'Die hochgeladene Datei enthält keine Daten oder ist falsch formatiert.',
+    'csv_import_partially_failed'        => '{0} Artikel-Import Fehler in Zeile: {1}. Keine Reihen wurden importiert.',
+    'csv_import_success'                 => 'Artikelimport erfolgreich.',
+    'current_quantity'                   => 'Aktuelle Menge',
+    'default_pack_name'                  => 'Jedes',
+    'description'                        => 'Beschreibung',
+    'details_count'                      => 'Lagerbestandsdetails',
+    'do_nothing'                         => 'Tue nichts',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Ändern Sie die Felder für die ausgewählten Artikel.',
+    'edit_multiple_items'                => 'Mehrere Artikel bearbeiten',
+    'empty_upc_items'                    => 'Artikel ohne Barcode',
+    'error_adding_updating'              => 'Fehler beim Hinzufügen/Ändern',
+    'error_updating_multiple'            => 'Fehler beim Ändern',
+    'generate_barcodes'                  => 'Generiere Barcodes',
+    'hsn_code'                           => 'Harmonisierte System Nomenklatur',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Importiere Artikel mit CSV Datei',
+    'info_provided_by'                   => 'Informationen bereitgestellt von',
+    'inventory'                          => 'Lagerbestand',
+    'inventory_CSV_import_quantity'      => 'Anzahl der Importe aus CSV',
+    'inventory_comments'                 => 'Bemerkungen',
+    'inventory_data_tracking'            => 'Bestandsdatenverfolgung',
+    'inventory_date'                     => 'Datum',
+    'inventory_employee'                 => 'Mitarbeiter',
+    'inventory_in_out_quantity'          => 'Ein-/ Ausgabemenge',
+    'inventory_remarks'                  => 'Bemerkungen',
+    'is_deleted'                         => 'Gelöscht',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Artikel hat Seriennummer',
+    'item'                               => 'Artikel',
+    'item_id'                            => '',
+    'item_number'                        => 'Barcode',
+    'item_number_duplicate'              => 'Die Artikelnummer existiert bereits in der Datenbank.',
+    'item_number_invalid'                => 'Die Artikelnummer enthält nicht zulässige Zeichen.',
+    'kit'                                => 'Satz',
+    'location'                           => 'Ort',
+    'low_inventory_items'                => 'Nicht vorrätige Artikel',
+    'low_sell_item'                      => 'Wenig verkaufter Artikel',
+    'manually_editing_of_quantity'       => 'Manuelle Bestandesänderung',
+    'markup'                             => '',
+    'name'                               => 'Artikelname',
+    'name_required'                      => 'Der Artikelname ist ein Pflichtfeld.',
+    'new'                                => 'Neuer Artikel',
+    'no_description_items'               => 'Artikel ohne Bezeichnung',
+    'no_items_to_display'                => 'Keine Artikel zum Anzeigen.',
+    'none'                               => 'Nichts',
+    'none_selected'                      => 'Sie haben keine Artikel zum Ändern gewählt',
+    'nonstock'                           => 'Nicht lagernd',
+    'number_information'                 => 'Artikelnummer',
+    'number_required'                    => 'Barcode ist ein Pflichtfeld.',
+    'one_or_multiple'                    => 'Artikel',
+    'pack_name'                          => 'Paketname',
+    'qty_per_pack'                       => 'Menge pro Packung',
+    'quantity'                           => 'Menge',
+    'quantity_number'                    => 'Menge muss eine Zahl sein.',
+    'quantity_required'                  => 'Die Menge ist ein Pflichtfeld.',
+    'receiving_quantity'                 => 'Eingangsmenge',
+    'remove_image'                       => 'Bild löschen',
+    'reorder_level'                      => 'Mindestbestand',
+    'reorder_level_number'               => 'Mindestbestand muss eine Zahl sein.',
+    'reorder_level_required'             => 'Der Mindestbestand ist ein Pflichtfeld.',
+    'retrive_item_info'                  => 'Artikelinformation',
+    'sales_tax_1'                        => 'Umsatzsteuer',
+    'sales_tax_2'                        => 'Umsatzsteuer 2',
+    'search_attributes'                  => 'Suche Attribute',
+    'select_image'                       => 'Bild auswählen',
+    'serialized_items'                   => 'Serialisierte Artikel',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Bestand',
+    'stock_location'                     => 'Lagerort',
+    'stock_type'                         => 'Bestandstyp',
+    'successful_adding'                  => 'Artikel erfolgreich hinzugefügt',
+    'successful_bulk_edit'               => 'Die gewählten Artikel wurden erforlgreich geändert',
+    'successful_deleted'                 => 'Löschung erfolgreich',
+    'successful_updating'                => 'Änderung erfolgreich',
+    'supplier'                           => 'Lieferant',
+    'tax_1'                              => 'Steuer 1',
+    'tax_2'                              => 'Steuer 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Steuerkategorie',
+    'tax_name_invalid'                   => 'Der Steuername enthält nicht erlaubte Zeichen.',
+    'tax_percent'                        => 'MWSt %',
+    'tax_percent_number'                 => 'Steuer Prozent muss ein Zahlenwert sein',
+    'tax_percent_required'               => 'Steuerprozentsatz ist ein Pflichtfeld.',
+    'tax_percents'                       => 'Steuerprozent(e)',
+    'temp'                               => 'Vorübergehend',
+    'type'                               => 'Artikeltyp',
+    'unit_price'                         => 'Verkaufspreis',
+    'unit_price_number'                  => 'Der Stückpreis muss eine Zahl sein.',
+    'unit_price_required'                => 'Der Verkaufspreis ist ein Pflichtfeld.',
+    'upc_database'                       => 'Barcode Datenbank',
+    'update'                             => 'Ändere Artikel',
+    'use_inventory_menu'                 => 'Verwende Bestandesmenu',
 ];
diff --git a/app/Language/de-DE/Login.php b/app/Language/de-DE/Login.php
index 6b6bd14a7..dcfdc3fa2 100644
--- a/app/Language/de-DE/Login.php
+++ b/app/Language/de-DE/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Ich bin kein Roboter.",
-    "go"                            => "Los",
-    "invalid_gcaptcha"              => "Ich bin kein Roboter ist ungültig.",
-    "invalid_installation"          => "Die Installation ist nicht korrekt, überprüfen Sie Ihre php.ini-Datei.",
-    "invalid_username_and_password" => "Ungültiger Benutzername oder Passwort.",
-    "login"                         => "Login",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Passwort",
-    "required_username"             => "",
-    "username"                      => "Benutzername",
-    "welcome"                       => "",
+    "gcaptcha"                            => "Ich bin kein Roboter.",
+    "go"                                  => "Los",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Ich bin kein Roboter ist ungültig.",
+    "invalid_installation"                => "Die Installation ist nicht korrekt, überprüfen Sie Ihre php.ini-Datei.",
+    "invalid_username_and_password"       => "Ungültiger Benutzername oder Passwort.",
+    "login"                               => "Login",
+    "logout"                              => "Abmelden",
+    "migrating_database"                  => "Datenbank wird migriert",
+    "migration_auth_message"              => "Administrator-Anmeldedaten sind erforderlich, um die Datenbank-Migration auf Version {0} zu autorisieren. Bitte melden Sie sich an, um fortzufahren.",
+    "migration_complete"                  => "Datenbank erfolgreich initialisiert!",
+    "migration_complete_login"            => "Sie können sich jetzt anmelden.",
+    "migration_complete_migrate"          => "Datenbank erfolgreich migriert!",
+    "migration_complete_redirect"         => "Migration abgeschlossen. Weiterleitung zur Anmeldung...",
+    "migration_error_connection"          => "Verbindungsfehler. Bitte versuchen Sie es erneut.",
+    "migration_failed"                    => "Migration fehlgeschlagen",
+    "migration_initializing"              => "Datenbank wird initialisiert",
+    "migration_needed"                    => "Eine Datenbank-Migration auf {0} wird nach der Anmeldung gestartet.",
+    "migration_required"                  => "Datenbank-Migration erforderlich",
+    "migration_running"                   => "Datenbank-Migrationen werden ausgeführt...",
+    "password"                            => "Passwort",
+    "required_username"                   => "Das Feld Benutzername ist erforderlich.",
+    'too_many_attempts'                   => 'Zu viele Versuche. Bitte warten Sie einen Moment und versuchen Sie es erneut.',
+    "username"                            => "Benutzername",
+    "welcome"                             => "Willkommen bei {0}!"
 ];
diff --git a/app/Language/de-DE/Reports.php b/app/Language/de-DE/Reports.php
index 01b97977b..c6b08075b 100644
--- a/app/Language/de-DE/Reports.php
+++ b/app/Language/de-DE/Reports.php
@@ -146,4 +146,5 @@ return [
     "used"                                    => "Punkte eingelöst",
     "work_orders"                             => "Arbeitsaufträge",
     "zero_and_less"                           => "Null und weniger",
+    "toggle_cost_and_profit"                  => "Kosten & Gewinn umschalten",
 ];
diff --git a/app/Language/de-DE/Sales.php b/app/Language/de-DE/Sales.php
index 18ad986ad..0d1ca7630 100644
--- a/app/Language/de-DE/Sales.php
+++ b/app/Language/de-DE/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Verfügbare Punkte",
-    "rewards_package"                  => "Prämie",
-    "rewards_remaining_balance"        => "Verbleibende Prämienpunkte ",
-    "account_number"                   => "Kundennummer",
-    "add_payment"                      => "Zahlung",
-    "amount_due"                       => "fälliger Betrag",
-    "amount_tendered"                  => "Erhalten",
-    "authorized_signature"             => "Unterschrift",
-    "cancel_sale"                      => "Annullieren",
-    "cash"                             => "Bar",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "Bareinzahlung",
-    "cash_filter"                      => "Bar",
-    "change_due"                       => "Wechselgeld",
-    "change_price"                     => "",
-    "check"                            => "Scheck",
-    "check_balance"                    => "Scheck-Differenz",
-    "check_filter"                     => "Scheck",
-    "close"                            => "",
-    "comment"                          => "Bemerkung",
-    "comments"                         => "Bemerkungen",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Abschliessen",
-    "confirm_cancel_sale"              => "Wollen Sie diesen Verkauf wirklich zurücksetzen? Alle Artikeleinträge werden entfernt.",
-    "confirm_delete"                   => "Wollen Sie die gewählten Aufträge löschen?",
-    "confirm_restore"                  => "Sind Sie sicher, dass Sie die ausgewählten Verkäufe wiederherstellen möchten?",
-    "credit"                           => "Kreditkarte",
-    "credit_deposit"                   => "Krediteinlage",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Kunde",
-    "customer_address"                 => "Kundenadresse",
-    "customer_discount"                => "Rabatt",
-    "customer_email"                   => "Kunden eMail",
-    "customer_location"                => "Kunden Stadt",
-    "customer_mailchimp_status"        => "Mailchim Status",
-    "customer_optional"                => "(Benötigt für fällige Zahlungen)",
-    "customer_required"                => "(Benötigt)",
-    "customer_total"                   => "Gesamtbetrag",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Datum",
-    "date_range"                       => "Zeitraum",
-    "date_required"                    => "Ein korrektes Datum ist erforderlich.",
-    "date_type"                        => "Datum ist erforderlich.",
-    "debit"                            => "EC-Karte",
-    "debit_filter"                     => "",
-    "delete"                           => "löschen",
-    "delete_confirmation"              => "Wollen Sie diesen Auftrag wirklich löschen? Dies kann nicht rückgängig gemacht werden.",
-    "delete_entire_sale"               => "Auftrag löschen",
-    "delete_successful"                => "Erfolgreich gelöscht.",
-    "delete_unsuccessful"              => "Löschen fehlgeschlagen.",
-    "description_abbrv"                => "Bez.",
-    "discard"                          => "Verwerfen",
-    "discard_quote"                    => "",
-    "discount"                         => "%",
-    "discount_included"                => "% Rabatt",
-    "discount_short"                   => "%",
-    "due"                              => "fällig",
-    "due_filter"                       => "Fällig",
-    "edit"                             => "Ändern",
-    "edit_item"                        => "Artikel Ändern",
-    "edit_sale"                        => "Auftrag ändern",
-    "email_receipt"                    => "Quittung per Email",
-    "employee"                         => "Mitarbeiter",
-    "entry"                            => "Eintrag",
-    "error_editing_item"               => "Fehler beim Ändern des Artikels",
-    "find_or_scan_item"                => "Finde/Scanne Artikel",
-    "find_or_scan_item_or_receipt"     => "Finde/Scanne Artikel oder Quittung",
-    "giftcard"                         => "Gutschein",
-    "giftcard_balance"                 => "Gutschein Restwert",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gutschein Nummer",
-    "group_by_category"                => "Gruppiere nach Kategorie",
-    "group_by_type"                    => "Gruppiere nach Typ",
-    "hsn"                              => "HSN",
-    "id"                               => "ID",
-    "include_prices"                   => "Inklusiv Preise?",
-    "invoice"                          => "Rechnung",
-    "invoice_confirm"                  => "Diese Rechnung wird gesendet an",
-    "invoice_enable"                   => "Erzeuge Rechnung",
-    "invoice_filter"                   => "Rechnungen",
-    "invoice_no_email"                 => "Dieser Kunde hat keine gültige Email Adresse.",
-    "invoice_number"                   => "Rechnungsnummer",
-    "invoice_number_duplicate"         => "Rechnungsnummer muss eindeutig sein.",
-    "invoice_sent"                     => "Rechnung gesendet an",
-    "invoice_total"                    => "Rechnungsbetrag",
-    "invoice_type_custom_invoice"      => "Benutzerdefinierte Rechnung (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Benutzerdefinierte Steuerrechnung (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Rechnung (invoice.php)",
-    "invoice_type_tax_invoice"         => "Steuerrechnung (tax_invoice.php)",
-    "invoice_unsent"                   => "Rechnung nicht gesendet",
-    "invoice_update"                   => "Aktualisieren",
-    "item_insufficient_of_stock"       => "Artikel hat Unterbestand.",
-    "item_name"                        => "Artikelname",
-    "item_number"                      => "Artikelnummer",
-    "item_out_of_stock"                => "Artikel ist nicht auf Lager.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Verkaufstyp",
-    "must_enter_numeric"               => "Eingabe muss eine Zahl sein.",
-    "must_enter_numeric_giftcard"      => "Gutschein-Nr. muss eine Zahl sein.",
-    "new_customer"                     => "Neuer Kunde",
-    "new_item"                         => "Neuer Artikel",
-    "no_description"                   => "Nichts",
-    "no_filter"                        => "Alle",
-    "no_items_in_cart"                 => "Warenkorb ist leer.",
-    "no_sales_to_display"              => "Keine Artikel zum Anzeigen.",
-    "none_selected"                    => "Sie haben keinen Auftrag zum Löschen ausgewählt.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "Diese Aktion ist nicht erlaubt.",
-    "one_or_multiple"                  => "Verkäufe",
-    "payment"                          => "Zahlungsart",
-    "payment_amount"                   => "Betrag",
-    "payment_not_cover_total"          => "Betrag deckt Rechnungsbetrag nicht.",
-    "payment_type"                     => "Typ",
-    "payments"                         => "",
-    "payments_total"                   => "Zahlung Total",
-    "price"                            => "Preis",
-    "print_after_sale"                 => "Drucke Bon nach Verkauf",
-    "quantity"                         => "Menge",
-    "quantity_less_than_reorder_level" => "Warnung: Gewünschte Menge ist nicht verfügbar.",
-    "quantity_less_than_zero"          => "Warnung: Gewünschte Menge ist nicht verfügbar. Sie können den Verkauf fortsetzen, dennoch prüfen Sie bitte den Lagerbestand.",
-    "quantity_of_items"                => "Menge von {0} Artikeln",
-    "quote"                            => "Angebot",
-    "quote_number"                     => "Angebotsnummer",
-    "quote_number_duplicate"           => "Die Angebotsnummer muss eindeutig sein.",
-    "quote_sent"                       => "Angebot gesendet an",
-    "quote_unsent"                     => "Angebot senden fehlgeschlagen",
-    "receipt"                          => "Quittung",
-    "receipt_no_email"                 => "Der Kunde hat keine gültige E-Mail Adresse.",
-    "receipt_number"                   => "Quittungsnummer",
-    "receipt_sent"                     => "Quittung gesendet an",
-    "receipt_unsent"                   => "Quittung nicht gesendet",
-    "refund"                           => "",
-    "register"                         => "Kasse",
-    "remove_customer"                  => "Entferne Kunde",
-    "remove_discount"                  => "",
-    "return"                           => "Retoure",
-    "rewards"                          => "Prämienpunkte",
-    "rewards_balance"                  => "Prämienpunkte Stand",
-    "sale"                             => "Verkauf",
-    "sale_by_invoice"                  => "Verkauf auf Rechnung",
-    "sale_for_customer"                => "Kunde:",
-    "sale_time"                        => "Zeit",
-    "sales_tax"                        => "Mehrwertsteuer",
-    "sales_total"                      => "",
-    "select_customer"                  => "Wähle Kunde (optional)",
-    "send_invoice"                     => "Sende Rechnung",
-    "send_quote"                       => "Angebot Senden",
-    "send_receipt"                     => "Sende Quittung",
-    "send_work_order"                  => "Arbeitsauftrag senden",
-    "serial"                           => "Seriennummer",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Rechnung",
-    "show_receipt"                     => "Quittung",
-    "start_typing_customer_name"       => "Geben Sie den Kundennamen ein...",
-    "start_typing_item_name"           => "Geben Sie den Artikel ein oder scannen Sie ihn...",
-    "stock"                            => "Vorrat",
-    "stock_location"                   => "Lagerort",
-    "sub_total"                        => "Zwischentotal",
-    "successfully_deleted"             => "Löschung erfolgreich",
-    "successfully_restored"            => "Erfolgreich wiederhergestellt",
-    "successfully_suspended_sale"      => "Verkauf erfolgreich gestoppt.",
-    "successfully_updated"             => "Verkauf erfolgreich geändert.",
-    "suspend_sale"                     => "-> Aussetzen",
-    "suspended_doc_id"                 => "Dokument",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Ausgesetzte Aufträge",
-    "table"                            => "Tisch",
-    "takings"                          => "Einnahmen",
-    "tax"                              => "Steuer",
-    "tax_id"                           => "Steuer ID",
-    "tax_invoice"                      => "Steuerrechnung",
-    "tax_percent"                      => "Steuer %",
-    "taxed_ind"                        => "",
-    "total"                            => "Gesamtbetrag",
-    "total_tax_exclusive"              => "exkl. Steuer",
-    "transaction_failed"               => "Verarbeitung fehlerhaft.",
-    "unable_to_add_item"               => "Kann Artikel nicht zum Auftrag hinzufügen",
-    "unsuccessfully_deleted"           => "Löschen des Verkaufs fehlgeschlagen.",
-    "unsuccessfully_restored"          => "Wiederherstellung fehlgeschlagen.",
-    "unsuccessfully_suspended_sale"    => "Verkaufsstopp fehlgeschlagen.",
-    "unsuccessfully_updated"           => "Änderung fehlgeschlagen.",
-    "unsuspend"                        => "Aktivieren",
-    "unsuspend_and_delete"             => "Aktivieren und löschen",
-    "update"                           => "Ändern",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Arbeitsauftrag",
-    "work_order_number"                => "Arbeitsauftragsnummer",
-    "work_order_number_duplicate"      => "Arbeitsauftragsnummer muss eindeutig sein.",
-    "work_order_sent"                  => "Arbeitsauftrag gesendet an",
-    "work_order_unsent"                => "Der Arbeitsauftrag konnte nicht gesendet werden an",
+    'account_number'                    => 'Kundennummer',
+    'add_payment'                       => 'Zahlung',
+    'amount_due'                        => 'fälliger Betrag',
+    'amount_due_not_covered'            => 'Die Zahlungen decken den fälligen Betrag nicht.',
+    'amount_tendered'                   => 'Erhalten',
+    'authorized_signature'              => 'Unterschrift',
+    'cancel_sale'                       => 'Annullieren',
+    'cash'                              => 'Bar',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => 'Bareinzahlung',
+    'cash_filter'                       => 'Bar',
+    'change_due'                        => 'Wechselgeld',
+    'change_price'                      => '',
+    'check'                             => 'Scheck',
+    'check_balance'                     => 'Scheck-Differenz',
+    'check_filter'                      => 'Scheck',
+    'close'                             => '',
+    'comment'                           => 'Bemerkung',
+    'comments'                          => 'Bemerkungen',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Abschliessen',
+    'confirm_cancel_sale'               => 'Wollen Sie diesen Verkauf wirklich zurücksetzen? Alle Artikeleinträge werden entfernt.',
+    'confirm_delete'                    => 'Wollen Sie die gewählten Aufträge löschen?',
+    'confirm_restore'                   => 'Sind Sie sicher, dass Sie die ausgewählten Verkäufe wiederherstellen möchten?',
+    'credit'                            => 'Kreditkarte',
+    'credit_deposit'                    => 'Krediteinlage',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Kunde',
+    'customer_address'                  => 'Kundenadresse',
+    'customer_discount'                 => 'Rabatt',
+    'customer_email'                    => 'Kunden eMail',
+    'customer_location'                 => 'Kunden Stadt',
+    'customer_mailchimp_status'         => 'Mailchim Status',
+    'customer_optional'                 => '(Benötigt für fällige Zahlungen)',
+    'customer_required'                 => '(Benötigt)',
+    'customer_total'                    => 'Gesamtbetrag',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Verfügbare Punkte',
+    'daily_sales'                       => '',
+    'date'                              => 'Datum',
+    'date_range'                        => 'Zeitraum',
+    'date_required'                     => 'Ein korrektes Datum ist erforderlich.',
+    'date_type'                         => 'Datum ist erforderlich.',
+    'debit'                             => 'EC-Karte',
+    'debit_filter'                      => '',
+    'delete'                            => 'löschen',
+    'delete_confirmation'               => 'Wollen Sie diesen Auftrag wirklich löschen? Dies kann nicht rückgängig gemacht werden.',
+    'delete_entire_sale'                => 'Auftrag löschen',
+    'delete_successful'                 => 'Erfolgreich gelöscht.',
+    'delete_unsuccessful'               => 'Löschen fehlgeschlagen.',
+    'description_abbrv'                 => 'Bez.',
+    'discard'                           => 'Verwerfen',
+    'discard_quote'                     => '',
+    'discount'                          => '%',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Rabatt',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'fällig',
+    'due_filter'                        => 'Fällig',
+    'edit'                              => 'Ändern',
+    'edit_item'                         => 'Artikel Ändern',
+    'edit_sale'                         => 'Auftrag ändern',
+    'email_receipt'                     => 'Quittung per Email',
+    'employee'                          => 'Mitarbeiter',
+    'entry'                             => 'Eintrag',
+    'error_editing_item'                => 'Fehler beim Ändern des Artikels',
+    'find_or_scan_item'                 => 'Finde/Scanne Artikel',
+    'find_or_scan_item_or_receipt'      => 'Finde/Scanne Artikel oder Quittung',
+    'giftcard'                          => 'Gutschein',
+    'giftcard_balance'                  => 'Gutschein Restwert',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Gutschein Nummer',
+    'group_by_category'                 => 'Gruppiere nach Kategorie',
+    'group_by_type'                     => 'Gruppiere nach Typ',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID',
+    'include_prices'                    => 'Inklusiv Preise?',
+    'insufficient_giftcard_balance'     => 'Unzureichendes Geschenkguthaben für diese Zahlung.',
+    'insufficient_reward_points'        => 'Unzureichende Prämienpunkte für diese Zahlung.',
+    'invoice'                           => 'Rechnung',
+    'invoice_confirm'                   => 'Diese Rechnung wird gesendet an',
+    'invoice_enable'                    => 'Erzeuge Rechnung',
+    'invoice_filter'                    => 'Rechnungen',
+    'invoice_no_email'                  => 'Dieser Kunde hat keine gültige Email Adresse.',
+    'invoice_number'                    => 'Rechnungsnummer',
+    'invoice_number_duplicate'          => 'Rechnungsnummer muss eindeutig sein.',
+    'invoice_sent'                      => 'Rechnung gesendet an',
+    'invoice_total'                     => 'Rechnungsbetrag',
+    'invoice_type_custom_invoice'       => 'Benutzerdefinierte Rechnung (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Benutzerdefinierte Steuerrechnung (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Rechnung (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Steuerrechnung (tax_invoice.php)',
+    'invoice_unsent'                    => 'Rechnung nicht gesendet',
+    'invoice_update'                    => 'Aktualisieren',
+    'item_insufficient_of_stock'        => 'Artikel hat Unterbestand.',
+    'item_name'                         => 'Artikelname',
+    'item_number'                       => 'Artikelnummer',
+    'item_out_of_stock'                 => 'Artikel ist nicht auf Lager.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Verkaufstyp',
+    'must_enter_numeric'                => 'Eingabe muss eine Zahl sein.',
+    'must_enter_numeric_giftcard'       => 'Gutschein-Nr. muss eine Zahl sein.',
+    'must_enter_reference_code'         => 'Referenz-/Abrufnummer muss eingegeben werden.',
+    'negative_amount_tendered'          => 'Der erhaltene Betrag darf nicht negativ sein.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Neuer Kunde',
+    'new_item'                          => 'Neuer Artikel',
+    'no_description'                    => 'Nichts',
+    'no_filter'                         => 'Alle',
+    'no_items_in_cart'                  => 'Warenkorb ist leer.',
+    'no_sales_to_display'               => 'Keine Artikel zum Anzeigen.',
+    'none_selected'                     => 'Sie haben keinen Auftrag zum Löschen ausgewählt.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'Diese Aktion ist nicht erlaubt.',
+    'one_or_multiple'                   => 'Verkäufe',
+    'payment'                           => 'Zahlungsart',
+    'payment_amount'                    => 'Betrag',
+    'payment_not_cover_total'           => 'Betrag deckt Rechnungsbetrag nicht.',
+    'payment_type'                      => 'Typ',
+    'payments'                          => '',
+    'payments_total'                    => 'Zahlung Total',
+    'price'                             => 'Preis',
+    'print_after_sale'                  => 'Drucke Bon nach Verkauf',
+    'quantity'                          => 'Menge',
+    'quantity_less_than_reorder_level'  => 'Warnung: Gewünschte Menge ist nicht verfügbar.',
+    'quantity_less_than_zero'           => 'Warnung: Gewünschte Menge ist nicht verfügbar. Sie können den Verkauf fortsetzen, dennoch prüfen Sie bitte den Lagerbestand.',
+    'quantity_of_items'                 => 'Menge von {0} Artikeln',
+    'quote'                             => 'Angebot',
+    'quote_number'                      => 'Angebotsnummer',
+    'quote_number_duplicate'            => 'Die Angebotsnummer muss eindeutig sein.',
+    'quote_sent'                        => 'Angebot gesendet an',
+    'quote_unsent'                      => 'Angebot senden fehlgeschlagen',
+    'receipt'                           => 'Quittung',
+    'receipt_no_email'                  => 'Der Kunde hat keine gültige E-Mail Adresse.',
+    'receipt_number'                    => 'Quittungsnummer',
+    'receipt_sent'                      => 'Quittung gesendet an',
+    'receipt_unsent'                    => 'Quittung nicht gesendet',
+    'reference_code'                    => 'Zahlungsreferenzcode',
+    'reference_code_invalid_characters' => 'Der Referenzcode darf nur Buchstaben und Zahlen enthalten.',
+    'reference_code_length_error'       => 'Die Länge des Referenzcodes ist ungültig.',
+    'refund'                            => '',
+    'register'                          => 'Kasse',
+    'remove_customer'                   => 'Entferne Kunde',
+    'remove_discount'                   => '',
+    'return'                            => 'Retoure',
+    'rewards'                           => 'Prämienpunkte',
+    'rewards_balance'                   => 'Prämienpunkte Stand',
+    'rewards_package'                   => 'Prämie',
+    'rewards_remaining_balance'         => 'Verbleibende Prämienpunkte ',
+    'sale'                              => 'Verkauf',
+    'sale_by_invoice'                   => 'Verkauf auf Rechnung',
+    'sale_for_customer'                 => 'Kunde:',
+    'sale_time'                         => 'Zeit',
+    'sales_tax'                         => 'Mehrwertsteuer',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Wähle Kunde (optional)',
+    'send_invoice'                      => 'Sende Rechnung',
+    'send_quote'                        => 'Angebot Senden',
+    'send_receipt'                      => 'Sende Quittung',
+    'send_work_order'                   => 'Arbeitsauftrag senden',
+    'serial'                            => 'Seriennummer',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Rechnung',
+    'show_receipt'                      => 'Quittung',
+    'start_typing_customer_name'        => 'Geben Sie den Kundennamen ein...',
+    'start_typing_item_name'            => 'Geben Sie den Artikel ein oder scannen Sie ihn...',
+    'stock'                             => 'Vorrat',
+    'stock_location'                    => 'Lagerort',
+    'sub_total'                         => 'Zwischentotal',
+    'successfully_deleted'              => 'Löschung erfolgreich',
+    'successfully_restored'             => 'Erfolgreich wiederhergestellt',
+    'successfully_suspended_sale'       => 'Verkauf erfolgreich gestoppt.',
+    'successfully_updated'              => 'Verkauf erfolgreich geändert.',
+    'suspend_sale'                      => '-> Aussetzen',
+    'suspended_doc_id'                  => 'Dokument',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Ausgesetzte Aufträge',
+    'table'                             => 'Tisch',
+    'takings'                           => 'Einnahmen',
+    'tax'                               => 'Steuer',
+    'tax_id'                            => 'Steuer ID',
+    'tax_invoice'                       => 'Steuerrechnung',
+    'tax_percent'                       => 'Steuer %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Gesamtbetrag',
+    'total_tax_exclusive'               => 'exkl. Steuer',
+    'transaction_failed'                => 'Verarbeitung fehlerhaft.',
+    'unable_to_add_item'                => 'Kann Artikel nicht zum Auftrag hinzufügen',
+    'unsuccessfully_deleted'            => 'Löschen des Verkaufs fehlgeschlagen.',
+    'unsuccessfully_restored'           => 'Wiederherstellung fehlgeschlagen.',
+    'unsuccessfully_suspended_sale'     => 'Verkaufsstopp fehlgeschlagen.',
+    'unsuccessfully_updated'            => 'Änderung fehlgeschlagen.',
+    'unsuspend'                         => 'Aktivieren',
+    'unsuspend_and_delete'              => 'Aktivieren und löschen',
+    'update'                            => 'Ändern',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Arbeitsauftrag',
+    'work_order_number'                 => 'Arbeitsauftragsnummer',
+    'work_order_number_duplicate'       => 'Arbeitsauftragsnummer muss eindeutig sein.',
+    'work_order_sent'                   => 'Arbeitsauftrag gesendet an',
+    'work_order_unsent'                 => 'Der Arbeitsauftrag konnte nicht gesendet werden an',
 ];
diff --git a/app/Language/el/Attributes.php b/app/Language/el/Attributes.php
index 3d9ff2afd..f3d8f6792 100644
--- a/app/Language/el/Attributes.php
+++ b/app/Language/el/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Η τιμή του χαρακτηριστικού δεν μπορεί να περιέχει ':' ή '|'",
-    "confirm_delete"                   => "Είστε βέβαιοι ότι θέλετε να διαγράψετε τα επιλεγμένα χαρακτηριστικά;",
-    "confirm_restore"                  => "Είστε βέβαιοι ότι θέλετε να επαναφέρετε τα επιλεγμένα χαρακτηριστικά;",
-    "definition_cannot_be_deleted"     => "Δεν ήταν δυνατή η διαγραφή των επιλεγμένων χαρακτηριστικών",
-    "definition_error_adding_updating" => "Το χαρακτηριστικό {0} δεν ήταν δυνατό να προστεθεί ή να ενημερωθεί. Ελέγξτε το αρχείο καταγραφής σφαλμάτων.",
-    "definition_flags"                 => "Ορατότητα χαρακτηριστικών",
-    "definition_group"                 => "Ομάδα",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Προσθήκη χαρακτηριστικού",
-    "definition_name_required"         => "Το όνομα του χαρακτηριστικού είναι υποχρεωτικό πεδίο",
-    "definition_one_or_multiple"       => "Χαρακτηριστικό(ά)",
-    "definition_successful_adding"     => "Έχετε προσθέσει με επιτυχία στοιχείο",
-    "definition_successful_deleted"    => "",
-    "definition_successful_updating"   => "Έχετε ενημερώσει με επιτυχία το χαρακτηριστικό",
-    "definition_type"                  => "Τύπος Χαρακτηριστικού",
-    "definition_type_required"         => "Ο τύπος ιδιότητας είναι υποχρεωτικό πεδίο",
-    "definition_unit"                  => "Μονάδα μέτρησης",
-    "definition_values"                => "Τιμές Χαρακτηριστικών",
-    "new"                              => "Νέο χαρακτηριστικό",
-    "no_attributes_to_display"         => "Δεν υπάρχουν στοιχεία για εμφάνιση",
-    "receipt_visibility"               => "",
-    "show_in_items"                    => "",
-    "show_in_items_visibility"         => "",
-    "show_in_receipt"                  => "",
-    "show_in_receivings"               => "",
-    "show_in_receivings_visibility"    => "",
-    "show_in_sales"                    => "",
-    "show_in_sales_visibility"         => "",
-    "update"                           => "",
+    'attribute_value_invalid_chars'    => 'Η τιμή του χαρακτηριστικού δεν μπορεί να περιέχει \':\' ή \'|\'',
+    'confirm_delete'                   => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε τα επιλεγμένα χαρακτηριστικά;',
+    'confirm_restore'                  => 'Είστε βέβαιοι ότι θέλετε να επαναφέρετε τα επιλεγμένα χαρακτηριστικά;',
+    'definition_cannot_be_deleted'     => 'Δεν ήταν δυνατή η διαγραφή των επιλεγμένων χαρακτηριστικών',
+    'definition_invalid_group' => 'Η επιλεγμένη ομάδα δεν υπάρχει ή δεν είναι έγκυρη.',
+    'definition_error_adding_updating' => 'Το χαρακτηριστικό {0} δεν ήταν δυνατό να προστεθεί ή να ενημερωθεί. Ελέγξτε το αρχείο καταγραφής σφαλμάτων.',
+    'definition_flags'                 => 'Ορατότητα χαρακτηριστικών',
+    'definition_group'                 => 'Ομάδα',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Προσθήκη χαρακτηριστικού',
+    'definition_name_required'         => 'Το όνομα του χαρακτηριστικού είναι υποχρεωτικό πεδίο',
+    'definition_one_or_multiple'       => 'Χαρακτηριστικό(ά)',
+    'definition_successful_adding'     => 'Έχετε προσθέσει με επιτυχία στοιχείο',
+    'definition_successful_deleted'    => '',
+    'definition_successful_updating'   => 'Έχετε ενημερώσει με επιτυχία το χαρακτηριστικό',
+    'definition_type'                  => 'Τύπος Χαρακτηριστικού',
+    'definition_type_required'         => 'Ο τύπος ιδιότητας είναι υποχρεωτικό πεδίο',
+    'definition_unit'                  => 'Μονάδα μέτρησης',
+    'definition_values'                => 'Τιμές Χαρακτηριστικών',
+    'new'                              => 'Νέο χαρακτηριστικό',
+    'no_attributes_to_display'         => 'Δεν υπάρχουν στοιχεία για εμφάνιση',
+    'receipt_visibility'               => '',
+    'show_in_items'                    => '',
+    'show_in_items_visibility'         => '',
+    'show_in_receipt'                  => '',
+    'show_in_receivings'               => '',
+    'show_in_receivings_visibility'    => '',
+    'show_in_sales'                    => '',
+    'show_in_sales_visibility'         => '',
+    'show_in_search'                   => 'Εμφάνιση στην αναζήτηση',
+    'show_in_search_visibility'        => 'Αναζήτηση',
+    'update'                           => '',
 ];
diff --git a/app/Language/el/Config.php b/app/Language/el/Config.php
index c599bb83c..d102694e0 100644
--- a/app/Language/el/Config.php
+++ b/app/Language/el/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "",
-    "address_required"                          => "",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '',
+    'address_required'                          => '',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'Κωδικός αναφοράς πληρωμής<br>Όρια μήκους',
+    'payment_reference_code_length_max_label'   => 'Μέγ',
+    'payment_reference_code_length_min_label'   => 'Ελάχ',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Μη έγκυρη διαδρομή sendmail. Επιτρέπονται μόνο γράμματα, αριθμοί, παύλες, κάτω παύλες, κάθετοι, ανάστροφες κάθετοι, άνω-κάτω τελείες, κενά και τελείες.',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/el/Employees.php b/app/Language/el/Employees.php
index 34a418062..2731458cc 100644
--- a/app/Language/el/Employees.php
+++ b/app/Language/el/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'Δεν μπορείτε να αφαιρέσετε τα ελάχιστα δικαιώματα πρόσβασης των δικών σας μονάδων.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'Οι αλλαγές δικαιωμάτων είναι απενεργοποιημένες σε αυτό το demo.',
+    'error_password_change_disallowed'       => 'Οι αλλαγές κωδικού πρόσβασης είναι απενεργοποιημένες σε αυτό το demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/el/Error.php b/app/Language/el/Error.php
index 64ebe1e41..4c81a6274 100644
--- a/app/Language/el/Error.php
+++ b/app/Language/el/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "",
-    "unknown"              => "",
+    'no_permission_module'           => 'Δεν έχετε δικαίωμα πρόσβασης στη μονάδα με το όνομα',
+    'unable_to_create_env_file'      => 'Δεν ήταν δυνατή η δημιουργία του {filePath} για την παροχή του throttle.key',
+    'unable_to_lock_file'            => 'Δεν ήταν δυνατό το κλείδωμα του {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Δεν ήταν δυνατό το άνοιγμα του {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Δεν ήταν δυνατή η αποθήκευση του throttle.key στο {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Δεν ήταν δυνατή η ανάγνωση του {filePath} για την παροχή του throttle.key',
+    'unknown'                        => 'Μη αναμενόμενο σφάλμα',
 ];
diff --git a/app/Language/el/Items.php b/app/Language/el/Items.php
index 42b2152bb..e8f686f5f 100644
--- a/app/Language/el/Items.php
+++ b/app/Language/el/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "",
-    "category"                           => "",
-    "category_new"                       => "",
-    "category_required"                  => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_bulk_edit_wipe_taxes"       => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => '',
+    'category'                           => '',
+    'category_new'                       => '',
+    'category_required'                  => '',
+    'change_all_to_allow_alt_desc'       => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => '',
+    'confirm_bulk_edit'                  => '',
+    'confirm_bulk_edit_wipe_taxes'       => '',
+    'confirm_delete'                     => '',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => 'Ο αριθμός είδους περιέχει μη επιτρεπόμενους χαρακτήρες.',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Το όνομα φόρου περιέχει μη επιτρεπτούς χαρακτήρες.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/el/Login.php b/app/Language/el/Login.php
index d443ab5b5..1da7f2419 100644
--- a/app/Language/el/Login.php
+++ b/app/Language/el/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "",
-    "login"                         => "",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "",
-    "required_username"             => "",
-    "username"                      => "",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "",
+    "login"                               => "",
+    "logout"                              => "",
+    "migrating_database"                  => "Μετεγκατάσταση βάσης δεδομένων",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Η βάση δεδομένων μεταφέρθηκε επιτυχώς!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Πάρα πολλές προσπάθειες. Παρακαλώ περιμένετε λίγο και δοκιμάστε ξανά.',
+    "username"                            => "",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/el/Reports.php b/app/Language/el/Reports.php
index 93316dfd2..15ff6bed9 100644
--- a/app/Language/el/Reports.php
+++ b/app/Language/el/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/el/Sales.php b/app/Language/el/Sales.php
index 90dd0d5d0..5f32cc11d 100644
--- a/app/Language/el/Sales.php
+++ b/app/Language/el/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Διαθέσιμοι Πόντοι",
-    "rewards_package"                  => "Ανταμοιβές",
-    "rewards_remaining_balance"        => "Η αξία των υπολειπόμενων πόντων ανταμοιβής είναι ",
-    "account_number"                   => "Λογαριασμός #",
-    "add_payment"                      => "Προσθήκη Πληρωμής",
-    "amount_due"                       => "Ποσό επιστροφής",
-    "amount_tendered"                  => "Ποσό Είσπραξης",
-    "authorized_signature"             => "Εγκεκριμένη Υπογραφή",
-    "cancel_sale"                      => "Ακύρωση",
-    "cash"                             => "Μετρητά",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "Προκαταβολή Μετρητών",
-    "cash_filter"                      => "Μετρητά",
-    "change_due"                       => "Ποσό Επιστροφής",
-    "change_price"                     => "",
-    "check"                            => "Επιταγή",
-    "check_balance"                    => "Υπόλοιπο Επιταγής",
-    "check_filter"                     => "Επιταγή",
-    "close"                            => "",
-    "comment"                          => "Σχόλιο",
-    "comments"                         => "Σχόλια",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Ολοκλήρωση",
-    "confirm_cancel_sale"              => "Είστε σίγουροι πως θέλετε να ακυρώσετε την συναλλαγή? Όλα τα είδη θα χαθούν.",
-    "confirm_delete"                   => "Είστε σίγουροι πως θέλετε να διαγράψετε την/τις επιλεγμένες Πωλήσεις?",
-    "confirm_restore"                  => "Είστε σίγουροι πως θέλετε να επαναφέρετε την/τις επιλεγμένες Πωλήσεις?",
-    "credit"                           => "Πιστωτική Κάρτα",
-    "credit_deposit"                   => "Ποσό Πίστωσης",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Όνομα",
-    "customer_address"                 => "Διεύθυνση",
-    "customer_discount"                => "Έκπτωση",
-    "customer_email"                   => "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-    "customer_location"                => "Τοποθεσία",
-    "customer_mailchimp_status"        => "Κατάσταση Mailchimp",
-    "customer_optional"                => "(Απαραίτητο για πληρωμές επί Πιστώσει)",
-    "customer_required"                => "(Απαραίτητο)",
-    "customer_total"                   => "Σύνολο",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Ημερομηνία Πώλησης",
-    "date_range"                       => "Εύρος Ημερομηνιών",
-    "date_required"                    => "Πρέπει να εισάγετε μια σωστή ημερομηνία.",
-    "date_type"                        => "Ημερομηνία είναι απαραίτητο πεδίο.",
-    "debit"                            => "Χρεωστική Κάρτα",
-    "debit_filter"                     => "",
-    "delete"                           => "Επιτρέπεται Διαγραφή",
-    "delete_confirmation"              => "Είστε σίγουροι πως θέλετε να διαγράψετε την πώληση? Η διαγραφή δε αναιρείται.",
-    "delete_entire_sale"               => "Διαγραφή Ολόκληρης Πώλησης",
-    "delete_successful"                => "Διαγραφή Πώλησης επιτυχής.",
-    "delete_unsuccessful"              => "Αποτυχία διαγραφής Πώλησης.",
-    "description_abbrv"                => "Περιγρ.",
-    "discard"                          => "Απόρριψη",
-    "discard_quote"                    => "",
-    "discount"                         => "Έκπτ.",
-    "discount_included"                => "% Έκπτωσης",
-    "discount_short"                   => "%",
-    "due"                              => "Πρέπει να πληρωθεί",
-    "due_filter"                       => "Πρέπει να πληρωθεί",
-    "edit"                             => "Επεξεργασία",
-    "edit_item"                        => "Επεξεργασία είδους",
-    "edit_sale"                        => "Επεξεργασία Πώλησης",
-    "email_receipt"                    => "Απόδειξη Ηλεκτρονικού Ταχυδρομείου",
-    "employee"                         => "Υπάλληλος",
-    "entry"                            => "Εγγραφή",
-    "error_editing_item"               => "Σφάλμα επεξεργασίας είδους",
-    "find_or_scan_item"                => "Εύρεση ή Σκανάρισμα Είδους",
-    "find_or_scan_item_or_receipt"     => "Εύρεση ή Σκανάρισμα είδους ή Απόδειξης",
-    "giftcard"                         => "Δωροκάρτα",
-    "giftcard_balance"                 => "Υπόλοιπο Δωροκάρτας",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Αριθμός Δωροκάρτας",
-    "group_by_category"                => "Ομαδοποίηση ανά Κατηγορία",
-    "group_by_type"                    => "Ομαδοποίηση ανά Είδος",
-    "hsn"                              => "HSN",
-    "id"                               => "ID Πώλησης",
-    "include_prices"                   => "Συμπερίληψη Τιμών?",
-    "invoice"                          => "Τιμολόγιο",
-    "invoice_confirm"                  => "Το τιμολόγιο θα αποσταλεί σε",
-    "invoice_enable"                   => "Δημιουργία Τιμολογίου",
-    "invoice_filter"                   => "Τιμολόγια",
-    "invoice_no_email"                 => "Ο Πελάτης δεν έχει έγκυρο λογαριασμό ταχυδρομείου.",
-    "invoice_number"                   => "Τιμολόγιο #",
-    "invoice_number_duplicate"         => "Ο Αριθμός Τιμολογίου πρέπει να είναι μοναδικός.",
-    "invoice_sent"                     => "Το Τιμολόγιο απεστάλη σε",
-    "invoice_total"                    => "Σύνολο Τιμολογίου",
-    "invoice_type_custom_invoice"      => "Προσαρμοσμένο Τιμολόγιο (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Προσαρμοσμένο Φορολογικό Τιμολόγιο (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Τιμολόγιο (invoice.php)",
-    "invoice_type_tax_invoice"         => "Φορολογικό Τιμολόγιο (tax_invoice.php)",
-    "invoice_unsent"                   => "Ανεπιτυχής αποστολή Τιμολογίου σε",
-    "invoice_update"                   => "Επαναμέτρηση",
-    "item_insufficient_of_stock"       => "Το είδος έχει ανεπαρκή απόθεμα.",
-    "item_name"                        => "Όνομα Είδους",
-    "item_number"                      => "# Είδους",
-    "item_out_of_stock"                => "Το είδος δεν υπάρχει σε απόθεμα.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Λειτουργία Ταμείου",
-    "must_enter_numeric"               => "Το Ποσό Είσπραξης πρέπει να είναι Αριθμός.",
-    "must_enter_numeric_giftcard"      => "Ο Αριθμός της Δωροκάρτας πρέπει να είναι αριθμός.",
-    "new_customer"                     => "Νέος Πελάτης",
-    "new_item"                         => "Νέο Είδος",
-    "no_description"                   => "Δεν έχει περιγραφή",
-    "no_filter"                        => "Όλα",
-    "no_items_in_cart"                 => "Δεν υπάρχουν είδη στο καλάθι.",
-    "no_sales_to_display"              => "Δεν υπάρχουν Πωλήσεις προς προβολή.",
-    "none_selected"                    => "Δεν έχετε επιλέξει Πώληση/σεις για διαγραφή.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "Αυτή η ενέργεια δεν είναι εξουσιοδοτημένη.",
-    "one_or_multiple"                  => "Πώληση/εις",
-    "payment"                          => "Τύπος Πληρωμής",
-    "payment_amount"                   => "Ποσό",
-    "payment_not_cover_total"          => "Το Ποσό πρέπει να είναι μεγαλύτερο ή ίσο του Συνόλου.",
-    "payment_type"                     => "Τύπος",
-    "payments"                         => "",
-    "payments_total"                   => "Συνολικό Ποσό",
-    "price"                            => "Τιμή",
-    "print_after_sale"                 => "Εκτύπωση μετά την Πώληση",
-    "quantity"                         => "Ποσότητα",
-    "quantity_less_than_reorder_level" => "Προσοχή: Επιθυμητή Ποσότητα είναι λιγότερη από την τιμή Επαναπαραγγελίας για το είδος.",
-    "quantity_less_than_zero"          => "Προσοχή: Επιθυμητή Ποσότητα είναι ανεπαρκής. Μπορείτε να επεξεργαστείτε την πώληση, αλλά ελέγξτε το απόθεμα.",
-    "quantity_of_items"                => "Ποσότητα των {0} Ειδών",
-    "quote"                            => "Παράθεση",
-    "quote_number"                     => "Αριθμός Παράθεσης",
-    "quote_number_duplicate"           => "Ο Αριθμός Παράθεσης πρέπει να είναι μοναδικός.",
-    "quote_sent"                       => "Η Παράθεση απεστάλη σε",
-    "quote_unsent"                     => "Αποτυχία αποστολής Παράθεσης σε",
-    "receipt"                          => "Απόδειξη Πώλησης",
-    "receipt_no_email"                 => "Ο πελάτης δεν έχει έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.",
-    "receipt_number"                   => "Πώληση #",
-    "receipt_sent"                     => "Η Απόδειξη εστάλη σε",
-    "receipt_unsent"                   => "Αποτυχία αποστολής Απόδειξης σε",
-    "refund"                           => "",
-    "register"                         => "Μητρώο Πωλήσεων",
-    "remove_customer"                  => "Αφαίρεση Πελάτη",
-    "remove_discount"                  => "",
-    "return"                           => "Επιστροφή",
-    "rewards"                          => "Πόντοι Ανταμοιβής",
-    "rewards_balance"                  => "Υπόλοιπο Πόντων Ανταμοιβής",
-    "sale"                             => "Πώληση",
-    "sale_by_invoice"                  => "Πώληση ανά Τιμολόγιο",
-    "sale_for_customer"                => "Πελάτης:",
-    "sale_time"                        => "Ώρα",
-    "sales_tax"                        => "Φόρος Πώλησης",
-    "sales_total"                      => "",
-    "select_customer"                  => "Επιλογή Πελάτη",
-    "send_invoice"                     => "Αποστολή Τιμολογίου",
-    "send_quote"                       => "Αποστολή Παράθεσης",
-    "send_receipt"                     => "Αποστολή Απόδειξης",
-    "send_work_order"                  => "Αποστολή Εντολής Εργασίας",
-    "serial"                           => "Σειριακός",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Εμφάνιση Τιμολογίου",
-    "show_receipt"                     => "Εμφάνιση Απόδειξης",
-    "start_typing_customer_name"       => "Πληκτρολογήστε τις λεπτομέρειες πελάτη...",
-    "start_typing_item_name"           => "Πληκτρολογήστε το είδος ή σκανάρετε το Barcode...",
-    "stock"                            => "Απόθεμα",
-    "stock_location"                   => "Τοποθεσία Αποθέματος",
-    "sub_total"                        => "Υποσύνολο",
-    "successfully_deleted"             => "Έχετε διαγράψει επιτυχώς",
-    "successfully_restored"            => "Έχετε επαναφέρει επιτυχώς",
-    "successfully_suspended_sale"      => "Αναμονή Πώλησης επιτυχής.",
-    "successfully_updated"             => "Ενημέρωση Πώλησης επιτυχής.",
-    "suspend_sale"                     => "Αναμονή",
-    "suspended_doc_id"                 => "Έγγραφο",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Ανεστάλη",
-    "table"                            => "Πίνακας",
-    "takings"                          => "Ημερήσιες Πωλήσεις",
-    "tax"                              => "Φόρος",
-    "tax_id"                           => "Id Φόρου",
-    "tax_invoice"                      => "Φόρος τιμολογίου",
-    "tax_percent"                      => "% Φόρου",
-    "taxed_ind"                        => "",
-    "total"                            => "Σύνολο",
-    "total_tax_exclusive"              => "Εξαιρουμένου Φόρου",
-    "transaction_failed"               => "Συναλλαγή Πώλησης απέτυχε.",
-    "unable_to_add_item"               => "Προσθήκη είδους στην Πώληση απέτυχε",
-    "unsuccessfully_deleted"           => "Διαγραφή Πώλησης/εων απέτυχε.",
-    "unsuccessfully_restored"          => "Επαναφορά Πώλησης/εων απέτυχε.",
-    "unsuccessfully_suspended_sale"    => "Αναμονή Πώλησης απέτυχε.",
-    "unsuccessfully_updated"           => "Ενημέρωση πώλησης απέτυχε.",
-    "unsuspend"                        => "Επαναφορά από Αναμονή",
-    "unsuspend_and_delete"             => "Ενέργεια",
-    "update"                           => "Ενημέρωση",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Παραγγελία Εργασίας",
-    "work_order_number"                => "Αριθμός Παραγγελίας Εργασίας",
-    "work_order_number_duplicate"      => "Ο Αριθμός της Παραγγελίας Εργασίας πρέπει να είναι μοναδικός.",
-    "work_order_sent"                  => "Εντολή Εργασίας απεστάλη σε",
-    "work_order_unsent"                => "Ανεπιτυχής αποστολή Εντολής Εργασίας",
+    'account_number'                    => 'Λογαριασμός #',
+    'add_payment'                       => 'Προσθήκη Πληρωμής',
+    'amount_due'                        => 'Ποσό επιστροφής',
+    'amount_due_not_covered'            => 'Οι πληρωμές δεν καλύπτουν το οφειλόμενο ποσό.',
+    'amount_tendered'                   => 'Ποσό Είσπραξης',
+    'authorized_signature'              => 'Εγκεκριμένη Υπογραφή',
+    'cancel_sale'                       => 'Ακύρωση',
+    'cash'                              => 'Μετρητά',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => 'Προκαταβολή Μετρητών',
+    'cash_filter'                       => 'Μετρητά',
+    'change_due'                        => 'Ποσό Επιστροφής',
+    'change_price'                      => '',
+    'check'                             => 'Επιταγή',
+    'check_balance'                     => 'Υπόλοιπο Επιταγής',
+    'check_filter'                      => 'Επιταγή',
+    'close'                             => '',
+    'comment'                           => 'Σχόλιο',
+    'comments'                          => 'Σχόλια',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Ολοκλήρωση',
+    'confirm_cancel_sale'               => 'Είστε σίγουροι πως θέλετε να ακυρώσετε την συναλλαγή? Όλα τα είδη θα χαθούν.',
+    'confirm_delete'                    => 'Είστε σίγουροι πως θέλετε να διαγράψετε την/τις επιλεγμένες Πωλήσεις?',
+    'confirm_restore'                   => 'Είστε σίγουροι πως θέλετε να επαναφέρετε την/τις επιλεγμένες Πωλήσεις?',
+    'credit'                            => 'Πιστωτική Κάρτα',
+    'credit_deposit'                    => 'Ποσό Πίστωσης',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Όνομα',
+    'customer_address'                  => 'Διεύθυνση',
+    'customer_discount'                 => 'Έκπτωση',
+    'customer_email'                    => 'Διεύθυνση ηλεκτρονικού ταχυδρομείου',
+    'customer_location'                 => 'Τοποθεσία',
+    'customer_mailchimp_status'         => 'Κατάσταση Mailchimp',
+    'customer_optional'                 => '(Απαραίτητο για πληρωμές επί Πιστώσει)',
+    'customer_required'                 => '(Απαραίτητο)',
+    'customer_total'                    => 'Σύνολο',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Διαθέσιμοι Πόντοι',
+    'daily_sales'                       => '',
+    'date'                              => 'Ημερομηνία Πώλησης',
+    'date_range'                        => 'Εύρος Ημερομηνιών',
+    'date_required'                     => 'Πρέπει να εισάγετε μια σωστή ημερομηνία.',
+    'date_type'                         => 'Ημερομηνία είναι απαραίτητο πεδίο.',
+    'debit'                             => 'Χρεωστική Κάρτα',
+    'debit_filter'                      => '',
+    'delete'                            => 'Επιτρέπεται Διαγραφή',
+    'delete_confirmation'               => 'Είστε σίγουροι πως θέλετε να διαγράψετε την πώληση? Η διαγραφή δε αναιρείται.',
+    'delete_entire_sale'                => 'Διαγραφή Ολόκληρης Πώλησης',
+    'delete_successful'                 => 'Διαγραφή Πώλησης επιτυχής.',
+    'delete_unsuccessful'               => 'Αποτυχία διαγραφής Πώλησης.',
+    'description_abbrv'                 => 'Περιγρ.',
+    'discard'                           => 'Απόρριψη',
+    'discard_quote'                     => '',
+    'discount'                          => 'Έκπτ.',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Έκπτωσης',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Πρέπει να πληρωθεί',
+    'due_filter'                        => 'Πρέπει να πληρωθεί',
+    'edit'                              => 'Επεξεργασία',
+    'edit_item'                         => 'Επεξεργασία είδους',
+    'edit_sale'                         => 'Επεξεργασία Πώλησης',
+    'email_receipt'                     => 'Απόδειξη Ηλεκτρονικού Ταχυδρομείου',
+    'employee'                          => 'Υπάλληλος',
+    'entry'                             => 'Εγγραφή',
+    'error_editing_item'                => 'Σφάλμα επεξεργασίας είδους',
+    'find_or_scan_item'                 => 'Εύρεση ή Σκανάρισμα Είδους',
+    'find_or_scan_item_or_receipt'      => 'Εύρεση ή Σκανάρισμα είδους ή Απόδειξης',
+    'giftcard'                          => 'Δωροκάρτα',
+    'giftcard_balance'                  => 'Υπόλοιπο Δωροκάρτας',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Αριθμός Δωροκάρτας',
+    'group_by_category'                 => 'Ομαδοποίηση ανά Κατηγορία',
+    'group_by_type'                     => 'Ομαδοποίηση ανά Είδος',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID Πώλησης',
+    'include_prices'                    => 'Συμπερίληψη Τιμών?',
+    'insufficient_giftcard_balance'     => 'Ανεπαρκές υπόλοιπο Δωροκάρτας για αυτή την πληρωμή.',
+    'insufficient_reward_points'        => 'Ανεπαρκείς Πόντοι Ανταμοιβής για αυτή την πληρωμή.',
+    'invoice'                           => 'Τιμολόγιο',
+    'invoice_confirm'                   => 'Το τιμολόγιο θα αποσταλεί σε',
+    'invoice_enable'                    => 'Δημιουργία Τιμολογίου',
+    'invoice_filter'                    => 'Τιμολόγια',
+    'invoice_no_email'                  => 'Ο Πελάτης δεν έχει έγκυρο λογαριασμό ταχυδρομείου.',
+    'invoice_number'                    => 'Τιμολόγιο #',
+    'invoice_number_duplicate'          => 'Ο Αριθμός Τιμολογίου πρέπει να είναι μοναδικός.',
+    'invoice_sent'                      => 'Το Τιμολόγιο απεστάλη σε',
+    'invoice_total'                     => 'Σύνολο Τιμολογίου',
+    'invoice_type_custom_invoice'       => 'Προσαρμοσμένο Τιμολόγιο (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Προσαρμοσμένο Φορολογικό Τιμολόγιο (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Τιμολόγιο (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Φορολογικό Τιμολόγιο (tax_invoice.php)',
+    'invoice_unsent'                    => 'Ανεπιτυχής αποστολή Τιμολογίου σε',
+    'invoice_update'                    => 'Επαναμέτρηση',
+    'item_insufficient_of_stock'        => 'Το είδος έχει ανεπαρκή απόθεμα.',
+    'item_name'                         => 'Όνομα Είδους',
+    'item_number'                       => '# Είδους',
+    'item_out_of_stock'                 => 'Το είδος δεν υπάρχει σε απόθεμα.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Λειτουργία Ταμείου',
+    'must_enter_numeric'                => 'Το Ποσό Είσπραξης πρέπει να είναι Αριθμός.',
+    'must_enter_numeric_giftcard'       => 'Ο Αριθμός της Δωροκάρτας πρέπει να είναι αριθμός.',
+    'must_enter_reference_code'         => 'Πρέπει να εισαχθεί αριθμός αναφοράς/ανάκτησης.',
+    'negative_amount_tendered'          => 'Το ποσό είσπραξης δεν μπορεί να είναι αρνητικό.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Νέος Πελάτης',
+    'new_item'                          => 'Νέο Είδος',
+    'no_description'                    => 'Δεν έχει περιγραφή',
+    'no_filter'                         => 'Όλα',
+    'no_items_in_cart'                  => 'Δεν υπάρχουν είδη στο καλάθι.',
+    'no_sales_to_display'               => 'Δεν υπάρχουν Πωλήσεις προς προβολή.',
+    'none_selected'                     => 'Δεν έχετε επιλέξει Πώληση/σεις για διαγραφή.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'Αυτή η ενέργεια δεν είναι εξουσιοδοτημένη.',
+    'one_or_multiple'                   => 'Πώληση/εις',
+    'payment'                           => 'Τύπος Πληρωμής',
+    'payment_amount'                    => 'Ποσό',
+    'payment_not_cover_total'           => 'Το Ποσό πρέπει να είναι μεγαλύτερο ή ίσο του Συνόλου.',
+    'payment_type'                      => 'Τύπος',
+    'payments'                          => '',
+    'payments_total'                    => 'Συνολικό Ποσό',
+    'price'                             => 'Τιμή',
+    'print_after_sale'                  => 'Εκτύπωση μετά την Πώληση',
+    'quantity'                          => 'Ποσότητα',
+    'quantity_less_than_reorder_level'  => 'Προσοχή: Επιθυμητή Ποσότητα είναι λιγότερη από την τιμή Επαναπαραγγελίας για το είδος.',
+    'quantity_less_than_zero'           => 'Προσοχή: Επιθυμητή Ποσότητα είναι ανεπαρκής. Μπορείτε να επεξεργαστείτε την πώληση, αλλά ελέγξτε το απόθεμα.',
+    'quantity_of_items'                 => 'Ποσότητα των {0} Ειδών',
+    'quote'                             => 'Παράθεση',
+    'quote_number'                      => 'Αριθμός Παράθεσης',
+    'quote_number_duplicate'            => 'Ο Αριθμός Παράθεσης πρέπει να είναι μοναδικός.',
+    'quote_sent'                        => 'Η Παράθεση απεστάλη σε',
+    'quote_unsent'                      => 'Αποτυχία αποστολής Παράθεσης σε',
+    'receipt'                           => 'Απόδειξη Πώλησης',
+    'receipt_no_email'                  => 'Ο πελάτης δεν έχει έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.',
+    'receipt_number'                    => 'Πώληση #',
+    'receipt_sent'                      => 'Η Απόδειξη εστάλη σε',
+    'receipt_unsent'                    => 'Αποτυχία αποστολής Απόδειξης σε',
+    'reference_code'                    => 'Κωδικός αναφοράς πληρωμής',
+    'reference_code_invalid_characters' => 'Ο κωδικός αναφοράς πρέπει να περιέχει μόνο γράμματα και αριθμούς.',
+    'reference_code_length_error'       => 'Το μήκος του κωδικού αναφοράς δεν είναι έγκυρο.',
+    'refund'                            => '',
+    'register'                          => 'Μητρώο Πωλήσεων',
+    'remove_customer'                   => 'Αφαίρεση Πελάτη',
+    'remove_discount'                   => '',
+    'return'                            => 'Επιστροφή',
+    'rewards'                           => 'Πόντοι Ανταμοιβής',
+    'rewards_balance'                   => 'Υπόλοιπο Πόντων Ανταμοιβής',
+    'rewards_package'                   => 'Ανταμοιβές',
+    'rewards_remaining_balance'         => 'Η αξία των υπολειπόμενων πόντων ανταμοιβής είναι ',
+    'sale'                              => 'Πώληση',
+    'sale_by_invoice'                   => 'Πώληση ανά Τιμολόγιο',
+    'sale_for_customer'                 => 'Πελάτης:',
+    'sale_time'                         => 'Ώρα',
+    'sales_tax'                         => 'Φόρος Πώλησης',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Επιλογή Πελάτη',
+    'send_invoice'                      => 'Αποστολή Τιμολογίου',
+    'send_quote'                        => 'Αποστολή Παράθεσης',
+    'send_receipt'                      => 'Αποστολή Απόδειξης',
+    'send_work_order'                   => 'Αποστολή Εντολής Εργασίας',
+    'serial'                            => 'Σειριακός',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Εμφάνιση Τιμολογίου',
+    'show_receipt'                      => 'Εμφάνιση Απόδειξης',
+    'start_typing_customer_name'        => 'Πληκτρολογήστε τις λεπτομέρειες πελάτη...',
+    'start_typing_item_name'            => 'Πληκτρολογήστε το είδος ή σκανάρετε το Barcode...',
+    'stock'                             => 'Απόθεμα',
+    'stock_location'                    => 'Τοποθεσία Αποθέματος',
+    'sub_total'                         => 'Υποσύνολο',
+    'successfully_deleted'              => 'Έχετε διαγράψει επιτυχώς',
+    'successfully_restored'             => 'Έχετε επαναφέρει επιτυχώς',
+    'successfully_suspended_sale'       => 'Αναμονή Πώλησης επιτυχής.',
+    'successfully_updated'              => 'Ενημέρωση Πώλησης επιτυχής.',
+    'suspend_sale'                      => 'Αναμονή',
+    'suspended_doc_id'                  => 'Έγγραφο',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Ανεστάλη',
+    'table'                             => 'Πίνακας',
+    'takings'                           => 'Ημερήσιες Πωλήσεις',
+    'tax'                               => 'Φόρος',
+    'tax_id'                            => 'Id Φόρου',
+    'tax_invoice'                       => 'Φόρος τιμολογίου',
+    'tax_percent'                       => '% Φόρου',
+    'taxed_ind'                         => '',
+    'total'                             => 'Σύνολο',
+    'total_tax_exclusive'               => 'Εξαιρουμένου Φόρου',
+    'transaction_failed'                => 'Συναλλαγή Πώλησης απέτυχε.',
+    'unable_to_add_item'                => 'Προσθήκη είδους στην Πώληση απέτυχε',
+    'unsuccessfully_deleted'            => 'Διαγραφή Πώλησης/εων απέτυχε.',
+    'unsuccessfully_restored'           => 'Επαναφορά Πώλησης/εων απέτυχε.',
+    'unsuccessfully_suspended_sale'     => 'Αναμονή Πώλησης απέτυχε.',
+    'unsuccessfully_updated'            => 'Ενημέρωση πώλησης απέτυχε.',
+    'unsuspend'                         => 'Επαναφορά από Αναμονή',
+    'unsuspend_and_delete'              => 'Ενέργεια',
+    'update'                            => 'Ενημέρωση',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Παραγγελία Εργασίας',
+    'work_order_number'                 => 'Αριθμός Παραγγελίας Εργασίας',
+    'work_order_number_duplicate'       => 'Ο Αριθμός της Παραγγελίας Εργασίας πρέπει να είναι μοναδικός.',
+    'work_order_sent'                   => 'Εντολή Εργασίας απεστάλη σε',
+    'work_order_unsent'                 => 'Ανεπιτυχής αποστολή Εντολής Εργασίας',
 ];
diff --git a/app/Language/en-GB/Attributes.php b/app/Language/en-GB/Attributes.php
index 4bc728b9b..51775f7fe 100644
--- a/app/Language/en-GB/Attributes.php
+++ b/app/Language/en-GB/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attribute value cannot contain '_' or '|'",
-    "confirm_delete"                   => "Are you sure you want to delete the selected attribute(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected attribute(s)?",
-    "definition_cannot_be_deleted"     => "Could not delete selected attribute(s)",
-    "definition_error_adding_updating" => "Attribute {0} could not be added or updated. Please check the error log.",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Add Attribute",
-    "definition_name_required"         => "Attribute name is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated attribute",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute type is a required field",
-    "definition_unit"                  => "Measurement Unit",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Items to display",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'Attribute value cannot contain \'_\' or \'|\'',
+    'confirm_delete'                   => 'Are you sure you want to delete the selected attribute(s)?',
+    'confirm_restore'                  => 'Are you sure you want to restore the selected attribute(s)?',
+    'definition_cannot_be_deleted'     => 'Could not delete selected attribute(s)',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_invalid_group' => 'The selected group does not exist or is invalid.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute name is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated attribute',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute type is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Attributes to display',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'Show in search',
+    'show_in_search_visibility'        => 'Search',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/en-GB/Bootstrap_tables.php b/app/Language/en-GB/Bootstrap_tables.php
index 305a80a5e..8c1f957cb 100644
--- a/app/Language/en-GB/Bootstrap_tables.php
+++ b/app/Language/en-GB/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "All",
-    "columns"              => "Columns",
-    "hide_show_pagination" => "Hide/Show pagination",
-    "loading"              => "Loading, please wait...",
-    "page_from_to"         => "Showing {0} to {1} of {2} rows",
-    "refresh"              => "Refresh",
-    "rows_per_page"        => "{0} rows per page",
-    "toggle"               => "Toggle",
+    'all' => "All",
+    'columns' => "Columns",
+    'hide_show_pagination' => "Hide/Show pagination",
+    'loading' => "Loading, please wait",
+    'page_from_to' => "Showing {0} to {1} of {2} rows",
+    'refresh' => "Refresh",
+    'rows_per_page' => "{0} rows per page",
+    'toggle' => "Toggle",
 ];
diff --git a/app/Language/en-GB/Config.php b/app/Language/en-GB/Config.php
index fb5a6726b..e356369d2 100644
--- a/app/Language/en-GB/Config.php
+++ b/app/Language/en-GB/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Company Address",
-    "address_required"                          => "Company Address is a required field.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Allow Duplicate Barcodes",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "Barcode",
-    "barcode_company"                           => "Company Name",
-    "barcode_configuration"                     => "Barcode Configuration",
-    "barcode_content"                           => "Barcode Content",
-    "barcode_first_row"                         => "Row 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Input Formats",
-    "barcode_generate_if_empty"                 => "Generate if empty.",
-    "barcode_height"                            => "Height (px)",
-    "barcode_id"                                => "Item Id/Name",
-    "barcode_info"                              => "Barcode Configuration Information",
-    "barcode_layout"                            => "Barcode Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "Barcode",
-    "barcode_number_in_row"                     => "Number in row",
-    "barcode_page_cellspacing"                  => "Display page cellspacing.",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "Price",
-    "barcode_second_row"                        => "Row 2",
-    "barcode_third_row"                         => "Row 3",
-    "barcode_tooltip"                           => "Warning: This feature can cause duplicate items to be imported or created. Do not use if you do not want duplicate barcodes.",
-    "barcode_type"                              => "Barcode Type",
-    "barcode_width"                             => "Width (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Cash Decimals",
-    "cash_decimals_tooltip"                     => "If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.",
-    "cash_rounding"                             => "Cash Rounding",
-    "category_dropdown"                         => "Show Category as a dropdown",
-    "center"                                    => "Centre",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Company Name",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Company Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "Company name is a required field",
-    "company_select_image"                      => "Select Image",
-    "company_website_url"                       => "Company website is not a valid URL (http://...).",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "Currency Code",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Currency Symbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Reward",
-    "customer_reward_duplicate"                 => "Please use a unique reward name.",
-    "customer_reward_enable"                    => "Enable Customer Rewards",
-    "customer_reward_invalid_chars"             => "The reward name cannot contain '_'",
-    "customer_reward_required"                  => "Reward is a required field",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Date and Time Filter",
-    "datetimeformat"                            => "Date and Time Format",
-    "decimal_point"                             => "Decimal Point",
-    "default_barcode_font_size_number"          => "Default Barcode Font size must be a number.",
-    "default_barcode_font_size_required"        => "Default Barcode Font size is a required field.",
-    "default_barcode_height_number"             => "Default Barcode Height must be a number.",
-    "default_barcode_height_required"           => "Default Barcode Height is a required field.",
-    "default_barcode_num_in_row_number"         => "Default Barcode Number in row must be a number.",
-    "default_barcode_num_in_row_required"       => "Default Barcode Number in row is a required field.",
-    "default_barcode_page_cellspacing_number"   => "Default Barcode Page Cellspacing must be a number.",
-    "default_barcode_page_cellspacing_required" => "Default Barcode Page Cellspacing is a required field.",
-    "default_barcode_page_width_number"         => "Default Barcode Page Width must be a number.",
-    "default_barcode_page_width_required"       => "Default Barcode Page Width is a required field.",
-    "default_barcode_width_number"              => "Default Barcode Width must be a number.",
-    "default_barcode_width_required"            => "Default Barcode Width is a required field.",
-    "default_item_columns"                      => "Default Visible Item Columns",
-    "default_origin_tax_code"                   => "Default Origin Tax Code",
-    "default_receivings_discount"               => "Default Receivings Discount",
-    "default_receivings_discount_number"        => "Default Receivings Discount must be a number.",
-    "default_receivings_discount_required"      => "Default Receivings Discount is a required field.",
-    "default_sales_discount"                    => "Default Sales Discount",
-    "default_sales_discount_number"             => "Default Sales Discount must be a number.",
-    "default_sales_discount_required"           => "Default Sales Discount is a required field.",
-    "default_tax_category"                      => "Default Tax Category",
-    "default_tax_code"                          => "Default Tax Code",
-    "default_tax_jurisdiction"                  => "Default Tax Jurisdiction",
-    "default_tax_name_number"                   => "Default Tax Name must be a string.",
-    "default_tax_name_required"                 => "Default Tax Name is a required field.",
-    "default_tax_rate"                          => "Default Tax Rate %",
-    "default_tax_rate_1"                        => "Tax 1 Rate",
-    "default_tax_rate_2"                        => "Tax 2 Rate",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Default Tax Rate must be a number.",
-    "default_tax_rate_required"                 => "Default Tax Rate is a required field.",
-    "derive_sale_quantity"                      => "Allow Derived Sale Quantity",
-    "derive_sale_quantity_tooltip"              => "If checked then a new item type will be provided for items ordered by extended amount",
-    "dinner_table"                              => "Table",
-    "dinner_table_duplicate"                    => "Please use an unique table name.",
-    "dinner_table_enable"                       => "Enable Dinner Tables",
-    "dinner_table_invalid_chars"                => "The table name cannot contain '_'.",
-    "dinner_table_required"                     => "Table is a required field.",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Email Receipt checkbox",
-    "email_receipt_check_behaviour_always"      => "Always checked",
-    "email_receipt_check_behaviour_last"        => "Remember last selection",
-    "email_receipt_check_behaviour_never"       => "Always unchecked",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Enforce privacy",
-    "enforce_privacy_tooltip"                   => "Protect Customers privacy enforcing data scrambling in case of their data being deleted",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions. Please fix and reload this page.",
-    "financial_year"                            => "Financial Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "Floating Labels",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "Allowed file types",
-    "image_max_height_tooltip"                  => "Maximum allowed height of image uploads in pixels (px).",
-    "image_max_size_tooltip"                    => "Maximum allowed file size of image uploads in kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Maximum allowed width of image uploads in pixels (px).",
-    "image_restrictions"                        => "Image Upload Restrictions",
-    "include_hsn"                               => "Include Support for HSN Codes",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Shop Information",
-    "input_groups"                              => "Input Groups",
-    "integrations"                              => "Integrations",
-    "integrations_configuration"                => "Third Party Integrations",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "Invoice Type",
-    "is_readable"                               => "is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.",
-    "is_writable"                               => "is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines Per Page",
-    "lines_per_page_number"                     => "Lines Per Page must be a number.",
-    "lines_per_page_required"                   => "Lines Per Page is a required field.",
-    "locale"                                    => "Localisation",
-    "locale_configuration"                      => "Localisation Configuration",
-    "locale_info"                               => "Localisation Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "Login Form Style",
-    "logout"                                    => "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "MailChimp API Key",
-    "mailchimp_configuration"                   => "MailChimp Configuration",
-    "mailchimp_key_successfully"                => "Valid API Key.",
-    "mailchimp_key_unsuccessfully"              => "Invalid API Key.",
-    "mailchimp_lists"                           => "MailChimp List(s)",
-    "mailchimp_tooltip"                         => "Click the icon for an API key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here. Otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "Multiple Packages per Item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localisation",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a sensible value.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "OSPOS Timezone:",
-    "ospos_info"                                => "OSPOS Installation Info",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Incorrect permissions leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Bottom Margin must be a number.",
-    "print_bottom_margin_required"              => "Bottom Margin is a required field.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
-    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
-    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Left Margin must be a number.",
-    "print_left_margin_required"                => "Left Margin is a required field.",
-    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
-    "print_receipt_check_behaviour_always"      => "Always checked",
-    "print_receipt_check_behaviour_last"        => "Remember last selection",
-    "print_receipt_check_behaviour_never"       => "Always unchecked",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Default Right Margin must be a number.",
-    "print_right_margin_required"               => "Default Right Margin is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Default Top Margin must be a number.",
-    "print_top_margin_required"                 => "Default Top Margin is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Default Quote Comments",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "Show Tax Indicator",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Change Cost Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "Report an issue",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration saved successfully.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Please use an unique location name.",
-    "stock_location_invalid_chars"              => "Stock location name cannot contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Takings Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "The entered Tax Category already exists.",
-    "tax_category_invalid_chars"                => "The entered Tax Category is invalid.",
-    "tax_category_required"                     => "The Tax Category is required.",
-    "tax_category_used"                         => "Tax Category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "Tax Id",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "Preview Theme:",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "OSPOS Timezone is Different from your Local Timezone.",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Use Destination Based Tax",
-    "user_timezone"                             => "Local Timezone:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'Company Address',
+    'address_required'                          => 'Company Address is a required field.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Allow Duplicate Barcodes',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => 'Barcode',
+    'barcode_company'                           => 'Company Name',
+    'barcode_configuration'                     => 'Barcode Configuration',
+    'barcode_content'                           => 'Barcode Content',
+    'barcode_first_row'                         => 'Row 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Input Formats',
+    'barcode_generate_if_empty'                 => 'Generate if empty.',
+    'barcode_height'                            => 'Height (px)',
+    'barcode_id'                                => 'Item Id/Name',
+    'barcode_info'                              => 'Barcode Configuration Information',
+    'barcode_layout'                            => 'Barcode Layout',
+    'barcode_name'                              => 'Name',
+    'barcode_number'                            => 'Barcode',
+    'barcode_number_in_row'                     => 'Number in row',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing.',
+    'barcode_page_width'                        => 'Display page width',
+    'barcode_price'                             => 'Price',
+    'barcode_second_row'                        => 'Row 2',
+    'barcode_third_row'                         => 'Row 3',
+    'barcode_tooltip'                           => 'Warning: This feature can cause duplicate items to be imported or created. Do not use if you do not want duplicate barcodes.',
+    'barcode_type'                              => 'Barcode Type',
+    'barcode_width'                             => 'Width (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Cash Decimals',
+    'cash_decimals_tooltip'                     => 'If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.',
+    'cash_rounding'                             => 'Cash Rounding',
+    'category_dropdown'                         => 'Show Category as a dropdown',
+    'center'                                    => 'Centre',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => 'Company Name',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Change Image',
+    'company_logo'                              => 'Company Logo',
+    'company_remove_image'                      => 'Remove Image',
+    'company_required'                          => 'Company name is a required field',
+    'company_select_image'                      => 'Select Image',
+    'company_website_url'                       => 'Company website is not a valid URL (http://...).',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => 'Currency Code',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => 'Currency Symbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Reward',
+    'customer_reward_duplicate'                 => 'Please use a unique reward name.',
+    'customer_reward_enable'                    => 'Enable Customer Rewards',
+    'customer_reward_invalid_chars'             => "The reward name cannot contain '_'",
+    'customer_reward_required'                  => 'Reward is a required field',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Date and Time Filter',
+    'datetimeformat'                            => 'Date and Time Format',
+    'decimal_point'                             => 'Decimal Point',
+    'default_barcode_font_size_number'          => 'Default Barcode Font size must be a number.',
+    'default_barcode_font_size_required'        => 'Default Barcode Font size is a required field.',
+    'default_barcode_height_number'             => 'Default Barcode Height must be a number.',
+    'default_barcode_height_required'           => 'Default Barcode Height is a required field.',
+    'default_barcode_num_in_row_number'         => 'Default Barcode Number in row must be a number.',
+    'default_barcode_num_in_row_required'       => 'Default Barcode Number in row is a required field.',
+    'default_barcode_page_cellspacing_number'   => 'Default Barcode Page Cellspacing must be a number.',
+    'default_barcode_page_cellspacing_required' => 'Default Barcode Page Cellspacing is a required field.',
+    'default_barcode_page_width_number'         => 'Default Barcode Page Width must be a number.',
+    'default_barcode_page_width_required'       => 'Default Barcode Page Width is a required field.',
+    'default_barcode_width_number'              => 'Default Barcode Width must be a number.',
+    'default_barcode_width_required'            => 'Default Barcode Width is a required field.',
+    'default_item_columns'                      => 'Default Visible Item Columns',
+    'default_origin_tax_code'                   => 'Default Origin Tax Code',
+    'default_receivings_discount'               => 'Default Receivings Discount',
+    'default_receivings_discount_number'        => 'Default Receivings Discount must be a number.',
+    'default_receivings_discount_required'      => 'Default Receivings Discount is a required field.',
+    'default_sales_discount'                    => 'Default Sales Discount',
+    'default_sales_discount_number'             => 'Default Sales Discount must be a number.',
+    'default_sales_discount_required'           => 'Default Sales Discount is a required field.',
+    'default_tax_category'                      => 'Default Tax Category',
+    'default_tax_code'                          => 'Default Tax Code',
+    'default_tax_jurisdiction'                  => 'Default Tax Jurisdiction',
+    'default_tax_name_number'                   => 'Default Tax Name must be a string.',
+    'default_tax_name_required'                 => 'Default Tax Name is a required field.',
+    'default_tax_rate'                          => 'Default Tax Rate %',
+    'default_tax_rate_1'                        => 'Tax 1 Rate',
+    'default_tax_rate_2'                        => 'Tax 2 Rate',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Default Tax Rate must be a number.',
+    'default_tax_rate_required'                 => 'Default Tax Rate is a required field.',
+    'derive_sale_quantity'                      => 'Allow Derived Sale Quantity',
+    'derive_sale_quantity_tooltip'              => 'If checked then a new item type will be provided for items ordered by extended amount',
+    'dinner_table'                              => 'Table',
+    'dinner_table_duplicate'                    => 'Please use an unique table name.',
+    'dinner_table_enable'                       => 'Enable Dinner Tables',
+    'dinner_table_invalid_chars'                => "The table name cannot contain '_'.",
+    'dinner_table_required'                     => 'Table is a required field.',
+    'dot'                                       => 'dot',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Email Receipt checkbox',
+    'email_receipt_check_behaviour_always'      => 'Always checked',
+    'email_receipt_check_behaviour_last'        => 'Remember last selection',
+    'email_receipt_check_behaviour_never'       => 'Always unchecked',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Enforce privacy',
+    'enforce_privacy_tooltip'                   => 'Protect Customers privacy enforcing data scrambling in case of their data being deleted',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions. Please fix and reload this page.',
+    'financial_year'                            => 'Financial Year Start',
+    'financial_year_apr'                        => '1st of April',
+    'financial_year_aug'                        => '1st of August',
+    'financial_year_dec'                        => '1st of December',
+    'financial_year_feb'                        => '1st of February',
+    'financial_year_jan'                        => '1st of January',
+    'financial_year_jul'                        => '1st of July',
+    'financial_year_jun'                        => '1st of June',
+    'financial_year_mar'                        => '1st of March',
+    'financial_year_may'                        => '1st of May',
+    'financial_year_nov'                        => '1st of November',
+    'financial_year_oct'                        => '1st of October',
+    'financial_year_sep'                        => '1st of September',
+    'floating_labels'                           => 'Floating Labels',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key is a required field',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => 'Allowed file types',
+    'image_max_height_tooltip'                  => 'Maximum allowed height of image uploads in pixels (px).',
+    'image_max_size_tooltip'                    => 'Maximum allowed file size of image uploads in kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Maximum allowed width of image uploads in pixels (px).',
+    'image_restrictions'                        => 'Image Upload Restrictions',
+    'include_hsn'                               => 'Include Support for HSN Codes',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Shop Information',
+    'input_groups'                              => 'Input Groups',
+    'integrations'                              => 'Integrations',
+    'integrations_configuration'                => 'Third Party Integrations',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => 'Invoice Type',
+    'is_readable'                               => 'is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.',
+    'is_writable'                               => 'is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines Per Page',
+    'lines_per_page_number'                     => 'Lines Per Page must be a number.',
+    'lines_per_page_required'                   => 'Lines Per Page is a required field.',
+    'locale'                                    => 'Localisation',
+    'locale_configuration'                      => 'Localisation Configuration',
+    'locale_info'                               => 'Localisation Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => 'Login Form Style',
+    'logout'                                    => "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout.",
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'MailChimp API Key',
+    'mailchimp_configuration'                   => 'MailChimp Configuration',
+    'mailchimp_key_successfully'                => 'Valid API Key.',
+    'mailchimp_key_unsuccessfully'              => 'Invalid API Key.',
+    'mailchimp_lists'                           => 'MailChimp List(s)',
+    'mailchimp_tooltip'                         => 'Click the icon for an API key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here. Otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => 'Multiple Packages per Item',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localisation',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a sensible value.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => 'OSPOS Timezone:',
+    'ospos_info'                                => 'OSPOS Installation Info',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Payment Reference Code<br>Length Limits',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Incorrect permissions leaves this software at risk.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Phone is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Bottom Margin must be a number.',
+    'print_bottom_margin_required'              => 'Bottom Margin is a required field.',
+    'print_delay_autoreturn'                    => 'Autoreturn to Sale delay',
+    'print_delay_autoreturn_number'             => 'Autoreturn to Sale delay must be a number.',
+    'print_delay_autoreturn_required'           => 'Autoreturn to Sale delay is a required field.',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Left Margin must be a number.',
+    'print_left_margin_required'                => 'Left Margin is a required field.',
+    'print_receipt_check_behaviour'             => 'Print Receipt checkbox',
+    'print_receipt_check_behaviour_always'      => 'Always checked',
+    'print_receipt_check_behaviour_last'        => 'Remember last selection',
+    'print_receipt_check_behaviour_never'       => 'Always unchecked',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Default Right Margin must be a number.',
+    'print_right_margin_required'               => 'Default Right Margin is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Default Top Margin must be a number.',
+    'print_top_margin_required'                 => 'Default Top Margin is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Default Quote Comments',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => 'Show Tax Indicator',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Change Cost Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => 'Report an issue',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'Invalid sendmail path. Only letters, numbers, dashes, underscores, slashes, backslashes, colons, spaces and dots are allowed.',
+    'saved_successfully'                        => 'Configuration saved successfully.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Stock location',
+    'stock_location_duplicate'                  => 'Please use an unique location name.',
+    'stock_location_invalid_chars'              => "Stock location name cannot contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 2',
+    'suggestions_third_column'                  => 'Column 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Takings Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => 'The entered Tax Category already exists.',
+    'tax_category_invalid_chars'                => 'The entered Tax Category is invalid.',
+    'tax_category_required'                     => 'The Tax Category is required.',
+    'tax_category_used'                         => 'Tax Category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Tax Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => 'Tax Id',
+    'tax_included'                              => 'Tax Included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => 'Preview Theme:',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => 'OSPOS Timezone is Different from your Local Timezone.',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => 'Use Destination Based Tax',
+    'user_timezone'                             => 'Local Timezone:',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/en-GB/Employees.php b/app/Language/en-GB/Employees.php
index c2b60fb78..1d5871e6e 100644
--- a/app/Language/en-GB/Employees.php
+++ b/app/Language/en-GB/Employees.php
@@ -1,45 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Information",
-    "cannot_be_deleted"            => "Unable to delete selected Employee(s), one or more of the has processed sales or you are trying to delete your account.",
-    "change_employee"              => "",
-    "change_password"              => "Change Password",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Are you sure you want to delete the selected Employee(s)?",
-    "confirm_restore"              => "Are you sure you want to restore the selected Employee(s)?",
-    "current_password"             => "Current Password",
-    "current_password_invalid"     => "Current Password is invalid.",
-    "employee"                     => "Employee",
-    "error_adding_updating"        => "Employee add or update failed.",
-    "error_deleting_demo_admin"    => "You cannot delete the demo admin user.",
-    "error_updating_demo_admin"    => "You cannot change the demo admin user.",
-    "language"                     => "Language",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "New Employee",
-    "none_selected"                => "You have not selected any Employee(s) to delete.",
-    "one_or_multiple"              => "Employee(s)",
-    "password"                     => "Password",
-    "password_minlength"           => "Passwords must be at least 8 characters.",
-    "password_must_match"          => "Passwords do not match.",
-    "password_not_must_match"      => "Current password and new password must be unique.",
-    "password_required"            => "Password is required.",
-    "permission_desc"              => "Check the boxes below to grant access to modules.",
-    "permission_info"              => "Permissions",
-    "repeat_password"              => "Password Again",
-    "subpermission_required"       => "Add at least one grant for each module.",
-    "successful_adding"            => "Employee add successful.",
-    "successful_change_password"   => "Password change successful.",
-    "successful_deleted"           => "You have successfully deleted Employee",
-    "successful_updating"          => "You have successfully updated Employee",
-    "system_language"              => "System Language",
-    "unsuccessful_change_password" => "Password change failed.",
-    "update"                       => "Update Employee",
-    "username"                     => "Username",
-    "username_duplicate"           => "Employee username is already in use. Please choose another one.",
-    "username_minlength"           => "Username must be at least 5 characters.",
-    "username_required"            => "Username is a required field.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Information',
+    'cannot_be_deleted'                      => 'Unable to delete selected Employee(s), one or more of them has processed sales or you are trying to delete your account.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Change Password',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Are you sure you want to delete the selected Employee(s)?',
+    'confirm_restore'                        => 'Are you sure you want to restore the selected Employee(s)?',
+    'current_password'                       => 'Current Password',
+    'current_password_invalid'               => 'Current Password is invalid.',
+    'employee'                               => 'Employee',
+    'error_adding_updating'                  => 'Employee add or update failed.',
+    'error_cannot_remove_own_minimum_grant'  => 'You cannot remove your own minimum module access grants.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'You cannot delete the demo admin user.',
+    'error_grant_change_disallowed'          => 'Grant changes are disabled in this demo.',
+    'error_password_change_disallowed'       => 'Password changes are disabled in this demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'You cannot change the demo admin user.',
+    'language'                               => 'Language',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'New Employee',
+    'none_selected'                          => 'You have not selected any Employee(s) to delete.',
+    'one_or_multiple'                        => 'Employee(s)',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'Passwords must be at least 8 characters.',
+    'password_must_match'                    => 'Passwords do not match.',
+    'password_not_must_match'                => 'Current password and new password must be unique.',
+    'password_required'                      => 'Password is required.',
+    'permission_desc'                        => 'Check the boxes below to grant access to modules.',
+    'permission_info'                        => 'Permissions',
+    'repeat_password'                        => 'Password Again',
+    'subpermission_required'                 => 'Add at least one grant for each module.',
+    'successful_adding'                      => 'Employee add successful.',
+    'successful_change_password'             => 'Password change successful.',
+    'successful_deleted'                     => 'You have successfully deleted Employee',
+    'successful_updating'                    => 'You have successfully updated Employee',
+    'system_language'                        => 'System Language',
+    'unsuccessful_change_password'           => 'Password change failed.',
+    'update'                                 => 'Update Employee',
+    'username'                               => 'Username',
+    'username_duplicate'                     => 'Employee username is already in use. Please choose another one.',
+    'username_minlength'                     => 'Username must be at least 5 characters.',
+    'username_required'                      => 'Username is a required field.',
 ];
diff --git a/app/Language/en-GB/Error.php b/app/Language/en-GB/Error.php
index e2e744336..29f0ba2f6 100644
--- a/app/Language/en-GB/Error.php
+++ b/app/Language/en-GB/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "You do not have the permission to access the module named",
-    "unknown"              => "Unexpected error",
+    'no_permission_module'           => 'You do not have the permission to access the module named',
+    'unable_to_create_env_file'      => 'Unable to create {filePath} to provision an environment key',
+    'unable_to_lock_file'            => 'Unable to lock {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Unable to open {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Unable to persist throttle.key to {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Unable to read {filePath} to provision an environment key',
+    'unknown'                        => 'Unexpected error',
 ];
diff --git a/app/Language/en-GB/Items.php b/app/Language/en-GB/Items.php
index 4527a6708..a74ea032f 100644
--- a/app/Language/en-GB/Items.php
+++ b/app/Language/en-GB/Items.php
@@ -1,121 +1,123 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventory to add or subtract.",
-    "allow_alt_description"              => "Allow Alternate Description",
-    "amount_entry"                       => "Amount Entry",
-    "bulk_edit"                          => "Bulk Edit",
-    "buy_price_required"                 => "Purchase Price is a required field.",
-    "cannot_be_deleted"                  => "Could not delete the selected Item(s), one or more of the selected Items have sales.",
-    "cannot_find_item"                   => "Item not found.",
-    "categories"                         => "",
-    "category"                           => "Category",
-    "category_new"                       => "",
-    "category_required"                  => "Category is a required field.",
-    "change_all_to_allow_alt_desc"       => "Allow Alternate Description for all.",
-    "change_all_to_not_allow_allow_desc" => "Do not allow Alternate Description for all.",
-    "change_all_to_serialized"           => "Change all to Serialised",
-    "change_all_to_unserialized"         => "Change all to Unserialised",
-    "change_image"                       => "Change Image",
-    "confirm_bulk_edit"                  => "Are you sure you want to edit selected Item(s)?",
-    "confirm_bulk_edit_wipe_taxes"       => "All Item Tax information will be replaced.",
-    "confirm_delete"                     => "Are you sure you want to delete the selected Item(s)?",
-    "confirm_restore"                    => "Are you sure you want to restore the selected Item(s)?",
-    "cost_price"                         => "Cost Price",
-    "cost_price_number"                  => "Cost Price must be a number.",
-    "cost_price_required"                => "Cost Price is a required field.",
-    "count"                              => "Update Inventory",
-    "csv_import_failed"                  => "The csv import failed",
-    "csv_import_nodata_wrongformat"      => "The uploaded file has no data or is formatted incorrectly.",
-    "csv_import_partially_failed"        => "There were {0} item import failure(s) on line(s): {1}. No rows were imported.",
-    "csv_import_success"                 => "Item import successful.",
-    "current_quantity"                   => "Current Quantity",
-    "default_pack_name"                  => "Each",
-    "description"                        => "Description",
-    "details_count"                      => "Inventory count details",
-    "do_nothing"                         => "Do nothing",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit the fields you want to edit for all the selected items.",
-    "edit_multiple_items"                => "Editing Multiple Items",
-    "empty_upc_items"                    => "Empty Barcode Items",
-    "error_adding_updating"              => "Error adding/updating item",
-    "error_updating_multiple"            => "Error updating items",
-    "generate_barcodes"                  => "Generate Barcodes",
-    "hsn_code"                           => "Harmonised System Nomenclature",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Item Import from CSV",
-    "info_provided_by"                   => "Information provided by",
-    "inventory"                          => "Inventory",
-    "inventory_CSV_import_quantity"      => "Quantity Imported from CSV",
-    "inventory_comments"                 => "Comments",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Date",
-    "inventory_employee"                 => "Employee",
-    "inventory_in_out_quantity"          => "In/Out Quantity",
-    "inventory_remarks"                  => "Remarks",
-    "is_deleted"                         => "Deleted",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item has Serial Number",
-    "item"                               => "Item",
-    "item_id"                            => "",
-    "item_number"                        => "Barcode",
-    "item_number_duplicate"              => "Item Number is already present in the database.",
-    "kit"                                => "Kit",
-    "location"                           => "Location",
-    "low_inventory_items"                => "Out Of Stock Items",
-    "low_sell_item"                      => "Low sell item",
-    "manually_editing_of_quantity"       => "Manual Edit of Quantity",
-    "markup"                             => "",
-    "name"                               => "Item Name",
-    "name_required"                      => "Item Name is a required field.",
-    "new"                                => "New Item",
-    "no_description_items"               => "No Description Items",
-    "no_items_to_display"                => "No Items to display.",
-    "none"                               => "None",
-    "none_selected"                      => "You have not selected any Item(s) to edit",
-    "nonstock"                           => "Non-stocked",
-    "number_information"                 => "Item Number",
-    "number_required"                    => "Barcode is a required field.",
-    "one_or_multiple"                    => "item(s)",
-    "pack_name"                          => "Pack Name",
-    "qty_per_pack"                       => "Quantity per pack",
-    "quantity"                           => "Quantity",
-    "quantity_number"                    => "Quantity must be a number.",
-    "quantity_required"                  => "Quantity is a required field.",
-    "receiving_quantity"                 => "Receiving Quantity",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "Reorder Level",
-    "reorder_level_number"               => "Reorder Level must be a number.",
-    "reorder_level_required"             => "Reorder Level is a required field.",
-    "retrive_item_info"                  => "Retrieve Item Info",
-    "sales_tax_1"                        => "Sales Tax",
-    "sales_tax_2"                        => "Sales Tax 2",
-    "search_attributes"                  => "Search Attributes. Date format Y-m-d",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "Serialised Items",
-    "standard"                           => "Standard",
-    "stock"                              => "Stock",
-    "stock_location"                     => "Stock location",
-    "stock_type"                         => "Stock Type",
-    "successful_adding"                  => "You have successfully added Item",
-    "successful_bulk_edit"               => "You have successfully updated the selected Items",
-    "successful_deleted"                 => "You have successfully deleted Item",
-    "successful_updating"                => "You have successfully updated Item",
-    "supplier"                           => "Supplier",
-    "tax_1"                              => "Tax 1",
-    "tax_2"                              => "Tax 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Tax Category",
-    "tax_percent"                        => "Tax Percent",
-    "tax_percent_number"                 => "Tax Percent must be a numeric value",
-    "tax_percent_required"               => "Tax Percent is a required field.",
-    "tax_percents"                       => "Tax Percent(s)",
-    "temp"                               => "Temporary",
-    "type"                               => "Item Type",
-    "unit_price"                         => "Sell Price",
-    "unit_price_number"                  => "Sell Price must be a number.",
-    "unit_price_required"                => "Sell Price is a required field.",
-    "upc_database"                       => "Barcode Database",
-    "update"                             => "Update Item",
-    "use_inventory_menu"                 => "Use Inventory Menu",
+    'add_minus'                          => 'Inventory to add or subtract.',
+    'allow_alt_description'              => 'Allow Alternate Description',
+    'amount_entry'                       => 'Amount Entry',
+    'bulk_edit'                          => 'Bulk Edit',
+    'buy_price_required'                 => 'Purchase Price is a required field.',
+    'cannot_be_deleted'                  => 'Could not delete the selected Item(s), one or more of the selected Items have sales.',
+    'cannot_find_item'                   => 'Item not found.',
+    'categories'                         => '',
+    'category'                           => 'Category',
+    'category_new'                       => '',
+    'category_required'                  => 'Category is a required field.',
+    'change_all_to_allow_alt_desc'       => 'Allow Alternate Description for all.',
+    'change_all_to_not_allow_allow_desc' => 'Do not allow Alternate Description for all.',
+    'change_all_to_serialized'           => 'Change all to Serialised',
+    'change_all_to_unserialized'         => 'Change all to Unserialised',
+    'change_image'                       => 'Change Image',
+    'confirm_bulk_edit'                  => 'Are you sure you want to edit selected Item(s)?',
+    'confirm_bulk_edit_wipe_taxes'       => 'All Item Tax information will be replaced.',
+    'confirm_delete'                     => 'Are you sure you want to delete the selected Item(s)?',
+    'confirm_restore'                    => 'Are you sure you want to restore the selected Item(s)?',
+    'cost_price'                         => 'Cost Price',
+    'cost_price_number'                  => 'Cost Price must be a number.',
+    'cost_price_required'                => 'Cost Price is a required field.',
+    'count'                              => 'Update Inventory',
+    'csv_import_failed'                  => 'The csv import failed',
+    'csv_import_nodata_wrongformat'      => 'The uploaded file has no data or is formatted incorrectly.',
+    'csv_import_partially_failed'        => 'There were {0} item import failure(s) on line(s): {1}. No rows were imported.',
+    'csv_import_success'                 => 'Item import successful.',
+    'current_quantity'                   => 'Current Quantity',
+    'default_pack_name'                  => 'Each',
+    'description'                        => 'Description',
+    'details_count'                      => 'Inventory count details',
+    'do_nothing'                         => 'Do nothing',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit the fields you want to edit for all the selected items.',
+    'edit_multiple_items'                => 'Editing Multiple Items',
+    'empty_upc_items'                    => 'Empty Barcode Items',
+    'error_adding_updating'              => 'Error adding/updating item',
+    'error_updating_multiple'            => 'Error updating items',
+    'generate_barcodes'                  => 'Generate Barcodes',
+    'hsn_code'                           => 'Harmonised System Nomenclature',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Item Import from CSV',
+    'info_provided_by'                   => 'Information provided by',
+    'inventory'                          => 'Inventory',
+    'inventory_CSV_import_quantity'      => 'Quantity Imported from CSV',
+    'inventory_comments'                 => 'Comments',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Date',
+    'inventory_employee'                 => 'Employee',
+    'inventory_in_out_quantity'          => 'In/Out Quantity',
+    'inventory_remarks'                  => 'Remarks',
+    'is_deleted'                         => 'Deleted',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item has Serial Number',
+    'item'                               => 'Item',
+    'item_id'                            => '',
+    'item_number'                        => 'Barcode',
+    'item_number_duplicate'              => 'Item Number is already present in the database.',
+    'item_number_invalid'                => 'Item Number contains disallowed characters.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Location',
+    'low_inventory_items'                => 'Out Of Stock Items',
+    'low_sell_item'                      => 'Low sell item',
+    'manually_editing_of_quantity'       => 'Manual Edit of Quantity',
+    'markup'                             => '',
+    'name'                               => 'Item Name',
+    'name_required'                      => 'Item Name is a required field.',
+    'new'                                => 'New Item',
+    'no_description_items'               => 'No Description Items',
+    'no_items_to_display'                => 'No Items to display.',
+    'none'                               => 'None',
+    'none_selected'                      => 'You have not selected any Item(s) to edit',
+    'nonstock'                           => 'Non-stocked',
+    'number_information'                 => 'Item Number',
+    'number_required'                    => 'Barcode is a required field.',
+    'one_or_multiple'                    => 'item(s)',
+    'pack_name'                          => 'Pack Name',
+    'qty_per_pack'                       => 'Quantity per pack',
+    'quantity'                           => 'Quantity',
+    'quantity_number'                    => 'Quantity must be a number.',
+    'quantity_required'                  => 'Quantity is a required field.',
+    'receiving_quantity'                 => 'Receiving Quantity',
+    'remove_image'                       => 'Remove Image',
+    'reorder_level'                      => 'Reorder Level',
+    'reorder_level_number'               => 'Reorder Level must be a number.',
+    'reorder_level_required'             => 'Reorder Level is a required field.',
+    'retrive_item_info'                  => 'Retrieve Item Info',
+    'sales_tax_1'                        => 'Sales Tax',
+    'sales_tax_2'                        => 'Sales Tax 2',
+    'search_attributes'                  => 'Search Attributes. Date format Y-m-d',
+    'select_image'                       => 'Select Image',
+    'serialized_items'                   => 'Serialised Items',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Stock',
+    'stock_location'                     => 'Stock location',
+    'stock_type'                         => 'Stock Type',
+    'successful_adding'                  => 'You have successfully added Item',
+    'successful_bulk_edit'               => 'You have successfully updated the selected Items',
+    'successful_deleted'                 => 'You have successfully deleted Item',
+    'successful_updating'                => 'You have successfully updated Item',
+    'supplier'                           => 'Supplier',
+    'tax_1'                              => 'Tax 1',
+    'tax_2'                              => 'Tax 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Tax Category',
+    'tax_name_invalid'                   => 'Tax Name contains disallowed characters.',
+    'tax_percent'                        => 'Tax Percent',
+    'tax_percent_number'                 => 'Tax Percent must be a numeric value',
+    'tax_percent_required'               => 'Tax Percent is a required field.',
+    'tax_percents'                       => 'Tax Percent(s)',
+    'temp'                               => 'Temporary',
+    'type'                               => 'Item Type',
+    'unit_price'                         => 'Sell Price',
+    'unit_price_number'                  => 'Sell Price must be a number.',
+    'unit_price_required'                => 'Sell Price is a required field.',
+    'upc_database'                       => 'Barcode Database',
+    'update'                             => 'Update Item',
+    'use_inventory_menu'                 => 'Use Inventory Menu',
 ];
diff --git a/app/Language/en-GB/Login.php b/app/Language/en-GB/Login.php
index 0eb94004e..7aaa5cc64 100644
--- a/app/Language/en-GB/Login.php
+++ b/app/Language/en-GB/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "I'm not a robot.",
-    "go"                            => "Go",
-    "invalid_gcaptcha"              => "Please verify that you are not a robot.",
-    "invalid_installation"          => "The installation is not correct, check your php.ini file.",
-    "invalid_username_and_password" => "Invalid username and/or password.",
-    "login"                         => "Login",
-    "logout"                        => "Logout",
-    "migration_needed"              => "A database migration to {0} will start after login.",
-    "password"                      => "Password",
-    "required_username"             => "The username field is required.",
-    "username"                      => "Username",
-    "welcome"                       => "Welcome to {0}!",
+    "gcaptcha"                            => "I'm not a robot.",
+    "go"                                  => "Go",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Please verify that you are not a robot.",
+    "invalid_installation"                => "The installation is not correct, check your php.ini file.",
+    "invalid_username_and_password"       => "Invalid username and/or password.",
+    "login"                               => "Login",
+    "logout"                              => "Logout",
+    "migrating_database"                  => "Migrating Database",
+    "migration_auth_message"              => "Administrator credentials are required to authorize the database migration to version {0}. Please login to proceed.",
+    "migration_complete"                  => "Database initialized successfully!",
+    "migration_complete_login"            => "You can now log in.",
+    "migration_complete_migrate"          => "Database migrated successfully!",
+    "migration_complete_redirect"         => "Migration complete. Redirecting to login...",
+    "migration_error_connection"          => "Connection error. Please try again.",
+    "migration_failed"                    => "Migration failed",
+    "migration_initializing"              => "Initializing Database",
+    "migration_needed"                    => "A database migration to {0} will start after login.",
+    "migration_required"                  => "Database Migration Required",
+    "migration_running"                   => "Running database migrations...",
+    "password"                            => "Password",
+    "required_username"                   => "The username field is required.",
+    'too_many_attempts'                   => 'Too many attempts. Please wait a moment and try again.',
+    "username"                            => "Username",
+    "welcome"                             => "Welcome to {0}!"
 ];
diff --git a/app/Language/en-GB/Sales.php b/app/Language/en-GB/Sales.php
index d9678ba44..d07593641 100644
--- a/app/Language/en-GB/Sales.php
+++ b/app/Language/en-GB/Sales.php
@@ -1,226 +1,242 @@
 <?php
 
 return [
-    "customers_available_points"       => "Points Available",
-    "rewards_package"                  => "Rewards",
-    "rewards_remaining_balance"        => "Reward Points remaining value is ",
-    "account_number"                   => "Account #",
-    "add_payment"                      => "Add Payment",
-    "amount_due"                       => "Amount Due",
-    "amount_tendered"                  => "Amount Tendered",
-    "authorized_signature"             => "Authorised Signature",
-    "cancel_sale"                      => "Cancel",
-    "cash"                             => "Cash",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Cash Adjustment",
-    "cash_deposit"                     => "Cash Deposit",
-    "cash_filter"                      => "Cash",
-    "change_due"                       => "Change Due",
-    "change_price"                     => "Change Selling Price",
-    "check"                            => "Cheque",
-    "check_balance"                    => "Cheque remainder",
-    "check_filter"                     => "Cheque",
-    "close"                            => "",
-    "comment"                          => "Comment",
-    "comments"                         => "Comments",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Complete",
-    "confirm_cancel_sale"              => "Are you sure you want to clear this sale? All items will be cleared.",
-    "confirm_delete"                   => "Are you sure you want to delete the selected Sale(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected Sale(s)?",
-    "credit"                           => "Credit Card",
-    "credit_deposit"                   => "Credit Deposit",
-    "credit_filter"                    => "Credit Card",
-    "current_table"                    => "",
-    "customer"                         => "Customer",
-    "customer_address"                 => "Address",
-    "customer_discount"                => "Discount",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Location",
-    "customer_mailchimp_status"        => "MailChimp Status",
-    "customer_optional"                => "(Required for Due Payments)",
-    "customer_required"                => "(Required)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Sale Date",
-    "date_range"                       => "Date Range",
-    "date_required"                    => "A correct date must be entered.",
-    "date_type"                        => "Date is a required field.",
-    "debit"                            => "Debit Card",
-    "debit_filter"                     => "",
-    "delete"                           => "Allow Delete",
-    "delete_confirmation"              => "Are you sure you want to delete this sale? This action cannot be undone.",
-    "delete_entire_sale"               => "Delete Entire Sale",
-    "delete_successful"                => "Sale delete successful.",
-    "delete_unsuccessful"              => "Sale delete failed.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Discard",
-    "discard_quote"                    => "",
-    "discount"                         => "Disc",
-    "discount_included"                => "% Discount",
-    "discount_short"                   => "%",
-    "due"                              => "Due",
-    "due_filter"                       => "Due",
-    "edit"                             => "Edit",
-    "edit_item"                        => "Edit Item",
-    "edit_sale"                        => "Edit Sale",
-    "email_receipt"                    => "Email Receipt",
-    "employee"                         => "Employee",
-    "entry"                            => "Entry",
-    "error_editing_item"               => "Error editing item",
-    "find_or_scan_item"                => "Find or Scan Item",
-    "find_or_scan_item_or_receipt"     => "Find or Scan Item or Receipt",
-    "giftcard"                         => "Gift Card",
-    "giftcard_balance"                 => "Gift Card Balance",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gift Card Number",
-    "group_by_category"                => "Group by Category",
-    "group_by_type"                    => "Group by Type",
-    "hsn"                              => "HSN",
-    "id"                               => "Sale ID",
-    "include_prices"                   => "Include Prices?",
-    "invoice"                          => "Invoice",
-    "invoice_confirm"                  => "This invoice will be sent to",
-    "invoice_enable"                   => "Invoice Number",
-    "invoice_filter"                   => "Invoices",
-    "invoice_no_email"                 => "This customer does not have a valid email address.",
-    "invoice_number"                   => "Invoice #",
-    "invoice_number_duplicate"         => "Invoice Number {0} must be unique.",
-    "invoice_sent"                     => "Invoice sent to",
-    "invoice_total"                    => "Invoice Total",
-    "invoice_type_custom_invoice"      => "Custom Invoice (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Custom Tax Invoice (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Invoice (invoice.php)",
-    "invoice_type_tax_invoice"         => "Tax Invoice (tax_invoice.php)",
-    "invoice_unsent"                   => "Invoice failed to be sent to",
-    "invoice_update"                   => "Recount",
-    "item_insufficient_of_stock"       => "Item has insufficient stock.",
-    "item_name"                        => "Item Name",
-    "item_number"                      => "Item #",
-    "item_out_of_stock"                => "Item is out of stock.",
-    "key_browser"                      => "Helpful Shortcuts",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice without payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "Open in Full Screen Mode",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "Zoom in",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "Zoom Out",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "Print Current Page",
-    "key_restore"                      => "Restore Original Display/Zoom",
-    "key_search"                       => "Search Reports Tables",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "System Shortcuts",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Register Mode",
-    "must_enter_numeric"               => "Amount Tendered must be a number.",
-    "must_enter_numeric_giftcard"      => "Gift Card Number must be a number.",
-    "new_customer"                     => "New Customer",
-    "new_item"                         => "New Item",
-    "no_description"                   => "No description",
-    "no_filter"                        => "All",
-    "no_items_in_cart"                 => "There are no Items in the cart.",
-    "no_sales_to_display"              => "No Sales to display.",
-    "none_selected"                    => "You have not selected any Sale(s) to delete.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "This action is not authorised.",
-    "one_or_multiple"                  => "Sale(s)",
-    "payment"                          => "Payment Type",
-    "payment_amount"                   => "Amount",
-    "payment_not_cover_total"          => "Payment Amount does not cover Total.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Payments Total",
-    "price"                            => "Price",
-    "print_after_sale"                 => "Print after Sale",
-    "quantity"                         => "Qty",
-    "quantity_less_than_reorder_level" => "Warning: Desired Quantity is below Reorder Level for that Item.",
-    "quantity_less_than_zero"          => "Warning: Desired Quantity is out of stock, audit your inventory.",
-    "quantity_of_items"                => "Quantity of {0} Items",
-    "quote"                            => "Quote",
-    "quote_number"                     => "Quote Number",
-    "quote_number_duplicate"           => "Quote Number must be unique.",
-    "quote_sent"                       => "Quote sent to",
-    "quote_unsent"                     => "Quote failed to be sent to",
-    "receipt"                          => "Sales Receipt",
-    "receipt_no_email"                 => "This customer does not have a valid email address.",
-    "receipt_number"                   => "Sale #",
-    "receipt_sent"                     => "Receipt sent to",
-    "receipt_unsent"                   => "Receipt failed to be sent to",
-    "refund"                           => "Refund Type",
-    "register"                         => "Sales Register",
-    "remove_customer"                  => "Remove Customer",
-    "remove_discount"                  => "",
-    "return"                           => "Return",
-    "rewards"                          => "Reward Points",
-    "rewards_balance"                  => "Reward Points Balance",
-    "sale"                             => "Sale",
-    "sale_by_invoice"                  => "Sale by Invoice",
-    "sale_for_customer"                => "Customer:",
-    "sale_time"                        => "Time",
-    "sales_tax"                        => "Sales Tax",
-    "sales_total"                      => "",
-    "select_customer"                  => "Select Customer",
-    "selected_customer"                => "Selected Customer",
-    "send_invoice"                     => "Send Invoice",
-    "send_quote"                       => "Send Quote",
-    "send_receipt"                     => "Send Receipt",
-    "send_work_order"                  => "Send Work Order",
-    "serial"                           => "Serial",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Show Invoice",
-    "show_receipt"                     => "Show Receipt",
-    "start_typing_customer_name"       => "Start typing customer details...",
-    "start_typing_item_name"           => "Start typing Item Name or scan Barcode...",
-    "stock"                            => "Stock",
-    "stock_location"                   => "Stock Location",
-    "sub_total"                        => "Sub Total",
-    "successfully_deleted"             => "You have successfully deleted Sale",
-    "successfully_restored"            => "You have successfully restored",
-    "successfully_suspended_sale"      => "Sale suspend successful.",
-    "successfully_updated"             => "Sale update successful.",
-    "suspend_sale"                     => "Suspend",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspended",
-    "table"                            => "Table",
-    "takings"                          => "Transactions",
-    "tax"                              => "Tax",
-    "tax_id"                           => "Tax Id",
-    "tax_invoice"                      => "Tax Invoice",
-    "tax_percent"                      => "Tax %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Tax excluded",
-    "transaction_failed"               => "Sales Transaction failed.",
-    "unable_to_add_item"               => "Item add to Sale failed",
-    "unsuccessfully_deleted"           => "Sale(s) delete failed.",
-    "unsuccessfully_restored"          => "Sale(s) restore failed.",
-    "unsuccessfully_suspended_sale"    => "Sale suspend failed.",
-    "unsuccessfully_updated"           => "Sale update failed.",
-    "unsuspend"                        => "Unsuspend",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Update",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Work Order",
-    "work_order_number"                => "Work Order Number",
-    "work_order_number_duplicate"      => "Work Order Number must be unique.",
-    "work_order_sent"                  => "Work Order sent to",
-    "work_order_unsent"                => "Work Order failed to be sent to",
+    'account_number'                    => 'Account #',
+    'add_payment'                       => 'Add Payment',
+    'amount_due'                        => 'Amount Due',
+    'amount_due_not_covered'            => 'Payments do not cover the amount due.',
+    'amount_tendered'                   => 'Amount Tendered',
+    'authorized_signature'              => 'Authorised Signature',
+    'bank_transfer'                     => 'Bank Transfer',
+    'cancel_sale'                       => 'Cancel',
+    'cash'                              => 'Cash',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Cash Adjustment',
+    'cash_deposit'                      => 'Cash Deposit',
+    'cash_filter'                       => 'Cash',
+    'change_due'                        => 'Change Due',
+    'change_price'                      => 'Change Selling Price',
+    'check'                             => 'Cheque',
+    'check_balance'                     => 'Cheque remainder',
+    'check_filter'                      => 'Cheque',
+    'close'                             => '',
+    'comment'                           => 'Comment',
+    'comments'                          => 'Comments',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Complete',
+    'confirm_cancel_sale'               => 'Are you sure you want to clear this sale? All items will be cleared.',
+    'confirm_delete'                    => 'Are you sure you want to delete the selected Sale(s)?',
+    'confirm_restore'                   => 'Are you sure you want to restore the selected Sale(s)?',
+    'credit'                            => 'Credit Card',
+    'credit_deposit'                    => 'Credit Deposit',
+    'credit_filter'                     => 'Credit Card',
+    'current_table'                     => '',
+    'customer'                          => 'Customer',
+    'customer_address'                  => 'Address',
+    'customer_discount'                 => 'Discount',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Location',
+    'customer_mailchimp_status'         => 'MailChimp Status',
+    'customer_optional'                 => '(Required for Due Payments)',
+    'customer_required'                 => '(Required)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Points Available',
+    'daily_sales'                       => '',
+    'date'                              => 'Sale Date',
+    'date_range'                        => 'Date Range',
+    'date_required'                     => 'A correct date must be entered.',
+    'date_type'                         => 'Date is a required field.',
+    'debit'                             => 'Debit Card',
+    'debit_filter'                      => '',
+    'delete'                            => 'Allow Delete',
+    'delete_confirmation'               => 'Are you sure you want to delete this sale? This action cannot be undone.',
+    'delete_entire_sale'                => 'Delete Entire Sale',
+    'delete_successful'                 => 'Sale delete successful.',
+    'delete_unsuccessful'               => 'Sale delete failed.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Discard',
+    'discard_quote'                     => '',
+    'discount'                          => 'Disc',
+    'discount_exceeds_item_total'       => 'Discount cannot exceed the item total.',
+    'discount_included'                 => '% Discount',
+    'discount_percent_exceeds_100'      => 'Percentage discount cannot exceed 100%.',
+    'discount_short'                    => '%',
+    'due'                               => 'Due',
+    'due_filter'                        => 'Due',
+    'edit'                              => 'Edit',
+    'edit_item'                         => 'Edit Item',
+    'edit_sale'                         => 'Edit Sale',
+    'email_receipt'                     => 'Email Receipt',
+    'employee'                          => 'Employee',
+    'entry'                             => 'Entry',
+    'error_editing_item'                => 'Error editing item',
+    'find_or_scan_item'                 => 'Find or Scan Item',
+    'find_or_scan_item_or_receipt'      => 'Find or Scan Item or Receipt',
+    'giftcard'                          => 'Gift Card',
+    'giftcard_balance'                  => 'Gift Card Balance',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Gift Card Number',
+    'group_by_category'                 => 'Group by Category',
+    'group_by_type'                     => 'Group by Type',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Sale ID',
+    'include_prices'                    => 'Include Prices?',
+    'insufficient_giftcard_balance'     => 'Insufficient gift card balance for this payment.',
+    'insufficient_reward_points'        => 'Insufficient reward points for this payment.',
+    'invoice'                           => 'Invoice',
+    'invoice_confirm'                   => 'This invoice will be sent to',
+    'invoice_enable'                    => 'Invoice Number',
+    'invoice_filter'                    => 'Invoices',
+    'invoice_no_email'                  => 'This customer does not have a valid email address.',
+    'invoice_number'                    => 'Invoice #',
+    'invoice_number_duplicate'          => 'Invoice Number {0} must be unique.',
+    'invoice_sent'                      => 'Invoice sent to',
+    'invoice_total'                     => 'Invoice Total',
+    'invoice_type_custom_invoice'       => 'Custom Invoice (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Custom Tax Invoice (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Invoice (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Tax Invoice (tax_invoice.php)',
+    'invoice_unsent'                    => 'Invoice failed to be sent to',
+    'invoice_update'                    => 'Recount',
+    'item_insufficient_of_stock'        => 'Item has insufficient stock.',
+    'item_name'                         => 'Item Name',
+    'item_number'                       => 'Item #',
+    'item_out_of_stock'                 => 'Item is out of stock.',
+    'key_browser'                       => 'Helpful Shortcuts',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice without payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => 'Open in Full Screen Mode',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => 'Zoom in',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => 'Zoom Out',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => 'Print Current Page',
+    'key_restore'                       => 'Restore Original Display/Zoom',
+    'key_search'                        => 'Search Reports Tables',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => 'System Shortcuts',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Register Mode',
+    'must_enter_numeric'                => 'Amount Tendered must be a number.',
+    'must_enter_numeric_giftcard'       => 'Gift Card Number must be a number.',
+    'must_enter_reference_code'         => 'Reference/Retrieval Number must be entered.',
+    'negative_amount_tendered'          => 'Amount Tendered cannot be negative.',
+    'negative_discount_invalid'         => 'Discount cannot be negative.',
+    'negative_price_invalid'            => 'Price cannot be negative.',
+    'negative_quantity_invalid'         => 'Quantity cannot be negative.',
+    'negative_total_invalid'            => 'Sale total cannot be negative. Check item discounts and quantities.',
+    'new_customer'                      => 'New Customer',
+    'new_item'                          => 'New Item',
+    'no_description'                    => 'No description',
+    'no_filter'                         => 'All',
+    'no_items_in_cart'                  => 'There are no Items in the cart.',
+    'no_sales_to_display'               => 'No Sales to display.',
+    'none_selected'                     => 'You have not selected any Sale(s) to delete.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'This action is not authorised.',
+    'one_or_multiple'                   => 'Sale(s)',
+    'payment'                           => 'Payment Type',
+    'payment_amount'                    => 'Amount',
+    'payment_not_cover_total'           => 'Payment Amount does not cover Total.',
+    'payment_type'                      => 'Type',
+    'payments'                          => '',
+    'payments_total'                    => 'Payments Total',
+    'price'                             => 'Price',
+    'print_after_sale'                  => 'Print after Sale',
+    'quantity'                          => 'Qty',
+    'quantity_less_than_reorder_level'  => 'Warning: Desired Quantity is below Reorder Level for that Item.',
+    'quantity_less_than_zero'           => 'Warning: Desired Quantity is out of stock, audit your inventory.',
+    'quantity_of_items'                 => 'Quantity of {0} Items',
+    'quote'                             => 'Quote',
+    'quote_number'                      => 'Quote Number',
+    'quote_number_duplicate'            => 'Quote Number must be unique.',
+    'quote_sent'                        => 'Quote sent to',
+    'quote_unsent'                      => 'Quote failed to be sent to',
+    'receipt'                           => 'Sales Receipt',
+    'receipt_no_email'                  => 'This customer does not have a valid email address.',
+    'receipt_number'                    => 'Sale #',
+    'receipt_sent'                      => 'Receipt sent to',
+    'receipt_unsent'                    => 'Receipt failed to be sent to',
+    'reference_code'                    => 'Payment Reference Code',
+    'reference_code_invalid_characters' => 'Reference code must contain only letters and numbers.',
+    'reference_code_length_error'       => 'Reference code length is invalid.',
+    'refund'                            => 'Refund Type',
+    'register'                          => 'Sales Register',
+    'remove_customer'                   => 'Remove Customer',
+    'remove_discount'                   => '',
+    'return'                            => 'Return',
+    'rewards'                           => 'Reward Points',
+    'rewards_balance'                   => 'Reward Points Balance',
+    'rewards_package'                   => 'Rewards',
+    'rewards_remaining_balance'         => 'Reward Points remaining value is ',
+    'sale'                              => 'Sale',
+    'sale_by_invoice'                   => 'Sale by Invoice',
+    'sale_for_customer'                 => 'Customer:',
+    'sale_time'                         => 'Time',
+    'sales_tax'                         => 'Sales Tax',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Select Customer',
+    'selected_customer'                 => 'Selected Customer',
+    'send_invoice'                      => 'Send Invoice',
+    'send_quote'                        => 'Send Quote',
+    'send_receipt'                      => 'Send Receipt',
+    'send_work_order'                   => 'Send Work Order',
+    'serial'                            => 'Serial',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Show Invoice',
+    'show_receipt'                      => 'Show Receipt',
+    'start_typing_customer_name'        => 'Start typing customer details...',
+    'start_typing_item_name'            => 'Start typing Item Name or scan Barcode...',
+    'stock'                             => 'Stock',
+    'stock_location'                    => 'Stock Location',
+    'sub_total'                         => 'Sub Total',
+    'successfully_deleted'              => 'You have successfully deleted Sale',
+    'successfully_restored'             => 'You have successfully restored',
+    'successfully_suspended_sale'       => 'Sale suspend successful.',
+    'successfully_updated'              => 'Sale update successful.',
+    'suspend_sale'                      => 'Suspend',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspended',
+    'table'                             => 'Table',
+    'takings'                           => 'Transactions',
+    'tax'                               => 'Tax',
+    'tax_id'                            => 'Tax Id',
+    'tax_invoice'                       => 'Tax Invoice',
+    'tax_percent'                       => 'Tax %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Tax excluded',
+    'transaction_failed'                => 'Sales Transaction failed.',
+    'unable_to_add_item'                => 'Item add to Sale failed',
+    'unsuccessfully_deleted'            => 'Sale(s) delete failed.',
+    'unsuccessfully_restored'           => 'Sale(s) restore failed.',
+    'unsuccessfully_suspended_sale'     => 'Sale suspend failed.',
+    'unsuccessfully_updated'            => 'Sale update failed.',
+    'unsuspend'                         => 'Unsuspend',
+    'unsuspend_and_delete'              => 'Action',
+    'update'                            => 'Update',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wallet'                            => 'Wallet',
+    'wholesale'                         => '',
+    'work_order'                        => 'Work Order',
+    'work_order_number'                 => 'Work Order Number',
+    'work_order_number_duplicate'       => 'Work Order Number must be unique.',
+    'work_order_sent'                   => 'Work Order sent to',
+    'work_order_unsent'                 => 'Work Order failed to be sent to',
 ];
diff --git a/app/Language/en/Attributes.php b/app/Language/en/Attributes.php
index bdbe402eb..51775f7fe 100644
--- a/app/Language/en/Attributes.php
+++ b/app/Language/en/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attribute value cannot contain '_' or '|'",
-    "confirm_delete"                   => "Are you sure you want to delete the selected attribute(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected attribute(s)?",
-    "definition_cannot_be_deleted"     => "Could not delete selected attribute(s)",
-    "definition_error_adding_updating" => "Attribute {0} could not be added or updated. Please check the error log.",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Add Attribute",
-    "definition_name_required"         => "Attribute name is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated attribute",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute type is a required field",
-    "definition_unit"                  => "Measurement Unit",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Attributes to display",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'Attribute value cannot contain \'_\' or \'|\'',
+    'confirm_delete'                   => 'Are you sure you want to delete the selected attribute(s)?',
+    'confirm_restore'                  => 'Are you sure you want to restore the selected attribute(s)?',
+    'definition_cannot_be_deleted'     => 'Could not delete selected attribute(s)',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_invalid_group' => 'The selected group does not exist or is invalid.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute name is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated attribute',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute type is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Attributes to display',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'Show in search',
+    'show_in_search_visibility'        => 'Search',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/en/Bootstrap_tables.php b/app/Language/en/Bootstrap_tables.php
index ae35fe81d..4e35f3063 100644
--- a/app/Language/en/Bootstrap_tables.php
+++ b/app/Language/en/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "all",
-    "columns"              => "Columns",
-    "hide_show_pagination" => "Hide/Show pagination",
-    "loading"              => "Loading, please wait...",
-    "page_from_to"         => "Showing {0} to {1} of {2} rows",
-    "refresh"              => "Refresh",
-    "rows_per_page"        => "{0} rows per page",
-    "toggle"               => "Toggle",
+    'all' => "all",
+    'columns' => "Columns",
+    'hide_show_pagination' => "Hide/Show pagination",
+    'loading' => "Loading, please wait",
+    'page_from_to' => "Showing {0} to {1} of {2} rows",
+    'refresh' => "Refresh",
+    'rows_per_page' => "{0} rows per page",
+    'toggle' => "Toggle",
 ];
diff --git a/app/Language/en/Config.php b/app/Language/en/Config.php
index 94a4c877e..01c7c7c0c 100644
--- a/app/Language/en/Config.php
+++ b/app/Language/en/Config.php
@@ -1,331 +1,341 @@
 <?php
 
 return [
-    "address"                                   => "Company Address",
-    "address_required"                          => "Company address is a required field.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Allow Duplicate Barcodes",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "Barcode",
-    "barcode_company"                           => "Company Name",
-    "barcode_configuration"                     => "Barcode Configuration",
-    "barcode_content"                           => "Barcode Content",
-    "barcode_first_row"                         => "Row 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Input Formats",
-    "barcode_generate_if_empty"                 => "Generate if empty.",
-    "barcode_height"                            => "Height (px)",
-    "barcode_id"                                => "Item Id/Name",
-    "barcode_info"                              => "Barcode Configuration Information",
-    "barcode_layout"                            => "Barcode Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "Barcode",
-    "barcode_number_in_row"                     => "Number in row",
-    "barcode_page_cellspacing"                  => "Display page cellspacing.",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "Price",
-    "barcode_second_row"                        => "Row 2",
-    "barcode_third_row"                         => "Row 3",
-    "barcode_tooltip"                           => "Warning: This feature can cause duplicate items to be imported or created. Do not use if you do not want duplicate barcodes.",
-    "barcode_type"                              => "Barcode Type",
-    "barcode_width"                             => "Width (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Cash Decimals",
-    "cash_decimals_tooltip"                     => "If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.",
-    "cash_rounding"                             => "Cash Rounding",
-    "category_dropdown"                         => "Show Category as a dropdown",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Company Name",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Company Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "Company name is a required field",
-    "company_select_image"                      => "Select Image",
-    "company_website_url"                       => "Company website is not a valid URL (http://...).",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "Currency Code",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Currency Symbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Reward",
-    "customer_reward_duplicate"                 => "Reward must be unique.",
-    "customer_reward_enable"                    => "Enable Customer Rewards",
-    "customer_reward_invalid_chars"             => "Reward can not contain '_'",
-    "customer_reward_required"                  => "Reward is a required field",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Date and Time Filter",
-    "datetimeformat"                            => "Date and Time Format",
-    "decimal_point"                             => "Decimal Point",
-    "default_barcode_font_size_number"          => "Default Barcode Font Size must be a number.",
-    "default_barcode_font_size_required"        => "Default Barcode Font Size is a required field.",
-    "default_barcode_height_number"             => "Default Barcode Height must be a number.",
-    "default_barcode_height_required"           => "Default Barcode Height is a required field.",
-    "default_barcode_num_in_row_number"         => "Default Barcode Number in Row must be a number.",
-    "default_barcode_num_in_row_required"       => "Default Barcode Number in Row is a required field.",
-    "default_barcode_page_cellspacing_number"   => "Default Barcode Page Cellspacing must be a number.",
-    "default_barcode_page_cellspacing_required" => "Default Barcode Page Cellspacing is a required field.",
-    "default_barcode_page_width_number"         => "Default Barcode Page Width must be a number.",
-    "default_barcode_page_width_required"       => "Default Barcode Page Width is a required field.",
-    "default_barcode_width_number"              => "Default Barcode Width must be a number.",
-    "default_barcode_width_required"            => "Default Barcode Width is a required field.",
-    "default_item_columns"                      => "Default Visible Item Columns",
-    "default_origin_tax_code"                   => "Default Origin Tax Code",
-    "default_receivings_discount"               => "Default Receivings Discount",
-    "default_receivings_discount_number"        => "Default Receivings Discount must be a number.",
-    "default_receivings_discount_required"      => "Default Receivings Discount is a required field.",
-    "default_sales_discount"                    => "Default Sales Discount",
-    "default_sales_discount_number"             => "Default Sales Discount must be a number.",
-    "default_sales_discount_required"           => "Default Sales Discount is a required field.",
-    "default_tax_category"                      => "Default Tax Category",
-    "default_tax_code"                          => "Default Tax Code",
-    "default_tax_jurisdiction"                  => "Default Tax Jurisdiction",
-    "default_tax_name_number"                   => "Default Tax Name must be a string.",
-    "default_tax_name_required"                 => "Default Tax Name is a required field.",
-    "default_tax_rate"                          => "Default Tax Rate %",
-    "default_tax_rate_1"                        => "Tax 1 Rate",
-    "default_tax_rate_2"                        => "Tax 2 Rate",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Default Tax Rate must be a number.",
-    "default_tax_rate_required"                 => "Default Tax Rate is a required field.",
-    "derive_sale_quantity"                      => "Allow Derived Sale Quantity",
-    "derive_sale_quantity_tooltip"              => "If checked then a new item type will be provided for items ordered by extended amount",
-    "dinner_table"                              => "Table",
-    "dinner_table_duplicate"                    => "Table must be unique.",
-    "dinner_table_enable"                       => "Enable Dinner Tables",
-    "dinner_table_invalid_chars"                => "Table Name can not contain '_'.",
-    "dinner_table_required"                     => "Table is a required field.",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Email Receipt checkbox",
-    "email_receipt_check_behaviour_always"      => "Always checked",
-    "email_receipt_check_behaviour_last"        => "Remember last selection",
-    "email_receipt_check_behaviour_never"       => "Always unchecked",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Enforce privacy",
-    "enforce_privacy_tooltip"                   => "Protect Customers privacy enforcing data scrambling in case of their data being deleted",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions. Please fix and reload this page.",
-    "financial_year"                            => "Fiscal Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "Floating Labels",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "Allowed file types",
-    "image_max_height_tooltip"                  => "Maximum allowed height of image uploads in pixels (px).",
-    "image_max_size_tooltip"                    => "Maximum allowed file size of image uploads in kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Maximum allowed width of image uploads in pixels (px).",
-    "image_restrictions"                        => "Image Upload Restrictions",
-    "include_hsn"                               => "Include Support for HSN Codes",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "Input Groups",
-    "integrations"                              => "Integrations",
-    "integrations_configuration"                => "Third Party Integrations",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "Invoice Type",
-    "is_readable"                               => "is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.",
-    "is_writable"                               => "is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "Lines per Page must be a number.",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Localization Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "Login Form Style",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "MailChimp API Key",
-    "mailchimp_configuration"                   => "MailChimp Configuration",
-    "mailchimp_key_successfully"                => "API Key is valid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
-    "mailchimp_lists"                           => "MailChimp List(s)",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "Multiple Packages per Item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "OSPOS Timezone:",
-    "ospos_info"                                => "OSPOS Installation Info",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Incorrect permissions leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
-    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
-    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
-    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Left must be a number.",
-    "print_left_margin_required"                => "Margin Left is a required field.",
-    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
-    "print_receipt_check_behaviour_always"      => "Always checked",
-    "print_receipt_check_behaviour_last"        => "Remember last selection",
-    "print_receipt_check_behaviour_never"       => "Always unchecked",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Right must be a number.",
-    "print_right_margin_required"               => "Margin Right is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Top must be a number.",
-    "print_top_margin_required"                 => "Margin Top is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Default Quote Comments",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "Show Tax Indicator",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "Report an issue",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "The entered tax category already exists.",
-    "tax_category_invalid_chars"                => "The entered tax category is invalid.",
-    "tax_category_required"                     => "The tax category is required.",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "Tax Id",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "Preview Theme:",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "OSPOS Timezone is Different from your Local Timezone.",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Use Destination Based Tax",
-    "user_timezone"                             => "Local Timezone:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'Company Address',
+    'address_required'                          => 'Company address is a required field.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Allow Duplicate Barcodes',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => 'Barcode',
+    'barcode_company'                           => 'Company Name',
+    'barcode_configuration'                     => 'Barcode Configuration',
+    'barcode_content'                           => 'Barcode Content',
+    'barcode_first_row'                         => 'Row 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Input Formats',
+    'barcode_generate_if_empty'                 => 'Generate if empty.',
+    'barcode_height'                            => 'Height (px)',
+    'barcode_id'                                => 'Item Id/Name',
+    'barcode_info'                              => 'Barcode Configuration Information',
+    'barcode_layout'                            => 'Barcode Layout',
+    'barcode_name'                              => 'Name',
+    'barcode_number'                            => 'Barcode',
+    'barcode_number_in_row'                     => 'Number in row',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing.',
+    'barcode_page_width'                        => 'Display page width',
+    'barcode_price'                             => 'Price',
+    'barcode_second_row'                        => 'Row 2',
+    'barcode_third_row'                         => 'Row 3',
+    'barcode_tooltip'                           => 'Warning: This feature can cause duplicate items to be imported or created. Do not use if you do not want duplicate barcodes.',
+    'barcode_type'                              => 'Barcode Type',
+    'barcode_width'                             => 'Width (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Cash Decimals',
+    'cash_decimals_tooltip'                     => 'If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.',
+    'cash_rounding'                             => 'Cash Rounding',
+    'category_dropdown'                         => 'Show Category as a dropdown',
+    'center'                                    => 'Center',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => 'Company Name',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Change Image',
+    'company_logo'                              => 'Company Logo',
+    'company_remove_image'                      => 'Remove Image',
+    'company_required'                          => 'Company name is a required field',
+    'company_select_image'                      => 'Select Image',
+    'company_website_url'                       => 'Company website is not a valid URL (http://...).',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => 'Currency Code',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => 'Currency Symbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Reward',
+    'customer_reward_duplicate'                 => 'Reward must be unique.',
+    'customer_reward_enable'                    => 'Enable Customer Rewards',
+    'customer_reward_invalid_chars'             => "Reward can not contain '_'",
+    'customer_reward_required'                  => 'Reward is a required field',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Date and Time Filter',
+    'datetimeformat'                            => 'Date and Time Format',
+    'decimal_point'                             => 'Decimal Point',
+    'default_barcode_font_size_number'          => 'Default Barcode Font Size must be a number.',
+    'default_barcode_font_size_required'        => 'Default Barcode Font Size is a required field.',
+    'default_barcode_height_number'             => 'Default Barcode Height must be a number.',
+    'default_barcode_height_required'           => 'Default Barcode Height is a required field.',
+    'default_barcode_num_in_row_number'         => 'Default Barcode Number in Row must be a number.',
+    'default_barcode_num_in_row_required'       => 'Default Barcode Number in Row is a required field.',
+    'default_barcode_page_cellspacing_number'   => 'Default Barcode Page Cellspacing must be a number.',
+    'default_barcode_page_cellspacing_required' => 'Default Barcode Page Cellspacing is a required field.',
+    'default_barcode_page_width_number'         => 'Default Barcode Page Width must be a number.',
+    'default_barcode_page_width_required'       => 'Default Barcode Page Width is a required field.',
+    'default_barcode_width_number'              => 'Default Barcode Width must be a number.',
+    'default_barcode_width_required'            => 'Default Barcode Width is a required field.',
+    'default_item_columns'                      => 'Default Visible Item Columns',
+    'default_origin_tax_code'                   => 'Default Origin Tax Code',
+    'default_receivings_discount'               => 'Default Receivings Discount',
+    'default_receivings_discount_number'        => 'Default Receivings Discount must be a number.',
+    'default_receivings_discount_required'      => 'Default Receivings Discount is a required field.',
+    'default_sales_discount'                    => 'Default Sales Discount',
+    'default_sales_discount_number'             => 'Default Sales Discount must be a number.',
+    'default_sales_discount_required'           => 'Default Sales Discount is a required field.',
+    'default_tax_category'                      => 'Default Tax Category',
+    'default_tax_code'                          => 'Default Tax Code',
+    'default_tax_jurisdiction'                  => 'Default Tax Jurisdiction',
+    'default_tax_name_number'                   => 'Default Tax Name must be a string.',
+    'default_tax_name_required'                 => 'Default Tax Name is a required field.',
+    'default_tax_rate'                          => 'Default Tax Rate %',
+    'default_tax_rate_1'                        => 'Tax 1 Rate',
+    'default_tax_rate_2'                        => 'Tax 2 Rate',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Default Tax Rate must be a number.',
+    'default_tax_rate_required'                 => 'Default Tax Rate is a required field.',
+    'derive_sale_quantity'                      => 'Allow Derived Sale Quantity',
+    'derive_sale_quantity_tooltip'              => 'If checked then a new item type will be provided for items ordered by extended amount',
+    'dinner_table'                              => 'Table',
+    'dinner_table_duplicate'                    => 'Table must be unique.',
+    'dinner_table_enable'                       => 'Enable Dinner Tables',
+    'dinner_table_invalid_chars'                => "Table Name can not contain '_'.",
+    'dinner_table_required'                     => 'Table is a required field.',
+    'dot'                                       => 'dot',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Email Receipt checkbox',
+    'email_receipt_check_behaviour_always'      => 'Always checked',
+    'email_receipt_check_behaviour_last'        => 'Remember last selection',
+    'email_receipt_check_behaviour_never'       => 'Always unchecked',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_pass_set'                       => 'Already set — leave blank to keep',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Enforce privacy',
+    'enforce_privacy_tooltip'                   => 'Protect Customers privacy enforcing data scrambling in case of their data being deleted',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions. Please fix and reload this page.',
+    'financial_year'                            => 'Fiscal Year Start',
+    'financial_year_apr'                        => '1st of April',
+    'financial_year_aug'                        => '1st of August',
+    'financial_year_dec'                        => '1st of December',
+    'financial_year_feb'                        => '1st of February',
+    'financial_year_jan'                        => '1st of January',
+    'financial_year_jul'                        => '1st of July',
+    'financial_year_jun'                        => '1st of June',
+    'financial_year_mar'                        => '1st of March',
+    'financial_year_may'                        => '1st of May',
+    'financial_year_nov'                        => '1st of November',
+    'financial_year_oct'                        => '1st of October',
+    'financial_year_sep'                        => '1st of September',
+    'floating_labels'                           => 'Floating Labels',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key is a required field',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => 'Allowed file types',
+    'image_max_height_tooltip'                  => 'Maximum allowed height of image uploads in pixels (px).',
+    'image_max_size_tooltip'                    => 'Maximum allowed file size of image uploads in kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Maximum allowed width of image uploads in pixels (px).',
+    'image_restrictions'                        => 'Image Upload Restrictions',
+    'include_hsn'                               => 'Include Support for HSN Codes',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Store Information',
+    'input_groups'                              => 'Input Groups',
+    'integrations'                              => 'Integrations',
+    'integrations_configuration'                => 'Third Party Integrations',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => 'Invoice Type',
+    'is_readable'                               => 'is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.',
+    'is_writable'                               => 'is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines per Page',
+    'lines_per_page_number'                     => 'Lines per Page must be a number.',
+    'lines_per_page_required'                   => 'Lines per Page is a required field.',
+    'locale'                                    => 'Localization',
+    'locale_configuration'                      => 'Localization Configuration',
+    'locale_info'                               => 'Localization Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => 'Login Form Style',
+    'logout'                                    => 'Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'MailChimp API Key',
+    'mailchimp_api_key_set'                     => 'Already set — leave blank to keep',
+    'mailchimp_configuration'                   => 'MailChimp Configuration',
+    'mailchimp_key_successfully'                => 'API Key is valid.',
+    'mailchimp_key_unsuccessfully'              => 'API Key is invalid.',
+    'mailchimp_lists'                           => 'MailChimp List(s)',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here, otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_pwd_set'                               => 'Already set — leave blank to keep',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => 'Multiple Packages per Item',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localization',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a valid locale.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => 'OSPOS Timezone:',
+    'ospos_info'                                => 'OSPOS Installation Info',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Payment Reference Code<br>Length Limits',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Incorrect permissions leaves this software at risk.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Phone is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Margin Bottom must be a number.',
+    'print_bottom_margin_required'              => 'Margin Bottom is a required field.',
+    'print_delay_autoreturn'                    => 'Autoreturn to Sale delay',
+    'print_delay_autoreturn_number'             => 'Autoreturn to Sale delay is a required field.',
+    'print_delay_autoreturn_required'           => 'Autoreturn to Sale delay must be a number.',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Margin Left must be a number.',
+    'print_left_margin_required'                => 'Margin Left is a required field.',
+    'print_receipt_check_behaviour'             => 'Print Receipt checkbox',
+    'print_receipt_check_behaviour_always'      => 'Always checked',
+    'print_receipt_check_behaviour_last'        => 'Remember last selection',
+    'print_receipt_check_behaviour_never'       => 'Always unchecked',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Margin Right must be a number.',
+    'print_right_margin_required'               => 'Margin Right is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Margin Top must be a number.',
+    'print_top_margin_required'                 => 'Margin Top is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Default Quote Comments',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => 'Show Tax Indicator',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Calc avg. Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => 'Report an issue',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'Invalid sendmail path. Only letters, numbers, dashes, underscores, slashes, backslashes, colons, spaces and dots are allowed.',
+    'saved_successfully'                        => 'Configuration save successful.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Stock location',
+    'stock_location_duplicate'                  => 'Stock Location must be unique.',
+    'stock_location_invalid_chars'              => "Stock Location can not contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 2',
+    'suggestions_third_column'                  => 'Column 3',
+    'shortcuts'                                 => 'Shortcuts',
+    'shortcuts_configuration'                   => 'Sales Keyboard Shortcut Configuration',
+    'shortcuts_duplicate_bindings'              => 'Shortcut bindings must be unique.',
+    'shortcuts_save_error'                      => 'Unable to save shortcut settings.',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Receipt Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => 'The entered tax category already exists.',
+    'tax_category_invalid_chars'                => 'The entered tax category is invalid.',
+    'tax_category_required'                     => 'The tax category is required.',
+    'tax_category_used'                         => 'Tax category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Tax Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => 'Tax Id',
+    'tax_included'                              => 'Tax Included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => 'Preview Theme:',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => 'OSPOS Timezone is Different from your Local Timezone.',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => 'Use Destination Based Tax',
+    'user_timezone'                             => 'Local Timezone:',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/en/Customers.php b/app/Language/en/Customers.php
index 0f83b2bb4..67d3874f3 100644
--- a/app/Language/en/Customers.php
+++ b/app/Language/en/Customers.php
@@ -16,7 +16,7 @@ return [
     "consent_required"              => "Registration consent is a required field.",
     "csv_import_failed"             => "CSV import failed",
     "csv_import_nodata_wrongformat" => "The uploaded file has no data or is incorrectly formatted.",
-    "csv_import_partially_failed"   => "Customer import successful with some failures:",
+    "csv_import_partially_failed"   => "{0} customer(s) failed to import on line(s): {1}.",
     "csv_import_success"            => "Customer import successful.",
     "customer"                      => "Customer",
     "date"                          => "Date",
diff --git a/app/Language/en/Employees.php b/app/Language/en/Employees.php
index b4d071172..d76b2eae1 100644
--- a/app/Language/en/Employees.php
+++ b/app/Language/en/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Information",
-    "cannot_be_deleted"            => "Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account.",
-    "change_employee"              => "",
-    "change_password"              => "Change Password",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Are you sure you want to delete the selected employee(s)?",
-    "confirm_restore"              => "Are you sure you want to restore selected employee(s)?",
-    "current_password"             => "Current Password",
-    "current_password_invalid"     => "Current Password is invalid.",
-    "employee"                     => "Employee",
-    "error_adding_updating"        => "Employee add or update failed.",
-    "error_deleting_admin"         => "You cannot delete an admin user.",
-    "error_deleting_demo_admin"    => "You can not delete the demo admin user.",
-    "error_updating_admin"         => "You cannot modify an admin user.",
-    "error_updating_demo_admin"    => "You can not change the demo admin user.",
-    "language"                     => "Language",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "New Employee",
-    "none_selected"                => "You have not selected any employee(s) to delete.",
-    "one_or_multiple"              => "employee(s)",
-    "password"                     => "Password",
-    "password_minlength"           => "Password must be at least 8 characters in length.",
-    "password_must_match"          => "Passwords do not match.",
-    "password_not_must_match"      => "Current password and new password must be unique.",
-    "password_required"            => "Password is required.",
-    "permission_desc"              => "Check the boxes below to grant access to modules.",
-    "permission_info"              => "Permissions",
-    "repeat_password"              => "Password Again",
-    "subpermission_required"       => "Add at least one grant for each module.",
-    "successful_adding"            => "Employee add successful.",
-    "successful_change_password"   => "Password change successful.",
-    "successful_deleted"           => "You have successfully deleted",
-    "successful_updating"          => "You have successfully updated employee",
-    "system_language"              => "System Language",
-    "unsuccessful_change_password" => "Password change failed.",
-    "update"                       => "Update Employee",
-    "username"                     => "Username",
-    "username_duplicate"           => "Employee username is already in use. Please choose another one.",
-    "username_minlength"           => "Username must be at least 5 characters in length.",
-    "username_required"            => "Username is a required field.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Information',
+    'cannot_be_deleted'                      => 'Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Change Password',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Are you sure you want to delete the selected employee(s)?',
+    'confirm_restore'                        => 'Are you sure you want to restore selected employee(s)?',
+    'current_password'                       => 'Current Password',
+    'current_password_invalid'               => 'Current Password is invalid.',
+    'employee'                               => 'Employee',
+    'error_adding_updating'                  => 'Employee add or update failed.',
+    'error_cannot_remove_own_minimum_grant'  => 'You cannot remove your own minimum module access grants.',
+    'error_deleting_admin'                   => 'You cannot delete an admin user.',
+    'error_deleting_demo_admin'              => 'You can not delete the demo admin user.',
+    'error_grant_change_disallowed'          => 'Grant changes are disabled in this demo.',
+    'error_password_change_disallowed'       => 'Password changes are disabled in this demo.',
+    'error_updating_admin'                   => 'You cannot modify an admin user.',
+    'error_updating_demo_admin'              => 'You can not change the demo admin user.',
+    'language'                               => 'Language',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'New Employee',
+    'none_selected'                          => 'You have not selected any employee(s) to delete.',
+    'one_or_multiple'                        => 'employee(s)',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'Password must be at least 8 characters in length.',
+    'password_must_match'                    => 'Passwords do not match.',
+    'password_not_must_match'                => 'Current password and new password must be unique.',
+    'password_required'                      => 'Password is required.',
+    'permission_desc'                        => 'Check the boxes below to grant access to modules.',
+    'permission_info'                        => 'Permissions',
+    'repeat_password'                        => 'Password Again',
+    'subpermission_required'                 => 'Add at least one grant for each module.',
+    'successful_adding'                      => 'Employee add successful.',
+    'successful_change_password'             => 'Password change successful.',
+    'successful_deleted'                     => 'You have successfully deleted',
+    'successful_updating'                    => 'You have successfully updated employee',
+    'system_language'                        => 'System Language',
+    'unsuccessful_change_password'           => 'Password change failed.',
+    'update'                                 => 'Update Employee',
+    'username'                               => 'Username',
+    'username_duplicate'                     => 'Employee username is already in use. Please choose another one.',
+    'username_minlength'                     => 'Username must be at least 5 characters in length.',
+    'username_required'                      => 'Username is a required field.',
 ];
diff --git a/app/Language/en/Error.php b/app/Language/en/Error.php
index ace67fbb1..930f88425 100644
--- a/app/Language/en/Error.php
+++ b/app/Language/en/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "You do not have permission to access the module named",
-    "unknown"              => "Unexpected error",
+    'no_permission_module'           => 'You do not have permission to access the module named',
+    'unable_to_create_env_file'      => 'Unable to create {filePath} to provision an environment key',
+    'unable_to_lock_file'            => 'Unable to lock {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Unable to open {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Unable to persist throttle.key to {filePath}',
+    'unable_to_persist_encryption_key' => 'Unable to persist the encryption key to {filePath}',
+    'encryption_key_not_provisioned' => 'No encryption key is provisioned. Run `php spark env:provision` before continuing.',
+    'throttle_key_not_provisioned'   => 'No throttle key is provisioned. Run `php spark env:provision` before continuing.',
+    'unable_to_read_env_file'        => 'Unable to read {filePath} to provision an environment key',
+    'unknown'                        => 'Unexpected error',
 ];
diff --git a/app/Language/en/Items.php b/app/Language/en/Items.php
index 627174e44..b13942457 100644
--- a/app/Language/en/Items.php
+++ b/app/Language/en/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventory to add or subtract.",
-    "allow_alt_description"              => "Allow Alternate Description",
-    "amount_entry"                       => "Amount Entry",
-    "bulk_edit"                          => "Bulk Edit",
-    "buy_price_required"                 => "Purchase Price is a required field.",
-    "cannot_be_deleted"                  => "Could not delete selected Item(s), one or more of the selected Items have sales.",
-    "cannot_find_item"                   => "Item not found.",
-    "categories"                         => "",
-    "category"                           => "Category",
-    "category_new"                       => "",
-    "category_required"                  => "Category is a required field.",
-    "change_all_to_allow_alt_desc"       => "Allow Alternate Description for all.",
-    "change_all_to_not_allow_allow_desc" => "Do not allow Alternate Description for all.",
-    "change_all_to_serialized"           => "Change all to Serialized",
-    "change_all_to_unserialized"         => "Change all to Unserialized",
-    "change_image"                       => "Change Image",
-    "confirm_bulk_edit"                  => "Are you sure you want to edit selected Item(s)?",
-    "confirm_bulk_edit_wipe_taxes"       => "All Item Tax information will be replaced.",
-    "confirm_delete"                     => "Are you sure you want to delete selected item(s)?",
-    "confirm_restore"                    => "Are you sure you want to restore selected item(s)?",
-    "cost_price"                         => "Wholesale Price",
-    "cost_price_number"                  => "Wholesale Price must be a number.",
-    "cost_price_required"                => "Wholesale Price is a required field.",
-    "count"                              => "Update Inventory",
-    "csv_import_failed"                  => "CSV import failed",
-    "csv_import_invalid_location"        => "Invalid stock location(s) found: {0}. Only valid stock locations are allowed.",
-    "csv_import_nodata_wrongformat"      => "The uploaded CSV file has no data or is formatted incorrectly.",
-    "csv_import_partially_failed"        => "There were {0} item import failure(s) on line(s): {1}. No rows were imported.",
-    "csv_import_success"                 => "Item CSV import successful.",
-    "current_quantity"                   => "Current Quantity",
-    "default_pack_name"                  => "Each",
-    "description"                        => "Description",
-    "details_count"                      => "Inventory Count Details",
-    "do_nothing"                         => "Do Nothing",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit the desired fields for selected item(s).",
-    "edit_multiple_items"                => "Editing Multiple Items",
-    "empty_upc_items"                    => "Empty Barcode Items",
-    "error_adding_updating"              => "Error adding/updating item",
-    "error_updating_multiple"            => "Error updating items",
-    "generate_barcodes"                  => "Generate Barcodes",
-    "hsn_code"                           => "Harmonized System Nomenclature",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Item Import from CSV",
-    "info_provided_by"                   => "Information provided by",
-    "inventory"                          => "Inventory",
-    "inventory_CSV_import_quantity"      => "Quantity Imported from CSV",
-    "inventory_comments"                 => "Comments",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Date",
-    "inventory_employee"                 => "Employee",
-    "inventory_in_out_quantity"          => "In/Out Quantity",
-    "inventory_remarks"                  => "Remarks",
-    "is_deleted"                         => "Deleted",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item has Serial Number",
-    "item"                               => "Item",
-    "item_id"                            => "",
-    "item_number"                        => "Barcode",
-    "item_number_duplicate"              => "Item Number is already present in the database.",
-    "kit"                                => "Kit",
-    "location"                           => "Location",
-    "low_inventory_items"                => "Out Of Stock Items",
-    "low_sell_item"                      => "Low sell item",
-    "manually_editing_of_quantity"       => "Manual Edit of Quantity",
-    "markup"                             => "",
-    "name"                               => "Item Name",
-    "name_required"                      => "Item Name is a required field.",
-    "new"                                => "New Item",
-    "no_description_items"               => "No Description Items",
-    "no_items_to_display"                => "No Items to display.",
-    "none"                               => "None",
-    "none_selected"                      => "You have not selected any Item(s) to edit",
-    "nonstock"                           => "Non-stocked",
-    "number_information"                 => "Item Number",
-    "number_required"                    => "Barcode is a required field.",
-    "one_or_multiple"                    => "item(s)",
-    "pack_name"                          => "Pack Name",
-    "qty_per_pack"                       => "Quantity per pack",
-    "quantity"                           => "Quantity",
-    "quantity_number"                    => "Quantity must be a number.",
-    "quantity_required"                  => "Quantity is a required field.",
-    "receiving_quantity"                 => "Receiving Quantity",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "Reorder Level",
-    "reorder_level_number"               => "Reorder Level must be a number.",
-    "reorder_level_required"             => "Reorder Level is a required field.",
-    "retrive_item_info"                  => "Retrieve Item Info",
-    "sales_tax_1"                        => "Sales Tax",
-    "sales_tax_2"                        => "Sales Tax 2",
-    "search_attributes"                  => "Search Attributes",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "Serialized Items",
-    "standard"                           => "Standard",
-    "stock"                              => "Stock",
-    "stock_location"                     => "Stock location",
-    "stock_type"                         => "Stock Type",
-    "successful_adding"                  => "You have successfully added item",
-    "successful_bulk_edit"               => "You have successfully updated the selected item(s)",
-    "successful_deleted"                 => "You have successfully deleted",
-    "successful_updating"                => "You have successfully updated item",
-    "supplier"                           => "Supplier",
-    "tax_1"                              => "Tax 1",
-    "tax_2"                              => "Tax 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Tax Category",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "Tax Percent must be a numeric value",
-    "tax_percent_required"               => "Tax Percent is a required field.",
-    "tax_percents"                       => "Tax Percent(s)",
-    "temp"                               => "Temporary",
-    "type"                               => "Item Type",
-    "unit_price"                         => "Retail Price",
-    "unit_price_number"                  => "Unit price must be a number.",
-    "unit_price_required"                => "Retail Price is a required field.",
-    "upc_database"                       => "Barcode Database",
-    "update"                             => "Update Item",
-    "use_inventory_menu"                 => "Use Inventory Menu",
+    'add_minus'                          => 'Inventory to add or subtract.',
+    'allow_alt_description'              => 'Allow Alternate Description',
+    'amount_entry'                       => 'Amount Entry',
+    'bulk_edit'                          => 'Bulk Edit',
+    'buy_price_required'                 => 'Purchase Price is a required field.',
+    'cannot_be_deleted'                  => 'Could not delete selected Item(s), one or more of the selected Items have sales.',
+    'cannot_find_item'                   => 'Item not found.',
+    'categories'                         => '',
+    'category'                           => 'Category',
+    'category_new'                       => '',
+    'category_required'                  => 'Category is a required field.',
+    'change_all_to_allow_alt_desc'       => 'Allow Alternate Description for all.',
+    'change_all_to_not_allow_allow_desc' => 'Do not allow Alternate Description for all.',
+    'change_all_to_serialized'           => 'Change all to Serialized',
+    'change_all_to_unserialized'         => 'Change all to Unserialized',
+    'change_image'                       => 'Change Image',
+    'confirm_bulk_edit'                  => 'Are you sure you want to edit selected Item(s)?',
+    'confirm_bulk_edit_wipe_taxes'       => 'All Item Tax information will be replaced.',
+    'confirm_delete'                     => 'Are you sure you want to delete selected item(s)?',
+    'confirm_restore'                    => 'Are you sure you want to restore selected item(s)?',
+    'cost_price'                         => 'Wholesale Price',
+    'cost_price_number'                  => 'Wholesale Price must be a number.',
+    'cost_price_required'                => 'Wholesale Price is a required field.',
+    'count'                              => 'Update Inventory',
+    'csv_import_failed'                  => 'CSV import failed',
+    'csv_import_invalid_location'        => 'Invalid stock location(s) found: {0}. Only valid stock locations are allowed.',
+    'csv_import_nodata_wrongformat'      => 'The uploaded CSV file has no data or is formatted incorrectly.',
+    'csv_import_partially_failed'        => 'There were {0} item import failure(s) on line(s): {1}. No rows were imported.',
+    'csv_import_success'                 => 'Item CSV import successful.',
+    'current_quantity'                   => 'Current Quantity',
+    'default_pack_name'                  => 'Each',
+    'description'                        => 'Description',
+    'details_count'                      => 'Inventory Count Details',
+    'do_nothing'                         => 'Do Nothing',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit the desired fields for selected item(s).',
+    'edit_multiple_items'                => 'Editing Multiple Items',
+    'empty_upc_items'                    => 'Empty Barcode Items',
+    'error_adding_updating'              => 'Error adding/updating item',
+    'error_updating_multiple'            => 'Error updating items',
+    'generate_barcodes'                  => 'Generate Barcodes',
+    'hsn_code'                           => 'Harmonized System Nomenclature',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Item Import from CSV',
+    'info_provided_by'                   => 'Information provided by',
+    'inventory'                          => 'Inventory',
+    'inventory_CSV_import_quantity'      => 'Quantity Imported from CSV',
+    'inventory_comments'                 => 'Comments',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Date',
+    'inventory_employee'                 => 'Employee',
+    'inventory_in_out_quantity'          => 'In/Out Quantity',
+    'inventory_remarks'                  => 'Remarks',
+    'is_deleted'                         => 'Deleted',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item has Serial Number',
+    'item'                               => 'Item',
+    'item_id'                            => '',
+    'item_number'                        => 'Barcode',
+    'item_number_duplicate'              => 'Item Number is already present in the database.',
+    'item_number_invalid'                => 'Item Number contains disallowed characters.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Location',
+    'low_inventory_items'                => 'Out Of Stock Items',
+    'low_sell_item'                      => 'Low sell item',
+    'manually_editing_of_quantity'       => 'Manual Edit of Quantity',
+    'markup'                             => '',
+    'name'                               => 'Item Name',
+    'name_required'                      => 'Item Name is a required field.',
+    'new'                                => 'New Item',
+    'no_description_items'               => 'No Description Items',
+    'no_items_to_display'                => 'No Items to display.',
+    'none'                               => 'None',
+    'none_selected'                      => 'You have not selected any Item(s) to edit',
+    'nonstock'                           => 'Non-stocked',
+    'number_information'                 => 'Item Number',
+    'number_required'                    => 'Barcode is a required field.',
+    'one_or_multiple'                    => 'item(s)',
+    'pack_name'                          => 'Pack Name',
+    'qty_per_pack'                       => 'Quantity per pack',
+    'quantity'                           => 'Quantity',
+    'quantity_number'                    => 'Quantity must be a number.',
+    'quantity_required'                  => 'Quantity is a required field.',
+    'receiving_quantity'                 => 'Receiving Quantity',
+    'remove_image'                       => 'Remove Image',
+    'reorder_level'                      => 'Reorder Level',
+    'reorder_level_number'               => 'Reorder Level must be a number.',
+    'reorder_level_required'             => 'Reorder Level is a required field.',
+    'retrive_item_info'                  => 'Retrieve Item Info',
+    'sales_tax_1'                        => 'Sales Tax',
+    'sales_tax_2'                        => 'Sales Tax 2',
+    'search_attributes'                  => 'Search Attributes',
+    'select_image'                       => 'Select Image',
+    'serialized_items'                   => 'Serialized Items',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Stock',
+    'stock_location'                     => 'Stock location',
+    'stock_type'                         => 'Stock Type',
+    'successful_adding'                  => 'You have successfully added item',
+    'successful_bulk_edit'               => 'You have successfully updated the selected item(s)',
+    'successful_deleted'                 => 'You have successfully deleted',
+    'successful_updating'                => 'You have successfully updated item',
+    'supplier'                           => 'Supplier',
+    'tax_1'                              => 'Tax 1',
+    'tax_2'                              => 'Tax 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Tax Category',
+    'tax_name_invalid'                   => 'Tax Name contains disallowed characters.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => 'Tax Percent must be a numeric value',
+    'tax_percent_required'               => 'Tax Percent is a required field.',
+    'tax_percents'                       => 'Tax Percent(s)',
+    'temp'                               => 'Temporary',
+    'type'                               => 'Item Type',
+    'unit_price'                         => 'Retail Price',
+    'unit_price_number'                  => 'Unit price must be a number.',
+    'unit_price_required'                => 'Retail Price is a required field.',
+    'upc_database'                       => 'Barcode Database',
+    'update'                             => 'Update Item',
+    'use_inventory_menu'                 => 'Use Inventory Menu',
 ];
diff --git a/app/Language/en/Login.php b/app/Language/en/Login.php
index 0eb94004e..1cbccb34e 100644
--- a/app/Language/en/Login.php
+++ b/app/Language/en/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "I'm not a robot.",
-    "go"                            => "Go",
-    "invalid_gcaptcha"              => "Please verify that you are not a robot.",
-    "invalid_installation"          => "The installation is not correct, check your php.ini file.",
-    "invalid_username_and_password" => "Invalid username and/or password.",
-    "login"                         => "Login",
-    "logout"                        => "Logout",
-    "migration_needed"              => "A database migration to {0} will start after login.",
-    "password"                      => "Password",
-    "required_username"             => "The username field is required.",
-    "username"                      => "Username",
-    "welcome"                       => "Welcome to {0}!",
+    "gcaptcha"                            => "I'm not a robot.",
+    "go"                                  => "Go",
+    "initialization_message"              => "The database has not been initialized.",
+    "initialization_required"             => "Database Initialization Required",
+    "initialize"                          => "Initialize",
+    "invalid_gcaptcha"                    => "Please verify that you are not a robot.",
+    "invalid_installation"                => "The installation is not correct, check your php.ini file.",
+    "invalid_username_and_password"       => "Invalid username and/or password.",
+    "login"                               => "Login",
+    "logout"                              => "Logout",
+    "migrating_database"                  => "Migrating Database",
+    "migration_auth_message"              => "Administrator credentials are required to authorize the database migration to version {0}. Please login to proceed.",
+    "migration_complete"                  => "Database initialized successfully!",
+    "migration_complete_login"            => "You can now log in.",
+    "migration_complete_migrate"          => "Database migrated successfully!",
+    "migration_complete_redirect"         => "Migration complete. Redirecting to login...",
+    "migration_error_connection"          => "Connection error. Please try again.",
+    "migration_failed"                    => "Migration failed",
+    "migration_initializing"              => "Initializing Database",
+    "migration_needed"                    => "A database migration to {0} will start after login.",
+    "migration_required"                  => "Database Migration Required",
+    "migration_running"                   => "Running database migrations...",
+    "password"                            => "Password",
+    "required_username"                   => "The username field is required.",
+    'too_many_attempts'                   => 'Too many attempts. Please wait a moment and try again.',
+    "username"                            => "Username",
+    "welcome"                             => "Welcome to {0}!"
 ];
diff --git a/app/Language/en/Reports.php b/app/Language/en/Reports.php
index d8361b7f6..9912da3cc 100644
--- a/app/Language/en/Reports.php
+++ b/app/Language/en/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Tax Rate",
     "taxes"                                   => "Taxes",
     "taxes_summary_report"                    => "Taxes Summary Report",
+    "toggle_cost_and_profit"                  => "Toggle Cost & Profit",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Total Inventory Value",
     "total_low_sell_quantity"                 => "Total Low Sell Quantity",
@@ -146,5 +147,4 @@ return [
     "used"                                    => "Points Used",
     "work_orders"                             => "Work Orders",
     "zero_and_less"                           => "Zero and less",
-    "toggle_cost_and_profit"                  => "Toggle Cost & Profit",
 ];
diff --git a/app/Language/en/Sales.php b/app/Language/en/Sales.php
index 6c7d93d48..5c3892a71 100644
--- a/app/Language/en/Sales.php
+++ b/app/Language/en/Sales.php
@@ -1,226 +1,242 @@
 <?php
 
 return [
-    "customers_available_points"       => "Points Available",
-    "rewards_package"                  => "Rewards",
-    "rewards_remaining_balance"        => "Reward Points remaining value is ",
-    "account_number"                   => "Account #",
-    "add_payment"                      => "Add Payment",
-    "amount_due"                       => "Amount Due",
-    "amount_tendered"                  => "Amount Tendered",
-    "authorized_signature"             => "Authorized Signature",
-    "cancel_sale"                      => "Cancel",
-    "cash"                             => "Cash",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Cash Adjustment",
-    "cash_deposit"                     => "Cash Deposit",
-    "cash_filter"                      => "Cash",
-    "change_due"                       => "Change Due",
-    "change_price"                     => "Change Selling Price",
-    "check"                            => "Check",
-    "check_balance"                    => "Check remainder",
-    "check_filter"                     => "Check",
-    "close"                            => "",
-    "comment"                          => "Comment",
-    "comments"                         => "Comments",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Complete",
-    "confirm_cancel_sale"              => "Are you sure you want to clear this sale? All items will be cleared.",
-    "confirm_delete"                   => "Are you sure you want to delete the selected Sale(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected Sale(s)?",
-    "credit"                           => "Credit Card",
-    "credit_deposit"                   => "Credit Deposit",
-    "credit_filter"                    => "Credit Card",
-    "current_table"                    => "",
-    "customer"                         => "Customer",
-    "customer_address"                 => "Address",
-    "customer_discount"                => "Discount",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Location",
-    "customer_mailchimp_status"        => "MailChimp Status",
-    "customer_optional"                => "(Required for Due Payments)",
-    "customer_required"                => "(Required)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Sale Date",
-    "date_range"                       => "Date Range",
-    "date_required"                    => "A correct date must be entered.",
-    "date_type"                        => "Date is a required field.",
-    "debit"                            => "Debit Card",
-    "debit_filter"                     => "",
-    "delete"                           => "Allow Delete",
-    "delete_confirmation"              => "Are you sure you want to delete this sale? This action cannot be undone.",
-    "delete_entire_sale"               => "Delete Entire Sale",
-    "delete_successful"                => "Sale delete successful.",
-    "delete_unsuccessful"              => "Sale delete failed.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Discard",
-    "discard_quote"                    => "",
-    "discount"                         => "Disc",
-    "discount_included"                => "% Discount",
-    "discount_short"                   => "%",
-    "due"                              => "Due",
-    "due_filter"                       => "Due",
-    "edit"                             => "Edit",
-    "edit_item"                        => "Edit Item",
-    "edit_sale"                        => "Edit Sale",
-    "email_receipt"                    => "Email Receipt",
-    "employee"                         => "Employee",
-    "entry"                            => "Entry",
-    "error_editing_item"               => "Error editing item",
-    "find_or_scan_item"                => "Find or Scan Item",
-    "find_or_scan_item_or_receipt"     => "Find or Scan Item or Receipt",
-    "giftcard"                         => "Gift Card",
-    "giftcard_balance"                 => "Gift Card Balance",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gift Card Number",
-    "group_by_category"                => "Group by Category",
-    "group_by_type"                    => "Group by Type",
-    "hsn"                              => "HSN",
-    "id"                               => "Sale ID",
-    "include_prices"                   => "Include Prices?",
-    "invoice"                          => "Invoice",
-    "invoice_confirm"                  => "This invoice will be sent to",
-    "invoice_enable"                   => "Invoice Number",
-    "invoice_filter"                   => "Invoices",
-    "invoice_no_email"                 => "This customer does not have a valid email address.",
-    "invoice_number"                   => "Invoice #",
-    "invoice_number_duplicate"         => "Invoice Number {0} must be unique.",
-    "invoice_sent"                     => "Invoice sent to",
-    "invoice_total"                    => "Invoice Total",
-    "invoice_type_custom_invoice"      => "Custom Invoice (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Custom Tax Invoice (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Invoice (invoice.php)",
-    "invoice_type_tax_invoice"         => "Tax Invoice (tax_invoice.php)",
-    "invoice_unsent"                   => "Invoice failed to be sent to",
-    "invoice_update"                   => "Recount",
-    "item_insufficient_of_stock"       => "Item has insufficient stock.",
-    "item_name"                        => "Item Name",
-    "item_number"                      => "Item #",
-    "item_out_of_stock"                => "Item is out of stock.",
-    "key_browser"                      => "Helpful Shortcuts",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice without payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "Open in Full Screen Mode",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "Zoom in",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "Zoom Out",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "Print Current Page",
-    "key_restore"                      => "Restore Original Display/Zoom",
-    "key_search"                       => "Search Reports Tables",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "System Shortcuts",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Register Mode",
-    "must_enter_numeric"               => "Amount Tendered must be a number.",
-    "must_enter_numeric_giftcard"      => "Gift Card Number must be a number.",
-    "new_customer"                     => "New Customer",
-    "new_item"                         => "New Item",
-    "no_description"                   => "No description",
-    "no_filter"                        => "All",
-    "no_items_in_cart"                 => "There are no Items in the cart.",
-    "no_sales_to_display"              => "No Sales to display.",
-    "none_selected"                    => "You have not selected any Sale(s) to delete.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "This action is not authorized.",
-    "one_or_multiple"                  => "Sale(s)",
-    "payment"                          => "Payment Type",
-    "payment_amount"                   => "Amount",
-    "payment_not_cover_total"          => "Payment Amount must be greater than or equal to Total.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Payments Total",
-    "price"                            => "Price",
-    "print_after_sale"                 => "Print after Sale",
-    "quantity"                         => "Quantity",
-    "quantity_less_than_reorder_level" => "Warning: Desired Quantity is below Reorder Level for that Item.",
-    "quantity_less_than_zero"          => "Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.",
-    "quantity_of_items"                => "Quantity of {0} Items",
-    "quote"                            => "Quote",
-    "quote_number"                     => "Quote Number",
-    "quote_number_duplicate"           => "Quote Number must be unique.",
-    "quote_sent"                       => "Quote sent to",
-    "quote_unsent"                     => "Quote failed to be sent to",
-    "receipt"                          => "Sales Receipt",
-    "receipt_no_email"                 => "This customer does not have a valid email address.",
-    "receipt_number"                   => "Sale #",
-    "receipt_sent"                     => "Receipt sent to",
-    "receipt_unsent"                   => "Receipt failed to be sent to",
-    "refund"                           => "Refund Type",
-    "register"                         => "Sales Register",
-    "remove_customer"                  => "Remove Customer",
-    "remove_discount"                  => "",
-    "return"                           => "Return",
-    "rewards"                          => "Reward Points",
-    "rewards_balance"                  => "Reward Points Balance",
-    "sale"                             => "Sale",
-    "sale_by_invoice"                  => "Sale by Invoice",
-    "sale_for_customer"                => "Customer:",
-    "sale_time"                        => "Time",
-    "sales_tax"                        => "Sales Tax",
-    "sales_total"                      => "",
-    "select_customer"                  => "Select Customer",
-    "selected_customer"                => "Selected Customer",
-    "send_invoice"                     => "Send Invoice",
-    "send_quote"                       => "Send Quote",
-    "send_receipt"                     => "Send Receipt",
-    "send_work_order"                  => "Send Work Order",
-    "serial"                           => "Serial",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Show Invoice",
-    "show_receipt"                     => "Show Receipt",
-    "start_typing_customer_name"       => "Start typing customer details...",
-    "start_typing_item_name"           => "Start typing Item Name or scan Barcode...",
-    "stock"                            => "Stock",
-    "stock_location"                   => "Stock Location",
-    "sub_total"                        => "Subtotal",
-    "successfully_deleted"             => "You have successfully deleted",
-    "successfully_restored"            => "You have successfully restored",
-    "successfully_suspended_sale"      => "Sale suspend successful.",
-    "successfully_updated"             => "Sale update successful.",
-    "suspend_sale"                     => "Suspend",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspended",
-    "table"                            => "Table",
-    "takings"                          => "Daily Sales",
-    "tax"                              => "Tax",
-    "tax_id"                           => "Tax Id",
-    "tax_invoice"                      => "Tax Invoice",
-    "tax_percent"                      => "Tax %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Tax excluded",
-    "transaction_failed"               => "Sales Transaction failed.",
-    "unable_to_add_item"               => "Item add to Sale failed",
-    "unsuccessfully_deleted"           => "Sale(s) delete failed.",
-    "unsuccessfully_restored"          => "Sale(s) restore failed.",
-    "unsuccessfully_suspended_sale"    => "Sale suspend failed.",
-    "unsuccessfully_updated"           => "Sale update failed.",
-    "unsuspend"                        => "Unsuspend",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Update",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Work Order",
-    "work_order_number"                => "Work Order Number",
-    "work_order_number_duplicate"      => "Work Order Number must be unique.",
-    "work_order_sent"                  => "Work Order sent to",
-    "work_order_unsent"                => "Work Order failed to be sent to",
+    'account_number'                    => 'Account #',
+    'add_payment'                       => 'Add Payment',
+    'amount_due'                        => 'Amount Due',
+    'amount_due_not_covered'            => 'Payments do not cover the amount due.',
+    'amount_tendered'                   => 'Amount Tendered',
+    'authorized_signature'              => 'Authorized Signature',
+    'bank_transfer'                     => 'Bank Transfer',
+    'cancel_sale'                       => 'Cancel',
+    'cash'                              => 'Cash',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Cash Adjustment',
+    'cash_deposit'                      => 'Cash Deposit',
+    'cash_filter'                       => 'Cash',
+    'change_due'                        => 'Change Due',
+    'change_price'                      => 'Change Selling Price',
+    'check'                             => 'Check',
+    'check_balance'                     => 'Check remainder',
+    'check_filter'                      => 'Check',
+    'close'                             => 'Close',
+    'comment'                           => 'Comment',
+    'comments'                          => 'Comments',
+    'company_name'                      => 'Company Name',
+    'complete'                          => 'Complete',
+    'complete_sale'                     => 'Complete',
+    'confirm_cancel_sale'               => 'Are you sure you want to clear this sale? All items will be cleared.',
+    'confirm_delete'                    => 'Are you sure you want to delete the selected Sale(s)?',
+    'confirm_restore'                   => 'Are you sure you want to restore the selected Sale(s)?',
+    'credit'                            => 'Credit Card',
+    'credit_deposit'                    => 'Credit Deposit',
+    'credit_filter'                     => 'Credit Card',
+    'current_table'                     => 'Current Table',
+    'customer'                          => 'Customer',
+    'customer_address'                  => 'Address',
+    'customer_discount'                 => 'Discount',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Location',
+    'customer_mailchimp_status'         => 'MailChimp Status',
+    'customer_optional'                 => '(Required for Due Payments)',
+    'customer_required'                 => '(Required)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => 'Total Spent',
+    'customers_available_points'        => 'Points Available',
+    'daily_sales'                       => 'Daily Sales',
+    'date'                              => 'Sale Date',
+    'date_range'                        => 'Date Range',
+    'date_required'                     => 'A correct date must be entered.',
+    'date_type'                         => 'Date is a required field.',
+    'debit'                             => 'Debit Card',
+    'debit_filter'                      => 'Debit Card',
+    'delete'                            => 'Allow Delete',
+    'delete_confirmation'               => 'Are you sure you want to delete this sale? This action cannot be undone.',
+    'delete_entire_sale'                => 'Delete Entire Sale',
+    'delete_successful'                 => 'Sale delete successful.',
+    'delete_unsuccessful'               => 'Sale delete failed.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Discard',
+    'discard_quote'                     => 'Discard Quote',
+    'discount'                          => 'Disc',
+    'discount_exceeds_item_total'       => 'Discount cannot exceed the item total.',
+    'discount_included'                 => '% Discount',
+    'discount_percent_exceeds_100'      => 'Percentage discount cannot exceed 100%.',
+    'discount_short'                    => '%',
+    'due'                               => 'Due',
+    'due_filter'                        => 'Due',
+    'edit'                              => 'Edit',
+    'edit_item'                         => 'Edit Item',
+    'edit_sale'                         => 'Edit Sale',
+    'email_receipt'                     => 'Email Receipt',
+    'employee'                          => 'Employee',
+    'entry'                             => 'Entry',
+    'error_editing_item'                => 'Error editing item',
+    'find_or_scan_item'                 => 'Find or Scan Item',
+    'find_or_scan_item_or_receipt'      => 'Find or Scan Item or Receipt',
+    'giftcard'                          => 'Gift Card',
+    'giftcard_balance'                  => 'Gift Card Balance',
+    'giftcard_filter'                   => 'Gift Card',
+    'giftcard_number'                   => 'Gift Card Number',
+    'group_by_category'                 => 'Group by Category',
+    'group_by_type'                     => 'Group by Type',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Sale ID',
+    'include_prices'                    => 'Include Prices?',
+    'insufficient_giftcard_balance'     => 'Insufficient gift card balance for this payment.',
+    'insufficient_reward_points'        => 'Insufficient reward points for this payment.',
+    'invoice'                           => 'Invoice',
+    'invoice_confirm'                   => 'This invoice will be sent to',
+    'invoice_enable'                    => 'Invoice Number',
+    'invoice_filter'                    => 'Invoices',
+    'invoice_no_email'                  => 'This customer does not have a valid email address.',
+    'invoice_number'                    => 'Invoice #',
+    'invoice_number_duplicate'          => 'Invoice Number {0} must be unique.',
+    'invoice_sent'                      => 'Invoice sent to',
+    'invoice_total'                     => 'Invoice Total',
+    'invoice_type_custom_invoice'       => 'Custom Invoice (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Custom Tax Invoice (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Invoice (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Tax Invoice (tax_invoice.php)',
+    'invoice_unsent'                    => 'Invoice failed to be sent to',
+    'invoice_update'                    => 'Recount',
+    'item_insufficient_of_stock'        => 'Item has insufficient stock.',
+    'item_name'                         => 'Item Name',
+    'item_number'                       => 'Item #',
+    'item_out_of_stock'                 => 'Item is out of stock.',
+    'key_browser'                       => 'Helpful Shortcuts',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice without payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => 'Open in Full Screen Mode',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => 'Zoom in',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => 'Zoom Out',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => 'Print Current Page',
+    'key_restore'                       => 'Restore Original Display/Zoom',
+    'key_search'                        => 'Search Reports Tables',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => 'System Shortcuts',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Register Mode',
+    'must_enter_numeric'                => 'Amount Tendered must be a number.',
+    'must_enter_numeric_giftcard'       => 'Gift Card Number must be a number.',
+    'must_enter_reference_code'         => 'Reference/Retrieval Number must be entered.',
+    'negative_amount_tendered'          => 'Amount Tendered cannot be negative.',
+    'negative_discount_invalid'         => 'Discount cannot be negative.',
+    'negative_price_invalid'            => 'Price cannot be negative.',
+    'negative_quantity_invalid'         => 'Quantity cannot be negative.',
+    'negative_total_invalid'            => 'Sale total cannot be negative. Check item discounts and quantities.',
+    'new_customer'                      => 'New Customer',
+    'new_item'                          => 'New Item',
+    'no_description'                    => 'No description',
+    'no_filter'                         => 'All',
+    'no_items_in_cart'                  => 'There are no Items in the cart.',
+    'no_sales_to_display'               => 'No Sales to display.',
+    'none_selected'                     => 'You have not selected any Sale(s) to delete.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'This action is not authorized.',
+    'one_or_multiple'                   => 'Sale(s)',
+    'payment'                           => 'Payment Type',
+    'payment_amount'                    => 'Amount',
+    'payment_not_cover_total'           => 'Payment Amount must be greater than or equal to Total.',
+    'payment_type'                      => 'Type',
+    'payments'                          => 'Payments',
+    'payments_total'                    => 'Payments Total',
+    'price'                             => 'Price',
+    'print_after_sale'                  => 'Print after Sale',
+    'quantity'                          => 'Quantity',
+    'quantity_less_than_reorder_level'  => 'Warning: Desired Quantity is below Reorder Level for that Item.',
+    'quantity_less_than_zero'           => 'Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.',
+    'quantity_of_items'                 => 'Quantity of {0} Items',
+    'quote'                             => 'Quote',
+    'quote_number'                      => 'Quote Number',
+    'quote_number_duplicate'            => 'Quote Number must be unique.',
+    'quote_sent'                        => 'Quote sent to',
+    'quote_unsent'                      => 'Quote failed to be sent to',
+    'receipt'                           => 'Sales Receipt',
+    'receipt_no_email'                  => 'This customer does not have a valid email address.',
+    'receipt_number'                    => 'Sale #',
+    'receipt_sent'                      => 'Receipt sent to',
+    'receipt_unsent'                    => 'Receipt failed to be sent to',
+    'reference_code'                    => 'Payment Reference Code',
+    'reference_code_invalid_characters' => 'Reference code must contain only letters and numbers.',
+    'reference_code_length_error'       => 'Reference code length is invalid.',
+    'refund'                            => 'Refund Type',
+    'register'                          => 'Sales Register',
+    'remove_customer'                   => 'Remove Customer',
+    'remove_discount'                   => 'Remove Discount',
+    'return'                            => 'Return',
+    'rewards'                           => 'Reward Points',
+    'rewards_balance'                   => 'Reward Points Balance',
+    'rewards_package'                   => 'Rewards',
+    'rewards_remaining_balance'         => 'Reward Points remaining value is ',
+    'sale'                              => 'Sale',
+    'sale_by_invoice'                   => 'Sale by Invoice',
+    'sale_for_customer'                 => 'Customer:',
+    'sale_time'                         => 'Time',
+    'sales_tax'                         => 'Sales Tax',
+    'sales_total'                       => 'Total',
+    'select_customer'                   => 'Select Customer',
+    'selected_customer'                 => 'Selected Customer',
+    'send_invoice'                      => 'Send Invoice',
+    'send_quote'                        => 'Send Quote',
+    'send_receipt'                      => 'Send Receipt',
+    'send_work_order'                   => 'Send Work Order',
+    'serial'                            => 'Serial',
+    'service_charge'                    => 'Service Charge',
+    'show_due'                          => 'Show Amount Due',
+    'show_invoice'                      => 'Show Invoice',
+    'show_receipt'                      => 'Show Receipt',
+    'start_typing_customer_name'        => 'Start typing customer details...',
+    'start_typing_item_name'            => 'Start typing Item Name or scan Barcode...',
+    'stock'                             => 'Stock',
+    'stock_location'                    => 'Stock Location',
+    'sub_total'                         => 'Subtotal',
+    'successfully_deleted'              => 'You have successfully deleted',
+    'successfully_restored'             => 'You have successfully restored',
+    'successfully_suspended_sale'       => 'Sale suspend successful.',
+    'successfully_updated'              => 'Sale update successful.',
+    'suspend_sale'                      => 'Suspend',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspended',
+    'table'                             => 'Table',
+    'takings'                           => 'Daily Sales',
+    'tax'                               => 'Tax',
+    'tax_id'                            => 'Tax Id',
+    'tax_invoice'                       => 'Tax Invoice',
+    'tax_percent'                       => 'Tax %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Tax excluded',
+    'transaction_failed'                => 'Sales Transaction failed.',
+    'unable_to_add_item'                => 'Item add to Sale failed',
+    'unsuccessfully_deleted'            => 'Sale(s) delete failed.',
+    'unsuccessfully_restored'           => 'Sale(s) restore failed.',
+    'unsuccessfully_suspended_sale'     => 'Sale suspend failed.',
+    'unsuccessfully_updated'            => 'Sale update failed.',
+    'unsuspend'                         => 'Unsuspend',
+    'unsuspend_and_delete'              => 'Action',
+    'update'                            => 'Update',
+    'upi'                               => 'UPI',
+    'visa'                              => 'Visa',
+    'wallet'                            => 'Wallet',
+    'wholesale'                         => 'Wholesale',
+    'work_order'                        => 'Work Order',
+    'work_order_number'                 => 'Work Order Number',
+    'work_order_number_duplicate'       => 'Work Order Number must be unique.',
+    'work_order_sent'                   => 'Work Order sent to',
+    'work_order_unsent'                 => 'Work Order failed to be sent to',
 ];
diff --git a/app/Language/es-ES/Attributes.php b/app/Language/es-ES/Attributes.php
index 3036662ad..16996bf0f 100644
--- a/app/Language/es-ES/Attributes.php
+++ b/app/Language/es-ES/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "El valor del atributo no puede contener ':' o '|'",
-    "confirm_delete"                   => "¿Está seguro de que desea borrar los atributos seleccionados?",
-    "confirm_restore"                  => "¿Está seguro de que desea restaurar los atributos seleccionados?",
-    "definition_cannot_be_deleted"     => "No se han podido borrar los atributos seleccionados",
-    "definition_error_adding_updating" => "El atributo {0} no pudo ser agregado o actulizado. Por favor compruebe el registro de errores.",
-    "definition_flags"                 => "Visibilidad del atributo",
-    "definition_group"                 => "Grupo",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Agregar Atributo",
-    "definition_name_required"         => "El nombre del Atributo es un campo obligatorio",
-    "definition_one_or_multiple"       => "atributo(s)",
-    "definition_successful_adding"     => "Ha agregado con éxito el atributo",
-    "definition_successful_deleted"    => "Ha eliminado con éxito",
-    "definition_successful_updating"   => "Ha actualizado con éxito el atributo",
-    "definition_type"                  => "Tipo de Atributo",
-    "definition_type_required"         => "Tipo de Atributo es un campo obligatorio",
-    "definition_unit"                  => "Unidad de medida",
-    "definition_values"                => "Valores del Atributo",
-    "new"                              => "Nuevo Atributo",
-    "no_attributes_to_display"         => "No hay Atributos para mostrar",
-    "receipt_visibility"               => "Recibo",
-    "show_in_items"                    => "Mostrar en ítems",
-    "show_in_items_visibility"         => "Ítems",
-    "show_in_receipt"                  => "Mostrar en recibo",
-    "show_in_receivings"               => "Mostrar en recibos",
-    "show_in_receivings_visibility"    => "Recibos",
-    "show_in_sales"                    => "Mostrar en ventas",
-    "show_in_sales_visibility"         => "Ventas",
-    "update"                           => "Actualizar Atributo",
+    'attribute_value_invalid_chars'    => 'El valor del atributo no puede contener \':\' o \'|\'',
+    'confirm_delete'                   => '¿Está seguro de que desea borrar los atributos seleccionados?',
+    'confirm_restore'                  => '¿Está seguro de que desea restaurar los atributos seleccionados?',
+    'definition_cannot_be_deleted'     => 'No se han podido borrar los atributos seleccionados',
+    'definition_invalid_group' => 'El grupo seleccionado no existe o no es válido.',
+    'definition_error_adding_updating' => 'El atributo {0} no pudo ser agregado o actulizado. Por favor compruebe el registro de errores.',
+    'definition_flags'                 => 'Visibilidad del atributo',
+    'definition_group'                 => 'Grupo',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Agregar Atributo',
+    'definition_name_required'         => 'El nombre del Atributo es un campo obligatorio',
+    'definition_one_or_multiple'       => 'atributo(s)',
+    'definition_successful_adding'     => 'Ha agregado con éxito el atributo',
+    'definition_successful_deleted'    => 'Ha eliminado con éxito',
+    'definition_successful_updating'   => 'Ha actualizado con éxito el atributo',
+    'definition_type'                  => 'Tipo de Atributo',
+    'definition_type_required'         => 'Tipo de Atributo es un campo obligatorio',
+    'definition_unit'                  => 'Unidad de medida',
+    'definition_values'                => 'Valores del Atributo',
+    'new'                              => 'Nuevo Atributo',
+    'no_attributes_to_display'         => 'No hay Atributos para mostrar',
+    'receipt_visibility'               => 'Recibo',
+    'show_in_items'                    => 'Mostrar en ítems',
+    'show_in_items_visibility'         => 'Ítems',
+    'show_in_receipt'                  => 'Mostrar en recibo',
+    'show_in_receivings'               => 'Mostrar en recibos',
+    'show_in_receivings_visibility'    => 'Recibos',
+    'show_in_sales'                    => 'Mostrar en ventas',
+    'show_in_sales_visibility'         => 'Ventas',
+    'show_in_search'                   => 'Mostrar en búsqueda',
+    'show_in_search_visibility'        => 'Búsqueda',
+    'update'                           => 'Actualizar Atributo',
 ];
diff --git a/app/Language/es-ES/Bootstrap_tables.php b/app/Language/es-ES/Bootstrap_tables.php
index 46efc02c1..e96c4291d 100644
--- a/app/Language/es-ES/Bootstrap_tables.php
+++ b/app/Language/es-ES/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Todas",
-    "columns"              => "Columnas",
-    "hide_show_pagination" => "Ocultar/Mostrar paginación",
-    "loading"              => "Por favor espere...",
-    "page_from_to"         => "Mostrando desde {0} hasta {1} - En total {2} resultados",
-    "refresh"              => "Refrescar",
-    "rows_per_page"        => "{0} resultados por página",
-    "toggle"               => "Ocultar/Mostrar",
+    'all' => "Todas",
+    'columns' => "Columnas",
+    'hide_show_pagination' => "Ocultar/Mostrar paginación",
+    'loading' => "Por favor espere",
+    'page_from_to' => "Mostrando desde {0} hasta {1} - En total {2} resultados",
+    'refresh' => "Refrescar",
+    'rows_per_page' => "{0} resultados por página",
+    'toggle' => "Ocultar/Mostrar",
 ];
diff --git a/app/Language/es-ES/Calendar.php b/app/Language/es-ES/Calendar.php
new file mode 100644
index 000000000..e58476325
--- /dev/null
+++ b/app/Language/es-ES/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "Do",
+    "mo"        => "Lu",
+    "tu"        => "Ma",
+    "we"        => "Mi",
+    "th"        => "Ju",
+    "fr"        => "Vi",
+    "sa"        => "Sá",
+    "sun"       => "Dom",
+    "mon"       => "Lun",
+    "tue"       => "Mar",
+    "wed"       => "Mié",
+    "thu"       => "Jue",
+    "fri"       => "Vie",
+    "sat"       => "Sáb",
+    "sunday"    => "Domingo",
+    "monday"    => "Lunes",
+    "tuesday"   => "Martes",
+    "wednesday" => "Miércoles",
+    "thursday"  => "Jueves",
+    "friday"    => "Viernes",
+    "saturday"  => "Sábado",
+    "jan"       => "Ene",
+    "feb"       => "Feb",
+    "mar"       => "Mar",
+    "apr"       => "Abr",
+    "may"       => "May",
+    "jun"       => "Jun",
+    "jul"       => "Jul",
+    "aug"       => "Ago",
+    "sep"       => "Sep",
+    "oct"       => "Oct",
+    "nov"       => "Nov",
+    "dec"       => "Dic",
+    "january"   => "Enero",
+    "february"  => "Febrero",
+    "march"     => "Marzo",
+    "april"     => "Abril",
+    "mayl"      => "Mayo",
+    "june"      => "Junio",
+    "july"      => "Julio",
+    "august"    => "Agosto",
+    "september" => "Septiembre",
+    "october"   => "Octubre",
+    "november"  => "Noviembre",
+    "december"  => "Diciembre",
+];
\ No newline at end of file
diff --git a/app/Language/es-ES/Config.php b/app/Language/es-ES/Config.php
index 6a0f02ccd..eddd74b55 100644
--- a/app/Language/es-ES/Config.php
+++ b/app/Language/es-ES/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Dirección del Comercio",
-    "address_required"                          => "Dirección del Comercio es requerida.",
-    "all_set"                                   => "¡Todos los permisos de archivo están configurados correctamente!",
-    "allow_duplicate_barcodes"                  => "Permitir código barras duplicados",
-    "apostrophe"                                => "apostrofe",
-    "backup_button"                             => "Respaldo",
-    "backup_database"                           => "Respaldo de Base de Datos",
-    "barcode"                                   => "Código Barras",
-    "barcode_company"                           => "Nombre del Comercio",
-    "barcode_configuration"                     => "Configuración de Código de Barras",
-    "barcode_content"                           => "Contenido de Código de Barras",
-    "barcode_first_row"                         => "Fila 1",
-    "barcode_font"                              => "Fuente",
-    "barcode_formats"                           => "Formato entrada",
-    "barcode_generate_if_empty"                 => "Generar si esta vacio.",
-    "barcode_height"                            => "Alto (px)",
-    "barcode_id"                                => "Id/Artículo",
-    "barcode_info"                              => "Información de Configuración de Código de Barras",
-    "barcode_layout"                            => "Diseño Código de Barras",
-    "barcode_name"                              => "Nombre",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Número en la línea",
-    "barcode_page_cellspacing"                  => "Mostrar espacios de celdas de página.",
-    "barcode_page_width"                        => "Mostrar ancho de página",
-    "barcode_price"                             => "Precio",
-    "barcode_second_row"                        => "Fila 2",
-    "barcode_third_row"                         => "Fila 3",
-    "barcode_tooltip"                           => "Cuidado: esta característica puede causar duplicados ser importados o creados, No lo use si no quiere códigos de barras duplicadas.",
-    "barcode_type"                              => "Tipo de Código de Barra",
-    "barcode_width"                             => "Ancho (px)",
-    "bottom"                                    => "Abajo",
-    "cash_button"                               => "Botones de Efectivo Rápido",
-    "cash_button_1"                             => "Botón 1",
-    "cash_button_2"                             => "Botón 2",
-    "cash_button_3"                             => "Botón 3",
-    "cash_button_4"                             => "Botón 4",
-    "cash_button_5"                             => "Botón 5",
-    "cash_button_6"                             => "Botón 6",
-    "cash_decimals"                             => "Decimales del Efectivo",
-    "cash_decimals_tooltip"                     => "Si los decimales del efectivo y del tipo de moneda son los mismos no habrá redondeo de los pagos en efectivo.",
-    "cash_rounding"                             => "Redondeo del Efectivo",
-    "category_dropdown"                         => "Mostrar Categoria como desplegable",
-    "center"                                    => "Centro",
-    "change_apperance_tooltip"                  => "Cambiar Aspecto de OSPOS",
-    "comma"                                     => "coma",
-    "company"                                   => "Nombre del Comercio",
-    "company_avatar"                            => "Avatar de Empleado",
-    "company_change_image"                      => "Cambiar Imagen",
-    "company_logo"                              => "Logotipo del Comercio",
-    "company_remove_image"                      => "Quitar Imagen",
-    "company_required"                          => "Nombre del Comercio es requerido",
-    "company_select_image"                      => "Seleccionar Imagen",
-    "company_website_url"                       => "Sitio Web no es una URL estándar (http://...).",
-    "country_codes"                             => "Código de País",
-    "country_codes_tooltip"                     => "Lista de codigo de paises separado por coma para busqueda de direcciones.",
-    "currency_code"                             => "Código de Moneda",
-    "currency_decimals"                         => "Decimales del tipo de moneda",
-    "currency_symbol"                           => "Símbolo de la moneda",
-    "current_employee_only"                     => "Mostrar registro sólo del empleado actual",
-    "customer_reward"                           => "Cat. de Cliente",
-    "customer_reward_duplicate"                 => "La recompensa debe ser única.",
-    "customer_reward_enable"                    => "Activar recompenza para clientes",
-    "customer_reward_invalid_chars"             => "El nombre de la recompenza no puede contener el carácter '_'",
-    "customer_reward_required"                  => "El nombre es un campo obligatorio",
-    "customer_sales_tax_support"                => "Habilitar la gestión de impuestos en las ventas a clientes",
-    "date_or_time_format"                       => "Filtro de fecha y hora",
-    "datetimeformat"                            => "Formato de fecha y hora",
-    "decimal_point"                             => "Punto Decimal",
-    "default_barcode_font_size_number"          => "Tamaño de fuente de código de barras debe ser número.",
-    "default_barcode_font_size_required"        => "Tamaño de fuente de código de barras es requerido.",
-    "default_barcode_height_number"             => "Alto del código de barras debe ser un número.",
-    "default_barcode_height_required"           => "Altura del código de barras es requerido.",
-    "default_barcode_num_in_row_number"         => "Número por fila del código de barras debe ser un número.",
-    "default_barcode_num_in_row_required"       => "Número de código de barras predeterminado en fila es un campo obligatorio.",
-    "default_barcode_page_cellspacing_number"   => "Espacios de celdas por página del código de barras debe ser un número.",
-    "default_barcode_page_cellspacing_required" => "Espacios de celdas por página del código de barras es requerido.",
-    "default_barcode_page_width_number"         => "Ancho de página del código de barras debe ser un número.",
-    "default_barcode_page_width_required"       => "Ancho de página del código de barras es requerido.",
-    "default_barcode_width_number"              => "Ancho del código de barras debe ser número.",
-    "default_barcode_width_required"            => "Ancho del código de barras es requerido.",
-    "default_item_columns"                      => "Columnas de Productos Visibles por Defecto",
-    "default_origin_tax_code"                   => "Código de impuesto por defecto",
-    "default_receivings_discount"               => "Descuento por Defecto para Recibos",
-    "default_receivings_discount_number"        => "El Descuento por Defecto Para Los Recibos Debe Ser Un Número.",
-    "default_receivings_discount_required"      => "El Descuento Predeterminado para los Recibos es un campo obligatorio.",
-    "default_sales_discount"                    => "Descuento Predeterminado para Ventas",
-    "default_sales_discount_number"             => "Descuento en ventas predeterminado debe ser un número.",
-    "default_sales_discount_required"           => "Descuento en ventas predeterminado es requerido.",
-    "default_tax_category"                      => "Categoría de Tasa predeterminada",
-    "default_tax_code"                          => "Código de Impuesto Predeterminado",
-    "default_tax_jurisdiction"                  => "Jurisdicción de Impuesto Predeterminado",
-    "default_tax_name_number"                   => "El nombre de el impuesto debe ser letras.",
-    "default_tax_name_required"                 => "El nombre del impuesto predeterminado es requerido.",
-    "default_tax_rate"                          => "% de Impuestos Predeterminado",
-    "default_tax_rate_1"                        => "Impuesto 1",
-    "default_tax_rate_2"                        => "Impuesto 2",
-    "default_tax_rate_3"                        => "Tasa de Impuestos 3",
-    "default_tax_rate_number"                   => "El Impuesto Predeterminado debe ser un número.",
-    "default_tax_rate_required"                 => "El Impuesto Predeterminado es requerido.",
-    "derive_sale_quantity"                      => "Permitir cantidad de venta derivada",
-    "derive_sale_quantity_tooltip"              => "Si se marca entonces se proporcionará un nuevo tipo para los artículos ordenados por cantidad extendida",
-    "dinner_table"                              => "Mesa",
-    "dinner_table_duplicate"                    => "Utilice un nombre de mesa único.",
-    "dinner_table_enable"                       => "Activar Mesa de Restaurante",
-    "dinner_table_invalid_chars"                => "El nombre de la mesa no puede contener '_'.",
-    "dinner_table_required"                     => "La mesa es un campo obligatorio.",
-    "dot"                                       => "punto",
-    "email"                                     => "E-mail",
-    "email_configuration"                       => "Configuracion de correo",
-    "email_mailpath"                            => "Ruta a Sendmail",
-    "email_protocol"                            => "Protocolo",
-    "email_receipt_check_behaviour"             => "Selector de Recibir por Correo",
-    "email_receipt_check_behaviour_always"      => "Siempre activado",
-    "email_receipt_check_behaviour_last"        => "Recordar ultima vez",
-    "email_receipt_check_behaviour_never"       => "Siempre desactivado",
-    "email_smtp_crypto"                         => "Encriptado SMTP",
-    "email_smtp_host"                           => "Servidor SMTP",
-    "email_smtp_pass"                           => "Pasword SMTP",
-    "email_smtp_port"                           => "Puerto SMTP",
-    "email_smtp_timeout"                        => "Tiempo falla SMTP",
-    "email_smtp_user"                           => "Usuario SMTP",
-    "enable_avatar"                             => "Habilitar Avatar",
-    "enable_avatar_tooltip"                     => "Habilitar Avatares para que se muestren en el menú desplegable Categorías y Registrarse ",
-    "enable_dropdown_tooltip"                   => "No podrá agregar nuevas categorías si esto está marcado",
-    "enable_new_look"                           => "Habilitar nueva apariencia",
-    "enable_right_bar"                          => " Habilitar la barra lateral derecha",
-    "enable_right_bar_tooltip"                  => "Cambiar la barra lateral de izquierda a derecha ",
-    "enforce_privacy"                           => "Forzar privacidad",
-    "enforce_privacy_tooltip"                   => "Proteja la privacidad de los clientes aplicando codificación de datos en caso de que se eliminen",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "Hay problemas con los permisos de archivo. Por favor corrija y vuelva a recargar esta página.",
-    "financial_year"                            => "Inicio del año fiscal",
-    "financial_year_apr"                        => "1º de Abril",
-    "financial_year_aug"                        => "1º de Agosto",
-    "financial_year_dec"                        => "1º de Diciembre",
-    "financial_year_feb"                        => "1º de Febrero",
-    "financial_year_jan"                        => "1º de Enero",
-    "financial_year_jul"                        => "1º de Julio",
-    "financial_year_jun"                        => "1º de Junio",
-    "financial_year_mar"                        => "1º de Marzo",
-    "financial_year_may"                        => "1º de Mayo",
-    "financial_year_nov"                        => "1º de Noviembre",
-    "financial_year_oct"                        => "1º de Octubre",
-    "financial_year_sep"                        => "1º de Septiembre",
-    "floating_labels"                           => "Etiquetas flotantes",
-    "gcaptcha_enable"                           => "Inicio de sesión con reCAPTCHA",
-    "gcaptcha_secret_key"                       => "Llave secreta reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key es requerida si se usa",
-    "gcaptcha_site_key"                         => "Llave del sitio reCAPTCHA",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key es requerida si se usa",
-    "gcaptcha_tooltip"                          => "Proteja la página de inicio de sesión con Google reCAPTCHA, haga clic en el icono de un par de claves de API.",
-    "general"                                   => "General",
-    "general_configuration"                     => "Configuración General",
-    "giftcard_number"                           => "Número de tarjeta de regalo",
-    "giftcard_random"                           => "Generar aleatoriamente",
-    "giftcard_series"                           => "Generar en serie",
-    "image_allowed_file_types"                  => "Tipos de archivos permitidos",
-    "image_max_height_tooltip"                  => "Altura máxima permitida de las cargas de imágenes en píxeles (px).",
-    "image_max_size_tooltip"                    => "Tamaño máximo de archivo permitido de cargas de imágenes en kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Ancho máximo permitido de las cargas de imágenes en píxeles (px).",
-    "image_restrictions"                        => "Restricciones de carga de imágenes",
-    "include_hsn"                               => "Incluir Soporte para Códigos HSN",
-    "info"                                      => "Información",
-    "info_configuration"                        => "Información del Comercio",
-    "input_groups"                              => "Introducir Grupos",
-    "integrations"                              => "Componentes Integrados",
-    "integrations_configuration"                => "Componentes de Terceros Integrados",
-    "invoice"                                   => "Factura",
-    "invoice_configuration"                     => "Parámetros de Impresión",
-    "invoice_default_comments"                  => "Comentarios predeterminados en la factura",
-    "invoice_email_message"                     => "Plantilla de Factura por Email",
-    "invoice_enable"                            => "Habilitar Facturación",
-    "invoice_printer"                           => "Impresora Facturadora",
-    "invoice_type"                              => "Tipo de Factura",
-    "is_readable"                               => "es legible, pero los permisos de lectura son incorrectos. Pongalos en 640 o 660 cargue nuevamente.",
-    "is_writable"                               => "es escribible, pero los permisos de escritura son incorrectos. Pongalos en 750 y recargue la página de nuevo.",
-    "item_markup"                               => "Marcado de Artículo",
-    "jsprintsetup_required"                     => "Advertencia!Esta funcionalidad desactivada solo funciona con el addon jsPrintSetup de FireFox instalado. Guardar de todas formas?",
-    "language"                                  => "Idioma",
-    "last_used_invoice_number"                  => "Último numero de factura utilizado",
-    "last_used_quote_number"                    => "Último número de presupuesto utilizado",
-    "last_used_work_order_number"               => "Ultimo usado sin numero",
-    "left"                                      => "Izquierda",
-    "license"                                   => "Licencia",
-    "license_configuration"                     => "Anuncio de Licencia",
-    "line_sequence"                             => "Secuencia de linea",
-    "lines_per_page"                            => "Líneas por página",
-    "lines_per_page_number"                     => "Líneas por página debe ser un número.",
-    "lines_per_page_required"                   => "Líneas por página es requerido.",
-    "locale"                                    => "Localización",
-    "locale_configuration"                      => "Configuración de la zona local",
-    "locale_info"                               => "Informacion de la configuracion de la zona",
-    "location"                                  => "Inventario",
-    "location_configuration"                    => "Ubicación de Inventario",
-    "location_info"                             => "Información de Configuración de Ubicación",
-    "login_form"                                => "Estilo del formulario de inicio de sesión",
-    "logout"                                    => "Desea hacer un respaldo antes de salir? Pulsa [OK] para respaldar o [Cancelar] para salir.",
-    "mailchimp"                                 => "Correo MailChimp",
-    "mailchimp_api_key"                         => "Clave API de Mailchimp",
-    "mailchimp_configuration"                   => "Configuración de Mailchimp",
-    "mailchimp_key_successfully"                => "Clave API correcta.",
-    "mailchimp_key_unsuccessfully"              => "Clave API incorrecta.",
-    "mailchimp_lists"                           => "Lista(s) de Mailchimp",
-    "mailchimp_tooltip"                         => "Haga clic en el icono de una clave de API.",
-    "message"                                   => "Mensajes SMS",
-    "message_configuration"                     => "Configuracion del mensaje",
-    "msg_msg"                                   => "Texto del mensaje guardado",
-    "msg_msg_placeholder"                       => "Si desea usar un formato de SMS guarde su mensaje aquí, en caso contrario deje en blanco.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password es un campo requerido",
-    "msg_src"                                   => "SMS-API ID remitente",
-    "msg_src_required"                          => "SMS-API ID remitente es un campo requerido",
-    "msg_uid"                                   => "SMS-API Usuario",
-    "msg_uid_required"                          => "SMS-API Usuario es un campo requerido",
-    "multi_pack_enabled"                        => "Empaquetado Múltiple por Producto",
-    "no_risk"                                   => "Sin riesgos de seguridad/vulnerabilidad.",
-    "none"                                      => "ninguno",
-    "notify_alignment"                          => "Posición de notificacion",
-    "number_format"                             => "Formato de número",
-    "number_locale"                             => "Localización",
-    "number_locale_invalid"                     => "Localización ingresada invalida. Revisa el link en el tooltip para encontrar informacion.",
-    "number_locale_required"                    => "Numero localizacion es un campo requerido.",
-    "number_locale_tooltip"                     => "Encontrar una zonificacion adecuada en este enlace.",
-    "os_timezone"                               => "Zona Horaria Local:",
-    "ospos_info"                                => "Información de la Instalación OSPOS",
-    "payment_options_order"                     => "Orden de opciones de pago",
-    "perm_risk"                                 => "Los permisos incorrectos dejan a este software en riesgo.",
-    "phone"                                     => "Teléfono comercial",
-    "phone_required"                            => "Teléfono del Comercio es requerido.",
-    "print_bottom_margin"                       => "Margen Inferior",
-    "print_bottom_margin_number"                => "Margen Inferior debe ser un número.",
-    "print_bottom_margin_required"              => "Margen Inferior es requerido.",
-    "print_delay_autoreturn"                    => "Regresar automaticamente a Vender",
-    "print_delay_autoreturn_number"             => "Tiempo espera requerido para regresar a ventas.",
-    "print_delay_autoreturn_required"           => "El tiempo espera debe ser numérico.",
-    "print_footer"                              => "Imprimir el pie de página del navegador",
-    "print_header"                              => "Imprimir el encabezado del navegador",
-    "print_left_margin"                         => "Margen Izquierdo",
-    "print_left_margin_number"                  => "Margen Izquierdo debe ser un número.",
-    "print_left_margin_required"                => "Margen Izquierdo es requerido.",
-    "print_receipt_check_behaviour"             => "Selección de Imprimir recibo",
-    "print_receipt_check_behaviour_always"      => "Siempre activado",
-    "print_receipt_check_behaviour_last"        => "Recordar la ultima vez",
-    "print_receipt_check_behaviour_never"       => "Siempre desactivo",
-    "print_right_margin"                        => "Margen Derecho",
-    "print_right_margin_number"                 => "Margen Derecho debe ser un número.",
-    "print_right_margin_required"               => "Margen Derecho es requerido.",
-    "print_silently"                            => "Mostrar configuracion pre- impresión",
-    "print_top_margin"                          => "Margen Superior",
-    "print_top_margin_number"                   => "Margen Superior debe ser un número.",
-    "print_top_margin_required"                 => "Margen Superior es requerido.",
-    "quantity_decimals"                         => "Decimales de Cantidades",
-    "quick_cash_enable"                         => "Activar Botones de Efectivo",
-    "quote_default_comments"                    => "Comentario inicial de cotizaciones",
-    "receipt"                                   => "Recibo",
-    "receipt_category"                          => "Recibo con categoría",
-    "receipt_configuration"                     => "Parámetros de Impresión",
-    "receipt_default"                           => "Normal",
-    "receipt_font_size"                         => "Tamaño letra",
-    "receipt_font_size_number"                  => "Debe ser un numero el tamaño de letra.",
-    "receipt_font_size_required"                => "El tamaño de letra es requerido.",
-    "receipt_info"                              => "Información de Configuración de Recibo",
-    "receipt_printer"                           => "Impresora de Ticket",
-    "receipt_short"                             => "Resumido",
-    "receipt_show_company_name"                 => "Mostrar el nombre de la empresa",
-    "receipt_show_description"                  => "Mostrar descripcion",
-    "receipt_show_serialnumber"                 => "Mostrar numero de serie",
-    "receipt_show_tax_ind"                      => "Mostrar indicador de impuestos",
-    "receipt_show_taxes"                        => "Mostrar impuestos",
-    "receipt_show_total_discount"               => "Mostrar Descuento Total",
-    "receipt_template"                          => "Formato de recibo",
-    "receiving_calculate_average_price"         => "Calcular Promedio de Precio. (Recepción)",
-    "recv_invoice_format"                       => "Formato de Factura de Recepción",
-    "register_mode_default"                     => "Modo de registro por defecto",
-    "report_an_issue"                           => "Informe de algún problema",
-    "return_policy_required"                    => "Política de Devolución requerida.",
-    "reward"                                    => "Recompensas",
-    "reward_configuration"                      => "Configuración de recompensas",
-    "right"                                     => "Derecha",
-    "sales_invoice_format"                      => "Formato de Facturas de Venta",
-    "sales_quote_format"                        => "Formato de presupuesto de las ventas",
-    "saved_successfully"                        => "Configuración guardada satisfactoriamente.",
-    "saved_unsuccessfully"                      => "Configuración no guardada.",
-    "security_issue"                            => "Advertencia de vulnerabilidad de seguridad",
-    "server_notice"                             => "Por Favor Use la Siguiente Información para Reportar Problemas.",
-    "service_charge"                            => "Costo de Servicio",
-    "show_due_enable"                           => "Mostrar vencimientos de clientes",
-    "show_office_group"                         => "Mostrar icono oficina",
-    "statistics"                                => "Enviar estadísticas",
-    "statistics_tooltip"                        => "Envíe estadísticas para el desarrollo y mejora de funciones.",
-    "stock_location"                            => "Ubicación de Inventario",
-    "stock_location_duplicate"                  => "El nombre de inventario debe ser único.",
-    "stock_location_invalid_chars"              => "Nombre de la Ubicación de Inventario no debe contener '_'.",
-    "stock_location_required"                   => "Número de Ubicación de Inventario es requerido.",
-    "suggestions_fifth_column"                  => "Columna 5",
-    "suggestions_first_column"                  => "Columna 1",
-    "suggestions_fourth_column"                 => "Columna 4",
-    "suggestions_layout"                        => "Sugerencias de búsqueda",
-    "suggestions_second_column"                 => "Columna 2",
-    "suggestions_third_column"                  => "Columna 3",
-    "system_conf"                               => "Sistema OSPOS",
-    "system_info"                               => "System Info",
-    "table"                                     => "Mesa",
-    "table_configuration"                       => "Configuración de Mesa",
-    "takings_printer"                           => "Impresión de retenciones",
-    "tax"                                       => "Impuestos",
-    "tax_category"                              => "Categoría impuesto",
-    "tax_category_duplicate"                    => "Categoría de impuesto ingresada ya existe.",
-    "tax_category_invalid_chars"                => "Categoría de impuesto ingresada es invalida.",
-    "tax_category_required"                     => "Categoría de impuesto es requerida.",
-    "tax_category_used"                         => "La categoría de impuestos no puede borrarse, esta en uso.",
-    "tax_configuration"                         => "Configuracion Impuesto",
-    "tax_decimals"                              => "Decimales de impuestos",
-    "tax_id"                                    => "Identificador del Impuesto",
-    "tax_included"                              => "Impuestos incluidos",
-    "theme"                                     => "Tema",
-    "theme_preview"                             => "Vista Previa del Tema:",
-    "thousands_separator"                       => "Separador de miles",
-    "timezone"                                  => "Zona Horaria",
-    "timezone_error"                            => "La zona horaria de OSPOS es diferente de tu zona horaria local.",
-    "top"                                       => "Arriba",
-    "use_destination_based_tax"                 => "Usar Impuesto Basado en Destino",
-    "user_timezone"                             => "Zona Horaria OSPOS:",
-    "website"                                   => "Sitio Web",
-    "wholesale_markup"                          => "Marcado al por mayor",
-    "work_order_enable"                         => "Soporte Ordenes de Trabajo",
-    "work_order_format"                         => "Formato Ordenes de trabajo",
+    'address'                                   => 'Dirección del Comercio',
+    'address_required'                          => 'Dirección del Comercio es requerida.',
+    'all_set'                                   => '¡Todos los permisos de archivo están configurados correctamente!',
+    'allow_duplicate_barcodes'                  => 'Permitir código barras duplicados',
+    'apostrophe'                                => 'apostrofe',
+    'backup_button'                             => 'Respaldo',
+    'backup_database'                           => 'Respaldo de Base de Datos',
+    'barcode'                                   => 'Código Barras',
+    'barcode_company'                           => 'Nombre del Comercio',
+    'barcode_configuration'                     => 'Configuración de Código de Barras',
+    'barcode_content'                           => 'Contenido de Código de Barras',
+    'barcode_first_row'                         => 'Fila 1',
+    'barcode_font'                              => 'Fuente',
+    'barcode_formats'                           => 'Formato entrada',
+    'barcode_generate_if_empty'                 => 'Generar si esta vacio.',
+    'barcode_height'                            => 'Alto (px)',
+    'barcode_id'                                => 'Id/Artículo',
+    'barcode_info'                              => 'Información de Configuración de Código de Barras',
+    'barcode_layout'                            => 'Diseño Código de Barras',
+    'barcode_name'                              => 'Nombre',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Número en la línea',
+    'barcode_page_cellspacing'                  => 'Mostrar espacios de celdas de página.',
+    'barcode_page_width'                        => 'Mostrar ancho de página',
+    'barcode_price'                             => 'Precio',
+    'barcode_second_row'                        => 'Fila 2',
+    'barcode_third_row'                         => 'Fila 3',
+    'barcode_tooltip'                           => 'Cuidado: esta característica puede causar duplicados ser importados o creados, No lo use si no quiere códigos de barras duplicadas.',
+    'barcode_type'                              => 'Tipo de Código de Barra',
+    'barcode_width'                             => 'Ancho (px)',
+    'bottom'                                    => 'Abajo',
+    'cash_button'                               => 'Botones de Efectivo Rápido',
+    'cash_button_1'                             => 'Botón 1',
+    'cash_button_2'                             => 'Botón 2',
+    'cash_button_3'                             => 'Botón 3',
+    'cash_button_4'                             => 'Botón 4',
+    'cash_button_5'                             => 'Botón 5',
+    'cash_button_6'                             => 'Botón 6',
+    'cash_decimals'                             => 'Decimales del Efectivo',
+    'cash_decimals_tooltip'                     => 'Si los decimales del efectivo y del tipo de moneda son los mismos no habrá redondeo de los pagos en efectivo.',
+    'cash_rounding'                             => 'Redondeo del Efectivo',
+    'category_dropdown'                         => 'Mostrar Categoria como desplegable',
+    'center'                                    => 'Centro',
+    'change_apperance_tooltip'                  => 'Cambiar Aspecto de OSPOS',
+    'comma'                                     => 'coma',
+    'company'                                   => 'Nombre del Comercio',
+    'company_avatar'                            => 'Avatar de Empleado',
+    'company_change_image'                      => 'Cambiar Imagen',
+    'company_logo'                              => 'Logotipo del Comercio',
+    'company_remove_image'                      => 'Quitar Imagen',
+    'company_required'                          => 'Nombre del Comercio es requerido',
+    'company_select_image'                      => 'Seleccionar Imagen',
+    'company_website_url'                       => 'Sitio Web no es una URL estándar (http://...).',
+    'country_codes'                             => 'Código de País',
+    'country_codes_tooltip'                     => 'Lista de codigo de paises separado por coma para busqueda de direcciones.',
+    'currency_code'                             => 'Código de Moneda',
+    'currency_decimals'                         => 'Decimales del tipo de moneda',
+    'currency_symbol'                           => 'Símbolo de la moneda',
+    'current_employee_only'                     => 'Mostrar registro sólo del empleado actual',
+    'customer_reward'                           => 'Cat. de Cliente',
+    'customer_reward_duplicate'                 => 'La recompensa debe ser única.',
+    'customer_reward_enable'                    => 'Activar recompenza para clientes',
+    'customer_reward_invalid_chars'             => "El nombre de la recompenza no puede contener el carácter '_'",
+    'customer_reward_required'                  => 'El nombre es un campo obligatorio',
+    'customer_sales_tax_support'                => 'Habilitar la gestión de impuestos en las ventas a clientes',
+    'date_or_time_format'                       => 'Filtro de fecha y hora',
+    'datetimeformat'                            => 'Formato de fecha y hora',
+    'decimal_point'                             => 'Punto Decimal',
+    'default_barcode_font_size_number'          => 'Tamaño de fuente de código de barras debe ser número.',
+    'default_barcode_font_size_required'        => 'Tamaño de fuente de código de barras es requerido.',
+    'default_barcode_height_number'             => 'Alto del código de barras debe ser un número.',
+    'default_barcode_height_required'           => 'Altura del código de barras es requerido.',
+    'default_barcode_num_in_row_number'         => 'Número por fila del código de barras debe ser un número.',
+    'default_barcode_num_in_row_required'       => 'Número de código de barras predeterminado en fila es un campo obligatorio.',
+    'default_barcode_page_cellspacing_number'   => 'Espacios de celdas por página del código de barras debe ser un número.',
+    'default_barcode_page_cellspacing_required' => 'Espacios de celdas por página del código de barras es requerido.',
+    'default_barcode_page_width_number'         => 'Ancho de página del código de barras debe ser un número.',
+    'default_barcode_page_width_required'       => 'Ancho de página del código de barras es requerido.',
+    'default_barcode_width_number'              => 'Ancho del código de barras debe ser número.',
+    'default_barcode_width_required'            => 'Ancho del código de barras es requerido.',
+    'default_item_columns'                      => 'Columnas de Productos Visibles por Defecto',
+    'default_origin_tax_code'                   => 'Código de impuesto por defecto',
+    'default_receivings_discount'               => 'Descuento por Defecto para Recibos',
+    'default_receivings_discount_number'        => 'El Descuento por Defecto Para Los Recibos Debe Ser Un Número.',
+    'default_receivings_discount_required'      => 'El Descuento Predeterminado para los Recibos es un campo obligatorio.',
+    'default_sales_discount'                    => 'Descuento Predeterminado para Ventas',
+    'default_sales_discount_number'             => 'Descuento en ventas predeterminado debe ser un número.',
+    'default_sales_discount_required'           => 'Descuento en ventas predeterminado es requerido.',
+    'default_tax_category'                      => 'Categoría de Tasa predeterminada',
+    'default_tax_code'                          => 'Código de Impuesto Predeterminado',
+    'default_tax_jurisdiction'                  => 'Jurisdicción de Impuesto Predeterminado',
+    'default_tax_name_number'                   => 'El nombre de el impuesto debe ser letras.',
+    'default_tax_name_required'                 => 'El nombre del impuesto predeterminado es requerido.',
+    'default_tax_rate'                          => '% de Impuestos Predeterminado',
+    'default_tax_rate_1'                        => 'Impuesto 1',
+    'default_tax_rate_2'                        => 'Impuesto 2',
+    'default_tax_rate_3'                        => 'Tasa de Impuestos 3',
+    'default_tax_rate_number'                   => 'El Impuesto Predeterminado debe ser un número.',
+    'default_tax_rate_required'                 => 'El Impuesto Predeterminado es requerido.',
+    'derive_sale_quantity'                      => 'Permitir cantidad de venta derivada',
+    'derive_sale_quantity_tooltip'              => 'Si se marca entonces se proporcionará un nuevo tipo para los artículos ordenados por cantidad extendida',
+    'dinner_table'                              => 'Mesa',
+    'dinner_table_duplicate'                    => 'Utilice un nombre de mesa único.',
+    'dinner_table_enable'                       => 'Activar Mesa de Restaurante',
+    'dinner_table_invalid_chars'                => "El nombre de la mesa no puede contener '_'.",
+    'dinner_table_required'                     => 'La mesa es un campo obligatorio.',
+    'dot'                                       => 'punto',
+    'email'                                     => 'E-mail',
+    'email_configuration'                       => 'Configuracion de correo',
+    'email_mailpath'                            => 'Ruta a Sendmail',
+    'email_protocol'                            => 'Protocolo',
+    'email_receipt_check_behaviour'             => 'Selector de Recibir por Correo',
+    'email_receipt_check_behaviour_always'      => 'Siempre activado',
+    'email_receipt_check_behaviour_last'        => 'Recordar ultima vez',
+    'email_receipt_check_behaviour_never'       => 'Siempre desactivado',
+    'email_smtp_crypto'                         => 'Encriptado SMTP',
+    'email_smtp_host'                           => 'Servidor SMTP',
+    'email_smtp_pass'                           => 'Pasword SMTP',
+    'email_smtp_port'                           => 'Puerto SMTP',
+    'email_smtp_timeout'                        => 'Tiempo falla SMTP',
+    'email_smtp_user'                           => 'Usuario SMTP',
+    'enable_avatar'                             => 'Habilitar Avatar',
+    'enable_avatar_tooltip'                     => 'Habilitar Avatares para que se muestren en el menú desplegable Categorías y Registrarse ',
+    'enable_dropdown_tooltip'                   => 'No podrá agregar nuevas categorías si esto está marcado',
+    'enable_new_look'                           => 'Habilitar nueva apariencia',
+    'enable_right_bar'                          => ' Habilitar la barra lateral derecha',
+    'enable_right_bar_tooltip'                  => 'Cambiar la barra lateral de izquierda a derecha ',
+    'enforce_privacy'                           => 'Forzar privacidad',
+    'enforce_privacy_tooltip'                   => 'Proteja la privacidad de los clientes aplicando codificación de datos en caso de que se eliminen',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'Hay problemas con los permisos de archivo. Por favor corrija y vuelva a recargar esta página.',
+    'financial_year'                            => 'Inicio del año fiscal',
+    'financial_year_apr'                        => '1º de Abril',
+    'financial_year_aug'                        => '1º de Agosto',
+    'financial_year_dec'                        => '1º de Diciembre',
+    'financial_year_feb'                        => '1º de Febrero',
+    'financial_year_jan'                        => '1º de Enero',
+    'financial_year_jul'                        => '1º de Julio',
+    'financial_year_jun'                        => '1º de Junio',
+    'financial_year_mar'                        => '1º de Marzo',
+    'financial_year_may'                        => '1º de Mayo',
+    'financial_year_nov'                        => '1º de Noviembre',
+    'financial_year_oct'                        => '1º de Octubre',
+    'financial_year_sep'                        => '1º de Septiembre',
+    'floating_labels'                           => 'Etiquetas flotantes',
+    'gcaptcha_enable'                           => 'Inicio de sesión con reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'Llave secreta reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key es requerida si se usa',
+    'gcaptcha_site_key'                         => 'Llave del sitio reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key es requerida si se usa',
+    'gcaptcha_tooltip'                          => 'Proteja la página de inicio de sesión con Google reCAPTCHA, haga clic en el icono de un par de claves de API.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'Configuración General',
+    'giftcard_number'                           => 'Número de tarjeta de regalo',
+    'giftcard_random'                           => 'Generar aleatoriamente',
+    'giftcard_series'                           => 'Generar en serie',
+    'image_allowed_file_types'                  => 'Tipos de archivos permitidos',
+    'image_max_height_tooltip'                  => 'Altura máxima permitida de las cargas de imágenes en píxeles (px).',
+    'image_max_size_tooltip'                    => 'Tamaño máximo de archivo permitido de cargas de imágenes en kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Ancho máximo permitido de las cargas de imágenes en píxeles (px).',
+    'image_restrictions'                        => 'Restricciones de carga de imágenes',
+    'include_hsn'                               => 'Incluir Soporte para Códigos HSN',
+    'info'                                      => 'Información',
+    'info_configuration'                        => 'Información del Comercio',
+    'input_groups'                              => 'Introducir Grupos',
+    'integrations'                              => 'Componentes Integrados',
+    'integrations_configuration'                => 'Componentes de Terceros Integrados',
+    'invoice'                                   => 'Factura',
+    'invoice_configuration'                     => 'Parámetros de Impresión',
+    'invoice_default_comments'                  => 'Comentarios predeterminados en la factura',
+    'invoice_email_message'                     => 'Plantilla de Factura por Email',
+    'invoice_enable'                            => 'Habilitar Facturación',
+    'invoice_printer'                           => 'Impresora Facturadora',
+    'invoice_type'                              => 'Tipo de Factura',
+    'is_readable'                               => 'es legible, pero los permisos de lectura son incorrectos. Pongalos en 640 o 660 cargue nuevamente.',
+    'is_writable'                               => 'es escribible, pero los permisos de escritura son incorrectos. Pongalos en 750 y recargue la página de nuevo.',
+    'item_markup'                               => 'Marcado de Artículo',
+    'jsprintsetup_required'                     => 'Advertencia!Esta funcionalidad desactivada solo funciona con el addon jsPrintSetup de FireFox instalado. Guardar de todas formas?',
+    'language'                                  => 'Idioma',
+    'last_used_invoice_number'                  => 'Último numero de factura utilizado',
+    'last_used_quote_number'                    => 'Último número de presupuesto utilizado',
+    'last_used_work_order_number'               => 'Ultimo usado sin numero',
+    'left'                                      => 'Izquierda',
+    'license'                                   => 'Licencia',
+    'license_configuration'                     => 'Anuncio de Licencia',
+    'line_sequence'                             => 'Secuencia de linea',
+    'lines_per_page'                            => 'Líneas por página',
+    'lines_per_page_number'                     => 'Líneas por página debe ser un número.',
+    'lines_per_page_required'                   => 'Líneas por página es requerido.',
+    'locale'                                    => 'Localización',
+    'locale_configuration'                      => 'Configuración de la zona local',
+    'locale_info'                               => 'Informacion de la configuracion de la zona',
+    'location'                                  => 'Inventario',
+    'location_configuration'                    => 'Ubicación de Inventario',
+    'location_info'                             => 'Información de Configuración de Ubicación',
+    'login_form'                                => 'Estilo del formulario de inicio de sesión',
+    'logout'                                    => 'Desea hacer un respaldo antes de salir? Pulsa [OK] para respaldar o [Cancelar] para salir.',
+    'mailchimp'                                 => 'Correo MailChimp',
+    'mailchimp_api_key'                         => 'Clave API de Mailchimp',
+    'mailchimp_configuration'                   => 'Configuración de Mailchimp',
+    'mailchimp_key_successfully'                => 'Clave API correcta.',
+    'mailchimp_key_unsuccessfully'              => 'Clave API incorrecta.',
+    'mailchimp_lists'                           => 'Lista(s) de Mailchimp',
+    'mailchimp_tooltip'                         => 'Haga clic en el icono de una clave de API.',
+    'message'                                   => 'Mensajes SMS',
+    'message_configuration'                     => 'Configuracion del mensaje',
+    'msg_msg'                                   => 'Texto del mensaje guardado',
+    'msg_msg_placeholder'                       => 'Si desea usar un formato de SMS guarde su mensaje aquí, en caso contrario deje en blanco.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API ID remitente',
+    'msg_src_required'                          => 'SMS-API ID remitente es un campo requerido',
+    'msg_uid'                                   => 'SMS-API Usuario',
+    'msg_uid_required'                          => 'SMS-API Usuario es un campo requerido',
+    'multi_pack_enabled'                        => 'Empaquetado Múltiple por Producto',
+    'no_risk'                                   => 'Sin riesgos de seguridad/vulnerabilidad.',
+    'none'                                      => 'ninguno',
+    'notify_alignment'                          => 'Posición de notificacion',
+    'number_format'                             => 'Formato de número',
+    'number_locale'                             => 'Localización',
+    'number_locale_invalid'                     => 'Localización ingresada invalida. Revisa el link en el tooltip para encontrar informacion.',
+    'number_locale_required'                    => 'Numero localizacion es un campo requerido.',
+    'number_locale_tooltip'                     => 'Encontrar una zonificacion adecuada en este enlace.',
+    'os_timezone'                               => 'Zona Horaria Local:',
+    'ospos_info'                                => 'Información de la Instalación OSPOS',
+    'payment_options_order'                     => 'Orden de opciones de pago',
+    'payment_reference_code_length_limits'      => 'Código de referencia de pago<br>Límites de longitud',
+    'payment_reference_code_length_max_label'   => 'Máx',
+    'payment_reference_code_length_min_label'   => 'Mín',
+    'perm_risk'                                 => 'Los permisos incorrectos dejan a este software en riesgo.',
+    'phone'                                     => 'Teléfono comercial',
+    'phone_required'                            => 'Teléfono del Comercio es requerido.',
+    'print_bottom_margin'                       => 'Margen Inferior',
+    'print_bottom_margin_number'                => 'Margen Inferior debe ser un número.',
+    'print_bottom_margin_required'              => 'Margen Inferior es requerido.',
+    'print_delay_autoreturn'                    => 'Regresar automaticamente a Vender',
+    'print_delay_autoreturn_number'             => 'Tiempo espera requerido para regresar a ventas.',
+    'print_delay_autoreturn_required'           => 'El tiempo espera debe ser numérico.',
+    'print_footer'                              => 'Imprimir el pie de página del navegador',
+    'print_header'                              => 'Imprimir el encabezado del navegador',
+    'print_left_margin'                         => 'Margen Izquierdo',
+    'print_left_margin_number'                  => 'Margen Izquierdo debe ser un número.',
+    'print_left_margin_required'                => 'Margen Izquierdo es requerido.',
+    'print_receipt_check_behaviour'             => 'Selección de Imprimir recibo',
+    'print_receipt_check_behaviour_always'      => 'Siempre activado',
+    'print_receipt_check_behaviour_last'        => 'Recordar la ultima vez',
+    'print_receipt_check_behaviour_never'       => 'Siempre desactivo',
+    'print_right_margin'                        => 'Margen Derecho',
+    'print_right_margin_number'                 => 'Margen Derecho debe ser un número.',
+    'print_right_margin_required'               => 'Margen Derecho es requerido.',
+    'print_silently'                            => 'Mostrar configuracion pre- impresión',
+    'print_top_margin'                          => 'Margen Superior',
+    'print_top_margin_number'                   => 'Margen Superior debe ser un número.',
+    'print_top_margin_required'                 => 'Margen Superior es requerido.',
+    'quantity_decimals'                         => 'Decimales de Cantidades',
+    'quick_cash_enable'                         => 'Activar Botones de Efectivo',
+    'quote_default_comments'                    => 'Comentario inicial de cotizaciones',
+    'receipt'                                   => 'Recibo',
+    'receipt_category'                          => 'Recibo con categoría',
+    'receipt_configuration'                     => 'Parámetros de Impresión',
+    'receipt_default'                           => 'Normal',
+    'receipt_font_size'                         => 'Tamaño letra',
+    'receipt_font_size_number'                  => 'Debe ser un numero el tamaño de letra.',
+    'receipt_font_size_required'                => 'El tamaño de letra es requerido.',
+    'receipt_info'                              => 'Información de Configuración de Recibo',
+    'receipt_printer'                           => 'Impresora de Ticket',
+    'receipt_short'                             => 'Resumido',
+    'receipt_show_company_name'                 => 'Mostrar el nombre de la empresa',
+    'receipt_show_description'                  => 'Mostrar descripcion',
+    'receipt_show_serialnumber'                 => 'Mostrar numero de serie',
+    'receipt_show_tax_ind'                      => 'Mostrar indicador de impuestos',
+    'receipt_show_taxes'                        => 'Mostrar impuestos',
+    'receipt_show_total_discount'               => 'Mostrar Descuento Total',
+    'receipt_template'                          => 'Formato de recibo',
+    'receiving_calculate_average_price'         => 'Calcular Promedio de Precio. (Recepción)',
+    'recv_invoice_format'                       => 'Formato de Factura de Recepción',
+    'register_mode_default'                     => 'Modo de registro por defecto',
+    'report_an_issue'                           => 'Informe de algún problema',
+    'return_policy_required'                    => 'Política de Devolución requerida.',
+    'reward'                                    => 'Recompensas',
+    'reward_configuration'                      => 'Configuración de recompensas',
+    'right'                                     => 'Derecha',
+    'sales_invoice_format'                      => 'Formato de Facturas de Venta',
+    'sales_quote_format'                        => 'Formato de presupuesto de las ventas',
+    'mailpath_invalid'                          => 'Ruta de sendmail no válida. Solo se permiten letras, números, guiones, guiones bajos, barras, barras invertidas, dos puntos, espacios y puntos.',
+    'saved_successfully'                        => 'Configuración guardada satisfactoriamente.',
+    'saved_unsuccessfully'                      => 'Configuración no guardada.',
+    'security_issue'                            => 'Advertencia de vulnerabilidad de seguridad',
+    'server_notice'                             => 'Por Favor Use la Siguiente Información para Reportar Problemas.',
+    'service_charge'                            => 'Costo de Servicio',
+    'show_due_enable'                           => 'Mostrar vencimientos de clientes',
+    'show_office_group'                         => 'Mostrar icono oficina',
+    'statistics'                                => 'Enviar estadísticas',
+    'statistics_tooltip'                        => 'Envíe estadísticas para el desarrollo y mejora de funciones.',
+    'stock_location'                            => 'Ubicación de Inventario',
+    'stock_location_duplicate'                  => 'El nombre de inventario debe ser único.',
+    'stock_location_invalid_chars'              => "Nombre de la Ubicación de Inventario no debe contener '_'.",
+    'stock_location_required'                   => 'Número de Ubicación de Inventario es requerido.',
+    'suggestions_fifth_column'                  => 'Columna 5',
+    'suggestions_first_column'                  => 'Columna 1',
+    'suggestions_fourth_column'                 => 'Columna 4',
+    'suggestions_layout'                        => 'Sugerencias de búsqueda',
+    'suggestions_second_column'                 => 'Columna 2',
+    'suggestions_third_column'                  => 'Columna 3',
+    'system_conf'                               => 'Sistema OSPOS',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Mesa',
+    'table_configuration'                       => 'Configuración de Mesa',
+    'takings_printer'                           => 'Impresión de retenciones',
+    'tax'                                       => 'Impuestos',
+    'tax_category'                              => 'Categoría impuesto',
+    'tax_category_duplicate'                    => 'Categoría de impuesto ingresada ya existe.',
+    'tax_category_invalid_chars'                => 'Categoría de impuesto ingresada es invalida.',
+    'tax_category_required'                     => 'Categoría de impuesto es requerida.',
+    'tax_category_used'                         => 'La categoría de impuestos no puede borrarse, esta en uso.',
+    'tax_configuration'                         => 'Configuracion Impuesto',
+    'tax_decimals'                              => 'Decimales de impuestos',
+    'tax_id'                                    => 'Identificador del Impuesto',
+    'tax_included'                              => 'Impuestos incluidos',
+    'theme'                                     => 'Tema',
+    'theme_preview'                             => 'Vista Previa del Tema:',
+    'thousands_separator'                       => 'Separador de miles',
+    'timezone'                                  => 'Zona Horaria',
+    'timezone_error'                            => 'La zona horaria de OSPOS es diferente de tu zona horaria local.',
+    'top'                                       => 'Arriba',
+    'use_destination_based_tax'                 => 'Usar Impuesto Basado en Destino',
+    'user_timezone'                             => 'Zona Horaria OSPOS:',
+    'website'                                   => 'Sitio Web',
+    'wholesale_markup'                          => 'Marcado al por mayor',
+    'work_order_enable'                         => 'Soporte Ordenes de Trabajo',
+    'work_order_format'                         => 'Formato Ordenes de trabajo',
 ];
diff --git a/app/Language/es-ES/Employees.php b/app/Language/es-ES/Employees.php
index 613d5cb44..3cebec26d 100644
--- a/app/Language/es-ES/Employees.php
+++ b/app/Language/es-ES/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "Administrador",
-    "basic_information"            => "Información Básica de Empleados",
-    "cannot_be_deleted"            => "No se pudieron borrar empleados. Uno o más empleados tiene ventas procesadas o estás tratando de borrarte a tí mismo(a).",
-    "change_employee"              => "Cambio de Empleado",
-    "change_password"              => "Cambiar Contraseña",
-    "clerk"                        => "Empleado",
-    "commission"                   => "Tasa de Comisión",
-    "confirm_delete"               => "¿Seguro(a) que quieres borrar los empleados seleccionados?",
-    "confirm_restore"              => "Esta seguro de quere restaurar lo(s) empleado(s) seleccionado(s)?",
-    "current_password"             => "Contraseña Actual",
-    "current_password_invalid"     => "Contraseña Actual Inválida.",
-    "employee"                     => "Empleado",
-    "error_adding_updating"        => "Error al agregar/actualizar empleado.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "No puedes borrar el usuario admin del demo.",
-    "error_updating_demo_admin"    => "No puedes cambiar el usuario admin del demo.",
-    "language"                     => "Idioma",
-    "login_info"                   => "Información de Ingreso del Empleado",
-    "manager"                      => "Encargado",
-    "new"                          => "Nuevo Empleado",
-    "none_selected"                => "No has seleccionado empleados para borrar.",
-    "one_or_multiple"              => "empleado(s)",
-    "password"                     => "Contraseña",
-    "password_minlength"           => "La contraseña debe tener, por lo menos, 8 caracteres.",
-    "password_must_match"          => "Las Contraseñas no coinciden.",
-    "password_not_must_match"      => "La contraseña actual y la nueva contraseña no deben ser iguales.",
-    "password_required"            => "La Contraseña es requerida.",
-    "permission_desc"              => "Activa las cajas debajo para permitir el acceso a los módulos.",
-    "permission_info"              => "Permisos y Acceso del Empleado",
-    "repeat_password"              => "Repita Contraseña",
-    "subpermission_required"       => "Agregar al menos un permiso para cada modulo.",
-    "successful_adding"            => "Empleado agregado satisfactoriamente.",
-    "successful_change_password"   => "Contraseña cambiada satisfactoriamente.",
-    "successful_deleted"           => "Has borrado satisfactoriamente a",
-    "successful_updating"          => "Has actualizado el empleado satisfactoriamente",
-    "system_language"              => "Idioma de sistema",
-    "unsuccessful_change_password" => "Cambio de contraseña fallido.",
-    "update"                       => "Actualizar Empleado",
-    "username"                     => "Usuario",
-    "username_duplicate"           => "Nombre de Usuario de Empleado yá está en uso. Por favor escoja otro.",
-    "username_minlength"           => "El nombre de usuario debe ser por lo menos, 5 caracteres.",
-    "username_required"            => "Nombre de usuario es requerido.",
+    'administrator'                          => 'Administrador',
+    'basic_information'                      => 'Información Básica de Empleados',
+    'cannot_be_deleted'                      => 'No se pudieron borrar empleados. Uno o más empleados tiene ventas procesadas o estás tratando de borrarte a tí mismo(a).',
+    'change_employee'                        => 'Cambio de Empleado',
+    'change_password'                        => 'Cambiar Contraseña',
+    'clerk'                                  => 'Empleado',
+    'commission'                             => 'Tasa de Comisión',
+    'confirm_delete'                         => '¿Seguro(a) que quieres borrar los empleados seleccionados?',
+    'confirm_restore'                        => 'Esta seguro de quere restaurar lo(s) empleado(s) seleccionado(s)?',
+    'current_password'                       => 'Contraseña Actual',
+    'current_password_invalid'               => 'Contraseña Actual Inválida.',
+    'employee'                               => 'Empleado',
+    'error_adding_updating'                  => 'Error al agregar/actualizar empleado.',
+    'error_cannot_remove_own_minimum_grant'  => 'No puedes eliminar tus propios permisos mínimos de acceso a módulos.',
+    'error_deleting_admin'                   => 'No puedes eliminar un usuario administrador.',
+    'error_deleting_demo_admin'              => 'No puedes borrar el usuario admin del demo.',
+    'error_grant_change_disallowed'          => 'Los cambios de permisos están deshabilitados en esta demo.',
+    'error_password_change_disallowed'       => 'Los cambios de contraseña están deshabilitados en esta demo.',
+    'error_updating_admin'                   => 'No puedes modificar un usuario administrador.',
+    'error_updating_demo_admin'              => 'No puedes cambiar el usuario admin del demo.',
+    'language'                               => 'Idioma',
+    'login_info'                             => 'Información de Ingreso del Empleado',
+    'manager'                                => 'Encargado',
+    'new'                                    => 'Nuevo Empleado',
+    'none_selected'                          => 'No has seleccionado empleados para borrar.',
+    'one_or_multiple'                        => 'empleado(s)',
+    'password'                               => 'Contraseña',
+    'password_minlength'                     => 'La contraseña debe tener, por lo menos, 8 caracteres.',
+    'password_must_match'                    => 'Las Contraseñas no coinciden.',
+    'password_not_must_match'                => 'La contraseña actual y la nueva contraseña no deben ser iguales.',
+    'password_required'                      => 'La Contraseña es requerida.',
+    'permission_desc'                        => 'Activa las cajas debajo para permitir el acceso a los módulos.',
+    'permission_info'                        => 'Permisos y Acceso del Empleado',
+    'repeat_password'                        => 'Repita Contraseña',
+    'subpermission_required'                 => 'Agregar al menos un permiso para cada modulo.',
+    'successful_adding'                      => 'Empleado agregado satisfactoriamente.',
+    'successful_change_password'             => 'Contraseña cambiada satisfactoriamente.',
+    'successful_deleted'                     => 'Has borrado satisfactoriamente a',
+    'successful_updating'                    => 'Has actualizado el empleado satisfactoriamente',
+    'system_language'                        => 'Idioma de sistema',
+    'unsuccessful_change_password'           => 'Cambio de contraseña fallido.',
+    'update'                                 => 'Actualizar Empleado',
+    'username'                               => 'Usuario',
+    'username_duplicate'                     => 'Nombre de Usuario de Empleado yá está en uso. Por favor escoja otro.',
+    'username_minlength'                     => 'El nombre de usuario debe ser por lo menos, 5 caracteres.',
+    'username_required'                      => 'Nombre de usuario es requerido.',
 ];
diff --git a/app/Language/es-ES/Error.php b/app/Language/es-ES/Error.php
index 7c7e21487..aa16e6303 100644
--- a/app/Language/es-ES/Error.php
+++ b/app/Language/es-ES/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "No tienes permiso para accesar el módulo llamado",
-    "unknown"              => "desconocido",
+    'no_permission_module'           => 'No tienes permiso para accesar el módulo llamado',
+    'unable_to_create_env_file'      => 'No se pudo crear {filePath} para aprovisionar throttle.key',
+    'unable_to_lock_file'            => 'No se pudo bloquear {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'No se pudo abrir {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'No se pudo guardar throttle.key en {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'No se pudo leer {filePath} para aprovisionar throttle.key',
+    'unknown'                        => 'desconocido',
 ];
diff --git a/app/Language/es-ES/Items.php b/app/Language/es-ES/Items.php
index aa7ab8eef..3d66f7241 100644
--- a/app/Language/es-ES/Items.php
+++ b/app/Language/es-ES/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventario a agregar/substraer.",
-    "allow_alt_description"              => "Permitir Descripción Alternativa",
-    "amount_entry"                       => "Monto entrada",
-    "bulk_edit"                          => "Edición Múltiple",
-    "buy_price_required"                 => "Precio de Compra es requerido.",
-    "cannot_be_deleted"                  => "No se pueden borrar los artículos seleccionados. Uno o más tiene(n) ventas.",
-    "cannot_find_item"                   => "Articulo no encontrado.",
-    "categories"                         => "Categorías. Seleccione el número de artículo.",
-    "category"                           => "Categoría",
-    "category_new"                       => "Nueva Categoría",
-    "category_required"                  => "Categoría es requerido.",
-    "change_all_to_allow_alt_desc"       => "Permitir Descripción Alternativa para todos.",
-    "change_all_to_not_allow_allow_desc" => "No permitir descripción alternativa para todos.",
-    "change_all_to_serialized"           => "Cambiar Todo A Serializado",
-    "change_all_to_unserialized"         => "Cambiar Todo A Deserializado",
-    "change_image"                       => "Cambiar Imagen",
-    "confirm_bulk_edit"                  => "¿Estás seguro(a) de querer editar los artículos seleccionados?",
-    "confirm_bulk_edit_wipe_taxes"       => "Toda la información de impuesto del articulo sera cambiada.",
-    "confirm_delete"                     => "¿Estás seguro(a) de querer borrar los artículos seleccionados?",
-    "confirm_restore"                    => "Esta seguro de querer restaurar lo(s) articulo(s) seleccionada(s)?",
-    "cost_price"                         => "Precio al Por Mayor",
-    "cost_price_number"                  => "Precio al Por Mayor debe ser un número.",
-    "cost_price_required"                => "Precio al Por Mayor es un campo requerido.",
-    "count"                              => "Actualizar Inventario",
-    "csv_import_failed"                  => "Falló la importación de Hoja de Cálculo",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "El archivo subido no tiene datos o el formato es incorrecto.",
-    "csv_import_partially_failed"        => "Hubo {0} falla(s) en la importación de producto(s) en la(s) línea(s): {1}. Ninguna fila ha sido importada.",
-    "csv_import_success"                 => "Se importaron los articulos exitosamente.",
-    "current_quantity"                   => "Cantidad Actual",
-    "default_pack_name"                  => "Cada",
-    "description"                        => "Descripción",
-    "details_count"                      => "Detalles de Cuenta de Inventario",
-    "do_nothing"                         => "No Hacer Nada",
-    "edit"                               => "Editar",
-    "edit_fields_you_want_to_update"     => "Edita los campos para actualizar en los artículos seleccionados.",
-    "edit_multiple_items"                => "Editando Artículos Múltiples",
-    "empty_upc_items"                    => "Items con UPC Vacio",
-    "error_adding_updating"              => "Error agregando/actualizando artículo",
-    "error_updating_multiple"            => "Error actualizando artículos",
-    "generate_barcodes"                  => "Generar Códigos de Barras",
-    "hsn_code"                           => "Nomenclatura de Sistemas Harmonizados",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Importar Artículos desde CSV",
-    "info_provided_by"                   => "Info provista por",
-    "inventory"                          => "Inventario",
-    "inventory_CSV_import_quantity"      => "Catidad Importada desde CSV",
-    "inventory_comments"                 => "Comentarios",
-    "inventory_data_tracking"            => "Seguimiento de datos de inventario",
-    "inventory_date"                     => "Fecha",
-    "inventory_employee"                 => "Empleado",
-    "inventory_in_out_quantity"          => "Cantidad E/S",
-    "inventory_remarks"                  => "Observaciones",
-    "is_deleted"                         => "Eliminado",
-    "is_printed"                         => "No impreso",
-    "is_serialized"                      => "El Artículo tiene Número de Serie",
-    "item"                               => "Artículo",
-    "item_id"                            => "Id del Artículo",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "El número de artículo ya esta presente en la base de datos.",
-    "kit"                                => "Kits de artículos",
-    "location"                           => "Ubicación",
-    "low_inventory_items"                => "Artículos de Inventario Escaso",
-    "low_sell_item"                      => "Producto de bajas ventas",
-    "manually_editing_of_quantity"       => "Edición Manual de Cantidad",
-    "markup"                             => "El marcado de elementos está habilitado",
-    "name"                               => "Nombre Artículo",
-    "name_required"                      => "Nombre de Artículo es requerido.",
-    "new"                                => "Nuevo Artículo",
-    "no_description_items"               => "Artículos sin Descripción",
-    "no_items_to_display"                => "Sin datos que mostrar.",
-    "none"                               => "Ninguno",
-    "none_selected"                      => "No has seleccionado artículos para editar",
-    "nonstock"                           => "Sin stock",
-    "number_information"                 => "Número del Artículo",
-    "number_required"                    => "UPC/EAN/ISBN es un campo requerido.",
-    "one_or_multiple"                    => "articulo(s)",
-    "pack_name"                          => "Nombre del Paquete",
-    "qty_per_pack"                       => "Cantidad por Paquete",
-    "quantity"                           => "Cantidad en Stock",
-    "quantity_number"                    => "Cantidad debe ser número.",
-    "quantity_required"                  => "Cantidad es requerido.",
-    "receiving_quantity"                 => "Cantidad Recibida",
-    "remove_image"                       => "Quitar Imagen",
-    "reorder_level"                      => "Cantidad Mínima",
-    "reorder_level_number"               => "Cantidad Mínima debe ser número.",
-    "reorder_level_required"             => "Cantidad Mínima es requerido.",
-    "retrive_item_info"                  => "Obtener Información de Artículo",
-    "sales_tax_1"                        => "Impuesto de Ventas 1",
-    "sales_tax_2"                        => "Impuesto de Ventas 2",
-    "search_attributes"                  => "Atributos de Búsqueda",
-    "select_image"                       => "Seleccionar Imagen",
-    "serialized_items"                   => "Artículos Serializados",
-    "standard"                           => "Estándar",
-    "stock"                              => "Existencia",
-    "stock_location"                     => "Ubicación de Inventario",
-    "stock_type"                         => "Tipo de stock",
-    "successful_adding"                  => "Has agregado satisfactoriamente un artículo",
-    "successful_bulk_edit"               => "Has actualizado satisfactoriamente los artículos seleccionados",
-    "successful_deleted"                 => "Has borrado satisfactoriamente",
-    "successful_updating"                => "Has actualizando satisfactoriamente un artículo",
-    "supplier"                           => "Proveedor",
-    "tax_1"                              => "Impuesto 1",
-    "tax_2"                              => "Impuesto 2",
-    "tax_3"                              => "Impuestos 3",
-    "tax_category"                       => "Categoría del Impuesto",
-    "tax_percent"                        => "Porcentaje de Impuesto",
-    "tax_percent_number"                 => "Impuesto porcentaje debe ser numerico",
-    "tax_percent_required"               => "Porcentaje de Impuesto es requerido.",
-    "tax_percents"                       => "Porcentaje de Impuesto(s)",
-    "temp"                               => "Temporal",
-    "type"                               => "Tipo de ítem",
-    "unit_price"                         => "Precio de Venta",
-    "unit_price_number"                  => "Precio de Venta debe ser número.",
-    "unit_price_required"                => "Precio de Venta es requerido.",
-    "upc_database"                       => "Base de datos UPC",
-    "update"                             => "Actualizar Artículo",
-    "use_inventory_menu"                 => "Usar Menú de Inventario",
+    'add_minus'                          => 'Inventario a agregar/substraer.',
+    'allow_alt_description'              => 'Permitir Descripción Alternativa',
+    'amount_entry'                       => 'Monto entrada',
+    'bulk_edit'                          => 'Edición Múltiple',
+    'buy_price_required'                 => 'Precio de Compra es requerido.',
+    'cannot_be_deleted'                  => 'No se pueden borrar los artículos seleccionados. Uno o más tiene(n) ventas.',
+    'cannot_find_item'                   => 'Articulo no encontrado.',
+    'categories'                         => 'Categorías. Seleccione el número de artículo.',
+    'category'                           => 'Categoría',
+    'category_new'                       => 'Nueva Categoría',
+    'category_required'                  => 'Categoría es requerido.',
+    'change_all_to_allow_alt_desc'       => 'Permitir Descripción Alternativa para todos.',
+    'change_all_to_not_allow_allow_desc' => 'No permitir descripción alternativa para todos.',
+    'change_all_to_serialized'           => 'Cambiar Todo A Serializado',
+    'change_all_to_unserialized'         => 'Cambiar Todo A Deserializado',
+    'change_image'                       => 'Cambiar Imagen',
+    'confirm_bulk_edit'                  => '¿Estás seguro(a) de querer editar los artículos seleccionados?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Toda la información de impuesto del articulo sera cambiada.',
+    'confirm_delete'                     => '¿Estás seguro(a) de querer borrar los artículos seleccionados?',
+    'confirm_restore'                    => 'Esta seguro de querer restaurar lo(s) articulo(s) seleccionada(s)?',
+    'cost_price'                         => 'Precio al Por Mayor',
+    'cost_price_number'                  => 'Precio al Por Mayor debe ser un número.',
+    'cost_price_required'                => 'Precio al Por Mayor es un campo requerido.',
+    'count'                              => 'Actualizar Inventario',
+    'csv_import_failed'                  => 'Falló la importación de Hoja de Cálculo',
+    'csv_import_invalid_location'        => 'Se encontraron ubicaciones de stock no válidas: {0}. Solo se permiten ubicaciones de stock válidas.',
+    'csv_import_nodata_wrongformat'      => 'El archivo subido no tiene datos o el formato es incorrecto.',
+    'csv_import_partially_failed'        => 'Hubo {0} falla(s) en la importación de producto(s) en la(s) línea(s): {1}. Ninguna fila ha sido importada.',
+    'csv_import_success'                 => 'Se importaron los articulos exitosamente.',
+    'current_quantity'                   => 'Cantidad Actual',
+    'default_pack_name'                  => 'Cada',
+    'description'                        => 'Descripción',
+    'details_count'                      => 'Detalles de Cuenta de Inventario',
+    'do_nothing'                         => 'No Hacer Nada',
+    'edit'                               => 'Editar',
+    'edit_fields_you_want_to_update'     => 'Edita los campos para actualizar en los artículos seleccionados.',
+    'edit_multiple_items'                => 'Editando Artículos Múltiples',
+    'empty_upc_items'                    => 'Items con UPC Vacio',
+    'error_adding_updating'              => 'Error agregando/actualizando artículo',
+    'error_updating_multiple'            => 'Error actualizando artículos',
+    'generate_barcodes'                  => 'Generar Códigos de Barras',
+    'hsn_code'                           => 'Nomenclatura de Sistemas Harmonizados',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Importar Artículos desde CSV',
+    'info_provided_by'                   => 'Info provista por',
+    'inventory'                          => 'Inventario',
+    'inventory_CSV_import_quantity'      => 'Catidad Importada desde CSV',
+    'inventory_comments'                 => 'Comentarios',
+    'inventory_data_tracking'            => 'Seguimiento de datos de inventario',
+    'inventory_date'                     => 'Fecha',
+    'inventory_employee'                 => 'Empleado',
+    'inventory_in_out_quantity'          => 'Cantidad E/S',
+    'inventory_remarks'                  => 'Observaciones',
+    'is_deleted'                         => 'Eliminado',
+    'is_printed'                         => 'No impreso',
+    'is_serialized'                      => 'El Artículo tiene Número de Serie',
+    'item'                               => 'Artículo',
+    'item_id'                            => 'Id del Artículo',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'El número de artículo ya esta presente en la base de datos.',
+    'item_number_invalid'                => 'El número de artículo contiene caracteres no permitidos.',
+    'kit'                                => 'Kits de artículos',
+    'location'                           => 'Ubicación',
+    'low_inventory_items'                => 'Artículos de Inventario Escaso',
+    'low_sell_item'                      => 'Producto de bajas ventas',
+    'manually_editing_of_quantity'       => 'Edición Manual de Cantidad',
+    'markup'                             => 'El marcado de elementos está habilitado',
+    'name'                               => 'Nombre Artículo',
+    'name_required'                      => 'Nombre de Artículo es requerido.',
+    'new'                                => 'Nuevo Artículo',
+    'no_description_items'               => 'Artículos sin Descripción',
+    'no_items_to_display'                => 'Sin datos que mostrar.',
+    'none'                               => 'Ninguno',
+    'none_selected'                      => 'No has seleccionado artículos para editar',
+    'nonstock'                           => 'Sin stock',
+    'number_information'                 => 'Número del Artículo',
+    'number_required'                    => 'UPC/EAN/ISBN es un campo requerido.',
+    'one_or_multiple'                    => 'articulo(s)',
+    'pack_name'                          => 'Nombre del Paquete',
+    'qty_per_pack'                       => 'Cantidad por Paquete',
+    'quantity'                           => 'Cantidad en Stock',
+    'quantity_number'                    => 'Cantidad debe ser número.',
+    'quantity_required'                  => 'Cantidad es requerido.',
+    'receiving_quantity'                 => 'Cantidad Recibida',
+    'remove_image'                       => 'Quitar Imagen',
+    'reorder_level'                      => 'Cantidad Mínima',
+    'reorder_level_number'               => 'Cantidad Mínima debe ser número.',
+    'reorder_level_required'             => 'Cantidad Mínima es requerido.',
+    'retrive_item_info'                  => 'Obtener Información de Artículo',
+    'sales_tax_1'                        => 'Impuesto de Ventas 1',
+    'sales_tax_2'                        => 'Impuesto de Ventas 2',
+    'search_attributes'                  => 'Atributos de Búsqueda',
+    'select_image'                       => 'Seleccionar Imagen',
+    'serialized_items'                   => 'Artículos Serializados',
+    'standard'                           => 'Estándar',
+    'stock'                              => 'Existencia',
+    'stock_location'                     => 'Ubicación de Inventario',
+    'stock_type'                         => 'Tipo de stock',
+    'successful_adding'                  => 'Has agregado satisfactoriamente un artículo',
+    'successful_bulk_edit'               => 'Has actualizado satisfactoriamente los artículos seleccionados',
+    'successful_deleted'                 => 'Has borrado satisfactoriamente',
+    'successful_updating'                => 'Has actualizando satisfactoriamente un artículo',
+    'supplier'                           => 'Proveedor',
+    'tax_1'                              => 'Impuesto 1',
+    'tax_2'                              => 'Impuesto 2',
+    'tax_3'                              => 'Impuestos 3',
+    'tax_category'                       => 'Categoría del Impuesto',
+    'tax_name_invalid'                   => 'El nombre del impuesto contiene caracteres no permitidos.',
+    'tax_percent'                        => 'Porcentaje de Impuesto',
+    'tax_percent_number'                 => 'Impuesto porcentaje debe ser numerico',
+    'tax_percent_required'               => 'Porcentaje de Impuesto es requerido.',
+    'tax_percents'                       => 'Porcentaje de Impuesto(s)',
+    'temp'                               => 'Temporal',
+    'type'                               => 'Tipo de ítem',
+    'unit_price'                         => 'Precio de Venta',
+    'unit_price_number'                  => 'Precio de Venta debe ser número.',
+    'unit_price_required'                => 'Precio de Venta es requerido.',
+    'upc_database'                       => 'Base de datos UPC',
+    'update'                             => 'Actualizar Artículo',
+    'use_inventory_menu'                 => 'Usar Menú de Inventario',
 ];
diff --git a/app/Language/es-ES/Login.php b/app/Language/es-ES/Login.php
index 03868bd06..f490ff86f 100644
--- a/app/Language/es-ES/Login.php
+++ b/app/Language/es-ES/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "No soy un robot.",
-    "go"                            => "Ir",
-    "invalid_gcaptcha"              => "Por favor verifique si usted no es un robot.",
-    "invalid_installation"          => "La instalación no es correcta, comprueba el fichero php.ini.",
-    "invalid_username_and_password" => "Usuario y/o Contraseña no validos.",
-    "login"                         => "Iniciar Sesión",
-    "logout"                        => "Cerrar sesión",
-    "migration_needed"              => "La migración de la base de datos a {0} se iniciará después del inicio de sesión.",
-    "password"                      => "Contraseña",
-    "required_username"             => "El campo de nombre de usuario es obligatorio.",
-    "username"                      => "Usuario",
-    "welcome"                       => "Bienvenido a {0}!",
+    "gcaptcha"                            => "No soy un robot.",
+    "go"                                  => "Ir",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Por favor verifique si usted no es un robot.",
+    "invalid_installation"                => "La instalación no es correcta, comprueba el fichero php.ini.",
+    "invalid_username_and_password"       => "Usuario y/o Contraseña no validos.",
+    "login"                               => "Iniciar Sesión",
+    "logout"                              => "Cerrar sesión",
+    "migrating_database"                  => "Migrando base de datos",
+    "migration_auth_message"              => "Se requieren credenciales de administrador para autorizar la migración de la base de datos a la versión {0}. Inicie sesión para continuar.",
+    "migration_complete"                  => "¡Base de datos inicializada correctamente!",
+    "migration_complete_login"            => "Ahora puede iniciar sesión.",
+    "migration_complete_migrate"          => "¡Base de datos migrada exitosamente!",
+    "migration_complete_redirect"         => "Migración completada. Redirigiendo al inicio de sesión...",
+    "migration_error_connection"          => "Error de conexión. Por favor, inténtelo de nuevo.",
+    "migration_failed"                    => "Migración fallida",
+    "migration_initializing"              => "Inicializando base de datos",
+    "migration_needed"                    => "La migración de la base de datos a {0} se iniciará después del inicio de sesión.",
+    "migration_required"                  => "Migración de base de datos requerida",
+    "migration_running"                   => "Ejecutando migraciones de base de datos...",
+    "password"                            => "Contraseña",
+    "required_username"                   => "El campo de nombre de usuario es obligatorio.",
+    'too_many_attempts'                   => 'Demasiados intentos. Por favor, espere un momento e inténtelo de nuevo.',
+    "username"                            => "Usuario",
+    "welcome"                             => "Bienvenido a {0}!"
 ];
diff --git a/app/Language/es-ES/Reports.php b/app/Language/es-ES/Reports.php
index 04c1de2f9..f7f86371e 100644
--- a/app/Language/es-ES/Reports.php
+++ b/app/Language/es-ES/Reports.php
@@ -146,4 +146,5 @@ return [
     "used"                                    => "Puntos usados",
     "work_orders"                             => "Ordenes",
     "zero_and_less"                           => "Cero y negativos",
+    "toggle_cost_and_profit"                  => "Alternar Costo y Ganancia",
 ];
diff --git a/app/Language/es-ES/Sales.php b/app/Language/es-ES/Sales.php
index 3c29182f0..d5f49c549 100644
--- a/app/Language/es-ES/Sales.php
+++ b/app/Language/es-ES/Sales.php
@@ -1,226 +1,242 @@
 <?php
 
 return [
-    "customers_available_points"       => "Puntos Disponibles",
-    "rewards_package"                  => "Paquete de recompensas",
-    "rewards_remaining_balance"        => "El remanente de puntos es ",
-    "account_number"                   => "Cuenta #",
-    "add_payment"                      => "Agregar Pago",
-    "amount_due"                       => "Monto Adeudado",
-    "amount_tendered"                  => "Cantidad Recibida",
-    "authorized_signature"             => "Firma Autorizada",
-    "cancel_sale"                      => "Cancelar Venta",
-    "cash"                             => "Efectivo",
-    "cash_1"                           => "1",
-    "cash_2"                           => "5",
-    "cash_3"                           => "10",
-    "cash_4"                           => "20",
-    "cash_adjustment"                  => "Ajuste de Efectivo",
-    "cash_deposit"                     => "Deposito Efectivo",
-    "cash_filter"                      => "Efectivo",
-    "change_due"                       => "Cambio",
-    "change_price"                     => "Cambiar el precio de venta",
-    "check"                            => "Cheque",
-    "check_balance"                    => "Balance de Cheque",
-    "check_filter"                     => "Cheque",
-    "close"                            => "Cerrar Lista",
-    "comment"                          => "Comentario",
-    "comments"                         => "Comentarios",
-    "company_name"                     => "Nombre de Comañía",
-    "complete"                         => "Completa",
-    "complete_sale"                    => "Completar Venta",
-    "confirm_cancel_sale"              => "¿Seguro quiere cancelar esta venta? Todos los artículos serán eliminados.",
-    "confirm_delete"                   => "¿Seguro quiere borrar las ventas seleccionadas?",
-    "confirm_restore"                  => "Esta seguro de querer restaurar la(s) venta(s) seleccionada(s)?",
-    "credit"                           => "Tarjeta de Crédito",
-    "credit_deposit"                   => "Deposito Credito",
-    "credit_filter"                    => "Tarjeta de Crédito",
-    "current_table"                    => "Tabla Actual",
-    "customer"                         => "cliente",
-    "customer_address"                 => "Direccion",
-    "customer_discount"                => "Descuento",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Ubicacion",
-    "customer_mailchimp_status"        => "Estado de Mailchimp",
-    "customer_optional"                => "(Obligatorio para Pagos Vencidos)",
-    "customer_required"                => "(Requerido)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "Total Gastado",
-    "daily_sales"                      => "Sus Ventas Diarias",
-    "date"                             => "Fecha",
-    "date_range"                       => "Rango de Fecha",
-    "date_required"                    => "Una fecha correcta debe ser ingresada.",
-    "date_type"                        => "Campo de Fecha es requerido.",
-    "debit"                            => "Tarjeta de Débito",
-    "debit_filter"                     => "Tarjeta de Débito",
-    "delete"                           => "Permitir borrar",
-    "delete_confirmation"              => "¿Seguro quiere borrar esta venta? Esta acción no se puede deshacer.",
-    "delete_entire_sale"               => "Borrar la venta completa",
-    "delete_successful"                => "Venta borrada correctamente.",
-    "delete_unsuccessful"              => "Venta no borrada, fallida.",
-    "description_abbrv"                => "Descrp.",
-    "discard"                          => "Descartar",
-    "discard_quote"                    => "Descartar",
-    "discount"                         => "Descuento",
-    "discount_included"                => "% Descuento",
-    "discount_short"                   => "%",
-    "due"                              => "Adeudado",
-    "due_filter"                       => "Adeudado",
-    "edit"                             => "Editar",
-    "edit_item"                        => "Editar Artículo",
-    "edit_sale"                        => "Editar Venta",
-    "email_receipt"                    => "Enviar Ticket",
-    "employee"                         => "Empleado",
-    "entry"                            => "Entrada",
-    "error_editing_item"               => "Error editando artículo",
-    "find_or_scan_item"                => "Encontrar/Escanear Artículo",
-    "find_or_scan_item_or_receipt"     => "Encontrar/Escanear Artículo o Entrada",
-    "giftcard"                         => "Tarjeta de Regalo",
-    "giftcard_balance"                 => "Balance de Tarjeta de Regalo",
-    "giftcard_filter"                  => "Tarjeta de Regalo",
-    "giftcard_number"                  => "Número de Tarjeta de Regalo",
-    "group_by_category"                => "Grupo por Categoría",
-    "group_by_type"                    => "Grupo por Tipo",
-    "hsn"                              => "HSN",
-    "id"                               => "ID de Venta",
-    "include_prices"                   => "Incluir precios?",
-    "invoice"                          => "Factura de venta",
-    "invoice_confirm"                  => "Esta factura sera enviada a",
-    "invoice_enable"                   => "Número de Factura",
-    "invoice_filter"                   => "Facturas",
-    "invoice_no_email"                 => "Este cliente no tiene un email válido.",
-    "invoice_number"                   => "Factura #",
-    "invoice_number_duplicate"         => "Por favor ingrese un número de factura único.",
-    "invoice_sent"                     => "Factura enviada a",
-    "invoice_total"                    => "Total Facturado",
-    "invoice_type_custom_invoice"      => "Factura Personalizada",
-    "invoice_type_custom_tax_invoice"  => "Factura de Impuesto personalizada",
-    "invoice_type_invoice"             => "Factura",
-    "invoice_type_tax_invoice"         => "Factura de Impuestos",
-    "invoice_unsent"                   => "Fallo el envio de la factura a",
-    "invoice_update"                   => "Actualizar",
-    "item_insufficient_of_stock"       => "Cantidad insuficiente en existencia.",
-    "item_name"                        => "Nombre del Artículo",
-    "item_number"                      => "UPC/EAN/ISBN",
-    "item_out_of_stock"                => "El artículo está agotado.",
-    "key_browser"                      => "Atajos Útiles",
-    "key_cancel"                       => "Cancelar actual Cotización/Factura/Venta",
-    "key_customer_search"              => "Búsqueda de Clientes",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Agregar Pago y Completar Factura/Venta",
-    "key_full"                         => "Abrir en Pantalla Completa",
-    "key_function"                     => "Function",
-    "key_help"                         => "Atajos",
-    "key_help_modal"                   => "Abrir Ventana de Atajos",
-    "key_in"                           => "Acercar",
-    "key_item_search"                  => "Buscar Artículo",
-    "key_out"                          => "Alejar",
-    "key_payment"                      => "Agregar Pago",
-    "key_print"                        => "Imprimir Página Actual",
-    "key_restore"                      => "Restaurar Pantalla/Zoom Original",
-    "key_search"                       => "Buscar Tablas de Reportes",
-    "key_suspend"                      => "Suspender Venta Actual",
-    "key_suspended"                    => "Mostrar Ventas Suspendidas",
-    "key_system"                       => "Atajos del Sistema",
-    "key_tendered"                     => "Editar Importe Licitado",
-    "key_title"                        => "Atajas de Teclado para Ventas",
-    "mc"                               => "Tarjeta Master Card",
-    "mode"                             => "Modo",
-    "must_enter_numeric"               => "Cantidad Recibida debe ser número.",
-    "must_enter_numeric_giftcard"      => "Número de Tarjeta de Regalo debe ser número.",
-    "new_customer"                     => "Cliente Nuevo",
-    "new_item"                         => "Artículo Nuevo",
-    "no_description"                   => "Ninguno",
-    "no_filter"                        => "Todos",
-    "no_items_in_cart"                 => "No hay artículos en el carrito.",
-    "no_sales_to_display"              => "No hay ventas que mostrar.",
-    "none_selected"                    => "No has seleccionado venta para borrar.",
-    "nontaxed_ind"                     => " Ventas no gravadas ",
-    "not_authorized"                   => "Esta accion no esta autorizada.",
-    "one_or_multiple"                  => "venta(s)",
-    "payment"                          => "Tipo de Pago",
-    "payment_amount"                   => "Cantidad",
-    "payment_not_cover_total"          => "La Cantidad Recibida no cubre el pago total.",
-    "payment_type"                     => "Tipo",
-    "payments"                         => "Pagos",
-    "payments_total"                   => "Pagado",
-    "price"                            => "Precio",
-    "print_after_sale"                 => "Imprimir recibo después de una venta",
-    "quantity"                         => "Cantidad",
-    "quantity_less_than_reorder_level" => "Advertencia. La cantidad deseada es insuficiente.",
-    "quantity_less_than_zero"          => "Advertencia. La cantidad deseada no tiene stock suficiente. Puedes procesar la venta pero revisa tu inventario.",
-    "quantity_of_items"                => "Cantidad de {0} articulos",
-    "quote"                            => "Cotizar",
-    "quote_number"                     => "Número de Presupuesto",
-    "quote_number_duplicate"           => "Cotizacion debe ser unico.",
-    "quote_sent"                       => "Cotizacion enviada a",
-    "quote_unsent"                     => "Cotización no se pudo enviar",
-    "receipt"                          => "Recibo de Venta",
-    "receipt_no_email"                 => "Este cliente no tiene una dirección de correo valido.",
-    "receipt_number"                   => "Venta #",
-    "receipt_sent"                     => "Recibo enviada a",
-    "receipt_unsent"                   => "Fallo el envio del recibo a",
-    "refund"                           => "Tipo de reembolso",
-    "register"                         => "Registro de Ventas",
-    "remove_customer"                  => "Borrar Cliente",
-    "remove_discount"                  => "Descuentos",
-    "return"                           => "Devolución",
-    "rewards"                          => "Puntos",
-    "rewards_balance"                  => "Balance de puntos",
-    "sale"                             => "Venta",
-    "sale_by_invoice"                  => "Venta por factura",
-    "sale_for_customer"                => "Cliente:",
-    "sale_time"                        => "Hora",
-    "sales_tax"                        => "Impuesto",
-    "sales_total"                      => "Ventas Totales",
-    "select_customer"                  => "Seleccionar Cliente",
-    "send_invoice"                     => "Enviar Factura",
-    "send_quote"                       => "Enviar Cotización",
-    "send_receipt"                     => "Enviar Recibo",
-    "send_work_order"                  => "Enviar Orden de Trabajo",
-    "serial"                           => "Serie",
-    "service_charge"                   => "Costo de Servicio",
-    "show_due"                         => "Mostrar los Importes Adeudados",
-    "show_invoice"                     => "Factura",
-    "show_receipt"                     => "Recibo",
-    "start_typing_customer_name"       => "Empieza a escribir el cliente...",
-    "start_typing_item_name"           => "Empieza a escribir o escanea el código de barras...",
-    "stock"                            => "Inventario",
-    "stock_location"                   => "Localizacion",
-    "sub_total"                        => "SubTotal",
-    "successfully_deleted"             => "Borrada satisfactoriamente",
-    "successfully_restored"            => "Restaurado satisfactoriamente",
-    "successfully_suspended_sale"      => "La venta ha sido suspendida.",
-    "successfully_updated"             => "La venta ha sido actualizada.",
-    "suspend_sale"                     => "Suspender",
-    "suspended_doc_id"                 => "Documento",
-    "suspended_sale_id"                => "Id",
-    "suspended_sales"                  => "Suspendidas",
-    "table"                            => "Datos",
-    "takings"                          => "Ventas Diarias",
-    "tax"                              => "Imp",
-    "tax_id"                           => "Identificador del Impuesto",
-    "tax_invoice"                      => "Impuesto de la Factura",
-    "tax_percent"                      => "% de Imp",
-    "taxed_ind"                        => "Ventas gravadas",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Sin impuesto",
-    "transaction_failed"               => "La transacción de venta falló.",
-    "unable_to_add_item"               => "Error al agregar artículo a la venta",
-    "unsuccessfully_deleted"           => "Ha fallado la eliminación de la Venta.",
-    "unsuccessfully_restored"          => "Restaurar Venta fallida.",
-    "unsuccessfully_suspended_sale"    => "Venta suspendida satisfactoriamente.",
-    "unsuccessfully_updated"           => "Ha fallado la actualización de la venta.",
-    "unsuspend"                        => "Retomar",
-    "unsuspend_and_delete"             => "Retomar y Borrar",
-    "update"                           => "Editar",
-    "upi"                              => "PIN UPI",
-    "visa"                             => "Tarjeta Visa",
-    "wholesale"                        => "Precio al por mayor",
-    "work_order"                       => "Orden trabajo",
-    "work_order_number"                => "Numero Orden Trabajo",
-    "work_order_number_duplicate"      => "El numero de orden de trabajo debe ser unico.",
-    "work_order_sent"                  => "Orden de trabajo enviada a",
-    "work_order_unsent"                => "Orden de trabajo fallida al enviar a",
-    "selected_customer"                => "Cliente seleccionado",
+    'account_number'                    => 'Cuenta #',
+    'add_payment'                       => 'Agregar Pago',
+    'amount_due'                        => 'Monto Adeudado',
+    'amount_due_not_covered'            => 'Los pagos no cubren el importe adeudado.',
+    'amount_tendered'                   => 'Cantidad Recibida',
+    'authorized_signature'              => 'Firma Autorizada',
+    'bank_transfer'                     => 'Transferencia Bancaria',
+    'cancel_sale'                       => 'Cancelar Venta',
+    'cash'                              => 'Efectivo',
+    'cash_1'                            => '1',
+    'cash_2'                            => '5',
+    'cash_3'                            => '10',
+    'cash_4'                            => '20',
+    'cash_adjustment'                   => 'Ajuste de Efectivo',
+    'cash_deposit'                      => 'Deposito Efectivo',
+    'cash_filter'                       => 'Efectivo',
+    'change_due'                        => 'Cambio',
+    'change_price'                      => 'Cambiar el precio de venta',
+    'check'                             => 'Cheque',
+    'check_balance'                     => 'Balance de Cheque',
+    'check_filter'                      => 'Cheque',
+    'close'                             => 'Cerrar Lista',
+    'comment'                           => 'Comentario',
+    'comments'                          => 'Comentarios',
+    'company_name'                      => 'Nombre de Comañía',
+    'complete'                          => 'Completa',
+    'complete_sale'                     => 'Completar Venta',
+    'confirm_cancel_sale'               => '¿Seguro quiere cancelar esta venta? Todos los artículos serán eliminados.',
+    'confirm_delete'                    => '¿Seguro quiere borrar las ventas seleccionadas?',
+    'confirm_restore'                   => 'Esta seguro de querer restaurar la(s) venta(s) seleccionada(s)?',
+    'credit'                            => 'Tarjeta de Crédito',
+    'credit_deposit'                    => 'Deposito Credito',
+    'credit_filter'                     => 'Tarjeta de Crédito',
+    'current_table'                     => 'Tabla Actual',
+    'customer'                          => 'cliente',
+    'customer_address'                  => 'Direccion',
+    'customer_discount'                 => 'Descuento',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Ubicacion',
+    'customer_mailchimp_status'         => 'Estado de Mailchimp',
+    'customer_optional'                 => '(Obligatorio para Pagos Vencidos)',
+    'customer_required'                 => '(Requerido)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => 'Total Gastado',
+    'customers_available_points'        => 'Puntos Disponibles',
+    'daily_sales'                       => 'Sus Ventas Diarias',
+    'date'                              => 'Fecha',
+    'date_range'                        => 'Rango de Fecha',
+    'date_required'                     => 'Una fecha correcta debe ser ingresada.',
+    'date_type'                         => 'Campo de Fecha es requerido.',
+    'debit'                             => 'Tarjeta de Débito',
+    'debit_filter'                      => 'Tarjeta de Débito',
+    'delete'                            => 'Permitir borrar',
+    'delete_confirmation'               => '¿Seguro quiere borrar esta venta? Esta acción no se puede deshacer.',
+    'delete_entire_sale'                => 'Borrar la venta completa',
+    'delete_successful'                 => 'Venta borrada correctamente.',
+    'delete_unsuccessful'               => 'Venta no borrada, fallida.',
+    'description_abbrv'                 => 'Descrp.',
+    'discard'                           => 'Descartar',
+    'discard_quote'                     => 'Descartar',
+    'discount'                          => 'Descuento',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Descuento',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Adeudado',
+    'due_filter'                        => 'Adeudado',
+    'edit'                              => 'Editar',
+    'edit_item'                         => 'Editar Artículo',
+    'edit_sale'                         => 'Editar Venta',
+    'email_receipt'                     => 'Enviar Ticket',
+    'employee'                          => 'Empleado',
+    'entry'                             => 'Entrada',
+    'error_editing_item'                => 'Error editando artículo',
+    'find_or_scan_item'                 => 'Encontrar/Escanear Artículo',
+    'find_or_scan_item_or_receipt'      => 'Encontrar/Escanear Artículo o Entrada',
+    'giftcard'                          => 'Tarjeta de Regalo',
+    'giftcard_balance'                  => 'Balance de Tarjeta de Regalo',
+    'giftcard_filter'                   => 'Tarjeta de Regalo',
+    'giftcard_number'                   => 'Número de Tarjeta de Regalo',
+    'group_by_category'                 => 'Grupo por Categoría',
+    'group_by_type'                     => 'Grupo por Tipo',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID de Venta',
+    'include_prices'                    => 'Incluir precios?',
+    'insufficient_giftcard_balance'     => 'Saldo insuficiente de tarjeta de regalo para este pago.',
+    'insufficient_reward_points'        => 'Puntos de recompensa insuficientes para este pago.',
+    'invoice'                           => 'Factura de venta',
+    'invoice_confirm'                   => 'Esta factura sera enviada a',
+    'invoice_enable'                    => 'Número de Factura',
+    'invoice_filter'                    => 'Facturas',
+    'invoice_no_email'                  => 'Este cliente no tiene un email válido.',
+    'invoice_number'                    => 'Factura #',
+    'invoice_number_duplicate'          => 'Por favor ingrese un número de factura único.',
+    'invoice_sent'                      => 'Factura enviada a',
+    'invoice_total'                     => 'Total Facturado',
+    'invoice_type_custom_invoice'       => 'Factura Personalizada',
+    'invoice_type_custom_tax_invoice'   => 'Factura de Impuesto personalizada',
+    'invoice_type_invoice'              => 'Factura',
+    'invoice_type_tax_invoice'          => 'Factura de Impuestos',
+    'invoice_unsent'                    => 'Fallo el envio de la factura a',
+    'invoice_update'                    => 'Actualizar',
+    'item_insufficient_of_stock'        => 'Cantidad insuficiente en existencia.',
+    'item_name'                         => 'Nombre del Artículo',
+    'item_number'                       => 'UPC/EAN/ISBN',
+    'item_out_of_stock'                 => 'El artículo está agotado.',
+    'key_browser'                       => 'Atajos Útiles',
+    'key_cancel'                        => 'Cancelar actual Cotización/Factura/Venta',
+    'key_customer_search'               => 'Búsqueda de Clientes',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Agregar Pago y Completar Factura/Venta',
+    'key_full'                          => 'Abrir en Pantalla Completa',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Atajos',
+    'key_help_modal'                    => 'Abrir Ventana de Atajos',
+    'key_in'                            => 'Acercar',
+    'key_item_search'                   => 'Buscar Artículo',
+    'key_out'                           => 'Alejar',
+    'key_payment'                       => 'Agregar Pago',
+    'key_print'                         => 'Imprimir Página Actual',
+    'key_restore'                       => 'Restaurar Pantalla/Zoom Original',
+    'key_search'                        => 'Buscar Tablas de Reportes',
+    'key_suspend'                       => 'Suspender Venta Actual',
+    'key_suspended'                     => 'Mostrar Ventas Suspendidas',
+    'key_system'                        => 'Atajos del Sistema',
+    'key_tendered'                      => 'Editar Importe Licitado',
+    'key_title'                         => 'Atajas de Teclado para Ventas',
+    'mc'                                => 'Tarjeta Master Card',
+    'mode'                              => 'Modo',
+    'must_enter_numeric'                => 'Cantidad Recibida debe ser número.',
+    'must_enter_numeric_giftcard'       => 'Número de Tarjeta de Regalo debe ser número.',
+    'must_enter_reference_code'         => 'Se debe ingresar el número de referencia/recuperación.',
+    'negative_amount_tendered'          => 'La cantidad recibida no puede ser negativa.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Cliente Nuevo',
+    'new_item'                          => 'Artículo Nuevo',
+    'no_description'                    => 'Ninguno',
+    'no_filter'                         => 'Todos',
+    'no_items_in_cart'                  => 'No hay artículos en el carrito.',
+    'no_sales_to_display'               => 'No hay ventas que mostrar.',
+    'none_selected'                     => 'No has seleccionado venta para borrar.',
+    'nontaxed_ind'                      => ' Ventas no gravadas ',
+    'not_authorized'                    => 'Esta accion no esta autorizada.',
+    'one_or_multiple'                   => 'venta(s)',
+    'payment'                           => 'Tipo de Pago',
+    'payment_amount'                    => 'Cantidad',
+    'payment_not_cover_total'           => 'La Cantidad Recibida no cubre el pago total.',
+    'payment_type'                      => 'Tipo',
+    'payments'                          => 'Pagos',
+    'payments_total'                    => 'Pagado',
+    'price'                             => 'Precio',
+    'print_after_sale'                  => 'Imprimir recibo después de una venta',
+    'quantity'                          => 'Cantidad',
+    'quantity_less_than_reorder_level'  => 'Advertencia. La cantidad deseada es insuficiente.',
+    'quantity_less_than_zero'           => 'Advertencia. La cantidad deseada no tiene stock suficiente. Puedes procesar la venta pero revisa tu inventario.',
+    'quantity_of_items'                 => 'Cantidad de {0} articulos',
+    'quote'                             => 'Cotizar',
+    'quote_number'                      => 'Número de Presupuesto',
+    'quote_number_duplicate'            => 'Cotizacion debe ser unico.',
+    'quote_sent'                        => 'Cotizacion enviada a',
+    'quote_unsent'                      => 'Cotización no se pudo enviar',
+    'receipt'                           => 'Recibo de Venta',
+    'receipt_no_email'                  => 'Este cliente no tiene una dirección de correo valido.',
+    'receipt_number'                    => 'Venta #',
+    'receipt_sent'                      => 'Recibo enviada a',
+    'receipt_unsent'                    => 'Fallo el envio del recibo a',
+    'reference_code'                    => 'Código de referencia de pago',
+    'reference_code_invalid_characters' => 'El código de referencia solo debe contener letras y números.',
+    'reference_code_length_error'       => 'La longitud del código de referencia no es válida.',
+    'refund'                            => 'Tipo de reembolso',
+    'register'                          => 'Registro de Ventas',
+    'remove_customer'                   => 'Borrar Cliente',
+    'remove_discount'                   => 'Descuentos',
+    'return'                            => 'Devolución',
+    'rewards'                           => 'Puntos',
+    'rewards_balance'                   => 'Balance de puntos',
+    'rewards_package'                   => 'Paquete de recompensas',
+    'rewards_remaining_balance'         => 'El remanente de puntos es ',
+    'sale'                              => 'Venta',
+    'sale_by_invoice'                   => 'Venta por factura',
+    'sale_for_customer'                 => 'Cliente:',
+    'sale_time'                         => 'Hora',
+    'sales_tax'                         => 'Impuesto',
+    'sales_total'                       => 'Ventas Totales',
+    'select_customer'                   => 'Seleccionar Cliente',
+    'selected_customer'                 => 'Cliente seleccionado',
+    'send_invoice'                      => 'Enviar Factura',
+    'send_quote'                        => 'Enviar Cotización',
+    'send_receipt'                      => 'Enviar Recibo',
+    'send_work_order'                   => 'Enviar Orden de Trabajo',
+    'serial'                            => 'Serie',
+    'service_charge'                    => 'Costo de Servicio',
+    'show_due'                          => 'Mostrar los Importes Adeudados',
+    'show_invoice'                      => 'Factura',
+    'show_receipt'                      => 'Recibo',
+    'start_typing_customer_name'        => 'Empieza a escribir el cliente...',
+    'start_typing_item_name'            => 'Empieza a escribir o escanea el código de barras...',
+    'stock'                             => 'Inventario',
+    'stock_location'                    => 'Localizacion',
+    'sub_total'                         => 'SubTotal',
+    'successfully_deleted'              => 'Borrada satisfactoriamente',
+    'successfully_restored'             => 'Restaurado satisfactoriamente',
+    'successfully_suspended_sale'       => 'La venta ha sido suspendida.',
+    'successfully_updated'              => 'La venta ha sido actualizada.',
+    'suspend_sale'                      => 'Suspender',
+    'suspended_doc_id'                  => 'Documento',
+    'suspended_sale_id'                 => 'Id',
+    'suspended_sales'                   => 'Suspendidas',
+    'table'                             => 'Datos',
+    'takings'                           => 'Ventas Diarias',
+    'tax'                               => 'Imp',
+    'tax_id'                            => 'Identificador del Impuesto',
+    'tax_invoice'                       => 'Impuesto de la Factura',
+    'tax_percent'                       => '% de Imp',
+    'taxed_ind'                         => 'Ventas gravadas',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Sin impuesto',
+    'transaction_failed'                => 'La transacción de venta falló.',
+    'unable_to_add_item'                => 'Error al agregar artículo a la venta',
+    'unsuccessfully_deleted'            => 'Ha fallado la eliminación de la Venta.',
+    'unsuccessfully_restored'           => 'Restaurar Venta fallida.',
+    'unsuccessfully_suspended_sale'     => 'Venta suspendida satisfactoriamente.',
+    'unsuccessfully_updated'            => 'Ha fallado la actualización de la venta.',
+    'unsuspend'                         => 'Retomar',
+    'unsuspend_and_delete'              => 'Retomar y Borrar',
+    'update'                            => 'Editar',
+    'upi'                               => 'PIN UPI',
+    'visa'                              => 'Tarjeta Visa',
+    'wallet'                            => 'Monedero',
+    'wholesale'                         => 'Precio al por mayor',
+    'work_order'                        => 'Orden trabajo',
+    'work_order_number'                 => 'Numero Orden Trabajo',
+    'work_order_number_duplicate'       => 'El numero de orden de trabajo debe ser unico.',
+    'work_order_sent'                   => 'Orden de trabajo enviada a',
+    'work_order_unsent'                 => 'Orden de trabajo fallida al enviar a',
 ];
diff --git a/app/Language/es-MX/Attributes.php b/app/Language/es-MX/Attributes.php
index 9a410be03..86c5792dd 100644
--- a/app/Language/es-MX/Attributes.php
+++ b/app/Language/es-MX/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "El valor del atributo no puede contener ':' or '|'",
-    "confirm_delete"                   => "¿Está seguro de eliminar el/los atributo(s) seleccionado(s)?",
-    "confirm_restore"                  => "¿Está seguro que quiere restaurar los atributos seleccionados?",
-    "definition_cannot_be_deleted"     => "No ha sido posible eliminar el/los atributo(s) seleccionado(s)",
-    "definition_error_adding_updating" => "El atributo {0} no pudo ser agregado o actualizado. Favor de revisar el registro de errorres.",
-    "definition_flags"                 => "Visibilidad del atributo",
-    "definition_group"                 => "Grupo",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Agregar Atributo",
-    "definition_name_required"         => "El nombre del atributo es un campo requerido",
-    "definition_one_or_multiple"       => "atributo(s)",
-    "definition_successful_adding"     => "Has agregado un atributo correctamente",
-    "definition_successful_deleted"    => "El atributo se ha eliminado correctamente",
-    "definition_successful_updating"   => "El atributo se ha actualizado correctamente",
-    "definition_type"                  => "Tipo de atributo",
-    "definition_type_required"         => "El tipo de atributo es un campo requerido",
-    "definition_unit"                  => "Unidad de Medida",
-    "definition_values"                => "Valores del atributo",
-    "new"                              => "Nuevo atributo",
-    "no_attributes_to_display"         => "Sin artículos para mostrar",
-    "receipt_visibility"               => "Recibo",
-    "show_in_items"                    => "Mostrar en artículos",
-    "show_in_items_visibility"         => "Artículos",
-    "show_in_receipt"                  => "Mostrar en recibo",
-    "show_in_receivings"               => "Mostrar en recepciones",
-    "show_in_receivings_visibility"    => "Recepciones",
-    "show_in_sales"                    => "Mostrar en Ventas",
-    "show_in_sales_visibility"         => "Ventas",
-    "update"                           => "Actualizar atributo",
+    'attribute_value_invalid_chars'    => 'El valor del atributo no puede contener \':\' or \'|\'',
+    'confirm_delete'                   => '¿Está seguro de eliminar el/los atributo(s) seleccionado(s)?',
+    'confirm_restore'                  => '¿Está seguro que quiere restaurar los atributos seleccionados?',
+    'definition_cannot_be_deleted'     => 'No ha sido posible eliminar el/los atributo(s) seleccionado(s)',
+    'definition_invalid_group' => 'El grupo seleccionado no existe o no es válido.',
+    'definition_error_adding_updating' => 'El atributo {0} no pudo ser agregado o actualizado. Favor de revisar el registro de errorres.',
+    'definition_flags'                 => 'Visibilidad del atributo',
+    'definition_group'                 => 'Grupo',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Agregar Atributo',
+    'definition_name_required'         => 'El nombre del atributo es un campo requerido',
+    'definition_one_or_multiple'       => 'atributo(s)',
+    'definition_successful_adding'     => 'Has agregado un atributo correctamente',
+    'definition_successful_deleted'    => 'El atributo se ha eliminado correctamente',
+    'definition_successful_updating'   => 'El atributo se ha actualizado correctamente',
+    'definition_type'                  => 'Tipo de atributo',
+    'definition_type_required'         => 'El tipo de atributo es un campo requerido',
+    'definition_unit'                  => 'Unidad de Medida',
+    'definition_values'                => 'Valores del atributo',
+    'new'                              => 'Nuevo atributo',
+    'no_attributes_to_display'         => 'Sin artículos para mostrar',
+    'receipt_visibility'               => 'Recibo',
+    'show_in_items'                    => 'Mostrar en artículos',
+    'show_in_items_visibility'         => 'Artículos',
+    'show_in_receipt'                  => 'Mostrar en recibo',
+    'show_in_receivings'               => 'Mostrar en recepciones',
+    'show_in_receivings_visibility'    => 'Recepciones',
+    'show_in_sales'                    => 'Mostrar en Ventas',
+    'show_in_sales_visibility'         => 'Ventas',
+    'show_in_search'                   => 'Mostrar en búsqueda',
+    'show_in_search_visibility'        => 'Búsqueda',
+    'update'                           => 'Actualizar atributo',
 ];
diff --git a/app/Language/es-MX/Bootstrap_tables.php b/app/Language/es-MX/Bootstrap_tables.php
index ca01e7179..75c656782 100644
--- a/app/Language/es-MX/Bootstrap_tables.php
+++ b/app/Language/es-MX/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Todos",
-    "columns"              => "Columnas",
-    "hide_show_pagination" => "Ocultar/Mostrar paginación",
-    "loading"              => "Cargando, por favor espere...",
-    "page_from_to"         => "Mostrando de {0} a {1} de {2} registros",
-    "refresh"              => "Actualizar",
-    "rows_per_page"        => "{0} registros por página",
-    "toggle"               => "Establecer",
+    'all' => "Todos",
+    'columns' => "Columnas",
+    'hide_show_pagination' => "Ocultar/Mostrar paginación",
+    'loading' => "Cargando, por favor espere",
+    'page_from_to' => "Mostrando de {0} a {1} de {2} registros",
+    'refresh' => "Actualizar",
+    'rows_per_page' => "{0} registros por página",
+    'toggle' => "Establecer",
 ];
diff --git a/app/Language/es-MX/Calendar.php b/app/Language/es-MX/Calendar.php
new file mode 100644
index 000000000..e58476325
--- /dev/null
+++ b/app/Language/es-MX/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "Do",
+    "mo"        => "Lu",
+    "tu"        => "Ma",
+    "we"        => "Mi",
+    "th"        => "Ju",
+    "fr"        => "Vi",
+    "sa"        => "Sá",
+    "sun"       => "Dom",
+    "mon"       => "Lun",
+    "tue"       => "Mar",
+    "wed"       => "Mié",
+    "thu"       => "Jue",
+    "fri"       => "Vie",
+    "sat"       => "Sáb",
+    "sunday"    => "Domingo",
+    "monday"    => "Lunes",
+    "tuesday"   => "Martes",
+    "wednesday" => "Miércoles",
+    "thursday"  => "Jueves",
+    "friday"    => "Viernes",
+    "saturday"  => "Sábado",
+    "jan"       => "Ene",
+    "feb"       => "Feb",
+    "mar"       => "Mar",
+    "apr"       => "Abr",
+    "may"       => "May",
+    "jun"       => "Jun",
+    "jul"       => "Jul",
+    "aug"       => "Ago",
+    "sep"       => "Sep",
+    "oct"       => "Oct",
+    "nov"       => "Nov",
+    "dec"       => "Dic",
+    "january"   => "Enero",
+    "february"  => "Febrero",
+    "march"     => "Marzo",
+    "april"     => "Abril",
+    "mayl"      => "Mayo",
+    "june"      => "Junio",
+    "july"      => "Julio",
+    "august"    => "Agosto",
+    "september" => "Septiembre",
+    "october"   => "Octubre",
+    "november"  => "Noviembre",
+    "december"  => "Diciembre",
+];
\ No newline at end of file
diff --git a/app/Language/es-MX/Config.php b/app/Language/es-MX/Config.php
index 5884086ae..987f62a8e 100644
--- a/app/Language/es-MX/Config.php
+++ b/app/Language/es-MX/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Dirección de la Empresa",
-    "address_required"                          => "La Dirección de la Empresa es un campo requerido.",
-    "all_set"                                   => "Todos los permisos han sido establecidos correctamente!",
-    "allow_duplicate_barcodes"                  => "Permitir Códigos de Barra Duplicados",
-    "apostrophe"                                => "apostrofé",
-    "backup_button"                             => "Respaldar",
-    "backup_database"                           => "Respaldar Base de Datos",
-    "barcode"                                   => "Código de Barras",
-    "barcode_company"                           => "Nombre de la Empresa",
-    "barcode_configuration"                     => "Configuración del Código de Barras",
-    "barcode_content"                           => "Contenido del Código de Barras",
-    "barcode_first_row"                         => "Fila 1",
-    "barcode_font"                              => "Tipo de Letra",
-    "barcode_formats"                           => "Formatos de Entrada",
-    "barcode_generate_if_empty"                 => "Generar si está vacío.",
-    "barcode_height"                            => "Alto (px)",
-    "barcode_id"                                => "Id Artículo/Nombre",
-    "barcode_info"                              => "Información de Configuración para Códigos de Barras",
-    "barcode_layout"                            => "Formato Código de Barras",
-    "barcode_name"                              => "Nombre",
-    "barcode_number"                            => "Código de Barras",
-    "barcode_number_in_row"                     => "Número en renglón",
-    "barcode_page_cellspacing"                  => "Mostrar espaciado de celda de la página.",
-    "barcode_page_width"                        => "Ancho de página",
-    "barcode_price"                             => "Precio",
-    "barcode_second_row"                        => "Renglón 2",
-    "barcode_third_row"                         => "Renglón 3",
-    "barcode_tooltip"                           => "Advertencia: Esta función puede hacer que se importen o creen elementos duplicados. No lo use si no desea códigos de barras duplicados.",
-    "barcode_type"                              => "Tipo de código de barras",
-    "barcode_width"                             => "Ancho (px)",
-    "bottom"                                    => "Final",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "decimales en efectivo",
-    "cash_decimals_tooltip"                     => "Si los decimales son iguales entonces no tendrá redondeo.",
-    "cash_rounding"                             => "Redondeo de efectivo",
-    "category_dropdown"                         => "Mostrar categoría como un menú desplegable",
-    "center"                                    => "Centro",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "coma",
-    "company"                                   => "Nombre de la Compañía",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Cambiar Imagen",
-    "company_logo"                              => "Logo de la Compañía",
-    "company_remove_image"                      => "Eliminar Imagen",
-    "company_required"                          => "Nombre de la compañia es un campo requerido",
-    "company_select_image"                      => "Seleccionar Imagen",
-    "company_website_url"                       => "Website de la compañía no es una URL valida (http://...).",
-    "country_codes"                             => "Códigos de Países",
-    "country_codes_tooltip"                     => "Lista separada por comas de códigos de países para la búsqueda de direcciones nominatim.",
-    "currency_code"                             => "código de moneda",
-    "currency_decimals"                         => "Decimales de moneda",
-    "currency_symbol"                           => "Símbolo de moneda",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Recompensa",
-    "customer_reward_duplicate"                 => "Recompensa debe ser única.",
-    "customer_reward_enable"                    => "Habilita recompensas para los clientes",
-    "customer_reward_invalid_chars"             => "Recompensa no debe tener '_'",
-    "customer_reward_required"                  => "Recompensa es un campo requerido",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Filtro Fecha y Hora",
-    "datetimeformat"                            => "Formato de Fecha y Hora",
-    "decimal_point"                             => "Punto Decimal",
-    "default_barcode_font_size_number"          => "El tamaño de fuente del código de barras predeterminado debe ser un número.",
-    "default_barcode_font_size_required"        => "El tamaño de fuente predeterminado del código de barras es un campo obligatorio.",
-    "default_barcode_height_number"             => "La altura predeterminada del código de barras debe ser un número.",
-    "default_barcode_height_required"           => "La altura predeterminada del código de barras es un campo obligatorio.",
-    "default_barcode_num_in_row_number"         => "El número de código de barras predeterminado en la fila debe ser un número.",
-    "default_barcode_num_in_row_required"       => "El número de código de barras predeterminado en la fila es un campo obligatorio.",
-    "default_barcode_page_cellspacing_number"   => "El espacio entre celdas predeterminado de la página de código de barras debe ser un número.",
-    "default_barcode_page_cellspacing_required" => "El espaciado entre celdas de página de código de barras predeterminado es un campo obligatorio.",
-    "default_barcode_page_width_number"         => "La anchura del código de barras debe ser un número.",
-    "default_barcode_page_width_required"       => "El ancho predeterminado del código de barras es un campo obligatorio.",
-    "default_barcode_width_number"              => "El Ancho del código de barra debe ser un número.",
-    "default_barcode_width_required"            => "El ancho predeterminado del código de barras es un campo obligatorio.",
-    "default_item_columns"                      => "Número de artículos por columna predeterminado",
-    "default_origin_tax_code"                   => "Código de Impuesto predeterminado",
-    "default_receivings_discount"               => "Descuentos de recibos predeterminados",
-    "default_receivings_discount_number"        => "Descuentos de recibos deben ser números.",
-    "default_receivings_discount_required"      => "Descuentos de recibos es un campo requerido.",
-    "default_sales_discount"                    => "% Descuentos en ventas",
-    "default_sales_discount_number"             => "El descuento predeterminado debe ser un número.",
-    "default_sales_discount_required"           => "Descuento de Ventas por Defecto es un campo requerido.",
-    "default_tax_category"                      => "Categoría de Impuesto Predeterminada",
-    "default_tax_code"                          => "Código de Impuesto Predeterminado",
-    "default_tax_jurisdiction"                  => "Jurisdicción de Impuesto Predeterminada",
-    "default_tax_name_number"                   => "Nombre de Impuesto Predeterminado debe ser una cadena de texto.",
-    "default_tax_name_required"                 => "Nombre de Impuesto Predeterminado es un campo requerido.",
-    "default_tax_rate"                          => "Tasa impositiva predeterminada %",
-    "default_tax_rate_1"                        => "Tasa de Impuestos 1",
-    "default_tax_rate_2"                        => "Tasa de Impuestos 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "La tasa impositiva predeterminada debe ser un número.",
-    "default_tax_rate_required"                 => "Tasa de impuestos predeterminada es un campo obligatorio.",
-    "derive_sale_quantity"                      => "Permitir cantidad de venta derivada",
-    "derive_sale_quantity_tooltip"              => "Si se marca, se proporcionará un nuevo tipo de artículo para los artículos pedidos por cantidad extendida",
-    "dinner_table"                              => "Mesa",
-    "dinner_table_duplicate"                    => "La tabla debe ser única.",
-    "dinner_table_enable"                       => "Habilitar Mesa de Alimentos",
-    "dinner_table_invalid_chars"                => "El nombre de la tabla no puede llevar '_'.",
-    "dinner_table_required"                     => "Tabla es requerida.",
-    "dot"                                       => "punto(.)",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Configuración Email",
-    "email_mailpath"                            => "Ruta a Sendmail",
-    "email_protocol"                            => "Protocolo",
-    "email_receipt_check_behaviour"             => "Email Receipt checkbox",
-    "email_receipt_check_behaviour_always"      => "Siempre selecionado",
-    "email_receipt_check_behaviour_last"        => "Recuerda la última selección",
-    "email_receipt_check_behaviour_never"       => "Núnca seleccionado",
-    "email_smtp_crypto"                         => "Encriptación SMTP",
-    "email_smtp_host"                           => "Servidor SMTP",
-    "email_smtp_pass"                           => "Contraseña del Servidor SMTP",
-    "email_smtp_port"                           => "Puerto del Servidor SMTP",
-    "email_smtp_timeout"                        => "Expiró Tiempo de Espera del Servidor SMTP",
-    "email_smtp_user"                           => "Nombre de Usuario del Servidor SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Enforce privacy",
-    "enforce_privacy_tooltip"                   => "Protect Customers privacy enforcing data scrambling in case of their data being deleted",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "Hay problemas con los permisos de archivo, por favor corríjalos y recargue esta página.",
-    "financial_year"                            => "Inicio del Año Fiscal",
-    "financial_year_apr"                        => "1.º de Abril",
-    "financial_year_aug"                        => "1.º de Agosto",
-    "financial_year_dec"                        => "1.º de Diciembre",
-    "financial_year_feb"                        => "1.º de Febrero",
-    "financial_year_jan"                        => "1.º de Enero",
-    "financial_year_jul"                        => "1.º de Julio",
-    "financial_year_jun"                        => "1.º de Junio",
-    "financial_year_mar"                        => "1.º de Marzo",
-    "financial_year_may"                        => "1.º de Mayo",
-    "financial_year_nov"                        => "1.º de Noviembre",
-    "financial_year_oct"                        => "1.º de Octubre",
-    "financial_year_sep"                        => "1º. de Septiembre",
-    "floating_labels"                           => "Etiquetas Flotantes",
-    "gcaptcha_enable"                           => "reCAPTCHA de Página de Ingreso",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Llave Secreta es un campo requerido",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "Tipo de archivos permitidos",
-    "image_max_height_tooltip"                  => "Altura máxima permitida de imágenes en píxeles (px).",
-    "image_max_size_tooltip"                    => "Tamaño máximo permitido de archivo de imágenes en kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Ancho máximo permitido para imágenes en píxeles (px).",
-    "image_restrictions"                        => "Restricciones de carga de imágenes",
-    "include_hsn"                               => "Include Support for HSN Codes",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "Grupos de Entrada",
-    "integrations"                              => "Integraciones",
-    "integrations_configuration"                => "Integraciones Externas",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "Invoice Type",
-    "is_readable"                               => "es legible, pero los permisos están configurados incorrectamente. Configúrelo en 640 o 660 y actualice.",
-    "is_writable"                               => "se puede escribir, pero los permisos están configurados incorrectamente. Configúrelo en 750 y actualice.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "Lines per Page must be a number.",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Localization Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "Estilo de formulario de inicio de sesión",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp Clave API",
-    "mailchimp_configuration"                   => "Configuración de MailChimp",
-    "mailchimp_key_successfully"                => "API Key is valid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
-    "mailchimp_lists"                           => "Lista (s) de MailChimp",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "Multiple Packages per Item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "Zona horaria OSPOS:",
-    "ospos_info"                                => "Información de instalación OSPOS",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Los permisos incorrectos ponen en riesgo este software.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
-    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
-    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
-    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Left must be a number.",
-    "print_left_margin_required"                => "Margin Left is a required field.",
-    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
-    "print_receipt_check_behaviour_always"      => "Always checked",
-    "print_receipt_check_behaviour_last"        => "Remember last selection",
-    "print_receipt_check_behaviour_never"       => "Always unchecked",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Right must be a number.",
-    "print_right_margin_required"               => "Margin Right is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Top must be a number.",
-    "print_top_margin_required"                 => "Margin Top is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Default Quote Comments",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "Mostrar indicador de impuestos",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Calcular promedio, Precio (Recepción)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "Reportar un problema",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Ubicación del inventario",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "The entered tax category already exists.",
-    "tax_category_invalid_chars"                => "The entered tax category is invalid.",
-    "tax_category_required"                     => "The tax category is required.",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "Tax Id",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "Vista Previa del Tema:",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "La zona horaria de OSPOS es diferente a su zona horaria local.",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Use Destination Based Tax",
-    "user_timezone"                             => "Zona horaria local:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'Dirección de la Empresa',
+    'address_required'                          => 'La Dirección de la Empresa es un campo requerido.',
+    'all_set'                                   => 'Todos los permisos han sido establecidos correctamente!',
+    'allow_duplicate_barcodes'                  => 'Permitir Códigos de Barra Duplicados',
+    'apostrophe'                                => 'apostrofé',
+    'backup_button'                             => 'Respaldar',
+    'backup_database'                           => 'Respaldar Base de Datos',
+    'barcode'                                   => 'Código de Barras',
+    'barcode_company'                           => 'Nombre de la Empresa',
+    'barcode_configuration'                     => 'Configuración del Código de Barras',
+    'barcode_content'                           => 'Contenido del Código de Barras',
+    'barcode_first_row'                         => 'Fila 1',
+    'barcode_font'                              => 'Tipo de Letra',
+    'barcode_formats'                           => 'Formatos de Entrada',
+    'barcode_generate_if_empty'                 => 'Generar si está vacío.',
+    'barcode_height'                            => 'Alto (px)',
+    'barcode_id'                                => 'Id Artículo/Nombre',
+    'barcode_info'                              => 'Información de Configuración para Códigos de Barras',
+    'barcode_layout'                            => 'Formato Código de Barras',
+    'barcode_name'                              => 'Nombre',
+    'barcode_number'                            => 'Código de Barras',
+    'barcode_number_in_row'                     => 'Número en renglón',
+    'barcode_page_cellspacing'                  => 'Mostrar espaciado de celda de la página.',
+    'barcode_page_width'                        => 'Ancho de página',
+    'barcode_price'                             => 'Precio',
+    'barcode_second_row'                        => 'Renglón 2',
+    'barcode_third_row'                         => 'Renglón 3',
+    'barcode_tooltip'                           => 'Advertencia: Esta función puede hacer que se importen o creen elementos duplicados. No lo use si no desea códigos de barras duplicados.',
+    'barcode_type'                              => 'Tipo de código de barras',
+    'barcode_width'                             => 'Ancho (px)',
+    'bottom'                                    => 'Final',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'decimales en efectivo',
+    'cash_decimals_tooltip'                     => 'Si los decimales son iguales entonces no tendrá redondeo.',
+    'cash_rounding'                             => 'Redondeo de efectivo',
+    'category_dropdown'                         => 'Mostrar categoría como un menú desplegable',
+    'center'                                    => 'Centro',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'coma',
+    'company'                                   => 'Nombre de la Compañía',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Cambiar Imagen',
+    'company_logo'                              => 'Logo de la Compañía',
+    'company_remove_image'                      => 'Eliminar Imagen',
+    'company_required'                          => 'Nombre de la compañia es un campo requerido',
+    'company_select_image'                      => 'Seleccionar Imagen',
+    'company_website_url'                       => 'Website de la compañía no es una URL valida (http://...).',
+    'country_codes'                             => 'Códigos de Países',
+    'country_codes_tooltip'                     => 'Lista separada por comas de códigos de países para la búsqueda de direcciones nominatim.',
+    'currency_code'                             => 'código de moneda',
+    'currency_decimals'                         => 'Decimales de moneda',
+    'currency_symbol'                           => 'Símbolo de moneda',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Recompensa',
+    'customer_reward_duplicate'                 => 'Recompensa debe ser única.',
+    'customer_reward_enable'                    => 'Habilita recompensas para los clientes',
+    'customer_reward_invalid_chars'             => "Recompensa no debe tener '_'",
+    'customer_reward_required'                  => 'Recompensa es un campo requerido',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Filtro Fecha y Hora',
+    'datetimeformat'                            => 'Formato de Fecha y Hora',
+    'decimal_point'                             => 'Punto Decimal',
+    'default_barcode_font_size_number'          => 'El tamaño de fuente del código de barras predeterminado debe ser un número.',
+    'default_barcode_font_size_required'        => 'El tamaño de fuente predeterminado del código de barras es un campo obligatorio.',
+    'default_barcode_height_number'             => 'La altura predeterminada del código de barras debe ser un número.',
+    'default_barcode_height_required'           => 'La altura predeterminada del código de barras es un campo obligatorio.',
+    'default_barcode_num_in_row_number'         => 'El número de código de barras predeterminado en la fila debe ser un número.',
+    'default_barcode_num_in_row_required'       => 'El número de código de barras predeterminado en la fila es un campo obligatorio.',
+    'default_barcode_page_cellspacing_number'   => 'El espacio entre celdas predeterminado de la página de código de barras debe ser un número.',
+    'default_barcode_page_cellspacing_required' => 'El espaciado entre celdas de página de código de barras predeterminado es un campo obligatorio.',
+    'default_barcode_page_width_number'         => 'La anchura del código de barras debe ser un número.',
+    'default_barcode_page_width_required'       => 'El ancho predeterminado del código de barras es un campo obligatorio.',
+    'default_barcode_width_number'              => 'El Ancho del código de barra debe ser un número.',
+    'default_barcode_width_required'            => 'El ancho predeterminado del código de barras es un campo obligatorio.',
+    'default_item_columns'                      => 'Número de artículos por columna predeterminado',
+    'default_origin_tax_code'                   => 'Código de Impuesto predeterminado',
+    'default_receivings_discount'               => 'Descuentos de recibos predeterminados',
+    'default_receivings_discount_number'        => 'Descuentos de recibos deben ser números.',
+    'default_receivings_discount_required'      => 'Descuentos de recibos es un campo requerido.',
+    'default_sales_discount'                    => '% Descuentos en ventas',
+    'default_sales_discount_number'             => 'El descuento predeterminado debe ser un número.',
+    'default_sales_discount_required'           => 'Descuento de Ventas por Defecto es un campo requerido.',
+    'default_tax_category'                      => 'Categoría de Impuesto Predeterminada',
+    'default_tax_code'                          => 'Código de Impuesto Predeterminado',
+    'default_tax_jurisdiction'                  => 'Jurisdicción de Impuesto Predeterminada',
+    'default_tax_name_number'                   => 'Nombre de Impuesto Predeterminado debe ser una cadena de texto.',
+    'default_tax_name_required'                 => 'Nombre de Impuesto Predeterminado es un campo requerido.',
+    'default_tax_rate'                          => 'Tasa impositiva predeterminada %',
+    'default_tax_rate_1'                        => 'Tasa de Impuestos 1',
+    'default_tax_rate_2'                        => 'Tasa de Impuestos 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'La tasa impositiva predeterminada debe ser un número.',
+    'default_tax_rate_required'                 => 'Tasa de impuestos predeterminada es un campo obligatorio.',
+    'derive_sale_quantity'                      => 'Permitir cantidad de venta derivada',
+    'derive_sale_quantity_tooltip'              => 'Si se marca, se proporcionará un nuevo tipo de artículo para los artículos pedidos por cantidad extendida',
+    'dinner_table'                              => 'Mesa',
+    'dinner_table_duplicate'                    => 'La tabla debe ser única.',
+    'dinner_table_enable'                       => 'Habilitar Mesa de Alimentos',
+    'dinner_table_invalid_chars'                => "El nombre de la tabla no puede llevar '_'.",
+    'dinner_table_required'                     => 'Tabla es requerida.',
+    'dot'                                       => 'punto(.)',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Configuración Email',
+    'email_mailpath'                            => 'Ruta a Sendmail',
+    'email_protocol'                            => 'Protocolo',
+    'email_receipt_check_behaviour'             => 'Email Receipt checkbox',
+    'email_receipt_check_behaviour_always'      => 'Siempre selecionado',
+    'email_receipt_check_behaviour_last'        => 'Recuerda la última selección',
+    'email_receipt_check_behaviour_never'       => 'Núnca seleccionado',
+    'email_smtp_crypto'                         => 'Encriptación SMTP',
+    'email_smtp_host'                           => 'Servidor SMTP',
+    'email_smtp_pass'                           => 'Contraseña del Servidor SMTP',
+    'email_smtp_port'                           => 'Puerto del Servidor SMTP',
+    'email_smtp_timeout'                        => 'Expiró Tiempo de Espera del Servidor SMTP',
+    'email_smtp_user'                           => 'Nombre de Usuario del Servidor SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Enforce privacy',
+    'enforce_privacy_tooltip'                   => 'Protect Customers privacy enforcing data scrambling in case of their data being deleted',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'Hay problemas con los permisos de archivo, por favor corríjalos y recargue esta página.',
+    'financial_year'                            => 'Inicio del Año Fiscal',
+    'financial_year_apr'                        => '1.º de Abril',
+    'financial_year_aug'                        => '1.º de Agosto',
+    'financial_year_dec'                        => '1.º de Diciembre',
+    'financial_year_feb'                        => '1.º de Febrero',
+    'financial_year_jan'                        => '1.º de Enero',
+    'financial_year_jul'                        => '1.º de Julio',
+    'financial_year_jun'                        => '1.º de Junio',
+    'financial_year_mar'                        => '1.º de Marzo',
+    'financial_year_may'                        => '1.º de Mayo',
+    'financial_year_nov'                        => '1.º de Noviembre',
+    'financial_year_oct'                        => '1.º de Octubre',
+    'financial_year_sep'                        => '1º. de Septiembre',
+    'floating_labels'                           => 'Etiquetas Flotantes',
+    'gcaptcha_enable'                           => 'reCAPTCHA de Página de Ingreso',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Llave Secreta es un campo requerido',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => 'Tipo de archivos permitidos',
+    'image_max_height_tooltip'                  => 'Altura máxima permitida de imágenes en píxeles (px).',
+    'image_max_size_tooltip'                    => 'Tamaño máximo permitido de archivo de imágenes en kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Ancho máximo permitido para imágenes en píxeles (px).',
+    'image_restrictions'                        => 'Restricciones de carga de imágenes',
+    'include_hsn'                               => 'Include Support for HSN Codes',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Store Information',
+    'input_groups'                              => 'Grupos de Entrada',
+    'integrations'                              => 'Integraciones',
+    'integrations_configuration'                => 'Integraciones Externas',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => 'Invoice Type',
+    'is_readable'                               => 'es legible, pero los permisos están configurados incorrectamente. Configúrelo en 640 o 660 y actualice.',
+    'is_writable'                               => 'se puede escribir, pero los permisos están configurados incorrectamente. Configúrelo en 750 y actualice.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines per Page',
+    'lines_per_page_number'                     => 'Lines per Page must be a number.',
+    'lines_per_page_required'                   => 'Lines per Page is a required field.',
+    'locale'                                    => 'Localization',
+    'locale_configuration'                      => 'Localization Configuration',
+    'locale_info'                               => 'Localization Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => 'Estilo de formulario de inicio de sesión',
+    'logout'                                    => 'Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp Clave API',
+    'mailchimp_configuration'                   => 'Configuración de MailChimp',
+    'mailchimp_key_successfully'                => 'API Key is valid.',
+    'mailchimp_key_unsuccessfully'              => 'API Key is invalid.',
+    'mailchimp_lists'                           => 'Lista (s) de MailChimp',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here, otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => 'Multiple Packages per Item',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localization',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a valid locale.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => 'Zona horaria OSPOS:',
+    'ospos_info'                                => 'Información de instalación OSPOS',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Código de referencia de pago<br>Límites de longitud',
+    'payment_reference_code_length_max_label'   => 'Máx',
+    'payment_reference_code_length_min_label'   => 'Mín',
+    'perm_risk'                                 => 'Los permisos incorrectos ponen en riesgo este software.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Phone is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Margin Bottom must be a number.',
+    'print_bottom_margin_required'              => 'Margin Bottom is a required field.',
+    'print_delay_autoreturn'                    => 'Autoreturn to Sale delay',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Margin Left must be a number.',
+    'print_left_margin_required'                => 'Margin Left is a required field.',
+    'print_receipt_check_behaviour'             => 'Print Receipt checkbox',
+    'print_receipt_check_behaviour_always'      => 'Always checked',
+    'print_receipt_check_behaviour_last'        => 'Remember last selection',
+    'print_receipt_check_behaviour_never'       => 'Always unchecked',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Margin Right must be a number.',
+    'print_right_margin_required'               => 'Margin Right is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Margin Top must be a number.',
+    'print_top_margin_required'                 => 'Margin Top is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Default Quote Comments',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => 'Mostrar indicador de impuestos',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Calcular promedio, Precio (Recepción)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => 'Reportar un problema',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'Ruta de sendmail inválida. Solo se permiten letras, números, guiones, guiones bajos, diagonales, diagonales invertidas, dos puntos, espacios y puntos.',
+    'saved_successfully'                        => 'Configuration save successful.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Ubicación del inventario',
+    'stock_location_duplicate'                  => 'Stock Location must be unique.',
+    'stock_location_invalid_chars'              => "Stock Location can not contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 2',
+    'suggestions_third_column'                  => 'Column 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Receipt Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => 'The entered tax category already exists.',
+    'tax_category_invalid_chars'                => 'The entered tax category is invalid.',
+    'tax_category_required'                     => 'The tax category is required.',
+    'tax_category_used'                         => 'Tax category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Tax Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => 'Tax Id',
+    'tax_included'                              => 'Tax Included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => 'Vista Previa del Tema:',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => 'La zona horaria de OSPOS es diferente a su zona horaria local.',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => 'Use Destination Based Tax',
+    'user_timezone'                             => 'Zona horaria local:',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/es-MX/Employees.php b/app/Language/es-MX/Employees.php
index 75ccd20ce..93ce49138 100644
--- a/app/Language/es-MX/Employees.php
+++ b/app/Language/es-MX/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Información",
-    "cannot_be_deleted"            => "No se puede borrar los empleados seleccionados, uno o más de ellos tienen ventas registradas ó intentas borrar tu propia cuenta.",
-    "change_employee"              => "",
-    "change_password"              => "Cambiar contraseña",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "¿Estás seguro que deseas borrar los empleados seleccionados?",
-    "confirm_restore"              => "¿Estás seguro que deseas restaurar los empleados seleccionados?",
-    "current_password"             => "Contraseña Actual",
-    "current_password_invalid"     => "La contraseña actual es inválida.",
-    "employee"                     => "Empleado",
-    "error_adding_updating"        => "Agregar ó Actualizar empleado ha fallado.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "No puede borrar el usuario demo de administrador.",
-    "error_updating_demo_admin"    => "No puede cambiar el usuario demo de administrador.",
-    "language"                     => "Idioma",
-    "login_info"                   => "Iniciar sesión",
-    "manager"                      => "",
-    "new"                          => "Nuevo Empleado",
-    "none_selected"                => "No ha seleccionado empleados a borrar.",
-    "one_or_multiple"              => "Empleado(s)",
-    "password"                     => "Contraseña",
-    "password_minlength"           => "La contraseña debe tener por lo menos 8 letras.",
-    "password_must_match"          => "Las contraseñas no coinciden.",
-    "password_not_must_match"      => "La contraseña actual y nueva contraseña deben ser distintas.",
-    "password_required"            => "Se requiere contraseña.",
-    "permission_desc"              => "Selecciona las casillas para otorgar acceso a los módulos.",
-    "permission_info"              => "Permisos",
-    "repeat_password"              => "Contraseña otra vez",
-    "subpermission_required"       => "Concede por lo menos un permiso para cada módulo.",
-    "successful_adding"            => "Empleado agregado exitosamente.",
-    "successful_change_password"   => "Cambio de contraseña exitoso.",
-    "successful_deleted"           => "Se ha borrado correctamente",
-    "successful_updating"          => "Empleado actualizado exitosamente",
-    "system_language"              => "Idioma del sistema",
-    "unsuccessful_change_password" => "El cambio de contraseña ha fallado.",
-    "update"                       => "Actualizar Empleado",
-    "username"                     => "Nombre de Usuario",
-    "username_duplicate"           => "El usuario del empleado ya esta en uso. Favor de escoger otro.",
-    "username_minlength"           => "Nombre de usuario debe tener por lo menos 5 letras.",
-    "username_required"            => "Es necesario el nombre de usuario.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Información',
+    'cannot_be_deleted'                      => 'No se puede borrar los empleados seleccionados, uno o más de ellos tienen ventas registradas ó intentas borrar tu propia cuenta.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Cambiar contraseña',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '¿Estás seguro que deseas borrar los empleados seleccionados?',
+    'confirm_restore'                        => '¿Estás seguro que deseas restaurar los empleados seleccionados?',
+    'current_password'                       => 'Contraseña Actual',
+    'current_password_invalid'               => 'La contraseña actual es inválida.',
+    'employee'                               => 'Empleado',
+    'error_adding_updating'                  => 'Agregar ó Actualizar empleado ha fallado.',
+    'error_cannot_remove_own_minimum_grant'  => 'No puede eliminar sus propios permisos mínimos de acceso a módulos.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'No puede borrar el usuario demo de administrador.',
+    'error_grant_change_disallowed'          => 'Los cambios de permisos están deshabilitados en esta demo.',
+    'error_password_change_disallowed'       => 'Los cambios de contraseña están deshabilitados en esta demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'No puede cambiar el usuario demo de administrador.',
+    'language'                               => 'Idioma',
+    'login_info'                             => 'Iniciar sesión',
+    'manager'                                => '',
+    'new'                                    => 'Nuevo Empleado',
+    'none_selected'                          => 'No ha seleccionado empleados a borrar.',
+    'one_or_multiple'                        => 'Empleado(s)',
+    'password'                               => 'Contraseña',
+    'password_minlength'                     => 'La contraseña debe tener por lo menos 8 letras.',
+    'password_must_match'                    => 'Las contraseñas no coinciden.',
+    'password_not_must_match'                => 'La contraseña actual y nueva contraseña deben ser distintas.',
+    'password_required'                      => 'Se requiere contraseña.',
+    'permission_desc'                        => 'Selecciona las casillas para otorgar acceso a los módulos.',
+    'permission_info'                        => 'Permisos',
+    'repeat_password'                        => 'Contraseña otra vez',
+    'subpermission_required'                 => 'Concede por lo menos un permiso para cada módulo.',
+    'successful_adding'                      => 'Empleado agregado exitosamente.',
+    'successful_change_password'             => 'Cambio de contraseña exitoso.',
+    'successful_deleted'                     => 'Se ha borrado correctamente',
+    'successful_updating'                    => 'Empleado actualizado exitosamente',
+    'system_language'                        => 'Idioma del sistema',
+    'unsuccessful_change_password'           => 'El cambio de contraseña ha fallado.',
+    'update'                                 => 'Actualizar Empleado',
+    'username'                               => 'Nombre de Usuario',
+    'username_duplicate'                     => 'El usuario del empleado ya esta en uso. Favor de escoger otro.',
+    'username_minlength'                     => 'Nombre de usuario debe tener por lo menos 5 letras.',
+    'username_required'                      => 'Es necesario el nombre de usuario.',
 ];
diff --git a/app/Language/es-MX/Error.php b/app/Language/es-MX/Error.php
index c93630786..c477ea08e 100644
--- a/app/Language/es-MX/Error.php
+++ b/app/Language/es-MX/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "No tienes permiso para acceder el módulo llamado",
-    "unknown"              => "Error inesperado",
+    'no_permission_module'           => 'No tienes permiso para acceder el módulo llamado',
+    'unable_to_create_env_file'      => 'No se pudo crear {filePath} para aprovisionar throttle.key',
+    'unable_to_lock_file'            => 'No se pudo bloquear {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'No se pudo abrir {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'No se pudo guardar throttle.key en {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'No se pudo leer {filePath} para aprovisionar throttle.key',
+    'unknown'                        => 'Error inesperado',
 ];
diff --git a/app/Language/es-MX/Items.php b/app/Language/es-MX/Items.php
index 12e1653db..99e38aa17 100644
--- a/app/Language/es-MX/Items.php
+++ b/app/Language/es-MX/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventario a agregar o disminuir.",
-    "allow_alt_description"              => "Permitir Descripción Alternativa",
-    "amount_entry"                       => "Ingrese Cantidad",
-    "bulk_edit"                          => "Edición Masiva",
-    "buy_price_required"                 => "Precio de Compra es un campo requerido.",
-    "cannot_be_deleted"                  => "No se puede borrar el item(s) seleccionado, uno a mas de los items seleccionados tienen ventas.",
-    "cannot_find_item"                   => "Articulo no encontrado.",
-    "categories"                         => "",
-    "category"                           => "Categoría",
-    "category_new"                       => "",
-    "category_required"                  => "Categoría es un campo requerido.",
-    "change_all_to_allow_alt_desc"       => "Permitir Descripción Alternativa para todo.",
-    "change_all_to_not_allow_allow_desc" => "No permitir Descripción Alternativa para todo.",
-    "change_all_to_serialized"           => "Cambiar todo a Serializado",
-    "change_all_to_unserialized"         => "Cambiar todo a No-Serializado",
-    "change_image"                       => "Cambiar Imagen",
-    "confirm_bulk_edit"                  => "¿Esta seguro que quiere editar los artículos seleccionados?",
-    "confirm_bulk_edit_wipe_taxes"       => "Toda la información de Impuestos de los Artículos será reemplazada.",
-    "confirm_delete"                     => "¿Esta seguro que quiere eliminar los artículos seleccionados?",
-    "confirm_restore"                    => "¿Esta seguro de restaurar los articulos seleccionado?",
-    "cost_price"                         => "Precio mayoreo.",
-    "cost_price_number"                  => "El precio de mayoreo debe ser números.",
-    "cost_price_required"                => "El precio de mayoreo es requerido.",
-    "count"                              => "Actualizar inventario",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "Cantidad actual",
-    "default_pack_name"                  => "",
-    "description"                        => "Descripción",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "Edición de varios elementos",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "Inventario",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Comentarios",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "Fecha",
-    "inventory_employee"                 => "Empleado",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "el articulo tiene número de serie",
-    "item"                               => "Articulo",
-    "item_id"                            => "",
-    "item_number"                        => "Código de barras",
-    "item_number_duplicate"              => "El código del artículo ya está presente en la base de datos.",
-    "kit"                                => "Kit",
-    "location"                           => "Ubicación",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "Nuevo articulo",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "Sin artículos.",
-    "none"                               => "",
-    "none_selected"                      => "Debe elegir algún articulo para poder modificarlo",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "Articulos",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "Cantidad por paquete",
-    "quantity"                           => "Cantidad",
-    "quantity_number"                    => "Cantidad debe ser número.",
-    "quantity_required"                  => "Especifique la cantidad.",
-    "receiving_quantity"                 => "Cantidad recibida",
-    "remove_image"                       => "Quitar imagen",
-    "reorder_level"                      => "Cantidad minima",
-    "reorder_level_number"               => "Cantidad minima deber ser numero.",
-    "reorder_level_required"             => "Cantidad minima no puede estar vacío.",
-    "retrive_item_info"                  => "Obtener información del articulo",
-    "sales_tax_1"                        => "Impuesto de Ventas 1",
-    "sales_tax_2"                        => "Impuesto de Ventas 2",
-    "search_attributes"                  => "Atributos de Búsqueda",
-    "select_image"                       => "Seleccionar imagen",
-    "serialized_items"                   => "Artículos con número de serie",
-    "standard"                           => "Estándar",
-    "stock"                              => "Existencia",
-    "stock_location"                     => "Ubicación del inventario",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "Se ha borrado correctamente",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => 'Inventario a agregar o disminuir.',
+    'allow_alt_description'              => 'Permitir Descripción Alternativa',
+    'amount_entry'                       => 'Ingrese Cantidad',
+    'bulk_edit'                          => 'Edición Masiva',
+    'buy_price_required'                 => 'Precio de Compra es un campo requerido.',
+    'cannot_be_deleted'                  => 'No se puede borrar el item(s) seleccionado, uno a mas de los items seleccionados tienen ventas.',
+    'cannot_find_item'                   => 'Articulo no encontrado.',
+    'categories'                         => '',
+    'category'                           => 'Categoría',
+    'category_new'                       => '',
+    'category_required'                  => 'Categoría es un campo requerido.',
+    'change_all_to_allow_alt_desc'       => 'Permitir Descripción Alternativa para todo.',
+    'change_all_to_not_allow_allow_desc' => 'No permitir Descripción Alternativa para todo.',
+    'change_all_to_serialized'           => 'Cambiar todo a Serializado',
+    'change_all_to_unserialized'         => 'Cambiar todo a No-Serializado',
+    'change_image'                       => 'Cambiar Imagen',
+    'confirm_bulk_edit'                  => '¿Esta seguro que quiere editar los artículos seleccionados?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Toda la información de Impuestos de los Artículos será reemplazada.',
+    'confirm_delete'                     => '¿Esta seguro que quiere eliminar los artículos seleccionados?',
+    'confirm_restore'                    => '¿Esta seguro de restaurar los articulos seleccionado?',
+    'cost_price'                         => 'Precio mayoreo.',
+    'cost_price_number'                  => 'El precio de mayoreo debe ser números.',
+    'cost_price_required'                => 'El precio de mayoreo es requerido.',
+    'count'                              => 'Actualizar inventario',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => 'Cantidad actual',
+    'default_pack_name'                  => '',
+    'description'                        => 'Descripción',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => 'Edición de varios elementos',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => 'Inventario',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Comentarios',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => 'Fecha',
+    'inventory_employee'                 => 'Empleado',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'el articulo tiene número de serie',
+    'item'                               => 'Articulo',
+    'item_id'                            => '',
+    'item_number'                        => 'Código de barras',
+    'item_number_duplicate'              => 'El código del artículo ya está presente en la base de datos.',
+    'item_number_invalid'                => 'El código del artículo contiene caracteres no permitidos.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Ubicación',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => 'Nuevo articulo',
+    'no_description_items'               => '',
+    'no_items_to_display'                => 'Sin artículos.',
+    'none'                               => '',
+    'none_selected'                      => 'Debe elegir algún articulo para poder modificarlo',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => 'Articulos',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => 'Cantidad por paquete',
+    'quantity'                           => 'Cantidad',
+    'quantity_number'                    => 'Cantidad debe ser número.',
+    'quantity_required'                  => 'Especifique la cantidad.',
+    'receiving_quantity'                 => 'Cantidad recibida',
+    'remove_image'                       => 'Quitar imagen',
+    'reorder_level'                      => 'Cantidad minima',
+    'reorder_level_number'               => 'Cantidad minima deber ser numero.',
+    'reorder_level_required'             => 'Cantidad minima no puede estar vacío.',
+    'retrive_item_info'                  => 'Obtener información del articulo',
+    'sales_tax_1'                        => 'Impuesto de Ventas 1',
+    'sales_tax_2'                        => 'Impuesto de Ventas 2',
+    'search_attributes'                  => 'Atributos de Búsqueda',
+    'select_image'                       => 'Seleccionar imagen',
+    'serialized_items'                   => 'Artículos con número de serie',
+    'standard'                           => 'Estándar',
+    'stock'                              => 'Existencia',
+    'stock_location'                     => 'Ubicación del inventario',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => 'Se ha borrado correctamente',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'El nombre del impuesto contiene caracteres no permitidos.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/es-MX/Login.php b/app/Language/es-MX/Login.php
index f76c33cb2..cf76ab113 100644
--- a/app/Language/es-MX/Login.php
+++ b/app/Language/es-MX/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "No soy un robot.",
-    "go"                            => "Entrar",
-    "invalid_gcaptcha"              => "Por favor compruebe que usted no es un robot.",
-    "invalid_installation"          => "La instalacion no es correcta, revise el archivo php.ini.",
-    "invalid_username_and_password" => "Usuario y/o Password Invalido.",
-    "login"                         => "Login",
-    "logout"                        => "Salir",
-    "migration_needed"              => "Una migración de base de datos a {0} empezara después de entrar.",
-    "password"                      => "Contraseña",
-    "required_username"             => "El nombre de usuario es obligatorio.",
-    "username"                      => "Usuario",
-    "welcome"                       => "Bienvenido a {0}!",
+    "gcaptcha"                            => "No soy un robot.",
+    "go"                                  => "Entrar",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Por favor compruebe que usted no es un robot.",
+    "invalid_installation"                => "La instalacion no es correcta, revise el archivo php.ini.",
+    "invalid_username_and_password"       => "Usuario y/o Password Invalido.",
+    "login"                               => "Login",
+    "logout"                              => "Salir",
+    "migrating_database"                  => "Migrando base de datos",
+    "migration_auth_message"              => "Se requieren credenciales de administrador para autorizar la migración de la base de datos a la versión {0}. Inicie sesión para continuar.",
+    "migration_complete"                  => "¡Base de datos inicializada correctamente!",
+    "migration_complete_login"            => "Ahora puede iniciar sesión.",
+    "migration_complete_migrate"          => "¡Base de datos migrada exitosamente!",
+    "migration_complete_redirect"         => "Migración completada. Redirigiendo al inicio de sesión...",
+    "migration_error_connection"          => "Error de conexión. Por favor, inténtelo de nuevo.",
+    "migration_failed"                    => "Migración fallida",
+    "migration_initializing"              => "Inicializando base de datos",
+    "migration_needed"                    => "Una migración de base de datos a {0} empezara después de entrar.",
+    "migration_required"                  => "Migración de base de datos requerida",
+    "migration_running"                   => "Ejecutando migraciones de base de datos...",
+    "password"                            => "Contraseña",
+    "required_username"                   => "El nombre de usuario es obligatorio.",
+    'too_many_attempts'                   => 'Demasiados intentos. Por favor espera un momento e intenta de nuevo.',
+    "username"                            => "Usuario",
+    "welcome"                             => "Bienvenido a {0}!"
 ];
diff --git a/app/Language/es-MX/Reports.php b/app/Language/es-MX/Reports.php
index 4f24ae0f9..3f144f67b 100644
--- a/app/Language/es-MX/Reports.php
+++ b/app/Language/es-MX/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Tarifa de Impuesto",
     "taxes"                                   => "Impuestos",
     "taxes_summary_report"                    => "Reporte Resumido de Impuestos",
+    "toggle_cost_and_profit"                  => "Alternar Costo y Ganancia",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Valor Total del Inventario",
     "total_low_sell_quantity"                 => "Cantidad Total de Venta Baja",
diff --git a/app/Language/es-MX/Sales.php b/app/Language/es-MX/Sales.php
index b0e521c5b..0795f391c 100644
--- a/app/Language/es-MX/Sales.php
+++ b/app/Language/es-MX/Sales.php
@@ -1,225 +1,241 @@
 <?php
 
 return [
-    "customers_available_points"       => "Puntos Disponibles",
-    "rewards_package"                  => "Premios",
-    "rewards_remaining_balance"        => "Puntos de recompensa sobrante son: ",
-    "account_number"                   => "Cuenta #",
-    "add_payment"                      => "Agregar Pago",
-    "amount_due"                       => "Monto de adeudo",
-    "amount_tendered"                  => "Cantidad Recibida",
-    "authorized_signature"             => "Firma Autorizada",
-    "cancel_sale"                      => "Cancelar",
-    "cash"                             => "Efectivo",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Ajuste de efectivo",
-    "cash_deposit"                     => "Deposito en Efectivo",
-    "cash_filter"                      => "Efectivo",
-    "change_due"                       => "Cambio",
-    "change_price"                     => "Cambiar precio de venta",
-    "check"                            => "Cheque",
-    "check_balance"                    => "Balance de Cheque",
-    "check_filter"                     => "Comprobar",
-    "close"                            => "",
-    "comment"                          => "Comentario",
-    "comments"                         => "Comentarios",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Completar",
-    "confirm_cancel_sale"              => "¿Está seguro que desea limpiar la venta? Todos los artículos serán borrados.",
-    "confirm_delete"                   => "¿Está seguro que desea borrar todas las ventas seleccionadas?",
-    "confirm_restore"                  => "¿Está seguro de desear restaurar las ventas seleccionadas?",
-    "credit"                           => "Tarjeta de Crédito",
-    "credit_deposit"                   => "Deposito de crédito",
-    "credit_filter"                    => "Tarjeta de crédito",
-    "current_table"                    => "",
-    "customer"                         => "Cliente",
-    "customer_address"                 => "Dirección",
-    "customer_discount"                => "Descuento",
-    "customer_email"                   => "Correo electrónico",
-    "customer_location"                => "Ubicación",
-    "customer_mailchimp_status"        => "Estado de MailChimp",
-    "customer_optional"                => "(Obligatorio para pagos vencidos)",
-    "customer_required"                => "(Obligatorio)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Fecha de venta",
-    "date_range"                       => "Rango de fechas",
-    "date_required"                    => "Ingresar una fecha correcta.",
-    "date_type"                        => "La fecha es un campo requerido.",
-    "debit"                            => "Tarjeta de débito",
-    "debit_filter"                     => "",
-    "delete"                           => "Permitir borrar",
-    "delete_confirmation"              => "¿Seguro(a) de querer borrar esta venta? Esta acción no se puede deshacer.",
-    "delete_entire_sale"               => "Eliminar la venta completa",
-    "delete_successful"                => "Venta borrada correctamente.",
-    "delete_unsuccessful"              => "Fallo al borrar la venta.",
-    "description_abbrv"                => "Descrip.",
-    "discard"                          => "Descartar",
-    "discard_quote"                    => "",
-    "discount"                         => "Desc.",
-    "discount_included"                => "% Descuento",
-    "discount_short"                   => "%",
-    "due"                              => "Adeudo",
-    "due_filter"                       => "Adeudo",
-    "edit"                             => "Editar",
-    "edit_item"                        => "Editar artículo",
-    "edit_sale"                        => "Editar venta",
-    "email_receipt"                    => "Enviar ticket",
-    "employee"                         => "Empleado",
-    "entry"                            => "Entrada",
-    "error_editing_item"               => "Error editando el artículo",
-    "find_or_scan_item"                => "Buscar o escanear artículo",
-    "find_or_scan_item_or_receipt"     => "Buscar o escanear artículo o recibo",
-    "giftcard"                         => "Tarjeta de regalo",
-    "giftcard_balance"                 => "Balance de Tarjeta de Regalo",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Número de Tarjeta de Regalo",
-    "group_by_category"                => "Grupo por Categoría",
-    "group_by_type"                    => "Grupo por Tipo",
-    "hsn"                              => "HSN",
-    "id"                               => "ID de Venta",
-    "include_prices"                   => "¿Incluir precios?",
-    "invoice"                          => "Factura de venta",
-    "invoice_confirm"                  => "Esta factura sera enviada a",
-    "invoice_enable"                   => "Crear factura",
-    "invoice_filter"                   => "Facturas",
-    "invoice_no_email"                 => "Este cliente no tiene un correo electrónico válido.",
-    "invoice_number"                   => "Factura #",
-    "invoice_number_duplicate"         => "Por favor ingrese un número de factura único.",
-    "invoice_sent"                     => "Factura enviada a",
-    "invoice_total"                    => "Total Facturado",
-    "invoice_type_custom_invoice"      => "Factura Personalizada (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Factura de Impuesto personalizada (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Factura",
-    "invoice_type_tax_invoice"         => "Factura de Impuestos",
-    "invoice_unsent"                   => "Fallo el envio de la factura a",
-    "invoice_update"                   => "Recuento",
-    "item_insufficient_of_stock"       => "Cantidad insuficiente en inventario.",
-    "item_name"                        => "Nombre del Artículo",
-    "item_number"                      => "Artículo #",
-    "item_out_of_stock"                => "El artículo está agotado.",
-    "key_browser"                      => "Atajos Útiles",
-    "key_cancel"                       => "Cancelar actual Cotización/Factura/Venta",
-    "key_customer_search"              => "Buscar Cliente",
-    "key_finish_quote"                 => "Finalizar Cotización/Factura sin pago",
-    "key_finish_sale"                  => "Agregar pago y Completar la Factura/Venta",
-    "key_full"                         => "Abrir en modo Pantalla Completa",
-    "key_function"                     => "Function",
-    "key_help"                         => "Atajos",
-    "key_help_modal"                   => "Abrir Ventana de Atajos",
-    "key_in"                           => "Acercar",
-    "key_item_search"                  => "Buscar Artículo",
-    "key_out"                          => "Alejar",
-    "key_payment"                      => "Agregar Pago",
-    "key_print"                        => "Imprimir Página Actual",
-    "key_restore"                      => "Restaurar Vista",
-    "key_search"                       => "Buscar Tablas de Reporte",
-    "key_suspend"                      => "Suspender Venta Actual",
-    "key_suspended"                    => "Mostrar Ventas Suspendidas",
-    "key_system"                       => "Atajos del Sistema",
-    "key_tendered"                     => "Editar Importe Licitado",
-    "key_title"                        => "Atajos de Teclado para Ventas",
-    "mc"                               => "",
-    "mode"                             => "Registrar Modo",
-    "must_enter_numeric"               => "Cantidad recibida debe ser un número.",
-    "must_enter_numeric_giftcard"      => "Número de Tarjeta de Regalo debe ser un número.",
-    "new_customer"                     => "Cliente Nuevo",
-    "new_item"                         => "Artículo Nuevo",
-    "no_description"                   => "Sin descripción",
-    "no_filter"                        => "Todos",
-    "no_items_in_cart"                 => "No hay artículos en el carrito.",
-    "no_sales_to_display"              => "No hay ventas que mostrar.",
-    "none_selected"                    => "No has seleccionado alguna venta para borrar.",
-    "nontaxed_ind"                     => " ' ",
-    "not_authorized"                   => "Esta acción no esta autorizada.",
-    "one_or_multiple"                  => "Venta(s)",
-    "payment"                          => "Tipo de pago",
-    "payment_amount"                   => "Cantidad",
-    "payment_not_cover_total"          => "La cantidad pagada debe ser mayor o igual al Total.",
-    "payment_type"                     => "Tipo",
-    "payments"                         => "",
-    "payments_total"                   => "Total de pagado",
-    "price"                            => "Precio",
-    "print_after_sale"                 => "Imprimir recibo después de una venta",
-    "quantity"                         => "Cantidad",
-    "quantity_less_than_reorder_level" => "Advertencia. La cantidad deseada es insuficiente.",
-    "quantity_less_than_zero"          => "Advertencia. La cantidad deseada es insuficiente. Puedes procesar la venta, pero verifica tu inventario.",
-    "quantity_of_items"                => "Cantidad de {0} artículos",
-    "quote"                            => "Cotizar",
-    "quote_number"                     => "Número de presupuesto",
-    "quote_number_duplicate"           => "El número de cotización debe ser único.",
-    "quote_sent"                       => "Cotización enviada a",
-    "quote_unsent"                     => "La cotización no se pudo enviar a",
-    "receipt"                          => "Recibo de venta",
-    "receipt_no_email"                 => "Este cliente no tiene una dirección de correo válida.",
-    "receipt_number"                   => "Venta #",
-    "receipt_sent"                     => "Recibo enviado a",
-    "receipt_unsent"                   => "Falló el envío del recibo a",
-    "refund"                           => "Modo de Reembolso",
-    "register"                         => "Registro de ventas",
-    "remove_customer"                  => "Borrar cliente",
-    "remove_discount"                  => "",
-    "return"                           => "Devolución",
-    "rewards"                          => "Puntos de recompensa",
-    "rewards_balance"                  => "Balance de puntos de recompensa",
-    "sale"                             => "Venta",
-    "sale_by_invoice"                  => "Venta por factura",
-    "sale_for_customer"                => "Cliente:",
-    "sale_time"                        => "Hora",
-    "sales_tax"                        => "Impuestos",
-    "sales_total"                      => "",
-    "select_customer"                  => "Seleccionar cliente",
-    "send_invoice"                     => "Enviar factura",
-    "send_quote"                       => "Enviar cotización",
-    "send_receipt"                     => "Enviar recibo",
-    "send_work_order"                  => "Enviar orden de trabajo",
-    "serial"                           => "Serie",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Mostrar factura",
-    "show_receipt"                     => "Mostrar recibo",
-    "start_typing_customer_name"       => "Empiece a escribir los detalles del cliente...",
-    "start_typing_item_name"           => "Escriba el nombre del artículo o escanea el código de barras...",
-    "stock"                            => "Existencia",
-    "stock_location"                   => "Localización del inventario",
-    "sub_total"                        => "el subtotal",
-    "successfully_deleted"             => "Se ha eliminado",
-    "successfully_restored"            => "Se ha restuarado satisfactoriamente",
-    "successfully_suspended_sale"      => "La venta se ha suspendido.",
-    "successfully_updated"             => "Venta actualizada.",
-    "suspend_sale"                     => "Suspender",
-    "suspended_doc_id"                 => "Documento",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspendidas",
-    "table"                            => "Datos",
-    "takings"                          => "Ventas diarias",
-    "tax"                              => "Impuestos",
-    "tax_id"                           => "ID Impuesto",
-    "tax_invoice"                      => "Impuesto de la factura",
-    "tax_percent"                      => "Impuesto %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Sin impuesto",
-    "transaction_failed"               => "Ha fallado la venta.",
-    "unable_to_add_item"               => "Falló al agregar artículos para venta",
-    "unsuccessfully_deleted"           => "La eliminación de venta falló.",
-    "unsuccessfully_restored"          => "La restauración de la venta falló.",
-    "unsuccessfully_suspended_sale"    => "La suspensión de venta falló.",
-    "unsuccessfully_updated"           => "Ha fallado la actualización de la venta.",
-    "unsuspend"                        => "Retomar",
-    "unsuspend_and_delete"             => "Acción",
-    "update"                           => "Actualizar",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Orden de trabajo",
-    "work_order_number"                => "Número de orden de trabajo",
-    "work_order_number_duplicate"      => "El número de orden de trabajo debe ser único.",
-    "work_order_sent"                  => "Orden de trabajo enviada a",
-    "work_order_unsent"                => "Falló la Orden de Trabajo al enviar a",
+    'account_number'                    => 'Cuenta #',
+    'add_payment'                       => 'Agregar Pago',
+    'amount_due'                        => 'Monto de adeudo',
+    'amount_due_not_covered'            => 'Los pagos no cubren el monto adeudado.',
+    'amount_tendered'                   => 'Cantidad Recibida',
+    'authorized_signature'              => 'Firma Autorizada',
+    'bank_transfer'                     => 'Transferencia Bancaria',
+    'cancel_sale'                       => 'Cancelar',
+    'cash'                              => 'Efectivo',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Ajuste de efectivo',
+    'cash_deposit'                      => 'Deposito en Efectivo',
+    'cash_filter'                       => 'Efectivo',
+    'change_due'                        => 'Cambio',
+    'change_price'                      => 'Cambiar precio de venta',
+    'check'                             => 'Cheque',
+    'check_balance'                     => 'Balance de Cheque',
+    'check_filter'                      => 'Comprobar',
+    'close'                             => '',
+    'comment'                           => 'Comentario',
+    'comments'                          => 'Comentarios',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Completar',
+    'confirm_cancel_sale'               => '¿Está seguro que desea limpiar la venta? Todos los artículos serán borrados.',
+    'confirm_delete'                    => '¿Está seguro que desea borrar todas las ventas seleccionadas?',
+    'confirm_restore'                   => '¿Está seguro de desear restaurar las ventas seleccionadas?',
+    'credit'                            => 'Tarjeta de Crédito',
+    'credit_deposit'                    => 'Deposito de crédito',
+    'credit_filter'                     => 'Tarjeta de crédito',
+    'current_table'                     => '',
+    'customer'                          => 'Cliente',
+    'customer_address'                  => 'Dirección',
+    'customer_discount'                 => 'Descuento',
+    'customer_email'                    => 'Correo electrónico',
+    'customer_location'                 => 'Ubicación',
+    'customer_mailchimp_status'         => 'Estado de MailChimp',
+    'customer_optional'                 => '(Obligatorio para pagos vencidos)',
+    'customer_required'                 => '(Obligatorio)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Puntos Disponibles',
+    'daily_sales'                       => '',
+    'date'                              => 'Fecha de venta',
+    'date_range'                        => 'Rango de fechas',
+    'date_required'                     => 'Ingresar una fecha correcta.',
+    'date_type'                         => 'La fecha es un campo requerido.',
+    'debit'                             => 'Tarjeta de débito',
+    'debit_filter'                      => '',
+    'delete'                            => 'Permitir borrar',
+    'delete_confirmation'               => '¿Seguro(a) de querer borrar esta venta? Esta acción no se puede deshacer.',
+    'delete_entire_sale'                => 'Eliminar la venta completa',
+    'delete_successful'                 => 'Venta borrada correctamente.',
+    'delete_unsuccessful'               => 'Fallo al borrar la venta.',
+    'description_abbrv'                 => 'Descrip.',
+    'discard'                           => 'Descartar',
+    'discard_quote'                     => '',
+    'discount'                          => 'Desc.',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Descuento',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Adeudo',
+    'due_filter'                        => 'Adeudo',
+    'edit'                              => 'Editar',
+    'edit_item'                         => 'Editar artículo',
+    'edit_sale'                         => 'Editar venta',
+    'email_receipt'                     => 'Enviar ticket',
+    'employee'                          => 'Empleado',
+    'entry'                             => 'Entrada',
+    'error_editing_item'                => 'Error editando el artículo',
+    'find_or_scan_item'                 => 'Buscar o escanear artículo',
+    'find_or_scan_item_or_receipt'      => 'Buscar o escanear artículo o recibo',
+    'giftcard'                          => 'Tarjeta de regalo',
+    'giftcard_balance'                  => 'Balance de Tarjeta de Regalo',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Número de Tarjeta de Regalo',
+    'group_by_category'                 => 'Grupo por Categoría',
+    'group_by_type'                     => 'Grupo por Tipo',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID de Venta',
+    'include_prices'                    => '¿Incluir precios?',
+    'insufficient_giftcard_balance'     => 'Saldo insuficiente de tarjeta de regalo para este pago.',
+    'insufficient_reward_points'        => 'Puntos de recompensa insuficientes para este pago.',
+    'invoice'                           => 'Factura de venta',
+    'invoice_confirm'                   => 'Esta factura sera enviada a',
+    'invoice_enable'                    => 'Crear factura',
+    'invoice_filter'                    => 'Facturas',
+    'invoice_no_email'                  => 'Este cliente no tiene un correo electrónico válido.',
+    'invoice_number'                    => 'Factura #',
+    'invoice_number_duplicate'          => 'Por favor ingrese un número de factura único.',
+    'invoice_sent'                      => 'Factura enviada a',
+    'invoice_total'                     => 'Total Facturado',
+    'invoice_type_custom_invoice'       => 'Factura Personalizada (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Factura de Impuesto personalizada (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Factura',
+    'invoice_type_tax_invoice'          => 'Factura de Impuestos',
+    'invoice_unsent'                    => 'Fallo el envio de la factura a',
+    'invoice_update'                    => 'Recuento',
+    'item_insufficient_of_stock'        => 'Cantidad insuficiente en inventario.',
+    'item_name'                         => 'Nombre del Artículo',
+    'item_number'                       => 'Artículo #',
+    'item_out_of_stock'                 => 'El artículo está agotado.',
+    'key_browser'                       => 'Atajos Útiles',
+    'key_cancel'                        => 'Cancelar actual Cotización/Factura/Venta',
+    'key_customer_search'               => 'Buscar Cliente',
+    'key_finish_quote'                  => 'Finalizar Cotización/Factura sin pago',
+    'key_finish_sale'                   => 'Agregar pago y Completar la Factura/Venta',
+    'key_full'                          => 'Abrir en modo Pantalla Completa',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Atajos',
+    'key_help_modal'                    => 'Abrir Ventana de Atajos',
+    'key_in'                            => 'Acercar',
+    'key_item_search'                   => 'Buscar Artículo',
+    'key_out'                           => 'Alejar',
+    'key_payment'                       => 'Agregar Pago',
+    'key_print'                         => 'Imprimir Página Actual',
+    'key_restore'                       => 'Restaurar Vista',
+    'key_search'                        => 'Buscar Tablas de Reporte',
+    'key_suspend'                       => 'Suspender Venta Actual',
+    'key_suspended'                     => 'Mostrar Ventas Suspendidas',
+    'key_system'                        => 'Atajos del Sistema',
+    'key_tendered'                      => 'Editar Importe Licitado',
+    'key_title'                         => 'Atajos de Teclado para Ventas',
+    'mc'                                => '',
+    'mode'                              => 'Registrar Modo',
+    'must_enter_numeric'                => 'Cantidad recibida debe ser un número.',
+    'must_enter_numeric_giftcard'       => 'Número de Tarjeta de Regalo debe ser un número.',
+    'must_enter_reference_code'         => 'Se debe ingresar el número de referencia/recuperación.',
+    'negative_amount_tendered'          => 'La cantidad recibida no puede ser negativa.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Cliente Nuevo',
+    'new_item'                          => 'Artículo Nuevo',
+    'no_description'                    => 'Sin descripción',
+    'no_filter'                         => 'Todos',
+    'no_items_in_cart'                  => 'No hay artículos en el carrito.',
+    'no_sales_to_display'               => 'No hay ventas que mostrar.',
+    'none_selected'                     => 'No has seleccionado alguna venta para borrar.',
+    'nontaxed_ind'                      => " ' ",
+    'not_authorized'                    => 'Esta acción no esta autorizada.',
+    'one_or_multiple'                   => 'Venta(s)',
+    'payment'                           => 'Tipo de pago',
+    'payment_amount'                    => 'Cantidad',
+    'payment_not_cover_total'           => 'La cantidad pagada debe ser mayor o igual al Total.',
+    'payment_type'                      => 'Tipo',
+    'payments'                          => '',
+    'payments_total'                    => 'Total de pagado',
+    'price'                             => 'Precio',
+    'print_after_sale'                  => 'Imprimir recibo después de una venta',
+    'quantity'                          => 'Cantidad',
+    'quantity_less_than_reorder_level'  => 'Advertencia. La cantidad deseada es insuficiente.',
+    'quantity_less_than_zero'           => 'Advertencia. La cantidad deseada es insuficiente. Puedes procesar la venta, pero verifica tu inventario.',
+    'quantity_of_items'                 => 'Cantidad de {0} artículos',
+    'quote'                             => 'Cotizar',
+    'quote_number'                      => 'Número de presupuesto',
+    'quote_number_duplicate'            => 'El número de cotización debe ser único.',
+    'quote_sent'                        => 'Cotización enviada a',
+    'quote_unsent'                      => 'La cotización no se pudo enviar a',
+    'receipt'                           => 'Recibo de venta',
+    'receipt_no_email'                  => 'Este cliente no tiene una dirección de correo válida.',
+    'receipt_number'                    => 'Venta #',
+    'receipt_sent'                      => 'Recibo enviado a',
+    'receipt_unsent'                    => 'Falló el envío del recibo a',
+    'reference_code'                    => 'Código de referencia de pago',
+    'reference_code_invalid_characters' => 'El código de referencia solo debe contener letras y números.',
+    'reference_code_length_error'       => 'La longitud del código de referencia no es válida.',
+    'refund'                            => 'Modo de Reembolso',
+    'register'                          => 'Registro de ventas',
+    'remove_customer'                   => 'Borrar cliente',
+    'remove_discount'                   => '',
+    'return'                            => 'Devolución',
+    'rewards'                           => 'Puntos de recompensa',
+    'rewards_balance'                   => 'Balance de puntos de recompensa',
+    'rewards_package'                   => 'Premios',
+    'rewards_remaining_balance'         => 'Puntos de recompensa sobrante son: ',
+    'sale'                              => 'Venta',
+    'sale_by_invoice'                   => 'Venta por factura',
+    'sale_for_customer'                 => 'Cliente:',
+    'sale_time'                         => 'Hora',
+    'sales_tax'                         => 'Impuestos',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Seleccionar cliente',
+    'send_invoice'                      => 'Enviar factura',
+    'send_quote'                        => 'Enviar cotización',
+    'send_receipt'                      => 'Enviar recibo',
+    'send_work_order'                   => 'Enviar orden de trabajo',
+    'serial'                            => 'Serie',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Mostrar factura',
+    'show_receipt'                      => 'Mostrar recibo',
+    'start_typing_customer_name'        => 'Empiece a escribir los detalles del cliente...',
+    'start_typing_item_name'            => 'Escriba el nombre del artículo o escanea el código de barras...',
+    'stock'                             => 'Existencia',
+    'stock_location'                    => 'Localización del inventario',
+    'sub_total'                         => 'el subtotal',
+    'successfully_deleted'              => 'Se ha eliminado',
+    'successfully_restored'             => 'Se ha restuarado satisfactoriamente',
+    'successfully_suspended_sale'       => 'La venta se ha suspendido.',
+    'successfully_updated'              => 'Venta actualizada.',
+    'suspend_sale'                      => 'Suspender',
+    'suspended_doc_id'                  => 'Documento',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspendidas',
+    'table'                             => 'Datos',
+    'takings'                           => 'Ventas diarias',
+    'tax'                               => 'Impuestos',
+    'tax_id'                            => 'ID Impuesto',
+    'tax_invoice'                       => 'Impuesto de la factura',
+    'tax_percent'                       => 'Impuesto %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Sin impuesto',
+    'transaction_failed'                => 'Ha fallado la venta.',
+    'unable_to_add_item'                => 'Falló al agregar artículos para venta',
+    'unsuccessfully_deleted'            => 'La eliminación de venta falló.',
+    'unsuccessfully_restored'           => 'La restauración de la venta falló.',
+    'unsuccessfully_suspended_sale'     => 'La suspensión de venta falló.',
+    'unsuccessfully_updated'            => 'Ha fallado la actualización de la venta.',
+    'unsuspend'                         => 'Retomar',
+    'unsuspend_and_delete'              => 'Acción',
+    'update'                            => 'Actualizar',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wallet'                            => 'Monedero',
+    'wholesale'                         => '',
+    'work_order'                        => 'Orden de trabajo',
+    'work_order_number'                 => 'Número de orden de trabajo',
+    'work_order_number_duplicate'       => 'El número de orden de trabajo debe ser único.',
+    'work_order_sent'                   => 'Orden de trabajo enviada a',
+    'work_order_unsent'                 => 'Falló la Orden de Trabajo al enviar a',
 ];
diff --git a/app/Language/fa/Attributes.php b/app/Language/fa/Attributes.php
index b756373f7..174ac67dc 100644
--- a/app/Language/fa/Attributes.php
+++ b/app/Language/fa/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "مقدار ویژگی نمی تواند حاوی | یا ـ باشد",
-    "confirm_delete"                   => "آیا مطمئن هستید که می خواهید ویژگی (های) انتخاب شده را حذف کنید؟",
-    "confirm_restore"                  => "آیا مطمئن هستید که می خواهید ویژگی (های) انتخاب شده را بازیابی کنید؟",
-    "definition_cannot_be_deleted"     => "نمی توان ویژگی (های) انتخابی را حذف کرد",
-    "definition_error_adding_updating" => "ویژگی{0} اضافه نشد یا به روز نمی شود. لطفا گزارش خطا را بررسی کنید.",
-    "definition_flags"                 => "قابلیت مشاهده ویژگی",
-    "definition_group"                 => "گروه",
-    "definition_id"                    => "شناسه",
-    "definition_name"                  => "افزودن ویژگی",
-    "definition_name_required"         => "نام ویژگی یک فیلد ضروری است",
-    "definition_one_or_multiple"       => "(ویژگی(ها",
-    "definition_successful_adding"     => "شما مورد را با موفقیت اضافه کردید",
-    "definition_successful_deleted"    => "شما با موفقیت حذف شده اید",
-    "definition_successful_updating"   => "شما ویژگی را با موفقیت به روز کردید",
-    "definition_type"                  => "نوع ویژگی",
-    "definition_type_required"         => "نوع ویژگی یک فیلد ضروری است",
-    "definition_unit"                  => "واحد اندازه گیری",
-    "definition_values"                => "مقادیر مشخصه",
-    "new"                              => "ویژگی جدید",
-    "no_attributes_to_display"         => "هیچ موردی برای نمایش",
-    "receipt_visibility"               => "اعلام وصول",
-    "show_in_items"                    => "نمایش در موارد",
-    "show_in_items_visibility"         => "موارد",
-    "show_in_receipt"                  => "نمایش در رسید",
-    "show_in_receivings"               => "نمایش در دریافت ها",
-    "show_in_receivings_visibility"    => "دریافت",
-    "show_in_sales"                    => "نمایش در فروش",
-    "show_in_sales_visibility"         => "حراجی",
-    "update"                           => "به روز کردن ویژگی",
+    'attribute_value_invalid_chars'    => 'مقدار ویژگی نمی تواند حاوی | یا ـ باشد',
+    'confirm_delete'                   => 'آیا مطمئن هستید که می خواهید ویژگی (های) انتخاب شده را حذف کنید؟',
+    'confirm_restore'                  => 'آیا مطمئن هستید که می خواهید ویژگی (های) انتخاب شده را بازیابی کنید؟',
+    'definition_cannot_be_deleted'     => 'نمی توان ویژگی (های) انتخابی را حذف کرد',
+    'definition_invalid_group' => 'گروه انتخاب شده وجود ندارد یا نامعتبر است.',
+    'definition_error_adding_updating' => 'ویژگی{0} اضافه نشد یا به روز نمی شود. لطفا گزارش خطا را بررسی کنید.',
+    'definition_flags'                 => 'قابلیت مشاهده ویژگی',
+    'definition_group'                 => 'گروه',
+    'definition_id'                    => 'شناسه',
+    'definition_name'                  => 'افزودن ویژگی',
+    'definition_name_required'         => 'نام ویژگی یک فیلد ضروری است',
+    'definition_one_or_multiple'       => '(ویژگی(ها',
+    'definition_successful_adding'     => 'شما مورد را با موفقیت اضافه کردید',
+    'definition_successful_deleted'    => 'شما با موفقیت حذف شده اید',
+    'definition_successful_updating'   => 'شما ویژگی را با موفقیت به روز کردید',
+    'definition_type'                  => 'نوع ویژگی',
+    'definition_type_required'         => 'نوع ویژگی یک فیلد ضروری است',
+    'definition_unit'                  => 'واحد اندازه گیری',
+    'definition_values'                => 'مقادیر مشخصه',
+    'new'                              => 'ویژگی جدید',
+    'no_attributes_to_display'         => 'هیچ موردی برای نمایش',
+    'receipt_visibility'               => 'اعلام وصول',
+    'show_in_items'                    => 'نمایش در موارد',
+    'show_in_items_visibility'         => 'موارد',
+    'show_in_receipt'                  => 'نمایش در رسید',
+    'show_in_receivings'               => 'نمایش در دریافت ها',
+    'show_in_receivings_visibility'    => 'دریافت',
+    'show_in_sales'                    => 'نمایش در فروش',
+    'show_in_sales_visibility'         => 'حراجی',
+    'show_in_search'                   => 'نمایش در جستجو',
+    'show_in_search_visibility'        => 'جستجو',
+    'update'                           => 'به روز کردن ویژگی',
 ];
diff --git a/app/Language/fa/Bootstrap_tables.php b/app/Language/fa/Bootstrap_tables.php
index 731dca0b4..ce0340bba 100644
--- a/app/Language/fa/Bootstrap_tables.php
+++ b/app/Language/fa/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "همه",
-    "columns"              => "ستون ها",
-    "hide_show_pagination" => "پنهان کردن / نمایش صفحه بندی",
-    "loading"              => "...در حال بارگزاری، لطفا منتظر بمانید",
-    "page_from_to"         => "نمایش {0} تا {1} از {2} ردیف",
-    "refresh"              => "تازه کردن",
-    "rows_per_page"        => "صفر ردیف در هر صفحه",
-    "toggle"               => "تغییر وضعیت",
+    'all' => "همه",
+    'columns' => "ستون ها",
+    'hide_show_pagination' => "پنهان کردن / نمایش صفحه بندی",
+    'loading' => "در حال بارگزاری، لطفا منتظر بمانید",
+    'page_from_to' => "نمایش {0} تا {1} از {2} ردیف",
+    'refresh' => "تازه کردن",
+    'rows_per_page' => "صفر ردیف در هر صفحه",
+    'toggle' => "تغییر وضعیت",
 ];
diff --git a/app/Language/fa/Config.php b/app/Language/fa/Config.php
index 5d5016ba9..fbc1a4bf1 100644
--- a/app/Language/fa/Config.php
+++ b/app/Language/fa/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "آدرس شرکت",
-    "address_required"                          => "آدرس شرکت یک زمینه ضروری است.",
-    "all_set"                                   => "همه مجوزهای پرونده درست تنظیم شده اند!",
-    "allow_duplicate_barcodes"                  => "مجاز بارکد های تکراری",
-    "apostrophe"                                => "ارتداد",
-    "backup_button"                             => "پشتیبان گیری",
-    "backup_database"                           => "بانک اطلاعات پشتیبان",
-    "barcode"                                   => "بارکد",
-    "barcode_company"                           => "نام شرکت",
-    "barcode_configuration"                     => "پیکربندی بارکد",
-    "barcode_content"                           => "محتوای بارکد",
-    "barcode_first_row"                         => "ردیف 1",
-    "barcode_font"                              => "قلم",
-    "barcode_formats"                           => "قالبهای ورودی",
-    "barcode_generate_if_empty"                 => "اگر خالی باشد تولید کنید.",
-    "barcode_height"                            => "قد به پیکسل",
-    "barcode_id"                                => "شناسه مورد / نام",
-    "barcode_info"                              => "اطلاعات پیکربندی بارکد",
-    "barcode_layout"                            => "چیدمان بارکد",
-    "barcode_name"                              => "نام",
-    "barcode_number"                            => "بارکد",
-    "barcode_number_in_row"                     => "تعداد در ردیف",
-    "barcode_page_cellspacing"                  => "نمایش جای خالی صفحه.",
-    "barcode_page_width"                        => "نمایش عرض صفحه",
-    "barcode_price"                             => "قیمت",
-    "barcode_second_row"                        => "ردیف 2",
-    "barcode_third_row"                         => "ردیف 3",
-    "barcode_tooltip"                           => "اخطار: این ویژگی می تواند باعث وارد شدن یا ایجاد موارد تکراری شود. اگر نمی خواهید بارکد های تکراری داشته باشید ، از آنها استفاده نکنید.",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "عرض به پیکسل",
-    "bottom"                                    => "پایین",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "اعشار نقدی",
-    "cash_decimals_tooltip"                     => "اگر کسرهای نقدی و دهدهی های ارزی یکسان باشد ، هیچ دور وجه نقدی صورت نمی گیرد.",
-    "cash_rounding"                             => "گرد پول نقد",
-    "category_dropdown"                         => "نمایش دسته بندی به عنوان یک بازده",
-    "center"                                    => "مرکز",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "کام",
-    "company"                                   => "نام شرکت",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "تغییر تصویر",
-    "company_logo"                              => "آرم شرکت",
-    "company_remove_image"                      => "حذف تصویر",
-    "company_required"                          => "نام شرکت یک زمینه ضروری است",
-    "company_select_image"                      => "تصویر را انتخاب کنید",
-    "company_website_url"                       => "وب سایت شرکت معتبر نیست",
-    "country_codes"                             => "کد کشور",
-    "country_codes_tooltip"                     => "کاما لیست کدهای کشور را برای جستجوی آدرس  جدا کرد.",
-    "currency_code"                             => "کد ارز",
-    "currency_decimals"                         => "اعشار ارزی",
-    "currency_symbol"                           => "نماد ارز",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "جایزه",
-    "customer_reward_duplicate"                 => "پاداش باید بی نظیر باشد.",
-    "customer_reward_enable"                    => "فعال کردن پاداش مشتری",
-    "customer_reward_invalid_chars"             => "پاداش نمی تواند حاوی ـ باشد",
-    "customer_reward_required"                  => "پاداش یک زمینه ضروری است",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "فیلتر تاریخ و زمان",
-    "datetimeformat"                            => "قالب و تاریخ",
-    "decimal_point"                             => "نقطه اعشار",
-    "default_barcode_font_size_number"          => "اندازه قلم بارکد پیش فرض باید یک عدد باشد.",
-    "default_barcode_font_size_required"        => "اندازه قلم پیش فرض بارکد یک فیلد مورد نیاز است.",
-    "default_barcode_height_number"             => "ارتفاع پیش فرض بارکد باید یک عدد باشد.",
-    "default_barcode_height_required"           => "پیش فرض بارکد ارتفاع یک فیلد مورد نیاز است.",
-    "default_barcode_num_in_row_number"         => "شماره بارکد پیش فرض در ردیف باید یک عدد باشد.",
-    "default_barcode_num_in_row_required"       => "پیش فرض بارکد شماره در ردیف یک زمینه مورد نیاز است.",
-    "default_barcode_page_cellspacing_number"   => "صفحه پیش فرض بارکد باید یک شماره باشد.",
-    "default_barcode_page_cellspacing_required" => "به طور پیش فرض بارکد صفحه یک زمینه مورد نیاز است.",
-    "default_barcode_page_width_number"         => "عرض صفحه بارکد پیش فرض باید یک عدد باشد.",
-    "default_barcode_page_width_required"       => "صفحه پیش فرض بارکد یک فیلد ضروری است.",
-    "default_barcode_width_number"              => "عرض پیش فرض بارکد باید یک عدد باشد.",
-    "default_barcode_width_required"            => "پیش فرض عرض بارکد یک فیلد مورد نیاز است.",
-    "default_item_columns"                      => "ستون های مورد قابل مشاهده پیش فرض",
-    "default_origin_tax_code"                   => "کد مالیات پیش فرض مبداء",
-    "default_receivings_discount"               => "تخفیف دريافت دريافت",
-    "default_receivings_discount_number"        => "تخفیف دريافت پیش فرض باید یک عدد باشد.",
-    "default_receivings_discount_required"      => "تخفیف دريافت پیش فرض یک قسمت مورد نیاز است.",
-    "default_sales_discount"                    => "تخفیف فروش پیش فرض",
-    "default_sales_discount_number"             => "تخفیف فروش پیش فرض باید یک عدد باشد.",
-    "default_sales_discount_required"           => "تخفیف فروش پیش فرض یک قسمت مورد نیاز است.",
-    "default_tax_category"                      => "طبقه بندی پیش فرض مالیات",
-    "default_tax_code"                          => "کد پیش فرض مالیات",
-    "default_tax_jurisdiction"                  => "پیش فرض صلاحیت مالیاتی",
-    "default_tax_name_number"                   => "نام مالیات پیش فرض باید یک رشته باشد.",
-    "default_tax_name_required"                 => "نام مالیات پیش فرض یک قسمت مورد نیاز است.",
-    "default_tax_rate"                          => "پیش فرض نرخ مالیات٪",
-    "default_tax_rate_1"                        => "نرخ مالیات 1",
-    "default_tax_rate_2"                        => "نرخ مالیات 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "نرخ مالیات پیش فرض باید یک عدد باشد.",
-    "default_tax_rate_required"                 => "پیش فرض مالیات نرخ مورد نیاز است.",
-    "derive_sale_quantity"                      => "مجاز به مقدار فروش مشتق شده",
-    "derive_sale_quantity_tooltip"              => "اگر بررسی شود ، نوع جدیدی برای موارد سفارش داده شده با مقدار طولانی ارائه می شود",
-    "dinner_table"                              => "جدول",
-    "dinner_table_duplicate"                    => "جدول باید بی نظیر باشد.",
-    "dinner_table_enable"                       => "فعال کردن جداول شام",
-    "dinner_table_invalid_chars"                => "نام جدول نمی تواند حاوی ـ باشد.",
-    "dinner_table_required"                     => "جدول فیلد مورد نیاز است.",
-    "dot"                                       => "نقطه",
-    "email"                                     => "پست الکترونیک",
-    "email_configuration"                       => "پیکربندی ایمیل",
-    "email_mailpath"                            => " مسیر ارسال به برنامه (سندمیل)",
-    "email_protocol"                            => "پروتکل",
-    "email_receipt_check_behaviour"             => "کادر بررسی دریافت ایمیل",
-    "email_receipt_check_behaviour_always"      => "همیشه بررسی شد",
-    "email_receipt_check_behaviour_last"        => "انتخاب گذشته را بخاطر بسپار",
-    "email_receipt_check_behaviour_never"       => "همیشه انتخاب نشده",
-    "email_smtp_crypto"                         => "SMTP رمزگذاری",
-    "email_smtp_host"                           => "SMTP سرور",
-    "email_smtp_pass"                           => "SMTP گذرواژه",
-    "email_smtp_port"                           => "SMTP پورت",
-    "email_smtp_timeout"                        => "SMT Timeout (s)",
-    "email_smtp_user"                           => "SMTP نام کاربری",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "اجرای حریم خصوصی",
-    "enforce_privacy_tooltip"                   => "در صورت از بین بردن داده های آنها در صورت حذف داده ها ، از حفظ حریم خصوصی مشتریان محافظت کنید",
-    "fax"                                       => "نمابر",
-    "file_perm"                                 => "در مجوزهای پرونده مشکلی وجود دارد ، لطفا این صفحه را تعمیر و بارگذاری مجدد کنید.",
-    "financial_year"                            => "شروع سال مالی",
-    "financial_year_apr"                        => "اول آوریل",
-    "financial_year_aug"                        => "اول اوت",
-    "financial_year_dec"                        => "اول دسامبر",
-    "financial_year_feb"                        => "اول فوریه",
-    "financial_year_jan"                        => "اول ژانویه",
-    "financial_year_jul"                        => "اول ژوئیه",
-    "financial_year_jun"                        => "اول ژوئن",
-    "financial_year_mar"                        => "اول مارس",
-    "financial_year_may"                        => "اول ماه مه",
-    "financial_year_nov"                        => "اول نوامبر",
-    "financial_year_oct"                        => "اول اکتبر",
-    "financial_year_sep"                        => "اول سپتامبر",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "صفحه ورود کپچا",
-    "gcaptcha_secret_key"                       => "کلید مخفی کپچا",
-    "gcaptcha_secret_key_required"              => "کلید مخفی کپچا یک زمینه مورد نیاز است",
-    "gcaptcha_site_key"                         => "کلید سایت کپچا",
-    "gcaptcha_site_key_required"                => "کلید سایت کپچا یک زمینه مورد نیاز است",
-    "gcaptcha_tooltip"                          => "از صفحه ورود با کپچا محافظت کنید ، روی یک نماد برای یک جفت کلید ای‌پی‌آی کلیک کنید.",
-    "general"                                   => "عمومی",
-    "general_configuration"                     => "پیکربندی عمومی",
-    "giftcard_number"                           => "شماره کارت هدیه",
-    "giftcard_random"                           => "تولید تصادفی",
-    "giftcard_series"                           => "تولید در سریال",
-    "image_allowed_file_types"                  => "انواع پرونده مجاز",
-    "image_max_height_tooltip"                  => "حداکثر ارتفاع مجاز بارگذاری تصویر در پیکسل ها (px).",
-    "image_max_size_tooltip"                    => "حداکثر اندازه مجاز بارگذاری تصویر در کیلوبایت (کیلوبایت).",
-    "image_max_width_tooltip"                   => "حداکثر عرض مجاز بارگذاری تصویر در پیکسل ها (px).",
-    "image_restrictions"                        => "محدودیتهای آپلود تصویر",
-    "include_hsn"                               => "شامل پشتیبانی از کدهای اچ‌اس‌ان",
-    "info"                                      => "اطلاعات",
-    "info_configuration"                        => "اطلاعات فروشگاه",
-    "input_groups"                              => "",
-    "integrations"                              => "ادغام",
-    "integrations_configuration"                => "ادغام های شخص ثالث",
-    "invoice"                                   => "صورتحساب",
-    "invoice_configuration"                     => "تنظیمات چاپ فاکتور",
-    "invoice_default_comments"                  => "نظرات پیش فرض فاکتور",
-    "invoice_email_message"                     => "الگوی ایمیل فاکتور",
-    "invoice_enable"                            => "فعال کردن صورتحساب",
-    "invoice_printer"                           => "چاپگر فاکتور",
-    "invoice_type"                              => "نوع فاکتور",
-    "is_readable"                               => "قابل خواندن است ، اما مجوزها از 660 بالاتر است.",
-    "is_writable"                               => "قابل چاپ است ، اما مجوزها بالاتر از 750 است.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "هشدار: این عملکرد تنها در صورتی کار خواهد کرد که افزونه فایرفاکس ج پرینت را نصب کنید. به هر حال ذخیره می شود؟",
-    "language"                                  => "زبان",
-    "last_used_invoice_number"                  => "آخرین فاکتور استفاده شده شماره",
-    "last_used_quote_number"                    => "آخرین شماره نقل قول استفاده شده",
-    "last_used_work_order_number"               => "آخرین شماره سفارش کار استفاده شده",
-    "left"                                      => "ترک کرد",
-    "license"                                   => "مجوز",
-    "license_configuration"                     => "بیانیه مجوز",
-    "line_sequence"                             => "دنباله خط",
-    "lines_per_page"                            => "خطوط در هر صفحه",
-    "lines_per_page_number"                     => "خطوط در هر صفحه باید عددی باشند.",
-    "lines_per_page_required"                   => "خطوط در هر صفحه یک زمینه ضروری است",
-    "locale"                                    => "بومی سازی",
-    "locale_configuration"                      => "پیکربندی محلی سازی",
-    "locale_info"                               => "اطلاعات پیکربندی محلی سازی",
-    "location"                                  => "موجودی",
-    "location_configuration"                    => "محل سهام",
-    "location_info"                             => "اطلاعات پیکربندی موقعیت مکانی",
-    "login_form"                                => "",
-    "logout"                                    => "آیا می خواهید قبل از ورود ، نسخه پشتیبان تهیه کنید؟ برای پشتیبان گیری یا [لغو] برای ورود به سیستم ، روی [اوکی] کلیک کنید",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "کلید ای‌پی‌آی میل‌چیمپ",
-    "mailchimp_configuration"                   => "پیکربندی میل‌چیمپ",
-    "mailchimp_key_successfully"                => "کلید ای‌پی‌آی معتبر است.",
-    "mailchimp_key_unsuccessfully"              => "کلید ای‌پی‌آی نامعتبر است.",
-    "mailchimp_lists"                           => "لیست (های) میل‌چیمپ",
-    "mailchimp_tooltip"                         => "بر روی نماد یک کلید ای‌پی‌آی کلیک کنید.",
-    "message"                                   => "پیام",
-    "message_configuration"                     => "پیکربندی پیام",
-    "msg_msg"                                   => "پیام متنی ذخیره شده",
-    "msg_msg_placeholder"                       => "اگر می خواهید از یک پیام کوتاه استفاده کنید ، پیام خود را در اینجا ذخیره کنید ، در غیر این صورت جعبه را خالی بگذارید.",
-    "msg_pwd"                                   => "گذرواژه SMS-API",
-    "msg_pwd_required"                          => "گذرواژه ای‌پی‌آی اس‌ام‌اس یک فیلد ضروری است",
-    "msg_src"                                   => "شناسه فرستنده ای‌پی‌آی اس‌ام‌اس ",
-    "msg_src_required"                          => "شناسه فرستنده ای‌پی‌آی اس‌ام‌اس  یک زمینه ضروری است",
-    "msg_uid"                                   => "نام کاربری ای‌پی‌آی اس‌ام‌اس ",
-    "msg_uid_required"                          => "نام کاربری ای‌پی‌آی اس‌ام‌اس  یک زمینه ضروری است",
-    "multi_pack_enabled"                        => "بسته های چندگانه برای هر مورد",
-    "no_risk"                                   => "خطرات امنیتی و آسیب پذیری وجود ندارد.",
-    "none"                                      => "هیچ یک",
-    "notify_alignment"                          => "موقعیت یاب اعلان",
-    "number_format"                             => "قالب شماره",
-    "number_locale"                             => "بومی سازی",
-    "number_locale_invalid"                     => "محل ورود نامعتبر است. برای یافتن محلی معتبر ، پیوند را در راهنمای ابزار بررسی کنید.",
-    "number_locale_required"                    => "شماره محلی یک زمینه مورد نیاز است.",
-    "number_locale_tooltip"                     => "از طریق این لینک محلی مناسب پیدا کنید.",
-    "os_timezone"                               => "منطقه زمانی اوسپوس:",
-    "ospos_info"                                => "اطلاعات نصب اوسپوس",
-    "payment_options_order"                     => "سفارش گزینه های پرداخت",
-    "perm_risk"                                 => "مجوزهای بالاتر از 750 برای نوشتن و 660 برای خواندن ، این نرم افزار را در معرض خطر قرار می دهد.",
-    "phone"                                     => "تلفن شرکت",
-    "phone_required"                            => "تلفن شرکت یک زمینه ضروری است.",
-    "print_bottom_margin"                       => "حاشیه پایین",
-    "print_bottom_margin_number"                => "حاشیه پایین باید یک عدد باشد.",
-    "print_bottom_margin_required"              => "کلید مارجین یک زمینه مورد نیاز است.",
-    "print_delay_autoreturn"                    => "تأخیر در فروش تاخیر در فروش",
-    "print_delay_autoreturn_number"             => "تأخیر در فروش تاخیر یک زمینه ضروری است.",
-    "print_delay_autoreturn_required"           => "تأخیر در فروش تاخیر در فروش باید یک عدد باشد.",
-    "print_footer"                              => "چاپ پاورقی مرورگر",
-    "print_header"                              => "چاپ هدر مرورگر",
-    "print_left_margin"                         => "حاشیه چپ",
-    "print_left_margin_number"                  => "مارجین چپ باید یک عدد باشد.",
-    "print_left_margin_required"                => "Margin Left یک زمینه مورد نیاز است.",
-    "print_receipt_check_behaviour"             => "کادر تأیید چاپ",
-    "print_receipt_check_behaviour_always"      => "همیشه بررسی شد",
-    "print_receipt_check_behaviour_last"        => "انتخاب گذشته را بخاطر بسپار",
-    "print_receipt_check_behaviour_never"       => "همیشه انتخاب نشده",
-    "print_right_margin"                        => "حق حاشیه",
-    "print_right_margin_number"                 => "حاشیه سمت راست باید یک عدد باشد.",
-    "print_right_margin_required"               => "مارجین راست یک زمینه ضروری است",
-    "print_silently"                            => "نمایش گفتگوی چاپ",
-    "print_top_margin"                          => "حاشیه بالا",
-    "print_top_margin_number"                   => "حاشیه بالا باید یک عدد باشد.",
-    "print_top_margin_required"                 => "مارجین بالا یک زمینه مورد نیاز است.",
-    "quantity_decimals"                         => "تعداد اعشار",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "نقل قول های پیش فرض",
-    "receipt"                                   => "اعلام وصول",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "تنظیمات چاپ دریافت",
-    "receipt_default"                           => "پیش فرض",
-    "receipt_font_size"                         => "اندازه فونت",
-    "receipt_font_size_number"                  => "اندازه قلم باید یک عدد باشد.",
-    "receipt_font_size_required"                => "اندازه قلم یک فیلد مورد نیاز است.",
-    "receipt_info"                              => "اطلاعات پیکربندی دریافت",
-    "receipt_printer"                           => "چاپگر بلیط",
-    "receipt_short"                             => "کوتاه",
-    "receipt_show_company_name"                 => "نمایش نام شرکت",
-    "receipt_show_description"                  => "نمایش توضیحات",
-    "receipt_show_serialnumber"                 => "نمایش شماره سریال",
-    "receipt_show_tax_ind"                      => "نمایش شاخص مالیات",
-    "receipt_show_taxes"                        => "نمایش مالیات",
-    "receipt_show_total_discount"               => "نمایش تخفیف در کل",
-    "receipt_template"                          => "الگوی رسید",
-    "receiving_calculate_average_price"         => "کالای میانگین. قیمت (دريافت)",
-    "recv_invoice_format"                       => "قالب فاکتور دریافتی",
-    "register_mode_default"                     => "حالت پیش فرض ثبت نام",
-    "report_an_issue"                           => "گزارش یک مسئله",
-    "return_policy_required"                    => "خط مشی برگشت یک زمینه مورد نیاز است.",
-    "reward"                                    => "جایزه",
-    "reward_configuration"                      => "پیکربندی پاداش",
-    "right"                                     => "درست",
-    "sales_invoice_format"                      => "قالب فاکتور فروش",
-    "sales_quote_format"                        => "قالب فروش قیمت",
-    "saved_successfully"                        => "پیکربندی ذخیره موفقیت آمیز است.",
-    "saved_unsuccessfully"                      => "ذخیره پیکربندی انجام نشد.",
-    "security_issue"                            => "هشدار آسیب پذیری امنیتی",
-    "server_notice"                             => "لطفاً برای گزارش مسئله از اطلاعات زیر استفاده کنید.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "نمایش نماد دفتر",
-    "statistics"                                => "ارسال آمار",
-    "statistics_tooltip"                        => "ارسال آمار برای اهداف توسعه و بهبود ویژگی ها.",
-    "stock_location"                            => "موقعیت مکانی سهام",
-    "stock_location_duplicate"                  => "موقعیت مکانی سهام باید بی نظیر باشد.",
-    "stock_location_invalid_chars"              => "محل نگهداری سهام نمی تواند حاوی ـ باشد.",
-    "stock_location_required"                   => "مکان سهام یک قسمت مورد نیاز است.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "ستون 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "طرح بندی پیشنهادات جستجو",
-    "suggestions_second_column"                 => "ستون 2",
-    "suggestions_third_column"                  => "ستون 3",
-    "system_conf"                               => "تنظیم و تنظیم",
-    "system_info"                               => "اطلاعات سیستم",
-    "table"                                     => "جدول",
-    "table_configuration"                       => "پیکربندی جدول",
-    "takings_printer"                           => "چاپگر رسید",
-    "tax"                                       => "مالیات",
-    "tax_category"                              => "طبقه بندی مالیات",
-    "tax_category_duplicate"                    => "دسته مالیاتی وارد شده در حال حاضر وجود دارد.",
-    "tax_category_invalid_chars"                => "دسته مالیاتی وارد شده نامعتبر است.",
-    "tax_category_required"                     => "طبقه بندی مالیات لازم است.",
-    "tax_category_used"                         => "طبقه بندی مالیات نمی تواند حذف شود زیرا در حال استفاده است.",
-    "tax_configuration"                         => "پیکربندی مالیات",
-    "tax_decimals"                              => "اعشار مالیاتی",
-    "tax_id"                                    => "شناسه مالیاتی",
-    "tax_included"                              => "با احتساب مالیات",
-    "theme"                                     => "موضوع",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "هزاران نفر",
-    "timezone"                                  => "منطقه زمانی",
-    "timezone_error"                            => "منطقه زمانی اوسپوس با منطقه زمانی محلی شما متفاوت است.",
-    "top"                                       => "بالا",
-    "use_destination_based_tax"                 => "استفاده از مالیات بر مبنای مقصد",
-    "user_timezone"                             => "منطقه زمانی محلی:",
-    "website"                                   => "سایت اینترنتی",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "پشتیبانی سفارش کار",
-    "work_order_format"                         => "قالب سفارش کار",
+    'address'                                   => 'آدرس شرکت',
+    'address_required'                          => 'آدرس شرکت یک زمینه ضروری است.',
+    'all_set'                                   => 'همه مجوزهای پرونده درست تنظیم شده اند!',
+    'allow_duplicate_barcodes'                  => 'مجاز بارکد های تکراری',
+    'apostrophe'                                => 'ارتداد',
+    'backup_button'                             => 'پشتیبان گیری',
+    'backup_database'                           => 'بانک اطلاعات پشتیبان',
+    'barcode'                                   => 'بارکد',
+    'barcode_company'                           => 'نام شرکت',
+    'barcode_configuration'                     => 'پیکربندی بارکد',
+    'barcode_content'                           => 'محتوای بارکد',
+    'barcode_first_row'                         => 'ردیف 1',
+    'barcode_font'                              => 'قلم',
+    'barcode_formats'                           => 'قالبهای ورودی',
+    'barcode_generate_if_empty'                 => 'اگر خالی باشد تولید کنید.',
+    'barcode_height'                            => 'قد به پیکسل',
+    'barcode_id'                                => 'شناسه مورد / نام',
+    'barcode_info'                              => 'اطلاعات پیکربندی بارکد',
+    'barcode_layout'                            => 'چیدمان بارکد',
+    'barcode_name'                              => 'نام',
+    'barcode_number'                            => 'بارکد',
+    'barcode_number_in_row'                     => 'تعداد در ردیف',
+    'barcode_page_cellspacing'                  => 'نمایش جای خالی صفحه.',
+    'barcode_page_width'                        => 'نمایش عرض صفحه',
+    'barcode_price'                             => 'قیمت',
+    'barcode_second_row'                        => 'ردیف 2',
+    'barcode_third_row'                         => 'ردیف 3',
+    'barcode_tooltip'                           => 'اخطار: این ویژگی می تواند باعث وارد شدن یا ایجاد موارد تکراری شود. اگر نمی خواهید بارکد های تکراری داشته باشید ، از آنها استفاده نکنید.',
+    'barcode_type'                              => '',
+    'barcode_width'                             => 'عرض به پیکسل',
+    'bottom'                                    => 'پایین',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'اعشار نقدی',
+    'cash_decimals_tooltip'                     => 'اگر کسرهای نقدی و دهدهی های ارزی یکسان باشد ، هیچ دور وجه نقدی صورت نمی گیرد.',
+    'cash_rounding'                             => 'گرد پول نقد',
+    'category_dropdown'                         => 'نمایش دسته بندی به عنوان یک بازده',
+    'center'                                    => 'مرکز',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'کام',
+    'company'                                   => 'نام شرکت',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'تغییر تصویر',
+    'company_logo'                              => 'آرم شرکت',
+    'company_remove_image'                      => 'حذف تصویر',
+    'company_required'                          => 'نام شرکت یک زمینه ضروری است',
+    'company_select_image'                      => 'تصویر را انتخاب کنید',
+    'company_website_url'                       => 'وب سایت شرکت معتبر نیست',
+    'country_codes'                             => 'کد کشور',
+    'country_codes_tooltip'                     => 'کاما لیست کدهای کشور را برای جستجوی آدرس  جدا کرد.',
+    'currency_code'                             => 'کد ارز',
+    'currency_decimals'                         => 'اعشار ارزی',
+    'currency_symbol'                           => 'نماد ارز',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'جایزه',
+    'customer_reward_duplicate'                 => 'پاداش باید بی نظیر باشد.',
+    'customer_reward_enable'                    => 'فعال کردن پاداش مشتری',
+    'customer_reward_invalid_chars'             => 'پاداش نمی تواند حاوی ـ باشد',
+    'customer_reward_required'                  => 'پاداش یک زمینه ضروری است',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'فیلتر تاریخ و زمان',
+    'datetimeformat'                            => 'قالب و تاریخ',
+    'decimal_point'                             => 'نقطه اعشار',
+    'default_barcode_font_size_number'          => 'اندازه قلم بارکد پیش فرض باید یک عدد باشد.',
+    'default_barcode_font_size_required'        => 'اندازه قلم پیش فرض بارکد یک فیلد مورد نیاز است.',
+    'default_barcode_height_number'             => 'ارتفاع پیش فرض بارکد باید یک عدد باشد.',
+    'default_barcode_height_required'           => 'پیش فرض بارکد ارتفاع یک فیلد مورد نیاز است.',
+    'default_barcode_num_in_row_number'         => 'شماره بارکد پیش فرض در ردیف باید یک عدد باشد.',
+    'default_barcode_num_in_row_required'       => 'پیش فرض بارکد شماره در ردیف یک زمینه مورد نیاز است.',
+    'default_barcode_page_cellspacing_number'   => 'صفحه پیش فرض بارکد باید یک شماره باشد.',
+    'default_barcode_page_cellspacing_required' => 'به طور پیش فرض بارکد صفحه یک زمینه مورد نیاز است.',
+    'default_barcode_page_width_number'         => 'عرض صفحه بارکد پیش فرض باید یک عدد باشد.',
+    'default_barcode_page_width_required'       => 'صفحه پیش فرض بارکد یک فیلد ضروری است.',
+    'default_barcode_width_number'              => 'عرض پیش فرض بارکد باید یک عدد باشد.',
+    'default_barcode_width_required'            => 'پیش فرض عرض بارکد یک فیلد مورد نیاز است.',
+    'default_item_columns'                      => 'ستون های مورد قابل مشاهده پیش فرض',
+    'default_origin_tax_code'                   => 'کد مالیات پیش فرض مبداء',
+    'default_receivings_discount'               => 'تخفیف دريافت دريافت',
+    'default_receivings_discount_number'        => 'تخفیف دريافت پیش فرض باید یک عدد باشد.',
+    'default_receivings_discount_required'      => 'تخفیف دريافت پیش فرض یک قسمت مورد نیاز است.',
+    'default_sales_discount'                    => 'تخفیف فروش پیش فرض',
+    'default_sales_discount_number'             => 'تخفیف فروش پیش فرض باید یک عدد باشد.',
+    'default_sales_discount_required'           => 'تخفیف فروش پیش فرض یک قسمت مورد نیاز است.',
+    'default_tax_category'                      => 'طبقه بندی پیش فرض مالیات',
+    'default_tax_code'                          => 'کد پیش فرض مالیات',
+    'default_tax_jurisdiction'                  => 'پیش فرض صلاحیت مالیاتی',
+    'default_tax_name_number'                   => 'نام مالیات پیش فرض باید یک رشته باشد.',
+    'default_tax_name_required'                 => 'نام مالیات پیش فرض یک قسمت مورد نیاز است.',
+    'default_tax_rate'                          => 'پیش فرض نرخ مالیات٪',
+    'default_tax_rate_1'                        => 'نرخ مالیات 1',
+    'default_tax_rate_2'                        => 'نرخ مالیات 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'نرخ مالیات پیش فرض باید یک عدد باشد.',
+    'default_tax_rate_required'                 => 'پیش فرض مالیات نرخ مورد نیاز است.',
+    'derive_sale_quantity'                      => 'مجاز به مقدار فروش مشتق شده',
+    'derive_sale_quantity_tooltip'              => 'اگر بررسی شود ، نوع جدیدی برای موارد سفارش داده شده با مقدار طولانی ارائه می شود',
+    'dinner_table'                              => 'جدول',
+    'dinner_table_duplicate'                    => 'جدول باید بی نظیر باشد.',
+    'dinner_table_enable'                       => 'فعال کردن جداول شام',
+    'dinner_table_invalid_chars'                => 'نام جدول نمی تواند حاوی ـ باشد.',
+    'dinner_table_required'                     => 'جدول فیلد مورد نیاز است.',
+    'dot'                                       => 'نقطه',
+    'email'                                     => 'پست الکترونیک',
+    'email_configuration'                       => 'پیکربندی ایمیل',
+    'email_mailpath'                            => ' مسیر ارسال به برنامه (سندمیل)',
+    'email_protocol'                            => 'پروتکل',
+    'email_receipt_check_behaviour'             => 'کادر بررسی دریافت ایمیل',
+    'email_receipt_check_behaviour_always'      => 'همیشه بررسی شد',
+    'email_receipt_check_behaviour_last'        => 'انتخاب گذشته را بخاطر بسپار',
+    'email_receipt_check_behaviour_never'       => 'همیشه انتخاب نشده',
+    'email_smtp_crypto'                         => 'SMTP رمزگذاری',
+    'email_smtp_host'                           => 'SMTP سرور',
+    'email_smtp_pass'                           => 'SMTP گذرواژه',
+    'email_smtp_port'                           => 'SMTP پورت',
+    'email_smtp_timeout'                        => 'SMT Timeout (s)',
+    'email_smtp_user'                           => 'SMTP نام کاربری',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'اجرای حریم خصوصی',
+    'enforce_privacy_tooltip'                   => 'در صورت از بین بردن داده های آنها در صورت حذف داده ها ، از حفظ حریم خصوصی مشتریان محافظت کنید',
+    'fax'                                       => 'نمابر',
+    'file_perm'                                 => 'در مجوزهای پرونده مشکلی وجود دارد ، لطفا این صفحه را تعمیر و بارگذاری مجدد کنید.',
+    'financial_year'                            => 'شروع سال مالی',
+    'financial_year_apr'                        => 'اول آوریل',
+    'financial_year_aug'                        => 'اول اوت',
+    'financial_year_dec'                        => 'اول دسامبر',
+    'financial_year_feb'                        => 'اول فوریه',
+    'financial_year_jan'                        => 'اول ژانویه',
+    'financial_year_jul'                        => 'اول ژوئیه',
+    'financial_year_jun'                        => 'اول ژوئن',
+    'financial_year_mar'                        => 'اول مارس',
+    'financial_year_may'                        => 'اول ماه مه',
+    'financial_year_nov'                        => 'اول نوامبر',
+    'financial_year_oct'                        => 'اول اکتبر',
+    'financial_year_sep'                        => 'اول سپتامبر',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'صفحه ورود کپچا',
+    'gcaptcha_secret_key'                       => 'کلید مخفی کپچا',
+    'gcaptcha_secret_key_required'              => 'کلید مخفی کپچا یک زمینه مورد نیاز است',
+    'gcaptcha_site_key'                         => 'کلید سایت کپچا',
+    'gcaptcha_site_key_required'                => 'کلید سایت کپچا یک زمینه مورد نیاز است',
+    'gcaptcha_tooltip'                          => 'از صفحه ورود با کپچا محافظت کنید ، روی یک نماد برای یک جفت کلید ای‌پی‌آی کلیک کنید.',
+    'general'                                   => 'عمومی',
+    'general_configuration'                     => 'پیکربندی عمومی',
+    'giftcard_number'                           => 'شماره کارت هدیه',
+    'giftcard_random'                           => 'تولید تصادفی',
+    'giftcard_series'                           => 'تولید در سریال',
+    'image_allowed_file_types'                  => 'انواع پرونده مجاز',
+    'image_max_height_tooltip'                  => 'حداکثر ارتفاع مجاز بارگذاری تصویر در پیکسل ها (px).',
+    'image_max_size_tooltip'                    => 'حداکثر اندازه مجاز بارگذاری تصویر در کیلوبایت (کیلوبایت).',
+    'image_max_width_tooltip'                   => 'حداکثر عرض مجاز بارگذاری تصویر در پیکسل ها (px).',
+    'image_restrictions'                        => 'محدودیتهای آپلود تصویر',
+    'include_hsn'                               => 'شامل پشتیبانی از کدهای اچ‌اس‌ان',
+    'info'                                      => 'اطلاعات',
+    'info_configuration'                        => 'اطلاعات فروشگاه',
+    'input_groups'                              => '',
+    'integrations'                              => 'ادغام',
+    'integrations_configuration'                => 'ادغام های شخص ثالث',
+    'invoice'                                   => 'صورتحساب',
+    'invoice_configuration'                     => 'تنظیمات چاپ فاکتور',
+    'invoice_default_comments'                  => 'نظرات پیش فرض فاکتور',
+    'invoice_email_message'                     => 'الگوی ایمیل فاکتور',
+    'invoice_enable'                            => 'فعال کردن صورتحساب',
+    'invoice_printer'                           => 'چاپگر فاکتور',
+    'invoice_type'                              => 'نوع فاکتور',
+    'is_readable'                               => 'قابل خواندن است ، اما مجوزها از 660 بالاتر است.',
+    'is_writable'                               => 'قابل چاپ است ، اما مجوزها بالاتر از 750 است.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'هشدار: این عملکرد تنها در صورتی کار خواهد کرد که افزونه فایرفاکس ج پرینت را نصب کنید. به هر حال ذخیره می شود؟',
+    'language'                                  => 'زبان',
+    'last_used_invoice_number'                  => 'آخرین فاکتور استفاده شده شماره',
+    'last_used_quote_number'                    => 'آخرین شماره نقل قول استفاده شده',
+    'last_used_work_order_number'               => 'آخرین شماره سفارش کار استفاده شده',
+    'left'                                      => 'ترک کرد',
+    'license'                                   => 'مجوز',
+    'license_configuration'                     => 'بیانیه مجوز',
+    'line_sequence'                             => 'دنباله خط',
+    'lines_per_page'                            => 'خطوط در هر صفحه',
+    'lines_per_page_number'                     => 'خطوط در هر صفحه باید عددی باشند.',
+    'lines_per_page_required'                   => 'خطوط در هر صفحه یک زمینه ضروری است',
+    'locale'                                    => 'بومی سازی',
+    'locale_configuration'                      => 'پیکربندی محلی سازی',
+    'locale_info'                               => 'اطلاعات پیکربندی محلی سازی',
+    'location'                                  => 'موجودی',
+    'location_configuration'                    => 'محل سهام',
+    'location_info'                             => 'اطلاعات پیکربندی موقعیت مکانی',
+    'login_form'                                => '',
+    'logout'                                    => 'آیا می خواهید قبل از ورود ، نسخه پشتیبان تهیه کنید؟ برای پشتیبان گیری یا [لغو] برای ورود به سیستم ، روی [اوکی] کلیک کنید',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'کلید ای‌پی‌آی میل‌چیمپ',
+    'mailchimp_configuration'                   => 'پیکربندی میل‌چیمپ',
+    'mailchimp_key_successfully'                => 'کلید ای‌پی‌آی معتبر است.',
+    'mailchimp_key_unsuccessfully'              => 'کلید ای‌پی‌آی نامعتبر است.',
+    'mailchimp_lists'                           => 'لیست (های) میل‌چیمپ',
+    'mailchimp_tooltip'                         => 'بر روی نماد یک کلید ای‌پی‌آی کلیک کنید.',
+    'message'                                   => 'پیام',
+    'message_configuration'                     => 'پیکربندی پیام',
+    'msg_msg'                                   => 'پیام متنی ذخیره شده',
+    'msg_msg_placeholder'                       => 'اگر می خواهید از یک پیام کوتاه استفاده کنید ، پیام خود را در اینجا ذخیره کنید ، در غیر این صورت جعبه را خالی بگذارید.',
+    'msg_pwd'                                   => 'گذرواژه SMS-API',
+    'msg_src'                                   => 'شناسه فرستنده ای‌پی‌آی اس‌ام‌اس ',
+    'msg_src_required'                          => 'شناسه فرستنده ای‌پی‌آی اس‌ام‌اس  یک زمینه ضروری است',
+    'msg_uid'                                   => 'نام کاربری ای‌پی‌آی اس‌ام‌اس ',
+    'msg_uid_required'                          => 'نام کاربری ای‌پی‌آی اس‌ام‌اس  یک زمینه ضروری است',
+    'multi_pack_enabled'                        => 'بسته های چندگانه برای هر مورد',
+    'no_risk'                                   => 'خطرات امنیتی و آسیب پذیری وجود ندارد.',
+    'none'                                      => 'هیچ یک',
+    'notify_alignment'                          => 'موقعیت یاب اعلان',
+    'number_format'                             => 'قالب شماره',
+    'number_locale'                             => 'بومی سازی',
+    'number_locale_invalid'                     => 'محل ورود نامعتبر است. برای یافتن محلی معتبر ، پیوند را در راهنمای ابزار بررسی کنید.',
+    'number_locale_required'                    => 'شماره محلی یک زمینه مورد نیاز است.',
+    'number_locale_tooltip'                     => 'از طریق این لینک محلی مناسب پیدا کنید.',
+    'os_timezone'                               => 'منطقه زمانی اوسپوس:',
+    'ospos_info'                                => 'اطلاعات نصب اوسپوس',
+    'payment_options_order'                     => 'سفارش گزینه های پرداخت',
+    'payment_reference_code_length_limits'      => 'کد مرجع پرداخت<br>محدودیت‌های طول',
+    'payment_reference_code_length_max_label'   => 'حداکثر',
+    'payment_reference_code_length_min_label'   => 'حداقل',
+    'perm_risk'                                 => 'مجوزهای بالاتر از 750 برای نوشتن و 660 برای خواندن ، این نرم افزار را در معرض خطر قرار می دهد.',
+    'phone'                                     => 'تلفن شرکت',
+    'phone_required'                            => 'تلفن شرکت یک زمینه ضروری است.',
+    'print_bottom_margin'                       => 'حاشیه پایین',
+    'print_bottom_margin_number'                => 'حاشیه پایین باید یک عدد باشد.',
+    'print_bottom_margin_required'              => 'کلید مارجین یک زمینه مورد نیاز است.',
+    'print_delay_autoreturn'                    => 'تأخیر در فروش تاخیر در فروش',
+    'print_delay_autoreturn_number'             => 'تأخیر در فروش تاخیر یک زمینه ضروری است.',
+    'print_delay_autoreturn_required'           => 'تأخیر در فروش تاخیر در فروش باید یک عدد باشد.',
+    'print_footer'                              => 'چاپ پاورقی مرورگر',
+    'print_header'                              => 'چاپ هدر مرورگر',
+    'print_left_margin'                         => 'حاشیه چپ',
+    'print_left_margin_number'                  => 'مارجین چپ باید یک عدد باشد.',
+    'print_left_margin_required'                => 'Margin Left یک زمینه مورد نیاز است.',
+    'print_receipt_check_behaviour'             => 'کادر تأیید چاپ',
+    'print_receipt_check_behaviour_always'      => 'همیشه بررسی شد',
+    'print_receipt_check_behaviour_last'        => 'انتخاب گذشته را بخاطر بسپار',
+    'print_receipt_check_behaviour_never'       => 'همیشه انتخاب نشده',
+    'print_right_margin'                        => 'حق حاشیه',
+    'print_right_margin_number'                 => 'حاشیه سمت راست باید یک عدد باشد.',
+    'print_right_margin_required'               => 'مارجین راست یک زمینه ضروری است',
+    'print_silently'                            => 'نمایش گفتگوی چاپ',
+    'print_top_margin'                          => 'حاشیه بالا',
+    'print_top_margin_number'                   => 'حاشیه بالا باید یک عدد باشد.',
+    'print_top_margin_required'                 => 'مارجین بالا یک زمینه مورد نیاز است.',
+    'quantity_decimals'                         => 'تعداد اعشار',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'نقل قول های پیش فرض',
+    'receipt'                                   => 'اعلام وصول',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'تنظیمات چاپ دریافت',
+    'receipt_default'                           => 'پیش فرض',
+    'receipt_font_size'                         => 'اندازه فونت',
+    'receipt_font_size_number'                  => 'اندازه قلم باید یک عدد باشد.',
+    'receipt_font_size_required'                => 'اندازه قلم یک فیلد مورد نیاز است.',
+    'receipt_info'                              => 'اطلاعات پیکربندی دریافت',
+    'receipt_printer'                           => 'چاپگر بلیط',
+    'receipt_short'                             => 'کوتاه',
+    'receipt_show_company_name'                 => 'نمایش نام شرکت',
+    'receipt_show_description'                  => 'نمایش توضیحات',
+    'receipt_show_serialnumber'                 => 'نمایش شماره سریال',
+    'receipt_show_tax_ind'                      => 'نمایش شاخص مالیات',
+    'receipt_show_taxes'                        => 'نمایش مالیات',
+    'receipt_show_total_discount'               => 'نمایش تخفیف در کل',
+    'receipt_template'                          => 'الگوی رسید',
+    'receiving_calculate_average_price'         => 'کالای میانگین. قیمت (دريافت)',
+    'recv_invoice_format'                       => 'قالب فاکتور دریافتی',
+    'register_mode_default'                     => 'حالت پیش فرض ثبت نام',
+    'report_an_issue'                           => 'گزارش یک مسئله',
+    'return_policy_required'                    => 'خط مشی برگشت یک زمینه مورد نیاز است.',
+    'reward'                                    => 'جایزه',
+    'reward_configuration'                      => 'پیکربندی پاداش',
+    'right'                                     => 'درست',
+    'sales_invoice_format'                      => 'قالب فاکتور فروش',
+    'sales_quote_format'                        => 'قالب فروش قیمت',
+    'mailpath_invalid'                          => 'مسیر sendmail نامعتبر است. فقط حروف، اعداد، خط‌تیره، زیرخط، اسلش، بک‌اسلش، دونقطه، فاصله و نقطه مجاز هستند.',
+    'saved_successfully'                        => 'پیکربندی ذخیره موفقیت آمیز است.',
+    'saved_unsuccessfully'                      => 'ذخیره پیکربندی انجام نشد.',
+    'security_issue'                            => 'هشدار آسیب پذیری امنیتی',
+    'server_notice'                             => 'لطفاً برای گزارش مسئله از اطلاعات زیر استفاده کنید.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'نمایش نماد دفتر',
+    'statistics'                                => 'ارسال آمار',
+    'statistics_tooltip'                        => 'ارسال آمار برای اهداف توسعه و بهبود ویژگی ها.',
+    'stock_location'                            => 'موقعیت مکانی سهام',
+    'stock_location_duplicate'                  => 'موقعیت مکانی سهام باید بی نظیر باشد.',
+    'stock_location_invalid_chars'              => 'محل نگهداری سهام نمی تواند حاوی ـ باشد.',
+    'stock_location_required'                   => 'مکان سهام یک قسمت مورد نیاز است.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'ستون 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'طرح بندی پیشنهادات جستجو',
+    'suggestions_second_column'                 => 'ستون 2',
+    'suggestions_third_column'                  => 'ستون 3',
+    'system_conf'                               => 'تنظیم و تنظیم',
+    'system_info'                               => 'اطلاعات سیستم',
+    'table'                                     => 'جدول',
+    'table_configuration'                       => 'پیکربندی جدول',
+    'takings_printer'                           => 'چاپگر رسید',
+    'tax'                                       => 'مالیات',
+    'tax_category'                              => 'طبقه بندی مالیات',
+    'tax_category_duplicate'                    => 'دسته مالیاتی وارد شده در حال حاضر وجود دارد.',
+    'tax_category_invalid_chars'                => 'دسته مالیاتی وارد شده نامعتبر است.',
+    'tax_category_required'                     => 'طبقه بندی مالیات لازم است.',
+    'tax_category_used'                         => 'طبقه بندی مالیات نمی تواند حذف شود زیرا در حال استفاده است.',
+    'tax_configuration'                         => 'پیکربندی مالیات',
+    'tax_decimals'                              => 'اعشار مالیاتی',
+    'tax_id'                                    => 'شناسه مالیاتی',
+    'tax_included'                              => 'با احتساب مالیات',
+    'theme'                                     => 'موضوع',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'هزاران نفر',
+    'timezone'                                  => 'منطقه زمانی',
+    'timezone_error'                            => 'منطقه زمانی اوسپوس با منطقه زمانی محلی شما متفاوت است.',
+    'top'                                       => 'بالا',
+    'use_destination_based_tax'                 => 'استفاده از مالیات بر مبنای مقصد',
+    'user_timezone'                             => 'منطقه زمانی محلی:',
+    'website'                                   => 'سایت اینترنتی',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'پشتیبانی سفارش کار',
+    'work_order_format'                         => 'قالب سفارش کار',
 ];
diff --git a/app/Language/fa/Employees.php b/app/Language/fa/Employees.php
index e1c06b1d5..6bea569a7 100644
--- a/app/Language/fa/Employees.php
+++ b/app/Language/fa/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "اطلاعات",
-    "cannot_be_deleted"            => "حذف کارمند (های) انتخابی امکان پذیر نیست ، یک یا چند مورد از فروش پردازش شده استفاده کرده یا می خواهید حساب خود را حذف کنید.",
-    "change_employee"              => "",
-    "change_password"              => "تغییر رمز عبور",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "آیا مطمئن هستید که می خواهید کارمند (های) انتخاب شده را حذف کنید؟",
-    "confirm_restore"              => "آیا مطمئن هستید که می خواهید کارمندان (های) انتخاب شده را بازیابی کنید؟",
-    "current_password"             => "گذرواژه فعلی",
-    "current_password_invalid"     => "گذرواژه فعلی نامعتبر است.",
-    "employee"                     => "کارمند",
-    "error_adding_updating"        => "افزودن یا به روزرسانی کارکنان انجام نشد.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "شما نمی توانید کاربر مدیر نسخه ی نمایشی را حذف کنید.",
-    "error_updating_demo_admin"    => "شما نمی توانید کاربر مدیر نسخه ی نمایشی را تغییر دهید.",
-    "language"                     => "زبان",
-    "login_info"                   => "وارد شدن",
-    "manager"                      => "",
-    "new"                          => "کارمند جدید",
-    "none_selected"                => "شما هیچ کارمندی را برای حذف انتخاب نکرده اید.",
-    "one_or_multiple"              => "کارمند (ها)",
-    "password"                     => "کلمه عبور",
-    "password_minlength"           => "گذرواژه باید حداقل 8 نویسه داشته باشد.",
-    "password_must_match"          => "رمزهای ورود مطابقت ندارند.",
-    "password_not_must_match"      => "گذرواژه فعلی و رمز جدید باید بی نظیر باشند.",
-    "password_required"            => "رمز عبور مورد نیاز است.",
-    "permission_desc"              => "کادرهای زیر را برای دسترسی به ماژولها بررسی کنید.",
-    "permission_info"              => "مجوزها",
-    "repeat_password"              => "رمز عبور دوباره",
-    "subpermission_required"       => "برای هر ماژول حداقل یک کمک هزینه اضافه کنید.",
-    "successful_adding"            => "کارمندان موفق شدند.",
-    "successful_change_password"   => "تغییر رمز عبور موفقیت آمیز است.",
-    "successful_deleted"           => "شما با موفقیت حذف شده اید",
-    "successful_updating"          => "شما با موفقیت کارمند را به روز کردید",
-    "system_language"              => "زبان سیستم",
-    "unsuccessful_change_password" => "تغییر رمز انجام نشد.",
-    "update"                       => "به روزرسانی کارمند",
-    "username"                     => "نام کاربری",
-    "username_duplicate"           => "",
-    "username_minlength"           => "نام کاربری باید حداقل 5 کاراکتر داشته باشد.",
-    "username_required"            => "نام کاربری فیلد مورد نیاز است.",
+    'administrator'                          => '',
+    'basic_information'                      => 'اطلاعات',
+    'cannot_be_deleted'                      => 'حذف کارمند (های) انتخابی امکان پذیر نیست ، یک یا چند مورد از فروش پردازش شده استفاده کرده یا می خواهید حساب خود را حذف کنید.',
+    'change_employee'                        => '',
+    'change_password'                        => 'تغییر رمز عبور',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'آیا مطمئن هستید که می خواهید کارمند (های) انتخاب شده را حذف کنید؟',
+    'confirm_restore'                        => 'آیا مطمئن هستید که می خواهید کارمندان (های) انتخاب شده را بازیابی کنید؟',
+    'current_password'                       => 'گذرواژه فعلی',
+    'current_password_invalid'               => 'گذرواژه فعلی نامعتبر است.',
+    'employee'                               => 'کارمند',
+    'error_adding_updating'                  => 'افزودن یا به روزرسانی کارکنان انجام نشد.',
+    'error_cannot_remove_own_minimum_grant'  => 'شما نمی توانید حداقل مجوزهای دسترسی به ماژول خود را حذف کنید.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'شما نمی توانید کاربر مدیر نسخه ی نمایشی را حذف کنید.',
+    'error_grant_change_disallowed'          => 'تغییرات اعطا در این نسخه نمایشی غیرفعال است.',
+    'error_password_change_disallowed'       => 'تغییرات رمز عبور در این نسخه نمایشی غیرفعال است.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'شما نمی توانید کاربر مدیر نسخه ی نمایشی را تغییر دهید.',
+    'language'                               => 'زبان',
+    'login_info'                             => 'وارد شدن',
+    'manager'                                => '',
+    'new'                                    => 'کارمند جدید',
+    'none_selected'                          => 'شما هیچ کارمندی را برای حذف انتخاب نکرده اید.',
+    'one_or_multiple'                        => 'کارمند (ها)',
+    'password'                               => 'کلمه عبور',
+    'password_minlength'                     => 'گذرواژه باید حداقل 8 نویسه داشته باشد.',
+    'password_must_match'                    => 'رمزهای ورود مطابقت ندارند.',
+    'password_not_must_match'                => 'گذرواژه فعلی و رمز جدید باید بی نظیر باشند.',
+    'password_required'                      => 'رمز عبور مورد نیاز است.',
+    'permission_desc'                        => 'کادرهای زیر را برای دسترسی به ماژولها بررسی کنید.',
+    'permission_info'                        => 'مجوزها',
+    'repeat_password'                        => 'رمز عبور دوباره',
+    'subpermission_required'                 => 'برای هر ماژول حداقل یک کمک هزینه اضافه کنید.',
+    'successful_adding'                      => 'کارمندان موفق شدند.',
+    'successful_change_password'             => 'تغییر رمز عبور موفقیت آمیز است.',
+    'successful_deleted'                     => 'شما با موفقیت حذف شده اید',
+    'successful_updating'                    => 'شما با موفقیت کارمند را به روز کردید',
+    'system_language'                        => 'زبان سیستم',
+    'unsuccessful_change_password'           => 'تغییر رمز انجام نشد.',
+    'update'                                 => 'به روزرسانی کارمند',
+    'username'                               => 'نام کاربری',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'نام کاربری باید حداقل 5 کاراکتر داشته باشد.',
+    'username_required'                      => 'نام کاربری فیلد مورد نیاز است.',
 ];
diff --git a/app/Language/fa/Error.php b/app/Language/fa/Error.php
index 518640451..d3ce1666e 100644
--- a/app/Language/fa/Error.php
+++ b/app/Language/fa/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "شما اجازه دسترسی به ماژول به نام خود را ندارید",
-    "unknown"              => "خطای غیر منتظره",
+    'no_permission_module'           => 'شما اجازه دسترسی به ماژول به نام خود را ندارید',
+    'unable_to_create_env_file'      => 'ایجاد {filePath} برای آماده‌سازی throttle.key ممکن نشد',
+    'unable_to_lock_file'            => 'قفل کردن {filePath} ممکن نشد: {reason}',
+    'unable_to_open_lock_file'       => 'باز کردن {filePath} ممکن نشد: {reason}',
+    'unable_to_persist_throttle_key' => 'ذخیره throttle.key در {filePath} ممکن نشد',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'خواندن {filePath} برای آماده‌سازی throttle.key ممکن نشد',
+    'unknown'                        => 'خطای غیر منتظره',
 ];
diff --git a/app/Language/fa/Items.php b/app/Language/fa/Items.php
index 0de0695ca..31d8a4169 100644
--- a/app/Language/fa/Items.php
+++ b/app/Language/fa/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "موجودی برای اضافه یا تفریق.",
-    "allow_alt_description"              => "اجازه توضیحات جایگزین",
-    "amount_entry"                       => "مقدار ورود",
-    "bulk_edit"                          => "ویرایش فله",
-    "buy_price_required"                 => "قیمت خرید فیلد مورد نیاز است.",
-    "cannot_be_deleted"                  => "نمی توان آیتم های انتخابی را حذف کرد ، یک یا چند مورد انتخاب شده فروش دارند.",
-    "cannot_find_item"                   => "مورد پیدا نشد.",
-    "categories"                         => "",
-    "category"                           => "دسته بندی",
-    "category_new"                       => "",
-    "category_required"                  => "دسته بندی یک فیلد ضروری است.",
-    "change_all_to_allow_alt_desc"       => "اجازه دهید توضیحات جایگزین برای همه مجاز باشد.",
-    "change_all_to_not_allow_allow_desc" => "اجازه دهید توضیحات جایگزین برای همه مجاز نباشد.",
-    "change_all_to_serialized"           => "تغییر همه به سریال شده",
-    "change_all_to_unserialized"         => "تغییر همه به غیرسیاسی",
-    "change_image"                       => "تغییر تصویر",
-    "confirm_bulk_edit"                  => "آیا مطمئن هستید که می خواهید موارد (های) انتخاب شده را ویرایش کنید؟",
-    "confirm_bulk_edit_wipe_taxes"       => "تمام اطلاعات مربوط به مالیات مورد جایگزین خواهد شد.",
-    "confirm_delete"                     => "آیا مطمئن هستید که می خواهید موارد (های) انتخاب شده را حذف کنید؟",
-    "confirm_restore"                    => "آیا مطمئن هستید که می خواهید موارد (های) انتخاب شده را بازیابی کنید؟",
-    "cost_price"                         => "قیمت عمده فروشی",
-    "cost_price_number"                  => "قیمت عمده فروشی باید یک عدد باشد.",
-    "cost_price_required"                => "قیمت عمده فروشی یک زمینه ضروری است.",
-    "count"                              => "به روزرسانی موجودی",
-    "csv_import_failed"                  => "واردات سی‌اس‌وی انجام نشد",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "پرونده سی‌اس‌وی آپلود شده داده ای ندارد یا به طور نادرست قالب بندی شده است.",
-    "csv_import_partially_failed"        => "در خط (ها){0} شکست واردات کالا وجود دارد:{1}. هیچ سطر وارد نشده است.",
-    "csv_import_success"                 => "وارد کردن سی‌اس‌وی مورد موفقیت آمیز است.",
-    "current_quantity"                   => "مقدار فعلی",
-    "default_pack_name"                  => "هر یک",
-    "description"                        => "شرح",
-    "details_count"                      => "جزئیات شمارش موجودی",
-    "do_nothing"                         => "هیچ کاری نکن",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "زمینه های مورد نظر را برای موارد (های) انتخاب شده ویرایش کنید.",
-    "edit_multiple_items"                => "ویرایش موارد متعدد",
-    "empty_upc_items"                    => "موارد خالی بارکد",
-    "error_adding_updating"              => "خطا در افزودن / به روزرسانی مورد",
-    "error_updating_multiple"            => "خطا در به روزرسانی موارد",
-    "generate_barcodes"                  => "تولید بارکد",
-    "hsn_code"                           => "نامگذاری سیستم هماهنگ",
-    "image"                              => "آواتار",
-    "import_items_csv"                   => "وارد کردن مورد از سی‌اس‌وی",
-    "info_provided_by"                   => "اطلاعات ارائه شده توسط",
-    "inventory"                          => "فهرست",
-    "inventory_CSV_import_quantity"      => "مقدار وارد شده از سی‌اس‌وی",
-    "inventory_comments"                 => "نظرات",
-    "inventory_data_tracking"            => "ردیابی داده های موجودی",
-    "inventory_date"                     => "تاریخ",
-    "inventory_employee"                 => "کارمند",
-    "inventory_in_out_quantity"          => "مقدار داخل / بیرون",
-    "inventory_remarks"                  => "ملاحظات",
-    "is_deleted"                         => "حذف شده",
-    "is_printed"                         => "",
-    "is_serialized"                      => "مورد دارای شماره سریال است",
-    "item"                               => "مورد",
-    "item_id"                            => "",
-    "item_number"                        => "بارکد",
-    "item_number_duplicate"              => "شماره مورد در بانک اطلاعاتی موجود است.",
-    "kit"                                => "کیت",
-    "location"                           => "محل",
-    "low_inventory_items"                => "موجودی غیر از سهام",
-    "low_sell_item"                      => "کالای کم فروش",
-    "manually_editing_of_quantity"       => "ویرایش دستی مقدار",
-    "markup"                             => "",
-    "name"                               => "نام مورد",
-    "name_required"                      => "نام مورد یک فیلد ضروری است.",
-    "new"                                => "گزینه جدید",
-    "no_description_items"               => "بدون توضیحات",
-    "no_items_to_display"                => "هیچ موردی برای نمایش وجود ندارد.",
-    "none"                               => "هیچ یک",
-    "none_selected"                      => "شما هیچ موردی را برای ویرایش انتخاب نکرده اید",
-    "nonstock"                           => "غیر سهامدار",
-    "number_information"                 => "شماره مورد",
-    "number_required"                    => "بارکد یک فیلد مورد نیاز است.",
-    "one_or_multiple"                    => "موارد)",
-    "pack_name"                          => "نام بسته",
-    "qty_per_pack"                       => "مقدار در هر بسته",
-    "quantity"                           => "تعداد",
-    "quantity_number"                    => "تعداد باید یک عدد باشد.",
-    "quantity_required"                  => "مقدار یک زمینه مورد نیاز است.",
-    "receiving_quantity"                 => "دریافت مقدار",
-    "remove_image"                       => "حذف تصویر",
-    "reorder_level"                      => "سطح سفارش مجدد",
-    "reorder_level_number"               => "سطح مرتب سازی باید یک عدد باشد.",
-    "reorder_level_required"             => "سطح تنظیم مجدد یک زمینه مورد نیاز است.",
-    "retrive_item_info"                  => "بازیابی اطلاعات مورد",
-    "sales_tax_1"                        => "مالیات بر فروش",
-    "sales_tax_2"                        => "مالیات بر فروش 2",
-    "search_attributes"                  => "ویژگی های جستجو",
-    "select_image"                       => "تصویر را انتخاب کنید",
-    "serialized_items"                   => "موارد سریال",
-    "standard"                           => "استاندارد",
-    "stock"                              => "موجودی",
-    "stock_location"                     => "موقعیت مکانی سهام",
-    "stock_type"                         => "نوع سهام",
-    "successful_adding"                  => "شما مورد را با موفقیت اضافه کردید",
-    "successful_bulk_edit"               => "شما مورد (های) انتخاب شده را با موفقیت به روز کردید",
-    "successful_deleted"                 => "شما با موفقیت حذف شده اید",
-    "successful_updating"                => "شما مورد را با موفقیت به روز کردید",
-    "supplier"                           => "تامین کننده",
-    "tax_1"                              => "مالیات 1",
-    "tax_2"                              => "مالیات 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "طبقه بندی مالیات",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "درصد مالیات باید عددی باشد",
-    "tax_percent_required"               => "درصد مالیات یک زمینه مورد نیاز است.",
-    "tax_percents"                       => "درصد (مالیات) مالیات",
-    "temp"                               => "موقت",
-    "type"                               => "نوع آیتم",
-    "unit_price"                         => "قیمت خرده فروشی",
-    "unit_price_number"                  => "قیمت واحد باید یک عدد باشد.",
-    "unit_price_required"                => "قیمت خرده فروشی یک زمینه ضروری است.",
-    "upc_database"                       => "بانک اطلاعات بارکد",
-    "update"                             => "به روز کردن مورد",
-    "use_inventory_menu"                 => "استفاده از فهرست موجودی",
+    'add_minus'                          => 'موجودی برای اضافه یا تفریق.',
+    'allow_alt_description'              => 'اجازه توضیحات جایگزین',
+    'amount_entry'                       => 'مقدار ورود',
+    'bulk_edit'                          => 'ویرایش فله',
+    'buy_price_required'                 => 'قیمت خرید فیلد مورد نیاز است.',
+    'cannot_be_deleted'                  => 'نمی توان آیتم های انتخابی را حذف کرد ، یک یا چند مورد انتخاب شده فروش دارند.',
+    'cannot_find_item'                   => 'مورد پیدا نشد.',
+    'categories'                         => '',
+    'category'                           => 'دسته بندی',
+    'category_new'                       => '',
+    'category_required'                  => 'دسته بندی یک فیلد ضروری است.',
+    'change_all_to_allow_alt_desc'       => 'اجازه دهید توضیحات جایگزین برای همه مجاز باشد.',
+    'change_all_to_not_allow_allow_desc' => 'اجازه دهید توضیحات جایگزین برای همه مجاز نباشد.',
+    'change_all_to_serialized'           => 'تغییر همه به سریال شده',
+    'change_all_to_unserialized'         => 'تغییر همه به غیرسیاسی',
+    'change_image'                       => 'تغییر تصویر',
+    'confirm_bulk_edit'                  => 'آیا مطمئن هستید که می خواهید موارد (های) انتخاب شده را ویرایش کنید؟',
+    'confirm_bulk_edit_wipe_taxes'       => 'تمام اطلاعات مربوط به مالیات مورد جایگزین خواهد شد.',
+    'confirm_delete'                     => 'آیا مطمئن هستید که می خواهید موارد (های) انتخاب شده را حذف کنید؟',
+    'confirm_restore'                    => 'آیا مطمئن هستید که می خواهید موارد (های) انتخاب شده را بازیابی کنید؟',
+    'cost_price'                         => 'قیمت عمده فروشی',
+    'cost_price_number'                  => 'قیمت عمده فروشی باید یک عدد باشد.',
+    'cost_price_required'                => 'قیمت عمده فروشی یک زمینه ضروری است.',
+    'count'                              => 'به روزرسانی موجودی',
+    'csv_import_failed'                  => 'واردات سی‌اس‌وی انجام نشد',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'پرونده سی‌اس‌وی آپلود شده داده ای ندارد یا به طور نادرست قالب بندی شده است.',
+    'csv_import_partially_failed'        => 'در خط (ها){0} شکست واردات کالا وجود دارد:{1}. هیچ سطر وارد نشده است.',
+    'csv_import_success'                 => 'وارد کردن سی‌اس‌وی مورد موفقیت آمیز است.',
+    'current_quantity'                   => 'مقدار فعلی',
+    'default_pack_name'                  => 'هر یک',
+    'description'                        => 'شرح',
+    'details_count'                      => 'جزئیات شمارش موجودی',
+    'do_nothing'                         => 'هیچ کاری نکن',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'زمینه های مورد نظر را برای موارد (های) انتخاب شده ویرایش کنید.',
+    'edit_multiple_items'                => 'ویرایش موارد متعدد',
+    'empty_upc_items'                    => 'موارد خالی بارکد',
+    'error_adding_updating'              => 'خطا در افزودن / به روزرسانی مورد',
+    'error_updating_multiple'            => 'خطا در به روزرسانی موارد',
+    'generate_barcodes'                  => 'تولید بارکد',
+    'hsn_code'                           => 'نامگذاری سیستم هماهنگ',
+    'image'                              => 'آواتار',
+    'import_items_csv'                   => 'وارد کردن مورد از سی‌اس‌وی',
+    'info_provided_by'                   => 'اطلاعات ارائه شده توسط',
+    'inventory'                          => 'فهرست',
+    'inventory_CSV_import_quantity'      => 'مقدار وارد شده از سی‌اس‌وی',
+    'inventory_comments'                 => 'نظرات',
+    'inventory_data_tracking'            => 'ردیابی داده های موجودی',
+    'inventory_date'                     => 'تاریخ',
+    'inventory_employee'                 => 'کارمند',
+    'inventory_in_out_quantity'          => 'مقدار داخل / بیرون',
+    'inventory_remarks'                  => 'ملاحظات',
+    'is_deleted'                         => 'حذف شده',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'مورد دارای شماره سریال است',
+    'item'                               => 'مورد',
+    'item_id'                            => '',
+    'item_number'                        => 'بارکد',
+    'item_number_duplicate'              => 'شماره مورد در بانک اطلاعاتی موجود است.',
+    'item_number_invalid'                => 'شماره مورد حاوی کاراکترهای غیرمجاز است.',
+    'kit'                                => 'کیت',
+    'location'                           => 'محل',
+    'low_inventory_items'                => 'موجودی غیر از سهام',
+    'low_sell_item'                      => 'کالای کم فروش',
+    'manually_editing_of_quantity'       => 'ویرایش دستی مقدار',
+    'markup'                             => '',
+    'name'                               => 'نام مورد',
+    'name_required'                      => 'نام مورد یک فیلد ضروری است.',
+    'new'                                => 'گزینه جدید',
+    'no_description_items'               => 'بدون توضیحات',
+    'no_items_to_display'                => 'هیچ موردی برای نمایش وجود ندارد.',
+    'none'                               => 'هیچ یک',
+    'none_selected'                      => 'شما هیچ موردی را برای ویرایش انتخاب نکرده اید',
+    'nonstock'                           => 'غیر سهامدار',
+    'number_information'                 => 'شماره مورد',
+    'number_required'                    => 'بارکد یک فیلد مورد نیاز است.',
+    'one_or_multiple'                    => 'موارد)',
+    'pack_name'                          => 'نام بسته',
+    'qty_per_pack'                       => 'مقدار در هر بسته',
+    'quantity'                           => 'تعداد',
+    'quantity_number'                    => 'تعداد باید یک عدد باشد.',
+    'quantity_required'                  => 'مقدار یک زمینه مورد نیاز است.',
+    'receiving_quantity'                 => 'دریافت مقدار',
+    'remove_image'                       => 'حذف تصویر',
+    'reorder_level'                      => 'سطح سفارش مجدد',
+    'reorder_level_number'               => 'سطح مرتب سازی باید یک عدد باشد.',
+    'reorder_level_required'             => 'سطح تنظیم مجدد یک زمینه مورد نیاز است.',
+    'retrive_item_info'                  => 'بازیابی اطلاعات مورد',
+    'sales_tax_1'                        => 'مالیات بر فروش',
+    'sales_tax_2'                        => 'مالیات بر فروش 2',
+    'search_attributes'                  => 'ویژگی های جستجو',
+    'select_image'                       => 'تصویر را انتخاب کنید',
+    'serialized_items'                   => 'موارد سریال',
+    'standard'                           => 'استاندارد',
+    'stock'                              => 'موجودی',
+    'stock_location'                     => 'موقعیت مکانی سهام',
+    'stock_type'                         => 'نوع سهام',
+    'successful_adding'                  => 'شما مورد را با موفقیت اضافه کردید',
+    'successful_bulk_edit'               => 'شما مورد (های) انتخاب شده را با موفقیت به روز کردید',
+    'successful_deleted'                 => 'شما با موفقیت حذف شده اید',
+    'successful_updating'                => 'شما مورد را با موفقیت به روز کردید',
+    'supplier'                           => 'تامین کننده',
+    'tax_1'                              => 'مالیات 1',
+    'tax_2'                              => 'مالیات 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'طبقه بندی مالیات',
+    'tax_name_invalid'                   => 'نام مالیات حاوی کاراکترهای غیرمجاز است.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => 'درصد مالیات باید عددی باشد',
+    'tax_percent_required'               => 'درصد مالیات یک زمینه مورد نیاز است.',
+    'tax_percents'                       => 'درصد (مالیات) مالیات',
+    'temp'                               => 'موقت',
+    'type'                               => 'نوع آیتم',
+    'unit_price'                         => 'قیمت خرده فروشی',
+    'unit_price_number'                  => 'قیمت واحد باید یک عدد باشد.',
+    'unit_price_required'                => 'قیمت خرده فروشی یک زمینه ضروری است.',
+    'upc_database'                       => 'بانک اطلاعات بارکد',
+    'update'                             => 'به روز کردن مورد',
+    'use_inventory_menu'                 => 'استفاده از فهرست موجودی',
 ];
diff --git a/app/Language/fa/Login.php b/app/Language/fa/Login.php
index 512f64b0e..59f13e3df 100644
--- a/app/Language/fa/Login.php
+++ b/app/Language/fa/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "من روبات نیستم.",
-    "go"                            => "برو",
-    "invalid_gcaptcha"              => "نامعتبر من یک روبات نیستم.",
-    "invalid_installation"          => "نصب صحیح نیست ، پرونده php.ini خود را بررسی کنید.",
-    "invalid_username_and_password" => "نام کاربری یا گذرواژه نامعتبر است.",
-    "login"                         => "وارد شدن",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "کلمه عبور",
-    "required_username"             => "",
-    "username"                      => "نام کاربری",
-    "welcome"                       => "",
+    "gcaptcha"                            => "من روبات نیستم.",
+    "go"                                  => "برو",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "نامعتبر من یک روبات نیستم.",
+    "invalid_installation"                => "نصب صحیح نیست ، پرونده php.ini خود را بررسی کنید.",
+    "invalid_username_and_password"       => "نام کاربری یا گذرواژه نامعتبر است.",
+    "login"                               => "وارد شدن",
+    "logout"                              => "",
+    "migrating_database"                  => "در حال انتقال پایگاه داده",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "پایگاه داده با موفقیت منتقل شد!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "کلمه عبور",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'تعداد تلاش‌ها بیش از حد مجاز است. لطفاً کمی صبر کنید و دوباره امتحان کنید.',
+    "username"                            => "نام کاربری",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/fa/Reports.php b/app/Language/fa/Reports.php
index 00aa80535..a879c9276 100644
--- a/app/Language/fa/Reports.php
+++ b/app/Language/fa/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "نرخ مالیات",
     "taxes"                                   => "مالیات",
     "taxes_summary_report"                    => "گزارش خلاصه مالیات",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "جمع",
     "total_inventory_value"                   => "ارزش کل موجودی",
     "total_low_sell_quantity"                 => "تعداد کم فروش کم",
diff --git a/app/Language/fa/Sales.php b/app/Language/fa/Sales.php
index 182a534e2..f92a61f21 100644
--- a/app/Language/fa/Sales.php
+++ b/app/Language/fa/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "امتیازهای موجود",
-    "rewards_package"                  => "پاداش",
-    "rewards_remaining_balance"        => "امتیاز باقی مانده مقدار باقی مانده است",
-    "account_number"                   => "حساب #",
-    "add_payment"                      => "افزودن پرداخت",
-    "amount_due"                       => "مبلغ پرداختی",
-    "amount_tendered"                  => "مبلغ مناقصه",
-    "authorized_signature"             => "امضای مجاز",
-    "cancel_sale"                      => "لغو",
-    "cash"                             => "نقدی",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "سپرده نقدی",
-    "cash_filter"                      => "نقدی",
-    "change_due"                       => "تغییر بدهی",
-    "change_price"                     => "تغییر قیمت فروش",
-    "check"                            => "بررسی",
-    "check_balance"                    => "باقی مانده را بررسی کنید",
-    "check_filter"                     => "بررسی",
-    "close"                            => "",
-    "comment"                          => "اظهار نظر",
-    "comments"                         => "نظرات",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "کامل",
-    "confirm_cancel_sale"              => "آیا مطمئن هستید که می خواهید این فروش را پاک کنید؟ همه موارد پاک خواهند شد.",
-    "confirm_delete"                   => "آیا مطمئن هستید که می خواهید فروش (های) خریداری شده را حذف کنید؟",
-    "confirm_restore"                  => "آیا مطمئن هستید که می خواهید فروش (های) انتخابی را بازیابی کنید؟",
-    "credit"                           => "کارت اعتباری",
-    "credit_deposit"                   => "سپرده اعتباری",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "مشتری",
-    "customer_address"                 => "نشانی",
-    "customer_discount"                => "تخفیف",
-    "customer_email"                   => "پست الکترونیک",
-    "customer_location"                => "محل",
-    "customer_mailchimp_status"        => "وضعیت Mailchimp",
-    "customer_optional"                => "(مورد نیاز برای پرداخت مقررات)",
-    "customer_required"                => "(ضروری)",
-    "customer_total"                   => "جمع",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "تاریخ فروش",
-    "date_range"                       => "محدوده زمانی",
-    "date_required"                    => "یک تاریخ صحیح باید وارد شود.",
-    "date_type"                        => "تاریخ یک زمینه ضروری است.",
-    "debit"                            => "کارت اعتباری",
-    "debit_filter"                     => "",
-    "delete"                           => "مجاز کردن حذف",
-    "delete_confirmation"              => "آیا مطمئن هستید که می خواهید این فروش را حذف کنید؟ این عملکرد قابل بازگشت نیست.",
-    "delete_entire_sale"               => "حذف فروش کل",
-    "delete_successful"                => "حذف موفقیت آمیز است.",
-    "delete_unsuccessful"              => "حذف فروش انجام نشد.",
-    "description_abbrv"                => "سقوط",
-    "discard"                          => "دور انداختن",
-    "discard_quote"                    => "",
-    "discount"                         => "دیسک",
-    "discount_included"                => "٪ تخفیف",
-    "discount_short"                   => "٪",
-    "due"                              => "ناشی از",
-    "due_filter"                       => "ناشی از",
-    "edit"                             => "ویرایش",
-    "edit_item"                        => "ویرایش آیتم",
-    "edit_sale"                        => "ویرایش فروش",
-    "email_receipt"                    => "دریافت ایمیل",
-    "employee"                         => "کارمند",
-    "entry"                            => "ورود",
-    "error_editing_item"               => "خطا در ویرایش مورد",
-    "find_or_scan_item"                => "یافتن یا اسکن کردن مورد",
-    "find_or_scan_item_or_receipt"     => "یافتن یا اسکن کردن مورد یا رسید",
-    "giftcard"                         => "کارت هدیه",
-    "giftcard_balance"                 => "مانده کارت هدیه",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "شماره کارت هدیه",
-    "group_by_category"                => "گروه بر اساس طبقه بندی",
-    "group_by_type"                    => "گروه براساس نوع",
-    "hsn"                              => "HSN",
-    "id"                               => "شناسه فروش",
-    "include_prices"                   => "شامل قیمت ها می شوید؟",
-    "invoice"                          => "صورتحساب",
-    "invoice_confirm"                  => "این فاکتور به ارسال می شود",
-    "invoice_enable"                   => "شماره فاکتور",
-    "invoice_filter"                   => "صورت حساب",
-    "invoice_no_email"                 => "این مشتری آدرس ایمیل معتبری ندارد.",
-    "invoice_number"                   => "صورتحساب #",
-    "invoice_number_duplicate"         => "فاکتور شماره{0} باید بی نظیر باشد.",
-    "invoice_sent"                     => "فاکتور ارسال شده به",
-    "invoice_total"                    => "فاکتور کل",
-    "invoice_type_custom_invoice"      => "فاکتور سفارشی (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "فاکتور مالیاتی سفارشی (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "فاکتور (invoice.php)",
-    "invoice_type_tax_invoice"         => "فاکتور مالیاتی (tax_invoice.php)",
-    "invoice_unsent"                   => "فاکتور نتوانست به ارسال شود",
-    "invoice_update"                   => "بازگو",
-    "item_insufficient_of_stock"       => "این کالا سهام کافی ندارد.",
-    "item_name"                        => "نام مورد",
-    "item_number"                      => "مورد #",
-    "item_out_of_stock"                => "مورد خارج از بورس.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "حالت ثبت نام",
-    "must_enter_numeric"               => "مقدار پیشنهادی باید یک عدد باشد.",
-    "must_enter_numeric_giftcard"      => "شماره کارت هدیه باید یک عدد باشد.",
-    "new_customer"                     => "مشتری جدید",
-    "new_item"                         => "گزینه جدید",
-    "no_description"                   => "بدون توضیح",
-    "no_filter"                        => "همه",
-    "no_items_in_cart"                 => "هیچ کالایی در سبد خرید وجود ندارد. ر.",
-    "no_sales_to_display"              => "بدون فروش برای نمایش.",
-    "none_selected"                    => "شما هیچ فروشی (فروش) را برای حذف انتخاب نکرده اید.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "این اقدام مجاز نیست.",
-    "one_or_multiple"                  => "حراجی)",
-    "payment"                          => "نوع پرداخت",
-    "payment_amount"                   => "میزان",
-    "payment_not_cover_total"          => "مبلغ پرداخت باید بیشتر یا برابر با Total باشد.",
-    "payment_type"                     => "نوع",
-    "payments"                         => "",
-    "payments_total"                   => "کل پرداختها",
-    "price"                            => "قیمت",
-    "print_after_sale"                 => "چاپ بعد از فروش",
-    "quantity"                         => "تعداد",
-    "quantity_less_than_reorder_level" => "هشدار: مقدار مورد نظر برای آن مورد کمتر از سطح ترتیب است.",
-    "quantity_less_than_zero"          => "هشدار: مقدار مورد نظر کافی نیست. شما هنوز هم می توانید فروش را پردازش کنید ، اما موجودی خود را حسابرسی کنید.",
-    "quantity_of_items"                => "مقدار{0} مورد",
-    "quote"                            => "نقل قول",
-    "quote_number"                     => "تعداد نقل قول",
-    "quote_number_duplicate"           => "نقل قول شماره باید بی نظیر باشد.",
-    "quote_sent"                       => "نقل قول ارسال شد به",
-    "quote_unsent"                     => "نقل قول ارسال نشد به",
-    "receipt"                          => "رسید فروش",
-    "receipt_no_email"                 => "این مشتری آدرس ایمیل معتبری ندارد.",
-    "receipt_number"                   => "فروش #",
-    "receipt_sent"                     => "رسید به",
-    "receipt_unsent"                   => "رسید ارسال نشد به",
-    "refund"                           => "نوع بازپرداخت",
-    "register"                         => "ثبت فروش",
-    "remove_customer"                  => "حذف مشتری",
-    "remove_discount"                  => "",
-    "return"                           => "برگشت",
-    "rewards"                          => "امتیاز پاداش",
-    "rewards_balance"                  => "تعادل امتیاز پاداش",
-    "sale"                             => "فروش",
-    "sale_by_invoice"                  => "فروش توسط فاکتور",
-    "sale_for_customer"                => "مشتری:",
-    "sale_time"                        => "زمان",
-    "sales_tax"                        => "مالیات بر فروش",
-    "sales_total"                      => "",
-    "select_customer"                  => "مشتری را انتخاب کنید",
-    "send_invoice"                     => "فاکتور بفرستید",
-    "send_quote"                       => "ارسال نقل قول",
-    "send_receipt"                     => "ارسال رسید",
-    "send_work_order"                  => "ارسال سفارش کار",
-    "serial"                           => "سریال",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "نمایش فاکتور",
-    "show_receipt"                     => "نمایش رسید",
-    "start_typing_customer_name"       => "شروع به تایپ جزئیات مشتری ...",
-    "start_typing_item_name"           => "شروع به تایپ نام مورد یا اسکن بارکد ...",
-    "stock"                            => "موجودی",
-    "stock_location"                   => "موقعیت مکانی سهام",
-    "sub_total"                        => "فرعی",
-    "successfully_deleted"             => "شما با موفقیت حذف شده اید",
-    "successfully_restored"            => "شما با موفقیت ترمیم کردید",
-    "successfully_suspended_sale"      => "فروش موفق به حالت تعلیق درآمد.",
-    "successfully_updated"             => "به روزرسانی فروش موفقیت آمیز است.",
-    "suspend_sale"                     => "تعلیق",
-    "suspended_doc_id"                 => "سند",
-    "suspended_sale_id"                => "شناسه",
-    "suspended_sales"                  => "معلق",
-    "table"                            => "جدول",
-    "takings"                          => "فروش روزانه",
-    "tax"                              => "مالیات",
-    "tax_id"                           => "شناسه مالیاتی",
-    "tax_invoice"                      => "فاکتور مالیات",
-    "tax_percent"                      => "مالیات ٪",
-    "taxed_ind"                        => "T",
-    "total"                            => "جمع",
-    "total_tax_exclusive"              => "پرداخت مالیات",
-    "transaction_failed"               => "معاملات معامله نشد.",
-    "unable_to_add_item"               => "افزودن مورد به فروش انجام نشد",
-    "unsuccessfully_deleted"           => "حذف (فروش) انجام نشد.",
-    "unsuccessfully_restored"          => "بازگرداندن فروش (ها) انجام نشد.",
-    "unsuccessfully_suspended_sale"    => "تعلیق فروش انجام نشد.",
-    "unsuccessfully_updated"           => "به روزرسانی فروش انجام نشد.",
-    "unsuspend"                        => "لغو",
-    "unsuspend_and_delete"             => "عمل",
-    "update"                           => "به روز رسانی",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "سفارش کار",
-    "work_order_number"                => "شماره سفارش کار",
-    "work_order_number_duplicate"      => "شماره سفارش کار باید منحصر به فرد باشد.",
-    "work_order_sent"                  => "دستور کار ارسال شده به",
-    "work_order_unsent"                => "دستور کار نتوانست به ارسال شود",
+    'account_number'                    => 'حساب #',
+    'add_payment'                       => 'افزودن پرداخت',
+    'amount_due'                        => 'مبلغ پرداختی',
+    'amount_due_not_covered'            => 'پرداخت‌ها مبلغ بدهی را پوشش نمی‌دهند.',
+    'amount_tendered'                   => 'مبلغ مناقصه',
+    'authorized_signature'              => 'امضای مجاز',
+    'cancel_sale'                       => 'لغو',
+    'cash'                              => 'نقدی',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => 'سپرده نقدی',
+    'cash_filter'                       => 'نقدی',
+    'change_due'                        => 'تغییر بدهی',
+    'change_price'                      => 'تغییر قیمت فروش',
+    'check'                             => 'بررسی',
+    'check_balance'                     => 'باقی مانده را بررسی کنید',
+    'check_filter'                      => 'بررسی',
+    'close'                             => '',
+    'comment'                           => 'اظهار نظر',
+    'comments'                          => 'نظرات',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'کامل',
+    'confirm_cancel_sale'               => 'آیا مطمئن هستید که می خواهید این فروش را پاک کنید؟ همه موارد پاک خواهند شد.',
+    'confirm_delete'                    => 'آیا مطمئن هستید که می خواهید فروش (های) خریداری شده را حذف کنید؟',
+    'confirm_restore'                   => 'آیا مطمئن هستید که می خواهید فروش (های) انتخابی را بازیابی کنید؟',
+    'credit'                            => 'کارت اعتباری',
+    'credit_deposit'                    => 'سپرده اعتباری',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'مشتری',
+    'customer_address'                  => 'نشانی',
+    'customer_discount'                 => 'تخفیف',
+    'customer_email'                    => 'پست الکترونیک',
+    'customer_location'                 => 'محل',
+    'customer_mailchimp_status'         => 'وضعیت Mailchimp',
+    'customer_optional'                 => '(مورد نیاز برای پرداخت مقررات)',
+    'customer_required'                 => '(ضروری)',
+    'customer_total'                    => 'جمع',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'امتیازهای موجود',
+    'daily_sales'                       => '',
+    'date'                              => 'تاریخ فروش',
+    'date_range'                        => 'محدوده زمانی',
+    'date_required'                     => 'یک تاریخ صحیح باید وارد شود.',
+    'date_type'                         => 'تاریخ یک زمینه ضروری است.',
+    'debit'                             => 'کارت اعتباری',
+    'debit_filter'                      => '',
+    'delete'                            => 'مجاز کردن حذف',
+    'delete_confirmation'               => 'آیا مطمئن هستید که می خواهید این فروش را حذف کنید؟ این عملکرد قابل بازگشت نیست.',
+    'delete_entire_sale'                => 'حذف فروش کل',
+    'delete_successful'                 => 'حذف موفقیت آمیز است.',
+    'delete_unsuccessful'               => 'حذف فروش انجام نشد.',
+    'description_abbrv'                 => 'سقوط',
+    'discard'                           => 'دور انداختن',
+    'discard_quote'                     => '',
+    'discount'                          => 'دیسک',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '٪ تخفیف',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '٪',
+    'due'                               => 'ناشی از',
+    'due_filter'                        => 'ناشی از',
+    'edit'                              => 'ویرایش',
+    'edit_item'                         => 'ویرایش آیتم',
+    'edit_sale'                         => 'ویرایش فروش',
+    'email_receipt'                     => 'دریافت ایمیل',
+    'employee'                          => 'کارمند',
+    'entry'                             => 'ورود',
+    'error_editing_item'                => 'خطا در ویرایش مورد',
+    'find_or_scan_item'                 => 'یافتن یا اسکن کردن مورد',
+    'find_or_scan_item_or_receipt'      => 'یافتن یا اسکن کردن مورد یا رسید',
+    'giftcard'                          => 'کارت هدیه',
+    'giftcard_balance'                  => 'مانده کارت هدیه',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'شماره کارت هدیه',
+    'group_by_category'                 => 'گروه بر اساس طبقه بندی',
+    'group_by_type'                     => 'گروه براساس نوع',
+    'hsn'                               => 'HSN',
+    'id'                                => 'شناسه فروش',
+    'include_prices'                    => 'شامل قیمت ها می شوید؟',
+    'insufficient_giftcard_balance'     => 'موجودی ناکافی کارت هدیه برای این پرداخت.',
+    'insufficient_reward_points'        => 'امتیازات پاداش ناکافی برای این پرداخت.',
+    'invoice'                           => 'صورتحساب',
+    'invoice_confirm'                   => 'این فاکتور به ارسال می شود',
+    'invoice_enable'                    => 'شماره فاکتور',
+    'invoice_filter'                    => 'صورت حساب',
+    'invoice_no_email'                  => 'این مشتری آدرس ایمیل معتبری ندارد.',
+    'invoice_number'                    => 'صورتحساب #',
+    'invoice_number_duplicate'          => 'فاکتور شماره{0} باید بی نظیر باشد.',
+    'invoice_sent'                      => 'فاکتور ارسال شده به',
+    'invoice_total'                     => 'فاکتور کل',
+    'invoice_type_custom_invoice'       => 'فاکتور سفارشی (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'فاکتور مالیاتی سفارشی (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'فاکتور (invoice.php)',
+    'invoice_type_tax_invoice'          => 'فاکتور مالیاتی (tax_invoice.php)',
+    'invoice_unsent'                    => 'فاکتور نتوانست به ارسال شود',
+    'invoice_update'                    => 'بازگو',
+    'item_insufficient_of_stock'        => 'این کالا سهام کافی ندارد.',
+    'item_name'                         => 'نام مورد',
+    'item_number'                       => 'مورد #',
+    'item_out_of_stock'                 => 'مورد خارج از بورس.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'حالت ثبت نام',
+    'must_enter_numeric'                => 'مقدار پیشنهادی باید یک عدد باشد.',
+    'must_enter_numeric_giftcard'       => 'شماره کارت هدیه باید یک عدد باشد.',
+    'must_enter_reference_code'         => 'شماره مرجع/بازیابی باید وارد شود.',
+    'negative_amount_tendered'          => 'مبلغ مناقصه نمی‌تواند منفی باشد.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'مشتری جدید',
+    'new_item'                          => 'گزینه جدید',
+    'no_description'                    => 'بدون توضیح',
+    'no_filter'                         => 'همه',
+    'no_items_in_cart'                  => 'هیچ کالایی در سبد خرید وجود ندارد. ر.',
+    'no_sales_to_display'               => 'بدون فروش برای نمایش.',
+    'none_selected'                     => 'شما هیچ فروشی (فروش) را برای حذف انتخاب نکرده اید.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'این اقدام مجاز نیست.',
+    'one_or_multiple'                   => 'حراجی)',
+    'payment'                           => 'نوع پرداخت',
+    'payment_amount'                    => 'میزان',
+    'payment_not_cover_total'           => 'مبلغ پرداخت باید بیشتر یا برابر با Total باشد.',
+    'payment_type'                      => 'نوع',
+    'payments'                          => '',
+    'payments_total'                    => 'کل پرداختها',
+    'price'                             => 'قیمت',
+    'print_after_sale'                  => 'چاپ بعد از فروش',
+    'quantity'                          => 'تعداد',
+    'quantity_less_than_reorder_level'  => 'هشدار: مقدار مورد نظر برای آن مورد کمتر از سطح ترتیب است.',
+    'quantity_less_than_zero'           => 'هشدار: مقدار مورد نظر کافی نیست. شما هنوز هم می توانید فروش را پردازش کنید ، اما موجودی خود را حسابرسی کنید.',
+    'quantity_of_items'                 => 'مقدار{0} مورد',
+    'quote'                             => 'نقل قول',
+    'quote_number'                      => 'تعداد نقل قول',
+    'quote_number_duplicate'            => 'نقل قول شماره باید بی نظیر باشد.',
+    'quote_sent'                        => 'نقل قول ارسال شد به',
+    'quote_unsent'                      => 'نقل قول ارسال نشد به',
+    'receipt'                           => 'رسید فروش',
+    'receipt_no_email'                  => 'این مشتری آدرس ایمیل معتبری ندارد.',
+    'receipt_number'                    => 'فروش #',
+    'receipt_sent'                      => 'رسید به',
+    'receipt_unsent'                    => 'رسید ارسال نشد به',
+    'reference_code'                    => 'کد مرجع پرداخت',
+    'reference_code_invalid_characters' => 'کد مرجع باید فقط شامل حروف و اعداد باشد.',
+    'reference_code_length_error'       => 'طول کد مرجع نامعتبر است.',
+    'refund'                            => 'نوع بازپرداخت',
+    'register'                          => 'ثبت فروش',
+    'remove_customer'                   => 'حذف مشتری',
+    'remove_discount'                   => '',
+    'return'                            => 'برگشت',
+    'rewards'                           => 'امتیاز پاداش',
+    'rewards_balance'                   => 'تعادل امتیاز پاداش',
+    'rewards_package'                   => 'پاداش',
+    'rewards_remaining_balance'         => 'امتیاز باقی مانده مقدار باقی مانده است',
+    'sale'                              => 'فروش',
+    'sale_by_invoice'                   => 'فروش توسط فاکتور',
+    'sale_for_customer'                 => 'مشتری:',
+    'sale_time'                         => 'زمان',
+    'sales_tax'                         => 'مالیات بر فروش',
+    'sales_total'                       => '',
+    'select_customer'                   => 'مشتری را انتخاب کنید',
+    'send_invoice'                      => 'فاکتور بفرستید',
+    'send_quote'                        => 'ارسال نقل قول',
+    'send_receipt'                      => 'ارسال رسید',
+    'send_work_order'                   => 'ارسال سفارش کار',
+    'serial'                            => 'سریال',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'نمایش فاکتور',
+    'show_receipt'                      => 'نمایش رسید',
+    'start_typing_customer_name'        => 'شروع به تایپ جزئیات مشتری ...',
+    'start_typing_item_name'            => 'شروع به تایپ نام مورد یا اسکن بارکد ...',
+    'stock'                             => 'موجودی',
+    'stock_location'                    => 'موقعیت مکانی سهام',
+    'sub_total'                         => 'فرعی',
+    'successfully_deleted'              => 'شما با موفقیت حذف شده اید',
+    'successfully_restored'             => 'شما با موفقیت ترمیم کردید',
+    'successfully_suspended_sale'       => 'فروش موفق به حالت تعلیق درآمد.',
+    'successfully_updated'              => 'به روزرسانی فروش موفقیت آمیز است.',
+    'suspend_sale'                      => 'تعلیق',
+    'suspended_doc_id'                  => 'سند',
+    'suspended_sale_id'                 => 'شناسه',
+    'suspended_sales'                   => 'معلق',
+    'table'                             => 'جدول',
+    'takings'                           => 'فروش روزانه',
+    'tax'                               => 'مالیات',
+    'tax_id'                            => 'شناسه مالیاتی',
+    'tax_invoice'                       => 'فاکتور مالیات',
+    'tax_percent'                       => 'مالیات ٪',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'جمع',
+    'total_tax_exclusive'               => 'پرداخت مالیات',
+    'transaction_failed'                => 'معاملات معامله نشد.',
+    'unable_to_add_item'                => 'افزودن مورد به فروش انجام نشد',
+    'unsuccessfully_deleted'            => 'حذف (فروش) انجام نشد.',
+    'unsuccessfully_restored'           => 'بازگرداندن فروش (ها) انجام نشد.',
+    'unsuccessfully_suspended_sale'     => 'تعلیق فروش انجام نشد.',
+    'unsuccessfully_updated'            => 'به روزرسانی فروش انجام نشد.',
+    'unsuspend'                         => 'لغو',
+    'unsuspend_and_delete'              => 'عمل',
+    'update'                            => 'به روز رسانی',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'سفارش کار',
+    'work_order_number'                 => 'شماره سفارش کار',
+    'work_order_number_duplicate'       => 'شماره سفارش کار باید منحصر به فرد باشد.',
+    'work_order_sent'                   => 'دستور کار ارسال شده به',
+    'work_order_unsent'                 => 'دستور کار نتوانست به ارسال شود',
 ];
diff --git a/app/Language/fr/Attributes.php b/app/Language/fr/Attributes.php
index ce0ad5b90..f56bb63ef 100644
--- a/app/Language/fr/Attributes.php
+++ b/app/Language/fr/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "La valeur de l'attribut ne doit pas contenir '_' ou '|'",
-    "confirm_delete"                   => "Êtes-vous certain de vouloir supprimer le(s) attribut(s) sélectionné(s) ?",
-    "confirm_restore"                  => "Êtes-vous certain de vouloir restaurer le(s) attribut(s) sélectionné(s) ?",
-    "definition_cannot_be_deleted"     => "Le(s) attribut(s) sélectionné(s) n'ont pas pu être supprimé(s)",
-    "definition_error_adding_updating" => "L'attribut {0} n'a pas pu être ajouté ou mis à jour. Veuillez vérifier le journal d'erreurs.",
-    "definition_flags"                 => "Visibilité de l'attribut",
-    "definition_group"                 => "Groupe",
-    "definition_id"                    => "ID",
-    "definition_name"                  => "Ajouter un attribut",
-    "definition_name_required"         => "Le nom de l'attribut est requis",
-    "definition_one_or_multiple"       => "attribut(s)",
-    "definition_successful_adding"     => "Vous avez ajouté l'article avec succès",
-    "definition_successful_deleted"    => "Vous avez supprimé avec succès",
-    "definition_successful_updating"   => "Vous avez mis-à-jour l'attribut avec succès",
-    "definition_type"                  => "Type d'attribut",
-    "definition_type_required"         => "Le type d'attribut est requis",
-    "definition_unit"                  => "Unité de mesure",
-    "definition_values"                => "Valeurs de l'attribut",
-    "new"                              => "Nouvel attribut",
-    "no_attributes_to_display"         => "Aucun attribut à afficher",
-    "receipt_visibility"               => "Reçu",
-    "show_in_items"                    => "Afficher dans les articles",
-    "show_in_items_visibility"         => "Articles",
-    "show_in_receipt"                  => "Afficher sur le reçu",
-    "show_in_receivings"               => "Afficher dans les réceptions",
-    "show_in_receivings_visibility"    => "Réceptions",
-    "show_in_sales"                    => "Afficher dans les ventes",
-    "show_in_sales_visibility"         => "Ventes",
-    "update"                           => "Mettre à jour l'attribut",
+    'attribute_value_invalid_chars'    => 'La valeur de l\'attribut ne doit pas contenir \'_\' ou \'|\'',
+    'confirm_delete'                   => 'Êtes-vous certain de vouloir supprimer le(s) attribut(s) sélectionné(s) ?',
+    'confirm_restore'                  => 'Êtes-vous certain de vouloir restaurer le(s) attribut(s) sélectionné(s) ?',
+    'definition_cannot_be_deleted'     => 'Le(s) attribut(s) sélectionné(s) n\'ont pas pu être supprimé(s)',
+    'definition_invalid_group' => 'Le groupe sélectionné n\'existe pas ou est invalide.',
+    'definition_error_adding_updating' => 'L\'attribut {0} n\'a pas pu être ajouté ou mis à jour. Veuillez vérifier le journal d\'erreurs.',
+    'definition_flags'                 => 'Visibilité de l\'attribut',
+    'definition_group'                 => 'Groupe',
+    'definition_id'                    => 'ID',
+    'definition_name'                  => 'Ajouter un attribut',
+    'definition_name_required'         => 'Le nom de l\'attribut est requis',
+    'definition_one_or_multiple'       => 'attribut(s)',
+    'definition_successful_adding'     => 'Vous avez ajouté l\'article avec succès',
+    'definition_successful_deleted'    => 'Vous avez supprimé avec succès',
+    'definition_successful_updating'   => 'Vous avez mis-à-jour l\'attribut avec succès',
+    'definition_type'                  => 'Type d\'attribut',
+    'definition_type_required'         => 'Le type d\'attribut est requis',
+    'definition_unit'                  => 'Unité de mesure',
+    'definition_values'                => 'Valeurs de l\'attribut',
+    'new'                              => 'Nouvel attribut',
+    'no_attributes_to_display'         => 'Aucun attribut à afficher',
+    'receipt_visibility'               => 'Reçu',
+    'show_in_items'                    => 'Afficher dans les articles',
+    'show_in_items_visibility'         => 'Articles',
+    'show_in_receipt'                  => 'Afficher sur le reçu',
+    'show_in_receivings'               => 'Afficher dans les réceptions',
+    'show_in_receivings_visibility'    => 'Réceptions',
+    'show_in_sales'                    => 'Afficher dans les ventes',
+    'show_in_sales_visibility'         => 'Ventes',
+    'show_in_search'                   => 'Afficher dans la recherche',
+    'show_in_search_visibility'        => 'Recherche',
+    'update'                           => 'Mettre à jour l\'attribut',
 ];
diff --git a/app/Language/fr/Bootstrap_tables.php b/app/Language/fr/Bootstrap_tables.php
index 6ac8542af..94e10d722 100644
--- a/app/Language/fr/Bootstrap_tables.php
+++ b/app/Language/fr/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "tous",
-    "columns"              => "Colonnes",
-    "hide_show_pagination" => "Masquer/Afficher la pagination",
-    "loading"              => "Chargement en cours, patientez, s'il vous plaît ...",
-    "page_from_to"         => "Affichage des lignes {0} à {1} sur {2} lignes au total",
-    "refresh"              => "Rafraîchir",
-    "rows_per_page"        => "{0} lignes par page",
-    "toggle"               => "Alterner",
+    'all' => "tous",
+    'columns' => "Colonnes",
+    'hide_show_pagination' => "Masquer/Afficher la pagination",
+    'loading' => "Chargement en cours, patientez, s'il vous plaît",
+    'page_from_to' => "Affichage des lignes {0} à {1} sur {2} lignes au total",
+    'refresh' => "Rafraîchir",
+    'rows_per_page' => "{0} lignes par page",
+    'toggle' => "Alterner",
 ];
diff --git a/app/Language/fr/Common.php b/app/Language/fr/Common.php
index 056c15ec8..d8dc85f84 100644
--- a/app/Language/fr/Common.php
+++ b/app/Language/fr/Common.php
@@ -3,18 +3,18 @@
 return [
     "address_1"                      => "Adresse 1",
     "address_2"                      => "Adresse 2",
-    "admin"                          => "",
+    "admin"                          => "Administrateur",
     "city"                           => "Ville",
-    "clerk"                          => "",
+    "clerk"                          => "Employé",
     "close"                          => "Fermer",
-    "color"                          => "",
+    "color"                          => "Couleurs du thème",
     "comments"                       => "Commentaires",
     "common"                         => "commun",
     "confirm_search"                 => "Vous avez sélectionné une ou plusieurs lignes, celles-ci ne seront plus sélectionnées après votre recherche. Voulez-vous continuer ?",
     "copyrights"                     => "© 2010 - {0}",
     "correct_errors"                 => "Merci de corriger les erreurs identifiées avant d'enregistrer",
     "country"                        => "Pays",
-    "dashboard"                      => "",
+    "dashboard"                      => "Tableau de bord",
     "date"                           => "Date",
     "delete"                         => "Supprimer",
     "det"                            => "détails",
@@ -26,14 +26,14 @@ return [
     "export_csv_no"                  => "Non",
     "export_csv_yes"                 => "Oui",
     "fields_required_message"        => "Les champs en rouge sont requis",
-    "fields_required_message_unique" => "",
+    "fields_required_message_unique" => "Les champs en rouge sont requis et doivent être uniques",
     "first_name"                     => "Prénom",
     "first_name_required"            => "Le prénom est requis.",
     "first_page"                     => "Premier",
     "gender"                         => "Genre",
     "gender_female"                  => "F",
     "gender_male"                    => "M",
-    "gender_undefined"               => "",
+    "gender_undefined"               => "Non défini",
     "icon"                           => "Icône",
     "id"                             => "Identifiant",
     "import"                         => "Importation",
@@ -51,18 +51,18 @@ return [
     "logo"                           => "Logo",
     "logo_mark"                      => "Marque",
     "logout"                         => "Déconnexion",
-    "manager"                        => "",
+    "manager"                        => "Gestionnaire",
     "migration_needed"               => "Une migration de la base de donnée vers {0} démarrera après le connexion.",
     "new"                            => "Nouveau",
-    "no"                             => "Oui",
+    "no"                             => "Non",
     "no_persons_to_display"          => "Il n'y a personne à afficher.",
     "none_selected_text"             => "[Sélectionner]",
     "or"                             => "OU",
-    "people"                         => "",
+    "people"                         => "Personnes",
     "phone_number"                   => "Téléphone",
     "phone_number_required"          => "Le numéro de téléphone est requis.",
     "please_visit_my"                => "SVP visitez le",
-    "position"                       => "",
+    "position"                       => "Position",
     "powered_by"                     => "Propulsé par",
     "price"                          => "Prix",
     "print"                          => "Imprimer",
diff --git a/app/Language/fr/Config.php b/app/Language/fr/Config.php
index fffec6b10..d5502712d 100644
--- a/app/Language/fr/Config.php
+++ b/app/Language/fr/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adresse de l'entreprise",
-    "address_required"                          => "L'adresse de l'entreprise est un champ obligatoire.",
-    "all_set"                                   => "Toutes les permissions de fichier sont correctement configurées !",
-    "allow_duplicate_barcodes"                  => "Autoriser les codes à barres en double",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Sauvegarde",
-    "backup_database"                           => "Sauvegarder la base de données",
-    "barcode"                                   => "Code à barre",
-    "barcode_company"                           => "Nom de l'entreprise",
-    "barcode_configuration"                     => "Configuration du code à barre",
-    "barcode_content"                           => "Contenu du code à barre",
-    "barcode_first_row"                         => "Ligne 1",
-    "barcode_font"                              => "Police d'écriture",
-    "barcode_formats"                           => "Formats d'entrée",
-    "barcode_generate_if_empty"                 => "Générer si vide.",
-    "barcode_height"                            => "Hauteur (px)",
-    "barcode_id"                                => "Id/Nom d'article",
-    "barcode_info"                              => "Configuration des informations du code à barre",
-    "barcode_layout"                            => "Disposition du code à barre",
-    "barcode_name"                              => "Nom",
-    "barcode_number"                            => "Code à barre",
-    "barcode_number_in_row"                     => "Numéro dans la ligne",
-    "barcode_page_cellspacing"                  => "Afficher l'espacement de cellules de la page.",
-    "barcode_page_width"                        => "Afficher la largeur de la page",
-    "barcode_price"                             => "Prix",
-    "barcode_second_row"                        => "Ligne 2",
-    "barcode_third_row"                         => "Ligne 3",
-    "barcode_tooltip"                           => "Avertissement : cette fonctionnalité peut entraîner l'importation ou la création de doublons. Ne pas utiliser si vous ne voulez pas de codes à barres en double.",
-    "barcode_type"                              => "Type de Code à barre",
-    "barcode_width"                             => "Largeur (px)",
-    "bottom"                                    => "Pied de page",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Décimales",
-    "cash_decimals_tooltip"                     => "Si les décimales et les décimales monétaires sont les mêmes, aucun arrondi ne sera effectué.",
-    "cash_rounding"                             => "Arrondis de trésorerie",
-    "category_dropdown"                         => "Afficher les catégories dans un menu déroulant",
-    "center"                                    => "Centre",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "virgule",
-    "company"                                   => "Nome de l'Entreprise",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Changer l'image",
-    "company_logo"                              => "Logo de l'Entreprise",
-    "company_remove_image"                      => "Supprimer l'image",
-    "company_required"                          => "Le nom d'entreprise est requis",
-    "company_select_image"                      => "Sélectionner l'image",
-    "company_website_url"                       => "Le site Web de l'entreprise n'est pas une URL valide (http: //...).",
-    "country_codes"                             => "Codes de pays",
-    "country_codes_tooltip"                     => "Liste des codes de pays, séparés par des virgules, pour la recherche d'adresses nominatives.",
-    "currency_code"                             => "Code de devise",
-    "currency_decimals"                         => "Décimales",
-    "currency_symbol"                           => "Symbole Monétaire",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Récompense",
-    "customer_reward_duplicate"                 => "La récompense doit être unique.",
-    "customer_reward_enable"                    => "Activer les récompenses client",
-    "customer_reward_invalid_chars"             => "La récompense ne peut pas contenir '_'",
-    "customer_reward_required"                  => "La récompense est un champ obligatoire",
-    "customer_sales_tax_support"                => "Soutien à la taxe de vente au client",
-    "date_or_time_format"                       => "Filtre de date et d'heure",
-    "datetimeformat"                            => "Format de la date et de l'heure",
-    "decimal_point"                             => "Virgule",
-    "default_barcode_font_size_number"          => "La taille de la police du code-barres par défaut doit être un nombre.",
-    "default_barcode_font_size_required"        => "La taille de police du code-barres par défaut est un champ obligatoire.",
-    "default_barcode_height_number"             => "La hauteur du code-barres par défaut doit être un nombre.",
-    "default_barcode_height_required"           => "La hauteur du code-barres par défaut est un champ obligatoire.",
-    "default_barcode_num_in_row_number"         => "Le numéro de code-barres par défaut dans la ligne doit être un nombre.",
-    "default_barcode_num_in_row_required"       => "Le numéro de code-barres par défaut dans la ligne est un champ obligatoire.",
-    "default_barcode_page_cellspacing_number"   => "Page de codes-barres par défaut L'espace-cellule doit être un nombre.",
-    "default_barcode_page_cellspacing_required" => "Page Barcode par défaut L'espacement des cellules est un champ obligatoire.",
-    "default_barcode_page_width_number"         => "La largeur de page du code à barres par défaut doit être un nombre.",
-    "default_barcode_page_width_required"       => "Largeur de page de code-barres par défaut est un champ obligatoire.",
-    "default_barcode_width_number"              => "La largeur de code à barres par défaut doit être un nombre.",
-    "default_barcode_width_required"            => "La largeur de code à barres par défaut est un champ obligatoire.",
-    "default_item_columns"                      => "Colonnes d'article visibles par défaut",
-    "default_origin_tax_code"                   => "Code de taxe d'origine par défaut",
-    "default_receivings_discount"               => "Rabais de réception par défaut",
-    "default_receivings_discount_number"        => "Rabais de réception par défaut doit être numérique.",
-    "default_receivings_discount_required"      => "Rabais de réception par défaut est requis.",
-    "default_sales_discount"                    => "Remboursement des ventes par défaut %",
-    "default_sales_discount_number"             => "Le rabais de vente par défaut doit être un nombre.",
-    "default_sales_discount_required"           => "La remise sur les ventes par défaut est un champ obligatoire.",
-    "default_tax_category"                      => "Catégorie fiscale par défaut",
-    "default_tax_code"                          => "Code fiscal par défaut",
-    "default_tax_jurisdiction"                  => "Juridiction fiscale par défaut",
-    "default_tax_name_number"                   => "Le nom de taxe par défaut doit être une chaîne.",
-    "default_tax_name_required"                 => "Le nom de taxe par défaut est un champ obligatoire.",
-    "default_tax_rate"                          => "Taux d'Imposition par Défaut",
-    "default_tax_rate_1"                        => "Taux d'Imposition 1",
-    "default_tax_rate_2"                        => "Taux d'Imposition 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Le taux de taxe par défaut doit être un nombre.",
-    "default_tax_rate_required"                 => "Le taux de taxe par défaut est un champ obligatoire.",
-    "derive_sale_quantity"                      => "Autoriser la quantité de vente dérivée",
-    "derive_sale_quantity_tooltip"              => "Si coché, un nouveau type d'article sera fourni pour les articles commandés par montant étendu",
-    "dinner_table"                              => "Table",
-    "dinner_table_duplicate"                    => "La table doit être unique.",
-    "dinner_table_enable"                       => "Activer les tables de dîner",
-    "dinner_table_invalid_chars"                => "Le nom de la table ne peut pas contenir '_'.",
-    "dinner_table_required"                     => "La table est un champ obligatoire.",
-    "dot"                                       => "point",
-    "email"                                     => "Courriel",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path de Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Case à cocher Reçu de courrier électronique",
-    "email_receipt_check_behaviour_always"      => "Toujours vérifié",
-    "email_receipt_check_behaviour_last"        => "Se souvenir de la dernière sélection",
-    "email_receipt_check_behaviour_never"       => "Toujours décoché",
-    "email_smtp_crypto"                         => "SMTP Cryptage",
-    "email_smtp_host"                           => "SMTP Serveur",
-    "email_smtp_pass"                           => "Mot de passe SMTP",
-    "email_smtp_port"                           => "Port SMTP",
-    "email_smtp_timeout"                        => "Délai SMTP (s)",
-    "email_smtp_user"                           => "Nom d'utilisateur SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Appliquer la confidentialité",
-    "enforce_privacy_tooltip"                   => "Protéger la confidentialité des clients en imposant le brouillage des données en cas de suppression de leurs données",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "Il y a des problèmes avec les permissions de fichier. Veuillez corriger et recharger la page.",
-    "financial_year"                            => "Début de l'année fiscale",
-    "financial_year_apr"                        => "1er avril",
-    "financial_year_aug"                        => "1er août",
-    "financial_year_dec"                        => "1er décembre",
-    "financial_year_feb"                        => "1er février",
-    "financial_year_jan"                        => "1er janvier",
-    "financial_year_jul"                        => "1er juillet",
-    "financial_year_jun"                        => "1er juin",
-    "financial_year_mar"                        => "1er mars",
-    "financial_year_may"                        => "1er mai",
-    "financial_year_nov"                        => "1er novembre",
-    "financial_year_oct"                        => "1er octobre",
-    "financial_year_sep"                        => "1er septembre",
-    "floating_labels"                           => "Étiquettes flottantes",
-    "gcaptcha_enable"                           => "Page de connexion reCAPTCHA",
-    "gcaptcha_secret_key"                       => "clé secrète reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "La clé secrète reCAPTCHA est un champ obligatoire",
-    "gcaptcha_site_key"                         => "clé de site reCAPTCHA",
-    "gcaptcha_site_key_required"                => "La clé de site reCAPTCHA est un champ obligatoire",
-    "gcaptcha_tooltip"                          => "Protégez la page de connexion avec Google reCAPTCHA, cliquez sur l'icône d'une paire de clés API.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Numéro de carte-cadeau",
-    "giftcard_random"                           => "Générer aléatoire",
-    "giftcard_series"                           => "Générer en série",
-    "image_allowed_file_types"                  => "Types de fichier autorisés",
-    "image_max_height_tooltip"                  => "Hauteur maximale autorisée en pixels pour le téléversement d'images.",
-    "image_max_size_tooltip"                    => "Taille de fichier maximale autorisée en kilobytes pour le téléversement d'images.",
-    "image_max_width_tooltip"                   => "Largeur maximale autorisée en pixels pour le téléversement d'images.",
-    "image_restrictions"                        => "Restrictions sur le téléversement d'images",
-    "include_hsn"                               => "Prise en charge des codes HSN",
-    "info"                                      => "Entreprise",
-    "info_configuration"                        => "Çonfiguration de l'Entreprise",
-    "input_groups"                              => "Groupes d'entrée",
-    "integrations"                              => "Intégrations",
-    "integrations_configuration"                => "Intégration de parties tierces",
-    "invoice"                                   => "Facture",
-    "invoice_configuration"                     => "Paramètres d'impression de facture",
-    "invoice_default_comments"                  => "Commentaires par facture par défaut",
-    "invoice_email_message"                     => "Modèle de courrier électronique de facture",
-    "invoice_enable"                            => "Activer la facturation",
-    "invoice_printer"                           => "Imprimante de facture",
-    "invoice_type"                              => "Type de facturation",
-    "is_readable"                               => "est lisible, mais les permissions sont incorrectes. Définir à 640 ou 660 et rafraîchir.",
-    "is_writable"                               => "is écrivable, mais les permissions sont plus hautes que 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Attention: Cette fonctionnalité ne sera active que si l'extension FireFox jsPrintSetup est installée. Enregistrer quand même ?",
-    "language"                                  => "Langue",
-    "last_used_invoice_number"                  => "Dernier numéro de facture utilisé",
-    "last_used_quote_number"                    => "Dernier numéro de devis utilisé",
-    "last_used_work_order_number"               => "Dernier numéro W / O utilisé",
-    "left"                                      => "Gauche",
-    "license"                                   => "Licence",
-    "license_configuration"                     => "Déclaration de licence",
-    "line_sequence"                             => "Séquence de lignes",
-    "lines_per_page"                            => "Lignes par page",
-    "lines_per_page_number"                     => "Les lignes par page doivent être un nombre.",
-    "lines_per_page_required"                   => "Lignes par page est un champ obligatoire.",
-    "locale"                                    => "Localisation",
-    "locale_configuration"                      => "Configuration de localisation",
-    "locale_info"                               => "Informations de configuration de localisation",
-    "location"                                  => "Inventaire",
-    "location_configuration"                    => "Emplacements de stock",
-    "location_info"                             => "Informations de configuration de l'emplacement",
-    "login_form"                                => "Style du formulaire de connexion",
-    "logout"                                    => "Voulez-vous faire une sauvegarde avant de vous déconnecter ? Cliquez sur [OK] pour sauvegarder ou sur [Annuler] pour vous déconnecter.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "Clé API MailChimp",
-    "mailchimp_configuration"                   => "Configuration de MailChimp",
-    "mailchimp_key_successfully"                => "La clé API est valide.",
-    "mailchimp_key_unsuccessfully"              => "La clé de l'API est invalide.",
-    "mailchimp_lists"                           => "Liste(s) MailChimp",
-    "mailchimp_tooltip"                         => "Cliquez sur l'icône pour une clé API.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Message texte enregistré",
-    "msg_msg_placeholder"                       => "Si vous souhaitez utiliser un modèle de SMS, enregistrez votre message ici. Sinon, laisser la boîte en blanc.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password est un champ obligatoire",
-    "msg_src"                                   => "ID de l'expéditeur de SMS-API",
-    "msg_src_required"                          => "L'ID de l'expéditeur de SMS-API est un champ obligatoire",
-    "msg_uid"                                   => "Nom d'utilisateur de l'API SMS",
-    "msg_uid_required"                          => "Le nom d'utilisateur de l'API SMS est un champ obligatoire",
-    "multi_pack_enabled"                        => "Ensembles multiples par article",
-    "no_risk"                                   => "Pas de risques de sécurité/vulnérabilité.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Position contextuelle de notification",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localisation",
-    "number_locale_invalid"                     => "L'environnement local entré est invalide. Vérifiez le lien dans l'info-bulle pour trouver un environnement local valide.",
-    "number_locale_required"                    => "Number Locale est un champ obligatoire.",
-    "number_locale_tooltip"                     => "Trouvez un lieu approprié grâce à ce lien.",
-    "os_timezone"                               => "Fuseau horaire d'OSPOS :",
-    "ospos_info"                                => "Informations d'installation d'OSPOS",
-    "payment_options_order"                     => "Ordre des options de paiement",
-    "perm_risk"                                 => "Des permissions incorrectement définies exposent ce logiciel a des risques de sécurité.",
-    "phone"                                     => "Téléphone",
-    "phone_required"                            => "Téléphone de l'entreprise est un champ obligatoire.",
-    "print_bottom_margin"                       => "Marge Bas",
-    "print_bottom_margin_number"                => "La marge inférieure doit être un nombre.",
-    "print_bottom_margin_required"              => "La marge inférieure est un champ obligatoire.",
-    "print_delay_autoreturn"                    => "Retour automatique a la vente retarde",
-    "print_delay_autoreturn_number"             => "Retour automatique à la vente retarde est un champ obligatoire.",
-    "print_delay_autoreturn_required"           => "Retour automatique à la vente retarde doit être un nombre.",
-    "print_footer"                              => "Pied de page imprimante",
-    "print_header"                              => "Imprimer l'en-tête du navigateur",
-    "print_left_margin"                         => "Marge Gauche",
-    "print_left_margin_number"                  => "La marge gauche par défaut doit être un nombre.",
-    "print_left_margin_required"                => "La marge gauche par défaut est un champ obligatoire.",
-    "print_receipt_check_behaviour"             => "Imprimer la case à cocher Reçu",
-    "print_receipt_check_behaviour_always"      => "Toujours vérifié",
-    "print_receipt_check_behaviour_last"        => "Se souvenir de la dernière sélection",
-    "print_receipt_check_behaviour_never"       => "Toujours décoché",
-    "print_right_margin"                        => "Marge Droit",
-    "print_right_margin_number"                 => "La marge droite par défaut doit être un nombre.",
-    "print_right_margin_required"               => "La marge droite par défaut est un champ obligatoire.",
-    "print_silently"                            => "Afficher la boîte de dialogue Imprimer",
-    "print_top_margin"                          => "Margin Superieure",
-    "print_top_margin_number"                   => "Margin Top doit être un nombre.",
-    "print_top_margin_required"                 => "Margin Top est un champ obligatoire.",
-    "quantity_decimals"                         => "Nombre de décimales",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Commentaires de devis par défaut",
-    "receipt"                                   => "Le reçu",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Paramètres d'impression du reçu",
-    "receipt_default"                           => "Défaut",
-    "receipt_font_size"                         => "Taille de font",
-    "receipt_font_size_number"                  => "La taille de la font doit être un nombre.",
-    "receipt_font_size_required"                => "Taille de la font est un champ obligatoire.",
-    "receipt_info"                              => "Informations de configuration du reçu",
-    "receipt_printer"                           => "Imprimante de tickets",
-    "receipt_short"                             => "Court",
-    "receipt_show_company_name"                 => "Afficher le nom de l'entreprise",
-    "receipt_show_description"                  => "Montrer la description",
-    "receipt_show_serialnumber"                 => "Afficher le numéro de série",
-    "receipt_show_tax_ind"                      => "Afficher les indicateurs de taxe",
-    "receipt_show_taxes"                        => "Afficher les taxes",
-    "receipt_show_total_discount"               => "Afficher le rabais total",
-    "receipt_template"                          => "Modèle de reçu",
-    "receiving_calculate_average_price"         => "Calc. prix moyen (Réception)",
-    "recv_invoice_format"                       => "Format de la facture des factures",
-    "register_mode_default"                     => "Mode de registre par défaut",
-    "report_an_issue"                           => "Signaler un problème",
-    "return_policy_required"                    => "Le Message est un champ requis.",
-    "reward"                                    => "Récompense",
-    "reward_configuration"                      => "Configuration de récompense",
-    "right"                                     => "Droite",
-    "sales_invoice_format"                      => "Format de la facture de vente",
-    "sales_quote_format"                        => "Format de devis de vente",
-    "saved_successfully"                        => "Configuration enregistrer avec succès.",
-    "saved_unsuccessfully"                      => "L'enregistrement de configuration a échoué.",
-    "security_issue"                            => "Avertissement de faille de sécurité",
-    "server_notice"                             => "Veuillez utiliser les informations ci-dessous pour signaler un problème.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Afficher l'icône du bureau",
-    "statistics"                                => "Envoyer des statistiques",
-    "statistics_tooltip"                        => "Envoyer des statistiques pour le développement et l'amélioration des fonctionnalités.",
-    "stock_location"                            => "Emplacement du stock",
-    "stock_location_duplicate"                  => "L'emplacement du stock doit être unique.",
-    "stock_location_invalid_chars"              => "L'emplacement de stockage ne peut pas contenir '_'.",
-    "stock_location_required"                   => "L'emplacement du stock est un champ obligatoire.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Colonne 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Présentation des suggestions de recherche",
-    "suggestions_second_column"                 => "Colonne 2",
-    "suggestions_third_column"                  => "Colonne 3",
-    "system_conf"                               => "Paramètres & Configuration",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Configuration de la table",
-    "takings_printer"                           => "Imprimante de reçu",
-    "tax"                                       => "Taxe",
-    "tax_category"                              => "Catégorie fiscale",
-    "tax_category_duplicate"                    => "La catégorie de taxe saisie existe déjà.",
-    "tax_category_invalid_chars"                => "La catégorie de taxe entrée est invalide.",
-    "tax_category_required"                     => "La catégorie de taxe est requise.",
-    "tax_category_used"                         => "La catégorie de taxe ne peut pas être supprimée car elle est utilisée.",
-    "tax_configuration"                         => "Configuration de l'impôt",
-    "tax_decimals"                              => "Décimales fiscales",
-    "tax_id"                                    => "Id de taxe",
-    "tax_included"                              => "Taxe inclu",
-    "theme"                                     => "Thème",
-    "theme_preview"                             => "Aperçu du thème :",
-    "thousands_separator"                       => "Séparateur de milliers",
-    "timezone"                                  => "Fuseau Horaire",
-    "timezone_error"                            => "Le fuseau horaire d'OSPOS est différent de votre fuseau horaire local.",
-    "top"                                       => "Haut",
-    "use_destination_based_tax"                 => "Utiliser la taxe basée sur la destination",
-    "user_timezone"                             => "Fuseau horaire local :",
-    "website"                                   => "Site Internet",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Support de commande de travail",
-    "work_order_format"                         => "Format de bon de travail",
+    'address'                                   => "Adresse de l'entreprise",
+    'address_required'                          => "L'adresse de l'entreprise est un champ obligatoire.",
+    'all_set'                                   => 'Toutes les permissions de fichier sont correctement configurées !',
+    'allow_duplicate_barcodes'                  => 'Autoriser les codes à barres en double',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Sauvegarde',
+    'backup_database'                           => 'Sauvegarder la base de données',
+    'barcode'                                   => 'Code à barre',
+    'barcode_company'                           => "Nom de l'entreprise",
+    'barcode_configuration'                     => 'Configuration du code à barre',
+    'barcode_content'                           => 'Contenu du code à barre',
+    'barcode_first_row'                         => 'Ligne 1',
+    'barcode_font'                              => "Police d'écriture",
+    'barcode_formats'                           => "Formats d'entrée",
+    'barcode_generate_if_empty'                 => 'Générer si vide.',
+    'barcode_height'                            => 'Hauteur (px)',
+    'barcode_id'                                => "Id/Nom d'article",
+    'barcode_info'                              => 'Configuration des informations du code à barre',
+    'barcode_layout'                            => 'Disposition du code à barre',
+    'barcode_name'                              => 'Nom',
+    'barcode_number'                            => 'Code à barre',
+    'barcode_number_in_row'                     => 'Numéro dans la ligne',
+    'barcode_page_cellspacing'                  => "Afficher l'espacement de cellules de la page.",
+    'barcode_page_width'                        => 'Afficher la largeur de la page',
+    'barcode_price'                             => 'Prix',
+    'barcode_second_row'                        => 'Ligne 2',
+    'barcode_third_row'                         => 'Ligne 3',
+    'barcode_tooltip'                           => "Avertissement : cette fonctionnalité peut entraîner l'importation ou la création de doublons. Ne pas utiliser si vous ne voulez pas de codes à barres en double.",
+    'barcode_type'                              => 'Type de Code à barre',
+    'barcode_width'                             => 'Largeur (px)',
+    'bottom'                                    => 'Pied de page',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Décimales',
+    'cash_decimals_tooltip'                     => 'Si les décimales et les décimales monétaires sont les mêmes, aucun arrondi ne sera effectué.',
+    'cash_rounding'                             => 'Arrondis de trésorerie',
+    'category_dropdown'                         => 'Afficher les catégories dans un menu déroulant',
+    'center'                                    => 'Centre',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'virgule',
+    'company'                                   => "Nome de l'Entreprise",
+    'company_avatar'                            => '',
+    'company_change_image'                      => "Changer l'image",
+    'company_logo'                              => "Logo de l'Entreprise",
+    'company_remove_image'                      => "Supprimer l'image",
+    'company_required'                          => "Le nom d'entreprise est requis",
+    'company_select_image'                      => "Sélectionner l'image",
+    'company_website_url'                       => "Le site Web de l'entreprise n'est pas une URL valide (http: //...).",
+    'country_codes'                             => 'Codes de pays',
+    'country_codes_tooltip'                     => "Liste des codes de pays, séparés par des virgules, pour la recherche d'adresses nominatives.",
+    'currency_code'                             => 'Code de devise',
+    'currency_decimals'                         => 'Décimales',
+    'currency_symbol'                           => 'Symbole Monétaire',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Récompense',
+    'customer_reward_duplicate'                 => 'La récompense doit être unique.',
+    'customer_reward_enable'                    => 'Activer les récompenses client',
+    'customer_reward_invalid_chars'             => "La récompense ne peut pas contenir '_'",
+    'customer_reward_required'                  => 'La récompense est un champ obligatoire',
+    'customer_sales_tax_support'                => 'Soutien à la taxe de vente au client',
+    'date_or_time_format'                       => "Filtre de date et d'heure",
+    'datetimeformat'                            => "Format de la date et de l'heure",
+    'decimal_point'                             => 'Virgule',
+    'default_barcode_font_size_number'          => 'La taille de la police du code-barres par défaut doit être un nombre.',
+    'default_barcode_font_size_required'        => 'La taille de police du code-barres par défaut est un champ obligatoire.',
+    'default_barcode_height_number'             => 'La hauteur du code-barres par défaut doit être un nombre.',
+    'default_barcode_height_required'           => 'La hauteur du code-barres par défaut est un champ obligatoire.',
+    'default_barcode_num_in_row_number'         => 'Le numéro de code-barres par défaut dans la ligne doit être un nombre.',
+    'default_barcode_num_in_row_required'       => 'Le numéro de code-barres par défaut dans la ligne est un champ obligatoire.',
+    'default_barcode_page_cellspacing_number'   => "Page de codes-barres par défaut L'espace-cellule doit être un nombre.",
+    'default_barcode_page_cellspacing_required' => "Page Barcode par défaut L'espacement des cellules est un champ obligatoire.",
+    'default_barcode_page_width_number'         => 'La largeur de page du code à barres par défaut doit être un nombre.',
+    'default_barcode_page_width_required'       => 'Largeur de page de code-barres par défaut est un champ obligatoire.',
+    'default_barcode_width_number'              => 'La largeur de code à barres par défaut doit être un nombre.',
+    'default_barcode_width_required'            => 'La largeur de code à barres par défaut est un champ obligatoire.',
+    'default_item_columns'                      => "Colonnes d'article visibles par défaut",
+    'default_origin_tax_code'                   => "Code de taxe d'origine par défaut",
+    'default_receivings_discount'               => 'Rabais de réception par défaut',
+    'default_receivings_discount_number'        => 'Rabais de réception par défaut doit être numérique.',
+    'default_receivings_discount_required'      => 'Rabais de réception par défaut est requis.',
+    'default_sales_discount'                    => 'Remboursement des ventes par défaut %',
+    'default_sales_discount_number'             => 'Le rabais de vente par défaut doit être un nombre.',
+    'default_sales_discount_required'           => 'La remise sur les ventes par défaut est un champ obligatoire.',
+    'default_tax_category'                      => 'Catégorie fiscale par défaut',
+    'default_tax_code'                          => 'Code fiscal par défaut',
+    'default_tax_jurisdiction'                  => 'Juridiction fiscale par défaut',
+    'default_tax_name_number'                   => 'Le nom de taxe par défaut doit être une chaîne.',
+    'default_tax_name_required'                 => 'Le nom de taxe par défaut est un champ obligatoire.',
+    'default_tax_rate'                          => "Taux d'Imposition par Défaut",
+    'default_tax_rate_1'                        => "Taux d'Imposition 1",
+    'default_tax_rate_2'                        => "Taux d'Imposition 2",
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Le taux de taxe par défaut doit être un nombre.',
+    'default_tax_rate_required'                 => 'Le taux de taxe par défaut est un champ obligatoire.',
+    'derive_sale_quantity'                      => 'Autoriser la quantité de vente dérivée',
+    'derive_sale_quantity_tooltip'              => "Si coché, un nouveau type d'article sera fourni pour les articles commandés par montant étendu",
+    'dinner_table'                              => 'Table',
+    'dinner_table_duplicate'                    => 'La table doit être unique.',
+    'dinner_table_enable'                       => 'Activer les tables de dîner',
+    'dinner_table_invalid_chars'                => "Le nom de la table ne peut pas contenir '_'.",
+    'dinner_table_required'                     => 'La table est un champ obligatoire.',
+    'dot'                                       => 'point',
+    'email'                                     => 'Courriel',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path de Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Case à cocher Reçu de courrier électronique',
+    'email_receipt_check_behaviour_always'      => 'Toujours vérifié',
+    'email_receipt_check_behaviour_last'        => 'Se souvenir de la dernière sélection',
+    'email_receipt_check_behaviour_never'       => 'Toujours décoché',
+    'email_smtp_crypto'                         => 'SMTP Cryptage',
+    'email_smtp_host'                           => 'SMTP Serveur',
+    'email_smtp_pass'                           => 'Mot de passe SMTP',
+    'email_smtp_port'                           => 'Port SMTP',
+    'email_smtp_timeout'                        => 'Délai SMTP (s)',
+    'email_smtp_user'                           => "Nom d'utilisateur SMTP",
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Appliquer la confidentialité',
+    'enforce_privacy_tooltip'                   => 'Protéger la confidentialité des clients en imposant le brouillage des données en cas de suppression de leurs données',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'Il y a des problèmes avec les permissions de fichier. Veuillez corriger et recharger la page.',
+    'financial_year'                            => "Début de l'année fiscale",
+    'financial_year_apr'                        => '1er avril',
+    'financial_year_aug'                        => '1er août',
+    'financial_year_dec'                        => '1er décembre',
+    'financial_year_feb'                        => '1er février',
+    'financial_year_jan'                        => '1er janvier',
+    'financial_year_jul'                        => '1er juillet',
+    'financial_year_jun'                        => '1er juin',
+    'financial_year_mar'                        => '1er mars',
+    'financial_year_may'                        => '1er mai',
+    'financial_year_nov'                        => '1er novembre',
+    'financial_year_oct'                        => '1er octobre',
+    'financial_year_sep'                        => '1er septembre',
+    'floating_labels'                           => 'Étiquettes flottantes',
+    'gcaptcha_enable'                           => 'Page de connexion reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'clé secrète reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'La clé secrète reCAPTCHA est un champ obligatoire',
+    'gcaptcha_site_key'                         => 'clé de site reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'La clé de site reCAPTCHA est un champ obligatoire',
+    'gcaptcha_tooltip'                          => "Protégez la page de connexion avec Google reCAPTCHA, cliquez sur l'icône d'une paire de clés API.",
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Numéro de carte-cadeau',
+    'giftcard_random'                           => 'Générer aléatoire',
+    'giftcard_series'                           => 'Générer en série',
+    'image_allowed_file_types'                  => 'Types de fichier autorisés',
+    'image_max_height_tooltip'                  => "Hauteur maximale autorisée en pixels pour le téléversement d'images.",
+    'image_max_size_tooltip'                    => "Taille de fichier maximale autorisée en kilobytes pour le téléversement d'images.",
+    'image_max_width_tooltip'                   => "Largeur maximale autorisée en pixels pour le téléversement d'images.",
+    'image_restrictions'                        => "Restrictions sur le téléversement d'images",
+    'include_hsn'                               => 'Prise en charge des codes HSN',
+    'info'                                      => 'Entreprise',
+    'info_configuration'                        => "Çonfiguration de l'Entreprise",
+    'input_groups'                              => "Groupes d'entrée",
+    'integrations'                              => 'Intégrations',
+    'integrations_configuration'                => 'Intégration de parties tierces',
+    'invoice'                                   => 'Facture',
+    'invoice_configuration'                     => "Paramètres d'impression de facture",
+    'invoice_default_comments'                  => 'Commentaires par facture par défaut',
+    'invoice_email_message'                     => 'Modèle de courrier électronique de facture',
+    'invoice_enable'                            => 'Activer la facturation',
+    'invoice_printer'                           => 'Imprimante de facture',
+    'invoice_type'                              => 'Type de facturation',
+    'is_readable'                               => 'est lisible, mais les permissions sont incorrectes. Définir à 640 ou 660 et rafraîchir.',
+    'is_writable'                               => 'is écrivable, mais les permissions sont plus hautes que 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => "Attention: Cette fonctionnalité ne sera active que si l'extension FireFox jsPrintSetup est installée. Enregistrer quand même ?",
+    'language'                                  => 'Langue',
+    'last_used_invoice_number'                  => 'Dernier numéro de facture utilisé',
+    'last_used_quote_number'                    => 'Dernier numéro de devis utilisé',
+    'last_used_work_order_number'               => 'Dernier numéro W / O utilisé',
+    'left'                                      => 'Gauche',
+    'license'                                   => 'Licence',
+    'license_configuration'                     => 'Déclaration de licence',
+    'line_sequence'                             => 'Séquence de lignes',
+    'lines_per_page'                            => 'Lignes par page',
+    'lines_per_page_number'                     => 'Les lignes par page doivent être un nombre.',
+    'lines_per_page_required'                   => 'Lignes par page est un champ obligatoire.',
+    'locale'                                    => 'Localisation',
+    'locale_configuration'                      => 'Configuration de localisation',
+    'locale_info'                               => 'Informations de configuration de localisation',
+    'location'                                  => 'Inventaire',
+    'location_configuration'                    => 'Emplacements de stock',
+    'location_info'                             => "Informations de configuration de l'emplacement",
+    'login_form'                                => 'Style du formulaire de connexion',
+    'logout'                                    => 'Voulez-vous faire une sauvegarde avant de vous déconnecter ? Cliquez sur [OK] pour sauvegarder ou sur [Annuler] pour vous déconnecter.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'Clé API MailChimp',
+    'mailchimp_configuration'                   => 'Configuration de MailChimp',
+    'mailchimp_key_successfully'                => 'La clé API est valide.',
+    'mailchimp_key_unsuccessfully'              => "La clé de l'API est invalide.",
+    'mailchimp_lists'                           => 'Liste(s) MailChimp',
+    'mailchimp_tooltip'                         => "Cliquez sur l'icône pour une clé API.",
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Message texte enregistré',
+    'msg_msg_placeholder'                       => 'Si vous souhaitez utiliser un modèle de SMS, enregistrez votre message ici. Sinon, laisser la boîte en blanc.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => "ID de l'expéditeur de SMS-API",
+    'msg_src_required'                          => "L'ID de l'expéditeur de SMS-API est un champ obligatoire",
+    'msg_uid'                                   => "Nom d'utilisateur de l'API SMS",
+    'msg_uid_required'                          => "Le nom d'utilisateur de l'API SMS est un champ obligatoire",
+    'multi_pack_enabled'                        => 'Ensembles multiples par article',
+    'no_risk'                                   => 'Pas de risques de sécurité/vulnérabilité.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Position contextuelle de notification',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localisation',
+    'number_locale_invalid'                     => "L'environnement local entré est invalide. Vérifiez le lien dans l'info-bulle pour trouver un environnement local valide.",
+    'number_locale_required'                    => 'Number Locale est un champ obligatoire.',
+    'number_locale_tooltip'                     => 'Trouvez un lieu approprié grâce à ce lien.',
+    'os_timezone'                               => "Fuseau horaire d'OSPOS :",
+    'ospos_info'                                => "Informations d'installation d'OSPOS",
+    'payment_options_order'                     => 'Ordre des options de paiement',
+    'payment_reference_code_length_limits'      => 'Code de référence de paiement<br>Limites de longueur',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Des permissions incorrectement définies exposent ce logiciel a des risques de sécurité.',
+    'phone'                                     => 'Téléphone',
+    'phone_required'                            => "Téléphone de l'entreprise est un champ obligatoire.",
+    'print_bottom_margin'                       => 'Marge Bas',
+    'print_bottom_margin_number'                => 'La marge inférieure doit être un nombre.',
+    'print_bottom_margin_required'              => 'La marge inférieure est un champ obligatoire.',
+    'print_delay_autoreturn'                    => 'Retour automatique a la vente retarde',
+    'print_delay_autoreturn_number'             => 'Retour automatique à la vente retarde est un champ obligatoire.',
+    'print_delay_autoreturn_required'           => 'Retour automatique à la vente retarde doit être un nombre.',
+    'print_footer'                              => 'Pied de page imprimante',
+    'print_header'                              => "Imprimer l'en-tête du navigateur",
+    'print_left_margin'                         => 'Marge Gauche',
+    'print_left_margin_number'                  => 'La marge gauche par défaut doit être un nombre.',
+    'print_left_margin_required'                => 'La marge gauche par défaut est un champ obligatoire.',
+    'print_receipt_check_behaviour'             => 'Imprimer la case à cocher Reçu',
+    'print_receipt_check_behaviour_always'      => 'Toujours vérifié',
+    'print_receipt_check_behaviour_last'        => 'Se souvenir de la dernière sélection',
+    'print_receipt_check_behaviour_never'       => 'Toujours décoché',
+    'print_right_margin'                        => 'Marge Droit',
+    'print_right_margin_number'                 => 'La marge droite par défaut doit être un nombre.',
+    'print_right_margin_required'               => 'La marge droite par défaut est un champ obligatoire.',
+    'print_silently'                            => 'Afficher la boîte de dialogue Imprimer',
+    'print_top_margin'                          => 'Margin Superieure',
+    'print_top_margin_number'                   => 'Margin Top doit être un nombre.',
+    'print_top_margin_required'                 => 'Margin Top est un champ obligatoire.',
+    'quantity_decimals'                         => 'Nombre de décimales',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Commentaires de devis par défaut',
+    'receipt'                                   => 'Le reçu',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => "Paramètres d'impression du reçu",
+    'receipt_default'                           => 'Défaut',
+    'receipt_font_size'                         => 'Taille de font',
+    'receipt_font_size_number'                  => 'La taille de la font doit être un nombre.',
+    'receipt_font_size_required'                => 'Taille de la font est un champ obligatoire.',
+    'receipt_info'                              => 'Informations de configuration du reçu',
+    'receipt_printer'                           => 'Imprimante de tickets',
+    'receipt_short'                             => 'Court',
+    'receipt_show_company_name'                 => "Afficher le nom de l'entreprise",
+    'receipt_show_description'                  => 'Montrer la description',
+    'receipt_show_serialnumber'                 => 'Afficher le numéro de série',
+    'receipt_show_tax_ind'                      => 'Afficher les indicateurs de taxe',
+    'receipt_show_taxes'                        => 'Afficher les taxes',
+    'receipt_show_total_discount'               => 'Afficher le rabais total',
+    'receipt_template'                          => 'Modèle de reçu',
+    'receiving_calculate_average_price'         => 'Calc. prix moyen (Réception)',
+    'recv_invoice_format'                       => 'Format de la facture des factures',
+    'register_mode_default'                     => 'Mode de registre par défaut',
+    'report_an_issue'                           => 'Signaler un problème',
+    'return_policy_required'                    => 'Le Message est un champ requis.',
+    'reward'                                    => 'Récompense',
+    'reward_configuration'                      => 'Configuration de récompense',
+    'right'                                     => 'Droite',
+    'sales_invoice_format'                      => 'Format de la facture de vente',
+    'sales_quote_format'                        => 'Format de devis de vente',
+    'mailpath_invalid'                          => 'Chemin sendmail invalide. Seuls les lettres, chiffres, tirets, traits de soulignement, barres obliques, antislashs, deux-points, espaces et points sont autorisés.',
+    'saved_successfully'                        => 'Configuration enregistrer avec succès.',
+    'saved_unsuccessfully'                      => "L'enregistrement de configuration a échoué.",
+    'security_issue'                            => 'Avertissement de faille de sécurité',
+    'server_notice'                             => 'Veuillez utiliser les informations ci-dessous pour signaler un problème.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => "Afficher l'icône du bureau",
+    'statistics'                                => 'Envoyer des statistiques',
+    'statistics_tooltip'                        => "Envoyer des statistiques pour le développement et l'amélioration des fonctionnalités.",
+    'stock_location'                            => 'Emplacement du stock',
+    'stock_location_duplicate'                  => "L'emplacement du stock doit être unique.",
+    'stock_location_invalid_chars'              => "L'emplacement de stockage ne peut pas contenir '_'.",
+    'stock_location_required'                   => "L'emplacement du stock est un champ obligatoire.",
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Colonne 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Présentation des suggestions de recherche',
+    'suggestions_second_column'                 => 'Colonne 2',
+    'suggestions_third_column'                  => 'Colonne 3',
+    'system_conf'                               => 'Paramètres & Configuration',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Configuration de la table',
+    'takings_printer'                           => 'Imprimante de reçu',
+    'tax'                                       => 'Taxe',
+    'tax_category'                              => 'Catégorie fiscale',
+    'tax_category_duplicate'                    => 'La catégorie de taxe saisie existe déjà.',
+    'tax_category_invalid_chars'                => 'La catégorie de taxe entrée est invalide.',
+    'tax_category_required'                     => 'La catégorie de taxe est requise.',
+    'tax_category_used'                         => 'La catégorie de taxe ne peut pas être supprimée car elle est utilisée.',
+    'tax_configuration'                         => "Configuration de l'impôt",
+    'tax_decimals'                              => 'Décimales fiscales',
+    'tax_id'                                    => 'Id de taxe',
+    'tax_included'                              => 'Taxe inclu',
+    'theme'                                     => 'Thème',
+    'theme_preview'                             => 'Aperçu du thème :',
+    'thousands_separator'                       => 'Séparateur de milliers',
+    'timezone'                                  => 'Fuseau Horaire',
+    'timezone_error'                            => "Le fuseau horaire d'OSPOS est différent de votre fuseau horaire local.",
+    'top'                                       => 'Haut',
+    'use_destination_based_tax'                 => 'Utiliser la taxe basée sur la destination',
+    'user_timezone'                             => 'Fuseau horaire local :',
+    'website'                                   => 'Site Internet',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Support de commande de travail',
+    'work_order_format'                         => 'Format de bon de travail',
 ];
diff --git a/app/Language/fr/Employees.php b/app/Language/fr/Employees.php
index 789649ae7..49b6fba0c 100644
--- a/app/Language/fr/Employees.php
+++ b/app/Language/fr/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Fiche",
-    "cannot_be_deleted"            => "Impossible de supprimer le(s) employé(s) sélectionné(s),car un ou plusieur a éffectué une vente, ou car vous essayez de vous supprimer vous-meme.",
-    "change_employee"              => "",
-    "change_password"              => "Changement de mot de passe",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Êtes-vous certain de vouloir supprimer le(s) employé(s) sélectionné(s) ?",
-    "confirm_restore"              => "Êtes-vous certain de vouloir restaurer le(s) employé(s) selectionné(s) ?",
-    "current_password"             => "Mot de passe actuel",
-    "current_password_invalid"     => "Le mot de passe actuel est invalide.",
-    "employee"                     => "Employé",
-    "error_adding_updating"        => "Erreur d'ajout/édition d'employé.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Vous ne pouvez pas supprimer l'utilisateur de démonstration admin.",
-    "error_updating_demo_admin"    => "Vous ne pouvez pas modifier l'utilisateur de démonstration admin.",
-    "language"                     => "Langue",
-    "login_info"                   => "Connexion",
-    "manager"                      => "",
-    "new"                          => "Nouvel employé",
-    "none_selected"                => "Aucun employé sélectionné pour la suppression.",
-    "one_or_multiple"              => "employé(s)",
-    "password"                     => "Mot de passe",
-    "password_minlength"           => "Le mot de passe doit contenir au moins 8 caractères.",
-    "password_must_match"          => "Les mots de passe ne concordent pas.",
-    "password_not_must_match"      => "Le mot de passe actuel et le nouveau mot de passe doivent être uniques.",
-    "password_required"            => "Mot de passe requis.",
-    "permission_desc"              => "Cochez les cases ci-dessous pour autoriser l'accès aux modules.",
-    "permission_info"              => "Permissions",
-    "repeat_password"              => "Re-saisissez le mot de passe",
-    "subpermission_required"       => "Ajoutez au moins une permission pour chaque module.",
-    "successful_adding"            => "Employé ajouté.",
-    "successful_change_password"   => "Mot de passe modifié avec succès.",
-    "successful_deleted"           => "Suppression d'employé réussie",
-    "successful_updating"          => "Édition d'employé réussie",
-    "system_language"              => "Langue système",
-    "unsuccessful_change_password" => "Échec du changement de mot de passe.",
-    "update"                       => "Éditer employé",
-    "username"                     => "Nom d'utilisateur",
-    "username_duplicate"           => "Nom d'utilisateur existant. Veuillez en choisir un autre.",
-    "username_minlength"           => "Le nom d'utilisateur doit contenir au moins 5 caractères.",
-    "username_required"            => "Nom d'utilisateur requis.",
+    'administrator'                          => 'Administrateur',
+    'basic_information'                      => 'Fiche',
+    'cannot_be_deleted'                      => 'Impossible de supprimer le(s) employé(s) sélectionné(s),car un ou plusieur a éffectué une vente, ou car vous essayez de vous supprimer vous-meme.',
+    'change_employee'                        => 'Changer d\'employé',
+    'change_password'                        => 'Changement de mot de passe',
+    'clerk'                                  => 'Employé',
+    'commission'                             => 'Commission',
+    'confirm_delete'                         => 'Êtes-vous certain de vouloir supprimer le(s) employé(s) sélectionné(s) ?',
+    'confirm_restore'                        => 'Êtes-vous certain de vouloir restaurer le(s) employé(s) selectionné(s) ?',
+    'current_password'                       => 'Mot de passe actuel',
+    'current_password_invalid'               => 'Le mot de passe actuel est invalide.',
+    'employee'                               => 'Employé',
+    'error_adding_updating'                  => 'Erreur d\'ajout/édition d\'employé.',
+    'error_cannot_remove_own_minimum_grant'  => 'Vous ne pouvez pas retirer vos propres permissions minimales d\'accès aux modules.',
+    'error_deleting_admin'                   => 'Vous ne pouvez pas supprimer un utilisateur administrateur.',
+    'error_deleting_demo_admin'              => 'Vous ne pouvez pas supprimer l\'utilisateur de démonstration admin.',
+    'error_grant_change_disallowed'          => 'Les modifications de permissions sont désactivées dans cette démo.',
+    'error_password_change_disallowed'       => 'Les modifications de mot de passe sont désactivées dans cette démo.',
+    'error_updating_admin'                   => 'Vous ne pouvez pas modifier un utilisateur administrateur.',
+    'error_updating_demo_admin'              => 'Vous ne pouvez pas modifier l\'utilisateur de démonstration admin.',
+    'language'                               => 'Langue',
+    'login_info'                             => 'Connexion',
+    'manager'                                => 'Gestionnaire',
+    'new'                                    => 'Nouvel employé',
+    'none_selected'                          => 'Aucun employé sélectionné pour la suppression.',
+    'one_or_multiple'                        => 'employé(s)',
+    'password'                               => 'Mot de passe',
+    'password_minlength'                     => 'Le mot de passe doit contenir au moins 8 caractères.',
+    'password_must_match'                    => 'Les mots de passe ne concordent pas.',
+    'password_not_must_match'                => 'Le mot de passe actuel et le nouveau mot de passe doivent être uniques.',
+    'password_required'                      => 'Mot de passe requis.',
+    'permission_desc'                        => 'Cochez les cases ci-dessous pour autoriser l\'accès aux modules.',
+    'permission_info'                        => 'Permissions',
+    'repeat_password'                        => 'Re-saisissez le mot de passe',
+    'subpermission_required'                 => 'Ajoutez au moins une permission pour chaque module.',
+    'successful_adding'                      => 'Employé ajouté.',
+    'successful_change_password'             => 'Mot de passe modifié avec succès.',
+    'successful_deleted'                     => 'Suppression d\'employé réussie',
+    'successful_updating'                    => 'Édition d\'employé réussie',
+    'system_language'                        => 'Langue système',
+    'unsuccessful_change_password'           => 'Échec du changement de mot de passe.',
+    'update'                                 => 'Éditer employé',
+    'username'                               => 'Nom d\'utilisateur',
+    'username_duplicate'                     => 'Nom d\'utilisateur existant. Veuillez en choisir un autre.',
+    'username_minlength'                     => 'Le nom d\'utilisateur doit contenir au moins 5 caractères.',
+    'username_required'                      => 'Nom d\'utilisateur requis.',
 ];
diff --git a/app/Language/fr/Error.php b/app/Language/fr/Error.php
index 687d5f2f7..68ef77cb8 100644
--- a/app/Language/fr/Error.php
+++ b/app/Language/fr/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Vous n'avez pas d'autorisation d'accès pour le module",
-    "unknown"              => "inconnu",
+    'no_permission_module'           => 'Vous n\'avez pas d\'autorisation d\'accès pour le module',
+    'unable_to_create_env_file'      => 'Impossible de créer {filePath} pour provisionner throttle.key',
+    'unable_to_lock_file'            => 'Impossible de verrouiller {filePath} : {reason}',
+    'unable_to_open_lock_file'       => 'Impossible d\'ouvrir {filePath} : {reason}',
+    'unable_to_persist_throttle_key' => 'Impossible d\'enregistrer throttle.key dans {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Impossible de lire {filePath} pour provisionner throttle.key',
+    'unknown'                        => 'inconnu',
 ];
diff --git a/app/Language/fr/Items.php b/app/Language/fr/Items.php
index 85c90f15e..889d7323d 100644
--- a/app/Language/fr/Items.php
+++ b/app/Language/fr/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventaire à ajouter ou soustraire.",
-    "allow_alt_description"              => "Autoriser description alternative",
-    "amount_entry"                       => "Entrée de quantité",
-    "bulk_edit"                          => "Éditions multiples",
-    "buy_price_required"                 => "Le prix d'achat est requis.",
-    "cannot_be_deleted"                  => "Impossible de supprimer car un ou plusiers des articles sélectionnés ont des ventes.",
-    "cannot_find_item"                   => "Article non trouvé.",
-    "categories"                         => "",
-    "category"                           => "Catégorie",
-    "category_new"                       => "",
-    "category_required"                  => "La catégorie est requise.",
-    "change_all_to_allow_alt_desc"       => "Autoriser description alternative pour tous.",
-    "change_all_to_not_allow_allow_desc" => "Interdire description alternative pour tous.",
-    "change_all_to_serialized"           => "Tout sérialiser",
-    "change_all_to_unserialized"         => "Tout désérialiser",
-    "change_image"                       => "Changer l'image",
-    "confirm_bulk_edit"                  => "Êtes-vous certain de vouloir éditer toute la sélection ?",
-    "confirm_bulk_edit_wipe_taxes"       => "Les informations de taxes seront remplacées pour tous les articles.",
-    "confirm_delete"                     => "Êtes-vous certain de vouloir supprimer la sélection ?",
-    "confirm_restore"                    => "Êtes-vous certain de vouloir restaurer le(s) élément(s) sélectionné(s) ?",
-    "cost_price"                         => "Prix de gros",
-    "cost_price_number"                  => "Le prix d'achat doit être un nombre.",
-    "cost_price_required"                => "Le prix de gros est requis.",
-    "count"                              => "Mise à jour de l'inventaire",
-    "csv_import_failed"                  => "Échec d'import CSV",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Le CSV envoyé ne contient aucune donnée, ou elles sont dans un format erroné.",
-    "csv_import_partially_failed"        => "Il y a eu {0} importation(s) d'articles échoué(s) au(x) ligne(s) : {1}. Aucune ligne n'a été importée.",
-    "csv_import_success"                 => "Importation des articles réussie.",
-    "current_quantity"                   => "Quantité actuelle",
-    "default_pack_name"                  => "Chacun",
-    "description"                        => "Description",
-    "details_count"                      => "Détails du décompte d'inventaire",
-    "do_nothing"                         => "Ne rien faire",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Modifier les champs pour les articles sélectionnés.",
-    "edit_multiple_items"                => "Édition multiple d'articles",
-    "empty_upc_items"                    => "Articles sans code à barre",
-    "error_adding_updating"              => "Erreur d'ajout/édition d'article",
-    "error_updating_multiple"            => "Erreur d'édition d'articles",
-    "generate_barcodes"                  => "Générer des codes à barres",
-    "hsn_code"                           => "Nomenclature du système harmonisé",
-    "image"                              => "Image",
-    "import_items_csv"                   => "Importation d'éléments à partir d'un CSV",
-    "info_provided_by"                   => "Informations fournie par",
-    "inventory"                          => "Inventaire",
-    "inventory_CSV_import_quantity"      => "Quantité importée à partir d'un CSV",
-    "inventory_comments"                 => "Commentaires",
-    "inventory_data_tracking"            => "Suivi d'inventaire",
-    "inventory_date"                     => "Date",
-    "inventory_employee"                 => "Employé",
-    "inventory_in_out_quantity"          => "Quantité entrée/sortie",
-    "inventory_remarks"                  => "Remarques",
-    "is_deleted"                         => "Supprimé",
-    "is_printed"                         => "",
-    "is_serialized"                      => "L'article a un numéro de série",
-    "item"                               => "Article",
-    "item_id"                            => "",
-    "item_number"                        => "Code à barre",
-    "item_number_duplicate"              => "L'article existe déjà la base de données.",
-    "kit"                                => "Ensemble",
-    "location"                           => "Emplacement",
-    "low_inventory_items"                => "Articles en rupture d'inventaire",
-    "low_sell_item"                      => "Article à faible vente",
-    "manually_editing_of_quantity"       => "Édition de quantité manuelle",
-    "markup"                             => "",
-    "name"                               => "Nom",
-    "name_required"                      => "Le nom est requis.",
-    "new"                                => "Nouvel article",
-    "no_description_items"               => "Articles sans description",
-    "no_items_to_display"                => "Aucun article à afficher.",
-    "none"                               => "Aucun",
-    "none_selected"                      => "Vous n'avez sélectionné aucun article à modifier",
-    "nonstock"                           => "Non-inventorié",
-    "number_information"                 => "Numéro d'article",
-    "number_required"                    => "Code à barres est un champ requis.",
-    "one_or_multiple"                    => "article(s)",
-    "pack_name"                          => "Nom de l'ensemble",
-    "qty_per_pack"                       => "Quantité par ensemble",
-    "quantity"                           => "Quantité",
-    "quantity_number"                    => "La quantité doit être un nombre.",
-    "quantity_required"                  => "La quantité est requise.",
-    "receiving_quantity"                 => "Quantité reçue",
-    "remove_image"                       => "Supprimer l'image",
-    "reorder_level"                      => "Niveau de réapprovisionnement",
-    "reorder_level_number"               => "Le niveau de réapprovisionnement doit etre un nombre.",
-    "reorder_level_required"             => "Le niveau de réapprovisionnement est requis.",
-    "retrive_item_info"                  => "Récupérer les informations d'article",
-    "sales_tax_1"                        => "Taxe de vente",
-    "sales_tax_2"                        => "Taxe de vente 2",
-    "search_attributes"                  => "Rechercher les attributs sélectionnés",
-    "select_image"                       => "Sélectionner l'image",
-    "serialized_items"                   => "Articles avec n° de série",
-    "standard"                           => "Régulier",
-    "stock"                              => "Inventaire",
-    "stock_location"                     => "Emplacement de l'inventaire",
-    "stock_type"                         => "Type d'inventaire",
-    "successful_adding"                  => "Article ajouté avec succès",
-    "successful_bulk_edit"               => "Édition d'article(s) réussie",
-    "successful_deleted"                 => "Suppression réussie",
-    "successful_updating"                => "Édition d'article réussie",
-    "supplier"                           => "Fournisseur",
-    "tax_1"                              => "Taxe 1",
-    "tax_2"                              => "Taxe 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Catégorie fiscale",
-    "tax_percent"                        => "Pourcentage d'imposition",
-    "tax_percent_number"                 => "Le pourcentage d'imposition doit être une valeur numérique",
-    "tax_percent_required"               => "Le pourcentage d'imposition est requis.",
-    "tax_percents"                       => "Pourcentage de taxes",
-    "temp"                               => "Temporaire",
-    "type"                               => "Type d'article",
-    "unit_price"                         => "Prix de détail",
-    "unit_price_number"                  => "Le prix unitaire doit etre un nombre.",
-    "unit_price_required"                => "Le prix de détail est requis.",
-    "upc_database"                       => "Base de données des codes à barres",
-    "update"                             => "Éditer l'article",
-    "use_inventory_menu"                 => "Utiliser le menu inventaire",
+    'add_minus'                          => 'Inventaire à ajouter ou soustraire.',
+    'allow_alt_description'              => 'Autoriser description alternative',
+    'amount_entry'                       => 'Entrée de quantité',
+    'bulk_edit'                          => 'Éditions multiples',
+    'buy_price_required'                 => 'Le prix d\'achat est requis.',
+    'cannot_be_deleted'                  => 'Impossible de supprimer car un ou plusiers des articles sélectionnés ont des ventes.',
+    'cannot_find_item'                   => 'Article non trouvé.',
+    'categories'                         => '',
+    'category'                           => 'Catégorie',
+    'category_new'                       => '',
+    'category_required'                  => 'La catégorie est requise.',
+    'change_all_to_allow_alt_desc'       => 'Autoriser description alternative pour tous.',
+    'change_all_to_not_allow_allow_desc' => 'Interdire description alternative pour tous.',
+    'change_all_to_serialized'           => 'Tout sérialiser',
+    'change_all_to_unserialized'         => 'Tout désérialiser',
+    'change_image'                       => 'Changer l\'image',
+    'confirm_bulk_edit'                  => 'Êtes-vous certain de vouloir éditer toute la sélection ?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Les informations de taxes seront remplacées pour tous les articles.',
+    'confirm_delete'                     => 'Êtes-vous certain de vouloir supprimer la sélection ?',
+    'confirm_restore'                    => 'Êtes-vous certain de vouloir restaurer le(s) élément(s) sélectionné(s) ?',
+    'cost_price'                         => 'Prix de gros',
+    'cost_price_number'                  => 'Le prix d\'achat doit être un nombre.',
+    'cost_price_required'                => 'Le prix de gros est requis.',
+    'count'                              => 'Mise à jour de l\'inventaire',
+    'csv_import_failed'                  => 'Échec d\'import CSV',
+    'csv_import_invalid_location'        => 'Emplacement(s) de stock invalide(s) trouvé(s) : {0}. Seuls les emplacements de stock valides sont autorisés.',
+    'csv_import_nodata_wrongformat'      => 'Le CSV envoyé ne contient aucune donnée, ou elles sont dans un format erroné.',
+    'csv_import_partially_failed'        => 'Il y a eu {0} importation(s) d\'articles échoué(s) au(x) ligne(s) : {1}. Aucune ligne n\'a été importée.',
+    'csv_import_success'                 => 'Importation des articles réussie.',
+    'current_quantity'                   => 'Quantité actuelle',
+    'default_pack_name'                  => 'Chacun',
+    'description'                        => 'Description',
+    'details_count'                      => 'Détails du décompte d\'inventaire',
+    'do_nothing'                         => 'Ne rien faire',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Modifier les champs pour les articles sélectionnés.',
+    'edit_multiple_items'                => 'Édition multiple d\'articles',
+    'empty_upc_items'                    => 'Articles sans code à barre',
+    'error_adding_updating'              => 'Erreur d\'ajout/édition d\'article',
+    'error_updating_multiple'            => 'Erreur d\'édition d\'articles',
+    'generate_barcodes'                  => 'Générer des codes à barres',
+    'hsn_code'                           => 'Nomenclature du système harmonisé',
+    'image'                              => 'Image',
+    'import_items_csv'                   => 'Importation d\'éléments à partir d\'un CSV',
+    'info_provided_by'                   => 'Informations fournie par',
+    'inventory'                          => 'Inventaire',
+    'inventory_CSV_import_quantity'      => 'Quantité importée à partir d\'un CSV',
+    'inventory_comments'                 => 'Commentaires',
+    'inventory_data_tracking'            => 'Suivi d\'inventaire',
+    'inventory_date'                     => 'Date',
+    'inventory_employee'                 => 'Employé',
+    'inventory_in_out_quantity'          => 'Quantité entrée/sortie',
+    'inventory_remarks'                  => 'Remarques',
+    'is_deleted'                         => 'Supprimé',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'L\'article a un numéro de série',
+    'item'                               => 'Article',
+    'item_id'                            => '',
+    'item_number'                        => 'Code à barre',
+    'item_number_duplicate'              => 'L\'article existe déjà la base de données.',
+    'item_number_invalid'                => 'Le code article contient des caractères non autorisés.',
+    'kit'                                => 'Ensemble',
+    'location'                           => 'Emplacement',
+    'low_inventory_items'                => 'Articles en rupture d\'inventaire',
+    'low_sell_item'                      => 'Article à faible vente',
+    'manually_editing_of_quantity'       => 'Édition de quantité manuelle',
+    'markup'                             => '',
+    'name'                               => 'Nom',
+    'name_required'                      => 'Le nom est requis.',
+    'new'                                => 'Nouvel article',
+    'no_description_items'               => 'Articles sans description',
+    'no_items_to_display'                => 'Aucun article à afficher.',
+    'none'                               => 'Aucun',
+    'none_selected'                      => 'Vous n\'avez sélectionné aucun article à modifier',
+    'nonstock'                           => 'Non-inventorié',
+    'number_information'                 => 'Numéro d\'article',
+    'number_required'                    => 'Code à barres est un champ requis.',
+    'one_or_multiple'                    => 'article(s)',
+    'pack_name'                          => 'Nom de l\'ensemble',
+    'qty_per_pack'                       => 'Quantité par ensemble',
+    'quantity'                           => 'Quantité',
+    'quantity_number'                    => 'La quantité doit être un nombre.',
+    'quantity_required'                  => 'La quantité est requise.',
+    'receiving_quantity'                 => 'Quantité reçue',
+    'remove_image'                       => 'Supprimer l\'image',
+    'reorder_level'                      => 'Niveau de réapprovisionnement',
+    'reorder_level_number'               => 'Le niveau de réapprovisionnement doit etre un nombre.',
+    'reorder_level_required'             => 'Le niveau de réapprovisionnement est requis.',
+    'retrive_item_info'                  => 'Récupérer les informations d\'article',
+    'sales_tax_1'                        => 'Taxe de vente',
+    'sales_tax_2'                        => 'Taxe de vente 2',
+    'search_attributes'                  => 'Rechercher les attributs sélectionnés',
+    'select_image'                       => 'Sélectionner l\'image',
+    'serialized_items'                   => 'Articles avec n° de série',
+    'standard'                           => 'Régulier',
+    'stock'                              => 'Inventaire',
+    'stock_location'                     => 'Emplacement de l\'inventaire',
+    'stock_type'                         => 'Type d\'inventaire',
+    'successful_adding'                  => 'Article ajouté avec succès',
+    'successful_bulk_edit'               => 'Édition d\'article(s) réussie',
+    'successful_deleted'                 => 'Suppression réussie',
+    'successful_updating'                => 'Édition d\'article réussie',
+    'supplier'                           => 'Fournisseur',
+    'tax_1'                              => 'Taxe 1',
+    'tax_2'                              => 'Taxe 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Catégorie fiscale',
+    'tax_name_invalid'                   => 'Le nom de la taxe contient des caractères non autorisés.',
+    'tax_percent'                        => 'Pourcentage d\'imposition',
+    'tax_percent_number'                 => 'Le pourcentage d\'imposition doit être une valeur numérique',
+    'tax_percent_required'               => 'Le pourcentage d\'imposition est requis.',
+    'tax_percents'                       => 'Pourcentage de taxes',
+    'temp'                               => 'Temporaire',
+    'type'                               => 'Type d\'article',
+    'unit_price'                         => 'Prix de détail',
+    'unit_price_number'                  => 'Le prix unitaire doit etre un nombre.',
+    'unit_price_required'                => 'Le prix de détail est requis.',
+    'upc_database'                       => 'Base de données des codes à barres',
+    'update'                             => 'Éditer l\'article',
+    'use_inventory_menu'                 => 'Utiliser le menu inventaire',
 ];
diff --git a/app/Language/fr/Login.php b/app/Language/fr/Login.php
index 5eb13d5c2..83ef24a80 100644
--- a/app/Language/fr/Login.php
+++ b/app/Language/fr/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Je ne suis pas un robot.",
-    "go"                            => "Lancer",
-    "invalid_gcaptcha"              => "Veuillez vérifier que vous n'êtes pas un robot.",
-    "invalid_installation"          => "Cette installation est incorrecte, veuillez vérifier votre fichier php.ini.",
-    "invalid_username_and_password" => "Nom d'utilisateur et/ou mot de passe invalide.",
-    "login"                         => "Login",
-    "logout"                        => "Déconnexion",
-    "migration_needed"              => "Une migration de base de données vers {0} débutera après l'ouverture de session.",
-    "password"                      => "Mot de passe",
-    "required_username"             => "Le champ nom utilisateur est obligatoire.",
-    "username"                      => "Nom d'utilisateur",
-    "welcome"                       => "Bienvenue à {0} !",
+    "gcaptcha"                            => "Je ne suis pas un robot.",
+    "go"                                  => "Lancer",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Veuillez vérifier que vous n'êtes pas un robot.",
+    "invalid_installation"                => "Cette installation est incorrecte, veuillez vérifier votre fichier php.ini.",
+    "invalid_username_and_password"       => "Nom d'utilisateur et/ou mot de passe invalide.",
+    "login"                               => "Login",
+    "logout"                              => "Déconnexion",
+    "migrating_database"                  => "Migration de la base de données",
+    "migration_auth_message"              => "Les identifiants administrateur sont requis pour autoriser la migration de la base de données vers la version {0}. Veuillez vous connecter pour continuer.",
+    "migration_complete"                  => "Base de données initialisée avec succès !",
+    "migration_complete_login"            => "Vous pouvez maintenant vous connecter.",
+    "migration_complete_migrate"          => "Base de données migrée avec succès !",
+    "migration_complete_redirect"         => "Migration terminée. Redirection vers la connexion...",
+    "migration_error_connection"          => "Erreur de connexion. Veuillez réessayer.",
+    "migration_failed"                    => "Échec de la migration",
+    "migration_initializing"              => "Initialisation de la base de données",
+    "migration_needed"                    => "Une migration de base de données vers {0} débutera après l'ouverture de session.",
+    "migration_required"                  => "Migration de base de données requise",
+    "migration_running"                   => "Exécution des migrations de la base de données...",
+    "password"                            => "Mot de passe",
+    "required_username"                   => "Le champ nom utilisateur est obligatoire.",
+    'too_many_attempts'                   => 'Trop de tentatives. Veuillez patienter un instant et réessayer.',
+    "username"                            => "Nom d'utilisateur",
+    "welcome"                             => "Bienvenue à {0} !"
 ];
diff --git a/app/Language/fr/Reports.php b/app/Language/fr/Reports.php
index 1758e42e0..3c8f0a0f0 100644
--- a/app/Language/fr/Reports.php
+++ b/app/Language/fr/Reports.php
@@ -146,4 +146,5 @@ return [
     "used"                                    => "Points utilisés",
     "work_orders"                             => "Ordre Du Travail",
     "zero_and_less"                           => "Zéro ou moin",
+    "toggle_cost_and_profit"                  => "Basculer Coût & Bénéfice",
 ];
diff --git a/app/Language/fr/Sales.php b/app/Language/fr/Sales.php
index c81e58ce8..9b769b5af 100644
--- a/app/Language/fr/Sales.php
+++ b/app/Language/fr/Sales.php
@@ -1,225 +1,241 @@
 <?php
 
 return [
-    "customers_available_points"       => "Points disponibles",
-    "rewards_package"                  => "Récompenses",
-    "rewards_remaining_balance"        => "Vos points fidélité restants ",
-    "account_number"                   => "# Compte",
-    "add_payment"                      => "Ajout Paiement",
-    "amount_due"                       => "Montant à Payer",
-    "amount_tendered"                  => "Montant Présenté",
-    "authorized_signature"             => "Signature autorisée",
-    "cancel_sale"                      => "Annuler la Vente",
-    "cash"                             => "Espèce",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Ajustement de caisse",
-    "cash_deposit"                     => "Dépôt d'Espèce",
-    "cash_filter"                      => "Espèce",
-    "change_due"                       => "Monnaie Rendue",
-    "change_price"                     => "Modifier le prix de vente",
-    "check"                            => "Chèque",
-    "check_balance"                    => "Rappel de chèque",
-    "check_filter"                     => "Chèque",
-    "close"                            => "",
-    "comment"                          => "Commentaire",
-    "comments"                         => "Commentaires",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Finaliser la Vente",
-    "confirm_cancel_sale"              => "Êtes-vous sûr de vouloir supprimer cette vente ? Tous les articles seront effacés de la vente.",
-    "confirm_delete"                   => "Êtes-vous sûr(e) de vouloir supprimer ce(ces) vente(s) ?",
-    "confirm_restore"                  => "Êtes-vous sûr de vouloir restaurer les vente(s) sélectionnée(s) ?",
-    "credit"                           => "Carte de Crédit",
-    "credit_deposit"                   => "Dépôt de crédit",
-    "credit_filter"                    => "Carte de crédit",
-    "current_table"                    => "",
-    "customer"                         => "Client",
-    "customer_address"                 => "Adresse",
-    "customer_discount"                => "Rabais",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Localisation du client",
-    "customer_mailchimp_status"        => "Statut de MailChimp",
-    "customer_optional"                => "(Requis pour paiement)",
-    "customer_required"                => "(Champs obligatoires)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Date de Vente",
-    "date_range"                       => "Intervalle de dates",
-    "date_required"                    => "Un bon format de date doit être entré.",
-    "date_type"                        => "La Date est requise.",
-    "debit"                            => "Carte de Débit",
-    "debit_filter"                     => "",
-    "delete"                           => "Autoriser la suppression",
-    "delete_confirmation"              => "Êtes vous sûr(e) de vouloir supprimer cette vente ? Cette opération est irréversible.",
-    "delete_entire_sale"               => "Supprimer la vente",
-    "delete_successful"                => "Suppression de la Vente réussie.",
-    "delete_unsuccessful"              => "Échec de suppression.",
-    "description_abbrv"                => "La Desc.",
-    "discard"                          => "Annuler",
-    "discard_quote"                    => "",
-    "discount"                         => "% Remise",
-    "discount_included"                => "% de Rabais",
-    "discount_short"                   => "%",
-    "due"                              => "Dû",
-    "due_filter"                       => "Dû",
-    "edit"                             => "Éditer",
-    "edit_item"                        => "Éditer article",
-    "edit_sale"                        => "Éditer vente",
-    "email_receipt"                    => "Reçu par Email",
-    "employee"                         => "Employé",
-    "entry"                            => "Entrée",
-    "error_editing_item"               => "Érreur lors de l'édition",
-    "find_or_scan_item"                => "Trouver/Scanner Article",
-    "find_or_scan_item_or_receipt"     => "Trouver/Scanner Article OU Reçu",
-    "giftcard"                         => "Carte Cadeau",
-    "giftcard_balance"                 => "Solde de la Carte-Cadeau",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Numéro de Carte cadeau",
-    "group_by_category"                => "Grouper par catégorie",
-    "group_by_type"                    => "Regrouper par type",
-    "hsn"                              => "HSN",
-    "id"                               => "ID Vente",
-    "include_prices"                   => "Inclure les prix ?",
-    "invoice"                          => "Facture",
-    "invoice_confirm"                  => "Cette facture sera envoyée à",
-    "invoice_enable"                   => "Créer une Facture",
-    "invoice_filter"                   => "Factures",
-    "invoice_no_email"                 => "Ce client n'a pas d'adresse courriel valide.",
-    "invoice_number"                   => "# Facture",
-    "invoice_number_duplicate"         => "Entrez un numéro de facture unique.",
-    "invoice_sent"                     => "Facture envoyée à",
-    "invoice_total"                    => "Total Facture",
-    "invoice_type_custom_invoice"      => "Facture personnalisée (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Facture fiscale personnalisée (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Facture (invoice.php)",
-    "invoice_type_tax_invoice"         => "Facture fiscale (tax_invoice.php)",
-    "invoice_unsent"                   => "La Facture n'a pas pu être envoyée à",
-    "invoice_update"                   => "Re-calculer",
-    "item_insufficient_of_stock"       => "Stock trop faible.",
-    "item_name"                        => "Nom",
-    "item_number"                      => "# Article",
-    "item_out_of_stock"                => "Stock épuisé.",
-    "key_browser"                      => "Raccourcis utiles",
-    "key_cancel"                       => "Annule l'Offre/Facture/Vente en cours",
-    "key_customer_search"              => "Recherche de client",
-    "key_finish_quote"                 => "Finaliser la soumission/facture sans paiement",
-    "key_finish_sale"                  => "Ajouter un paiement et complété la facture/vente",
-    "key_full"                         => "Ouvrir en Mode Plein Écran",
-    "key_function"                     => "Function",
-    "key_help"                         => "Raccourcis",
-    "key_help_modal"                   => "Ouvrir la fenêtre de raccourcis",
-    "key_in"                           => "Agrandir",
-    "key_item_search"                  => "Recherche d'article",
-    "key_out"                          => "Rapetisser",
-    "key_payment"                      => "Ajouter un paiement",
-    "key_print"                        => "Imprimer la page",
-    "key_restore"                      => "Restaurer le Zoom initial",
-    "key_search"                       => "Recherche de rapports de tables",
-    "key_suspend"                      => "Suspendre la transaction",
-    "key_suspended"                    => "Afficher les transactions supsendues",
-    "key_system"                       => "Raccourcis systèmes",
-    "key_tendered"                     => "Modifier le montant remis",
-    "key_title"                        => "Raccourcis Claviers des Ventes",
-    "mc"                               => "",
-    "mode"                             => "Mode d'Enregistrement",
-    "must_enter_numeric"               => "Veuillez entrer une valeur numérique pour la somme.",
-    "must_enter_numeric_giftcard"      => "Veuillez entrer une valeur numérique pour le numéro de carte.",
-    "new_customer"                     => "Nouveau Client",
-    "new_item"                         => "Nouvel Élément",
-    "no_description"                   => "Aucun",
-    "no_filter"                        => "Tous",
-    "no_items_in_cart"                 => "Il n'y a rien dans votre panier.",
-    "no_sales_to_display"              => "Aucune vente à afficher.",
-    "none_selected"                    => "Vous n'avez sélectionné aucun élément.",
-    "nontaxed_ind"                     => " - ",
-    "not_authorized"                   => "Cette action n'est pas autorisée.",
-    "one_or_multiple"                  => "Vente(s)",
-    "payment"                          => "Type Paiement",
-    "payment_amount"                   => "Somme",
-    "payment_not_cover_total"          => "Le Paiement ne couvre pas le Total.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Total Paiements",
-    "price"                            => "Prix",
-    "print_after_sale"                 => "Imprimer un recu après vente",
-    "quantity"                         => "Qté",
-    "quantity_less_than_reorder_level" => "Avertissement, Quantité Demandée Insuffisante.",
-    "quantity_less_than_zero"          => "Avertissement : Quantité Demandée insuffisante. Vous pouvez accomplir la vente, mais veuillez vérifier votre inventaire.",
-    "quantity_of_items"                => "Quantité d'articles {0}",
-    "quote"                            => "Offre",
-    "quote_number"                     => "Offre n°",
-    "quote_number_duplicate"           => "Le numéro de l'offre doit être unique.",
-    "quote_sent"                       => "Offre envoyée à",
-    "quote_unsent"                     => "L'offre n'est pas parvenue à être envoyée à",
-    "receipt"                          => "Reçu de Ventes",
-    "receipt_no_email"                 => "Ce client n'a pas d'adresse e-mail valide.",
-    "receipt_number"                   => "# Caisse",
-    "receipt_sent"                     => "Reçu envoyé à",
-    "receipt_unsent"                   => "Reçu NON envoyé à",
-    "refund"                           => "Type de remboursement",
-    "register"                         => "Registre des Ventes",
-    "remove_customer"                  => "Enlever Client",
-    "remove_discount"                  => "",
-    "return"                           => "Reprise",
-    "rewards"                          => "Points de fidélité",
-    "rewards_balance"                  => "Compte de points de fidélité",
-    "sale"                             => "Vente",
-    "sale_by_invoice"                  => "Vente par facture",
-    "sale_for_customer"                => "Client :",
-    "sale_time"                        => "Heure",
-    "sales_tax"                        => "Taxes de vente",
-    "sales_total"                      => "",
-    "select_customer"                  => "Choisir Client",
-    "send_invoice"                     => "Envoyer la Facture",
-    "send_quote"                       => "Envoyer offre",
-    "send_receipt"                     => "Envoyer le Reçu",
-    "send_work_order"                  => "Envoyer un ordre de travail",
-    "serial"                           => "Serie",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Afficher la facture",
-    "show_receipt"                     => "Afficher le reçu",
-    "start_typing_customer_name"       => "Commencez à saisir le nom du client...",
-    "start_typing_item_name"           => "Commencez à saisir le nom de l'item ou scannez le code-barre...",
-    "stock"                            => "Inventaire",
-    "stock_location"                   => "Endroit d'inventaire",
-    "sub_total"                        => "Sous-Total",
-    "successfully_deleted"             => "Vente supprimée",
-    "successfully_restored"            => "Vous avez restauré avec succès",
-    "successfully_suspended_sale"      => "Vente suspendue.",
-    "successfully_updated"             => "Vente éditée.",
-    "suspend_sale"                     => "Suspendre la Vente",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Ventes Suspendues",
-    "table"                            => "Emploi du temps",
-    "takings"                          => "Ventes complétées",
-    "tax"                              => "Taxe",
-    "tax_id"                           => "Id Taxe",
-    "tax_invoice"                      => "Facture Fiscale",
-    "tax_percent"                      => "% Taxe",
-    "taxed_ind"                        => "T",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Taxe exclus",
-    "transaction_failed"               => "Échec de Transaction de vente.",
-    "unable_to_add_item"               => "Erreur d'ajout d'article à la vente",
-    "unsuccessfully_deleted"           => "Échec de suppression.",
-    "unsuccessfully_restored"          => "Restauration de(s) vente(s) échouée.",
-    "unsuccessfully_suspended_sale"    => "Vente suspendue.",
-    "unsuccessfully_updated"           => "Échec d'édition.",
-    "unsuspend"                        => "Débloquer",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Éditer",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Commande de travail",
-    "work_order_number"                => "Numéro de commande",
-    "work_order_number_duplicate"      => "Le numéro de bon de travail doit être unique.",
-    "work_order_sent"                  => "Ordre de travail envoyé à",
-    "work_order_unsent"                => "L'ordre de travail n'a pas pu être envoyé à",
+    'account_number'                    => '# Compte',
+    'add_payment'                       => 'Ajout Paiement',
+    'amount_due'                        => 'Montant à Payer',
+    'amount_due_not_covered'            => 'Les paiements ne couvrent pas le montant dû.',
+    'amount_tendered'                   => 'Montant Présenté',
+    'authorized_signature'              => 'Signature autorisée',
+    'bank_transfer'                     => 'Virement Bancaire',
+    'cancel_sale'                       => 'Annuler la Vente',
+    'cash'                              => 'Espèce',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Ajustement de caisse',
+    'cash_deposit'                      => "Dépôt d'Espèce",
+    'cash_filter'                       => 'Espèce',
+    'change_due'                        => 'Monnaie Rendue',
+    'change_price'                      => 'Modifier le prix de vente',
+    'check'                             => 'Chèque',
+    'check_balance'                     => 'Rappel de chèque',
+    'check_filter'                      => 'Chèque',
+    'close'                             => '',
+    'comment'                           => 'Commentaire',
+    'comments'                          => 'Commentaires',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Finaliser la Vente',
+    'confirm_cancel_sale'               => 'Êtes-vous sûr de vouloir supprimer cette vente ? Tous les articles seront effacés de la vente.',
+    'confirm_delete'                    => 'Êtes-vous sûr(e) de vouloir supprimer ce(ces) vente(s) ?',
+    'confirm_restore'                   => 'Êtes-vous sûr de vouloir restaurer les vente(s) sélectionnée(s) ?',
+    'credit'                            => 'Carte de Crédit',
+    'credit_deposit'                    => 'Dépôt de crédit',
+    'credit_filter'                     => 'Carte de crédit',
+    'current_table'                     => '',
+    'customer'                          => 'Client',
+    'customer_address'                  => 'Adresse',
+    'customer_discount'                 => 'Rabais',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Localisation du client',
+    'customer_mailchimp_status'         => 'Statut de MailChimp',
+    'customer_optional'                 => '(Requis pour paiement)',
+    'customer_required'                 => '(Champs obligatoires)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Points disponibles',
+    'daily_sales'                       => '',
+    'date'                              => 'Date de Vente',
+    'date_range'                        => 'Intervalle de dates',
+    'date_required'                     => 'Un bon format de date doit être entré.',
+    'date_type'                         => 'La Date est requise.',
+    'debit'                             => 'Carte de Débit',
+    'debit_filter'                      => '',
+    'delete'                            => 'Autoriser la suppression',
+    'delete_confirmation'               => 'Êtes vous sûr(e) de vouloir supprimer cette vente ? Cette opération est irréversible.',
+    'delete_entire_sale'                => 'Supprimer la vente',
+    'delete_successful'                 => 'Suppression de la Vente réussie.',
+    'delete_unsuccessful'               => 'Échec de suppression.',
+    'description_abbrv'                 => 'La Desc.',
+    'discard'                           => 'Annuler',
+    'discard_quote'                     => '',
+    'discount'                          => '% Remise',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% de Rabais',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Dû',
+    'due_filter'                        => 'Dû',
+    'edit'                              => 'Éditer',
+    'edit_item'                         => 'Éditer article',
+    'edit_sale'                         => 'Éditer vente',
+    'email_receipt'                     => 'Reçu par Email',
+    'employee'                          => 'Employé',
+    'entry'                             => 'Entrée',
+    'error_editing_item'                => "Érreur lors de l'édition",
+    'find_or_scan_item'                 => 'Trouver/Scanner Article',
+    'find_or_scan_item_or_receipt'      => 'Trouver/Scanner Article OU Reçu',
+    'giftcard'                          => 'Carte Cadeau',
+    'giftcard_balance'                  => 'Solde de la Carte-Cadeau',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Numéro de Carte cadeau',
+    'group_by_category'                 => 'Grouper par catégorie',
+    'group_by_type'                     => 'Regrouper par type',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID Vente',
+    'include_prices'                    => 'Inclure les prix ?',
+    'insufficient_giftcard_balance'     => 'Solde insuffisant de la carte-cadeau pour ce paiement.',
+    'insufficient_reward_points'        => 'Points de récompense insuffisants pour ce paiement.',
+    'invoice'                           => 'Facture',
+    'invoice_confirm'                   => 'Cette facture sera envoyée à',
+    'invoice_enable'                    => 'Créer une Facture',
+    'invoice_filter'                    => 'Factures',
+    'invoice_no_email'                  => "Ce client n'a pas d'adresse courriel valide.",
+    'invoice_number'                    => '# Facture',
+    'invoice_number_duplicate'          => 'Entrez un numéro de facture unique.',
+    'invoice_sent'                      => 'Facture envoyée à',
+    'invoice_total'                     => 'Total Facture',
+    'invoice_type_custom_invoice'       => 'Facture personnalisée (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Facture fiscale personnalisée (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Facture (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Facture fiscale (tax_invoice.php)',
+    'invoice_unsent'                    => "La Facture n'a pas pu être envoyée à",
+    'invoice_update'                    => 'Re-calculer',
+    'item_insufficient_of_stock'        => 'Stock trop faible.',
+    'item_name'                         => 'Nom',
+    'item_number'                       => '# Article',
+    'item_out_of_stock'                 => 'Stock épuisé.',
+    'key_browser'                       => 'Raccourcis utiles',
+    'key_cancel'                        => "Annule l'Offre/Facture/Vente en cours",
+    'key_customer_search'               => 'Recherche de client',
+    'key_finish_quote'                  => 'Finaliser la soumission/facture sans paiement',
+    'key_finish_sale'                   => 'Ajouter un paiement et complété la facture/vente',
+    'key_full'                          => 'Ouvrir en Mode Plein Écran',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Raccourcis',
+    'key_help_modal'                    => 'Ouvrir la fenêtre de raccourcis',
+    'key_in'                            => 'Agrandir',
+    'key_item_search'                   => "Recherche d'article",
+    'key_out'                           => 'Rapetisser',
+    'key_payment'                       => 'Ajouter un paiement',
+    'key_print'                         => 'Imprimer la page',
+    'key_restore'                       => 'Restaurer le Zoom initial',
+    'key_search'                        => 'Recherche de rapports de tables',
+    'key_suspend'                       => 'Suspendre la transaction',
+    'key_suspended'                     => 'Afficher les transactions supsendues',
+    'key_system'                        => 'Raccourcis systèmes',
+    'key_tendered'                      => 'Modifier le montant remis',
+    'key_title'                         => 'Raccourcis Claviers des Ventes',
+    'mc'                                => '',
+    'mode'                              => "Mode d'Enregistrement",
+    'must_enter_numeric'                => 'Veuillez entrer une valeur numérique pour la somme.',
+    'must_enter_numeric_giftcard'       => 'Veuillez entrer une valeur numérique pour le numéro de carte.',
+    'must_enter_reference_code'         => 'Le numéro de référence/récupération doit être saisi.',
+    'negative_amount_tendered'          => 'Le montant présenté ne peut pas être négatif.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Nouveau Client',
+    'new_item'                          => 'Nouvel Élément',
+    'no_description'                    => 'Aucun',
+    'no_filter'                         => 'Tous',
+    'no_items_in_cart'                  => "Il n'y a rien dans votre panier.",
+    'no_sales_to_display'               => 'Aucune vente à afficher.',
+    'none_selected'                     => "Vous n'avez sélectionné aucun élément.",
+    'nontaxed_ind'                      => ' - ',
+    'not_authorized'                    => "Cette action n'est pas autorisée.",
+    'one_or_multiple'                   => 'Vente(s)',
+    'payment'                           => 'Type Paiement',
+    'payment_amount'                    => 'Somme',
+    'payment_not_cover_total'           => 'Le Paiement ne couvre pas le Total.',
+    'payment_type'                      => 'Type',
+    'payments'                          => '',
+    'payments_total'                    => 'Total Paiements',
+    'price'                             => 'Prix',
+    'print_after_sale'                  => 'Imprimer un recu après vente',
+    'quantity'                          => 'Qté',
+    'quantity_less_than_reorder_level'  => 'Avertissement, Quantité Demandée Insuffisante.',
+    'quantity_less_than_zero'           => 'Avertissement : Quantité Demandée insuffisante. Vous pouvez accomplir la vente, mais veuillez vérifier votre inventaire.',
+    'quantity_of_items'                 => "Quantité d'articles {0}",
+    'quote'                             => 'Offre',
+    'quote_number'                      => 'Offre n°',
+    'quote_number_duplicate'            => "Le numéro de l'offre doit être unique.",
+    'quote_sent'                        => 'Offre envoyée à',
+    'quote_unsent'                      => "L'offre n'est pas parvenue à être envoyée à",
+    'receipt'                           => 'Reçu de Ventes',
+    'receipt_no_email'                  => "Ce client n'a pas d'adresse e-mail valide.",
+    'receipt_number'                    => '# Caisse',
+    'receipt_sent'                      => 'Reçu envoyé à',
+    'receipt_unsent'                    => 'Reçu NON envoyé à',
+    'reference_code'                    => 'Code de référence de paiement',
+    'reference_code_invalid_characters' => 'Le code de référence ne doit contenir que des lettres et des chiffres.',
+    'reference_code_length_error'       => 'La longueur du code de référence est invalide.',
+    'refund'                            => 'Type de remboursement',
+    'register'                          => 'Registre des Ventes',
+    'remove_customer'                   => 'Enlever Client',
+    'remove_discount'                   => '',
+    'return'                            => 'Reprise',
+    'rewards'                           => 'Points de fidélité',
+    'rewards_balance'                   => 'Compte de points de fidélité',
+    'rewards_package'                   => 'Récompenses',
+    'rewards_remaining_balance'         => 'Vos points fidélité restants ',
+    'sale'                              => 'Vente',
+    'sale_by_invoice'                   => 'Vente par facture',
+    'sale_for_customer'                 => 'Client :',
+    'sale_time'                         => 'Heure',
+    'sales_tax'                         => 'Taxes de vente',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Choisir Client',
+    'send_invoice'                      => 'Envoyer la Facture',
+    'send_quote'                        => 'Envoyer offre',
+    'send_receipt'                      => 'Envoyer le Reçu',
+    'send_work_order'                   => 'Envoyer un ordre de travail',
+    'serial'                            => 'Serie',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Afficher la facture',
+    'show_receipt'                      => 'Afficher le reçu',
+    'start_typing_customer_name'        => 'Commencez à saisir le nom du client...',
+    'start_typing_item_name'            => "Commencez à saisir le nom de l'item ou scannez le code-barre...",
+    'stock'                             => 'Inventaire',
+    'stock_location'                    => "Endroit d'inventaire",
+    'sub_total'                         => 'Sous-Total',
+    'successfully_deleted'              => 'Vente supprimée',
+    'successfully_restored'             => 'Vous avez restauré avec succès',
+    'successfully_suspended_sale'       => 'Vente suspendue.',
+    'successfully_updated'              => 'Vente éditée.',
+    'suspend_sale'                      => 'Suspendre la Vente',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Ventes Suspendues',
+    'table'                             => 'Emploi du temps',
+    'takings'                           => 'Ventes complétées',
+    'tax'                               => 'Taxe',
+    'tax_id'                            => 'Id Taxe',
+    'tax_invoice'                       => 'Facture Fiscale',
+    'tax_percent'                       => '% Taxe',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Taxe exclus',
+    'transaction_failed'                => 'Échec de Transaction de vente.',
+    'unable_to_add_item'                => "Erreur d'ajout d'article à la vente",
+    'unsuccessfully_deleted'            => 'Échec de suppression.',
+    'unsuccessfully_restored'           => 'Restauration de(s) vente(s) échouée.',
+    'unsuccessfully_suspended_sale'     => 'Vente suspendue.',
+    'unsuccessfully_updated'            => "Échec d'édition.",
+    'unsuspend'                         => 'Débloquer',
+    'unsuspend_and_delete'              => 'Action',
+    'update'                            => 'Éditer',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wallet'                            => 'Portefeuille',
+    'wholesale'                         => '',
+    'work_order'                        => 'Commande de travail',
+    'work_order_number'                 => 'Numéro de commande',
+    'work_order_number_duplicate'       => 'Le numéro de bon de travail doit être unique.',
+    'work_order_sent'                   => 'Ordre de travail envoyé à',
+    'work_order_unsent'                 => "L'ordre de travail n'a pas pu être envoyé à",
 ];
diff --git a/app/Language/he/Attributes.php b/app/Language/he/Attributes.php
index 3e7bc0cb0..527d24ba7 100644
--- a/app/Language/he/Attributes.php
+++ b/app/Language/he/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "ערך השדה אינו יכול להכיל ':' או '|'",
-    "confirm_delete"                   => "האם אתה בטוח שברצונך למחוק את המאפיינים שנבחרו?",
-    "confirm_restore"                  => "האם אתה בטוח שברצונך לשחזר את המאפיינים שנבחרו?",
-    "definition_cannot_be_deleted"     => "לא ניתן למחוק מאפיינים נבחר(ים)",
-    "definition_error_adding_updating" => "לא ניתן להוסיף או לעדכן את הערך {0}. בדוק את יומן השגיאות.",
-    "definition_flags"                 => "מאפיין גלוי",
-    "definition_group"                 => "קבוצה",
-    "definition_id"                    => "מספר זיהוי",
-    "definition_name"                  => "הוסף מאפיין",
-    "definition_name_required"         => "מאפיין שם הינו שדה חובה",
-    "definition_one_or_multiple"       => "תכונה (תכונות)",
-    "definition_successful_adding"     => "הוספת בהצלחה את הפריט",
-    "definition_successful_deleted"    => "נמחק בהצלחה",
-    "definition_successful_updating"   => "עדכנת בהצלחה את המאפיין",
-    "definition_type"                  => "סוג מאפיין",
-    "definition_type_required"         => "שדה המאפיין הינו שדה חובה",
-    "definition_unit"                  => "יחידת מדידה",
-    "definition_values"                => "ערכי המאפיין",
-    "new"                              => "מאפיין חדש",
-    "no_attributes_to_display"         => "אין פריטים להצגה",
-    "receipt_visibility"               => "קבלה",
-    "show_in_items"                    => "הצג בפריטים",
-    "show_in_items_visibility"         => "פריטים",
-    "show_in_receipt"                  => "הצג בקבלה",
-    "show_in_receivings"               => "הצג בקבלת סחורה",
-    "show_in_receivings_visibility"    => "קבלת סחורה",
-    "show_in_sales"                    => "הצג במכירות",
-    "show_in_sales_visibility"         => "מכירות",
-    "update"                           => "עדכן מאפיין",
+    'attribute_value_invalid_chars'    => 'ערך השדה אינו יכול להכיל \':\' או \'|\'',
+    'confirm_delete'                   => 'האם אתה בטוח שברצונך למחוק את המאפיינים שנבחרו?',
+    'confirm_restore'                  => 'האם אתה בטוח שברצונך לשחזר את המאפיינים שנבחרו?',
+    'definition_cannot_be_deleted'     => 'לא ניתן למחוק מאפיינים נבחר(ים)',
+    'definition_invalid_group' => 'הקבוצה שנבחרה לא קיימת או אינה תקינה.',
+    'definition_error_adding_updating' => 'לא ניתן להוסיף או לעדכן את הערך {0}. בדוק את יומן השגיאות.',
+    'definition_flags'                 => 'מאפיין גלוי',
+    'definition_group'                 => 'קבוצה',
+    'definition_id'                    => 'מספר זיהוי',
+    'definition_name'                  => 'הוסף מאפיין',
+    'definition_name_required'         => 'מאפיין שם הינו שדה חובה',
+    'definition_one_or_multiple'       => 'תכונה (תכונות)',
+    'definition_successful_adding'     => 'הוספת בהצלחה את הפריט',
+    'definition_successful_deleted'    => 'נמחק בהצלחה',
+    'definition_successful_updating'   => 'עדכנת בהצלחה את המאפיין',
+    'definition_type'                  => 'סוג מאפיין',
+    'definition_type_required'         => 'שדה המאפיין הינו שדה חובה',
+    'definition_unit'                  => 'יחידת מדידה',
+    'definition_values'                => 'ערכי המאפיין',
+    'new'                              => 'מאפיין חדש',
+    'no_attributes_to_display'         => 'אין פריטים להצגה',
+    'receipt_visibility'               => 'קבלה',
+    'show_in_items'                    => 'הצג בפריטים',
+    'show_in_items_visibility'         => 'פריטים',
+    'show_in_receipt'                  => 'הצג בקבלה',
+    'show_in_receivings'               => 'הצג בקבלת סחורה',
+    'show_in_receivings_visibility'    => 'קבלת סחורה',
+    'show_in_sales'                    => 'הצג במכירות',
+    'show_in_sales_visibility'         => 'מכירות',
+    'show_in_search'                   => 'הצג בחיפוש',
+    'show_in_search_visibility'        => 'חיפוש',
+    'update'                           => 'עדכן מאפיין',
 ];
diff --git a/app/Language/he/Bootstrap_tables.php b/app/Language/he/Bootstrap_tables.php
index ca09b8e9e..65cf104c8 100644
--- a/app/Language/he/Bootstrap_tables.php
+++ b/app/Language/he/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "הכול",
-    "columns"              => "עמודות",
-    "hide_show_pagination" => "הסתר / הצג מספור דפים",
-    "loading"              => "טוען, אנא המתן ...",
-    "page_from_to"         => "מציג {0} ל {1} מתוך {2} שורות",
-    "refresh"              => "רענן",
-    "rows_per_page"        => "{0} שורות לדף",
-    "toggle"               => "החלף",
+    'all' => "הכול",
+    'columns' => "עמודות",
+    'hide_show_pagination' => "הסתר / הצג מספור דפים",
+    'loading' => "טוען, אנא המתן",
+    'page_from_to' => "מציג {0} ל {1} מתוך {2} שורות",
+    'refresh' => "רענן",
+    'rows_per_page' => "{0} שורות לדף",
+    'toggle' => "החלף",
 ];
diff --git a/app/Language/he/Calendar.php b/app/Language/he/Calendar.php
new file mode 100644
index 000000000..d300f5554
--- /dev/null
+++ b/app/Language/he/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "א",
+    "mo"        => "ב",
+    "tu"        => "ג",
+    "we"        => "ד",
+    "th"        => "ה",
+    "fr"        => "ו",
+    "sa"        => "ש",
+    "sun"       => "יום א",
+    "mon"       => "יום ב",
+    "tue"       => "יום ג",
+    "wed"       => "יום ד",
+    "thu"       => "יום ה",
+    "fri"       => "יום ו",
+    "sat"       => "שבת",
+    "sunday"    => "יום ראשון",
+    "monday"    => "יום שני",
+    "tuesday"   => "יום שלישי",
+    "wednesday" => "יום רביעי",
+    "thursday"  => "יום חמישי",
+    "friday"    => "יום שישי",
+    "saturday"  => "יום שבת",
+    "jan"       => "ינו",
+    "feb"       => "פבר",
+    "mar"       => "מרץ",
+    "apr"       => "אפר",
+    "may"       => "מאי",
+    "jun"       => "יונ",
+    "jul"       => "יול",
+    "aug"       => "אוג",
+    "sep"       => "ספט",
+    "oct"       => "אוק",
+    "nov"       => "נוב",
+    "dec"       => "דצמ",
+    "january"   => "ינואר",
+    "february"  => "פברואר",
+    "march"     => "מרץ",
+    "april"     => "אפריל",
+    "mayl"      => "מאי",
+    "june"      => "יוני",
+    "july"      => "יולי",
+    "august"    => "אוגוסט",
+    "september" => "ספטמבר",
+    "october"   => "אוקטובר",
+    "november"  => "נובמבר",
+    "december"  => "דצמבר",
+];
\ No newline at end of file
diff --git a/app/Language/he/Config.php b/app/Language/he/Config.php
index 404e04f4d..b98c2c9c5 100644
--- a/app/Language/he/Config.php
+++ b/app/Language/he/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "כתובת חברה",
-    "address_required"                          => "כתובת החברה הינה שדה חובה.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "אפשר ברקודים כפולים",
-    "apostrophe"                                => "גרש",
-    "backup_button"                             => "גיבוי",
-    "backup_database"                           => "מסד נתונים לגיבוי",
-    "barcode"                                   => "ברקוד",
-    "barcode_company"                           => "שם חברה",
-    "barcode_configuration"                     => "הגדרות ברקוד",
-    "barcode_content"                           => "תוכן ברקוד",
-    "barcode_first_row"                         => "שורה 1",
-    "barcode_font"                              => "פונט",
-    "barcode_formats"                           => "תבניות קלט",
-    "barcode_generate_if_empty"                 => "צור אם ריק.",
-    "barcode_height"                            => "גובה (פיקסלים)",
-    "barcode_id"                                => "מזהה / שם פריט",
-    "barcode_info"                              => "מידע על הדגרות ברקוד",
-    "barcode_layout"                            => "פריסת ברקוד",
-    "barcode_name"                              => "שם",
-    "barcode_number"                            => "ברקוד",
-    "barcode_number_in_row"                     => "מספר בשורה",
-    "barcode_page_cellspacing"                  => "הצגת מרחבי עמוד.",
-    "barcode_page_width"                        => "הצגת רוחב דף",
-    "barcode_price"                             => "מחיר",
-    "barcode_second_row"                        => "שורה 2",
-    "barcode_third_row"                         => "שורה 3",
-    "barcode_tooltip"                           => "אזהרה: תכונה זו עלולה לגרום לייבוא או יצירת פריטים כפולים. אל תשתמש אם אתה לא רוצה ברקודים כפולים.",
-    "barcode_type"                              => "סוג ברקוד",
-    "barcode_width"                             => "רוחב (פיקסלים)",
-    "bottom"                                    => "למטה",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "עשרוני מזומנים",
-    "cash_decimals_tooltip"                     => "אם עשרוני מזומנים ועשרוני מטבעות זהים אז לא יתקיים עיגול מזומנים.",
-    "cash_rounding"                             => "עיגול מזומנים",
-    "category_dropdown"                         => "",
-    "center"                                    => "מרכז",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "פסיק",
-    "company"                                   => "שם חברה",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "שנה תמונה",
-    "company_logo"                              => "לוגו חברה",
-    "company_remove_image"                      => "הסר תמונה",
-    "company_required"                          => "שם החברה הינו שדה חובה",
-    "company_select_image"                      => "בחר תמונה",
-    "company_website_url"                       => "אתר החברה אינו כתובת אתר חוקית (http://...).",
-    "country_codes"                             => "קודי מדינה",
-    "country_codes_tooltip"                     => "רשימה מופרדת בפסיקים של קודי מדינות עבור בדיקת כתובת של nominatim.",
-    "currency_code"                             => "קוד מטבע",
-    "currency_decimals"                         => "מטבע עשרוני",
-    "currency_symbol"                           => "סמל מטבע",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "תגמול",
-    "customer_reward_duplicate"                 => "התגמול חייב להיות ייחודי.",
-    "customer_reward_enable"                    => "אפשר תגמולים ללקוחות",
-    "customer_reward_invalid_chars"             => "התגמול אינו יכול להכיל '_'",
-    "customer_reward_required"                  => "התגמול הינו שדה חובה",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "מסנן תאריך ושעה",
-    "datetimeformat"                            => "פורמט תאריך ושעה",
-    "decimal_point"                             => "נקודה עשרונית",
-    "default_barcode_font_size_number"          => "ברירת מחדל של גודל גופן הברקוד חייב להיות מספר.",
-    "default_barcode_font_size_required"        => "שדה גודל גופן הברקוד הינו שדה חובה.",
-    "default_barcode_height_number"             => "גובה ברירת המחדל של הברקוד חייב להיות מספר.",
-    "default_barcode_height_required"           => "גובה ברירת המחדל של הברקוד הינו שדה חובה.",
-    "default_barcode_num_in_row_number"         => "ברירת המחדל של מספר הברקוד בשורה חייב להיות מספר.",
-    "default_barcode_num_in_row_required"       => "ברירת המחדל של מספר הברקוד בשורה הינו שדה חובה.",
-    "default_barcode_page_cellspacing_number"   => "ברירת המחדל של שדה מרווח עימוד הברקוד חייב להיות מספר.",
-    "default_barcode_page_cellspacing_required" => "ברירת המחדל של שדה מרווח עימוד הברקוד הינו שדה חובה.",
-    "default_barcode_page_width_number"         => "ברירת המחדל של שדה רוחב עמוד הברקוד חייב להיות מספר.",
-    "default_barcode_page_width_required"       => "ברירת המחדל של שדה רוחב עמוד הברקוד הינו שדה חובה.",
-    "default_barcode_width_number"              => "ברירת המחדל של שדה רוחב הברקוד חייב להיות מספר.",
-    "default_barcode_width_required"            => "ברירת המחדל של שדה רוחב הברקוד הינו שדה חובה.",
-    "default_item_columns"                      => "ברירת מחדל של עמודות לפריטים גלויים",
-    "default_origin_tax_code"                   => "קוד ברירת מחדל למס במקור",
-    "default_receivings_discount"               => "הנחה ברירת מחדל להחזרות  ספקים",
-    "default_receivings_discount_number"        => "הנחה ברירת מחדל להחזרות  ספקים חייב להיות מספר.",
-    "default_receivings_discount_required"      => "הנחה ברירת מחדל להחזרות  ספקים הינו שדה חובה.",
-    "default_sales_discount"                    => "הנחה ברירת מחדל למכירות",
-    "default_sales_discount_number"             => "הנחה ברירת מחדל למכירות חייב להיות מספר.",
-    "default_sales_discount_required"           => "הנחה ברירת מחדל למכירות הינו שדה חובה.",
-    "default_tax_category"                      => "קטגוריה מס ברירת מחדל",
-    "default_tax_code"                          => "קוד מס ברירת מחדל",
-    "default_tax_jurisdiction"                  => "תחום שיפוט מס ברירת מחדל",
-    "default_tax_name_number"                   => "שם מס ברירת המחדל חייב להיות מחרוזת.",
-    "default_tax_name_required"                 => "שם מס ברירת המחדל הינו שדה חובה.",
-    "default_tax_rate"                          => "שיעור מס ברירת מחדל %",
-    "default_tax_rate_1"                        => "מדרגת מס 1",
-    "default_tax_rate_2"                        => "מדרגת מס 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "שיעור מס ברירת מחדל חייב להיות מספר.",
-    "default_tax_rate_required"                 => "שיעור מס ברירת מחדל הינו שדה חובה.",
-    "derive_sale_quantity"                      => "אפשר כמות נגזרת של מכירה",
-    "derive_sale_quantity_tooltip"              => "אם מסומן, סוג פריט חדש יספק פריטים שהוזמנו בכמות מורחבת",
-    "dinner_table"                              => "טבלה",
-    "dinner_table_duplicate"                    => "הטבלה חייבת להיות ייחודית.",
-    "dinner_table_enable"                       => "אפשר טבלאות אוכל",
-    "dinner_table_invalid_chars"                => "שם הטבלה אינו יכול להכיל את '_'.",
-    "dinner_table_required"                     => "שם הטבלה הינו שדה חובה.",
-    "dot"                                       => "נקודה",
-    "email"                                     => "אימייל",
-    "email_configuration"                       => "הגדרות אימייל",
-    "email_mailpath"                            => "נתיב לשליחת מייל",
-    "email_protocol"                            => "פרוטוקול",
-    "email_receipt_check_behaviour"             => "תיבת סימון של קבלת אימייל",
-    "email_receipt_check_behaviour_always"      => "תמיד מסומן",
-    "email_receipt_check_behaviour_last"        => "זכור את הבחירה האחרונה",
-    "email_receipt_check_behaviour_never"       => "תמיד לא מסומן",
-    "email_smtp_crypto"                         => "הצפנת SMTP",
-    "email_smtp_host"                           => "שרת SMTP",
-    "email_smtp_pass"                           => "סיסמת SMTP",
-    "email_smtp_port"                           => "יציאת SMTP",
-    "email_smtp_timeout"                        => "זמן קצוב לתפוגה של SMTP",
-    "email_smtp_user"                           => "שם משתמש של SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "אכיפת פרטיות",
-    "enforce_privacy_tooltip"                   => "הגן על פרטיות הלקוחות ואכיפת ערבוב נתונים במקרה של מחיקת הנתונים שלהם",
-    "fax"                                       => "פקס",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "תחילת שנת הכספים",
-    "financial_year_apr"                        => "1 של אפריל",
-    "financial_year_aug"                        => "1 של אוגוסט",
-    "financial_year_dec"                        => "1 של דצמבר",
-    "financial_year_feb"                        => "1 של פברואר",
-    "financial_year_jan"                        => "1 של ינואר",
-    "financial_year_jul"                        => "1 של יולי",
-    "financial_year_jun"                        => "1 של יוני",
-    "financial_year_mar"                        => "1 של מרץ",
-    "financial_year_may"                        => "1 של מאי",
-    "financial_year_nov"                        => "1 של נובמבר",
-    "financial_year_oct"                        => "1 של אוקטובר",
-    "financial_year_sep"                        => "1 של ספטמבר",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "דף התחברות reCAPTCHA",
-    "gcaptcha_secret_key"                       => "מפתח סודי של reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "מפתח סודי של reCAPTCHA הינו שדה חובה",
-    "gcaptcha_site_key"                         => "מפתח אתר reCAPTCHA",
-    "gcaptcha_site_key_required"                => "מפתח אתר reCAPTCHA הינו שדה חובה",
-    "gcaptcha_tooltip"                          => "הגן על דף ההתחברות באמצעות Google reCAPTCHA, לחץ על האייקון של ממשק צמד מפתחות API.",
-    "general"                                   => "כללי",
-    "general_configuration"                     => "הגדרות כלליות",
-    "giftcard_number"                           => "מספר כרטיס מתנה",
-    "giftcard_random"                           => "צור אקראי",
-    "giftcard_series"                           => "צור בסדרה",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "כלול תמיכה בקודי HSN",
-    "info"                                      => "מידע",
-    "info_configuration"                        => "אחסון מידע",
-    "input_groups"                              => "",
-    "integrations"                              => "אינטגרציה",
-    "integrations_configuration"                => "שילובים של צד שלישי",
-    "invoice"                                   => "חשבונית",
-    "invoice_configuration"                     => "הגדרות הדפסה של חשבוניות",
-    "invoice_default_comments"                  => "הערות ברירת מחדל של חשבוניות",
-    "invoice_email_message"                     => "תבנית אימייל של חשבונית",
-    "invoice_enable"                            => "הפעל חשבוניות",
-    "invoice_printer"                           => "מדפסת חשבונית",
-    "invoice_type"                              => "סוג חשבונית",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "אזהרה: פונקציונליות זו תפעל רק אם התקנת את התוסף FireFox jsPrintSetup ,לשמור בכל זאת?",
-    "language"                                  => "שפה",
-    "last_used_invoice_number"                  => "מספר חשבונית אחרונה שהייתה בשימוש",
-    "last_used_quote_number"                    => "מספר הצעת מחיר אחרונה שהייתה בשימוש",
-    "last_used_work_order_number"               => "מספר W/O אחרון שהיה בשימוש",
-    "left"                                      => "שמאל",
-    "license"                                   => "רישיון",
-    "license_configuration"                     => "הצהרת רישיון",
-    "line_sequence"                             => "סדר פעולות",
-    "lines_per_page"                            => "שורות בעמוד",
-    "lines_per_page_number"                     => "שורות בעמוד חייב להיות מספר.",
-    "lines_per_page_required"                   => "שורות בעמוד הינו שדה חובה.",
-    "locale"                                    => "התאמת שפה",
-    "locale_configuration"                      => "הגדרות התאמת שפה",
-    "locale_info"                               => "מידע על הגדרות התאמת שפה",
-    "location"                                  => "מלאי",
-    "location_configuration"                    => "מיקום המלאי",
-    "location_info"                             => "מידע על הגדרות מיקום",
-    "login_form"                                => "",
-    "logout"                                    => "האם ברצונך לבצע גיבוי לפני היציאה? לחץ על [OK] כדי לגבות או [ביטול] כדי להתנתק.",
-    "mailchimp"                                 => "Mailchimp (פלטפורמה לשליחת מיילים)",
-    "mailchimp_api_key"                         => "מפתח API של Mailchimp",
-    "mailchimp_configuration"                   => "הגדרות Mailchimp",
-    "mailchimp_key_successfully"                => "מפתח ה- API תקף.",
-    "mailchimp_key_unsuccessfully"              => "מפתח ה- API לא תקף.",
-    "mailchimp_lists"                           => "רשימת Mailchimp",
-    "mailchimp_tooltip"                         => "לחץ על האייקון של מפתח ממשק API.",
-    "message"                                   => "הודעה",
-    "message_configuration"                     => "הגדרות הודעה",
-    "msg_msg"                                   => "הודעת טקסט שמורה",
-    "msg_msg_placeholder"                       => "אם ברצונך להשתמש בתבנית הודעה שמור את ההודעה שלך כאן, אחרת השאר את התיבה ריקה.",
-    "msg_pwd"                                   => "סיסמה של SMS-API",
-    "msg_pwd_required"                          => "סיסמה של SMS-API הינו שדה חובה",
-    "msg_src"                                   => "מזהה שולח SMS-API",
-    "msg_src_required"                          => "מזהה שולח SMS-API הינו שדה חובה",
-    "msg_uid"                                   => "שם משתמש של SMS-API",
-    "msg_uid_required"                          => "שם משתמש של SMS-API הינו שדה חובה",
-    "multi_pack_enabled"                        => "חבילות מרובות לכל פריט",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "לא קיים",
-    "notify_alignment"                          => "מיקום חלון קופץ",
-    "number_format"                             => "פורמט מספר",
-    "number_locale"                             => "הגדרות שפה",
-    "number_locale_invalid"                     => "האזור שהוזן אינו חוקי. בדוק את הקישור שבסרגל הכלים כדי לאתר אזור חוקי.",
-    "number_locale_required"                    => "מספר אזור הינו שדה חובה.",
-    "number_locale_tooltip"                     => "מצא אזור תואם באמצעות קישור זה.",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "OSPOS פרטי התקנה",
-    "payment_options_order"                     => "סידור אפשרויות תשלום",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "טלפון חברה",
-    "phone_required"                            => "טלפון חברה הינו שדה חובה.",
-    "print_bottom_margin"                       => "כפתור שוליים",
-    "print_bottom_margin_number"                => "שדה כפתור שוליים חייב להיות מספר.",
-    "print_bottom_margin_required"              => "כפתור שוליים הינו שדה חובה.",
-    "print_delay_autoreturn"                    => "חזרה אוטומטית לעיכוב מכירה",
-    "print_delay_autoreturn_number"             => "חזרה אוטומטית לעיכוב מכירה הינו שדה חובה.",
-    "print_delay_autoreturn_required"           => "שדה חזרה אוטומטית לעיכוב מכירה חייב להיות מספר.",
-    "print_footer"                              => "הדפס כותרת תחתונה",
-    "print_header"                              => "הדפס כותרת עליונה",
-    "print_left_margin"                         => "שוליים צד שמאל",
-    "print_left_margin_number"                  => "שדה שוליים צד שמאל חייב להיות מספר.",
-    "print_left_margin_required"                => "שוליים צד שמאל הינו שדה חובה.",
-    "print_receipt_check_behaviour"             => "הדפס קבלה",
-    "print_receipt_check_behaviour_always"      => "תמיד מסומן",
-    "print_receipt_check_behaviour_last"        => "זכור את הבחירה האחרונה",
-    "print_receipt_check_behaviour_never"       => "תמיד לא מסומן",
-    "print_right_margin"                        => "שוליים צד ימין",
-    "print_right_margin_number"                 => "שדה שוליים צד ימין חייב להיות מספר.",
-    "print_right_margin_required"               => "שוליים צד ימין הינו שדה חובה.",
-    "print_silently"                            => "הצג את תיבת הדו-שיח 'הדפסה'",
-    "print_top_margin"                          => "שוליים עליונים",
-    "print_top_margin_number"                   => "שדה שוליים עליונים חייב להיות מספר.",
-    "print_top_margin_required"                 => "שוליים עליונים הינו שדה חובה.",
-    "quantity_decimals"                         => "כמות עשרונית",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "הערת ברירת מחדל להצעת מחיר",
-    "receipt"                                   => "קבלה",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "הגדרות הדפסה קבלה",
-    "receipt_default"                           => "ברירת מחדל",
-    "receipt_font_size"                         => "גודל פונט",
-    "receipt_font_size_number"                  => "שדה גודל פונט חייב להיות מספר.",
-    "receipt_font_size_required"                => "גודל פונט הינו שדה חובה.",
-    "receipt_info"                              => "מידע על הגדרות קבלה",
-    "receipt_printer"                           => "מדפסת כרטיסים",
-    "receipt_short"                             => "קצר",
-    "receipt_show_company_name"                 => "הצג שם חברה",
-    "receipt_show_description"                  => "הצג תיאור",
-    "receipt_show_serialnumber"                 => "הצג מספר סידורי",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "הצג מסים",
-    "receipt_show_total_discount"               => "הצג הנחה כוללת",
-    "receipt_template"                          => "תבנית קבלה",
-    "receiving_calculate_average_price"         => "חישוב ממוצע למחיר (החזרותספקים)",
-    "recv_invoice_format"                       => "תבנית חשבונית החזרותספקים",
-    "register_mode_default"                     => "מצב רישום ברירת מחדל",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "מדיניות ההחזרה היא שדה חובה.",
-    "reward"                                    => "תגמול",
-    "reward_configuration"                      => "הגדרות תגמולים",
-    "right"                                     => "ימין",
-    "sales_invoice_format"                      => "תבנית חשבונית מכירות",
-    "sales_quote_format"                        => "תבנית חשבונית הצעת מחיר",
-    "saved_successfully"                        => "ההגדרות נשמרו בהצלחה.",
-    "saved_unsuccessfully"                      => "שמירת ההגדרות נכשלה.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "השתמש במידע הבא לדיווח על בעיות.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "הצג את סמל המשרד",
-    "statistics"                                => "שלח סטטיסטיקה",
-    "statistics_tooltip"                        => "שלח סטטיסטיקות למפתחים למטרות פיתוח ושיפור התוכנה.",
-    "stock_location"                            => "מיקום המלאי",
-    "stock_location_duplicate"                  => "מיקום המלאי חייב להיות ייחודי.",
-    "stock_location_invalid_chars"              => "מיקום המלאי אינו יכול להכיל '_'.",
-    "stock_location_required"                   => "מיקום המלאי הינו שדה חובה.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "עמודה 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "פריסת הצעות חיפוש",
-    "suggestions_second_column"                 => "עמודה 2",
-    "suggestions_third_column"                  => "עמודה 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "מידע מערכת",
-    "table"                                     => "טבלה",
-    "table_configuration"                       => "הגדרות טבלה",
-    "takings_printer"                           => "מדפסת קבלה",
-    "tax"                                       => "מס",
-    "tax_category"                              => "קטגוריה מס",
-    "tax_category_duplicate"                    => "קטגוריית המס שהוזנה כבר קיימת.",
-    "tax_category_invalid_chars"                => "קטגוריית המס שהוזנה אינה חוקית.",
-    "tax_category_required"                     => "קטגוריית המס הינה חובה.",
-    "tax_category_used"                         => "לא ניתן למחוק את קטגוריית המס מכיוון שהיא נמצאת בשימוש.",
-    "tax_configuration"                         => "הגדרות מס",
-    "tax_decimals"                              => "מס עשרוני",
-    "tax_id"                                    => "מזהה לצורך מס",
-    "tax_included"                              => "כולל מס",
-    "theme"                                     => "ערכת נושא",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "מפריד אלפים",
-    "timezone"                                  => "אזור זמן",
-    "timezone_error"                            => "",
-    "top"                                       => "חלק עליון",
-    "use_destination_based_tax"                 => "השתמש במס מבוסס יעד",
-    "user_timezone"                             => "",
-    "website"                                   => "אתר",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "תמיכה בהזמנת עבודה",
-    "work_order_format"                         => "פורמט הזמנת עבודה",
+    'address'                                   => 'כתובת חברה',
+    'address_required'                          => 'כתובת החברה הינה שדה חובה.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'אפשר ברקודים כפולים',
+    'apostrophe'                                => 'גרש',
+    'backup_button'                             => 'גיבוי',
+    'backup_database'                           => 'מסד נתונים לגיבוי',
+    'barcode'                                   => 'ברקוד',
+    'barcode_company'                           => 'שם חברה',
+    'barcode_configuration'                     => 'הגדרות ברקוד',
+    'barcode_content'                           => 'תוכן ברקוד',
+    'barcode_first_row'                         => 'שורה 1',
+    'barcode_font'                              => 'פונט',
+    'barcode_formats'                           => 'תבניות קלט',
+    'barcode_generate_if_empty'                 => 'צור אם ריק.',
+    'barcode_height'                            => 'גובה (פיקסלים)',
+    'barcode_id'                                => 'מזהה / שם פריט',
+    'barcode_info'                              => 'מידע על הדגרות ברקוד',
+    'barcode_layout'                            => 'פריסת ברקוד',
+    'barcode_name'                              => 'שם',
+    'barcode_number'                            => 'ברקוד',
+    'barcode_number_in_row'                     => 'מספר בשורה',
+    'barcode_page_cellspacing'                  => 'הצגת מרחבי עמוד.',
+    'barcode_page_width'                        => 'הצגת רוחב דף',
+    'barcode_price'                             => 'מחיר',
+    'barcode_second_row'                        => 'שורה 2',
+    'barcode_third_row'                         => 'שורה 3',
+    'barcode_tooltip'                           => 'אזהרה: תכונה זו עלולה לגרום לייבוא או יצירת פריטים כפולים. אל תשתמש אם אתה לא רוצה ברקודים כפולים.',
+    'barcode_type'                              => 'סוג ברקוד',
+    'barcode_width'                             => 'רוחב (פיקסלים)',
+    'bottom'                                    => 'למטה',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'עשרוני מזומנים',
+    'cash_decimals_tooltip'                     => 'אם עשרוני מזומנים ועשרוני מטבעות זהים אז לא יתקיים עיגול מזומנים.',
+    'cash_rounding'                             => 'עיגול מזומנים',
+    'category_dropdown'                         => '',
+    'center'                                    => 'מרכז',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'פסיק',
+    'company'                                   => 'שם חברה',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'שנה תמונה',
+    'company_logo'                              => 'לוגו חברה',
+    'company_remove_image'                      => 'הסר תמונה',
+    'company_required'                          => 'שם החברה הינו שדה חובה',
+    'company_select_image'                      => 'בחר תמונה',
+    'company_website_url'                       => 'אתר החברה אינו כתובת אתר חוקית (http://...).',
+    'country_codes'                             => 'קודי מדינה',
+    'country_codes_tooltip'                     => 'רשימה מופרדת בפסיקים של קודי מדינות עבור בדיקת כתובת של nominatim.',
+    'currency_code'                             => 'קוד מטבע',
+    'currency_decimals'                         => 'מטבע עשרוני',
+    'currency_symbol'                           => 'סמל מטבע',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'תגמול',
+    'customer_reward_duplicate'                 => 'התגמול חייב להיות ייחודי.',
+    'customer_reward_enable'                    => 'אפשר תגמולים ללקוחות',
+    'customer_reward_invalid_chars'             => "התגמול אינו יכול להכיל '_'",
+    'customer_reward_required'                  => 'התגמול הינו שדה חובה',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'מסנן תאריך ושעה',
+    'datetimeformat'                            => 'פורמט תאריך ושעה',
+    'decimal_point'                             => 'נקודה עשרונית',
+    'default_barcode_font_size_number'          => 'ברירת מחדל של גודל גופן הברקוד חייב להיות מספר.',
+    'default_barcode_font_size_required'        => 'שדה גודל גופן הברקוד הינו שדה חובה.',
+    'default_barcode_height_number'             => 'גובה ברירת המחדל של הברקוד חייב להיות מספר.',
+    'default_barcode_height_required'           => 'גובה ברירת המחדל של הברקוד הינו שדה חובה.',
+    'default_barcode_num_in_row_number'         => 'ברירת המחדל של מספר הברקוד בשורה חייב להיות מספר.',
+    'default_barcode_num_in_row_required'       => 'ברירת המחדל של מספר הברקוד בשורה הינו שדה חובה.',
+    'default_barcode_page_cellspacing_number'   => 'ברירת המחדל של שדה מרווח עימוד הברקוד חייב להיות מספר.',
+    'default_barcode_page_cellspacing_required' => 'ברירת המחדל של שדה מרווח עימוד הברקוד הינו שדה חובה.',
+    'default_barcode_page_width_number'         => 'ברירת המחדל של שדה רוחב עמוד הברקוד חייב להיות מספר.',
+    'default_barcode_page_width_required'       => 'ברירת המחדל של שדה רוחב עמוד הברקוד הינו שדה חובה.',
+    'default_barcode_width_number'              => 'ברירת המחדל של שדה רוחב הברקוד חייב להיות מספר.',
+    'default_barcode_width_required'            => 'ברירת המחדל של שדה רוחב הברקוד הינו שדה חובה.',
+    'default_item_columns'                      => 'ברירת מחדל של עמודות לפריטים גלויים',
+    'default_origin_tax_code'                   => 'קוד ברירת מחדל למס במקור',
+    'default_receivings_discount'               => 'הנחה ברירת מחדל להחזרות  ספקים',
+    'default_receivings_discount_number'        => 'הנחה ברירת מחדל להחזרות  ספקים חייב להיות מספר.',
+    'default_receivings_discount_required'      => 'הנחה ברירת מחדל להחזרות  ספקים הינו שדה חובה.',
+    'default_sales_discount'                    => 'הנחה ברירת מחדל למכירות',
+    'default_sales_discount_number'             => 'הנחה ברירת מחדל למכירות חייב להיות מספר.',
+    'default_sales_discount_required'           => 'הנחה ברירת מחדל למכירות הינו שדה חובה.',
+    'default_tax_category'                      => 'קטגוריה מס ברירת מחדל',
+    'default_tax_code'                          => 'קוד מס ברירת מחדל',
+    'default_tax_jurisdiction'                  => 'תחום שיפוט מס ברירת מחדל',
+    'default_tax_name_number'                   => 'שם מס ברירת המחדל חייב להיות מחרוזת.',
+    'default_tax_name_required'                 => 'שם מס ברירת המחדל הינו שדה חובה.',
+    'default_tax_rate'                          => 'שיעור מס ברירת מחדל %',
+    'default_tax_rate_1'                        => 'מדרגת מס 1',
+    'default_tax_rate_2'                        => 'מדרגת מס 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'שיעור מס ברירת מחדל חייב להיות מספר.',
+    'default_tax_rate_required'                 => 'שיעור מס ברירת מחדל הינו שדה חובה.',
+    'derive_sale_quantity'                      => 'אפשר כמות נגזרת של מכירה',
+    'derive_sale_quantity_tooltip'              => 'אם מסומן, סוג פריט חדש יספק פריטים שהוזמנו בכמות מורחבת',
+    'dinner_table'                              => 'טבלה',
+    'dinner_table_duplicate'                    => 'הטבלה חייבת להיות ייחודית.',
+    'dinner_table_enable'                       => 'אפשר טבלאות אוכל',
+    'dinner_table_invalid_chars'                => "שם הטבלה אינו יכול להכיל את '_'.",
+    'dinner_table_required'                     => 'שם הטבלה הינו שדה חובה.',
+    'dot'                                       => 'נקודה',
+    'email'                                     => 'אימייל',
+    'email_configuration'                       => 'הגדרות אימייל',
+    'email_mailpath'                            => 'נתיב לשליחת מייל',
+    'email_protocol'                            => 'פרוטוקול',
+    'email_receipt_check_behaviour'             => 'תיבת סימון של קבלת אימייל',
+    'email_receipt_check_behaviour_always'      => 'תמיד מסומן',
+    'email_receipt_check_behaviour_last'        => 'זכור את הבחירה האחרונה',
+    'email_receipt_check_behaviour_never'       => 'תמיד לא מסומן',
+    'email_smtp_crypto'                         => 'הצפנת SMTP',
+    'email_smtp_host'                           => 'שרת SMTP',
+    'email_smtp_pass'                           => 'סיסמת SMTP',
+    'email_smtp_port'                           => 'יציאת SMTP',
+    'email_smtp_timeout'                        => 'זמן קצוב לתפוגה של SMTP',
+    'email_smtp_user'                           => 'שם משתמש של SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'אכיפת פרטיות',
+    'enforce_privacy_tooltip'                   => 'הגן על פרטיות הלקוחות ואכיפת ערבוב נתונים במקרה של מחיקת הנתונים שלהם',
+    'fax'                                       => 'פקס',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'תחילת שנת הכספים',
+    'financial_year_apr'                        => '1 של אפריל',
+    'financial_year_aug'                        => '1 של אוגוסט',
+    'financial_year_dec'                        => '1 של דצמבר',
+    'financial_year_feb'                        => '1 של פברואר',
+    'financial_year_jan'                        => '1 של ינואר',
+    'financial_year_jul'                        => '1 של יולי',
+    'financial_year_jun'                        => '1 של יוני',
+    'financial_year_mar'                        => '1 של מרץ',
+    'financial_year_may'                        => '1 של מאי',
+    'financial_year_nov'                        => '1 של נובמבר',
+    'financial_year_oct'                        => '1 של אוקטובר',
+    'financial_year_sep'                        => '1 של ספטמבר',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'דף התחברות reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'מפתח סודי של reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'מפתח סודי של reCAPTCHA הינו שדה חובה',
+    'gcaptcha_site_key'                         => 'מפתח אתר reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'מפתח אתר reCAPTCHA הינו שדה חובה',
+    'gcaptcha_tooltip'                          => 'הגן על דף ההתחברות באמצעות Google reCAPTCHA, לחץ על האייקון של ממשק צמד מפתחות API.',
+    'general'                                   => 'כללי',
+    'general_configuration'                     => 'הגדרות כלליות',
+    'giftcard_number'                           => 'מספר כרטיס מתנה',
+    'giftcard_random'                           => 'צור אקראי',
+    'giftcard_series'                           => 'צור בסדרה',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => 'כלול תמיכה בקודי HSN',
+    'info'                                      => 'מידע',
+    'info_configuration'                        => 'אחסון מידע',
+    'input_groups'                              => '',
+    'integrations'                              => 'אינטגרציה',
+    'integrations_configuration'                => 'שילובים של צד שלישי',
+    'invoice'                                   => 'חשבונית',
+    'invoice_configuration'                     => 'הגדרות הדפסה של חשבוניות',
+    'invoice_default_comments'                  => 'הערות ברירת מחדל של חשבוניות',
+    'invoice_email_message'                     => 'תבנית אימייל של חשבונית',
+    'invoice_enable'                            => 'הפעל חשבוניות',
+    'invoice_printer'                           => 'מדפסת חשבונית',
+    'invoice_type'                              => 'סוג חשבונית',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'אזהרה: פונקציונליות זו תפעל רק אם התקנת את התוסף FireFox jsPrintSetup ,לשמור בכל זאת?',
+    'language'                                  => 'שפה',
+    'last_used_invoice_number'                  => 'מספר חשבונית אחרונה שהייתה בשימוש',
+    'last_used_quote_number'                    => 'מספר הצעת מחיר אחרונה שהייתה בשימוש',
+    'last_used_work_order_number'               => 'מספר W/O אחרון שהיה בשימוש',
+    'left'                                      => 'שמאל',
+    'license'                                   => 'רישיון',
+    'license_configuration'                     => 'הצהרת רישיון',
+    'line_sequence'                             => 'סדר פעולות',
+    'lines_per_page'                            => 'שורות בעמוד',
+    'lines_per_page_number'                     => 'שורות בעמוד חייב להיות מספר.',
+    'lines_per_page_required'                   => 'שורות בעמוד הינו שדה חובה.',
+    'locale'                                    => 'התאמת שפה',
+    'locale_configuration'                      => 'הגדרות התאמת שפה',
+    'locale_info'                               => 'מידע על הגדרות התאמת שפה',
+    'location'                                  => 'מלאי',
+    'location_configuration'                    => 'מיקום המלאי',
+    'location_info'                             => 'מידע על הגדרות מיקום',
+    'login_form'                                => '',
+    'logout'                                    => 'האם ברצונך לבצע גיבוי לפני היציאה? לחץ על [OK] כדי לגבות או [ביטול] כדי להתנתק.',
+    'mailchimp'                                 => 'Mailchimp (פלטפורמה לשליחת מיילים)',
+    'mailchimp_api_key'                         => 'מפתח API של Mailchimp',
+    'mailchimp_configuration'                   => 'הגדרות Mailchimp',
+    'mailchimp_key_successfully'                => 'מפתח ה- API תקף.',
+    'mailchimp_key_unsuccessfully'              => 'מפתח ה- API לא תקף.',
+    'mailchimp_lists'                           => 'רשימת Mailchimp',
+    'mailchimp_tooltip'                         => 'לחץ על האייקון של מפתח ממשק API.',
+    'message'                                   => 'הודעה',
+    'message_configuration'                     => 'הגדרות הודעה',
+    'msg_msg'                                   => 'הודעת טקסט שמורה',
+    'msg_msg_placeholder'                       => 'אם ברצונך להשתמש בתבנית הודעה שמור את ההודעה שלך כאן, אחרת השאר את התיבה ריקה.',
+    'msg_pwd'                                   => 'סיסמה של SMS-API',
+    'msg_src'                                   => 'מזהה שולח SMS-API',
+    'msg_src_required'                          => 'מזהה שולח SMS-API הינו שדה חובה',
+    'msg_uid'                                   => 'שם משתמש של SMS-API',
+    'msg_uid_required'                          => 'שם משתמש של SMS-API הינו שדה חובה',
+    'multi_pack_enabled'                        => 'חבילות מרובות לכל פריט',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'לא קיים',
+    'notify_alignment'                          => 'מיקום חלון קופץ',
+    'number_format'                             => 'פורמט מספר',
+    'number_locale'                             => 'הגדרות שפה',
+    'number_locale_invalid'                     => 'האזור שהוזן אינו חוקי. בדוק את הקישור שבסרגל הכלים כדי לאתר אזור חוקי.',
+    'number_locale_required'                    => 'מספר אזור הינו שדה חובה.',
+    'number_locale_tooltip'                     => 'מצא אזור תואם באמצעות קישור זה.',
+    'os_timezone'                               => '',
+    'ospos_info'                                => 'OSPOS פרטי התקנה',
+    'payment_options_order'                     => 'סידור אפשרויות תשלום',
+    'payment_reference_code_length_limits'      => 'קוד אסמכתא לתשלום<br>מגבלות אורך',
+    'payment_reference_code_length_max_label'   => 'מקס',
+    'payment_reference_code_length_min_label'   => 'מין',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'טלפון חברה',
+    'phone_required'                            => 'טלפון חברה הינו שדה חובה.',
+    'print_bottom_margin'                       => 'כפתור שוליים',
+    'print_bottom_margin_number'                => 'שדה כפתור שוליים חייב להיות מספר.',
+    'print_bottom_margin_required'              => 'כפתור שוליים הינו שדה חובה.',
+    'print_delay_autoreturn'                    => 'חזרה אוטומטית לעיכוב מכירה',
+    'print_delay_autoreturn_number'             => 'חזרה אוטומטית לעיכוב מכירה הינו שדה חובה.',
+    'print_delay_autoreturn_required'           => 'שדה חזרה אוטומטית לעיכוב מכירה חייב להיות מספר.',
+    'print_footer'                              => 'הדפס כותרת תחתונה',
+    'print_header'                              => 'הדפס כותרת עליונה',
+    'print_left_margin'                         => 'שוליים צד שמאל',
+    'print_left_margin_number'                  => 'שדה שוליים צד שמאל חייב להיות מספר.',
+    'print_left_margin_required'                => 'שוליים צד שמאל הינו שדה חובה.',
+    'print_receipt_check_behaviour'             => 'הדפס קבלה',
+    'print_receipt_check_behaviour_always'      => 'תמיד מסומן',
+    'print_receipt_check_behaviour_last'        => 'זכור את הבחירה האחרונה',
+    'print_receipt_check_behaviour_never'       => 'תמיד לא מסומן',
+    'print_right_margin'                        => 'שוליים צד ימין',
+    'print_right_margin_number'                 => 'שדה שוליים צד ימין חייב להיות מספר.',
+    'print_right_margin_required'               => 'שוליים צד ימין הינו שדה חובה.',
+    'print_silently'                            => "הצג את תיבת הדו-שיח 'הדפסה'",
+    'print_top_margin'                          => 'שוליים עליונים',
+    'print_top_margin_number'                   => 'שדה שוליים עליונים חייב להיות מספר.',
+    'print_top_margin_required'                 => 'שוליים עליונים הינו שדה חובה.',
+    'quantity_decimals'                         => 'כמות עשרונית',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'הערת ברירת מחדל להצעת מחיר',
+    'receipt'                                   => 'קבלה',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'הגדרות הדפסה קבלה',
+    'receipt_default'                           => 'ברירת מחדל',
+    'receipt_font_size'                         => 'גודל פונט',
+    'receipt_font_size_number'                  => 'שדה גודל פונט חייב להיות מספר.',
+    'receipt_font_size_required'                => 'גודל פונט הינו שדה חובה.',
+    'receipt_info'                              => 'מידע על הגדרות קבלה',
+    'receipt_printer'                           => 'מדפסת כרטיסים',
+    'receipt_short'                             => 'קצר',
+    'receipt_show_company_name'                 => 'הצג שם חברה',
+    'receipt_show_description'                  => 'הצג תיאור',
+    'receipt_show_serialnumber'                 => 'הצג מספר סידורי',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'הצג מסים',
+    'receipt_show_total_discount'               => 'הצג הנחה כוללת',
+    'receipt_template'                          => 'תבנית קבלה',
+    'receiving_calculate_average_price'         => 'חישוב ממוצע למחיר (החזרותספקים)',
+    'recv_invoice_format'                       => 'תבנית חשבונית החזרותספקים',
+    'register_mode_default'                     => 'מצב רישום ברירת מחדל',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'מדיניות ההחזרה היא שדה חובה.',
+    'reward'                                    => 'תגמול',
+    'reward_configuration'                      => 'הגדרות תגמולים',
+    'right'                                     => 'ימין',
+    'sales_invoice_format'                      => 'תבנית חשבונית מכירות',
+    'sales_quote_format'                        => 'תבנית חשבונית הצעת מחיר',
+    'mailpath_invalid'                          => 'נתיב sendmail לא תקין. מותרים רק אותיות, ספרות, מקפים, קווים תחתונים, לוכסנים, לוכסנים הפוכים, נקודתיים, רווחים ונקודות.',
+    'saved_successfully'                        => 'ההגדרות נשמרו בהצלחה.',
+    'saved_unsuccessfully'                      => 'שמירת ההגדרות נכשלה.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'השתמש במידע הבא לדיווח על בעיות.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'הצג את סמל המשרד',
+    'statistics'                                => 'שלח סטטיסטיקה',
+    'statistics_tooltip'                        => 'שלח סטטיסטיקות למפתחים למטרות פיתוח ושיפור התוכנה.',
+    'stock_location'                            => 'מיקום המלאי',
+    'stock_location_duplicate'                  => 'מיקום המלאי חייב להיות ייחודי.',
+    'stock_location_invalid_chars'              => "מיקום המלאי אינו יכול להכיל '_'.",
+    'stock_location_required'                   => 'מיקום המלאי הינו שדה חובה.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'עמודה 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'פריסת הצעות חיפוש',
+    'suggestions_second_column'                 => 'עמודה 2',
+    'suggestions_third_column'                  => 'עמודה 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'מידע מערכת',
+    'table'                                     => 'טבלה',
+    'table_configuration'                       => 'הגדרות טבלה',
+    'takings_printer'                           => 'מדפסת קבלה',
+    'tax'                                       => 'מס',
+    'tax_category'                              => 'קטגוריה מס',
+    'tax_category_duplicate'                    => 'קטגוריית המס שהוזנה כבר קיימת.',
+    'tax_category_invalid_chars'                => 'קטגוריית המס שהוזנה אינה חוקית.',
+    'tax_category_required'                     => 'קטגוריית המס הינה חובה.',
+    'tax_category_used'                         => 'לא ניתן למחוק את קטגוריית המס מכיוון שהיא נמצאת בשימוש.',
+    'tax_configuration'                         => 'הגדרות מס',
+    'tax_decimals'                              => 'מס עשרוני',
+    'tax_id'                                    => 'מזהה לצורך מס',
+    'tax_included'                              => 'כולל מס',
+    'theme'                                     => 'ערכת נושא',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'מפריד אלפים',
+    'timezone'                                  => 'אזור זמן',
+    'timezone_error'                            => '',
+    'top'                                       => 'חלק עליון',
+    'use_destination_based_tax'                 => 'השתמש במס מבוסס יעד',
+    'user_timezone'                             => '',
+    'website'                                   => 'אתר',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'תמיכה בהזמנת עבודה',
+    'work_order_format'                         => 'פורמט הזמנת עבודה',
 ];
diff --git a/app/Language/he/Employees.php b/app/Language/he/Employees.php
index 44063035e..297b09650 100644
--- a/app/Language/he/Employees.php
+++ b/app/Language/he/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "מידע",
-    "cannot_be_deleted"            => "לא ניתן למחוק עובדים נבחרים, לאחד או יותר יש מכירות בתהליך או שאתה מנסה למחוק את החשבון שלך.",
-    "change_employee"              => "",
-    "change_password"              => "שנה סיסמה",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "האם אתה בטוח שברצונך למחוק את העובדים שנבחרו?",
-    "confirm_restore"              => "האם אתה בטוח שברצונך לשחזר את העובדים שנבחרו?",
-    "current_password"             => "סיסמה נוכחית",
-    "current_password_invalid"     => "הסיסמה הנוכחית אינה חוקית.",
-    "employee"                     => "עובד",
-    "error_adding_updating"        => "הוספה או עדכון של עובד נכשלה.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "לא ניתן למחוק את משתמש המנהל ההדגמה.",
-    "error_updating_demo_admin"    => "לא ניתן לשנות את משתמש המנהל ההדגמה.",
-    "language"                     => "שפה",
-    "login_info"                   => "כניסה",
-    "manager"                      => "",
-    "new"                          => "עובד חדש",
-    "none_selected"                => "לא בחרת עובדים שברצונך למחוק.",
-    "one_or_multiple"              => "עובד(ים)",
-    "password"                     => "סיסמה",
-    "password_minlength"           => "על הסיסמה להיות באורך של 8 תווים לפחות.",
-    "password_must_match"          => "סיסמאות לא תואמות.",
-    "password_not_must_match"      => "הסיסמה הנוכחית והסיסמה החדשה חייבות להיות ייחודיות.",
-    "password_required"            => "דרושה סיסמה.",
-    "permission_desc"              => "סמן את התיבות שלהלן כדי להעניק גישה למודולים.",
-    "permission_info"              => "הרשאות",
-    "repeat_password"              => "סיסמא בשנית",
-    "subpermission_required"       => "הוסף לפחות גישה אחת לכל מודול.",
-    "successful_adding"            => "הוספת עובד בהצלחה.",
-    "successful_change_password"   => "סיסמה שונתה בהצלחה.",
-    "successful_deleted"           => "נמחק בהצלחה",
-    "successful_updating"          => "עדכנת בהצלחה את פרטי העובד",
-    "system_language"              => "שפת מערכת",
-    "unsuccessful_change_password" => "שינוי הסיסמה נכשל.",
-    "update"                       => "עדכן עובד",
-    "username"                     => "שם משתמש",
-    "username_duplicate"           => "",
-    "username_minlength"           => "על שם המשתמש להיות באורך של 5 תווים לפחות.",
-    "username_required"            => "שם המשתמש הינו שדה חובה.",
+    'administrator'                          => '',
+    'basic_information'                      => 'מידע',
+    'cannot_be_deleted'                      => 'לא ניתן למחוק עובדים נבחרים, לאחד או יותר יש מכירות בתהליך או שאתה מנסה למחוק את החשבון שלך.',
+    'change_employee'                        => '',
+    'change_password'                        => 'שנה סיסמה',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'האם אתה בטוח שברצונך למחוק את העובדים שנבחרו?',
+    'confirm_restore'                        => 'האם אתה בטוח שברצונך לשחזר את העובדים שנבחרו?',
+    'current_password'                       => 'סיסמה נוכחית',
+    'current_password_invalid'               => 'הסיסמה הנוכחית אינה חוקית.',
+    'employee'                               => 'עובד',
+    'error_adding_updating'                  => 'הוספה או עדכון של עובד נכשלה.',
+    'error_cannot_remove_own_minimum_grant'  => 'אינך יכול להסיר את הרשאות הגישה המינימליות שלך למודולים.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'לא ניתן למחוק את משתמש המנהל ההדגמה.',
+    'error_grant_change_disallowed'          => 'שינויים בהרשאות מבוטלים בדמו זה.',
+    'error_password_change_disallowed'       => 'שינויים בסיסמה מבוטלים בדמו זה.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'לא ניתן לשנות את משתמש המנהל ההדגמה.',
+    'language'                               => 'שפה',
+    'login_info'                             => 'כניסה',
+    'manager'                                => '',
+    'new'                                    => 'עובד חדש',
+    'none_selected'                          => 'לא בחרת עובדים שברצונך למחוק.',
+    'one_or_multiple'                        => 'עובד(ים)',
+    'password'                               => 'סיסמה',
+    'password_minlength'                     => 'על הסיסמה להיות באורך של 8 תווים לפחות.',
+    'password_must_match'                    => 'סיסמאות לא תואמות.',
+    'password_not_must_match'                => 'הסיסמה הנוכחית והסיסמה החדשה חייבות להיות ייחודיות.',
+    'password_required'                      => 'דרושה סיסמה.',
+    'permission_desc'                        => 'סמן את התיבות שלהלן כדי להעניק גישה למודולים.',
+    'permission_info'                        => 'הרשאות',
+    'repeat_password'                        => 'סיסמא בשנית',
+    'subpermission_required'                 => 'הוסף לפחות גישה אחת לכל מודול.',
+    'successful_adding'                      => 'הוספת עובד בהצלחה.',
+    'successful_change_password'             => 'סיסמה שונתה בהצלחה.',
+    'successful_deleted'                     => 'נמחק בהצלחה',
+    'successful_updating'                    => 'עדכנת בהצלחה את פרטי העובד',
+    'system_language'                        => 'שפת מערכת',
+    'unsuccessful_change_password'           => 'שינוי הסיסמה נכשל.',
+    'update'                                 => 'עדכן עובד',
+    'username'                               => 'שם משתמש',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'על שם המשתמש להיות באורך של 5 תווים לפחות.',
+    'username_required'                      => 'שם המשתמש הינו שדה חובה.',
 ];
diff --git a/app/Language/he/Error.php b/app/Language/he/Error.php
index a6c9f59d6..65f5b97f5 100644
--- a/app/Language/he/Error.php
+++ b/app/Language/he/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "אין לך הרשאה לגשת אל המודול ששמו",
-    "unknown"              => "שגיאה לא ידועה",
+    'no_permission_module'           => 'אין לך הרשאה לגשת אל המודול ששמו',
+    'unable_to_create_env_file'      => 'לא ניתן ליצור את {filePath} כדי להגדיר את throttle.key',
+    'unable_to_lock_file'            => 'לא ניתן לנעול את {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'לא ניתן לפתוח את {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'לא ניתן לשמור את throttle.key בקובץ {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'לא ניתן לקרוא את {filePath} כדי להגדיר את throttle.key',
+    'unknown'                        => 'שגיאה לא ידועה',
 ];
diff --git a/app/Language/he/Items.php b/app/Language/he/Items.php
index 9583bb300..7c24eb256 100644
--- a/app/Language/he/Items.php
+++ b/app/Language/he/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "הוספה או החסרה של מלאי.",
-    "allow_alt_description"              => "אפשר תיאור חלופי",
-    "amount_entry"                       => "ערך כניסה",
-    "bulk_edit"                          => "עריכה גורפת",
-    "buy_price_required"                 => "מחיר הרכישה הינו שדה חובה.",
-    "cannot_be_deleted"                  => "לא ניתן למחוק פריטים נבחרים, לאחד או יותר מהפריטים שנבחרו יש מכירות.",
-    "cannot_find_item"                   => "פריט לא נמצא.",
-    "categories"                         => "",
-    "category"                           => "קטגוריה",
-    "category_new"                       => "",
-    "category_required"                  => "קטגוריה היא שדה חובה.",
-    "change_all_to_allow_alt_desc"       => "אפשר תיאור חלופי להכול.",
-    "change_all_to_not_allow_allow_desc" => "אל תאפשר תיאור חלופי להכול.",
-    "change_all_to_serialized"           => "שנה הכל לסריאליזציה",
-    "change_all_to_unserialized"         => "הפוך הכל מסריאליזציה",
-    "change_image"                       => "שנה תמונה",
-    "confirm_bulk_edit"                  => "האם אתה בטוח שברצונך לערוך פריטים נבחרים?",
-    "confirm_bulk_edit_wipe_taxes"       => "כל פירוטי המס בפריט יוחלפו.",
-    "confirm_delete"                     => "האם אתה בטוח שברצונך למחוק פריטים נבחרים?",
-    "confirm_restore"                    => "האם אתה בטוח שברצונך לשחזר פריטים נבחרים?",
-    "cost_price"                         => "מחיר סיטונאי",
-    "cost_price_number"                  => "מחיר סיטונאי חייב להיות מספר.",
-    "cost_price_required"                => "מחיר סיטונאי הינו שדה חובה.",
-    "count"                              => "עדכן מלאי",
-    "csv_import_failed"                  => "ייבוא אקסל נכשל",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "בקובץ שהועלה אין נתונים או פורמט שגוי.",
-    "csv_import_partially_failed"        => "ייבוא פריט הצליח עם מספר שגיאות:",
-    "csv_import_success"                 => "ייבוא הפריט הצליח.",
-    "current_quantity"                   => "כמות נוכחית",
-    "default_pack_name"                  => "כל",
-    "description"                        => "תיאור",
-    "details_count"                      => "פרטים על ספירת מלאי",
-    "do_nothing"                         => "לא לעשות שום דבר",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "ערוך את השדות הרצויים לפריטים שנבחרו.",
-    "edit_multiple_items"                => "עריכת פריטים מרובים",
-    "empty_upc_items"                    => "הסר ברקוד לפריטים",
-    "error_adding_updating"              => "שגיאה בהוספה / עדכון של פריט",
-    "error_updating_multiple"            => "שגיאה בעדכון פריטים",
-    "generate_barcodes"                  => "צור ברקודים",
-    "hsn_code"                           => "מערכת מינוח מתואמת",
-    "image"                              => "אווטר",
-    "import_items_csv"                   => "ייבוא פריט מאקסל",
-    "info_provided_by"                   => "מידע סופק על ידי",
-    "inventory"                          => "מלאי",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "הערות",
-    "inventory_data_tracking"            => "מעקב אחר נתוני מלאי",
-    "inventory_date"                     => "תאריך",
-    "inventory_employee"                 => "עובד",
-    "inventory_in_out_quantity"          => "הכנס\הוצא כמות",
-    "inventory_remarks"                  => "הערות",
-    "is_deleted"                         => "נמחק",
-    "is_printed"                         => "",
-    "is_serialized"                      => "לפריט יש מספר סידורי",
-    "item"                               => "פריט",
-    "item_id"                            => "",
-    "item_number"                        => "ברקוד",
-    "item_number_duplicate"              => "מספר הפריט כבר נמצא במסד הנתונים.",
-    "kit"                                => "ערכה",
-    "location"                           => "מיקום",
-    "low_inventory_items"                => "פריטים מחוץ למלאי",
-    "low_sell_item"                      => "פריט במכירה זולה",
-    "manually_editing_of_quantity"       => "עריכה ידנית של כמות",
-    "markup"                             => "",
-    "name"                               => "שם פריט",
-    "name_required"                      => "שם הפריט הינו שדה חובה.",
-    "new"                                => "פריט חדש",
-    "no_description_items"               => "אין תיאור לפריטים",
-    "no_items_to_display"                => "אין פריטים להצגה.",
-    "none"                               => "ריק",
-    "none_selected"                      => "לא בחרת פריט כלשהו לעריכה",
-    "nonstock"                           => "לא במלאי",
-    "number_information"                 => "מספר פריט",
-    "number_required"                    => "ברקוד הינו שדה חובה.",
-    "one_or_multiple"                    => "פריט(ים)",
-    "pack_name"                          => "שם החבילה",
-    "qty_per_pack"                       => "כמות לחבילה",
-    "quantity"                           => "כמות",
-    "quantity_number"                    => "שדה הכמות חייב להיות מספר.",
-    "quantity_required"                  => "הכמות היא שדה חובה.",
-    "receiving_quantity"                 => "קבלת כמות",
-    "remove_image"                       => "הסר תמונה",
-    "reorder_level"                      => "כמות מינימום להזמנה חדשה",
-    "reorder_level_number"               => "שדה כמות מינימום להזמנה חדשה חייב להיות מספר.",
-    "reorder_level_required"             => "כמות מינימום להזמנה חדשה הינו שדה חובה.",
-    "retrive_item_info"                  => "אחזר פרטי פריט",
-    "sales_tax_1"                        => "מס מכירה",
-    "sales_tax_2"                        => "מס מכירה 2",
-    "search_attributes"                  => "חיפוש במאפיינים",
-    "select_image"                       => "בחר תמונה",
-    "serialized_items"                   => "סדר פריטים",
-    "standard"                           => "רגיל",
-    "stock"                              => "במלאי",
-    "stock_location"                     => "מיקום המלאי",
-    "stock_type"                         => "סוג המלאי",
-    "successful_adding"                  => "הוספת בהצלחה פריט",
-    "successful_bulk_edit"               => "עדכנת בהצלחה את הפריטים שנבחרו",
-    "successful_deleted"                 => "נמחק בהצלחה",
-    "successful_updating"                => "עדכנת בהצלחה את הפריט",
-    "supplier"                           => "ספק",
-    "tax_1"                              => "מס 1",
-    "tax_2"                              => "מס 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "קטגוריה מס",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "אחוז המס חייב להיות ערך מספרי",
-    "tax_percent_required"               => "אחוז המס הינו שדה חובה.",
-    "tax_percents"                       => "אחוזי מס",
-    "temp"                               => "זמני",
-    "type"                               => "סוג פריט",
-    "unit_price"                         => "מחיר קמעונאי",
-    "unit_price_number"                  => "מחיר היחידה חייב להיות מספר.",
-    "unit_price_required"                => "מחיר קמעונאי הינו שדה חובה.",
-    "upc_database"                       => "מסד נתונים של הברקוד",
-    "update"                             => "עדכן פריט",
-    "use_inventory_menu"                 => "השתמש בתפריט מלאי",
+    'add_minus'                          => 'הוספה או החסרה של מלאי.',
+    'allow_alt_description'              => 'אפשר תיאור חלופי',
+    'amount_entry'                       => 'ערך כניסה',
+    'bulk_edit'                          => 'עריכה גורפת',
+    'buy_price_required'                 => 'מחיר הרכישה הינו שדה חובה.',
+    'cannot_be_deleted'                  => 'לא ניתן למחוק פריטים נבחרים, לאחד או יותר מהפריטים שנבחרו יש מכירות.',
+    'cannot_find_item'                   => 'פריט לא נמצא.',
+    'categories'                         => '',
+    'category'                           => 'קטגוריה',
+    'category_new'                       => '',
+    'category_required'                  => 'קטגוריה היא שדה חובה.',
+    'change_all_to_allow_alt_desc'       => 'אפשר תיאור חלופי להכול.',
+    'change_all_to_not_allow_allow_desc' => 'אל תאפשר תיאור חלופי להכול.',
+    'change_all_to_serialized'           => 'שנה הכל לסריאליזציה',
+    'change_all_to_unserialized'         => 'הפוך הכל מסריאליזציה',
+    'change_image'                       => 'שנה תמונה',
+    'confirm_bulk_edit'                  => 'האם אתה בטוח שברצונך לערוך פריטים נבחרים?',
+    'confirm_bulk_edit_wipe_taxes'       => 'כל פירוטי המס בפריט יוחלפו.',
+    'confirm_delete'                     => 'האם אתה בטוח שברצונך למחוק פריטים נבחרים?',
+    'confirm_restore'                    => 'האם אתה בטוח שברצונך לשחזר פריטים נבחרים?',
+    'cost_price'                         => 'מחיר סיטונאי',
+    'cost_price_number'                  => 'מחיר סיטונאי חייב להיות מספר.',
+    'cost_price_required'                => 'מחיר סיטונאי הינו שדה חובה.',
+    'count'                              => 'עדכן מלאי',
+    'csv_import_failed'                  => 'ייבוא אקסל נכשל',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'בקובץ שהועלה אין נתונים או פורמט שגוי.',
+    'csv_import_partially_failed'        => 'ייבוא פריט הצליח עם מספר שגיאות:',
+    'csv_import_success'                 => 'ייבוא הפריט הצליח.',
+    'current_quantity'                   => 'כמות נוכחית',
+    'default_pack_name'                  => 'כל',
+    'description'                        => 'תיאור',
+    'details_count'                      => 'פרטים על ספירת מלאי',
+    'do_nothing'                         => 'לא לעשות שום דבר',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'ערוך את השדות הרצויים לפריטים שנבחרו.',
+    'edit_multiple_items'                => 'עריכת פריטים מרובים',
+    'empty_upc_items'                    => 'הסר ברקוד לפריטים',
+    'error_adding_updating'              => 'שגיאה בהוספה / עדכון של פריט',
+    'error_updating_multiple'            => 'שגיאה בעדכון פריטים',
+    'generate_barcodes'                  => 'צור ברקודים',
+    'hsn_code'                           => 'מערכת מינוח מתואמת',
+    'image'                              => 'אווטר',
+    'import_items_csv'                   => 'ייבוא פריט מאקסל',
+    'info_provided_by'                   => 'מידע סופק על ידי',
+    'inventory'                          => 'מלאי',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'הערות',
+    'inventory_data_tracking'            => 'מעקב אחר נתוני מלאי',
+    'inventory_date'                     => 'תאריך',
+    'inventory_employee'                 => 'עובד',
+    'inventory_in_out_quantity'          => 'הכנס\הוצא כמות',
+    'inventory_remarks'                  => 'הערות',
+    'is_deleted'                         => 'נמחק',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'לפריט יש מספר סידורי',
+    'item'                               => 'פריט',
+    'item_id'                            => '',
+    'item_number'                        => 'ברקוד',
+    'item_number_duplicate'              => 'מספר הפריט כבר נמצא במסד הנתונים.',
+    'item_number_invalid'                => 'מספר הפריט מכיל תווים אסורים.',
+    'kit'                                => 'ערכה',
+    'location'                           => 'מיקום',
+    'low_inventory_items'                => 'פריטים מחוץ למלאי',
+    'low_sell_item'                      => 'פריט במכירה זולה',
+    'manually_editing_of_quantity'       => 'עריכה ידנית של כמות',
+    'markup'                             => '',
+    'name'                               => 'שם פריט',
+    'name_required'                      => 'שם הפריט הינו שדה חובה.',
+    'new'                                => 'פריט חדש',
+    'no_description_items'               => 'אין תיאור לפריטים',
+    'no_items_to_display'                => 'אין פריטים להצגה.',
+    'none'                               => 'ריק',
+    'none_selected'                      => 'לא בחרת פריט כלשהו לעריכה',
+    'nonstock'                           => 'לא במלאי',
+    'number_information'                 => 'מספר פריט',
+    'number_required'                    => 'ברקוד הינו שדה חובה.',
+    'one_or_multiple'                    => 'פריט(ים)',
+    'pack_name'                          => 'שם החבילה',
+    'qty_per_pack'                       => 'כמות לחבילה',
+    'quantity'                           => 'כמות',
+    'quantity_number'                    => 'שדה הכמות חייב להיות מספר.',
+    'quantity_required'                  => 'הכמות היא שדה חובה.',
+    'receiving_quantity'                 => 'קבלת כמות',
+    'remove_image'                       => 'הסר תמונה',
+    'reorder_level'                      => 'כמות מינימום להזמנה חדשה',
+    'reorder_level_number'               => 'שדה כמות מינימום להזמנה חדשה חייב להיות מספר.',
+    'reorder_level_required'             => 'כמות מינימום להזמנה חדשה הינו שדה חובה.',
+    'retrive_item_info'                  => 'אחזר פרטי פריט',
+    'sales_tax_1'                        => 'מס מכירה',
+    'sales_tax_2'                        => 'מס מכירה 2',
+    'search_attributes'                  => 'חיפוש במאפיינים',
+    'select_image'                       => 'בחר תמונה',
+    'serialized_items'                   => 'סדר פריטים',
+    'standard'                           => 'רגיל',
+    'stock'                              => 'במלאי',
+    'stock_location'                     => 'מיקום המלאי',
+    'stock_type'                         => 'סוג המלאי',
+    'successful_adding'                  => 'הוספת בהצלחה פריט',
+    'successful_bulk_edit'               => 'עדכנת בהצלחה את הפריטים שנבחרו',
+    'successful_deleted'                 => 'נמחק בהצלחה',
+    'successful_updating'                => 'עדכנת בהצלחה את הפריט',
+    'supplier'                           => 'ספק',
+    'tax_1'                              => 'מס 1',
+    'tax_2'                              => 'מס 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'קטגוריה מס',
+    'tax_name_invalid'                   => 'שם המס מכיל תווים אסורים.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => 'אחוז המס חייב להיות ערך מספרי',
+    'tax_percent_required'               => 'אחוז המס הינו שדה חובה.',
+    'tax_percents'                       => 'אחוזי מס',
+    'temp'                               => 'זמני',
+    'type'                               => 'סוג פריט',
+    'unit_price'                         => 'מחיר קמעונאי',
+    'unit_price_number'                  => 'מחיר היחידה חייב להיות מספר.',
+    'unit_price_required'                => 'מחיר קמעונאי הינו שדה חובה.',
+    'upc_database'                       => 'מסד נתונים של הברקוד',
+    'update'                             => 'עדכן פריט',
+    'use_inventory_menu'                 => 'השתמש בתפריט מלאי',
 ];
diff --git a/app/Language/he/Login.php b/app/Language/he/Login.php
index c1809b79d..50147ebbd 100644
--- a/app/Language/he/Login.php
+++ b/app/Language/he/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "אני לא רובוט.",
-    "go"                            => "שלח",
-    "invalid_gcaptcha"              => "שגיאת אימות.",
-    "invalid_installation"          => "ההתקנה אינה נכונה, בדוק את קובץ php.ini.",
-    "invalid_username_and_password" => "שם משתמש או סיסמה לא נכונים.",
-    "login"                         => "כניסה",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "סיסמה",
-    "required_username"             => "",
-    "username"                      => "שם משתמש",
-    "welcome"                       => "",
+    "gcaptcha"                            => "אני לא רובוט.",
+    "go"                                  => "שלח",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "שגיאת אימות.",
+    "invalid_installation"                => "ההתקנה אינה נכונה, בדוק את קובץ php.ini.",
+    "invalid_username_and_password"       => "שם משתמש או סיסמה לא נכונים.",
+    "login"                               => "כניסה",
+    "logout"                              => "",
+    "migrating_database"                  => "מעביר בסיס נתונים",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "בסיס הנתונים הועבר בהצלחה!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "סיסמה",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'יותר מדי ניסיונות. אנא המתן רגע ונסה שוב.',
+    "username"                            => "שם משתמש",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/he/Reports.php b/app/Language/he/Reports.php
index 393a6ef63..6177843b5 100644
--- a/app/Language/he/Reports.php
+++ b/app/Language/he/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "שיעור מס",
     "taxes"                                   => "מסים",
     "taxes_summary_report"                    => "דוח סיכום מסים",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "סהכ",
     "total_inventory_value"                   => "סהכ ערך מלאי",
     "total_low_sell_quantity"                 => "סהכ מינימום כמות למכירה",
diff --git a/app/Language/he/Sales.php b/app/Language/he/Sales.php
index f2bd399ba..4049f61d2 100644
--- a/app/Language/he/Sales.php
+++ b/app/Language/he/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "נקודות זמינות",
-    "rewards_package"                  => "פרסים",
-    "rewards_remaining_balance"        => "נקודות הפרס הנותרות הן ",
-    "account_number"                   => "חשבון מס #",
-    "add_payment"                      => "הוסף תשלום",
-    "amount_due"                       => "סכום לתשלום",
-    "amount_tendered"                  => "סכום ההצעה",
-    "authorized_signature"             => "חתימת מורשה",
-    "cancel_sale"                      => "בטל",
-    "cash"                             => "מזומן",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "הפקדת מזומן",
-    "cash_filter"                      => "מזומן",
-    "change_due"                       => "עודף לתשלום",
-    "change_price"                     => "",
-    "check"                            => "שק",
-    "check_balance"                    => "תזכורת שקים",
-    "check_filter"                     => "שק",
-    "close"                            => "",
-    "comment"                          => "הערה",
-    "comments"                         => "הערות",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "הושלם",
-    "confirm_cancel_sale"              => "האם אתה בטוח שברצונך למחוק את המכירה הזו? כל הפריטים יימחקו.",
-    "confirm_delete"                   => "האם אתה בטוח שברצונך למחוק את המכירות שנבחרו?",
-    "confirm_restore"                  => "האם אתה בטוח שברצונך לשחזר את המכירות שנבחרו?",
-    "credit"                           => "כרטיס אשראי",
-    "credit_deposit"                   => "הפקדת אשראי",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "שם",
-    "customer_address"                 => "כתובת",
-    "customer_discount"                => "הנחה",
-    "customer_email"                   => "אימייל",
-    "customer_location"                => "מיקום",
-    "customer_mailchimp_status"        => "מצב Mailchimp",
-    "customer_optional"                => "נדרש עבור תשלומים עתידיים (אופציונאלי)",
-    "customer_required"                => "(נדרש)",
-    "customer_total"                   => "סהכ",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "תאריך המכירה",
-    "date_range"                       => "טווח תאריכים",
-    "date_required"                    => "יש להזין תאריך נכון.",
-    "date_type"                        => "תאריך הוא שדה חובה.",
-    "debit"                            => "כרטיס חיוב מיידי",
-    "debit_filter"                     => "",
-    "delete"                           => "אפשר מחיקה",
-    "delete_confirmation"              => "האם אתה בטוח שברצונך למחוק את המכירה הזו? לא ניתן לבטל פעולה זו.",
-    "delete_entire_sale"               => "מחק את כל המכירה",
-    "delete_successful"                => "המכירה נמחקה בהצלחה.",
-    "delete_unsuccessful"              => "מחיקת המכירה נכשלה.",
-    "description_abbrv"                => "תיאור.",
-    "discard"                          => "התעלם",
-    "discard_quote"                    => "",
-    "discount"                         => "תיאור",
-    "discount_included"                => "% הנחה",
-    "discount_short"                   => "%",
-    "due"                              => "לתשלום",
-    "due_filter"                       => "צפוי לתשלום",
-    "edit"                             => "ערוך",
-    "edit_item"                        => "ערוך פריט",
-    "edit_sale"                        => "ערוך מכירה",
-    "email_receipt"                    => "נמען אימייל",
-    "employee"                         => "עובד",
-    "entry"                            => "ערך",
-    "error_editing_item"               => "שגיאה בעריכת פריט",
-    "find_or_scan_item"                => "חיפוש או סריקה של פריט",
-    "find_or_scan_item_or_receipt"     => "חיפוש או סריקה של פריט או קבלה",
-    "giftcard"                         => "כרטיס מתנה",
-    "giftcard_balance"                 => "מאזן כרטיס מתנה",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "מספר כרטיס מתנה",
-    "group_by_category"                => "קבוצה או קטגוריה",
-    "group_by_type"                    => "קבוצה לפי סוג",
-    "hsn"                              => "HSN",
-    "id"                               => "מזהה מכירה",
-    "include_prices"                   => "לכלול מחירים?",
-    "invoice"                          => "חשבונית",
-    "invoice_confirm"                  => "חשבונית זו תישלח אל",
-    "invoice_enable"                   => "צור חשבונית",
-    "invoice_filter"                   => "חשבוניות",
-    "invoice_no_email"                 => "ללקוח זה אין כתובת אימייל חוקית.",
-    "invoice_number"                   => "חשבונית #",
-    "invoice_number_duplicate"         => "מספר החשבונית חייב להיות ייחודי.",
-    "invoice_sent"                     => "חשבונית נשלחה אל",
-    "invoice_total"                    => "סהכ חשבונית",
-    "invoice_type_custom_invoice"      => "חשבונית מותאמת אישית (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "חשבונית מס מותאמת אישית (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "חשבונית (invoice.php)",
-    "invoice_type_tax_invoice"         => "חשבונית מס (tax_invoice.php)",
-    "invoice_unsent"                   => "החשבונית לא נשלחה אל",
-    "invoice_update"                   => "ספירה חוזרת",
-    "item_insufficient_of_stock"       => "הפריט מכיל מלאי נמוך.",
-    "item_name"                        => "שם פריט",
-    "item_number"                      => "פריט #",
-    "item_out_of_stock"                => "הפריט לא במלאי.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "מצב הרשמה",
-    "must_enter_numeric"               => "סכום ההצעה חייב להיות מספר.",
-    "must_enter_numeric_giftcard"      => "מספר כרטיס המתנה חייב להיות מספר.",
-    "new_customer"                     => "לקוח חדש",
-    "new_item"                         => "פריט חדש",
-    "no_description"                   => "אין תיאור",
-    "no_filter"                        => "הכול",
-    "no_items_in_cart"                 => "אין פריטים בעגלה.",
-    "no_sales_to_display"              => "אין מכירות להצגה.",
-    "none_selected"                    => "לא בחרת כל מכירה(ות) למחיקה.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "פעולה זו אינה מורשית.",
-    "one_or_multiple"                  => "מכירה(ות)",
-    "payment"                          => "סוג תשלום",
-    "payment_amount"                   => "סכום",
-    "payment_not_cover_total"          => "סכום התשלום חייב להיות גדול או שווה לסהכ.",
-    "payment_type"                     => "סוג",
-    "payments"                         => "",
-    "payments_total"                   => "סהכ תשלום",
-    "price"                            => "מחיר",
-    "print_after_sale"                 => "הדפס לאחר מכירה",
-    "quantity"                         => "כמות",
-    "quantity_less_than_reorder_level" => "אזהרה: כמות רצויה נמצאת מתחת לרמת ההזמנה עבור פריט זה.",
-    "quantity_less_than_zero"          => "אזהרה: כמות מבוקשת אינה מספיקה. עדיין תוכל לעבד את המכירה, אך בדוק את המלאי שלך.",
-    "quantity_of_items"                => "כמות של {0} פריטים",
-    "quote"                            => "הצעת מחיר",
-    "quote_number"                     => "מספר הצעת מחיר",
-    "quote_number_duplicate"           => "מספר הצעת מחיר חייב להיות ייחודי.",
-    "quote_sent"                       => "הצעת המחיר נשלחה אל",
-    "quote_unsent"                     => "הצעת המחיר לא נשלחה אל",
-    "receipt"                          => "קבלה",
-    "receipt_no_email"                 => "ללקוח זה אין כתובת אימייל חוקית.",
-    "receipt_number"                   => "מכירה #",
-    "receipt_sent"                     => "קבלה נשלחה אל",
-    "receipt_unsent"                   => "קבלה לא נשלחה אל",
-    "refund"                           => "",
-    "register"                         => "קופת מכירות",
-    "remove_customer"                  => "הסר לקוח",
-    "remove_discount"                  => "",
-    "return"                           => "החזרה",
-    "rewards"                          => "נקודות פרס",
-    "rewards_balance"                  => "מאזן נקודות פרס",
-    "sale"                             => "מכירה",
-    "sale_by_invoice"                  => "מכירה לפי חשבונית",
-    "sale_for_customer"                => "לקוח:",
-    "sale_time"                        => "זמן",
-    "sales_tax"                        => "מס מכירה",
-    "sales_total"                      => "",
-    "select_customer"                  => "בחר לקוח",
-    "send_invoice"                     => "שלח חשבונית",
-    "send_quote"                       => "שלח הצעת מחיר",
-    "send_receipt"                     => "שלח קבלה",
-    "send_work_order"                  => "שלח הזמנת עבודה",
-    "serial"                           => "מספר סידורי",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "הצג חשבונית",
-    "show_receipt"                     => "הצג קבלה",
-    "start_typing_customer_name"       => "התחל להקליד פרטי לקוח ...",
-    "start_typing_item_name"           => "התחל להקליד שם פריט או סרוק ברקוד ...",
-    "stock"                            => "מלאי",
-    "stock_location"                   => "מיקום מלאי",
-    "sub_total"                        => "סהכ",
-    "successfully_deleted"             => "נמחק בהצלחה",
-    "successfully_restored"            => "שוחזר בהצלחה",
-    "successfully_suspended_sale"      => "מכירה הושהתה בהצלחה.",
-    "successfully_updated"             => "מכירה עודכנה בהצלחה.",
-    "suspend_sale"                     => "השהה",
-    "suspended_doc_id"                 => "מסמך",
-    "suspended_sale_id"                => "מזהה",
-    "suspended_sales"                  => "הושהו",
-    "table"                            => "טבלה",
-    "takings"                          => "מכירות יומיות",
-    "tax"                              => "מס",
-    "tax_id"                           => "מזהה מס",
-    "tax_invoice"                      => "חשבונית מס",
-    "tax_percent"                      => "מס %",
-    "taxed_ind"                        => "",
-    "total"                            => "סהכ",
-    "total_tax_exclusive"              => "לא כולל מס",
-    "transaction_failed"               => "עסקת המכירה נכשלה.",
-    "unable_to_add_item"               => "הוספת פריט למכירה נכשל",
-    "unsuccessfully_deleted"           => "מחיקת מכירה(ות) נכשלה.",
-    "unsuccessfully_restored"          => "שחזור מכירה(ות) נכשלה.",
-    "unsuccessfully_suspended_sale"    => "השהיית מכירה(ות) נכשלה.",
-    "unsuccessfully_updated"           => "עדכון מכירה נכשל.",
-    "unsuspend"                        => "בטל השהייה",
-    "unsuspend_and_delete"             => "פעולה",
-    "update"                           => "עדכן",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "הזמנת עבודה",
-    "work_order_number"                => "מספר הזמנת עבודה",
-    "work_order_number_duplicate"      => "מספר הזמנת עבודה חייב להיות ייחודי.",
-    "work_order_sent"                  => "הזמנת עבודה נשלחה אל",
-    "work_order_unsent"                => "הזמנת עבודה לא נשלחה אל",
+    'account_number'                    => 'חשבון מס #',
+    'add_payment'                       => 'הוסף תשלום',
+    'amount_due'                        => 'סכום לתשלום',
+    'amount_due_not_covered'            => 'התשלומים אינם מכסים את הסכום לתשלום.',
+    'amount_tendered'                   => 'סכום ההצעה',
+    'authorized_signature'              => 'חתימת מורשה',
+    'cancel_sale'                       => 'בטל',
+    'cash'                              => 'מזומן',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => 'הפקדת מזומן',
+    'cash_filter'                       => 'מזומן',
+    'change_due'                        => 'עודף לתשלום',
+    'change_price'                      => '',
+    'check'                             => 'שק',
+    'check_balance'                     => 'תזכורת שקים',
+    'check_filter'                      => 'שק',
+    'close'                             => '',
+    'comment'                           => 'הערה',
+    'comments'                          => 'הערות',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'הושלם',
+    'confirm_cancel_sale'               => 'האם אתה בטוח שברצונך למחוק את המכירה הזו? כל הפריטים יימחקו.',
+    'confirm_delete'                    => 'האם אתה בטוח שברצונך למחוק את המכירות שנבחרו?',
+    'confirm_restore'                   => 'האם אתה בטוח שברצונך לשחזר את המכירות שנבחרו?',
+    'credit'                            => 'כרטיס אשראי',
+    'credit_deposit'                    => 'הפקדת אשראי',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'שם',
+    'customer_address'                  => 'כתובת',
+    'customer_discount'                 => 'הנחה',
+    'customer_email'                    => 'אימייל',
+    'customer_location'                 => 'מיקום',
+    'customer_mailchimp_status'         => 'מצב Mailchimp',
+    'customer_optional'                 => 'נדרש עבור תשלומים עתידיים (אופציונאלי)',
+    'customer_required'                 => '(נדרש)',
+    'customer_total'                    => 'סהכ',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'נקודות זמינות',
+    'daily_sales'                       => '',
+    'date'                              => 'תאריך המכירה',
+    'date_range'                        => 'טווח תאריכים',
+    'date_required'                     => 'יש להזין תאריך נכון.',
+    'date_type'                         => 'תאריך הוא שדה חובה.',
+    'debit'                             => 'כרטיס חיוב מיידי',
+    'debit_filter'                      => '',
+    'delete'                            => 'אפשר מחיקה',
+    'delete_confirmation'               => 'האם אתה בטוח שברצונך למחוק את המכירה הזו? לא ניתן לבטל פעולה זו.',
+    'delete_entire_sale'                => 'מחק את כל המכירה',
+    'delete_successful'                 => 'המכירה נמחקה בהצלחה.',
+    'delete_unsuccessful'               => 'מחיקת המכירה נכשלה.',
+    'description_abbrv'                 => 'תיאור.',
+    'discard'                           => 'התעלם',
+    'discard_quote'                     => '',
+    'discount'                          => 'תיאור',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% הנחה',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'לתשלום',
+    'due_filter'                        => 'צפוי לתשלום',
+    'edit'                              => 'ערוך',
+    'edit_item'                         => 'ערוך פריט',
+    'edit_sale'                         => 'ערוך מכירה',
+    'email_receipt'                     => 'נמען אימייל',
+    'employee'                          => 'עובד',
+    'entry'                             => 'ערך',
+    'error_editing_item'                => 'שגיאה בעריכת פריט',
+    'find_or_scan_item'                 => 'חיפוש או סריקה של פריט',
+    'find_or_scan_item_or_receipt'      => 'חיפוש או סריקה של פריט או קבלה',
+    'giftcard'                          => 'כרטיס מתנה',
+    'giftcard_balance'                  => 'מאזן כרטיס מתנה',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'מספר כרטיס מתנה',
+    'group_by_category'                 => 'קבוצה או קטגוריה',
+    'group_by_type'                     => 'קבוצה לפי סוג',
+    'hsn'                               => 'HSN',
+    'id'                                => 'מזהה מכירה',
+    'include_prices'                    => 'לכלול מחירים?',
+    'insufficient_giftcard_balance'     => 'יתרת כרטיסי מתנה לא מספקת לתשלום זה.',
+    'insufficient_reward_points'        => 'נקודות חיזוק לא מספקות לתשלום זה.',
+    'invoice'                           => 'חשבונית',
+    'invoice_confirm'                   => 'חשבונית זו תישלח אל',
+    'invoice_enable'                    => 'צור חשבונית',
+    'invoice_filter'                    => 'חשבוניות',
+    'invoice_no_email'                  => 'ללקוח זה אין כתובת אימייל חוקית.',
+    'invoice_number'                    => 'חשבונית #',
+    'invoice_number_duplicate'          => 'מספר החשבונית חייב להיות ייחודי.',
+    'invoice_sent'                      => 'חשבונית נשלחה אל',
+    'invoice_total'                     => 'סהכ חשבונית',
+    'invoice_type_custom_invoice'       => 'חשבונית מותאמת אישית (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'חשבונית מס מותאמת אישית (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'חשבונית (invoice.php)',
+    'invoice_type_tax_invoice'          => 'חשבונית מס (tax_invoice.php)',
+    'invoice_unsent'                    => 'החשבונית לא נשלחה אל',
+    'invoice_update'                    => 'ספירה חוזרת',
+    'item_insufficient_of_stock'        => 'הפריט מכיל מלאי נמוך.',
+    'item_name'                         => 'שם פריט',
+    'item_number'                       => 'פריט #',
+    'item_out_of_stock'                 => 'הפריט לא במלאי.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'מצב הרשמה',
+    'must_enter_numeric'                => 'סכום ההצעה חייב להיות מספר.',
+    'must_enter_numeric_giftcard'       => 'מספר כרטיס המתנה חייב להיות מספר.',
+    'must_enter_reference_code'         => 'יש להזין מספר אסמכתא/אחזור.',
+    'negative_amount_tendered'          => 'סכום ההצעה לא יכול להיות שלילי.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'לקוח חדש',
+    'new_item'                          => 'פריט חדש',
+    'no_description'                    => 'אין תיאור',
+    'no_filter'                         => 'הכול',
+    'no_items_in_cart'                  => 'אין פריטים בעגלה.',
+    'no_sales_to_display'               => 'אין מכירות להצגה.',
+    'none_selected'                     => 'לא בחרת כל מכירה(ות) למחיקה.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'פעולה זו אינה מורשית.',
+    'one_or_multiple'                   => 'מכירה(ות)',
+    'payment'                           => 'סוג תשלום',
+    'payment_amount'                    => 'סכום',
+    'payment_not_cover_total'           => 'סכום התשלום חייב להיות גדול או שווה לסהכ.',
+    'payment_type'                      => 'סוג',
+    'payments'                          => '',
+    'payments_total'                    => 'סהכ תשלום',
+    'price'                             => 'מחיר',
+    'print_after_sale'                  => 'הדפס לאחר מכירה',
+    'quantity'                          => 'כמות',
+    'quantity_less_than_reorder_level'  => 'אזהרה: כמות רצויה נמצאת מתחת לרמת ההזמנה עבור פריט זה.',
+    'quantity_less_than_zero'           => 'אזהרה: כמות מבוקשת אינה מספיקה. עדיין תוכל לעבד את המכירה, אך בדוק את המלאי שלך.',
+    'quantity_of_items'                 => 'כמות של {0} פריטים',
+    'quote'                             => 'הצעת מחיר',
+    'quote_number'                      => 'מספר הצעת מחיר',
+    'quote_number_duplicate'            => 'מספר הצעת מחיר חייב להיות ייחודי.',
+    'quote_sent'                        => 'הצעת המחיר נשלחה אל',
+    'quote_unsent'                      => 'הצעת המחיר לא נשלחה אל',
+    'receipt'                           => 'קבלה',
+    'receipt_no_email'                  => 'ללקוח זה אין כתובת אימייל חוקית.',
+    'receipt_number'                    => 'מכירה #',
+    'receipt_sent'                      => 'קבלה נשלחה אל',
+    'receipt_unsent'                    => 'קבלה לא נשלחה אל',
+    'reference_code'                    => 'קוד אסמכתא לתשלום',
+    'reference_code_invalid_characters' => 'קוד האסמכתא חייב להכיל רק אותיות ומספרים.',
+    'reference_code_length_error'       => 'אורך קוד האסמכתא אינו תקין.',
+    'refund'                            => '',
+    'register'                          => 'קופת מכירות',
+    'remove_customer'                   => 'הסר לקוח',
+    'remove_discount'                   => '',
+    'return'                            => 'החזרה',
+    'rewards'                           => 'נקודות פרס',
+    'rewards_balance'                   => 'מאזן נקודות פרס',
+    'rewards_package'                   => 'פרסים',
+    'rewards_remaining_balance'         => 'נקודות הפרס הנותרות הן ',
+    'sale'                              => 'מכירה',
+    'sale_by_invoice'                   => 'מכירה לפי חשבונית',
+    'sale_for_customer'                 => 'לקוח:',
+    'sale_time'                         => 'זמן',
+    'sales_tax'                         => 'מס מכירה',
+    'sales_total'                       => '',
+    'select_customer'                   => 'בחר לקוח',
+    'send_invoice'                      => 'שלח חשבונית',
+    'send_quote'                        => 'שלח הצעת מחיר',
+    'send_receipt'                      => 'שלח קבלה',
+    'send_work_order'                   => 'שלח הזמנת עבודה',
+    'serial'                            => 'מספר סידורי',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'הצג חשבונית',
+    'show_receipt'                      => 'הצג קבלה',
+    'start_typing_customer_name'        => 'התחל להקליד פרטי לקוח ...',
+    'start_typing_item_name'            => 'התחל להקליד שם פריט או סרוק ברקוד ...',
+    'stock'                             => 'מלאי',
+    'stock_location'                    => 'מיקום מלאי',
+    'sub_total'                         => 'סהכ',
+    'successfully_deleted'              => 'נמחק בהצלחה',
+    'successfully_restored'             => 'שוחזר בהצלחה',
+    'successfully_suspended_sale'       => 'מכירה הושהתה בהצלחה.',
+    'successfully_updated'              => 'מכירה עודכנה בהצלחה.',
+    'suspend_sale'                      => 'השהה',
+    'suspended_doc_id'                  => 'מסמך',
+    'suspended_sale_id'                 => 'מזהה',
+    'suspended_sales'                   => 'הושהו',
+    'table'                             => 'טבלה',
+    'takings'                           => 'מכירות יומיות',
+    'tax'                               => 'מס',
+    'tax_id'                            => 'מזהה מס',
+    'tax_invoice'                       => 'חשבונית מס',
+    'tax_percent'                       => 'מס %',
+    'taxed_ind'                         => '',
+    'total'                             => 'סהכ',
+    'total_tax_exclusive'               => 'לא כולל מס',
+    'transaction_failed'                => 'עסקת המכירה נכשלה.',
+    'unable_to_add_item'                => 'הוספת פריט למכירה נכשל',
+    'unsuccessfully_deleted'            => 'מחיקת מכירה(ות) נכשלה.',
+    'unsuccessfully_restored'           => 'שחזור מכירה(ות) נכשלה.',
+    'unsuccessfully_suspended_sale'     => 'השהיית מכירה(ות) נכשלה.',
+    'unsuccessfully_updated'            => 'עדכון מכירה נכשל.',
+    'unsuspend'                         => 'בטל השהייה',
+    'unsuspend_and_delete'              => 'פעולה',
+    'update'                            => 'עדכן',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'הזמנת עבודה',
+    'work_order_number'                 => 'מספר הזמנת עבודה',
+    'work_order_number_duplicate'       => 'מספר הזמנת עבודה חייב להיות ייחודי.',
+    'work_order_sent'                   => 'הזמנת עבודה נשלחה אל',
+    'work_order_unsent'                 => 'הזמנת עבודה לא נשלחה אל',
 ];
diff --git a/app/Language/hr-HR/Attributes.php b/app/Language/hr-HR/Attributes.php
index 093e018ab..a328dd205 100644
--- a/app/Language/hr-HR/Attributes.php
+++ b/app/Language/hr-HR/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "definition_cannot_be_deleted"     => "",
-    "definition_error_adding_updating" => "",
-    "definition_flags"                 => "",
-    "definition_group"                 => "",
-    "definition_id"                    => "",
-    "definition_name"                  => "",
-    "definition_name_required"         => "",
-    "definition_one_or_multiple"       => "",
-    "definition_successful_adding"     => "",
-    "definition_successful_deleted"    => "",
-    "definition_successful_updating"   => "",
-    "definition_type"                  => "",
-    "definition_type_required"         => "",
-    "definition_unit"                  => "",
-    "definition_values"                => "",
-    "new"                              => "",
-    "no_attributes_to_display"         => "",
-    "receipt_visibility"               => "",
-    "show_in_items"                    => "",
-    "show_in_items_visibility"         => "",
-    "show_in_receipt"                  => "",
-    "show_in_receivings"               => "",
-    "show_in_receivings_visibility"    => "",
-    "show_in_sales"                    => "",
-    "show_in_sales_visibility"         => "",
-    "update"                           => "",
+    'attribute_value_invalid_chars'    => '',
+    'confirm_delete'                   => '',
+    'confirm_restore'                  => '',
+    'definition_cannot_be_deleted'     => '',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => '',
+    'definition_flags'                 => '',
+    'definition_group'                 => '',
+    'definition_id'                    => '',
+    'definition_name'                  => '',
+    'definition_name_required'         => '',
+    'definition_one_or_multiple'       => '',
+    'definition_successful_adding'     => '',
+    'definition_successful_deleted'    => '',
+    'definition_successful_updating'   => '',
+    'definition_type'                  => '',
+    'definition_type_required'         => '',
+    'definition_unit'                  => '',
+    'definition_values'                => '',
+    'new'                              => '',
+    'no_attributes_to_display'         => '',
+    'receipt_visibility'               => '',
+    'show_in_items'                    => '',
+    'show_in_items_visibility'         => '',
+    'show_in_receipt'                  => '',
+    'show_in_receivings'               => '',
+    'show_in_receivings_visibility'    => '',
+    'show_in_sales'                    => '',
+    'show_in_sales_visibility'         => '',
+    'show_in_search'                   => 'Prikaži u pretrazi',
+    'show_in_search_visibility'        => 'Pretraga',
+    'update'                           => '',
 ];
diff --git a/app/Language/hr-HR/Bootstrap_tables.php b/app/Language/hr-HR/Bootstrap_tables.php
index a7cfcb176..e0cdd3928 100644
--- a/app/Language/hr-HR/Bootstrap_tables.php
+++ b/app/Language/hr-HR/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Sve",
-    "columns"              => "Kolone",
-    "hide_show_pagination" => "Prikaži/sakrij stranice",
-    "loading"              => "Molimo pričekajte ...",
-    "page_from_to"         => "Prikazujem {0}. - {1} od ukupnog broja zapisa {2}",
-    "refresh"              => "Osvježi",
-    "rows_per_page"        => "{0} broj zapisa po stranici",
-    "toggle"               => "Promijeni prikaz",
+    'all' => "Sve",
+    'columns' => "Kolone",
+    'hide_show_pagination' => "Prikaži/sakrij stranice",
+    'loading' => "Molimo pričekajte",
+    'page_from_to' => "Prikazujem {0}. - {1} od ukupnog broja zapisa {2}",
+    'refresh' => "Osvježi",
+    'rows_per_page' => "{0} broj zapisa po stranici",
+    'toggle' => "Promijeni prikaz",
 ];
diff --git a/app/Language/hr-HR/Config.php b/app/Language/hr-HR/Config.php
index 37fca7ea8..5cd2ee098 100644
--- a/app/Language/hr-HR/Config.php
+++ b/app/Language/hr-HR/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adresa tvrtke",
-    "address_required"                          => "Adresu tvrtke je potrebno unijeti",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Arhiva",
-    "backup_database"                           => "Arhiviranje baze",
-    "barcode"                                   => "Barkoda",
-    "barcode_company"                           => "Naziv tvrtke",
-    "barcode_configuration"                     => "Konfiguracija barkoda",
-    "barcode_content"                           => "Sadržaj barkoda",
-    "barcode_first_row"                         => "1 red",
-    "barcode_font"                              => "Pismo",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "Generiraj ako je prazno",
-    "barcode_height"                            => "Visina(px)",
-    "barcode_id"                                => "ID artikla",
-    "barcode_info"                              => "Informacija o barkod-ovima",
-    "barcode_layout"                            => "Postavke barkod-a",
-    "barcode_name"                              => "Naziv",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Red.br.",
-    "barcode_page_cellspacing"                  => "Stranični prostor",
-    "barcode_page_width"                        => "Širina stranice",
-    "barcode_price"                             => "Cijena",
-    "barcode_second_row"                        => "2.red",
-    "barcode_third_row"                         => "3.red",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "Tip barkod-a",
-    "barcode_width"                             => "Širina (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Naziv tvrtke",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Promijeni logo",
-    "company_logo"                              => "Logo tvrtke",
-    "company_remove_image"                      => "Ukloni logo",
-    "company_required"                          => "Polje naziv tvrtke je potreban",
-    "company_select_image"                      => "Odaberi logo",
-    "company_website_url"                       => "Adresa web stranice nije valjana (http://...)",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "Velutne decimale",
-    "currency_symbol"                           => "Valutna oznaka",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "Oblik datuma i vremena",
-    "decimal_point"                             => "Decimalna točka",
-    "default_barcode_font_size_number"          => "Veličina pisma barkod-a mora biti broj",
-    "default_barcode_font_size_required"        => "Veličina pisma je potrebna",
-    "default_barcode_height_number"             => "Veličina barkod-a mora biti broj",
-    "default_barcode_height_required"           => "Veličina barkod-a je potrebna",
-    "default_barcode_num_in_row_number"         => "Broj u redu barkod-a mora biti broj",
-    "default_barcode_num_in_row_required"       => "Broj u redu barkod-a je potreban",
-    "default_barcode_page_cellspacing_number"   => "Razmak barkod-a mora biti broj",
-    "default_barcode_page_cellspacing_required" => "Vonalkód cellatávolság kötelező mező.",
-    "default_barcode_page_width_number"         => "Širina stranice barkod-a mora biti broj",
-    "default_barcode_page_width_required"       => "Širina stranice barkod-a je potrebna",
-    "default_barcode_width_number"              => "Az alapértelmezett vonalkód szélességnek számnak kell lennie",
-    "default_barcode_width_required"            => "Širina barkod-a mora bit broj",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "Zadani popust %",
-    "default_sales_discount_number"             => "Zadani popust mora biti broj",
-    "default_sales_discount_required"           => "Zadani popust je potreban",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "Naziv poreza je poteban",
-    "default_tax_rate"                          => "Porez %",
-    "default_tax_rate_1"                        => "Porez 1 %",
-    "default_tax_rate_2"                        => "Porez 2 %",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Zadani porez mora biti broj",
-    "default_tax_rate_required"                 => "Zadani porez je potreban",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "Opća",
-    "general_configuration"                     => "Opća konfiguracija",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "Info",
-    "info_configuration"                        => "Info o web trgovini",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "Račun",
-    "invoice_configuration"                     => "Postavke štamapnja",
-    "invoice_default_comments"                  => "Komentar na računu",
-    "invoice_email_message"                     => "e-mail za račun",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Printer za račun",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Upozorenje! Onemogućene opcije će raditi samo ako imate instaliran FireFox jsPrintSetup dodatak. Svakako snimiti?",
-    "language"                                  => "Jezik",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "Linija po stranici",
-    "lines_per_page_number"                     => "Linija po stranici mora biti broj",
-    "lines_per_page_required"                   => "Broj linija po stranici je potreban podatak",
-    "locale"                                    => "Lokacija",
-    "locale_configuration"                      => "Konfiguracija",
-    "locale_info"                               => "Informacije o lokalnoj konfiguraciji",
-    "location"                                  => "Skladišta",
-    "location_configuration"                    => "Mjesto skladišta",
-    "location_info"                             => "Info o lokaciji skladišta",
-    "login_form"                                => "",
-    "logout"                                    => "Želite napraviti arhivu prije nego izađete? Pritisnite [OK] za arhivu, [Cancel] to otkazivanje.",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here. Otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Format broja",
-    "number_locale"                             => "Lokalnoj",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a sensible value",
-    "number_locale_required"                    => "Number Locale is a required field",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Telefon tvrtke",
-    "phone_required"                            => "Telefon tvrtke je potreban",
-    "print_bottom_margin"                       => "Doljnja margina",
-    "print_bottom_margin_number"                => "Doljnja margina mora biti broj",
-    "print_bottom_margin_required"              => "Doljnja margina je potrebna",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "Prikazati podnožje u pregledniku",
-    "print_header"                              => "Prikazati zaglavlje u pregledniku",
-    "print_left_margin"                         => "Lijeva margina",
-    "print_left_margin_number"                  => "Lijeva margina mora biti broj",
-    "print_left_margin_required"                => "Lijeva margina je obavezna",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "Desna margina",
-    "print_right_margin_number"                 => "Desna margina mora biti broj",
-    "print_right_margin_required"               => "Desna margina je potrebna",
-    "print_silently"                            => "Pokaži okvir za štampanje",
-    "print_top_margin"                          => "Gornja margina",
-    "print_top_margin_number"                   => "Gornja margina mora biti broj",
-    "print_top_margin_required"                 => "Gornja margina je obavezna",
-    "quantity_decimals"                         => "Decimalne količine",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "Priznanica",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Postavke štamapnja",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "Informacije o POS računu",
-    "receipt_printer"                           => "POS printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "Prikaži porez",
-    "receipt_show_total_discount"               => "Pokaži ukupni popust",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Računaj prosječnu cijenu (primke)",
-    "recv_invoice_format"                       => "Oblik ulaznog računa(primke)",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Polje za povratne obavijesti je potrebno",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Oblik fakture",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "Konfiguracija je uspješno snimljena",
-    "saved_unsuccessfully"                      => "Konfiguracija nije uspješno snimljena",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "Send statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes",
-    "stock_location"                            => "Lokacija skladišta",
-    "stock_location_duplicate"                  => "Molim koristite jedinstveni naziv skladišta",
-    "stock_location_invalid_chars"              => "Naziv skaldišta ne može sadržavati '_'",
-    "stock_location_required"                   => "Naziv skladišta je potreban",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "Printer za 'Prodano'",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "Porezne decimale",
-    "tax_id"                                    => "",
-    "tax_included"                              => "Uključuje porez",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Razdjelnik za tisućice",
-    "timezone"                                  => "Vremenska zona",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "web strana",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => 'Adresa tvrtke',
+    'address_required'                          => 'Adresu tvrtke je potrebno unijeti',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Arhiva',
+    'backup_database'                           => 'Arhiviranje baze',
+    'barcode'                                   => 'Barkoda',
+    'barcode_company'                           => 'Naziv tvrtke',
+    'barcode_configuration'                     => 'Konfiguracija barkoda',
+    'barcode_content'                           => 'Sadržaj barkoda',
+    'barcode_first_row'                         => '1 red',
+    'barcode_font'                              => 'Pismo',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => 'Generiraj ako je prazno',
+    'barcode_height'                            => 'Visina(px)',
+    'barcode_id'                                => 'ID artikla',
+    'barcode_info'                              => 'Informacija o barkod-ovima',
+    'barcode_layout'                            => 'Postavke barkod-a',
+    'barcode_name'                              => 'Naziv',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Red.br.',
+    'barcode_page_cellspacing'                  => 'Stranični prostor',
+    'barcode_page_width'                        => 'Širina stranice',
+    'barcode_price'                             => 'Cijena',
+    'barcode_second_row'                        => '2.red',
+    'barcode_third_row'                         => '3.red',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => 'Tip barkod-a',
+    'barcode_width'                             => 'Širina (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Center',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => 'Naziv tvrtke',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Promijeni logo',
+    'company_logo'                              => 'Logo tvrtke',
+    'company_remove_image'                      => 'Ukloni logo',
+    'company_required'                          => 'Polje naziv tvrtke je potreban',
+    'company_select_image'                      => 'Odaberi logo',
+    'company_website_url'                       => 'Adresa web stranice nije valjana (http://...)',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => '',
+    'currency_decimals'                         => 'Velutne decimale',
+    'currency_symbol'                           => 'Valutna oznaka',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => 'Oblik datuma i vremena',
+    'decimal_point'                             => 'Decimalna točka',
+    'default_barcode_font_size_number'          => 'Veličina pisma barkod-a mora biti broj',
+    'default_barcode_font_size_required'        => 'Veličina pisma je potrebna',
+    'default_barcode_height_number'             => 'Veličina barkod-a mora biti broj',
+    'default_barcode_height_required'           => 'Veličina barkod-a je potrebna',
+    'default_barcode_num_in_row_number'         => 'Broj u redu barkod-a mora biti broj',
+    'default_barcode_num_in_row_required'       => 'Broj u redu barkod-a je potreban',
+    'default_barcode_page_cellspacing_number'   => 'Razmak barkod-a mora biti broj',
+    'default_barcode_page_cellspacing_required' => 'Vonalkód cellatávolság kötelező mező.',
+    'default_barcode_page_width_number'         => 'Širina stranice barkod-a mora biti broj',
+    'default_barcode_page_width_required'       => 'Širina stranice barkod-a je potrebna',
+    'default_barcode_width_number'              => 'Az alapértelmezett vonalkód szélességnek számnak kell lennie',
+    'default_barcode_width_required'            => 'Širina barkod-a mora bit broj',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => 'Zadani popust %',
+    'default_sales_discount_number'             => 'Zadani popust mora biti broj',
+    'default_sales_discount_required'           => 'Zadani popust je potreban',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => 'Naziv poreza je poteban',
+    'default_tax_rate'                          => 'Porez %',
+    'default_tax_rate_1'                        => 'Porez 1 %',
+    'default_tax_rate_2'                        => 'Porez 2 %',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Zadani porez mora biti broj',
+    'default_tax_rate_required'                 => 'Zadani porez je potreban',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => 'dot',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => 'Opća',
+    'general_configuration'                     => 'Opća konfiguracija',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => 'Info',
+    'info_configuration'                        => 'Info o web trgovini',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => 'Račun',
+    'invoice_configuration'                     => 'Postavke štamapnja',
+    'invoice_default_comments'                  => 'Komentar na računu',
+    'invoice_email_message'                     => 'e-mail za račun',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Printer za račun',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Upozorenje! Onemogućene opcije će raditi samo ako imate instaliran FireFox jsPrintSetup dodatak. Svakako snimiti?',
+    'language'                                  => 'Jezik',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => 'Linija po stranici',
+    'lines_per_page_number'                     => 'Linija po stranici mora biti broj',
+    'lines_per_page_required'                   => 'Broj linija po stranici je potreban podatak',
+    'locale'                                    => 'Lokacija',
+    'locale_configuration'                      => 'Konfiguracija',
+    'locale_info'                               => 'Informacije o lokalnoj konfiguraciji',
+    'location'                                  => 'Skladišta',
+    'location_configuration'                    => 'Mjesto skladišta',
+    'location_info'                             => 'Info o lokaciji skladišta',
+    'login_form'                                => '',
+    'logout'                                    => 'Želite napraviti arhivu prije nego izađete? Pritisnite [OK] za arhivu, [Cancel] to otkazivanje.',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here. Otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Format broja',
+    'number_locale'                             => 'Lokalnoj',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a sensible value',
+    'number_locale_required'                    => 'Number Locale is a required field',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Referentni kod plaćanja<br>Ograničenja duljine',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Telefon tvrtke',
+    'phone_required'                            => 'Telefon tvrtke je potreban',
+    'print_bottom_margin'                       => 'Doljnja margina',
+    'print_bottom_margin_number'                => 'Doljnja margina mora biti broj',
+    'print_bottom_margin_required'              => 'Doljnja margina je potrebna',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Prikazati podnožje u pregledniku',
+    'print_header'                              => 'Prikazati zaglavlje u pregledniku',
+    'print_left_margin'                         => 'Lijeva margina',
+    'print_left_margin_number'                  => 'Lijeva margina mora biti broj',
+    'print_left_margin_required'                => 'Lijeva margina je obavezna',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => 'Desna margina',
+    'print_right_margin_number'                 => 'Desna margina mora biti broj',
+    'print_right_margin_required'               => 'Desna margina je potrebna',
+    'print_silently'                            => 'Pokaži okvir za štampanje',
+    'print_top_margin'                          => 'Gornja margina',
+    'print_top_margin_number'                   => 'Gornja margina mora biti broj',
+    'print_top_margin_required'                 => 'Gornja margina je obavezna',
+    'quantity_decimals'                         => 'Decimalne količine',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => 'Priznanica',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Postavke štamapnja',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => 'Informacije o POS računu',
+    'receipt_printer'                           => 'POS printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'Prikaži porez',
+    'receipt_show_total_discount'               => 'Pokaži ukupni popust',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Računaj prosječnu cijenu (primke)',
+    'recv_invoice_format'                       => 'Oblik ulaznog računa(primke)',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Polje za povratne obavijesti je potrebno',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Oblik fakture',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Nevažeća sendmail putanja. Dopuštena su samo slova, brojevi, crtice, podvlake, kose crte, obrnute kose crte, dvotočke, razmaci i točke.',
+    'saved_successfully'                        => 'Konfiguracija je uspješno snimljena',
+    'saved_unsuccessfully'                      => 'Konfiguracija nije uspješno snimljena',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => 'Send statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes',
+    'stock_location'                            => 'Lokacija skladišta',
+    'stock_location_duplicate'                  => 'Molim koristite jedinstveni naziv skladišta',
+    'stock_location_invalid_chars'              => "Naziv skaldišta ne može sadržavati '_'",
+    'stock_location_required'                   => 'Naziv skladišta je potreban',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => "Printer za 'Prodano'",
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => 'Porezne decimale',
+    'tax_id'                                    => '',
+    'tax_included'                              => 'Uključuje porez',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Razdjelnik za tisućice',
+    'timezone'                                  => 'Vremenska zona',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => 'web strana',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/hr-HR/Employees.php b/app/Language/hr-HR/Employees.php
index ce4143648..c33f24696 100644
--- a/app/Language/hr-HR/Employees.php
+++ b/app/Language/hr-HR/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informacije",
-    "cannot_be_deleted"            => "Ne možete obristi odabranog radnika, jedan ili više radnika ima prodaju ili pokušavate obristi sebe :)",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Jeste li ste sigurni da želite obristi odabranog radnika?",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "Radnik",
-    "error_adding_updating"        => "Greška kod dodavanja/ažuriranja radnika",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Ne možete obrisati demo admin korisnika",
-    "error_updating_demo_admin"    => "Ne možete promijeniti demo admin korisnika",
-    "language"                     => "",
-    "login_info"                   => "Prijava",
-    "manager"                      => "",
-    "new"                          => "Novi radnik",
-    "none_selected"                => "Nije odabran niti jedan radnik za brisanje",
-    "one_or_multiple"              => "Radnik(ci)",
-    "password"                     => "Lozinka",
-    "password_minlength"           => "Lozinka mora imati najmanje 8 znakova",
-    "password_must_match"          => "Lozinka se ne podudara",
-    "password_not_must_match"      => "",
-    "password_required"            => "Lozinka je potrebna",
-    "permission_desc"              => "Odaberite module za dozvolu",
-    "permission_info"              => "Dozvole",
-    "repeat_password"              => "Ponovite lozinku",
-    "subpermission_required"       => "Odaberite barem jednu dozvolu po modulu",
-    "successful_adding"            => "Uspješno ste dodali radnika",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "Uspješno ste obrisali radnika",
-    "successful_updating"          => "Uspješno ste ažurirali radnika",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "Ažuriraj radnika",
-    "username"                     => "Korisničko ime",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Korisničko ime mora imati najmanje 5 znakova",
-    "username_required"            => "Korisničko ime je potrebno",
+    'administrator'                          => '',
+    'basic_information'                      => 'Informacije',
+    'cannot_be_deleted'                      => 'Ne možete obristi odabranog radnika, jedan ili više radnika ima prodaju ili pokušavate obristi sebe :)',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Jeste li ste sigurni da želite obristi odabranog radnika?',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => 'Radnik',
+    'error_adding_updating'                  => 'Greška kod dodavanja/ažuriranja radnika',
+    'error_cannot_remove_own_minimum_grant'  => 'Ne možete ukloniti vlastite minimalne dozvole pristupa modulima.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Ne možete obrisati demo admin korisnika',
+    'error_grant_change_disallowed'          => 'Promene dozvola su onemogućene u ovoj demo verziji.',
+    'error_password_change_disallowed'       => 'Promene lozinke su onemogućene u ovoj demo verziji.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Ne možete promijeniti demo admin korisnika',
+    'language'                               => '',
+    'login_info'                             => 'Prijava',
+    'manager'                                => '',
+    'new'                                    => 'Novi radnik',
+    'none_selected'                          => 'Nije odabran niti jedan radnik za brisanje',
+    'one_or_multiple'                        => 'Radnik(ci)',
+    'password'                               => 'Lozinka',
+    'password_minlength'                     => 'Lozinka mora imati najmanje 8 znakova',
+    'password_must_match'                    => 'Lozinka se ne podudara',
+    'password_not_must_match'                => '',
+    'password_required'                      => 'Lozinka je potrebna',
+    'permission_desc'                        => 'Odaberite module za dozvolu',
+    'permission_info'                        => 'Dozvole',
+    'repeat_password'                        => 'Ponovite lozinku',
+    'subpermission_required'                 => 'Odaberite barem jednu dozvolu po modulu',
+    'successful_adding'                      => 'Uspješno ste dodali radnika',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => 'Uspješno ste obrisali radnika',
+    'successful_updating'                    => 'Uspješno ste ažurirali radnika',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => 'Ažuriraj radnika',
+    'username'                               => 'Korisničko ime',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Korisničko ime mora imati najmanje 5 znakova',
+    'username_required'                      => 'Korisničko ime je potrebno',
 ];
diff --git a/app/Language/hr-HR/Error.php b/app/Language/hr-HR/Error.php
index 8cd38c12d..7485cce0d 100644
--- a/app/Language/hr-HR/Error.php
+++ b/app/Language/hr-HR/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Nemate dozvolu za pristup modulu",
-    "unknown"              => "ismeretlen",
+    'no_permission_module'           => 'Nemate dozvolu za pristup modulu',
+    'unable_to_create_env_file'      => 'Nije moguće izraditi {filePath} za postavljanje throttle.key',
+    'unable_to_lock_file'            => 'Nije moguće zaključati {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Nije moguće otvoriti {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Nije moguće trajno spremiti throttle.key u {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Nije moguće pročitati {filePath} za postavljanje throttle.key',
+    'unknown'                        => 'Neočekivana pogreška',
 ];
diff --git a/app/Language/hr-HR/Items.php b/app/Language/hr-HR/Items.php
index fff939ecb..a8a64efb7 100644
--- a/app/Language/hr-HR/Items.php
+++ b/app/Language/hr-HR/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Dodavanje/skidanje s inventure",
-    "allow_alt_description"              => "Dozvoli Alt opis",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "Zajedno uređenje",
-    "buy_price_required"                 => "Prodajna cijena je potrebna",
-    "cannot_be_deleted"                  => "Nemožete obrisati odabranu stavku, jedna ili više odabranih stavki ima prodaju.",
-    "cannot_find_item"                   => "Nema informacije o odabranoj stavci",
-    "categories"                         => "",
-    "category"                           => "Kategorija",
-    "category_new"                       => "",
-    "category_required"                  => "Kategorija je potrebna",
-    "change_all_to_allow_alt_desc"       => "Dozvali Alt opis za sve",
-    "change_all_to_not_allow_allow_desc" => "Nije dozvoljen Alt opis za sve",
-    "change_all_to_serialized"           => "Promijeni sve u serijske brojeve",
-    "change_all_to_unserialized"         => "ukloni sve serijske brojeve",
-    "change_image"                       => "Promjeni sliku",
-    "confirm_bulk_edit"                  => "Jeste li sigurni da želite urediti odabrane stavke?",
-    "confirm_bulk_edit_wipe_taxes"       => "Sve stavke poreznih informacija bit će zamijenjene",
-    "confirm_delete"                     => "Jeste li sigrni da želite obrisati odabrane stavke?",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "Nabavna cijena",
-    "cost_price_number"                  => "Nabavna cijena mora biti broj",
-    "cost_price_required"                => "Nabavna cijena je potrebna",
-    "count"                              => "Ažuriraj inveturu",
-    "csv_import_failed"                  => "Greška kod uvoza iz CSV-a",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Your uploaded file has no data or wrong format",
-    "csv_import_partially_failed"        => "Most Items imported. But some were not, here is the list",
-    "csv_import_success"                 => "Import of Items successful",
-    "current_quantity"                   => "Trenutna količina",
-    "default_pack_name"                  => "",
-    "description"                        => "Opis",
-    "details_count"                      => "Pojedinosati o količinama inventure",
-    "do_nothing"                         => "Ne radi ništa",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Uredi polja koja želite urediti za sve odabrane stavke",
-    "edit_multiple_items"                => "Uredi višestruke stavke",
-    "empty_upc_items"                    => "UPC artikal",
-    "error_adding_updating"              => "Greška kod dodavanja/ažuriranja stavke",
-    "error_updating_multiple"            => "Greška kod ažuriranja stavki",
-    "generate_barcodes"                  => "Generiraj barkod",
-    "hsn_code"                           => "",
-    "image"                              => "Slika",
-    "import_items_csv"                   => "Uvezi stavke iz CSV-a",
-    "info_provided_by"                   => "Info daje",
-    "inventory"                          => "Inventura",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Komentari",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "Obrisano",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Artikal ima ser. broj",
-    "item"                               => "Stavka",
-    "item_id"                            => "",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "Broj stavke već postoji u bazi",
-    "kit"                                => "",
-    "location"                           => "Mjesto",
-    "low_inventory_items"                => "Rasprodaja artikala",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "Ručno uređivanje količine",
-    "markup"                             => "",
-    "name"                               => "Naziv artikla",
-    "name_required"                      => "Naziv artikla je potreban",
-    "new"                                => "Novi artikal",
-    "no_description_items"               => "Artikal nema opisa",
-    "no_items_to_display"                => "Nema artikla za prikazati",
-    "none"                               => "Egysem",
-    "none_selected"                      => "Niste odabrali nijedan artikal za uređivanje",
-    "nonstock"                           => "",
-    "number_information"                 => "Redni broj",
-    "number_required"                    => "UPC/EAN/ISBN je potreban",
-    "one_or_multiple"                    => "Artikal(i)",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "Količina",
-    "quantity_number"                    => "Količina mora biti broj",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "Zaprimljena količina",
-    "remove_image"                       => "Ukloni sliku",
-    "reorder_level"                      => "Poredaj razine",
-    "reorder_level_number"               => "Numeracija mora biti numerička",
-    "reorder_level_required"             => "Numeracija je obavezna",
-    "retrive_item_info"                  => "Info o zaprimljenom artiklu",
-    "sales_tax_1"                        => "Prodajni porez 1",
-    "sales_tax_2"                        => "Prodajni porez 2",
-    "search_attributes"                  => "Polje za pretragu",
-    "select_image"                       => "Odaberi sliku",
-    "serialized_items"                   => "Artikl ima ser. broj",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "Mjesto skladišta",
-    "stock_type"                         => "",
-    "successful_adding"                  => "Uspješno ste dodali artikal",
-    "successful_bulk_edit"               => "Uspješno ste ažurirali odabrane stavke",
-    "successful_deleted"                 => "Uspješno ste obrisali artikl",
-    "successful_updating"                => "Uspješno ste ažurirali artikl",
-    "supplier"                           => "Dobavljač",
-    "tax_1"                              => "Porez 1",
-    "tax_2"                              => "Porez 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "% poreza",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "% poreza je obavezan",
-    "tax_percents"                       => "%-ci poreza",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "Maloprodajna cijena",
-    "unit_price_number"                  => "Maloprodajna cijena mora biti broj",
-    "unit_price_required"                => "Maloprodajna cijena je obavezna",
-    "upc_database"                       => "UPC baza",
-    "update"                             => "Ažuriraj artikl",
-    "use_inventory_menu"                 => "Koristi inv. meni",
+    'add_minus'                          => 'Dodavanje/skidanje s inventure',
+    'allow_alt_description'              => 'Dozvoli Alt opis',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => 'Zajedno uređenje',
+    'buy_price_required'                 => 'Prodajna cijena je potrebna',
+    'cannot_be_deleted'                  => 'Nemožete obrisati odabranu stavku, jedna ili više odabranih stavki ima prodaju.',
+    'cannot_find_item'                   => 'Nema informacije o odabranoj stavci',
+    'categories'                         => '',
+    'category'                           => 'Kategorija',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategorija je potrebna',
+    'change_all_to_allow_alt_desc'       => 'Dozvali Alt opis za sve',
+    'change_all_to_not_allow_allow_desc' => 'Nije dozvoljen Alt opis za sve',
+    'change_all_to_serialized'           => 'Promijeni sve u serijske brojeve',
+    'change_all_to_unserialized'         => 'ukloni sve serijske brojeve',
+    'change_image'                       => 'Promjeni sliku',
+    'confirm_bulk_edit'                  => 'Jeste li sigurni da želite urediti odabrane stavke?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Sve stavke poreznih informacija bit će zamijenjene',
+    'confirm_delete'                     => 'Jeste li sigrni da želite obrisati odabrane stavke?',
+    'confirm_restore'                    => '',
+    'cost_price'                         => 'Nabavna cijena',
+    'cost_price_number'                  => 'Nabavna cijena mora biti broj',
+    'cost_price_required'                => 'Nabavna cijena je potrebna',
+    'count'                              => 'Ažuriraj inveturu',
+    'csv_import_failed'                  => 'Greška kod uvoza iz CSV-a',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Your uploaded file has no data or wrong format',
+    'csv_import_partially_failed'        => 'Most Items imported. But some were not, here is the list',
+    'csv_import_success'                 => 'Import of Items successful',
+    'current_quantity'                   => 'Trenutna količina',
+    'default_pack_name'                  => '',
+    'description'                        => 'Opis',
+    'details_count'                      => 'Pojedinosati o količinama inventure',
+    'do_nothing'                         => 'Ne radi ništa',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Uredi polja koja želite urediti za sve odabrane stavke',
+    'edit_multiple_items'                => 'Uredi višestruke stavke',
+    'empty_upc_items'                    => 'UPC artikal',
+    'error_adding_updating'              => 'Greška kod dodavanja/ažuriranja stavke',
+    'error_updating_multiple'            => 'Greška kod ažuriranja stavki',
+    'generate_barcodes'                  => 'Generiraj barkod',
+    'hsn_code'                           => '',
+    'image'                              => 'Slika',
+    'import_items_csv'                   => 'Uvezi stavke iz CSV-a',
+    'info_provided_by'                   => 'Info daje',
+    'inventory'                          => 'Inventura',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Komentari',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => 'Obrisano',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Artikal ima ser. broj',
+    'item'                               => 'Stavka',
+    'item_id'                            => '',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'Broj stavke već postoji u bazi',
+    'item_number_invalid'                => 'Broj stavke sadrži nedopuštene znakove.',
+    'kit'                                => '',
+    'location'                           => 'Mjesto',
+    'low_inventory_items'                => 'Rasprodaja artikala',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => 'Ručno uređivanje količine',
+    'markup'                             => '',
+    'name'                               => 'Naziv artikla',
+    'name_required'                      => 'Naziv artikla je potreban',
+    'new'                                => 'Novi artikal',
+    'no_description_items'               => 'Artikal nema opisa',
+    'no_items_to_display'                => 'Nema artikla za prikazati',
+    'none'                               => 'Egysem',
+    'none_selected'                      => 'Niste odabrali nijedan artikal za uređivanje',
+    'nonstock'                           => '',
+    'number_information'                 => 'Redni broj',
+    'number_required'                    => 'UPC/EAN/ISBN je potreban',
+    'one_or_multiple'                    => 'Artikal(i)',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => 'Količina',
+    'quantity_number'                    => 'Količina mora biti broj',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => 'Zaprimljena količina',
+    'remove_image'                       => 'Ukloni sliku',
+    'reorder_level'                      => 'Poredaj razine',
+    'reorder_level_number'               => 'Numeracija mora biti numerička',
+    'reorder_level_required'             => 'Numeracija je obavezna',
+    'retrive_item_info'                  => 'Info o zaprimljenom artiklu',
+    'sales_tax_1'                        => 'Prodajni porez 1',
+    'sales_tax_2'                        => 'Prodajni porez 2',
+    'search_attributes'                  => 'Polje za pretragu',
+    'select_image'                       => 'Odaberi sliku',
+    'serialized_items'                   => 'Artikl ima ser. broj',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => 'Mjesto skladišta',
+    'stock_type'                         => '',
+    'successful_adding'                  => 'Uspješno ste dodali artikal',
+    'successful_bulk_edit'               => 'Uspješno ste ažurirali odabrane stavke',
+    'successful_deleted'                 => 'Uspješno ste obrisali artikl',
+    'successful_updating'                => 'Uspješno ste ažurirali artikl',
+    'supplier'                           => 'Dobavljač',
+    'tax_1'                              => 'Porez 1',
+    'tax_2'                              => 'Porez 2',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Naziv poreza sadrži nedopuštene znakove.',
+    'tax_percent'                        => '% poreza',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '% poreza je obavezan',
+    'tax_percents'                       => '%-ci poreza',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => 'Maloprodajna cijena',
+    'unit_price_number'                  => 'Maloprodajna cijena mora biti broj',
+    'unit_price_required'                => 'Maloprodajna cijena je obavezna',
+    'upc_database'                       => 'UPC baza',
+    'update'                             => 'Ažuriraj artikl',
+    'use_inventory_menu'                 => 'Koristi inv. meni',
 ];
diff --git a/app/Language/hr-HR/Login.php b/app/Language/hr-HR/Login.php
index 8bb5cac4a..a844d55ab 100644
--- a/app/Language/hr-HR/Login.php
+++ b/app/Language/hr-HR/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "Ulaz",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "Neispravno ime/lozinka",
-    "login"                         => "Prijava",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Lozinka",
-    "required_username"             => "",
-    "username"                      => "Korisničko ime",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "Ulaz",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "Neispravno ime/lozinka",
+    "login"                               => "Prijava",
+    "logout"                              => "",
+    "migrating_database"                  => "Migracija baze podataka",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Baza podataka je uspješno migrirana!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Lozinka",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Previše pokušaja. Pričekajte trenutak i pokušajte ponovno.',
+    "username"                            => "Korisničko ime",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/hr-HR/Reports.php b/app/Language/hr-HR/Reports.php
index aa88f1803..53cecab8e 100644
--- a/app/Language/hr-HR/Reports.php
+++ b/app/Language/hr-HR/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "Porezi",
     "taxes_summary_report"                    => "Zbrojni izvještaj po porezima",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Ukupno",
     "total_inventory_value"                   => "Ukupan iznos inventure",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/hr-HR/Sales.php b/app/Language/hr-HR/Sales.php
index 9e2df3b99..aead64c7a 100644
--- a/app/Language/hr-HR/Sales.php
+++ b/app/Language/hr-HR/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "Dodaj plaćanje",
-    "amount_due"                       => "Iznos duga",
-    "amount_tendered"                  => "Ponuđeni iznos",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "Otkaži",
-    "cash"                             => "Novčanice",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "Novčanice",
-    "change_due"                       => "Ostatak",
-    "change_price"                     => "",
-    "check"                            => "Ček",
-    "check_balance"                    => "Ostatak čeka",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "Komentar",
-    "comments"                         => "Komentari",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Završeno",
-    "confirm_cancel_sale"              => "Želite li otkazati ovu prodaju? Svi artikli se brišu.",
-    "confirm_delete"                   => "Želite li obrisati odabranu prodaju?",
-    "confirm_restore"                  => "",
-    "credit"                           => "Kreditna kartica",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Kupac",
-    "customer_address"                 => "Adresa kupca",
-    "customer_discount"                => "Popust",
-    "customer_email"                   => "e-mail kupca",
-    "customer_location"                => "Mjesto kupca",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Datum prodaje",
-    "date_range"                       => "Period",
-    "date_required"                    => "Morate unijeti ispravan datum",
-    "date_type"                        => "Datum je potreban",
-    "debit"                            => "Debitna kartica",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "Želite li obrisati ovu prodaju? Ova akcija ne može se vratiti.",
-    "delete_entire_sale"               => "Obrisati cjelokupnu prodaju",
-    "delete_successful"                => "Uspješno ste obrisali prodaju",
-    "delete_unsuccessful"              => "Neuspješno brisanje prodaje",
-    "description_abbrv"                => "Opis",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "Popust %",
-    "discount_included"                => "Popust %",
-    "discount_short"                   => "%",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "Uredi",
-    "edit_item"                        => "Uredi artikal",
-    "edit_sale"                        => "Uredi prodaju",
-    "email_receipt"                    => "e-mail potvrde",
-    "employee"                         => "Radnik",
-    "entry"                            => "",
-    "error_editing_item"               => "Greška kod uređivanja artikla",
-    "find_or_scan_item"                => "Pronađi/Skaniraj artikal",
-    "find_or_scan_item_or_receipt"     => "Pronađi/Skaniraj artikal ili račun",
-    "giftcard"                         => "Poklon bon",
-    "giftcard_balance"                 => "Saldo poklon bona",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Poklon bon br.",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "Prodaja br.",
-    "include_prices"                   => "",
-    "invoice"                          => "Faktura",
-    "invoice_confirm"                  => "Poslati fakturu",
-    "invoice_enable"                   => "Napravi fakturu",
-    "invoice_filter"                   => "Fakturirati",
-    "invoice_no_email"                 => "Kupac nema ispravan e-mail",
-    "invoice_number"                   => "Faktura br.",
-    "invoice_number_duplicate"         => "Molim unesite jedinstven broj fakture",
-    "invoice_sent"                     => "Faktura poslana",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "Faktura nije poslana",
-    "invoice_update"                   => "Ponovno brojanje",
-    "item_insufficient_of_stock"       => "Artikla nema na zalihi",
-    "item_name"                        => "Naziv artikla",
-    "item_number"                      => "UPC/EAN/ISBN",
-    "item_out_of_stock"                => "Stavka je rasprodana",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Mod registriranja",
-    "must_enter_numeric"               => "Morate unijeti numeričku vrijednost za količinu",
-    "must_enter_numeric_giftcard"      => "Morate unijeti numeričku vrijednost za poklon bon",
-    "new_customer"                     => "Novi kupac",
-    "new_item"                         => "Nova stavka",
-    "no_description"                   => "Nema opisa",
-    "no_filter"                        => "Svi",
-    "no_items_in_cart"                 => "Nema artikala u košari",
-    "no_sales_to_display"              => "Nema prodaje za prikaz",
-    "none_selected"                    => "Niste odabrali nijedu prodaju za brisanje",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "Prodaja(e)",
-    "payment"                          => "Tip plaćanja",
-    "payment_amount"                   => "Iznos",
-    "payment_not_cover_total"          => "Plaćeni iznos ne pokriva ukupni iznos",
-    "payment_type"                     => "Tip",
-    "payments"                         => "",
-    "payments_total"                   => "Ukupno plaćeno",
-    "price"                            => "Cijena",
-    "print_after_sale"                 => "Štampaj poslije prodaje",
-    "quantity"                         => "Količina",
-    "quantity_less_than_reorder_level" => "Upozorenje! Željena količina je ispod minimalne.",
-    "quantity_less_than_zero"          => "Upozorenje! Željena količina je nedovoljna. Možete nastaviti prodaju, ali provjerite svoju zalihu.",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "Račun",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "Račun br.",
-    "receipt_sent"                     => "Račun poslana",
-    "receipt_unsent"                   => "Račun nije poslana",
-    "refund"                           => "",
-    "register"                         => "Registracija prodaje",
-    "remove_customer"                  => "Ukloni kupca",
-    "remove_discount"                  => "",
-    "return"                           => "Povrat",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "Prodaja",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "Kupac:",
-    "sale_time"                        => "Vrijeme",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "Odaberi kupca(neobaveno)",
-    "send_invoice"                     => "Pošalji fakturu",
-    "send_quote"                       => "",
-    "send_receipt"                     => "Pošalji račun",
-    "send_work_order"                  => "",
-    "serial"                           => "Serijski broj",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Pokaži fakturu",
-    "show_receipt"                     => "Pokaži račun",
-    "start_typing_customer_name"       => "Počnite upisivati naziv kupca ...",
-    "start_typing_item_name"           => "Počnite upisivati naziv artikal ili skenirajte barkod",
-    "stock"                            => "",
-    "stock_location"                   => "Skladište",
-    "sub_total"                        => "Međuzbroj",
-    "successfully_deleted"             => "Uspješno ste obrisali prodaju",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "Neuspješno brisanje prodaje",
-    "successfully_updated"             => "Uspješno ste ažurirali prodaju",
-    "suspend_sale"                     => "Obustavi",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "Broj obustave",
-    "suspended_sales"                  => "Obustavljanje",
-    "table"                            => "",
-    "takings"                          => "Prodano",
-    "tax"                              => "Porez",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "Porez %",
-    "taxed_ind"                        => "",
-    "total"                            => "Ukupno",
-    "total_tax_exclusive"              => "Porez nije uključen",
-    "transaction_failed"               => "Greška kod prodaje",
-    "unable_to_add_item"               => "Artikal nije moguće dodati",
-    "unsuccessfully_deleted"           => "Prodaju(e) nije moguće izbrisati",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "Neuspješno brisanje prodaje",
-    "unsuccessfully_updated"           => "Prodaju(e) nije moguće ažurirati",
-    "unsuspend"                        => "Ponovno uključeno",
-    "unsuspend_and_delete"             => "Uključeno i obrisano",
-    "update"                           => "Ažuriraj",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => 'Dodaj plaćanje',
+    'amount_due'                        => 'Iznos duga',
+    'amount_due_not_covered'            => 'Uplate ne pokrivaju dospjeli iznos.',
+    'amount_tendered'                   => 'Ponuđeni iznos',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => 'Otkaži',
+    'cash'                              => 'Novčanice',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => 'Novčanice',
+    'change_due'                        => 'Ostatak',
+    'change_price'                      => '',
+    'check'                             => 'Ček',
+    'check_balance'                     => 'Ostatak čeka',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => 'Komentar',
+    'comments'                          => 'Komentari',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Završeno',
+    'confirm_cancel_sale'               => 'Želite li otkazati ovu prodaju? Svi artikli se brišu.',
+    'confirm_delete'                    => 'Želite li obrisati odabranu prodaju?',
+    'confirm_restore'                   => '',
+    'credit'                            => 'Kreditna kartica',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Kupac',
+    'customer_address'                  => 'Adresa kupca',
+    'customer_discount'                 => 'Popust',
+    'customer_email'                    => 'e-mail kupca',
+    'customer_location'                 => 'Mjesto kupca',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => 'Datum prodaje',
+    'date_range'                        => 'Period',
+    'date_required'                     => 'Morate unijeti ispravan datum',
+    'date_type'                         => 'Datum je potreban',
+    'debit'                             => 'Debitna kartica',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => 'Želite li obrisati ovu prodaju? Ova akcija ne može se vratiti.',
+    'delete_entire_sale'                => 'Obrisati cjelokupnu prodaju',
+    'delete_successful'                 => 'Uspješno ste obrisali prodaju',
+    'delete_unsuccessful'               => 'Neuspješno brisanje prodaje',
+    'description_abbrv'                 => 'Opis',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => 'Popust %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => 'Popust %',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => 'Uredi',
+    'edit_item'                         => 'Uredi artikal',
+    'edit_sale'                         => 'Uredi prodaju',
+    'email_receipt'                     => 'e-mail potvrde',
+    'employee'                          => 'Radnik',
+    'entry'                             => '',
+    'error_editing_item'                => 'Greška kod uređivanja artikla',
+    'find_or_scan_item'                 => 'Pronađi/Skaniraj artikal',
+    'find_or_scan_item_or_receipt'      => 'Pronađi/Skaniraj artikal ili račun',
+    'giftcard'                          => 'Poklon bon',
+    'giftcard_balance'                  => 'Saldo poklon bona',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Poklon bon br.',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => 'Prodaja br.',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Nedovoljan saldo dar-kartice za ovu uplatu.',
+    'insufficient_reward_points'        => 'Nedovoljni bodovi nagrade za ovu uplatu.',
+    'invoice'                           => 'Faktura',
+    'invoice_confirm'                   => 'Poslati fakturu',
+    'invoice_enable'                    => 'Napravi fakturu',
+    'invoice_filter'                    => 'Fakturirati',
+    'invoice_no_email'                  => 'Kupac nema ispravan e-mail',
+    'invoice_number'                    => 'Faktura br.',
+    'invoice_number_duplicate'          => 'Molim unesite jedinstven broj fakture',
+    'invoice_sent'                      => 'Faktura poslana',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => 'Faktura nije poslana',
+    'invoice_update'                    => 'Ponovno brojanje',
+    'item_insufficient_of_stock'        => 'Artikla nema na zalihi',
+    'item_name'                         => 'Naziv artikla',
+    'item_number'                       => 'UPC/EAN/ISBN',
+    'item_out_of_stock'                 => 'Stavka je rasprodana',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Mod registriranja',
+    'must_enter_numeric'                => 'Morate unijeti numeričku vrijednost za količinu',
+    'must_enter_numeric_giftcard'       => 'Morate unijeti numeričku vrijednost za poklon bon',
+    'must_enter_reference_code'         => 'Referentni/broj za preuzimanje mora biti unesen.',
+    'negative_amount_tendered'          => 'Ponuđeni iznos ne može biti negativan.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Novi kupac',
+    'new_item'                          => 'Nova stavka',
+    'no_description'                    => 'Nema opisa',
+    'no_filter'                         => 'Svi',
+    'no_items_in_cart'                  => 'Nema artikala u košari',
+    'no_sales_to_display'               => 'Nema prodaje za prikaz',
+    'none_selected'                     => 'Niste odabrali nijedu prodaju za brisanje',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => 'Prodaja(e)',
+    'payment'                           => 'Tip plaćanja',
+    'payment_amount'                    => 'Iznos',
+    'payment_not_cover_total'           => 'Plaćeni iznos ne pokriva ukupni iznos',
+    'payment_type'                      => 'Tip',
+    'payments'                          => '',
+    'payments_total'                    => 'Ukupno plaćeno',
+    'price'                             => 'Cijena',
+    'print_after_sale'                  => 'Štampaj poslije prodaje',
+    'quantity'                          => 'Količina',
+    'quantity_less_than_reorder_level'  => 'Upozorenje! Željena količina je ispod minimalne.',
+    'quantity_less_than_zero'           => 'Upozorenje! Željena količina je nedovoljna. Možete nastaviti prodaju, ali provjerite svoju zalihu.',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => 'Račun',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => 'Račun br.',
+    'receipt_sent'                      => 'Račun poslana',
+    'receipt_unsent'                    => 'Račun nije poslana',
+    'reference_code'                    => 'Referentni kod plaćanja',
+    'reference_code_invalid_characters' => 'Referentni kod smije sadržavati samo slova i brojeve.',
+    'reference_code_length_error'       => 'Duljina referentnog koda nije ispravna.',
+    'refund'                            => '',
+    'register'                          => 'Registracija prodaje',
+    'remove_customer'                   => 'Ukloni kupca',
+    'remove_discount'                   => '',
+    'return'                            => 'Povrat',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => 'Prodaja',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => 'Kupac:',
+    'sale_time'                         => 'Vrijeme',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Odaberi kupca(neobaveno)',
+    'send_invoice'                      => 'Pošalji fakturu',
+    'send_quote'                        => '',
+    'send_receipt'                      => 'Pošalji račun',
+    'send_work_order'                   => '',
+    'serial'                            => 'Serijski broj',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Pokaži fakturu',
+    'show_receipt'                      => 'Pokaži račun',
+    'start_typing_customer_name'        => 'Počnite upisivati naziv kupca ...',
+    'start_typing_item_name'            => 'Počnite upisivati naziv artikal ili skenirajte barkod',
+    'stock'                             => '',
+    'stock_location'                    => 'Skladište',
+    'sub_total'                         => 'Međuzbroj',
+    'successfully_deleted'              => 'Uspješno ste obrisali prodaju',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => 'Neuspješno brisanje prodaje',
+    'successfully_updated'              => 'Uspješno ste ažurirali prodaju',
+    'suspend_sale'                      => 'Obustavi',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => 'Broj obustave',
+    'suspended_sales'                   => 'Obustavljanje',
+    'table'                             => '',
+    'takings'                           => 'Prodano',
+    'tax'                               => 'Porez',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => 'Porez %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Ukupno',
+    'total_tax_exclusive'               => 'Porez nije uključen',
+    'transaction_failed'                => 'Greška kod prodaje',
+    'unable_to_add_item'                => 'Artikal nije moguće dodati',
+    'unsuccessfully_deleted'            => 'Prodaju(e) nije moguće izbrisati',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => 'Neuspješno brisanje prodaje',
+    'unsuccessfully_updated'            => 'Prodaju(e) nije moguće ažurirati',
+    'unsuspend'                         => 'Ponovno uključeno',
+    'unsuspend_and_delete'              => 'Uključeno i obrisano',
+    'update'                            => 'Ažuriraj',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/hu/Attributes.php b/app/Language/hu/Attributes.php
index ef8a368f7..e6fd036c9 100644
--- a/app/Language/hu/Attributes.php
+++ b/app/Language/hu/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Tulajdonság értéke nem tartalmazhat '_' vagy '|' karaktert",
-    "confirm_delete"                   => "Biztosan törli szeretné a kijelölt tulajdonságokat?",
-    "confirm_restore"                  => "Biztosan visszaállítja a kijelölt tulajdonságokat?",
-    "definition_cannot_be_deleted"     => "Nem sikerült törölni a kijelölt tulajdonságokat",
-    "definition_error_adding_updating" => "{0} attribútum nem adható hozzá és nem frissíthető. Kérjük, ellenőrizze a hibanaplót.",
-    "definition_flags"                 => "Tulajdonság láthatósága",
-    "definition_group"                 => "Csoport",
-    "definition_id"                    => "Azonosító",
-    "definition_name"                  => "Tulajdonság hozzáadása",
-    "definition_name_required"         => "Tulajdonság név kötelező mező",
-    "definition_one_or_multiple"       => "tulajdonságok",
-    "definition_successful_adding"     => "Sikeresen hozzáadta az elemet",
-    "definition_successful_deleted"    => "Sikeresen törölte",
-    "definition_successful_updating"   => "Sikeresen frissítette a tulajdonságot",
-    "definition_type"                  => "Tulajdonság típus",
-    "definition_type_required"         => "Tulajdonság típusa kötelező mező",
-    "definition_unit"                  => "Mértkékegység",
-    "definition_values"                => "Tulajdonság értékei",
-    "new"                              => "Új tulajdnoság",
-    "no_attributes_to_display"         => "Nincs megjelenítendő elem",
-    "receipt_visibility"               => "Nyugta",
-    "show_in_items"                    => "Megjelenítés a termékekben",
-    "show_in_items_visibility"         => "Termékek",
-    "show_in_receipt"                  => "Nyugta megjelenítése",
-    "show_in_receivings"               => "Meglenesítés árúátvételekben",
-    "show_in_receivings_visibility"    => "Áruátvételek",
-    "show_in_sales"                    => "Megjelenítés az értékesítésekben",
-    "show_in_sales_visibility"         => "Értékesítések",
-    "update"                           => "Tulajdonság frissítése",
+    'attribute_value_invalid_chars'    => 'Tulajdonság értéke nem tartalmazhat \'_\' vagy \'|\' karaktert',
+    'confirm_delete'                   => 'Biztosan törli szeretné a kijelölt tulajdonságokat?',
+    'confirm_restore'                  => 'Biztosan visszaállítja a kijelölt tulajdonságokat?',
+    'definition_cannot_be_deleted'     => 'Nem sikerült törölni a kijelölt tulajdonságokat',
+    'definition_invalid_group' => 'A kiválasztott csoport nem létezik vagy érvénytelen.',
+    'definition_error_adding_updating' => '{0} attribútum nem adható hozzá és nem frissíthető. Kérjük, ellenőrizze a hibanaplót.',
+    'definition_flags'                 => 'Tulajdonság láthatósága',
+    'definition_group'                 => 'Csoport',
+    'definition_id'                    => 'Azonosító',
+    'definition_name'                  => 'Tulajdonság hozzáadása',
+    'definition_name_required'         => 'Tulajdonság név kötelező mező',
+    'definition_one_or_multiple'       => 'tulajdonságok',
+    'definition_successful_adding'     => 'Sikeresen hozzáadta az elemet',
+    'definition_successful_deleted'    => 'Sikeresen törölte',
+    'definition_successful_updating'   => 'Sikeresen frissítette a tulajdonságot',
+    'definition_type'                  => 'Tulajdonság típus',
+    'definition_type_required'         => 'Tulajdonság típusa kötelező mező',
+    'definition_unit'                  => 'Mértkékegység',
+    'definition_values'                => 'Tulajdonság értékei',
+    'new'                              => 'Új tulajdnoság',
+    'no_attributes_to_display'         => 'Nincs megjelenítendő elem',
+    'receipt_visibility'               => 'Nyugta',
+    'show_in_items'                    => 'Megjelenítés a termékekben',
+    'show_in_items_visibility'         => 'Termékek',
+    'show_in_receipt'                  => 'Nyugta megjelenítése',
+    'show_in_receivings'               => 'Meglenesítés árúátvételekben',
+    'show_in_receivings_visibility'    => 'Áruátvételek',
+    'show_in_sales'                    => 'Megjelenítés az értékesítésekben',
+    'show_in_sales_visibility'         => 'Értékesítések',
+    'show_in_search'                   => 'Megjelenítés a keresésben',
+    'show_in_search_visibility'        => 'Keresés',
+    'update'                           => 'Tulajdonság frissítése',
 ];
diff --git a/app/Language/hu/Bootstrap_tables.php b/app/Language/hu/Bootstrap_tables.php
index 89b7b0cd3..c742aaa2c 100644
--- a/app/Language/hu/Bootstrap_tables.php
+++ b/app/Language/hu/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Mind",
-    "columns"              => "Oszlopok",
-    "hide_show_pagination" => "Lapozó elrejtése/megjelenítése",
-    "loading"              => "Betöltés, kérem várjon...",
-    "page_from_to"         => "Megjelenítve  {0}  {1} / {2} összesen",
-    "refresh"              => "Frissítés",
-    "rows_per_page"        => "{0} rekord per oldal",
-    "toggle"               => "Váltás",
+    'all' => "Mind",
+    'columns' => "Oszlopok",
+    'hide_show_pagination' => "Lapozó elrejtése/megjelenítése",
+    'loading' => "Betöltés, kérem várjon",
+    'page_from_to' => "Megjelenítve  {0}  {1} / {2} összesen",
+    'refresh' => "Frissítés",
+    'rows_per_page' => "{0} rekord per oldal",
+    'toggle' => "Váltás",
 ];
diff --git a/app/Language/hu/Config.php b/app/Language/hu/Config.php
index 9bb9b47f3..384557376 100644
--- a/app/Language/hu/Config.php
+++ b/app/Language/hu/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Cég cím",
-    "address_required"                          => "Cég cím kötelező mező",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "aposztrof",
-    "backup_button"                             => "Mentés",
-    "backup_database"                           => "Adatbázis mentése",
-    "barcode"                                   => "Vonalkód",
-    "barcode_company"                           => "Cég neve",
-    "barcode_configuration"                     => "Vonalkód konfigurálása",
-    "barcode_content"                           => "Vonalkód tartalma",
-    "barcode_first_row"                         => "Sor 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "Generáljon ha üres",
-    "barcode_height"                            => "Magasság (px)",
-    "barcode_id"                                => "Termék Id/Név",
-    "barcode_info"                              => "Vonalkód konfigurációs információk",
-    "barcode_layout"                            => "Vonalkód elrendezés",
-    "barcode_name"                              => "Név",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Szám a sorban",
-    "barcode_page_cellspacing"                  => "Display page cellspacing",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "Ár",
-    "barcode_second_row"                        => "Sor 2",
-    "barcode_third_row"                         => "Sor 3",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "Vonalkód tipus",
-    "barcode_width"                             => "Szélesség (px)",
-    "bottom"                                    => "Alul",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "Közép",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "vessző",
-    "company"                                   => "Cégnév",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Kép cseréje",
-    "company_logo"                              => "Cég logó",
-    "company_remove_image"                      => "Kép eltávolítása",
-    "company_required"                          => "Cégnév kötelező mező",
-    "company_select_image"                      => "Kép kiválasztása",
-    "company_website_url"                       => "A cég webcime nem érvényes URL (http://...)",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Pénznem",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "Dátum és idő formátum",
-    "decimal_point"                             => "Tizedes pont",
-    "default_barcode_font_size_number"          => "Az alapértelmezett vonalkód font méretnek számnak kell lennie",
-    "default_barcode_font_size_required"        => "Az alapértelmezett vonalkód font méret kötelező mező",
-    "default_barcode_height_number"             => "Az alapértelmezett vonalkód magasságnak számnak kell lennie",
-    "default_barcode_height_required"           => "Az alapértelmezett vonalkód magasság kötelező mező",
-    "default_barcode_num_in_row_number"         => "Az alapértelmezett vonalkód száma a sorbannak számnak kell lennie",
-    "default_barcode_num_in_row_required"       => "Az alapértelmezett vonalkód szám a sorban kötelező mező",
-    "default_barcode_page_cellspacing_number"   => "Vonalkód cellatávolságnak számnak kell lennie",
-    "default_barcode_page_cellspacing_required" => "Vonalkód cellatávolság kötelező mező.",
-    "default_barcode_page_width_number"         => "Az alapértelmezett vonalkód oldal szélességnek számnak kell lennie",
-    "default_barcode_page_width_required"       => "Az alapértelmezett vonalkód oldal szésesség kötelező.",
-    "default_barcode_width_number"              => "Az alapértelmezett vonalkód szélességnek számnak kell lennie",
-    "default_barcode_width_required"            => "Az alapértelmezett vonalkód szélesség kötelező mező",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "Alapértelmezett kedvezmény %",
-    "default_sales_discount_number"             => "Alapértelmezett kedvezménynek számnak kell lennie",
-    "default_sales_discount_required"           => "Alapértelmezett kedvezmény kötelező mező",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "Alapértelmezett adó név kötelező mező",
-    "default_tax_rate"                          => "Alapértelmezett adó %",
-    "default_tax_rate_1"                        => "Adó 1",
-    "default_tax_rate_2"                        => "Adó 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Az alapértelmezett adónak számnak kell lennie",
-    "default_tax_rate_required"                 => "Az alapértelmezett adó kötelező mező",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "pont",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email beállítás",
-    "email_mailpath"                            => "Sendmail elérési út",
-    "email_protocol"                            => "Protokoll",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Szerver",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP időtúllépést (mp)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "Általános",
-    "general_configuration"                     => "Általános beállitás",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "Információk",
-    "info_configuration"                        => "Bolt információk",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "Számla",
-    "invoice_configuration"                     => "Nyomtatási beállitások",
-    "invoice_default_comments"                  => "Alapértelmezett számla kommentek",
-    "invoice_email_message"                     => "Email számla sablon",
-    "invoice_enable"                            => "Számlázás engedélyezése",
-    "invoice_printer"                           => "Számla nyomtató",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Figyelem! Ez a letiltott funkció csak akkor működik megfelelően, ha a FireFox jsPrintSetup kiegészítő telepítve van. Menti mindezek tudatában?",
-    "language"                                  => "Nyelv",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "Bal",
-    "license"                                   => "Licensz",
-    "license_configuration"                     => "Licensz statementek",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "Sorok száma  oldalanként",
-    "lines_per_page_number"                     => "A sorok száma oldalanként kötelező mező",
-    "lines_per_page_required"                   => "A sor per oldal kötelező mező",
-    "locale"                                    => "Lokalizációs",
-    "locale_configuration"                      => "Lokalizációs beállitások",
-    "locale_info"                               => "Lokalizációs beállitási információk",
-    "location"                                  => "Készlet",
-    "location_configuration"                    => "Készlet helye",
-    "location_info"                             => "Helyszin konfigurációs információk",
-    "login_form"                                => "",
-    "logout"                                    => "Nem szeretne mentést csinálni kilépés előtt? Kattintson az [OK]-ra a mentéshez, [Mégsem] a kilépéshez",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "Üzenet",
-    "message_configuration"                     => "Üzenet beállítások",
-    "msg_msg"                                   => "Mentett text üzenet",
-    "msg_msg_placeholder"                       => "Ha SMS alapot kíván használni ide írja. Egyébként hagyja üresen a mezőt.",
-    "msg_pwd"                                   => "SMS-API Jelszó",
-    "msg_pwd_required"                          => "SMS-API jelszó kötelező mező",
-    "msg_src"                                   => "SMS-API Küldö ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Felhasználó",
-    "msg_uid_required"                          => "SMS-API Username kötelező mező",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Szám formátum",
-    "number_locale"                             => "Lokalizációs",
-    "number_locale_invalid"                     => "A megadott érték érvénytelen. Ellenőrizze a linken a megadható értékeket.",
-    "number_locale_required"                    => "Lokalizációs szám kötelező mező",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Cég telefonszáma",
-    "phone_required"                            => "Cég telefonszáma kötelező mező",
-    "print_bottom_margin"                       => "Alsó margó",
-    "print_bottom_margin_number"                => "The default bottom margin must be a number",
-    "print_bottom_margin_required"              => "The default bottom margin is a required field",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Bal margó",
-    "print_left_margin_number"                  => "The default left margin must be a number",
-    "print_left_margin_required"                => "The default left margin is a required field",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "Jobb margó",
-    "print_right_margin_number"                 => "The default right margin must be a number",
-    "print_right_margin_required"               => "The default right margin is a required field",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Felső margó",
-    "print_top_margin_number"                   => "The default top margin must be a number",
-    "print_top_margin_required"                 => "The default top margin is a required field",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "Nyugta",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Nyomtatási beállitások",
-    "receipt_default"                           => "Alapértelmezett",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "Nyugta beállítási információk",
-    "receipt_printer"                           => "Jegy nyomtató",
-    "receipt_short"                             => "Rövid",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "Leírás mutatása",
-    "receipt_show_serialnumber"                 => "Szériaszám mutatása",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "Adók mutatása",
-    "receipt_show_total_discount"               => "Összes kedvezmény mutatása",
-    "receipt_template"                          => "Nyugta template",
-    "receiving_calculate_average_price"         => "Átl. Ár számitása (visszáru)",
-    "recv_invoice_format"                       => "Visszatérítési számla formátum",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Return policy is a required field",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "Jobb",
-    "sales_invoice_format"                      => "Eladási számla formátum",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "Beállítások sikeresen elmentve",
-    "saved_unsuccessfully"                      => "Beállítások mentése sikertelen",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "Statisztika küldése",
-    "statistics_tooltip"                        => "Statisztika küldése fejlesztési célból",
-    "stock_location"                            => "Bolt helye",
-    "stock_location_duplicate"                  => "Kérem egyedi helyszin nevet használjon",
-    "stock_location_invalid_chars"              => "A bolt helyének neve nem tartalmazhat '_' karaktert",
-    "stock_location_required"                   => "Bolt helyszín szám kötelező mező",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "Takings Printer",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "",
-    "tax_included"                              => "Adókat tartalmaz",
-    "theme"                                     => "Téma",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Ezres elválasztó",
-    "timezone"                                  => "Időzóna",
-    "timezone_error"                            => "",
-    "top"                                       => "Felül",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "Weboldal",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => 'Cég cím',
+    'address_required'                          => 'Cég cím kötelező mező',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => 'aposztrof',
+    'backup_button'                             => 'Mentés',
+    'backup_database'                           => 'Adatbázis mentése',
+    'barcode'                                   => 'Vonalkód',
+    'barcode_company'                           => 'Cég neve',
+    'barcode_configuration'                     => 'Vonalkód konfigurálása',
+    'barcode_content'                           => 'Vonalkód tartalma',
+    'barcode_first_row'                         => 'Sor 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => 'Generáljon ha üres',
+    'barcode_height'                            => 'Magasság (px)',
+    'barcode_id'                                => 'Termék Id/Név',
+    'barcode_info'                              => 'Vonalkód konfigurációs információk',
+    'barcode_layout'                            => 'Vonalkód elrendezés',
+    'barcode_name'                              => 'Név',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Szám a sorban',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing',
+    'barcode_page_width'                        => 'Display page width',
+    'barcode_price'                             => 'Ár',
+    'barcode_second_row'                        => 'Sor 2',
+    'barcode_third_row'                         => 'Sor 3',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => 'Vonalkód tipus',
+    'barcode_width'                             => 'Szélesség (px)',
+    'bottom'                                    => 'Alul',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Közép',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'vessző',
+    'company'                                   => 'Cégnév',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Kép cseréje',
+    'company_logo'                              => 'Cég logó',
+    'company_remove_image'                      => 'Kép eltávolítása',
+    'company_required'                          => 'Cégnév kötelező mező',
+    'company_select_image'                      => 'Kép kiválasztása',
+    'company_website_url'                       => 'A cég webcime nem érvényes URL (http://...)',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => '',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => 'Pénznem',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => 'Dátum és idő formátum',
+    'decimal_point'                             => 'Tizedes pont',
+    'default_barcode_font_size_number'          => 'Az alapértelmezett vonalkód font méretnek számnak kell lennie',
+    'default_barcode_font_size_required'        => 'Az alapértelmezett vonalkód font méret kötelező mező',
+    'default_barcode_height_number'             => 'Az alapértelmezett vonalkód magasságnak számnak kell lennie',
+    'default_barcode_height_required'           => 'Az alapértelmezett vonalkód magasság kötelező mező',
+    'default_barcode_num_in_row_number'         => 'Az alapértelmezett vonalkód száma a sorbannak számnak kell lennie',
+    'default_barcode_num_in_row_required'       => 'Az alapértelmezett vonalkód szám a sorban kötelező mező',
+    'default_barcode_page_cellspacing_number'   => 'Vonalkód cellatávolságnak számnak kell lennie',
+    'default_barcode_page_cellspacing_required' => 'Vonalkód cellatávolság kötelező mező.',
+    'default_barcode_page_width_number'         => 'Az alapértelmezett vonalkód oldal szélességnek számnak kell lennie',
+    'default_barcode_page_width_required'       => 'Az alapértelmezett vonalkód oldal szésesség kötelező.',
+    'default_barcode_width_number'              => 'Az alapértelmezett vonalkód szélességnek számnak kell lennie',
+    'default_barcode_width_required'            => 'Az alapértelmezett vonalkód szélesség kötelező mező',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => 'Alapértelmezett kedvezmény %',
+    'default_sales_discount_number'             => 'Alapértelmezett kedvezménynek számnak kell lennie',
+    'default_sales_discount_required'           => 'Alapértelmezett kedvezmény kötelező mező',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => 'Alapértelmezett adó név kötelező mező',
+    'default_tax_rate'                          => 'Alapértelmezett adó %',
+    'default_tax_rate_1'                        => 'Adó 1',
+    'default_tax_rate_2'                        => 'Adó 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Az alapértelmezett adónak számnak kell lennie',
+    'default_tax_rate_required'                 => 'Az alapértelmezett adó kötelező mező',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => 'pont',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email beállítás',
+    'email_mailpath'                            => 'Sendmail elérési út',
+    'email_protocol'                            => 'Protokoll',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Szerver',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP időtúllépést (mp)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => 'Általános',
+    'general_configuration'                     => 'Általános beállitás',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => 'Információk',
+    'info_configuration'                        => 'Bolt információk',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => 'Számla',
+    'invoice_configuration'                     => 'Nyomtatási beállitások',
+    'invoice_default_comments'                  => 'Alapértelmezett számla kommentek',
+    'invoice_email_message'                     => 'Email számla sablon',
+    'invoice_enable'                            => 'Számlázás engedélyezése',
+    'invoice_printer'                           => 'Számla nyomtató',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Figyelem! Ez a letiltott funkció csak akkor működik megfelelően, ha a FireFox jsPrintSetup kiegészítő telepítve van. Menti mindezek tudatában?',
+    'language'                                  => 'Nyelv',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => 'Bal',
+    'license'                                   => 'Licensz',
+    'license_configuration'                     => 'Licensz statementek',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => 'Sorok száma  oldalanként',
+    'lines_per_page_number'                     => 'A sorok száma oldalanként kötelező mező',
+    'lines_per_page_required'                   => 'A sor per oldal kötelező mező',
+    'locale'                                    => 'Lokalizációs',
+    'locale_configuration'                      => 'Lokalizációs beállitások',
+    'locale_info'                               => 'Lokalizációs beállitási információk',
+    'location'                                  => 'Készlet',
+    'location_configuration'                    => 'Készlet helye',
+    'location_info'                             => 'Helyszin konfigurációs információk',
+    'login_form'                                => '',
+    'logout'                                    => 'Nem szeretne mentést csinálni kilépés előtt? Kattintson az [OK]-ra a mentéshez, [Mégsem] a kilépéshez',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => 'Üzenet',
+    'message_configuration'                     => 'Üzenet beállítások',
+    'msg_msg'                                   => 'Mentett text üzenet',
+    'msg_msg_placeholder'                       => 'Ha SMS alapot kíván használni ide írja. Egyébként hagyja üresen a mezőt.',
+    'msg_pwd'                                   => 'SMS-API Jelszó',
+    'msg_src'                                   => 'SMS-API Küldö ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Felhasználó',
+    'msg_uid_required'                          => 'SMS-API Username kötelező mező',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Szám formátum',
+    'number_locale'                             => 'Lokalizációs',
+    'number_locale_invalid'                     => 'A megadott érték érvénytelen. Ellenőrizze a linken a megadható értékeket.',
+    'number_locale_required'                    => 'Lokalizációs szám kötelező mező',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Fizetési hivatkozási kód<br>Hosszkorlátok',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Cég telefonszáma',
+    'phone_required'                            => 'Cég telefonszáma kötelező mező',
+    'print_bottom_margin'                       => 'Alsó margó',
+    'print_bottom_margin_number'                => 'The default bottom margin must be a number',
+    'print_bottom_margin_required'              => 'The default bottom margin is a required field',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Bal margó',
+    'print_left_margin_number'                  => 'The default left margin must be a number',
+    'print_left_margin_required'                => 'The default left margin is a required field',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => 'Jobb margó',
+    'print_right_margin_number'                 => 'The default right margin must be a number',
+    'print_right_margin_required'               => 'The default right margin is a required field',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Felső margó',
+    'print_top_margin_number'                   => 'The default top margin must be a number',
+    'print_top_margin_required'                 => 'The default top margin is a required field',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => 'Nyugta',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Nyomtatási beállitások',
+    'receipt_default'                           => 'Alapértelmezett',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => 'Nyugta beállítási információk',
+    'receipt_printer'                           => 'Jegy nyomtató',
+    'receipt_short'                             => 'Rövid',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => 'Leírás mutatása',
+    'receipt_show_serialnumber'                 => 'Szériaszám mutatása',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'Adók mutatása',
+    'receipt_show_total_discount'               => 'Összes kedvezmény mutatása',
+    'receipt_template'                          => 'Nyugta template',
+    'receiving_calculate_average_price'         => 'Átl. Ár számitása (visszáru)',
+    'recv_invoice_format'                       => 'Visszatérítési számla formátum',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Return policy is a required field',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => 'Jobb',
+    'sales_invoice_format'                      => 'Eladási számla formátum',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Érvénytelen sendmail elérési út. Csak betűk, számok, kötőjelek, aláhúzások, perjelek, fordított perjelek, kettőspontok, szóközök és pontok engedélyezettek.',
+    'saved_successfully'                        => 'Beállítások sikeresen elmentve',
+    'saved_unsuccessfully'                      => 'Beállítások mentése sikertelen',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => 'Statisztika küldése',
+    'statistics_tooltip'                        => 'Statisztika küldése fejlesztési célból',
+    'stock_location'                            => 'Bolt helye',
+    'stock_location_duplicate'                  => 'Kérem egyedi helyszin nevet használjon',
+    'stock_location_invalid_chars'              => "A bolt helyének neve nem tartalmazhat '_' karaktert",
+    'stock_location_required'                   => 'Bolt helyszín szám kötelező mező',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => 'Takings Printer',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => '',
+    'tax_included'                              => 'Adókat tartalmaz',
+    'theme'                                     => 'Téma',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Ezres elválasztó',
+    'timezone'                                  => 'Időzóna',
+    'timezone_error'                            => '',
+    'top'                                       => 'Felül',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => 'Weboldal',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/hu/Employees.php b/app/Language/hu/Employees.php
index 3ab447510..9de15ce0c 100644
--- a/app/Language/hu/Employees.php
+++ b/app/Language/hu/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Munkavállaló alap információk",
-    "cannot_be_deleted"            => "Nem lehet a kiválasztott munkavállaló(ka)t törölni, mert már van lezárt értékesítése vagy saját magát kívánja törölni! :)",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Biztos, hogy törölni kívánja a munkavállalót?",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "Munkavállaló",
-    "error_adding_updating"        => "Hiba a munkavállaló módosításánál/hozzáadásánál",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Nem tudja törölni a demo admin felhasználót",
-    "error_updating_demo_admin"    => "Nem tudja módosítani a demo admin felhasználót",
-    "language"                     => "",
-    "login_info"                   => "Munkavállaló azonosító",
-    "manager"                      => "",
-    "new"                          => "Új munkavállaló",
-    "none_selected"                => "Nem választott ki munkavállalót a törléshez",
-    "one_or_multiple"              => "munkavállaló(k)",
-    "password"                     => "Jelszó",
-    "password_minlength"           => "A jelszónak legalább 8 karakternek kell lennie",
-    "password_must_match"          => "A jelszó nem egyezik",
-    "password_not_must_match"      => "",
-    "password_required"            => "A jelszó kötelező",
-    "permission_desc"              => "Válassza ki az alábbi boxokat a hozzáférés megadásához",
-    "permission_info"              => "Munkavállaló engedélyei",
-    "repeat_password"              => "Jelszó újra",
-    "subpermission_required"       => "Engedélyezzen legalább egyet minden modulhoz",
-    "successful_adding"            => "Sikeresen hozzáadott egy új munkavállalót",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "Sikeresen törölt egy munkavállalót",
-    "successful_updating"          => "Sikeresen módosította a munkavállalót",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "Munkavállaló módosítása",
-    "username"                     => "Felhasználó név",
-    "username_duplicate"           => "",
-    "username_minlength"           => "A felhasználó névnek legalább 5 karakternek kell lennie",
-    "username_required"            => "Felhasználó név kötelező",
+    'administrator'                          => '',
+    'basic_information'                      => 'Munkavállaló alap információk',
+    'cannot_be_deleted'                      => 'Nem lehet a kiválasztott munkavállaló(ka)t törölni, mert már van lezárt értékesítése vagy saját magát kívánja törölni! :)',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Biztos, hogy törölni kívánja a munkavállalót?',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => 'Munkavállaló',
+    'error_adding_updating'                  => 'Hiba a munkavállaló módosításánál/hozzáadásánál',
+    'error_cannot_remove_own_minimum_grant'  => 'Nem távolíthatja el a saját minimális modulhozzáférési engedélyeit.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Nem tudja törölni a demo admin felhasználót',
+    'error_grant_change_disallowed'          => 'A jogok módosítása le van tiltva ebben a demóban.',
+    'error_password_change_disallowed'       => 'A jelszóváltoztatás le van tiltva ebben a demóban.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Nem tudja módosítani a demo admin felhasználót',
+    'language'                               => '',
+    'login_info'                             => 'Munkavállaló azonosító',
+    'manager'                                => '',
+    'new'                                    => 'Új munkavállaló',
+    'none_selected'                          => 'Nem választott ki munkavállalót a törléshez',
+    'one_or_multiple'                        => 'munkavállaló(k)',
+    'password'                               => 'Jelszó',
+    'password_minlength'                     => 'A jelszónak legalább 8 karakternek kell lennie',
+    'password_must_match'                    => 'A jelszó nem egyezik',
+    'password_not_must_match'                => '',
+    'password_required'                      => 'A jelszó kötelező',
+    'permission_desc'                        => 'Válassza ki az alábbi boxokat a hozzáférés megadásához',
+    'permission_info'                        => 'Munkavállaló engedélyei',
+    'repeat_password'                        => 'Jelszó újra',
+    'subpermission_required'                 => 'Engedélyezzen legalább egyet minden modulhoz',
+    'successful_adding'                      => 'Sikeresen hozzáadott egy új munkavállalót',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => 'Sikeresen törölt egy munkavállalót',
+    'successful_updating'                    => 'Sikeresen módosította a munkavállalót',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => 'Munkavállaló módosítása',
+    'username'                               => 'Felhasználó név',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'A felhasználó névnek legalább 5 karakternek kell lennie',
+    'username_required'                      => 'Felhasználó név kötelező',
 ];
diff --git a/app/Language/hu/Error.php b/app/Language/hu/Error.php
index 49b193503..733dc71dd 100644
--- a/app/Language/hu/Error.php
+++ b/app/Language/hu/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Önnek nincs hozzáférése az alábbi modulhoz ",
-    "unknown"              => "ismeretlen",
+    'no_permission_module'           => 'Önnek nincs hozzáférése az alábbi modulhoz ',
+    'unable_to_create_env_file'      => 'Nem sikerült létrehozni a(z) {filePath} fájlt a throttle.key beállításához',
+    'unable_to_lock_file'            => 'Nem sikerült zárolni a(z) {filePath} fájlt: {reason}',
+    'unable_to_open_lock_file'       => 'Nem sikerült megnyitni a(z) {filePath} fájlt: {reason}',
+    'unable_to_persist_throttle_key' => 'Nem sikerült elmenteni a throttle.key kulcsot a(z) {filePath} fájlba',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Nem sikerült beolvasni a(z) {filePath} fájlt a throttle.key beállításához',
+    'unknown'                        => 'ismeretlen',
 ];
diff --git a/app/Language/hu/Items.php b/app/Language/hu/Items.php
index c70c64cd0..aecd66dcc 100644
--- a/app/Language/hu/Items.php
+++ b/app/Language/hu/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Mennyiség hozzáadása/elvétele",
-    "allow_alt_description"              => "Alternativ leirás eng.",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "Tömeges módosítás",
-    "buy_price_required"                 => "Vételár kötelező mező",
-    "cannot_be_deleted"                  => "Nem törölhető a kiválasztott termék, mert van folyamatban lévő eladás!",
-    "cannot_find_item"                   => "Nem található információ a termékről",
-    "categories"                         => "",
-    "category"                           => "Kategória",
-    "category_new"                       => "",
-    "category_required"                  => "Kategória kötelező mező",
-    "change_all_to_allow_alt_desc"       => "Alternativ leirás eng. mindenhol",
-    "change_all_to_not_allow_allow_desc" => "Alternativ leirás tiltása",
-    "change_all_to_serialized"           => "Change All To Serialized",
-    "change_all_to_unserialized"         => "Change All To Unserialized",
-    "change_image"                       => "Kép cseréje",
-    "confirm_bulk_edit"                  => "Biztosan módosítani kívánja a kiválasztott termékeket?",
-    "confirm_bulk_edit_wipe_taxes"       => "Minden termék adó információja cserélve lesz!",
-    "confirm_delete"                     => "Biztosan törölni kívánja a kijelölt termékeket?",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "Beker. Ár",
-    "cost_price_number"                  => "Bekerülési árnak számnak kell lennie",
-    "cost_price_required"                => "Bekerülési ár kötelező mező",
-    "count"                              => "Raktárkészlet módosítása",
-    "csv_import_failed"                  => "CSV import sikertelen",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "A feltöltött fájlban nincs adat, vagy rossz formátum.",
-    "csv_import_partially_failed"        => "Most Items imported. But some were not, here is the list",
-    "csv_import_success"                 => "Import of Items successful",
-    "current_quantity"                   => "Jelenlegi mennyiség",
-    "default_pack_name"                  => "",
-    "description"                        => "Leírás",
-    "details_count"                      => "Raktárkészlet információk",
-    "do_nothing"                         => "Ne csináljon semmit",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit the fields you want to edit for ALL selected items",
-    "edit_multiple_items"                => "Editing Multiple Items",
-    "empty_upc_items"                    => "Üres UPC term.",
-    "error_adding_updating"              => "Termék módositása/hozzáadása sikertelen.",
-    "error_updating_multiple"            => "Termék módositás sikertelen",
-    "generate_barcodes"                  => "Vonalkód generálás",
-    "hsn_code"                           => "",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Termékek importálása CSVből",
-    "info_provided_by"                   => "Info provided by",
-    "inventory"                          => "Raktárkészlet",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Megjegyzés",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "Törölve",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Terméknek van sorozatszáma",
-    "item"                               => "Termék információ",
-    "item_id"                            => "",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "A termék száma már szerepel az adatbázisban",
-    "kit"                                => "",
-    "location"                           => "Helyszín",
-    "low_inventory_items"                => "Kifogyott term.",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "Mennyiség módosítása manuálisan",
-    "markup"                             => "",
-    "name"                               => "Terméknév",
-    "name_required"                      => "Terméknév kötelező mező",
-    "new"                                => "Új termék",
-    "no_description_items"               => "Leirás nélk.",
-    "no_items_to_display"                => "Nincsenek megjeleníthető termékek",
-    "none"                               => "Egysem",
-    "none_selected"                      => "Nem választott ki terméket a módosításhoz",
-    "nonstock"                           => "",
-    "number_information"                 => "Termék száma",
-    "number_required"                    => "UPC/EAN/ISBN kötelező mező",
-    "one_or_multiple"                    => "termék(ek)",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "Mennyiség",
-    "quantity_number"                    => "A mennyiségnek számnak kell lennie",
-    "quantity_required"                  => "A mennyiség kötelező mező",
-    "receiving_quantity"                 => "Egységcsom mennyiség",
-    "remove_image"                       => "Kép eltávolítása",
-    "reorder_level"                      => "Újrarend szint",
-    "reorder_level_number"               => "Újrarendelési szintnek számnak kell lennie.",
-    "reorder_level_required"             => "Újrarendelési mező kötelező",
-    "retrive_item_info"                  => "Retrive Item Info",
-    "sales_tax_1"                        => "Értékesítési adó 1",
-    "sales_tax_2"                        => "Értékesítési adó 2",
-    "search_attributes"                  => "Egyedi mezők",
-    "select_image"                       => "Kép kiválasztása",
-    "serialized_items"                   => "Szerializált termékek",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "Raktárhely",
-    "stock_type"                         => "",
-    "successful_adding"                  => "Sikeresen hozzáadott egy terméket",
-    "successful_bulk_edit"               => "Sikeresen módosította a kiválasztott termékeket",
-    "successful_deleted"                 => "Sikeres törlés",
-    "successful_updating"                => "Sikeresen módosította a terméket",
-    "supplier"                           => "Beszállító",
-    "tax_1"                              => "Adó 1",
-    "tax_2"                              => "Adó 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "Adó %",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "Adó % kötelező mező",
-    "tax_percents"                       => "Adó százalék(ok)",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "Kisker. Ár",
-    "unit_price_number"                  => "Egységárnak számnak kell lennie",
-    "unit_price_required"                => "Kiskereskedelmi ár kötelező mező",
-    "upc_database"                       => "UPC adatbázis",
-    "update"                             => "Termék módosítás",
-    "use_inventory_menu"                 => "Készl. menü haszn.",
+    'add_minus'                          => 'Mennyiség hozzáadása/elvétele',
+    'allow_alt_description'              => 'Alternativ leirás eng.',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => 'Tömeges módosítás',
+    'buy_price_required'                 => 'Vételár kötelező mező',
+    'cannot_be_deleted'                  => 'Nem törölhető a kiválasztott termék, mert van folyamatban lévő eladás!',
+    'cannot_find_item'                   => 'Nem található információ a termékről',
+    'categories'                         => '',
+    'category'                           => 'Kategória',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategória kötelező mező',
+    'change_all_to_allow_alt_desc'       => 'Alternativ leirás eng. mindenhol',
+    'change_all_to_not_allow_allow_desc' => 'Alternativ leirás tiltása',
+    'change_all_to_serialized'           => 'Change All To Serialized',
+    'change_all_to_unserialized'         => 'Change All To Unserialized',
+    'change_image'                       => 'Kép cseréje',
+    'confirm_bulk_edit'                  => 'Biztosan módosítani kívánja a kiválasztott termékeket?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Minden termék adó információja cserélve lesz!',
+    'confirm_delete'                     => 'Biztosan törölni kívánja a kijelölt termékeket?',
+    'confirm_restore'                    => '',
+    'cost_price'                         => 'Beker. Ár',
+    'cost_price_number'                  => 'Bekerülési árnak számnak kell lennie',
+    'cost_price_required'                => 'Bekerülési ár kötelező mező',
+    'count'                              => 'Raktárkészlet módosítása',
+    'csv_import_failed'                  => 'CSV import sikertelen',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'A feltöltött fájlban nincs adat, vagy rossz formátum.',
+    'csv_import_partially_failed'        => 'Most Items imported. But some were not, here is the list',
+    'csv_import_success'                 => 'Import of Items successful',
+    'current_quantity'                   => 'Jelenlegi mennyiség',
+    'default_pack_name'                  => '',
+    'description'                        => 'Leírás',
+    'details_count'                      => 'Raktárkészlet információk',
+    'do_nothing'                         => 'Ne csináljon semmit',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit the fields you want to edit for ALL selected items',
+    'edit_multiple_items'                => 'Editing Multiple Items',
+    'empty_upc_items'                    => 'Üres UPC term.',
+    'error_adding_updating'              => 'Termék módositása/hozzáadása sikertelen.',
+    'error_updating_multiple'            => 'Termék módositás sikertelen',
+    'generate_barcodes'                  => 'Vonalkód generálás',
+    'hsn_code'                           => '',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Termékek importálása CSVből',
+    'info_provided_by'                   => 'Info provided by',
+    'inventory'                          => 'Raktárkészlet',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Megjegyzés',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => 'Törölve',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Terméknek van sorozatszáma',
+    'item'                               => 'Termék információ',
+    'item_id'                            => '',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'A termék száma már szerepel az adatbázisban',
+    'item_number_invalid'                => 'A termék száma nem megengedett karaktereket tartalmaz.',
+    'kit'                                => '',
+    'location'                           => 'Helyszín',
+    'low_inventory_items'                => 'Kifogyott term.',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => 'Mennyiség módosítása manuálisan',
+    'markup'                             => '',
+    'name'                               => 'Terméknév',
+    'name_required'                      => 'Terméknév kötelező mező',
+    'new'                                => 'Új termék',
+    'no_description_items'               => 'Leirás nélk.',
+    'no_items_to_display'                => 'Nincsenek megjeleníthető termékek',
+    'none'                               => 'Egysem',
+    'none_selected'                      => 'Nem választott ki terméket a módosításhoz',
+    'nonstock'                           => '',
+    'number_information'                 => 'Termék száma',
+    'number_required'                    => 'UPC/EAN/ISBN kötelező mező',
+    'one_or_multiple'                    => 'termék(ek)',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => 'Mennyiség',
+    'quantity_number'                    => 'A mennyiségnek számnak kell lennie',
+    'quantity_required'                  => 'A mennyiség kötelező mező',
+    'receiving_quantity'                 => 'Egységcsom mennyiség',
+    'remove_image'                       => 'Kép eltávolítása',
+    'reorder_level'                      => 'Újrarend szint',
+    'reorder_level_number'               => 'Újrarendelési szintnek számnak kell lennie.',
+    'reorder_level_required'             => 'Újrarendelési mező kötelező',
+    'retrive_item_info'                  => 'Retrive Item Info',
+    'sales_tax_1'                        => 'Értékesítési adó 1',
+    'sales_tax_2'                        => 'Értékesítési adó 2',
+    'search_attributes'                  => 'Egyedi mezők',
+    'select_image'                       => 'Kép kiválasztása',
+    'serialized_items'                   => 'Szerializált termékek',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => 'Raktárhely',
+    'stock_type'                         => '',
+    'successful_adding'                  => 'Sikeresen hozzáadott egy terméket',
+    'successful_bulk_edit'               => 'Sikeresen módosította a kiválasztott termékeket',
+    'successful_deleted'                 => 'Sikeres törlés',
+    'successful_updating'                => 'Sikeresen módosította a terméket',
+    'supplier'                           => 'Beszállító',
+    'tax_1'                              => 'Adó 1',
+    'tax_2'                              => 'Adó 2',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Az adó neve nem megengedett karaktereket tartalmaz.',
+    'tax_percent'                        => 'Adó %',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => 'Adó % kötelező mező',
+    'tax_percents'                       => 'Adó százalék(ok)',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => 'Kisker. Ár',
+    'unit_price_number'                  => 'Egységárnak számnak kell lennie',
+    'unit_price_required'                => 'Kiskereskedelmi ár kötelező mező',
+    'upc_database'                       => 'UPC adatbázis',
+    'update'                             => 'Termék módosítás',
+    'use_inventory_menu'                 => 'Készl. menü haszn.',
 ];
diff --git a/app/Language/hu/Login.php b/app/Language/hu/Login.php
index 0a2e55dfc..d13684daa 100644
--- a/app/Language/hu/Login.php
+++ b/app/Language/hu/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "Juhúúúúúú!",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "Érvénytelen felhasználói név vagy jelszó",
-    "login"                         => "Belépés",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Jelszó",
-    "required_username"             => "",
-    "username"                      => "Felhasználó név",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "Juhúúúúúú!",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "Érvénytelen felhasználói név vagy jelszó",
+    "login"                               => "Belépés",
+    "logout"                              => "",
+    "migrating_database"                  => "Adatbázis migrálása",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Az adatbázis sikeresen migrálva!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Jelszó",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Túl sok próbálkozás. Kérjük, várjon egy kicsit, majd próbálja újra.',
+    "username"                            => "Felhasználó név",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/hu/Reports.php b/app/Language/hu/Reports.php
index faee19987..b6310fee3 100644
--- a/app/Language/hu/Reports.php
+++ b/app/Language/hu/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "Adók",
     "taxes_summary_report"                    => "Adók összegző riport",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Összesen",
     "total_inventory_value"                   => "Total Inventory Value",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/hu/Sales.php b/app/Language/hu/Sales.php
index 5928b2708..d22a98aa8 100644
--- a/app/Language/hu/Sales.php
+++ b/app/Language/hu/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "Fiz. hozzáad.",
-    "amount_due"                       => "Fennmaradó",
-    "amount_tendered"                  => "Összeg",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "Mégsem",
-    "cash"                             => "Készpénz",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "Készpénz",
-    "change_due"                       => "Visszajáró",
-    "change_price"                     => "",
-    "check"                            => "Csekk",
-    "check_balance"                    => "Csekk maradék",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "Komment",
-    "comments"                         => "Kommentek",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Eladás befej.",
-    "confirm_cancel_sale"              => "Biztos kiüriti ezt az eladást? MINDEGYIK termék törölve lesz.",
-    "confirm_delete"                   => "Biztos, hogy törli a kijelölt értékesitéseket?",
-    "confirm_restore"                  => "",
-    "credit"                           => "Hitelkártya",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Vevő",
-    "customer_address"                 => "Vevő cím",
-    "customer_discount"                => "Discount",
-    "customer_email"                   => "Vevő e-mail",
-    "customer_location"                => "Vevő hely",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Eladás dátuma",
-    "date_range"                       => "Dátum range",
-    "date_required"                    => "Korrekt dátumot kell megadnia.",
-    "date_type"                        => "Dátum mező kötelező",
-    "debit"                            => "Bankkártya",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "Biztos, hogy törli ezt az eladást? Nem lehet visszavonni!",
-    "delete_entire_sale"               => "Eladás törlése",
-    "delete_successful"                => "Sikeresen törölte az eladást",
-    "delete_unsuccessful"              => "Sikertelenül törölte az eladást",
-    "description_abbrv"                => "Megnevezés",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "Kedv. %",
-    "discount_included"                => "% kedvezmény",
-    "discount_short"                   => "%",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "Szerkeszt",
-    "edit_item"                        => "Módosít",
-    "edit_sale"                        => "Eladás szerkesztése",
-    "email_receipt"                    => "E-mail nyugta",
-    "employee"                         => "Dolgozó",
-    "entry"                            => "",
-    "error_editing_item"               => "Termék módositási hiba",
-    "find_or_scan_item"                => "Termék keresés/scan",
-    "find_or_scan_item_or_receipt"     => "Termék keresése",
-    "giftcard"                         => "Ajándék utalvány",
-    "giftcard_balance"                 => "Ajándék utalvány egyenleg",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Ajándék utalvány sorszáma",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "Eladási s.szám",
-    "include_prices"                   => "",
-    "invoice"                          => "Számla",
-    "invoice_confirm"                  => "Ez a számla el lesz küldve ",
-    "invoice_enable"                   => "Számla elkészítése",
-    "invoice_filter"                   => "Számlák",
-    "invoice_no_email"                 => "Ennek a vásárlónak nincs érvényes email címe",
-    "invoice_number"                   => "Számla #",
-    "invoice_number_duplicate"         => "Kérem adjon meg egyedi számla sorszámot",
-    "invoice_sent"                     => "Szálma elküldve ",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "Számla sikertelen küldése ",
-    "invoice_update"                   => "Újraszámol",
-    "item_insufficient_of_stock"       => "Termék elégtelen mennyiségú a raktárban.",
-    "item_name"                        => "Termék neve",
-    "item_number"                      => "Termék #",
-    "item_out_of_stock"                => "Termék kifogyott",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Nyilv. mód",
-    "must_enter_numeric"               => "Számot kell megadnia a megrendelt mennyiséghez",
-    "must_enter_numeric_giftcard"      => "Vásárlási utalvány számát adja meg",
-    "new_customer"                     => "Új vásárló",
-    "new_item"                         => "Új termék",
-    "no_description"                   => "Nincs leírás",
-    "no_filter"                        => "Mindegyik",
-    "no_items_in_cart"                 => "Nincsenek termékek a kosárban",
-    "no_sales_to_display"              => "Nincsenek megjelenithető értékesitések",
-    "none_selected"                    => "Nem választott ki értékesitést törlésre",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "értékesítés(ek)",
-    "payment"                          => "Fizetés módja",
-    "payment_amount"                   => "Összeg",
-    "payment_not_cover_total"          => "Fizetés összege nem fedezi a teljes összeget",
-    "payment_type"                     => "Típus",
-    "payments"                         => "",
-    "payments_total"                   => "Fizetve eddig:",
-    "price"                            => "Ár",
-    "print_after_sale"                 => "Nyomtatás eladás után",
-    "quantity"                         => "Menny.",
-    "quantity_less_than_reorder_level" => "Figyelem, a megadott mennyiség elégtelen!",
-    "quantity_less_than_zero"          => "Figyelem, a megadott mennyiség elégtelen! Tovább folytathatja az értékesitést, de ellenőrizze a készletet.",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "Eladási nyugta",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "Értékesítési #",
-    "receipt_sent"                     => "Nyugta elküldve",
-    "receipt_unsent"                   => "Nyugta sikertelen küldése",
-    "refund"                           => "",
-    "register"                         => "Értékesitési nyilvántartás",
-    "remove_customer"                  => "Vásárló eltávolítása",
-    "remove_discount"                  => "",
-    "return"                           => "Visszavétel",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "Eladás",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "Vevő:",
-    "sale_time"                        => "Idő",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "Vevő kiválasztása (opcionális)",
-    "send_invoice"                     => "Számla küldése",
-    "send_quote"                       => "",
-    "send_receipt"                     => "Nyugta küldése",
-    "send_work_order"                  => "",
-    "serial"                           => "Serial",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "számla",
-    "show_receipt"                     => "nyugta",
-    "start_typing_customer_name"       => "Kezdje gépelni a vevő nevét…",
-    "start_typing_item_name"           => "Irja be a termék nevét vagy olvassa be a vonalkódot…",
-    "stock"                            => "",
-    "stock_location"                   => "Üzlet helyszine",
-    "sub_total"                        => "Részösszeg",
-    "successfully_deleted"             => "Sikeresen törölte",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "Értékesitése sikeresen felfüggesztve",
-    "successfully_updated"             => "Értékesités sikeresen frissitve",
-    "suspend_sale"                     => "Felfüggeszt",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Függő eladások",
-    "table"                            => "",
-    "takings"                          => "Bevételek",
-    "tax"                              => "Adó",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "Adó %",
-    "taxed_ind"                        => "",
-    "total"                            => "Összesen",
-    "total_tax_exclusive"              => "Adók nélkül",
-    "transaction_failed"               => "Tranzakció sikertelen",
-    "unable_to_add_item"               => "Nem adható termék az értékesitéshez",
-    "unsuccessfully_deleted"           => "Értékesités(ek) nem törölhető(k)",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "Értékesitése sikeresen felfüggesztve",
-    "unsuccessfully_updated"           => "Értékesités sikertelenül frissitve",
-    "unsuspend"                        => "Újraaktivál",
-    "unsuspend_and_delete"             => "Újraaktivál és töröl",
-    "update"                           => "Eladás szerk.",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => 'Fiz. hozzáad.',
+    'amount_due'                        => 'Fennmaradó',
+    'amount_due_not_covered'            => 'A befizetések nem fedezik az esedékes összeget.',
+    'amount_tendered'                   => 'Összeg',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => 'Mégsem',
+    'cash'                              => 'Készpénz',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => 'Készpénz',
+    'change_due'                        => 'Visszajáró',
+    'change_price'                      => '',
+    'check'                             => 'Csekk',
+    'check_balance'                     => 'Csekk maradék',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => 'Komment',
+    'comments'                          => 'Kommentek',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Eladás befej.',
+    'confirm_cancel_sale'               => 'Biztos kiüriti ezt az eladást? MINDEGYIK termék törölve lesz.',
+    'confirm_delete'                    => 'Biztos, hogy törli a kijelölt értékesitéseket?',
+    'confirm_restore'                   => '',
+    'credit'                            => 'Hitelkártya',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Vevő',
+    'customer_address'                  => 'Vevő cím',
+    'customer_discount'                 => 'Discount',
+    'customer_email'                    => 'Vevő e-mail',
+    'customer_location'                 => 'Vevő hely',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => 'Eladás dátuma',
+    'date_range'                        => 'Dátum range',
+    'date_required'                     => 'Korrekt dátumot kell megadnia.',
+    'date_type'                         => 'Dátum mező kötelező',
+    'debit'                             => 'Bankkártya',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => 'Biztos, hogy törli ezt az eladást? Nem lehet visszavonni!',
+    'delete_entire_sale'                => 'Eladás törlése',
+    'delete_successful'                 => 'Sikeresen törölte az eladást',
+    'delete_unsuccessful'               => 'Sikertelenül törölte az eladást',
+    'description_abbrv'                 => 'Megnevezés',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => 'Kedv. %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% kedvezmény',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => 'Szerkeszt',
+    'edit_item'                         => 'Módosít',
+    'edit_sale'                         => 'Eladás szerkesztése',
+    'email_receipt'                     => 'E-mail nyugta',
+    'employee'                          => 'Dolgozó',
+    'entry'                             => '',
+    'error_editing_item'                => 'Termék módositási hiba',
+    'find_or_scan_item'                 => 'Termék keresés/scan',
+    'find_or_scan_item_or_receipt'      => 'Termék keresése',
+    'giftcard'                          => 'Ajándék utalvány',
+    'giftcard_balance'                  => 'Ajándék utalvány egyenleg',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Ajándék utalvány sorszáma',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => 'Eladási s.szám',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Elégtelen ajándékutalvány egyenleg ehhez a fizetéshez.',
+    'insufficient_reward_points'        => 'Elégtelen jutalmi pontok ehhez a fizetéshez.',
+    'invoice'                           => 'Számla',
+    'invoice_confirm'                   => 'Ez a számla el lesz küldve ',
+    'invoice_enable'                    => 'Számla elkészítése',
+    'invoice_filter'                    => 'Számlák',
+    'invoice_no_email'                  => 'Ennek a vásárlónak nincs érvényes email címe',
+    'invoice_number'                    => 'Számla #',
+    'invoice_number_duplicate'          => 'Kérem adjon meg egyedi számla sorszámot',
+    'invoice_sent'                      => 'Szálma elküldve ',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => 'Számla sikertelen küldése ',
+    'invoice_update'                    => 'Újraszámol',
+    'item_insufficient_of_stock'        => 'Termék elégtelen mennyiségú a raktárban.',
+    'item_name'                         => 'Termék neve',
+    'item_number'                       => 'Termék #',
+    'item_out_of_stock'                 => 'Termék kifogyott',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Nyilv. mód',
+    'must_enter_numeric'                => 'Számot kell megadnia a megrendelt mennyiséghez',
+    'must_enter_numeric_giftcard'       => 'Vásárlási utalvány számát adja meg',
+    'must_enter_reference_code'         => 'A hivatkozási/visszakeresési számot meg kell adni.',
+    'negative_amount_tendered'          => 'Az összeg nem lehet negatív.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Új vásárló',
+    'new_item'                          => 'Új termék',
+    'no_description'                    => 'Nincs leírás',
+    'no_filter'                         => 'Mindegyik',
+    'no_items_in_cart'                  => 'Nincsenek termékek a kosárban',
+    'no_sales_to_display'               => 'Nincsenek megjelenithető értékesitések',
+    'none_selected'                     => 'Nem választott ki értékesitést törlésre',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => 'értékesítés(ek)',
+    'payment'                           => 'Fizetés módja',
+    'payment_amount'                    => 'Összeg',
+    'payment_not_cover_total'           => 'Fizetés összege nem fedezi a teljes összeget',
+    'payment_type'                      => 'Típus',
+    'payments'                          => '',
+    'payments_total'                    => 'Fizetve eddig:',
+    'price'                             => 'Ár',
+    'print_after_sale'                  => 'Nyomtatás eladás után',
+    'quantity'                          => 'Menny.',
+    'quantity_less_than_reorder_level'  => 'Figyelem, a megadott mennyiség elégtelen!',
+    'quantity_less_than_zero'           => 'Figyelem, a megadott mennyiség elégtelen! Tovább folytathatja az értékesitést, de ellenőrizze a készletet.',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => 'Eladási nyugta',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => 'Értékesítési #',
+    'receipt_sent'                      => 'Nyugta elküldve',
+    'receipt_unsent'                    => 'Nyugta sikertelen küldése',
+    'reference_code'                    => 'Fizetési hivatkozási kód',
+    'reference_code_invalid_characters' => 'A hivatkozási kód csak betűket és számokat tartalmazhat.',
+    'reference_code_length_error'       => 'A hivatkozási kód hossza érvénytelen.',
+    'refund'                            => '',
+    'register'                          => 'Értékesitési nyilvántartás',
+    'remove_customer'                   => 'Vásárló eltávolítása',
+    'remove_discount'                   => '',
+    'return'                            => 'Visszavétel',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => 'Eladás',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => 'Vevő:',
+    'sale_time'                         => 'Idő',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Vevő kiválasztása (opcionális)',
+    'send_invoice'                      => 'Számla küldése',
+    'send_quote'                        => '',
+    'send_receipt'                      => 'Nyugta küldése',
+    'send_work_order'                   => '',
+    'serial'                            => 'Serial',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'számla',
+    'show_receipt'                      => 'nyugta',
+    'start_typing_customer_name'        => 'Kezdje gépelni a vevő nevét…',
+    'start_typing_item_name'            => 'Irja be a termék nevét vagy olvassa be a vonalkódot…',
+    'stock'                             => '',
+    'stock_location'                    => 'Üzlet helyszine',
+    'sub_total'                         => 'Részösszeg',
+    'successfully_deleted'              => 'Sikeresen törölte',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => 'Értékesitése sikeresen felfüggesztve',
+    'successfully_updated'              => 'Értékesités sikeresen frissitve',
+    'suspend_sale'                      => 'Felfüggeszt',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Függő eladások',
+    'table'                             => '',
+    'takings'                           => 'Bevételek',
+    'tax'                               => 'Adó',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => 'Adó %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Összesen',
+    'total_tax_exclusive'               => 'Adók nélkül',
+    'transaction_failed'                => 'Tranzakció sikertelen',
+    'unable_to_add_item'                => 'Nem adható termék az értékesitéshez',
+    'unsuccessfully_deleted'            => 'Értékesités(ek) nem törölhető(k)',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => 'Értékesitése sikeresen felfüggesztve',
+    'unsuccessfully_updated'            => 'Értékesités sikertelenül frissitve',
+    'unsuspend'                         => 'Újraaktivál',
+    'unsuspend_and_delete'              => 'Újraaktivál és töröl',
+    'update'                            => 'Eladás szerk.',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/hy/Attributes.php b/app/Language/hy/Attributes.php
index 4e154bbbe..e52e89f11 100644
--- a/app/Language/hy/Attributes.php
+++ b/app/Language/hy/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attribute value cannot contain ':' or '|'",
-    "confirm_delete"                   => "Are you sure you want to delete the selected attribute(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected attribute(s)?",
-    "definition_cannot_be_deleted"     => "Could not delete selected attribute(s)",
-    "definition_error_adding_updating" => "Attribute {0} could not be added or updated. Please check the error log.",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Add Attribute",
-    "definition_name_required"         => "Attribute name is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated attribute",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute type is a required field",
-    "definition_unit"                  => "Measurement Unit",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Items to display",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'Attribute value cannot contain \':\' or \'|\'',
+    'confirm_delete'                   => 'Are you sure you want to delete the selected attribute(s)?',
+    'confirm_restore'                  => 'Are you sure you want to restore the selected attribute(s)?',
+    'definition_cannot_be_deleted'     => 'Could not delete selected attribute(s)',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute name is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated attribute',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute type is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Items to display',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'Ցուցադրել որոնման մեջ',
+    'show_in_search_visibility'        => 'Որոնում',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/hy/Config.php b/app/Language/hy/Config.php
index 44a8a13eb..2cc22ade7 100644
--- a/app/Language/hy/Config.php
+++ b/app/Language/hy/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "",
-    "address_required"                          => "",
-    "all_set"                                   => "",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "",
-    "server_notice"                             => "",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "",
-    "system_info"                               => "",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '',
+    'address_required'                          => '',
+    'all_set'                                   => '',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => '',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => '',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => '',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'Վճարման հղման կոդ<br>Երկարության սահմանափակումներ',
+    'payment_reference_code_length_max_label'   => 'Մաքս',
+    'payment_reference_code_length_min_label'   => 'Մին',
+    'perm_risk'                                 => '',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Sendmail-ի ուղին անվավեր է։ Թույլատրվում են միայն տառեր, թվեր, գծիկներ, ընդգծումներ, թեք գծեր, հակառակ թեք գծեր, երկկետեր, բացատներ և կետեր։',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => '',
+    'server_notice'                             => '',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => '',
+    'system_info'                               => '',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/hy/Employees.php b/app/Language/hy/Employees.php
index 34a418062..8549b926a 100644
--- a/app/Language/hy/Employees.php
+++ b/app/Language/hy/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'Դուք չեք կարող հեռացնել ձեր սեփական մոդուլների նվազագույն մատչելիության թույլտվությունները:',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'Թույլատրումների փոփոխումները անջատված են այս ցուցադրտեսքում:',
+    'error_password_change_disallowed'       => 'Գաղտնաբառի փոփոխումները անջատված են այս ցուցադրտեսքում:',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/hy/Error.php b/app/Language/hy/Error.php
index 64ebe1e41..da0821306 100644
--- a/app/Language/hy/Error.php
+++ b/app/Language/hy/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "",
-    "unknown"              => "",
+    'no_permission_module'           => 'Ձեզ չի թույլատրվում մուտք գործել այս անունով մոդուլ',
+    'unable_to_create_env_file'      => 'Հնարավոր չէ ստեղծել {filePath} ֆայլը՝ throttle.key-ը կարգավորելու համար',
+    'unable_to_lock_file'            => 'Հնարավոր չէ արգելափակել {filePath} ֆայլը՝ {reason}',
+    'unable_to_open_lock_file'       => 'Հնարավոր չէ բացել {filePath} ֆայլը՝ {reason}',
+    'unable_to_persist_throttle_key' => 'Հնարավոր չէ պահպանել throttle.key-ը {filePath} ֆայլում',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Հնարավոր չէ կարդալ {filePath} ֆայլը՝ throttle.key-ը կարգավորելու համար',
+    'unknown'                        => 'Անսպասելի սխալ',
 ];
diff --git a/app/Language/hy/Items.php b/app/Language/hy/Items.php
index 42b2152bb..a931dc1cc 100644
--- a/app/Language/hy/Items.php
+++ b/app/Language/hy/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "",
-    "category"                           => "",
-    "category_new"                       => "",
-    "category_required"                  => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_bulk_edit_wipe_taxes"       => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => '',
+    'category'                           => '',
+    'category_new'                       => '',
+    'category_required'                  => '',
+    'change_all_to_allow_alt_desc'       => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => '',
+    'confirm_bulk_edit'                  => '',
+    'confirm_bulk_edit_wipe_taxes'       => '',
+    'confirm_delete'                     => '',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => 'Իրի համարը պարունակում է անթույլատրելի նիշեր։',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Հարկի անվանումը պարունակում է անթույլատրելի նիշեր։',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/hy/Login.php b/app/Language/hy/Login.php
index d443ab5b5..267b222bb 100644
--- a/app/Language/hy/Login.php
+++ b/app/Language/hy/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "",
-    "login"                         => "",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "",
-    "required_username"             => "",
-    "username"                      => "",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "",
+    "login"                               => "",
+    "logout"                              => "",
+    "migrating_database"                  => "Տվյալների բազայի տեղափոխում",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Տվյալների բազան հաջողությամբ տեղափոխվել է!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Չափազանց շատ փորձեր: Խնդրում ենք սպասել մի փոքր և կրկին փորձել:',
+    "username"                            => "",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/hy/Reports.php b/app/Language/hy/Reports.php
index 93316dfd2..15ff6bed9 100644
--- a/app/Language/hy/Reports.php
+++ b/app/Language/hy/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/hy/Sales.php b/app/Language/hy/Sales.php
index b38f57446..6e55a9af6 100644
--- a/app/Language/hy/Sales.php
+++ b/app/Language/hy/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "",
-    "amount_due"                       => "",
-    "amount_tendered"                  => "",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "",
-    "cash"                             => "",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "",
-    "change_due"                       => "",
-    "change_price"                     => "",
-    "check"                            => "",
-    "check_balance"                    => "",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "",
-    "comments"                         => "",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "",
-    "confirm_cancel_sale"              => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "credit"                           => "",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "",
-    "customer_address"                 => "",
-    "customer_discount"                => "",
-    "customer_email"                   => "",
-    "customer_location"                => "",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "",
-    "date_range"                       => "",
-    "date_required"                    => "",
-    "date_type"                        => "",
-    "debit"                            => "",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "",
-    "delete_entire_sale"               => "",
-    "delete_successful"                => "",
-    "delete_unsuccessful"              => "",
-    "description_abbrv"                => "",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "",
-    "discount_included"                => "",
-    "discount_short"                   => "",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "",
-    "edit_item"                        => "",
-    "edit_sale"                        => "",
-    "email_receipt"                    => "",
-    "employee"                         => "",
-    "entry"                            => "",
-    "error_editing_item"               => "",
-    "find_or_scan_item"                => "",
-    "find_or_scan_item_or_receipt"     => "",
-    "giftcard"                         => "",
-    "giftcard_balance"                 => "",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "",
-    "include_prices"                   => "",
-    "invoice"                          => "",
-    "invoice_confirm"                  => "",
-    "invoice_enable"                   => "",
-    "invoice_filter"                   => "",
-    "invoice_no_email"                 => "",
-    "invoice_number"                   => "",
-    "invoice_number_duplicate"         => "",
-    "invoice_sent"                     => "",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "",
-    "invoice_update"                   => "",
-    "item_insufficient_of_stock"       => "",
-    "item_name"                        => "",
-    "item_number"                      => "",
-    "item_out_of_stock"                => "",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "",
-    "new_customer"                     => "",
-    "new_item"                         => "",
-    "no_description"                   => "",
-    "no_filter"                        => "",
-    "no_items_in_cart"                 => "",
-    "no_sales_to_display"              => "",
-    "none_selected"                    => "",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "",
-    "payment_amount"                   => "",
-    "payment_not_cover_total"          => "",
-    "payment_type"                     => "",
-    "payments"                         => "",
-    "payments_total"                   => "",
-    "price"                            => "",
-    "print_after_sale"                 => "",
-    "quantity"                         => "",
-    "quantity_less_than_reorder_level" => "",
-    "quantity_less_than_zero"          => "",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "",
-    "receipt_sent"                     => "",
-    "receipt_unsent"                   => "",
-    "refund"                           => "",
-    "register"                         => "",
-    "remove_customer"                  => "",
-    "remove_discount"                  => "",
-    "return"                           => "",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "",
-    "sale_time"                        => "",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "",
-    "send_invoice"                     => "",
-    "send_quote"                       => "",
-    "send_receipt"                     => "",
-    "send_work_order"                  => "",
-    "serial"                           => "",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "",
-    "show_receipt"                     => "",
-    "start_typing_customer_name"       => "",
-    "start_typing_item_name"           => "",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "",
-    "successfully_deleted"             => "",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "",
-    "successfully_updated"             => "",
-    "suspend_sale"                     => "",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "",
-    "suspended_sales"                  => "",
-    "table"                            => "",
-    "takings"                          => "",
-    "tax"                              => "",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "",
-    "taxed_ind"                        => "",
-    "total"                            => "",
-    "total_tax_exclusive"              => "",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "",
-    "unsuccessfully_deleted"           => "",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "",
-    "unsuccessfully_updated"           => "",
-    "unsuspend"                        => "",
-    "unsuspend_and_delete"             => "",
-    "update"                           => "",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => '',
+    'amount_due'                        => '',
+    'amount_due_not_covered'            => 'Վճարումները չեն ծածկում վճարման ենթակա գումարը.',
+    'amount_tendered'                   => '',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => '',
+    'cash'                              => '',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '',
+    'change_due'                        => '',
+    'change_price'                      => '',
+    'check'                             => '',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => '',
+    'comments'                          => '',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '',
+    'confirm_cancel_sale'               => '',
+    'confirm_delete'                    => '',
+    'confirm_restore'                   => '',
+    'credit'                            => '',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '',
+    'customer_address'                  => '',
+    'customer_discount'                 => '',
+    'customer_email'                    => '',
+    'customer_location'                 => '',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => '',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => '',
+    'date_range'                        => '',
+    'date_required'                     => '',
+    'date_type'                         => '',
+    'debit'                             => '',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => '',
+    'delete_entire_sale'                => '',
+    'delete_successful'                 => '',
+    'delete_unsuccessful'               => '',
+    'description_abbrv'                 => '',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '',
+    'edit_item'                         => '',
+    'edit_sale'                         => '',
+    'email_receipt'                     => '',
+    'employee'                          => '',
+    'entry'                             => '',
+    'error_editing_item'                => '',
+    'find_or_scan_item'                 => '',
+    'find_or_scan_item_or_receipt'      => '',
+    'giftcard'                          => '',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Նվեր քարտի անբավարար մնացորդ այս վճարման համար.',
+    'insufficient_reward_points'        => 'Անբավարար պարգևավճարային միավորներ այս վճարման համար.',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'Պետք է մուտքագրվի հղման/որոնման համարը։',
+    'negative_amount_tendered'          => 'Վճարված գումարը չի կարող բացասական լինել.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => '',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'Վճարման հղման կոդ',
+    'reference_code_invalid_characters' => 'Հղման կոդը պետք է պարունակի միայն տառեր և թվեր։',
+    'reference_code_length_error'       => 'Հղման կոդի երկարությունն անվավեր է։',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/id/Attributes.php b/app/Language/id/Attributes.php
index e997f9f6c..d23be2e08 100644
--- a/app/Language/id/Attributes.php
+++ b/app/Language/id/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Nilai Atribut tidak boleh mengandung karakter '_' atau '|'",
-    "confirm_delete"                   => "Apakah Anda yakin ingin menghapus atribut tersebut?",
-    "confirm_restore"                  => "Apakah Anda yakin ingin mengembalikan atribut tersebut?",
-    "definition_cannot_be_deleted"     => "Tidak bisa menghapus atribut terpilih",
-    "definition_error_adding_updating" => "Atribut {0} tidak dapat ditambah atau diperbaharui. Silahkan periksa log kesalahan.",
-    "definition_flags"                 => "Visibilitas Atribut",
-    "definition_group"                 => "Grup",
-    "definition_id"                    => "Nomor Id",
-    "definition_name"                  => "Tambah Atribut",
-    "definition_name_required"         => "Nama atribut harus diisi",
-    "definition_one_or_multiple"       => "atribut",
-    "definition_successful_adding"     => "Anda telah berhasil menambahkan atribut",
-    "definition_successful_deleted"    => "Anda telah berhasil menghapus",
-    "definition_successful_updating"   => "Anda telah berhasil memperbaharui atribut",
-    "definition_type"                  => "Tipe Atribut",
-    "definition_type_required"         => "Tipe Atribut harus diisi",
-    "definition_unit"                  => "Satuan Ukuran",
-    "definition_values"                => "Nilai Atribut",
-    "new"                              => "Atribut baru",
-    "no_attributes_to_display"         => "Tidak ada Item yang dapat ditampilkan",
-    "receipt_visibility"               => "Struk",
-    "show_in_items"                    => "Tampilkan dalam item",
-    "show_in_items_visibility"         => "Item",
-    "show_in_receipt"                  => "Tampilkan dalam struk",
-    "show_in_receivings"               => "Tampilkan dalam penerimaan",
-    "show_in_receivings_visibility"    => "Penerimaan",
-    "show_in_sales"                    => "Tampilkan dalam penjualan",
-    "show_in_sales_visibility"         => "Penjualan",
-    "update"                           => "Perbarui Atribut",
+    'attribute_value_invalid_chars'    => 'Nilai Atribut tidak boleh mengandung karakter \'_\' atau \'|\'',
+    'confirm_delete'                   => 'Apakah Anda yakin ingin menghapus atribut tersebut?',
+    'confirm_restore'                  => 'Apakah Anda yakin ingin mengembalikan atribut tersebut?',
+    'definition_cannot_be_deleted'     => 'Tidak bisa menghapus atribut terpilih',
+    'definition_invalid_group' => 'Grup yang dipilih tidak ada atau tidak valid.',
+    'definition_error_adding_updating' => 'Atribut {0} tidak dapat ditambah atau diperbaharui. Silahkan periksa log kesalahan.',
+    'definition_flags'                 => 'Visibilitas Atribut',
+    'definition_group'                 => 'Grup',
+    'definition_id'                    => 'Nomor Id',
+    'definition_name'                  => 'Tambah Atribut',
+    'definition_name_required'         => 'Nama atribut harus diisi',
+    'definition_one_or_multiple'       => 'atribut',
+    'definition_successful_adding'     => 'Anda telah berhasil menambahkan atribut',
+    'definition_successful_deleted'    => 'Anda telah berhasil menghapus',
+    'definition_successful_updating'   => 'Anda telah berhasil memperbaharui atribut',
+    'definition_type'                  => 'Tipe Atribut',
+    'definition_type_required'         => 'Tipe Atribut harus diisi',
+    'definition_unit'                  => 'Satuan Ukuran',
+    'definition_values'                => 'Nilai Atribut',
+    'new'                              => 'Atribut baru',
+    'no_attributes_to_display'         => 'Tidak ada Item yang dapat ditampilkan',
+    'receipt_visibility'               => 'Struk',
+    'show_in_items'                    => 'Tampilkan dalam item',
+    'show_in_items_visibility'         => 'Item',
+    'show_in_receipt'                  => 'Tampilkan dalam struk',
+    'show_in_receivings'               => 'Tampilkan dalam penerimaan',
+    'show_in_receivings_visibility'    => 'Penerimaan',
+    'show_in_sales'                    => 'Tampilkan dalam penjualan',
+    'show_in_sales_visibility'         => 'Penjualan',
+    'show_in_search'                   => 'Tampilkan dalam pencarian',
+    'show_in_search_visibility'        => 'Pencarian',
+    'update'                           => 'Perbarui Atribut',
 ];
diff --git a/app/Language/id/Bootstrap_tables.php b/app/Language/id/Bootstrap_tables.php
index 77b13b81a..3e545cecf 100644
--- a/app/Language/id/Bootstrap_tables.php
+++ b/app/Language/id/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "semua",
-    "columns"              => "Kolom",
-    "hide_show_pagination" => "Sembunyikan/Tampilkan paginasi",
-    "loading"              => "Memuat, tunggu ...",
-    "page_from_to"         => "Menampilkan {0} sampai {1} dari {2} baris",
-    "refresh"              => "Segarkan",
-    "rows_per_page"        => "{0} baris per halaman",
-    "toggle"               => "Beralih",
+    'all' => "semua",
+    'columns' => "Kolom",
+    'hide_show_pagination' => "Sembunyikan/Tampilkan paginasi",
+    'loading' => "Memuat, tunggu",
+    'page_from_to' => "Menampilkan {0} sampai {1} dari {2} baris",
+    'refresh' => "Segarkan",
+    'rows_per_page' => "{0} baris per halaman",
+    'toggle' => "Beralih",
 ];
diff --git a/app/Language/id/Config.php b/app/Language/id/Config.php
index f2097acbb..c59d4c44e 100644
--- a/app/Language/id/Config.php
+++ b/app/Language/id/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    'address' => "Alamat Perusahaan",
-    'address_required' => "Alamat Perusahaan wajib diisi.",
-    'all_set' => "Semua perizinan file diatur dengan benar!",
-    'allow_duplicate_barcodes' => "Ijinkan kode batang ganda",
-    'apostrophe' => "Tanda petik (')",
-    'backup_button' => "Cadangkan",
-    'backup_database' => "Cadangkan basis data",
-    'barcode' => "Kode batang",
-    'barcode_company' => "Nama Perusahaan",
-    'barcode_configuration' => "Pengaturan kode batang",
-    'barcode_content' => "Isi kode batang",
-    'barcode_first_row' => "Baris 1",
-    'barcode_font' => "Jenis huruf",
-    'barcode_formats' => "Format masukan",
-    'barcode_generate_if_empty' => "Buatkan kode batang otomatis jika kosong.",
-    'barcode_height' => "Tinggi (px)",
-    'barcode_id' => "Item Id/Nama",
-    'barcode_info' => "Informasi pengaturan kode batang",
-    'barcode_layout' => "Tata letak kode batang",
-    'barcode_name' => "Nama",
-    'barcode_number' => "Kode batang",
-    'barcode_number_in_row' => "Jumlah baris",
-    'barcode_page_cellspacing' => "Tampilkan jarak antar sel pada halaman.",
-    'barcode_page_width' => "Lebar halaman",
-    'barcode_price' => "Harga",
-    'barcode_second_row' => "Baris 2",
-    'barcode_third_row' => "Baris 3",
-    'barcode_tooltip' => "Peringatan: Fitur ini dapat meyebabkan duplikasi item yang diimpor atau dibuat. Jangan digunakan jika Anda tidak ingin menggandakan kode batang.",
-    'barcode_type' => "Jenis kode batang",
-    'barcode_width' => "Lebar (px)",
-    'bottom' => "Bawah",
-    'cash_button' => "",
-    'cash_button_1' => "",
-    'cash_button_2' => "",
-    'cash_button_3' => "",
-    'cash_button_4' => "",
-    'cash_button_5' => "",
-    'cash_button_6' => "",
-    'cash_decimals' => "Desimal Tunai",
-    'cash_decimals_tooltip' => "Jika Desimal Tunai dan Desimal Mata Uang sama, maka pembulatan uang tidak akan dilakukan.",
-    'cash_rounding' => "Pembulatan tunai",
-    'category_dropdown' => "Tampilkan menu tarik turun untuk Kategori",
-    'center' => "Tengah",
-    'change_apperance_tooltip' => "",
-    'comma' => "koma",
-    'company' => "Nama Perusahaan",
-    'company_avatar' => "",
-    'company_change_image' => "Ubah gambar",
-    'company_logo' => "Logo perusahaan",
-    'company_remove_image' => "Hapus gambar",
-    'company_required' => "Nama Perusahaan wajib diisi",
-    'company_select_image' => "Pilih gambar",
-    'company_website_url' => "Situs Perusahaan bukan URL yang benar(http://...).",
-    'country_codes' => "Kode negara",
-    'country_codes_tooltip' => "Daftar kode negara format CSV untuk lookup alamat.",
-    'currency_code' => "Kode Mata uang",
-    'currency_decimals' => "Angka desimal",
-    'currency_symbol' => "Simbol Mata Uang",
-    'current_employee_only' => "",
-    'customer_reward' => "Hadiah",
-    'customer_reward_duplicate' => "Masukkan nama unik untuk hadiah.",
-    'customer_reward_enable' => "Aktifkan Hadiah Konsumen",
-    'customer_reward_invalid_chars' => "Nama hadiah tidak boleh berisi '_'",
-    'customer_reward_required' => "Kolom hadiah tidak boleh kosong",
-    'customer_sales_tax_support' => "Dukungan Pajak Penjualan Pelanggan",
-    'date_or_time_format' => "Penyaring tanggal dan waktu",
-    'datetimeformat' => "Format tanggal dan waktu",
-    'decimal_point' => "Titik Desimal",
-    'default_barcode_font_size_number' => "Pengaturan ukuran kode batang default harus berupa angka.",
-    'default_barcode_font_size_required' => "Pengaturan ukuran kode batang default harus diisi.",
-    'default_barcode_height_number' => "Pengaturan tinggi kode batang harus berupa angka.",
-    'default_barcode_height_required' => "Pengaturan tinggi kode batang harus diisi.",
-    'default_barcode_num_in_row_number' => "Kode batang harus berupa angka.",
-    'default_barcode_num_in_row_required' => "Kode batang harus diisi.",
-    'default_barcode_page_cellspacing_number' => "Pengaturan spasi sel kode batang harus berupa angka.",
-    'default_barcode_page_cellspacing_required' => "Pengaturan spasi sel kode batang harus diisi.",
-    'default_barcode_page_width_number' => "Lebar halaman kode batang harus berupa angka.",
-    'default_barcode_page_width_required' => "Lebar halaman kode batang harus diisi.",
-    'default_barcode_width_number' => "Lebar kode batang harus berupa angka.",
-    'default_barcode_width_required' => "Lebar kode batang harus diisi.",
-    'default_item_columns' => "Kolom item terlihat bawaan",
-    'default_origin_tax_code' => "Kode Pajak Asal Default",
-    'default_receivings_discount' => "Diskon pembelian bawaan",
-    'default_receivings_discount_number' => "Diskon pembelian bawaaan harus berupa angka.",
-    'default_receivings_discount_required' => "Diskon oembelian harus diisi.",
-    'default_sales_discount' => "Diskon penjualan bawaan",
-    'default_sales_discount_number' => "Diskon penjualan harus berupa angka.",
-    'default_sales_discount_required' => "Diskon penjualan harus diisi.",
-    'default_tax_category' => "Kategori pajak bawaan",
-    'default_tax_code' => "Kode pajak bawaan",
-    'default_tax_jurisdiction' => "Yuridiksi Pajak bawaan",
-    'default_tax_name_number' => "Nama Pajak Default harus berupa string.",
-    'default_tax_name_required' => "Jenis pajak harus diisi.",
-    'default_tax_rate' => "Tarif Pajak %",
-    'default_tax_rate_1' => "Tarif Pajak 1",
-    'default_tax_rate_2' => "Tarif Pajak 2",
-    'default_tax_rate_3' => "",
-    'default_tax_rate_number' => "Tarif Pajak harus berupa angkat.",
-    'default_tax_rate_required' => "Tarif Pajak Biasa harus diisi.",
-    'derive_sale_quantity' => "Ijinkan Kuantitas Penjulan Diturunkan",
-    'derive_sale_quantity_tooltip' => "Jika dicentang maka jenis barang baru akan disediakan untuk barang yang dipesan dengan jumlah yang diperpanjang",
-    'dinner_table' => "Meja",
-    'dinner_table_duplicate' => "Masukkan nama meja (harus unik).",
-    'dinner_table_enable' => "Aktifkan meja",
-    'dinner_table_invalid_chars' => "Nama meja tidak dapat berisi karater '_'.",
-    'dinner_table_required' => "Meja adalah kolom yang harus diisi.",
-    'dot' => "titik",
-    'email' => "Surel",
-    'email_configuration' => "Konfigurasi Email",
-    'email_mailpath' => "Direktori untuk Sendmail",
-    'email_protocol' => "Protocol",
-    'email_receipt_check_behaviour' => "Kotak centang Penerimaan Email",
-    'email_receipt_check_behaviour_always' => "Selalu dicentang",
-    'email_receipt_check_behaviour_last' => "Ingat pilihan terakhir",
-    'email_receipt_check_behaviour_never' => "Selalu tidak tercentang",
-    'email_smtp_crypto' => "Enkripsi SMTP",
-    'email_smtp_host' => "Server SMTP",
-    'email_smtp_pass' => "Kata Sandi SMTP",
-    'email_smtp_port' => "Port SMTP",
-    'email_smtp_timeout' => "Masa Aktif SMTP",
-    'email_smtp_user' => "Nama Pengguna SMTP",
-    'enable_avatar' => "",
-    'enable_avatar_tooltip' => "",
-    'enable_dropdown_tooltip' => "",
-    'enable_new_look' => "",
-    'enable_right_bar' => "",
-    'enable_right_bar_tooltip' => "",
-    'enforce_privacy' => "Berlakukan privasi",
-    'enforce_privacy_tooltip' => "Lindungi privasi Pelanggan yang menegakkan data dalam hal data mereka dihapus",
-    'fax' => "Fax",
-    'file_perm' => "Perizinan berkas bermasalah, Silakan perbaiki dan muat ulang halaman ini.",
-    'financial_year' => "Tahun Awal Fiskal",
-    'financial_year_apr' => "1 April",
-    'financial_year_aug' => "1 Agustus",
-    'financial_year_dec' => "1 Desember",
-    'financial_year_feb' => "1 Februari",
-    'financial_year_jan' => "1 Januari",
-    'financial_year_jul' => "1 Juli",
-    'financial_year_jun' => "1 Juni",
-    'financial_year_mar' => "1 Maret",
-    'financial_year_may' => "1 Mei",
-    'financial_year_nov' => "1 November",
-    'financial_year_oct' => "1 Oktober",
-    'financial_year_sep' => "1 September",
-    'floating_labels' => "Label mengambang",
-    'gcaptcha_enable' => "Halaman login reCHAPTCHA",
-    'gcaptcha_secret_key' => "Kunci Rahasia reCHAPTCHA",
-    'gcaptcha_secret_key_required' => "Kunci Rahasia reCHAPTCHA adalah bidang yang harus diisi",
-    'gcaptcha_site_key' => "Kunci Situs reCHAPTCHA",
-    'gcaptcha_site_key_required' => "Kunci Situs reCHAPTCHA adalah bidang yang dibutuhkan",
-    'gcaptcha_tooltip' => "Lindungi Halaman Login dengan reCAPTCHA Google, klik pada ikon untuk pasangan kunci API.",
-    'general' => "Umum",
-    'general_configuration' => "Pengaturan Umum",
-    'giftcard_number' => "Nomor Kartu Hadiah",
-    'giftcard_random' => "Hasilkan acak",
-    'giftcard_series' => "Hasilkan dalam seri",
-    'image_allowed_file_types' => "Jenis berkas yang diizinkan",
-    'image_max_height_tooltip' => "Tinggi maksimum unggahan gambar yang diizinkan dalam piksel (px).",
-    'image_max_size_tooltip' => "ukuran berkas maksimum yang diijinkan untuk mengunggah gambar dalam kilobyte (kb).",
-    'image_max_width_tooltip' => "Lebar maksimum yang diunggah dari pengunggahan gambar dalam piksel (px).",
-    'image_restrictions' => "Pembatasan Pengunggahan Gambar",
-    'include_hsn' => "Termasuk dukungan kode HSN",
-    'info' => "Informasi",
-    'info_configuration' => "Informasi Toko",
-    'input_groups' => "Grup masukan",
-    'integrations' => "Integrasi",
-    'integrations_configuration' => "Integrasi pihak ketiga",
-    'invoice' => "Faktur",
-    'invoice_configuration' => "Pengaturan cetak faktur",
-    'invoice_default_comments' => "Komentar faktur",
-    'invoice_email_message' => "Templat email faktur",
-    'invoice_enable' => "Mengaktifkan faktur",
-    'invoice_printer' => "Pencetak Faktur",
-    'invoice_type' => "Tipe Faktur",
-    'is_readable' => "dapat dibaca, tetapi izin tidak disetel dengan benar. Setel ke 640 atau 660, kemudian segarkan.",
-    'is_writable' => "bisa ditulis, tetapi izin tidak disetel dengan benar. Setel ke 750 dan segarkan.",
-    'item_markup' => "",
-    'jsprintsetup_required' => "Perhatian! Fungsi ini hanya berjalan jika anda menggunakan Firefox yang memiliki tambahan jsPrintSetup. Tetap simpan?",
-    'language' => "Bahasa",
-    'last_used_invoice_number' => "Nomor terakhir faktur",
-    'last_used_quote_number' => "Nomor Penawaran yang terakhir digunakan",
-    'last_used_work_order_number' => "Nomor W/O yang terakhir dipakai",
-    'left' => "Kiri",
-    'license' => "Lisensi",
-    'license_configuration' => "Pernyataan Lisensi",
-    'line_sequence' => "Urutan baris",
-    'lines_per_page' => "Baris per halaman",
-    'lines_per_page_number' => "Baris per halaman harus berupa angka.",
-    'lines_per_page_required' => "Baris per halaman tidak boleh kosong.",
-    'locale' => "Terjemahan",
-    'locale_configuration' => "Konfigurasi Terjemahan",
-    'locale_info' => "Informasi Konfigurasi Terjemahan",
-    'location' => "Lokasi Stock",
-    'location_configuration' => "Lokasi Stock",
-    'location_info' => "Informasi konfigurasi lokasi stock",
-    'login_form' => "Gaya Formulir Log Masuk",
-    'logout' => "Apakah Anda akan membuat cadangan sebelum anda keluar? Klik [OK] untuk pencadangan, [Batal] untuk keluar.",
-    'mailchimp' => "MailChimp",
-    'mailchimp_api_key' => "Kunci API MailChimp",
-    'mailchimp_configuration' => "Pengaturan MailChimp",
-    'mailchimp_key_successfully' => "Kunci API benar.",
-    'mailchimp_key_unsuccessfully' => "Kunci API tidak valid.",
-    'mailchimp_lists' => "Daftar MailChimp",
-    'mailchimp_tooltip' => "Klik pada ikon untuk KUnci API.",
-    'message' => "Pesan",
-    'message_configuration' => "Pengaturan Pesan",
-    'msg_msg' => "Pesan teks tersimpan",
-    'msg_msg_placeholder' => "Apakah Anda ingin menggunakan template SMS menyimpan pesan Anda disini? Jika tidak, biarkan kosong.",
-    'msg_pwd' => "SMS-API Password",
-    'msg_pwd_required' => "SMS-API Password harus diisi",
-    'msg_src' => "ID pengirim SMS-API",
-    'msg_src_required' => "SMS-API Sender ID harus diisi",
-    'msg_uid' => "SMS-API User Name",
-    'msg_uid_required' => "SMS-API Username harus diisi",
-    'multi_pack_enabled' => "Multi paket per item",
-    'no_risk' => "Tidak ada risiko keamanan / kerentanan.",
-    'none' => "none",
-    'notify_alignment' => "Posisi notifikasi Popup",
-    'number_format' => "Format Nomor",
-    'number_locale' => "Terjemahan",
-    'number_locale_invalid' => "Kode bahasa salah. Cek tautan pada tooltip untuk mendapatkan kode bahasa yang benar.",
-    'number_locale_required' => "Kode Lokal wajib diisi.",
-    'number_locale_tooltip' => "Menemukan kode lokal melalui link ini.",
-    'os_timezone' => "Zona waktu OSPOS:",
-    'ospos_info' => "Info pemasangan OSPOS",
-    'payment_options_order' => "Urutan pilihan pembayaran",
-    'perm_risk' => "Setelan izin yang salah berbahaya bagi keamanan perangkat lunak.",
-    'phone' => "Telepon Perusahaan",
-    'phone_required' => "Telepon Perusahaan wajib diisi.",
-    'print_bottom_margin' => "Margin Bawah",
-    'print_bottom_margin_number' => "Default margin bawah harus angka.",
-    'print_bottom_margin_required' => "Default margin Bawah harus di isi.",
-    'print_delay_autoreturn' => "Otomatis Retur pada penundaan Penjualan",
-    'print_delay_autoreturn_number' => "Kolom Otomatis Retur pada Penundaan Penjualan harus diisi.",
-    'print_delay_autoreturn_required' => "Pengembalian otomatis untuk Penjualan tertunda harus berupa angka.",
-    'print_footer' => "Mencetak Footer Browser",
-    'print_header' => "Mencetak Browser Header",
-    'print_left_margin' => "Margin Kiri",
-    'print_left_margin_number' => "Margin kiri harus berupa angka.",
-    'print_left_margin_required' => "Margin kiri wajib di isi.",
-    'print_receipt_check_behaviour' => "Centang Cetak Struk",
-    'print_receipt_check_behaviour_always' => "Selalu dicentang",
-    'print_receipt_check_behaviour_last' => "Ingat pilihan terakhir",
-    'print_receipt_check_behaviour_never' => "Selalu tidak dicentang",
-    'print_right_margin' => "Margin kanan",
-    'print_right_margin_number' => "Margin kiri harus berupa angka.",
-    'print_right_margin_required' => "Margin kanan wajib di isi.",
-    'print_silently' => "Tampilkan Print Dialog",
-    'print_top_margin' => "Margin atas",
-    'print_top_margin_number' => "Nilai margin atas harus di isi angka.",
-    'print_top_margin_required' => "Margin atas wajib di isi.",
-    'quantity_decimals' => "Desimal untuk Jumlah",
-    'quick_cash_enable' => "",
-    'quote_default_comments' => "Komentar faktur",
-    'receipt' => "Struk Penerimaan",
-    'receipt_category' => "",
-    'receipt_configuration' => "Struk Print Settings",
-    'receipt_default' => "Default",
-    'receipt_font_size' => "Ukuran Font",
-    'receipt_font_size_number' => "Ukuran font harus berupa angka.",
-    'receipt_font_size_required' => "Ukuran font harus diisi.",
-    'receipt_info' => "Struk Konfigurasi Informasi",
-    'receipt_printer' => "Tiket Printer",
-    'receipt_short' => "Ringkas",
-    'receipt_show_company_name' => "Tampilkan nama perusahaan",
-    'receipt_show_description' => "Tampilkan deskripsi",
-    'receipt_show_serialnumber' => "Tampilkan nomor seri",
-    'receipt_show_tax_ind' => "Tampilkan Indikator Pajak",
-    'receipt_show_taxes' => "Tampilkan pajak",
-    'receipt_show_total_discount' => "Tampilkan total diskon",
-    'receipt_template' => "Template struk",
-    'receiving_calculate_average_price' => "Menghitung harga rata-rata (Penerimaan)",
-    'recv_invoice_format' => "Format Faktur",
-    'register_mode_default' => "Default register mode",
-    'report_an_issue' => "Laporkan masalah",
-    'return_policy_required' => "Kebijakan retur wajib diisi.",
-    'reward' => "Hadiah",
-    'reward_configuration' => "Konfigurasi Hadiah",
-    'right' => "Kanan",
-    'sales_invoice_format' => "Format Faktur Penjualan",
-    'sales_quote_format' => "Format Penawaran Penjualan",
-    'saved_successfully' => "Konfigurasi berhasil disimpan.",
-    'saved_unsuccessfully' => "Konfigurasi tidak berhasil disimpan.",
-    'security_issue' => "Peringatan Kerentanan Keamanan",
-    'server_notice' => "Silakan gunakan info di bawah ini untuk pelaporan masalah.",
-    'service_charge' => "",
-    'show_due_enable' => "",
-    'show_office_group' => "Tampilkan ikon kantor",
-    'statistics' => "Kirim statistik",
-    'statistics_tooltip' => "Kirim statistik untuk pengembangan dan peningkatan fitur.",
-    'stock_location' => "Lokasi Stock",
-    'stock_location_duplicate' => "Gunakan nama yang unik untuk lokasi stock.",
-    'stock_location_invalid_chars' => "Nama lokasi tidak boleh berisi karakter '_'.",
-    'stock_location_required' => "Nomor lokasi stock harus diisi.",
-    'suggestions_fifth_column' => "",
-    'suggestions_first_column' => "Kolom 1",
-    'suggestions_fourth_column' => "",
-    'suggestions_layout' => "Tampilan Saran Pencarian",
-    'suggestions_second_column' => "Kolom 2",
-    'suggestions_third_column' => "Kolom 3",
-    'system_conf' => "Setting & Conf",
-    'system_info' => "System Info",
-    'table' => "Meja",
-    'table_configuration' => "Konfigurasi Meja",
-    'takings_printer' => "Struk Printer",
-    'tax' => "Pajak",
-    'tax_category' => "Kategori Pajak",
-    'tax_category_duplicate' => "Kategori pajak yang dimasukkan sudah ada.",
-    'tax_category_invalid_chars' => "Kategori pajak yang dimasukkan tidak valid.",
-    'tax_category_required' => "Kategori pajak dibutuhkan.",
-    'tax_category_used' => "Kategori pajak tidak bisa dihapus karena sedang digunakan.",
-    'tax_configuration' => "Konfigurasi Pajak",
-    'tax_decimals' => "Pajak Decimals",
-    'tax_id' => "Id Pajak",
-    'tax_included' => "Dikenakan Pajak",
-    'theme' => "Tema",
-    'theme_preview' => "Pratinjau Tema:",
-    'thousands_separator' => "Pemisah Ribuan",
-    'timezone' => "Zona Waktu",
-    'timezone_error' => "Zona Waktu OSPOS berbeda dari Zona Waktu Anda.",
-    'top' => "Atas",
-    'use_destination_based_tax' => "Gunakan Pajak Berdasarkan Tujuan",
-    'user_timezone' => "Zona waktu lokal:",
-    'website' => "Situs Perusahaan",
-    'wholesale_markup' => "",
-    'work_order_enable' => "Dukungan Work Order",
-    'work_order_format' => "Format Work Order",
+    'address'                                   => 'Alamat Perusahaan',
+    'address_required'                          => 'Alamat Perusahaan wajib diisi.',
+    'all_set'                                   => 'Semua perizinan file diatur dengan benar!',
+    'allow_duplicate_barcodes'                  => 'Ijinkan kode batang ganda',
+    'apostrophe'                                => "Tanda petik (')",
+    'backup_button'                             => 'Cadangkan',
+    'backup_database'                           => 'Cadangkan basis data',
+    'barcode'                                   => 'Kode batang',
+    'barcode_company'                           => 'Nama Perusahaan',
+    'barcode_configuration'                     => 'Pengaturan kode batang',
+    'barcode_content'                           => 'Isi kode batang',
+    'barcode_first_row'                         => 'Baris 1',
+    'barcode_font'                              => 'Jenis huruf',
+    'barcode_formats'                           => 'Format masukan',
+    'barcode_generate_if_empty'                 => 'Buatkan kode batang otomatis jika kosong.',
+    'barcode_height'                            => 'Tinggi (px)',
+    'barcode_id'                                => 'Item Id/Nama',
+    'barcode_info'                              => 'Informasi pengaturan kode batang',
+    'barcode_layout'                            => 'Tata letak kode batang',
+    'barcode_name'                              => 'Nama',
+    'barcode_number'                            => 'Kode batang',
+    'barcode_number_in_row'                     => 'Jumlah baris',
+    'barcode_page_cellspacing'                  => 'Tampilkan jarak antar sel pada halaman.',
+    'barcode_page_width'                        => 'Lebar halaman',
+    'barcode_price'                             => 'Harga',
+    'barcode_second_row'                        => 'Baris 2',
+    'barcode_third_row'                         => 'Baris 3',
+    'barcode_tooltip'                           => 'Peringatan: Fitur ini dapat meyebabkan duplikasi item yang diimpor atau dibuat. Jangan digunakan jika Anda tidak ingin menggandakan kode batang.',
+    'barcode_type'                              => 'Jenis kode batang',
+    'barcode_width'                             => 'Lebar (px)',
+    'bottom'                                    => 'Bawah',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Desimal Tunai',
+    'cash_decimals_tooltip'                     => 'Jika Desimal Tunai dan Desimal Mata Uang sama, maka pembulatan uang tidak akan dilakukan.',
+    'cash_rounding'                             => 'Pembulatan tunai',
+    'category_dropdown'                         => 'Tampilkan menu tarik turun untuk Kategori',
+    'center'                                    => 'Tengah',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'koma',
+    'company'                                   => 'Nama Perusahaan',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Ubah gambar',
+    'company_logo'                              => 'Logo perusahaan',
+    'company_remove_image'                      => 'Hapus gambar',
+    'company_required'                          => 'Nama Perusahaan wajib diisi',
+    'company_select_image'                      => 'Pilih gambar',
+    'company_website_url'                       => 'Situs Perusahaan bukan URL yang benar(http://...).',
+    'country_codes'                             => 'Kode negara',
+    'country_codes_tooltip'                     => 'Daftar kode negara format CSV untuk lookup alamat.',
+    'currency_code'                             => 'Kode Mata uang',
+    'currency_decimals'                         => 'Angka desimal',
+    'currency_symbol'                           => 'Simbol Mata Uang',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Hadiah',
+    'customer_reward_duplicate'                 => 'Masukkan nama unik untuk hadiah.',
+    'customer_reward_enable'                    => 'Aktifkan Hadiah Konsumen',
+    'customer_reward_invalid_chars'             => "Nama hadiah tidak boleh berisi '_'",
+    'customer_reward_required'                  => 'Kolom hadiah tidak boleh kosong',
+    'customer_sales_tax_support'                => 'Dukungan Pajak Penjualan Pelanggan',
+    'date_or_time_format'                       => 'Penyaring tanggal dan waktu',
+    'datetimeformat'                            => 'Format tanggal dan waktu',
+    'decimal_point'                             => 'Titik Desimal',
+    'default_barcode_font_size_number'          => 'Pengaturan ukuran kode batang default harus berupa angka.',
+    'default_barcode_font_size_required'        => 'Pengaturan ukuran kode batang default harus diisi.',
+    'default_barcode_height_number'             => 'Pengaturan tinggi kode batang harus berupa angka.',
+    'default_barcode_height_required'           => 'Pengaturan tinggi kode batang harus diisi.',
+    'default_barcode_num_in_row_number'         => 'Kode batang harus berupa angka.',
+    'default_barcode_num_in_row_required'       => 'Kode batang harus diisi.',
+    'default_barcode_page_cellspacing_number'   => 'Pengaturan spasi sel kode batang harus berupa angka.',
+    'default_barcode_page_cellspacing_required' => 'Pengaturan spasi sel kode batang harus diisi.',
+    'default_barcode_page_width_number'         => 'Lebar halaman kode batang harus berupa angka.',
+    'default_barcode_page_width_required'       => 'Lebar halaman kode batang harus diisi.',
+    'default_barcode_width_number'              => 'Lebar kode batang harus berupa angka.',
+    'default_barcode_width_required'            => 'Lebar kode batang harus diisi.',
+    'default_item_columns'                      => 'Kolom item terlihat bawaan',
+    'default_origin_tax_code'                   => 'Kode Pajak Asal Default',
+    'default_receivings_discount'               => 'Diskon pembelian bawaan',
+    'default_receivings_discount_number'        => 'Diskon pembelian bawaaan harus berupa angka.',
+    'default_receivings_discount_required'      => 'Diskon oembelian harus diisi.',
+    'default_sales_discount'                    => 'Diskon penjualan bawaan',
+    'default_sales_discount_number'             => 'Diskon penjualan harus berupa angka.',
+    'default_sales_discount_required'           => 'Diskon penjualan harus diisi.',
+    'default_tax_category'                      => 'Kategori pajak bawaan',
+    'default_tax_code'                          => 'Kode pajak bawaan',
+    'default_tax_jurisdiction'                  => 'Yuridiksi Pajak bawaan',
+    'default_tax_name_number'                   => 'Nama Pajak Default harus berupa string.',
+    'default_tax_name_required'                 => 'Jenis pajak harus diisi.',
+    'default_tax_rate'                          => 'Tarif Pajak %',
+    'default_tax_rate_1'                        => 'Tarif Pajak 1',
+    'default_tax_rate_2'                        => 'Tarif Pajak 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Tarif Pajak harus berupa angkat.',
+    'default_tax_rate_required'                 => 'Tarif Pajak Biasa harus diisi.',
+    'derive_sale_quantity'                      => 'Ijinkan Kuantitas Penjulan Diturunkan',
+    'derive_sale_quantity_tooltip'              => 'Jika dicentang maka jenis barang baru akan disediakan untuk barang yang dipesan dengan jumlah yang diperpanjang',
+    'dinner_table'                              => 'Meja',
+    'dinner_table_duplicate'                    => 'Masukkan nama meja (harus unik).',
+    'dinner_table_enable'                       => 'Aktifkan meja',
+    'dinner_table_invalid_chars'                => "Nama meja tidak dapat berisi karater '_'.",
+    'dinner_table_required'                     => 'Meja adalah kolom yang harus diisi.',
+    'dot'                                       => 'titik',
+    'email'                                     => 'Surel',
+    'email_configuration'                       => 'Konfigurasi Email',
+    'email_mailpath'                            => 'Direktori untuk Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Kotak centang Penerimaan Email',
+    'email_receipt_check_behaviour_always'      => 'Selalu dicentang',
+    'email_receipt_check_behaviour_last'        => 'Ingat pilihan terakhir',
+    'email_receipt_check_behaviour_never'       => 'Selalu tidak tercentang',
+    'email_smtp_crypto'                         => 'Enkripsi SMTP',
+    'email_smtp_host'                           => 'Server SMTP',
+    'email_smtp_pass'                           => 'Kata Sandi SMTP',
+    'email_smtp_port'                           => 'Port SMTP',
+    'email_smtp_timeout'                        => 'Masa Aktif SMTP',
+    'email_smtp_user'                           => 'Nama Pengguna SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Berlakukan privasi',
+    'enforce_privacy_tooltip'                   => 'Lindungi privasi Pelanggan yang menegakkan data dalam hal data mereka dihapus',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'Perizinan berkas bermasalah, Silakan perbaiki dan muat ulang halaman ini.',
+    'financial_year'                            => 'Tahun Awal Fiskal',
+    'financial_year_apr'                        => '1 April',
+    'financial_year_aug'                        => '1 Agustus',
+    'financial_year_dec'                        => '1 Desember',
+    'financial_year_feb'                        => '1 Februari',
+    'financial_year_jan'                        => '1 Januari',
+    'financial_year_jul'                        => '1 Juli',
+    'financial_year_jun'                        => '1 Juni',
+    'financial_year_mar'                        => '1 Maret',
+    'financial_year_may'                        => '1 Mei',
+    'financial_year_nov'                        => '1 November',
+    'financial_year_oct'                        => '1 Oktober',
+    'financial_year_sep'                        => '1 September',
+    'floating_labels'                           => 'Label mengambang',
+    'gcaptcha_enable'                           => 'Halaman login reCHAPTCHA',
+    'gcaptcha_secret_key'                       => 'Kunci Rahasia reCHAPTCHA',
+    'gcaptcha_secret_key_required'              => 'Kunci Rahasia reCHAPTCHA adalah bidang yang harus diisi',
+    'gcaptcha_site_key'                         => 'Kunci Situs reCHAPTCHA',
+    'gcaptcha_site_key_required'                => 'Kunci Situs reCHAPTCHA adalah bidang yang dibutuhkan',
+    'gcaptcha_tooltip'                          => 'Lindungi Halaman Login dengan reCAPTCHA Google, klik pada ikon untuk pasangan kunci API.',
+    'general'                                   => 'Umum',
+    'general_configuration'                     => 'Pengaturan Umum',
+    'giftcard_number'                           => 'Nomor Kartu Hadiah',
+    'giftcard_random'                           => 'Hasilkan acak',
+    'giftcard_series'                           => 'Hasilkan dalam seri',
+    'image_allowed_file_types'                  => 'Jenis berkas yang diizinkan',
+    'image_max_height_tooltip'                  => 'Tinggi maksimum unggahan gambar yang diizinkan dalam piksel (px).',
+    'image_max_size_tooltip'                    => 'ukuran berkas maksimum yang diijinkan untuk mengunggah gambar dalam kilobyte (kb).',
+    'image_max_width_tooltip'                   => 'Lebar maksimum yang diunggah dari pengunggahan gambar dalam piksel (px).',
+    'image_restrictions'                        => 'Pembatasan Pengunggahan Gambar',
+    'include_hsn'                               => 'Termasuk dukungan kode HSN',
+    'info'                                      => 'Informasi',
+    'info_configuration'                        => 'Informasi Toko',
+    'input_groups'                              => 'Grup masukan',
+    'integrations'                              => 'Integrasi',
+    'integrations_configuration'                => 'Integrasi pihak ketiga',
+    'invoice'                                   => 'Faktur',
+    'invoice_configuration'                     => 'Pengaturan cetak faktur',
+    'invoice_default_comments'                  => 'Komentar faktur',
+    'invoice_email_message'                     => 'Templat email faktur',
+    'invoice_enable'                            => 'Mengaktifkan faktur',
+    'invoice_printer'                           => 'Pencetak Faktur',
+    'invoice_type'                              => 'Tipe Faktur',
+    'is_readable'                               => 'dapat dibaca, tetapi izin tidak disetel dengan benar. Setel ke 640 atau 660, kemudian segarkan.',
+    'is_writable'                               => 'bisa ditulis, tetapi izin tidak disetel dengan benar. Setel ke 750 dan segarkan.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Perhatian! Fungsi ini hanya berjalan jika anda menggunakan Firefox yang memiliki tambahan jsPrintSetup. Tetap simpan?',
+    'language'                                  => 'Bahasa',
+    'last_used_invoice_number'                  => 'Nomor terakhir faktur',
+    'last_used_quote_number'                    => 'Nomor Penawaran yang terakhir digunakan',
+    'last_used_work_order_number'               => 'Nomor W/O yang terakhir dipakai',
+    'left'                                      => 'Kiri',
+    'license'                                   => 'Lisensi',
+    'license_configuration'                     => 'Pernyataan Lisensi',
+    'line_sequence'                             => 'Urutan baris',
+    'lines_per_page'                            => 'Baris per halaman',
+    'lines_per_page_number'                     => 'Baris per halaman harus berupa angka.',
+    'lines_per_page_required'                   => 'Baris per halaman tidak boleh kosong.',
+    'locale'                                    => 'Terjemahan',
+    'locale_configuration'                      => 'Konfigurasi Terjemahan',
+    'locale_info'                               => 'Informasi Konfigurasi Terjemahan',
+    'location'                                  => 'Lokasi Stock',
+    'location_configuration'                    => 'Lokasi Stock',
+    'location_info'                             => 'Informasi konfigurasi lokasi stock',
+    'login_form'                                => 'Gaya Formulir Log Masuk',
+    'logout'                                    => 'Apakah Anda akan membuat cadangan sebelum anda keluar? Klik [OK] untuk pencadangan, [Batal] untuk keluar.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'Kunci API MailChimp',
+    'mailchimp_configuration'                   => 'Pengaturan MailChimp',
+    'mailchimp_key_successfully'                => 'Kunci API benar.',
+    'mailchimp_key_unsuccessfully'              => 'Kunci API tidak valid.',
+    'mailchimp_lists'                           => 'Daftar MailChimp',
+    'mailchimp_tooltip'                         => 'Klik pada ikon untuk KUnci API.',
+    'message'                                   => 'Pesan',
+    'message_configuration'                     => 'Pengaturan Pesan',
+    'msg_msg'                                   => 'Pesan teks tersimpan',
+    'msg_msg_placeholder'                       => 'Apakah Anda ingin menggunakan template SMS menyimpan pesan Anda disini? Jika tidak, biarkan kosong.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'ID pengirim SMS-API',
+    'msg_src_required'                          => 'SMS-API Sender ID harus diisi',
+    'msg_uid'                                   => 'SMS-API User Name',
+    'msg_uid_required'                          => 'SMS-API Username harus diisi',
+    'multi_pack_enabled'                        => 'Multi paket per item',
+    'no_risk'                                   => 'Tidak ada risiko keamanan / kerentanan.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Posisi notifikasi Popup',
+    'number_format'                             => 'Format Nomor',
+    'number_locale'                             => 'Terjemahan',
+    'number_locale_invalid'                     => 'Kode bahasa salah. Cek tautan pada tooltip untuk mendapatkan kode bahasa yang benar.',
+    'number_locale_required'                    => 'Kode Lokal wajib diisi.',
+    'number_locale_tooltip'                     => 'Menemukan kode lokal melalui link ini.',
+    'os_timezone'                               => 'Zona waktu OSPOS:',
+    'ospos_info'                                => 'Info pemasangan OSPOS',
+    'payment_options_order'                     => 'Urutan pilihan pembayaran',
+    'payment_reference_code_length_limits'      => 'Kode Referensi Pembayaran<br>Batas Panjang',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Setelan izin yang salah berbahaya bagi keamanan perangkat lunak.',
+    'phone'                                     => 'Telepon Perusahaan',
+    'phone_required'                            => 'Telepon Perusahaan wajib diisi.',
+    'print_bottom_margin'                       => 'Margin Bawah',
+    'print_bottom_margin_number'                => 'Default margin bawah harus angka.',
+    'print_bottom_margin_required'              => 'Default margin Bawah harus di isi.',
+    'print_delay_autoreturn'                    => 'Otomatis Retur pada penundaan Penjualan',
+    'print_delay_autoreturn_number'             => 'Kolom Otomatis Retur pada Penundaan Penjualan harus diisi.',
+    'print_delay_autoreturn_required'           => 'Pengembalian otomatis untuk Penjualan tertunda harus berupa angka.',
+    'print_footer'                              => 'Mencetak Footer Browser',
+    'print_header'                              => 'Mencetak Browser Header',
+    'print_left_margin'                         => 'Margin Kiri',
+    'print_left_margin_number'                  => 'Margin kiri harus berupa angka.',
+    'print_left_margin_required'                => 'Margin kiri wajib di isi.',
+    'print_receipt_check_behaviour'             => 'Centang Cetak Struk',
+    'print_receipt_check_behaviour_always'      => 'Selalu dicentang',
+    'print_receipt_check_behaviour_last'        => 'Ingat pilihan terakhir',
+    'print_receipt_check_behaviour_never'       => 'Selalu tidak dicentang',
+    'print_right_margin'                        => 'Margin kanan',
+    'print_right_margin_number'                 => 'Margin kiri harus berupa angka.',
+    'print_right_margin_required'               => 'Margin kanan wajib di isi.',
+    'print_silently'                            => 'Tampilkan Print Dialog',
+    'print_top_margin'                          => 'Margin atas',
+    'print_top_margin_number'                   => 'Nilai margin atas harus di isi angka.',
+    'print_top_margin_required'                 => 'Margin atas wajib di isi.',
+    'quantity_decimals'                         => 'Desimal untuk Jumlah',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Komentar faktur',
+    'receipt'                                   => 'Struk Penerimaan',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Struk Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Ukuran Font',
+    'receipt_font_size_number'                  => 'Ukuran font harus berupa angka.',
+    'receipt_font_size_required'                => 'Ukuran font harus diisi.',
+    'receipt_info'                              => 'Struk Konfigurasi Informasi',
+    'receipt_printer'                           => 'Tiket Printer',
+    'receipt_short'                             => 'Ringkas',
+    'receipt_show_company_name'                 => 'Tampilkan nama perusahaan',
+    'receipt_show_description'                  => 'Tampilkan deskripsi',
+    'receipt_show_serialnumber'                 => 'Tampilkan nomor seri',
+    'receipt_show_tax_ind'                      => 'Tampilkan Indikator Pajak',
+    'receipt_show_taxes'                        => 'Tampilkan pajak',
+    'receipt_show_total_discount'               => 'Tampilkan total diskon',
+    'receipt_template'                          => 'Template struk',
+    'receiving_calculate_average_price'         => 'Menghitung harga rata-rata (Penerimaan)',
+    'recv_invoice_format'                       => 'Format Faktur',
+    'register_mode_default'                     => 'Default register mode',
+    'report_an_issue'                           => 'Laporkan masalah',
+    'return_policy_required'                    => 'Kebijakan retur wajib diisi.',
+    'reward'                                    => 'Hadiah',
+    'reward_configuration'                      => 'Konfigurasi Hadiah',
+    'right'                                     => 'Kanan',
+    'sales_invoice_format'                      => 'Format Faktur Penjualan',
+    'sales_quote_format'                        => 'Format Penawaran Penjualan',
+    'mailpath_invalid'                          => 'Jalur sendmail tidak valid. Hanya huruf, angka, tanda hubung, garis bawah, garis miring, garis miring terbalik, titik dua, spasi, dan titik yang diizinkan.',
+    'saved_successfully'                        => 'Konfigurasi berhasil disimpan.',
+    'saved_unsuccessfully'                      => 'Konfigurasi tidak berhasil disimpan.',
+    'security_issue'                            => 'Peringatan Kerentanan Keamanan',
+    'server_notice'                             => 'Silakan gunakan info di bawah ini untuk pelaporan masalah.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Tampilkan ikon kantor',
+    'statistics'                                => 'Kirim statistik',
+    'statistics_tooltip'                        => 'Kirim statistik untuk pengembangan dan peningkatan fitur.',
+    'stock_location'                            => 'Lokasi Stock',
+    'stock_location_duplicate'                  => 'Gunakan nama yang unik untuk lokasi stock.',
+    'stock_location_invalid_chars'              => "Nama lokasi tidak boleh berisi karakter '_'.",
+    'stock_location_required'                   => 'Nomor lokasi stock harus diisi.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Kolom 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Tampilan Saran Pencarian',
+    'suggestions_second_column'                 => 'Kolom 2',
+    'suggestions_third_column'                  => 'Kolom 3',
+    'system_conf'                               => 'Setting & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Meja',
+    'table_configuration'                       => 'Konfigurasi Meja',
+    'takings_printer'                           => 'Struk Printer',
+    'tax'                                       => 'Pajak',
+    'tax_category'                              => 'Kategori Pajak',
+    'tax_category_duplicate'                    => 'Kategori pajak yang dimasukkan sudah ada.',
+    'tax_category_invalid_chars'                => 'Kategori pajak yang dimasukkan tidak valid.',
+    'tax_category_required'                     => 'Kategori pajak dibutuhkan.',
+    'tax_category_used'                         => 'Kategori pajak tidak bisa dihapus karena sedang digunakan.',
+    'tax_configuration'                         => 'Konfigurasi Pajak',
+    'tax_decimals'                              => 'Pajak Decimals',
+    'tax_id'                                    => 'Id Pajak',
+    'tax_included'                              => 'Dikenakan Pajak',
+    'theme'                                     => 'Tema',
+    'theme_preview'                             => 'Pratinjau Tema:',
+    'thousands_separator'                       => 'Pemisah Ribuan',
+    'timezone'                                  => 'Zona Waktu',
+    'timezone_error'                            => 'Zona Waktu OSPOS berbeda dari Zona Waktu Anda.',
+    'top'                                       => 'Atas',
+    'use_destination_based_tax'                 => 'Gunakan Pajak Berdasarkan Tujuan',
+    'user_timezone'                             => 'Zona waktu lokal:',
+    'website'                                   => 'Situs Perusahaan',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Dukungan Work Order',
+    'work_order_format'                         => 'Format Work Order',
 ];
diff --git a/app/Language/id/Employees.php b/app/Language/id/Employees.php
index 8f969aa2b..6673845b6 100644
--- a/app/Language/id/Employees.php
+++ b/app/Language/id/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informasi Karyawan",
-    "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.",
-    "change_employee"              => "",
-    "change_password"              => "Ubah kata kunci",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Apakah Anda yakin ingin menghapus karyawan yang dipilih?",
-    "confirm_restore"              => "Anda yakin ingin mengembalikan karyawan terpilih?",
-    "current_password"             => "Kata kunci sekarang",
-    "current_password_invalid"     => "Kata kunci sekarang salah.",
-    "employee"                     => "Karyawan",
-    "error_adding_updating"        => "Kesalahan menambah / memperbarui karyawan.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Anda tidak dapat menghapus Demo admin user.",
-    "error_updating_demo_admin"    => "Anda tidak dapat mengubah Demo admin user.",
-    "language"                     => "Bahasa",
-    "login_info"                   => "Info Login Karyawan",
-    "manager"                      => "",
-    "new"                          => "Karyawan Baru",
-    "none_selected"                => "Anda belum memilih karyawan untuk dihapus.",
-    "one_or_multiple"              => "Karyawan",
-    "password"                     => "Kata Sandi",
-    "password_minlength"           => "Kata kunci minimal terdiri dari 8 karakter.",
-    "password_must_match"          => "Kata Sandi tidak cocok.",
-    "password_not_must_match"      => "Kata kunci sekarang dan kata kunci baru harus unik.",
-    "password_required"            => "Kata Sandi wajib diisi.",
-    "permission_desc"              => "Tandai kotak di bawah ini untuk memberikan akses ke Modul.",
-    "permission_info"              => "Hak Akses Karyawan",
-    "repeat_password"              => "Ulang Kata Sandi",
-    "subpermission_required"       => "Paling tidak tambahkan satu hak akses untuk setiap modul.",
-    "successful_adding"            => "Anda telah berhasil menambahkan karyawan.",
-    "successful_change_password"   => "Kata kunci berhasil diubah.",
-    "successful_deleted"           => "Berhasil menghapus Kartu Hadiah",
-    "successful_updating"          => "Anda telah berhasil memperbarui karyawan",
-    "system_language"              => "Bahasa Sistem",
-    "unsuccessful_change_password" => "Gagal mengubah kata sandi.",
-    "update"                       => "Ubah Karyawan",
-    "username"                     => "Nama Pengguna",
-    "username_duplicate"           => "Nama pengguna karyawan sudah digunakan. Silakan pilih yang lain.",
-    "username_minlength"           => "Nama Pengguna minimal 5 huruf.",
-    "username_required"            => "Nama Pengguna wajib diisi.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Informasi Karyawan',
+    '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.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Ubah kata kunci',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Apakah Anda yakin ingin menghapus karyawan yang dipilih?',
+    'confirm_restore'                        => 'Anda yakin ingin mengembalikan karyawan terpilih?',
+    'current_password'                       => 'Kata kunci sekarang',
+    'current_password_invalid'               => 'Kata kunci sekarang salah.',
+    'employee'                               => 'Karyawan',
+    'error_adding_updating'                  => 'Kesalahan menambah / memperbarui karyawan.',
+    'error_cannot_remove_own_minimum_grant'  => 'Anda tidak dapat menghapus hak akses modul minimum milik Anda sendiri.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Anda tidak dapat menghapus Demo admin user.',
+    'error_grant_change_disallowed'          => 'Perubahan izin dinonaktifkan dalam demo ini.',
+    'error_password_change_disallowed'       => 'Perubahan kata sandi dinonaktifkan dalam demo ini.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Anda tidak dapat mengubah Demo admin user.',
+    'language'                               => 'Bahasa',
+    'login_info'                             => 'Info Login Karyawan',
+    'manager'                                => '',
+    'new'                                    => 'Karyawan Baru',
+    'none_selected'                          => 'Anda belum memilih karyawan untuk dihapus.',
+    'one_or_multiple'                        => 'Karyawan',
+    'password'                               => 'Kata Sandi',
+    'password_minlength'                     => 'Kata kunci minimal terdiri dari 8 karakter.',
+    'password_must_match'                    => 'Kata Sandi tidak cocok.',
+    'password_not_must_match'                => 'Kata kunci sekarang dan kata kunci baru harus unik.',
+    'password_required'                      => 'Kata Sandi wajib diisi.',
+    'permission_desc'                        => 'Tandai kotak di bawah ini untuk memberikan akses ke Modul.',
+    'permission_info'                        => 'Hak Akses Karyawan',
+    'repeat_password'                        => 'Ulang Kata Sandi',
+    'subpermission_required'                 => 'Paling tidak tambahkan satu hak akses untuk setiap modul.',
+    'successful_adding'                      => 'Anda telah berhasil menambahkan karyawan.',
+    'successful_change_password'             => 'Kata kunci berhasil diubah.',
+    'successful_deleted'                     => 'Berhasil menghapus Kartu Hadiah',
+    'successful_updating'                    => 'Anda telah berhasil memperbarui karyawan',
+    'system_language'                        => 'Bahasa Sistem',
+    'unsuccessful_change_password'           => 'Gagal mengubah kata sandi.',
+    'update'                                 => 'Ubah Karyawan',
+    'username'                               => 'Nama Pengguna',
+    'username_duplicate'                     => 'Nama pengguna karyawan sudah digunakan. Silakan pilih yang lain.',
+    'username_minlength'                     => 'Nama Pengguna minimal 5 huruf.',
+    'username_required'                      => 'Nama Pengguna wajib diisi.',
 ];
diff --git a/app/Language/id/Error.php b/app/Language/id/Error.php
index 54a3924d9..aeea78f34 100644
--- a/app/Language/id/Error.php
+++ b/app/Language/id/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Anda tidak memiliki izin untuk mengakses modul ini",
-    "unknown"              => "tidak dikenal",
+    'no_permission_module'           => 'Anda tidak memiliki izin untuk mengakses modul ini',
+    'unable_to_create_env_file'      => 'Tidak dapat membuat {filePath} untuk menyediakan throttle.key',
+    'unable_to_lock_file'            => 'Tidak dapat mengunci {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Tidak dapat membuka {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Tidak dapat menyimpan throttle.key ke {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Tidak dapat membaca {filePath} untuk menyediakan throttle.key',
+    'unknown'                        => 'tidak dikenal',
 ];
diff --git a/app/Language/id/Items.php b/app/Language/id/Items.php
index 3a93d75df..0aece1480 100644
--- a/app/Language/id/Items.php
+++ b/app/Language/id/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Tambah atau kurangi Inventori.",
-    "allow_alt_description"              => "Izinkan Deskripsi Alternatif",
-    "amount_entry"                       => "Jumlah entri",
-    "bulk_edit"                          => "Ubah Massal",
-    "buy_price_required"                 => "Harga Beli wajib diisi.",
-    "cannot_be_deleted"                  => "Tidak dapat menghapus item terpilih, satu atau lebih item yang dipilih memiliki penjualan.",
-    "cannot_find_item"                   => "Item tidak ditemukan.",
-    "categories"                         => "",
-    "category"                           => "Kategori",
-    "category_new"                       => "",
-    "category_required"                  => "Kategori wajib diisi.",
-    "change_all_to_allow_alt_desc"       => "Izinkan deskripsi alternatif untuk semua.",
-    "change_all_to_not_allow_allow_desc" => "Tidak diizinkan deskripsi alternatif untuk semua.",
-    "change_all_to_serialized"           => "Ubah semua jadi berseri",
-    "change_all_to_unserialized"         => "Ubah semua menjadi tidak berseri",
-    "change_image"                       => "Ubah Gambar",
-    "confirm_bulk_edit"                  => "Anda yakin ingin mengubah semua item terpilih?",
-    "confirm_bulk_edit_wipe_taxes"       => "Semua item informasi pajak akan diganti.",
-    "confirm_delete"                     => "Anda yakin ingin menghapus item terpilih?",
-    "confirm_restore"                    => "Anda yakin ingin mengembalikan item terpilih?",
-    "cost_price"                         => "Harga Beli",
-    "cost_price_number"                  => "Harga beli harus berupa angka.",
-    "cost_price_required"                => "Harga beli harus diisi.",
-    "count"                              => "Mutasi Inventori",
-    "csv_import_failed"                  => "Gagal impor CSV",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Berkas CSV terunggah tidak berisi data atau formatnya salah.",
-    "csv_import_partially_failed"        => "Terdapat {0} item gagal impor pada baris: {1}. Tidak ada baris yang diimpor.",
-    "csv_import_success"                 => "Impor item CSV berhasil.",
-    "current_quantity"                   => "Jumlah saat ini",
-    "default_pack_name"                  => "Setiap",
-    "description"                        => "Deskripsi",
-    "details_count"                      => "Jumlah Detail Inventori",
-    "do_nothing"                         => "Tidak ada Perubahan",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit ruas untuk item terpilih.",
-    "edit_multiple_items"                => "Ubah Beberapa Item",
-    "empty_upc_items"                    => "UPC Items Kosong",
-    "error_adding_updating"              => "Kesalahan ketika menambahkan/memperbarui item",
-    "error_updating_multiple"            => "Kesalahan ketika memperbarui item",
-    "generate_barcodes"                  => "Buat Barcode",
-    "hsn_code"                           => "Kode HSN",
-    "image"                              => "Gambar",
-    "import_items_csv"                   => "Impor item dari CSV sheet",
-    "info_provided_by"                   => "Info disediakan oleh",
-    "inventory"                          => "Inventori",
-    "inventory_CSV_import_quantity"      => "Jumlah telah diimpor dari CSV",
-    "inventory_comments"                 => "Keterangan",
-    "inventory_data_tracking"            => "Pelacakan Data Inventaris",
-    "inventory_date"                     => "Tanggal",
-    "inventory_employee"                 => "Karyawan",
-    "inventory_in_out_quantity"          => "Jumlah Masuk/Keluar",
-    "inventory_remarks"                  => "Komentar",
-    "is_deleted"                         => "Item dihapus",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item Memiliki Nomor Serial",
-    "item"                               => "Item Barang",
-    "item_id"                            => "",
-    "item_number"                        => "Kode Barang",
-    "item_number_duplicate"              => "Nomor item telah ada pada basis data.",
-    "kit"                                => "Perlengkapan",
-    "location"                           => "Lokasi Barang",
-    "low_inventory_items"                => "Daftar Stock Rendah",
-    "low_sell_item"                      => "Produk dengan Penjualan yang Rendah",
-    "manually_editing_of_quantity"       => "Edit manual kuantitas",
-    "markup"                             => "",
-    "name"                               => "Nama Barang",
-    "name_required"                      => "Nama item wajib diisi.",
-    "new"                                => "Buat Barang Baru",
-    "no_description_items"               => "Produk/Item tidak ada deskripsi",
-    "no_items_to_display"                => "Tidak ada item untuk ditampilkan.",
-    "none"                               => "Tidak Ada",
-    "none_selected"                      => "Anda belum memilih Barang untuk diubah",
-    "nonstock"                           => "Tidak ada stok",
-    "number_information"                 => "Nomor Barang",
-    "number_required"                    => "Barcode harus diisi.",
-    "one_or_multiple"                    => "Item Barang",
-    "pack_name"                          => "Nama paket",
-    "qty_per_pack"                       => "Jumlah per paket",
-    "quantity"                           => "Jumlah",
-    "quantity_number"                    => "Jumlah harus berupa angka.",
-    "quantity_required"                  => "Jumlah wajib diisi.",
-    "receiving_quantity"                 => "Jumlah per penerimaan",
-    "remove_image"                       => "Hapus gambar",
-    "reorder_level"                      => "Level pesan ulang",
-    "reorder_level_number"               => "Batas pesan ulang harus berupa angka.",
-    "reorder_level_required"             => "Batas pesan ulang wajib diisi.",
-    "retrive_item_info"                  => "Dapatkan Info Barang",
-    "sales_tax_1"                        => "Pajak Penjualan1",
-    "sales_tax_2"                        => "Pajak Penjualan2",
-    "search_attributes"                  => "Cari Atribut",
-    "select_image"                       => "Pilih Gambar",
-    "serialized_items"                   => "Serial Item",
-    "standard"                           => "Standar",
-    "stock"                              => "Stok",
-    "stock_location"                     => "Lokasi Stok",
-    "stock_type"                         => "Jenis Stok",
-    "successful_adding"                  => "Item Barang telah berhasil ditambahkan",
-    "successful_bulk_edit"               => "Anda telah berhasil memperbarui item yang dipilih",
-    "successful_deleted"                 => "Berhasil menghapus Kartu Hadiah",
-    "successful_updating"                => "Item Barang telah berhasil diperbarui",
-    "supplier"                           => "Pemasok",
-    "tax_1"                              => "Pajak 1",
-    "tax_2"                              => "Pajak 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Kategori Pajak",
-    "tax_percent"                        => "Tarif Pajak",
-    "tax_percent_number"                 => "Nilai persen pajak harus berupa angka",
-    "tax_percent_required"               => "Tarif Pajak wajib diisi.",
-    "tax_percents"                       => "Tarif Pajak",
-    "temp"                               => "Sementara",
-    "type"                               => "Tipe Item",
-    "unit_price"                         => "Harga Jual",
-    "unit_price_number"                  => "Harga satuan harus berupa angka.",
-    "unit_price_required"                => "Harga Jual wajib diisi.",
-    "upc_database"                       => "Basis data Barcode",
-    "update"                             => "Ubah",
-    "use_inventory_menu"                 => "Gunakan Inv. Menu",
+    'add_minus'                          => 'Tambah atau kurangi Inventori.',
+    'allow_alt_description'              => 'Izinkan Deskripsi Alternatif',
+    'amount_entry'                       => 'Jumlah entri',
+    'bulk_edit'                          => 'Ubah Massal',
+    'buy_price_required'                 => 'Harga Beli wajib diisi.',
+    'cannot_be_deleted'                  => 'Tidak dapat menghapus item terpilih, satu atau lebih item yang dipilih memiliki penjualan.',
+    'cannot_find_item'                   => 'Item tidak ditemukan.',
+    'categories'                         => '',
+    'category'                           => 'Kategori',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategori wajib diisi.',
+    'change_all_to_allow_alt_desc'       => 'Izinkan deskripsi alternatif untuk semua.',
+    'change_all_to_not_allow_allow_desc' => 'Tidak diizinkan deskripsi alternatif untuk semua.',
+    'change_all_to_serialized'           => 'Ubah semua jadi berseri',
+    'change_all_to_unserialized'         => 'Ubah semua menjadi tidak berseri',
+    'change_image'                       => 'Ubah Gambar',
+    'confirm_bulk_edit'                  => 'Anda yakin ingin mengubah semua item terpilih?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Semua item informasi pajak akan diganti.',
+    'confirm_delete'                     => 'Anda yakin ingin menghapus item terpilih?',
+    'confirm_restore'                    => 'Anda yakin ingin mengembalikan item terpilih?',
+    'cost_price'                         => 'Harga Beli',
+    'cost_price_number'                  => 'Harga beli harus berupa angka.',
+    'cost_price_required'                => 'Harga beli harus diisi.',
+    'count'                              => 'Mutasi Inventori',
+    'csv_import_failed'                  => 'Gagal impor CSV',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Berkas CSV terunggah tidak berisi data atau formatnya salah.',
+    'csv_import_partially_failed'        => 'Terdapat {0} item gagal impor pada baris: {1}. Tidak ada baris yang diimpor.',
+    'csv_import_success'                 => 'Impor item CSV berhasil.',
+    'current_quantity'                   => 'Jumlah saat ini',
+    'default_pack_name'                  => 'Setiap',
+    'description'                        => 'Deskripsi',
+    'details_count'                      => 'Jumlah Detail Inventori',
+    'do_nothing'                         => 'Tidak ada Perubahan',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit ruas untuk item terpilih.',
+    'edit_multiple_items'                => 'Ubah Beberapa Item',
+    'empty_upc_items'                    => 'UPC Items Kosong',
+    'error_adding_updating'              => 'Kesalahan ketika menambahkan/memperbarui item',
+    'error_updating_multiple'            => 'Kesalahan ketika memperbarui item',
+    'generate_barcodes'                  => 'Buat Barcode',
+    'hsn_code'                           => 'Kode HSN',
+    'image'                              => 'Gambar',
+    'import_items_csv'                   => 'Impor item dari CSV sheet',
+    'info_provided_by'                   => 'Info disediakan oleh',
+    'inventory'                          => 'Inventori',
+    'inventory_CSV_import_quantity'      => 'Jumlah telah diimpor dari CSV',
+    'inventory_comments'                 => 'Keterangan',
+    'inventory_data_tracking'            => 'Pelacakan Data Inventaris',
+    'inventory_date'                     => 'Tanggal',
+    'inventory_employee'                 => 'Karyawan',
+    'inventory_in_out_quantity'          => 'Jumlah Masuk/Keluar',
+    'inventory_remarks'                  => 'Komentar',
+    'is_deleted'                         => 'Item dihapus',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item Memiliki Nomor Serial',
+    'item'                               => 'Item Barang',
+    'item_id'                            => '',
+    'item_number'                        => 'Kode Barang',
+    'item_number_duplicate'              => 'Nomor item telah ada pada basis data.',
+    'item_number_invalid'                => 'Nomor item mengandung karakter yang tidak diizinkan.',
+    'kit'                                => 'Perlengkapan',
+    'location'                           => 'Lokasi Barang',
+    'low_inventory_items'                => 'Daftar Stock Rendah',
+    'low_sell_item'                      => 'Produk dengan Penjualan yang Rendah',
+    'manually_editing_of_quantity'       => 'Edit manual kuantitas',
+    'markup'                             => '',
+    'name'                               => 'Nama Barang',
+    'name_required'                      => 'Nama item wajib diisi.',
+    'new'                                => 'Buat Barang Baru',
+    'no_description_items'               => 'Produk/Item tidak ada deskripsi',
+    'no_items_to_display'                => 'Tidak ada item untuk ditampilkan.',
+    'none'                               => 'Tidak Ada',
+    'none_selected'                      => 'Anda belum memilih Barang untuk diubah',
+    'nonstock'                           => 'Tidak ada stok',
+    'number_information'                 => 'Nomor Barang',
+    'number_required'                    => 'Barcode harus diisi.',
+    'one_or_multiple'                    => 'Item Barang',
+    'pack_name'                          => 'Nama paket',
+    'qty_per_pack'                       => 'Jumlah per paket',
+    'quantity'                           => 'Jumlah',
+    'quantity_number'                    => 'Jumlah harus berupa angka.',
+    'quantity_required'                  => 'Jumlah wajib diisi.',
+    'receiving_quantity'                 => 'Jumlah per penerimaan',
+    'remove_image'                       => 'Hapus gambar',
+    'reorder_level'                      => 'Level pesan ulang',
+    'reorder_level_number'               => 'Batas pesan ulang harus berupa angka.',
+    'reorder_level_required'             => 'Batas pesan ulang wajib diisi.',
+    'retrive_item_info'                  => 'Dapatkan Info Barang',
+    'sales_tax_1'                        => 'Pajak Penjualan1',
+    'sales_tax_2'                        => 'Pajak Penjualan2',
+    'search_attributes'                  => 'Cari Atribut',
+    'select_image'                       => 'Pilih Gambar',
+    'serialized_items'                   => 'Serial Item',
+    'standard'                           => 'Standar',
+    'stock'                              => 'Stok',
+    'stock_location'                     => 'Lokasi Stok',
+    'stock_type'                         => 'Jenis Stok',
+    'successful_adding'                  => 'Item Barang telah berhasil ditambahkan',
+    'successful_bulk_edit'               => 'Anda telah berhasil memperbarui item yang dipilih',
+    'successful_deleted'                 => 'Berhasil menghapus Kartu Hadiah',
+    'successful_updating'                => 'Item Barang telah berhasil diperbarui',
+    'supplier'                           => 'Pemasok',
+    'tax_1'                              => 'Pajak 1',
+    'tax_2'                              => 'Pajak 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Kategori Pajak',
+    'tax_name_invalid'                   => 'Nama pajak mengandung karakter yang tidak diizinkan.',
+    'tax_percent'                        => 'Tarif Pajak',
+    'tax_percent_number'                 => 'Nilai persen pajak harus berupa angka',
+    'tax_percent_required'               => 'Tarif Pajak wajib diisi.',
+    'tax_percents'                       => 'Tarif Pajak',
+    'temp'                               => 'Sementara',
+    'type'                               => 'Tipe Item',
+    'unit_price'                         => 'Harga Jual',
+    'unit_price_number'                  => 'Harga satuan harus berupa angka.',
+    'unit_price_required'                => 'Harga Jual wajib diisi.',
+    'upc_database'                       => 'Basis data Barcode',
+    'update'                             => 'Ubah',
+    'use_inventory_menu'                 => 'Gunakan Inv. Menu',
 ];
diff --git a/app/Language/id/Login.php b/app/Language/id/Login.php
index f1a1c4dd9..8977cea59 100644
--- a/app/Language/id/Login.php
+++ b/app/Language/id/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Saya bukan robot.",
-    "go"                            => "Lanjut",
-    "invalid_gcaptcha"              => "Tolong buktikan bahwa anda bukan robot.",
-    "invalid_installation"          => "Instalasi tidak benar, periksa file php.ini Anda.",
-    "invalid_username_and_password" => "Nama Pengguna Atau Sandi Salah.",
-    "login"                         => "Masuk",
-    "logout"                        => "Keluar",
-    "migration_needed"              => "Migrasi basis data untuk {0} akan mulai setelah masuk.",
-    "password"                      => "Kata kunci",
-    "required_username"             => "Kolom nama pengguna wajib diisi.",
-    "username"                      => "Nama Anda",
-    "welcome"                       => "Selamat Datang di {0}!",
+    "gcaptcha"                            => "Saya bukan robot.",
+    "go"                                  => "Lanjut",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Tolong buktikan bahwa anda bukan robot.",
+    "invalid_installation"                => "Instalasi tidak benar, periksa file php.ini Anda.",
+    "invalid_username_and_password"       => "Nama Pengguna Atau Sandi Salah.",
+    "login"                               => "Masuk",
+    "logout"                              => "Keluar",
+    "migrating_database"                  => "Migrasi Database",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Database berhasil dimigrasi!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "Migrasi basis data untuk {0} akan mulai setelah masuk.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Kata kunci",
+    "required_username"                   => "Kolom nama pengguna wajib diisi.",
+    'too_many_attempts'                   => 'Terlalu banyak percobaan. Harap tunggu sebentar dan coba lagi.',
+    "username"                            => "Nama Anda",
+    "welcome"                             => "Selamat Datang di {0}!"
 ];
diff --git a/app/Language/id/Reports.php b/app/Language/id/Reports.php
index 50f67eaf8..f6f0c6caa 100644
--- a/app/Language/id/Reports.php
+++ b/app/Language/id/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Tarif Pajak",
     "taxes"                                   => "Pajak",
     "taxes_summary_report"                    => "Laporan Ringkasan Pajak",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Total Nilai Persediaan",
     "total_low_sell_quantity"                 => "Total Jumlah Penjualan yang Rendah",
diff --git a/app/Language/id/Sales.php b/app/Language/id/Sales.php
index e15191351..de24eb0c5 100644
--- a/app/Language/id/Sales.php
+++ b/app/Language/id/Sales.php
@@ -1,226 +1,240 @@
 <?php
 
 return [
-    "customers_available_points"       => "Poin tersedia",
-    "rewards_package"                  => "Hadiah",
-    "rewards_remaining_balance"        => "Poin hadiah yang tersisa adalah ",
-    "account_number"                   => "Akun #",
-    "add_payment"                      => "Terima",
-    "amount_due"                       => "Uang Kembalian",
-    "amount_tendered"                  => "Nilai Pembayaran",
-    "authorized_signature"             => "Tanda tangan",
-    "cancel_sale"                      => "Batal Jual",
-    "cash"                             => "Tunai",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Penyesuaian Kas",
-    "cash_deposit"                     => "Deposit Tunai",
-    "cash_filter"                      => "Tunai",
-    "change_due"                       => "Kembalian Uang",
-    "change_price"                     => "Ubah Harga Jual",
-    "check"                            => "Cek",
-    "check_balance"                    => "Aktifkan pengingat",
-    "check_filter"                     => "Cek",
-    "close"                            => "",
-    "comment"                          => "Catatan",
-    "comments"                         => "Keterangan",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Selesai",
-    "confirm_cancel_sale"              => "Apakah anda yakin ingin mengosongkan transaksi penjualan ini? Semua item akan dihapus.",
-    "confirm_delete"                   => "Apakah anda yakin akan menghapus penjualan terpilih?",
-    "confirm_restore"                  => "Apakah anda yakin akan mengembalikan penjualan terpilih?",
-    "credit"                           => "Kartu Kredit",
-    "credit_deposit"                   => "Deposit Kredit",
-    "credit_filter"                    => "Kartu Kredit",
-    "current_table"                    => "",
-    "customer"                         => "Pelanggan",
-    "customer_address"                 => "Alamat",
-    "customer_discount"                => "Diskon",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Lokasi",
-    "customer_mailchimp_status"        => "Status MailChimp",
-    "customer_optional"                => "(Diperlukan untuk Pembayaran Jatuh Tempo)",
-    "customer_required"                => "(Dibutuhkan)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Tanggal Penjualan",
-    "date_range"                       => "Rentang Tanggal",
-    "date_required"                    => "Masukkan tanggal yang benar.",
-    "date_type"                        => "Tanggal tidak boleh kosong.",
-    "debit"                            => "Kartu Debit",
-    "debit_filter"                     => "",
-    "delete"                           => "Boleh dihapus",
-    "delete_confirmation"              => "Apakah anda yakin ingin menghapus transaksi penjualan ini, Pilihan ini tidak dapat dibatalkan.",
-    "delete_entire_sale"               => "Hapus Transaksi Penjualan",
-    "delete_successful"                => "Transaksi Penjualan berhasil dihapus.",
-    "delete_unsuccessful"              => "Transaksi Penjualan gagal dihapus.",
-    "description_abbrv"                => "Deskripsi.",
-    "discard"                          => "Buang",
-    "discard_quote"                    => "",
-    "discount"                         => "Diskon",
-    "discount_included"                => "% Diskon",
-    "discount_short"                   => "%",
-    "due"                              => "Jatuh tempo",
-    "due_filter"                       => "Jatuh tempo",
-    "edit"                             => "Ubah",
-    "edit_item"                        => "Ubah Item",
-    "edit_sale"                        => "Ubah Penjualan",
-    "email_receipt"                    => "email Faktur",
-    "employee"                         => "Karyawan",
-    "entry"                            => "Entri",
-    "error_editing_item"               => "mengubah item salah",
-    "find_or_scan_item"                => "Cari/Scan Item",
-    "find_or_scan_item_or_receipt"     => "Temukan atau pindai Item atau Faktur",
-    "giftcard"                         => "Kartu Hadiah",
-    "giftcard_balance"                 => "Nilai Kupon Bonus",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Nomor Kartu Hadiah",
-    "group_by_category"                => "Dikelompokkan berdasarkan Kategori",
-    "group_by_type"                    => "Dikelompokkan berdasarkan Jenis",
-    "hsn"                              => "HSN",
-    "id"                               => "ID Penjualan",
-    "include_prices"                   => "Termasuk Harga?",
-    "invoice"                          => "Faktur",
-    "invoice_confirm"                  => "Faktur ini akan dikirim ke",
-    "invoice_enable"                   => "Nomor Faktur",
-    "invoice_filter"                   => "Faktur",
-    "invoice_no_email"                 => "Pelanggan ini tidak memiliki alamat email yang valid.",
-    "invoice_number"                   => "Nomor Nota",
-    "invoice_number_duplicate"         => "Nomor nota harus unik.",
-    "invoice_sent"                     => "Faktur dikirim kepada",
-    "invoice_total"                    => "Total faktur",
-    "invoice_type_custom_invoice"      => "Faktur kustom (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Faktur pajak kustom (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Faktur (invoice.php)",
-    "invoice_type_tax_invoice"         => "Faktur pajak (tax_invoice.php)",
-    "invoice_unsent"                   => "Faktur gagal dikirim kepada",
-    "invoice_update"                   => "Menghitung ulang",
-    "item_insufficient_of_stock"       => "Stok Item tidak mencukupi.",
-    "item_name"                        => "Nama Barang",
-    "item_number"                      => "Barang #",
-    "item_out_of_stock"                => "Barang habis.",
-    "key_browser"                      => "Pintasan bermanfaat",
-    "key_cancel"                       => "Membatalkan Penawaran/Faktur/Penjualan saat ini",
-    "key_customer_search"              => "Pencarian Pelanggan",
-    "key_finish_quote"                 => "Selesaikan Struk/Faktur tanpa pembayaran",
-    "key_finish_sale"                  => "Tambahkan Pembayaran dan Lengkapi Faktur/Penjualan",
-    "key_full"                         => "Buka dalam Mode Layar Penuh",
-    "key_function"                     => "Fungsi",
-    "key_help"                         => "Pintasan",
-    "key_help_modal"                   => "Buka Jendela Pintasan",
-    "key_in"                           => "Perbesar",
-    "key_item_search"                  => "Pencarian Barang",
-    "key_out"                          => "Perkecil",
-    "key_payment"                      => "Tambahkan Pembayaran",
-    "key_print"                        => "Cetak Halaman sekarang",
-    "key_restore"                      => "Reset tampilan zum",
-    "key_search"                       => "Cari Tabel Laporan",
-    "key_suspend"                      => "Tangguhkan Penjualan saat ini",
-    "key_suspended"                    => "Tampilkan Penjualan yang Ditangguhkan",
-    "key_system"                       => "Pemintas Sistem",
-    "key_tendered"                     => "Edit jumlah yang dibayarkan",
-    "key_title"                        => "Pintasan Papan Ketik Penjualan",
-    "mc"                               => "",
-    "mode"                             => "Jenis Transaksi",
-    "must_enter_numeric"               => "Nilai yang dimasukkan harus berupa angka.",
-    "must_enter_numeric_giftcard"      => "Nomor Gift Card harus berupa angka.",
-    "new_customer"                     => "Pelanggan Baru",
-    "new_item"                         => "Barang Baru",
-    "no_description"                   => "Tidak ada deskripsi",
-    "no_filter"                        => "Semua",
-    "no_items_in_cart"                 => "Tidak ada Barang dalam Keranjang Belanja.",
-    "no_sales_to_display"              => "Tidak ada penjualan yang ditampilkan.",
-    "none_selected"                    => "Anda belum memilih Penjualan untuk dihapus.",
-    "nontaxed_ind"                     => " . ",
-    "not_authorized"                   => "Aksi ini tidak resmi.",
-    "one_or_multiple"                  => "Penjualan",
-    "payment"                          => "Jenis Pembayaran",
-    "payment_amount"                   => "Jumlah",
-    "payment_not_cover_total"          => "Jumlah pembayaran harus lebih besar atau sama dengan Total.",
-    "payment_type"                     => "Jenis",
-    "payments"                         => "",
-    "payments_total"                   => "Total Pembayaran",
-    "price"                            => "Harga",
-    "print_after_sale"                 => "Cetak Faktur setelah penjualan",
-    "quantity"                         => "Jumlah",
-    "quantity_less_than_reorder_level" => "Peringatan: Stok Inventori barang ini dibawah level order ulang.",
-    "quantity_less_than_zero"          => "Peringatan: Stok Inventori tidak cukup. Proses penjualan masih dapat dilanjutkan, tapi periksa Inventori.",
-    "quantity_of_items"                => "Jumlah dari {0} item",
-    "quote"                            => "Penawaran",
-    "quote_number"                     => "No. Penawaran",
-    "quote_number_duplicate"           => "No. Penawaran tidak boleh sama.",
-    "quote_sent"                       => "Penawaran dikirim ke",
-    "quote_unsent"                     => "Penawaran gagal dikirim ke",
-    "receipt"                          => "Faktur Penjualan",
-    "receipt_no_email"                 => "Pembeli ini tidak memiliki surel yang valid.",
-    "receipt_number"                   => "POS #",
-    "receipt_sent"                     => "Nota dikirim ke",
-    "receipt_unsent"                   => "Noto gagal dikirim kepada",
-    "refund"                           => "Tipe Pengembalian Dana",
-    "register"                         => "Transaksi Penjualan",
-    "remove_customer"                  => "Hapus Pelanggan",
-    "remove_discount"                  => "",
-    "return"                           => "Retur",
-    "rewards"                          => "Poin Penghargaan",
-    "rewards_balance"                  => "Jumlah Poin Penghargaan",
-    "sale"                             => "Penjualan",
-    "sale_by_invoice"                  => "Penjualan berdasarkan Faktur",
-    "sale_for_customer"                => "Pelanggan:",
-    "sale_time"                        => "Waktu",
-    "sales_tax"                        => "Pajak Penjualan",
-    "sales_total"                      => "",
-    "select_customer"                  => "Pilih Pelanggan",
-    "send_invoice"                     => "Kirim Faktur",
-    "send_quote"                       => "Kirim Penawaran",
-    "send_receipt"                     => "Kirim Nota",
-    "send_work_order"                  => "Kirim Order Kerja",
-    "serial"                           => "Seri",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Tampilkan Faktur",
-    "show_receipt"                     => "Tampilkan Nota",
-    "start_typing_customer_name"       => "Ketik Nama Pelanggan...",
-    "start_typing_item_name"           => "Ketik Nama Barang atau Scan Barcode...",
-    "stock"                            => "Stok",
-    "stock_location"                   => "Lokasi Stock",
-    "sub_total"                        => "Sub-total",
-    "successfully_deleted"             => "Transaksi Penjualan berhasil dihapus",
-    "successfully_restored"            => "Berhasil dikembalikan",
-    "successfully_suspended_sale"      => "Penjualan berhasil ditangguhkan.",
-    "successfully_updated"             => "Penjualan berhasil diperbarui.",
-    "suspend_sale"                     => "Tangguhkan",
-    "suspended_doc_id"                 => "Dokumen",
-    "suspended_sale_id"                => "ID Penjualan ditangguhkan",
-    "suspended_sales"                  => "Penangguhan",
-    "table"                            => "Meja",
-    "takings"                          => "Daftar Penjualan",
-    "tax"                              => "Pajak",
-    "tax_id"                           => "ID Pajak",
-    "tax_invoice"                      => "Faktur Pajak",
-    "tax_percent"                      => "Pajak %",
-    "taxed_ind"                        => "P",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Tidak termasuk pajak",
-    "transaction_failed"               => "Transaksi Penjualan gagal.",
-    "unable_to_add_item"               => "Tidak dapat menambahkan item pada penjualan",
-    "unsuccessfully_deleted"           => "Transaksi Penjualan gagal dihapus.",
-    "unsuccessfully_restored"          => "Transaksi Penjualan gagal dikembalikan.",
-    "unsuccessfully_suspended_sale"    => "Transaksi penjualan gagal ditangguhkan.",
-    "unsuccessfully_updated"           => "Transaksi Penjualan gagal diperbaharui.",
-    "unsuspend"                        => "Tidak Ditangguhkan",
-    "unsuspend_and_delete"             => "Batalkan dan hapus penangguhan",
-    "update"                           => "Ubah",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Perintah Kerja",
-    "work_order_number"                => "Nomor Perintah Kerja",
-    "work_order_number_duplicate"      => "Nomor Perintah Kerja tidak boleh sama.",
-    "work_order_sent"                  => "Perintah Kerja dikirim ke",
-    "work_order_unsent"                => "Perintah Kerja gagal dikirim ke",
-    "selected_customer"                => "Pelanggan Terpilih",
+    'account_number'                    => 'Akun #',
+    'add_payment'                       => 'Terima',
+    'amount_due'                        => 'Uang Kembalian',
+    'amount_due_not_covered'            => 'Pembayaran tidak menutupi jumlah yang harus dibayar.',
+    'amount_tendered'                   => 'Nilai Pembayaran',
+    'authorized_signature'              => 'Tanda tangan',
+    'cancel_sale'                       => 'Batal Jual',
+    'cash'                              => 'Tunai',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Penyesuaian Kas',
+    'cash_deposit'                      => 'Deposit Tunai',
+    'cash_filter'                       => 'Tunai',
+    'change_due'                        => 'Kembalian Uang',
+    'change_price'                      => 'Ubah Harga Jual',
+    'check'                             => 'Cek',
+    'check_balance'                     => 'Aktifkan pengingat',
+    'check_filter'                      => 'Cek',
+    'close'                             => '',
+    'comment'                           => 'Catatan',
+    'comments'                          => 'Keterangan',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Selesai',
+    'confirm_cancel_sale'               => 'Apakah anda yakin ingin mengosongkan transaksi penjualan ini? Semua item akan dihapus.',
+    'confirm_delete'                    => 'Apakah anda yakin akan menghapus penjualan terpilih?',
+    'confirm_restore'                   => 'Apakah anda yakin akan mengembalikan penjualan terpilih?',
+    'credit'                            => 'Kartu Kredit',
+    'credit_deposit'                    => 'Deposit Kredit',
+    'credit_filter'                     => 'Kartu Kredit',
+    'current_table'                     => '',
+    'customer'                          => 'Pelanggan',
+    'customer_address'                  => 'Alamat',
+    'customer_discount'                 => 'Diskon',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Lokasi',
+    'customer_mailchimp_status'         => 'Status MailChimp',
+    'customer_optional'                 => '(Diperlukan untuk Pembayaran Jatuh Tempo)',
+    'customer_required'                 => '(Dibutuhkan)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Poin tersedia',
+    'daily_sales'                       => '',
+    'date'                              => 'Tanggal Penjualan',
+    'date_range'                        => 'Rentang Tanggal',
+    'date_required'                     => 'Masukkan tanggal yang benar.',
+    'date_type'                         => 'Tanggal tidak boleh kosong.',
+    'debit'                             => 'Kartu Debit',
+    'debit_filter'                      => '',
+    'delete'                            => 'Boleh dihapus',
+    'delete_confirmation'               => 'Apakah anda yakin ingin menghapus transaksi penjualan ini, Pilihan ini tidak dapat dibatalkan.',
+    'delete_entire_sale'                => 'Hapus Transaksi Penjualan',
+    'delete_successful'                 => 'Transaksi Penjualan berhasil dihapus.',
+    'delete_unsuccessful'               => 'Transaksi Penjualan gagal dihapus.',
+    'description_abbrv'                 => 'Deskripsi.',
+    'discard'                           => 'Buang',
+    'discard_quote'                     => '',
+    'discount'                          => 'Diskon',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Diskon',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Jatuh tempo',
+    'due_filter'                        => 'Jatuh tempo',
+    'edit'                              => 'Ubah',
+    'edit_item'                         => 'Ubah Item',
+    'edit_sale'                         => 'Ubah Penjualan',
+    'email_receipt'                     => 'email Faktur',
+    'employee'                          => 'Karyawan',
+    'entry'                             => 'Entri',
+    'error_editing_item'                => 'mengubah item salah',
+    'find_or_scan_item'                 => 'Cari/Scan Item',
+    'find_or_scan_item_or_receipt'      => 'Temukan atau pindai Item atau Faktur',
+    'giftcard'                          => 'Kartu Hadiah',
+    'giftcard_balance'                  => 'Nilai Kupon Bonus',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Nomor Kartu Hadiah',
+    'group_by_category'                 => 'Dikelompokkan berdasarkan Kategori',
+    'group_by_type'                     => 'Dikelompokkan berdasarkan Jenis',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID Penjualan',
+    'include_prices'                    => 'Termasuk Harga?',
+    'insufficient_giftcard_balance'     => 'Saldo kartu hadiah tidak mencukupi untuk pembayaran ini.',
+    'insufficient_reward_points'        => 'Poin reward tidak cukup untuk pembayaran ini.',
+    'invoice'                           => 'Faktur',
+    'invoice_confirm'                   => 'Faktur ini akan dikirim ke',
+    'invoice_enable'                    => 'Nomor Faktur',
+    'invoice_filter'                    => 'Faktur',
+    'invoice_no_email'                  => 'Pelanggan ini tidak memiliki alamat email yang valid.',
+    'invoice_number'                    => 'Nomor Nota',
+    'invoice_number_duplicate'          => 'Nomor nota harus unik.',
+    'invoice_sent'                      => 'Faktur dikirim kepada',
+    'invoice_total'                     => 'Total faktur',
+    'invoice_type_custom_invoice'       => 'Faktur kustom (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Faktur pajak kustom (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Faktur (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Faktur pajak (tax_invoice.php)',
+    'invoice_unsent'                    => 'Faktur gagal dikirim kepada',
+    'invoice_update'                    => 'Menghitung ulang',
+    'item_insufficient_of_stock'        => 'Stok Item tidak mencukupi.',
+    'item_name'                         => 'Nama Barang',
+    'item_number'                       => 'Barang #',
+    'item_out_of_stock'                 => 'Barang habis.',
+    'key_browser'                       => 'Pintasan bermanfaat',
+    'key_cancel'                        => 'Membatalkan Penawaran/Faktur/Penjualan saat ini',
+    'key_customer_search'               => 'Pencarian Pelanggan',
+    'key_finish_quote'                  => 'Selesaikan Struk/Faktur tanpa pembayaran',
+    'key_finish_sale'                   => 'Tambahkan Pembayaran dan Lengkapi Faktur/Penjualan',
+    'key_full'                          => 'Buka dalam Mode Layar Penuh',
+    'key_function'                      => 'Fungsi',
+    'key_help'                          => 'Pintasan',
+    'key_help_modal'                    => 'Buka Jendela Pintasan',
+    'key_in'                            => 'Perbesar',
+    'key_item_search'                   => 'Pencarian Barang',
+    'key_out'                           => 'Perkecil',
+    'key_payment'                       => 'Tambahkan Pembayaran',
+    'key_print'                         => 'Cetak Halaman sekarang',
+    'key_restore'                       => 'Reset tampilan zum',
+    'key_search'                        => 'Cari Tabel Laporan',
+    'key_suspend'                       => 'Tangguhkan Penjualan saat ini',
+    'key_suspended'                     => 'Tampilkan Penjualan yang Ditangguhkan',
+    'key_system'                        => 'Pemintas Sistem',
+    'key_tendered'                      => 'Edit jumlah yang dibayarkan',
+    'key_title'                         => 'Pintasan Papan Ketik Penjualan',
+    'mc'                                => '',
+    'mode'                              => 'Jenis Transaksi',
+    'must_enter_numeric'                => 'Nilai yang dimasukkan harus berupa angka.',
+    'must_enter_numeric_giftcard'       => 'Nomor Gift Card harus berupa angka.',
+    'must_enter_reference_code'         => 'Nomor referensi/pengambilan harus dimasukkan.',
+    'negative_amount_tendered'          => 'Nilai pembayaran tidak boleh negatif.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Pelanggan Baru',
+    'new_item'                          => 'Barang Baru',
+    'no_description'                    => 'Tidak ada deskripsi',
+    'no_filter'                         => 'Semua',
+    'no_items_in_cart'                  => 'Tidak ada Barang dalam Keranjang Belanja.',
+    'no_sales_to_display'               => 'Tidak ada penjualan yang ditampilkan.',
+    'none_selected'                     => 'Anda belum memilih Penjualan untuk dihapus.',
+    'nontaxed_ind'                      => ' . ',
+    'not_authorized'                    => 'Aksi ini tidak resmi.',
+    'one_or_multiple'                   => 'Penjualan',
+    'payment'                           => 'Jenis Pembayaran',
+    'payment_amount'                    => 'Jumlah',
+    'payment_not_cover_total'           => 'Jumlah pembayaran harus lebih besar atau sama dengan Total.',
+    'payment_type'                      => 'Jenis',
+    'payments'                          => '',
+    'payments_total'                    => 'Total Pembayaran',
+    'price'                             => 'Harga',
+    'print_after_sale'                  => 'Cetak Faktur setelah penjualan',
+    'quantity'                          => 'Jumlah',
+    'quantity_less_than_reorder_level'  => 'Peringatan: Stok Inventori barang ini dibawah level order ulang.',
+    'quantity_less_than_zero'           => 'Peringatan: Stok Inventori tidak cukup. Proses penjualan masih dapat dilanjutkan, tapi periksa Inventori.',
+    'quantity_of_items'                 => 'Jumlah dari {0} item',
+    'quote'                             => 'Penawaran',
+    'quote_number'                      => 'No. Penawaran',
+    'quote_number_duplicate'            => 'No. Penawaran tidak boleh sama.',
+    'quote_sent'                        => 'Penawaran dikirim ke',
+    'quote_unsent'                      => 'Penawaran gagal dikirim ke',
+    'receipt'                           => 'Faktur Penjualan',
+    'receipt_no_email'                  => 'Pembeli ini tidak memiliki surel yang valid.',
+    'receipt_number'                    => 'POS #',
+    'receipt_sent'                      => 'Nota dikirim ke',
+    'receipt_unsent'                    => 'Noto gagal dikirim kepada',
+    'reference_code'                    => 'Kode Referensi Pembayaran',
+    'reference_code_invalid_characters' => 'Kode referensi hanya boleh mengandung huruf dan angka.',
+    'reference_code_length_error'       => 'Panjang kode referensi tidak valid.',
+    'refund'                            => 'Tipe Pengembalian Dana',
+    'register'                          => 'Transaksi Penjualan',
+    'remove_customer'                   => 'Hapus Pelanggan',
+    'remove_discount'                   => '',
+    'return'                            => 'Retur',
+    'rewards'                           => 'Poin Penghargaan',
+    'rewards_balance'                   => 'Jumlah Poin Penghargaan',
+    'rewards_package'                   => 'Hadiah',
+    'rewards_remaining_balance'         => 'Poin hadiah yang tersisa adalah ',
+    'sale'                              => 'Penjualan',
+    'sale_by_invoice'                   => 'Penjualan berdasarkan Faktur',
+    'sale_for_customer'                 => 'Pelanggan:',
+    'sale_time'                         => 'Waktu',
+    'sales_tax'                         => 'Pajak Penjualan',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Pilih Pelanggan',
+    'selected_customer'                 => 'Pelanggan Terpilih',
+    'send_invoice'                      => 'Kirim Faktur',
+    'send_quote'                        => 'Kirim Penawaran',
+    'send_receipt'                      => 'Kirim Nota',
+    'send_work_order'                   => 'Kirim Order Kerja',
+    'serial'                            => 'Seri',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Tampilkan Faktur',
+    'show_receipt'                      => 'Tampilkan Nota',
+    'start_typing_customer_name'        => 'Ketik Nama Pelanggan...',
+    'start_typing_item_name'            => 'Ketik Nama Barang atau Scan Barcode...',
+    'stock'                             => 'Stok',
+    'stock_location'                    => 'Lokasi Stock',
+    'sub_total'                         => 'Sub-total',
+    'successfully_deleted'              => 'Transaksi Penjualan berhasil dihapus',
+    'successfully_restored'             => 'Berhasil dikembalikan',
+    'successfully_suspended_sale'       => 'Penjualan berhasil ditangguhkan.',
+    'successfully_updated'              => 'Penjualan berhasil diperbarui.',
+    'suspend_sale'                      => 'Tangguhkan',
+    'suspended_doc_id'                  => 'Dokumen',
+    'suspended_sale_id'                 => 'ID Penjualan ditangguhkan',
+    'suspended_sales'                   => 'Penangguhan',
+    'table'                             => 'Meja',
+    'takings'                           => 'Daftar Penjualan',
+    'tax'                               => 'Pajak',
+    'tax_id'                            => 'ID Pajak',
+    'tax_invoice'                       => 'Faktur Pajak',
+    'tax_percent'                       => 'Pajak %',
+    'taxed_ind'                         => 'P',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Tidak termasuk pajak',
+    'transaction_failed'                => 'Transaksi Penjualan gagal.',
+    'unable_to_add_item'                => 'Tidak dapat menambahkan item pada penjualan',
+    'unsuccessfully_deleted'            => 'Transaksi Penjualan gagal dihapus.',
+    'unsuccessfully_restored'           => 'Transaksi Penjualan gagal dikembalikan.',
+    'unsuccessfully_suspended_sale'     => 'Transaksi penjualan gagal ditangguhkan.',
+    'unsuccessfully_updated'            => 'Transaksi Penjualan gagal diperbaharui.',
+    'unsuspend'                         => 'Tidak Ditangguhkan',
+    'unsuspend_and_delete'              => 'Batalkan dan hapus penangguhan',
+    'update'                            => 'Ubah',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Perintah Kerja',
+    'work_order_number'                 => 'Nomor Perintah Kerja',
+    'work_order_number_duplicate'       => 'Nomor Perintah Kerja tidak boleh sama.',
+    'work_order_sent'                   => 'Perintah Kerja dikirim ke',
+    'work_order_unsent'                 => 'Perintah Kerja gagal dikirim ke',
 ];
diff --git a/app/Language/it/Attributes.php b/app/Language/it/Attributes.php
index 5665bf04a..53e41620f 100644
--- a/app/Language/it/Attributes.php
+++ b/app/Language/it/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Il valore dell'attributo non può contenere '_' o '|'",
-    "confirm_delete"                   => "Sei sicuro di voler eliminare gli attributi selezionati?",
-    "confirm_restore"                  => "Sei sicuro di voler ripristinare l'attributo selezionato?",
-    "definition_cannot_be_deleted"     => "Non riesco a cancellare l'attributo selezionato",
-    "definition_error_adding_updating" => "Impossibile aggiungere o aggiornare l'attributo {0}. Si prega di controllare il registro degli errori.",
-    "definition_flags"                 => "Visibilità attributo",
-    "definition_group"                 => "Gruppo",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Aggiungi attributo",
-    "definition_name_required"         => "Nome attributo è richiesto",
-    "definition_one_or_multiple"       => "attributo(i)",
-    "definition_successful_adding"     => "Hai aggiunto il prodotto con successo",
-    "definition_successful_deleted"    => "Cancellato con successo",
-    "definition_successful_updating"   => "Hai aggiornato correttamente l'attributo",
-    "definition_type"                  => "Tipo di attributo",
-    "definition_type_required"         => "Il tipo di attribuito è richiesto",
-    "definition_unit"                  => "Unità di misura",
-    "definition_values"                => "Valore attributo",
-    "new"                              => "Nuovo attributo",
-    "no_attributes_to_display"         => "Nessun elemento da visualizzare",
-    "receipt_visibility"               => "Scontrino",
-    "show_in_items"                    => "Visualizza in articoli",
-    "show_in_items_visibility"         => "Articoli",
-    "show_in_receipt"                  => "Mostra in ricevuta",
-    "show_in_receivings"               => "Mostra negli incassi",
-    "show_in_receivings_visibility"    => "Ricezione",
-    "show_in_sales"                    => "Visualizza in vendite",
-    "show_in_sales_visibility"         => "Vendite",
-    "update"                           => "Aggiorna attributo",
+    'attribute_value_invalid_chars'    => 'Il valore dell\'attributo non può contenere \'_\' o \'|\'',
+    'confirm_delete'                   => 'Sei sicuro di voler eliminare gli attributi selezionati?',
+    'confirm_restore'                  => 'Sei sicuro di voler ripristinare l\'attributo selezionato?',
+    'definition_cannot_be_deleted'     => 'Non riesco a cancellare l\'attributo selezionato',
+    'definition_invalid_group' => 'Il gruppo selezionato non esiste o non è valido.',
+    'definition_error_adding_updating' => 'Impossibile aggiungere o aggiornare l\'attributo {0}. Si prega di controllare il registro degli errori.',
+    'definition_flags'                 => 'Visibilità attributo',
+    'definition_group'                 => 'Gruppo',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Aggiungi attributo',
+    'definition_name_required'         => 'Nome attributo è richiesto',
+    'definition_one_or_multiple'       => 'attributo(i)',
+    'definition_successful_adding'     => 'Hai aggiunto il prodotto con successo',
+    'definition_successful_deleted'    => 'Cancellato con successo',
+    'definition_successful_updating'   => 'Hai aggiornato correttamente l\'attributo',
+    'definition_type'                  => 'Tipo di attributo',
+    'definition_type_required'         => 'Il tipo di attribuito è richiesto',
+    'definition_unit'                  => 'Unità di misura',
+    'definition_values'                => 'Valore attributo',
+    'new'                              => 'Nuovo attributo',
+    'no_attributes_to_display'         => 'Nessun elemento da visualizzare',
+    'receipt_visibility'               => 'Scontrino',
+    'show_in_items'                    => 'Visualizza in articoli',
+    'show_in_items_visibility'         => 'Articoli',
+    'show_in_receipt'                  => 'Mostra in ricevuta',
+    'show_in_receivings'               => 'Mostra negli incassi',
+    'show_in_receivings_visibility'    => 'Ricezione',
+    'show_in_sales'                    => 'Visualizza in vendite',
+    'show_in_sales_visibility'         => 'Vendite',
+    'show_in_search'                   => 'Visualizza nella ricerca',
+    'show_in_search_visibility'        => 'Ricerca',
+    'update'                           => 'Aggiorna attributo',
 ];
diff --git a/app/Language/it/Bootstrap_tables.php b/app/Language/it/Bootstrap_tables.php
index 673bd6c2a..68807fd4f 100644
--- a/app/Language/it/Bootstrap_tables.php
+++ b/app/Language/it/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Tutte",
-    "columns"              => "Colonne",
-    "hide_show_pagination" => "Nascondi/mostra paginazione",
-    "loading"              => "Caricamento, attendere prego...",
-    "page_from_to"         => "Mostro {0} a {1} di {2} righe",
-    "refresh"              => "Ricarica",
-    "rows_per_page"        => "{0} righe per pagina",
-    "toggle"               => "Inverti",
+    'all' => "Tutte",
+    'columns' => "Colonne",
+    'hide_show_pagination' => "Nascondi/mostra paginazione",
+    'loading' => "Caricamento, attendere prego",
+    'page_from_to' => "Mostro {0} a {1} di {2} righe",
+    'refresh' => "Ricarica",
+    'rows_per_page' => "{0} righe per pagina",
+    'toggle' => "Inverti",
 ];
diff --git a/app/Language/it/Common.php b/app/Language/it/Common.php
index ded83079c..5bb34d433 100644
--- a/app/Language/it/Common.php
+++ b/app/Language/it/Common.php
@@ -3,18 +3,18 @@
 return [
     "address_1"                      => "Indirizzo 1",
     "address_2"                      => "Indirizzo 2",
-    "admin"                          => "",
+    "admin"                          => "Amministratore",
     "city"                           => "Città",
-    "clerk"                          => "",
+    "clerk"                          => "Impiegato",
     "close"                          => "Chiudere",
-    "color"                          => "",
+    "color"                          => "Colori del tema",
     "comments"                       => "Commenti",
     "common"                         => "comune",
     "confirm_search"                 => "Hai selezionato una o più righe, queste non saranno più selezionate dopo la tua ricerca. Sei sicuro di voler procedere alla ricerca?",
     "copyrights"                     => "© 2010 - {0}",
     "correct_errors"                 => "Correggi gli errori identificati prima di salvare",
     "country"                        => "Paese",
-    "dashboard"                      => "",
+    "dashboard"                      => "Pannello di controllo",
     "date"                           => "Data",
     "delete"                         => "Cancella",
     "det"                            => "dettagli",
@@ -26,14 +26,14 @@ return [
     "export_csv_no"                  => "No",
     "export_csv_yes"                 => "Si",
     "fields_required_message"        => "I campi in rosso sono richiesti",
-    "fields_required_message_unique" => "",
+    "fields_required_message_unique" => "I campi in rosso sono richiesti e devono essere unici",
     "first_name"                     => "Nome",
     "first_name_required"            => "Campo Nome è richiesto.",
     "first_page"                     => "Primo",
     "gender"                         => "Sesso",
     "gender_female"                  => "F",
     "gender_male"                    => "M",
-    "gender_undefined"               => "",
+    "gender_undefined"               => "Non definito",
     "icon"                           => "Icona",
     "id"                             => "ID",
     "import"                         => "Importa",
@@ -51,18 +51,18 @@ return [
     "logo"                           => "Logo",
     "logo_mark"                      => "Marchio",
     "logout"                         => "Esci",
-    "manager"                        => "",
-    "migration_needed"               => "",
+    "manager"                        => "Responsabile",
+    "migration_needed"               => "Una migrazione del database verso {0} inizierà dopo l'accesso.",
     "new"                            => "Nuovo",
-    "no"                             => "",
+    "no"                             => "No",
     "no_persons_to_display"          => "Non ci sono persone da mostrare.",
     "none_selected_text"             => "[Selezionare]",
     "or"                             => "OR",
-    "people"                         => "",
+    "people"                         => "Persone",
     "phone_number"                   => "Numero di Telefono",
-    "phone_number_required"          => "",
+    "phone_number_required"          => "Il numero di telefono è richiesto",
     "please_visit_my"                => "Visitare il",
-    "position"                       => "",
+    "position"                       => "Posizione",
     "powered_by"                     => "Sviluppato da",
     "price"                          => "Prezzo",
     "print"                          => "Stampa",
@@ -83,7 +83,7 @@ return [
     "website"                        => "Sito web",
     "welcome"                        => "Benvenuto",
     "welcome_message"                => "Benvenuto in OSPOS, clicca un modulo sottostante per incominciare.",
-    "yes"                            => "",
+    "yes"                            => "Sì",
     "you_are_using_ospos"            => "Stai usando la versione Open Source Point Of Sale (Punto di vendita)",
     "zip"                            => "CAP",
 ];
diff --git a/app/Language/it/Config.php b/app/Language/it/Config.php
index 47020ebb9..e5cce9eec 100644
--- a/app/Language/it/Config.php
+++ b/app/Language/it/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Indirizzo Azienda",
-    "address_required"                          => "Il campo Indirizzo Azienda è obbligatorio.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Permetti Codice a Barre duplicati",
-    "apostrophe"                                => "apostrofo",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup del Database",
-    "barcode"                                   => "Codici a Barre",
-    "barcode_company"                           => "Nome Azienda",
-    "barcode_configuration"                     => "Configurazione Codici a Barre",
-    "barcode_content"                           => "Contenuto Codice a Barre",
-    "barcode_first_row"                         => "Riga 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Formati d'input",
-    "barcode_generate_if_empty"                 => "Genera se vuoto.",
-    "barcode_height"                            => "Altezza (px)",
-    "barcode_id"                                => "Id/Nome Elemento",
-    "barcode_info"                              => "Informazioni Configurazione Codice a Barre",
-    "barcode_layout"                            => "Layout Codice a Barre",
-    "barcode_name"                              => "Nome",
-    "barcode_number"                            => "Codice a Barre",
-    "barcode_number_in_row"                     => "Numero nella riga",
-    "barcode_page_cellspacing"                  => "Mostra spaziatura celle.",
-    "barcode_page_width"                        => "Mostra larghezza pagina",
-    "barcode_price"                             => "Prezzo",
-    "barcode_second_row"                        => "Riga 2",
-    "barcode_third_row"                         => "Riga 3",
-    "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.",
-    "barcode_type"                              => "Tipo Codice a Barre",
-    "barcode_width"                             => "Larghezza (px)",
-    "bottom"                                    => "Parte inferiore",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Decimali Contanti",
-    "cash_decimals_tooltip"                     => "Se Decimali Contanti e Decimali Valuta sono le stesse non verrà effettuato un arrotondamento.",
-    "cash_rounding"                             => "Arrotondamento Contanti",
-    "category_dropdown"                         => "Mostra categoria come menu a discesa",
-    "center"                                    => "Centro",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "virgola",
-    "company"                                   => "Nome Azienda",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Cambia Immagine",
-    "company_logo"                              => "Logo Azienda",
-    "company_remove_image"                      => "Rimuovi Immagine",
-    "company_required"                          => "Il campo Nome Compagnia è obbligatorio",
-    "company_select_image"                      => "Seleziona Immagine",
-    "company_website_url"                       => "Il sito dell'azienda non è un URL valido (http://...).",
-    "country_codes"                             => "Codice Postale",
-    "country_codes_tooltip"                     => "La lista di Codici Postali separate da virgole sono usate per la ricerca per indirizzo.",
-    "currency_code"                             => "Codice valuta",
-    "currency_decimals"                         => "Decimali Valuta",
-    "currency_symbol"                           => "Simbolo Valuta",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Raccolta Punti",
-    "customer_reward_duplicate"                 => "Punti Fedeltà deve essere unica.",
-    "customer_reward_enable"                    => "Abilita la Raccolta Punti per i Clienti",
-    "customer_reward_invalid_chars"             => "I punti fedeltà non possono contenere '_'",
-    "customer_reward_required"                  => "I Punti Fedeltà sono un campo obbligatorio",
-    "customer_sales_tax_support"                => "Supporto Fiscale di vendita ai Clienti (Sales Tax Support)",
-    "date_or_time_format"                       => "Filtro Data e Ora",
-    "datetimeformat"                            => "Formato Data e Ora",
-    "decimal_point"                             => "Punti Decimali",
-    "default_barcode_font_size_number"          => "La grandezza del Font del Codice a Barre di default deve essere un numero.",
-    "default_barcode_font_size_required"        => "Il campo Grandezza del font del Codice a Barre di Default è obbligatorio.",
-    "default_barcode_height_number"             => "Altezza di Default del Codice a Barre deve essere un numero.",
-    "default_barcode_height_required"           => "Il campo Altezza Codice a Barre di Default è obbligatorio.",
-    "default_barcode_num_in_row_number"         => "Il numero di Codice a Barre di Default nella Riga deve essere un numero.",
-    "default_barcode_num_in_row_required"       => "Numero Codice a Barre di Default nella Riga è un campo obbligatorio.",
-    "default_barcode_page_cellspacing_number"   => "Spaziatura Codice a Barre di Default deve essere un numero.",
-    "default_barcode_page_cellspacing_required" => "Spaziatura Codice a Barre di Default è un campo obbligatorio.",
-    "default_barcode_page_width_number"         => "Larghezza Codice a Barre di Default deve essere un numero.",
-    "default_barcode_page_width_required"       => "Larghezza Codice a Barre di Default è un campo obbligatorio.",
-    "default_barcode_width_number"              => "Larghezza Codice a Barre di Default deve essere un numero.",
-    "default_barcode_width_required"            => "Larghezza Codice a Barre di Default è un campo obbligatorio.",
-    "default_item_columns"                      => "Colonne degli elementi visibili di default",
-    "default_origin_tax_code"                   => "Codice Imposta di Origine Default",
-    "default_receivings_discount"               => "Sconto sugli incassi predefiniti",
-    "default_receivings_discount_number"        => "Lo sconto sugli incassi predefinito deve essere un numero.",
-    "default_receivings_discount_required"      => "Lo sconto di ricezione predefinito è un campo obbligatorio.",
-    "default_sales_discount"                    => "Sconto Vendita Default %",
-    "default_sales_discount_number"             => "Sconto Vendita Default deve essere un numero.",
-    "default_sales_discount_required"           => "Sconto Vendita Default è un campo obbligatorio.",
-    "default_tax_category"                      => "Categoria di imposta predefinita",
-    "default_tax_code"                          => "Codice Fiscale predefinito",
-    "default_tax_jurisdiction"                  => "Giurisdizione fiscale predefinita",
-    "default_tax_name_number"                   => "Nome Tassazione Default deve essere una stringa.",
-    "default_tax_name_required"                 => "Nome Tassazione Default è un campo richiesto.",
-    "default_tax_rate"                          => "Percent. Imposta Default %",
-    "default_tax_rate_1"                        => "Perc. Imposta 1",
-    "default_tax_rate_2"                        => "Perc. Imposta 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Percent. Imposta Default deve essere un numero.",
-    "default_tax_rate_required"                 => "Percent. Imposta Default è un campo obbligatorio.",
-    "derive_sale_quantity"                      => "Permetti Quantità Derivata dalle Vendite",
-    "derive_sale_quantity_tooltip"              => "Se abilitato, un nuovo tipo di elemento sarà dato per quegli elementi che supereranno la quantità",
-    "dinner_table"                              => "Tavolo",
-    "dinner_table_duplicate"                    => "Il Tavolo deve essere univoco.",
-    "dinner_table_enable"                       => "Abilita Tavoli da Cena",
-    "dinner_table_invalid_chars"                => "Nome Tavolo non può contenere '_'.",
-    "dinner_table_required"                     => "Tavolo è un campo obbligatorio.",
-    "dot"                                       => "punto",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Configurazione Email",
-    "email_mailpath"                            => "Percorso per Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Checkbox email ricevuta",
-    "email_receipt_check_behaviour_always"      => "Sempre selezionato",
-    "email_receipt_check_behaviour_last"        => "Ricorda l'ultima selezione",
-    "email_receipt_check_behaviour_never"       => "Sempre non selezionato",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Porta",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Rispetta privacy",
-    "enforce_privacy_tooltip"                   => "Rispetta la privacy dei tuoi clienti annullando i loro dati se cancellati",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Data Inizio Anno Fiscale",
-    "financial_year_apr"                        => "1mo di Aprile",
-    "financial_year_aug"                        => "1mo di Agosto",
-    "financial_year_dec"                        => "1mo di Dicembre",
-    "financial_year_feb"                        => "1mo di Febbraio",
-    "financial_year_jan"                        => "1mo di Gennaio",
-    "financial_year_jul"                        => "1mo di Luglio",
-    "financial_year_jun"                        => "1mo di Giugno",
-    "financial_year_mar"                        => "1mo di Marzo",
-    "financial_year_may"                        => "1mo di Maggio",
-    "financial_year_nov"                        => "1mo di Novembre",
-    "financial_year_oct"                        => "1mo di Ottobre",
-    "financial_year_sep"                        => "1mo di Settembre",
-    "floating_labels"                           => "Etichette mobili",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key è un campo obbligatorio",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key è un campo obbligatorio",
-    "gcaptcha_tooltip"                          => "Per proteggere la Login page con Google reCAPTCHA, clicca sull'icona per una key pair per l'API.",
-    "general"                                   => "Generali",
-    "general_configuration"                     => "Configurazione Generale",
-    "giftcard_number"                           => "Numero Carta Regalo",
-    "giftcard_random"                           => "Genera Casualmente",
-    "giftcard_series"                           => "Genera in Serie",
-    "image_allowed_file_types"                  => "Tipi di file consentiti",
-    "image_max_height_tooltip"                  => "Altezza massima consentita per i caricamenti di immagini in pixel (px).",
-    "image_max_size_tooltip"                    => "Dimensione file massima consentita per il caricamento di immagini in kilobyte (kb).",
-    "image_max_width_tooltip"                   => "Larghezza massima consentita per i caricamenti di immagini in pixel (px).",
-    "image_restrictions"                        => "Restrizioni al caricamento delle immagini",
-    "include_hsn"                               => "Includere il supporto per i codici HSN",
-    "info"                                      => "Informazioni",
-    "info_configuration"                        => "Informazioni Negozio",
-    "input_groups"                              => "Gruppi di Ingresso",
-    "integrations"                              => "Integrazioni",
-    "integrations_configuration"                => "Integrazioni di terze parti",
-    "invoice"                                   => "Fattura",
-    "invoice_configuration"                     => "Impostazioni di Stampa Fattura",
-    "invoice_default_comments"                  => "Commenti Fattura di Default",
-    "invoice_email_message"                     => "Template Email di Fattura",
-    "invoice_enable"                            => "Abilita Fatturazione",
-    "invoice_printer"                           => "Stampante per Fattura",
-    "invoice_type"                              => "Tipo fattura",
-    "is_readable"                               => "è leggibile, ma le autorizzazioni sono impostate in modo errato. Impostalo su 640 o 660 e aggiorna.",
-    "is_writable"                               => "è scrivibile, ma i permessi sono impostati in modo errato. Si prega di impostarlo su 750 e aggiornare.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Attenzione: Questa funzionalità funzionerà solo se è installato l'addon di FifeFox jsPrintSetup. Salvare ugualmente ?",
-    "language"                                  => "Lingua",
-    "last_used_invoice_number"                  => "Ultimo Numero Fattura usato",
-    "last_used_quote_number"                    => "Ultimo Numero Preventivo usato",
-    "last_used_work_order_number"               => "Ultimo Numero Ordine di Lavoro/Commessa usato",
-    "left"                                      => "Sinistra",
-    "license"                                   => "Licenza",
-    "license_configuration"                     => "Contenuti della Licenza",
-    "line_sequence"                             => "Sequenza Linea",
-    "lines_per_page"                            => "Linee per Pagina",
-    "lines_per_page_number"                     => "Le linee per Pagina devono essere un numero.",
-    "lines_per_page_required"                   => "Linee per Pagina è un campo obbligatorio.",
-    "locale"                                    => "Localizzazione",
-    "locale_configuration"                      => "Configurazione Localizzazione",
-    "locale_info"                               => "Informazioni di Configurazione Localizzazione",
-    "location"                                  => "Magazzino",
-    "location_configuration"                    => "Locazione Magazzino",
-    "location_info"                             => "Informazioni di Configurazione Posizione",
-    "login_form"                                => "Stile modulo di accesso",
-    "logout"                                    => "Vuoi fare il backup prima di effettuare il logout? Premere [OK] per eseguirlo o [Cancella] per il logout.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp API Key",
-    "mailchimp_configuration"                   => "Configurazione Mailchimp",
-    "mailchimp_key_successfully"                => "API Key valida.",
-    "mailchimp_key_unsuccessfully"              => "API Key non valida.",
-    "mailchimp_lists"                           => "Lista/e Mailchimp",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "SMS",
-    "message_configuration"                     => "Configurazione SMS",
-    "msg_msg"                                   => "Testo Messaggio Salvato",
-    "msg_msg_placeholder"                       => "Se vuoi utilizzare un template SMS, salva il tuo messaggio qui o lascia il campo in bianco.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password è un campo obbligatorio",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID è un campo obbligatorio",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username è un campo obbligatorio",
-    "multi_pack_enabled"                        => "Pacchetti multipli per articolo",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "nessuno",
-    "notify_alignment"                          => "Posizione Popup di Notifica",
-    "number_format"                             => "Formato Numero",
-    "number_locale"                             => "Localizzazione",
-    "number_locale_invalid"                     => "La località inserita non è valida. Controlla il link nel tooltip per cercare una località valida.",
-    "number_locale_required"                    => "Numero Località è un campo obbligatorio.",
-    "number_locale_tooltip"                     => "Cerca una Località adatta con questo link.",
-    "os_timezone"                               => "OSPOS fuso orario:",
-    "ospos_info"                                => "Informazioni sull'installazione di OSPOS",
-    "payment_options_order"                     => "Opzioni di Pagamento Ordine",
-    "perm_risk"                                 => "Le autorizzazioni errate lasciano questo software a rischio.",
-    "phone"                                     => "Telefono Azienda",
-    "phone_required"                            => "Telefono Aziena è un campo obbligatorio.",
-    "print_bottom_margin"                       => "Margine Inferiore",
-    "print_bottom_margin_number"                => "Margine Inferiore deve essere un numero.",
-    "print_bottom_margin_required"              => "Margine Inferiore è un campo richiesto.",
-    "print_delay_autoreturn"                    => "Ritardo ritorno a Vendite",
-    "print_delay_autoreturn_number"             => "Ritardo è un campo obbligatorio.",
-    "print_delay_autoreturn_required"           => "Ritardo deve essere un numero.",
-    "print_footer"                              => "Stampa Footer del Browser",
-    "print_header"                              => "Stampa Intestazione del Browser",
-    "print_left_margin"                         => "Margine sinistro",
-    "print_left_margin_number"                  => "Margine sinistro deve essere un numero.",
-    "print_left_margin_required"                => "Margine Sinistro è un campo obbligatorio.",
-    "print_receipt_check_behaviour"             => "Checkbox stampa scontrino",
-    "print_receipt_check_behaviour_always"      => "Sempre selezionato",
-    "print_receipt_check_behaviour_last"        => "Ricorda l'ultima selezione",
-    "print_receipt_check_behaviour_never"       => "Sempre non selezionato",
-    "print_right_margin"                        => "Margine Destro",
-    "print_right_margin_number"                 => "Margine Destro deve essere un numero.",
-    "print_right_margin_required"               => "Margine Destro è un campo obbligatorio.",
-    "print_silently"                            => "Mostra Finestra di Stampa",
-    "print_top_margin"                          => "Margine Superiore",
-    "print_top_margin_number"                   => "Margine Superiore deve essere un numero.",
-    "print_top_margin_required"                 => "Margine Superiore è un campo obbligatorio.",
-    "quantity_decimals"                         => "Decimali Quantità",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Commento di default Stime",
-    "receipt"                                   => "Scontrino",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Impostazioni di stampa Scontrino",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Grandezza Font",
-    "receipt_font_size_number"                  => "Grandezza Font deve essere un numero.",
-    "receipt_font_size_required"                => "Grandezza Font è un campo obbligatorio.",
-    "receipt_info"                              => "Informazioni di Configurazione Scontrino",
-    "receipt_printer"                           => "Stampante Ticket",
-    "receipt_short"                             => "Corto",
-    "receipt_show_company_name"                 => "Mostra Nome Compagnia",
-    "receipt_show_description"                  => "Mostra Descrizione",
-    "receipt_show_serialnumber"                 => "Mostra Numero Seriale",
-    "receipt_show_tax_ind"                      => "Mostra indicatore fiscale",
-    "receipt_show_taxes"                        => "Mostra Imposte",
-    "receipt_show_total_discount"               => "Mostra Sconto Totale",
-    "receipt_template"                          => "Template Scontrino",
-    "receiving_calculate_average_price"         => "Calcola Prezzo medio (Ricezione)",
-    "recv_invoice_format"                       => "Formato Fattura Acquisto",
-    "register_mode_default"                     => "Modalità Registro Automatico/Default",
-    "report_an_issue"                           => "Segnala un problema",
-    "return_policy_required"                    => "Politica di Reso è un campo obbligatorio.",
-    "reward"                                    => "Raccolta Punti",
-    "reward_configuration"                      => "Configurazione Raccolta Punti",
-    "right"                                     => "Destra",
-    "sales_invoice_format"                      => "Formato Fattura di Vendita",
-    "sales_quote_format"                        => "Formato Preventivo",
-    "saved_successfully"                        => "Configurazione salvata correttamente.",
-    "saved_unsuccessfully"                      => "Salvataggio Configurazione Fallito.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Mostra icona ufficio",
-    "statistics"                                => "Invia Statistiche",
-    "statistics_tooltip"                        => "Invia statistiche per lo sviluppo e il miglioramento delle funzionalità proposte.",
-    "stock_location"                            => "Posizione Magazzino",
-    "stock_location_duplicate"                  => "Posizione Magazzino deve essere unico.",
-    "stock_location_invalid_chars"              => "Posizione Magazzino non può contenere '_'.",
-    "stock_location_required"                   => "Posizione Magazzino è un campo obbligatorio.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Colonna 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Schema di Suggerimenti di ricerca",
-    "suggestions_second_column"                 => "Colonna 2",
-    "suggestions_third_column"                  => "Colonna 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Tavoli (Ristorazione)",
-    "table_configuration"                       => "Configurazione Tavoli",
-    "takings_printer"                           => "Stampa scontrino",
-    "tax"                                       => "Imposte",
-    "tax_category"                              => "Categoria Imposta",
-    "tax_category_duplicate"                    => "Categoria tassa esistente.",
-    "tax_category_invalid_chars"                => "Categoria tassa non valida.",
-    "tax_category_required"                     => "Categoria tassa richiesta.",
-    "tax_category_used"                         => "Categoria Imposta non può essere eliminata perchè è in utilizzo.",
-    "tax_configuration"                         => "Configurazione Imposte",
-    "tax_decimals"                              => "Decimali Imposta",
-    "tax_id"                                    => "Codice Fiscale",
-    "tax_included"                              => "Imposte incluse",
-    "theme"                                     => "Tema",
-    "theme_preview"                             => "Anteprima tema:",
-    "thousands_separator"                       => "Separatore centinaia",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "Il fuso orario OSPOS è diverso dal fuso orario locale.",
-    "top"                                       => "Sopra",
-    "use_destination_based_tax"                 => "Usa l'imposta basata sulla destinazione",
-    "user_timezone"                             => "Fuso orario locale:",
-    "website"                                   => "Sitoweb",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Supporto all'ordine (Work Order Support)",
-    "work_order_format"                         => "Formato ordine di lavoro/commessa",
+    'address'                                   => 'Indirizzo Azienda',
+    'address_required'                          => 'Il campo Indirizzo Azienda è obbligatorio.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Permetti Codice a Barre duplicati',
+    'apostrophe'                                => 'apostrofo',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup del Database',
+    'barcode'                                   => 'Codici a Barre',
+    'barcode_company'                           => 'Nome Azienda',
+    'barcode_configuration'                     => 'Configurazione Codici a Barre',
+    'barcode_content'                           => 'Contenuto Codice a Barre',
+    'barcode_first_row'                         => 'Riga 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => "Formati d'input",
+    'barcode_generate_if_empty'                 => 'Genera se vuoto.',
+    'barcode_height'                            => 'Altezza (px)',
+    'barcode_id'                                => 'Id/Nome Elemento',
+    'barcode_info'                              => 'Informazioni Configurazione Codice a Barre',
+    'barcode_layout'                            => 'Layout Codice a Barre',
+    'barcode_name'                              => 'Nome',
+    'barcode_number'                            => 'Codice a Barre',
+    'barcode_number_in_row'                     => 'Numero nella riga',
+    'barcode_page_cellspacing'                  => 'Mostra spaziatura celle.',
+    'barcode_page_width'                        => 'Mostra larghezza pagina',
+    'barcode_price'                             => 'Prezzo',
+    'barcode_second_row'                        => 'Riga 2',
+    'barcode_third_row'                         => 'Riga 3',
+    '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.',
+    'barcode_type'                              => 'Tipo Codice a Barre',
+    'barcode_width'                             => 'Larghezza (px)',
+    'bottom'                                    => 'Parte inferiore',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Decimali Contanti',
+    'cash_decimals_tooltip'                     => 'Se Decimali Contanti e Decimali Valuta sono le stesse non verrà effettuato un arrotondamento.',
+    'cash_rounding'                             => 'Arrotondamento Contanti',
+    'category_dropdown'                         => 'Mostra categoria come menu a discesa',
+    'center'                                    => 'Centro',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'virgola',
+    'company'                                   => 'Nome Azienda',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Cambia Immagine',
+    'company_logo'                              => 'Logo Azienda',
+    'company_remove_image'                      => 'Rimuovi Immagine',
+    'company_required'                          => 'Il campo Nome Compagnia è obbligatorio',
+    'company_select_image'                      => 'Seleziona Immagine',
+    'company_website_url'                       => "Il sito dell'azienda non è un URL valido (http://...).",
+    'country_codes'                             => 'Codice Postale',
+    'country_codes_tooltip'                     => 'La lista di Codici Postali separate da virgole sono usate per la ricerca per indirizzo.',
+    'currency_code'                             => 'Codice valuta',
+    'currency_decimals'                         => 'Decimali Valuta',
+    'currency_symbol'                           => 'Simbolo Valuta',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Raccolta Punti',
+    'customer_reward_duplicate'                 => 'Punti Fedeltà deve essere unica.',
+    'customer_reward_enable'                    => 'Abilita la Raccolta Punti per i Clienti',
+    'customer_reward_invalid_chars'             => "I punti fedeltà non possono contenere '_'",
+    'customer_reward_required'                  => 'I Punti Fedeltà sono un campo obbligatorio',
+    'customer_sales_tax_support'                => 'Supporto Fiscale di vendita ai Clienti (Sales Tax Support)',
+    'date_or_time_format'                       => 'Filtro Data e Ora',
+    'datetimeformat'                            => 'Formato Data e Ora',
+    'decimal_point'                             => 'Punti Decimali',
+    'default_barcode_font_size_number'          => 'La grandezza del Font del Codice a Barre di default deve essere un numero.',
+    'default_barcode_font_size_required'        => 'Il campo Grandezza del font del Codice a Barre di Default è obbligatorio.',
+    'default_barcode_height_number'             => 'Altezza di Default del Codice a Barre deve essere un numero.',
+    'default_barcode_height_required'           => 'Il campo Altezza Codice a Barre di Default è obbligatorio.',
+    'default_barcode_num_in_row_number'         => 'Il numero di Codice a Barre di Default nella Riga deve essere un numero.',
+    'default_barcode_num_in_row_required'       => 'Numero Codice a Barre di Default nella Riga è un campo obbligatorio.',
+    'default_barcode_page_cellspacing_number'   => 'Spaziatura Codice a Barre di Default deve essere un numero.',
+    'default_barcode_page_cellspacing_required' => 'Spaziatura Codice a Barre di Default è un campo obbligatorio.',
+    'default_barcode_page_width_number'         => 'Larghezza Codice a Barre di Default deve essere un numero.',
+    'default_barcode_page_width_required'       => 'Larghezza Codice a Barre di Default è un campo obbligatorio.',
+    'default_barcode_width_number'              => 'Larghezza Codice a Barre di Default deve essere un numero.',
+    'default_barcode_width_required'            => 'Larghezza Codice a Barre di Default è un campo obbligatorio.',
+    'default_item_columns'                      => 'Colonne degli elementi visibili di default',
+    'default_origin_tax_code'                   => 'Codice Imposta di Origine Default',
+    'default_receivings_discount'               => 'Sconto sugli incassi predefiniti',
+    'default_receivings_discount_number'        => 'Lo sconto sugli incassi predefinito deve essere un numero.',
+    'default_receivings_discount_required'      => 'Lo sconto di ricezione predefinito è un campo obbligatorio.',
+    'default_sales_discount'                    => 'Sconto Vendita Default %',
+    'default_sales_discount_number'             => 'Sconto Vendita Default deve essere un numero.',
+    'default_sales_discount_required'           => 'Sconto Vendita Default è un campo obbligatorio.',
+    'default_tax_category'                      => 'Categoria di imposta predefinita',
+    'default_tax_code'                          => 'Codice Fiscale predefinito',
+    'default_tax_jurisdiction'                  => 'Giurisdizione fiscale predefinita',
+    'default_tax_name_number'                   => 'Nome Tassazione Default deve essere una stringa.',
+    'default_tax_name_required'                 => 'Nome Tassazione Default è un campo richiesto.',
+    'default_tax_rate'                          => 'Percent. Imposta Default %',
+    'default_tax_rate_1'                        => 'Perc. Imposta 1',
+    'default_tax_rate_2'                        => 'Perc. Imposta 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Percent. Imposta Default deve essere un numero.',
+    'default_tax_rate_required'                 => 'Percent. Imposta Default è un campo obbligatorio.',
+    'derive_sale_quantity'                      => 'Permetti Quantità Derivata dalle Vendite',
+    'derive_sale_quantity_tooltip'              => 'Se abilitato, un nuovo tipo di elemento sarà dato per quegli elementi che supereranno la quantità',
+    'dinner_table'                              => 'Tavolo',
+    'dinner_table_duplicate'                    => 'Il Tavolo deve essere univoco.',
+    'dinner_table_enable'                       => 'Abilita Tavoli da Cena',
+    'dinner_table_invalid_chars'                => "Nome Tavolo non può contenere '_'.",
+    'dinner_table_required'                     => 'Tavolo è un campo obbligatorio.',
+    'dot'                                       => 'punto',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Configurazione Email',
+    'email_mailpath'                            => 'Percorso per Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Checkbox email ricevuta',
+    'email_receipt_check_behaviour_always'      => 'Sempre selezionato',
+    'email_receipt_check_behaviour_last'        => "Ricorda l'ultima selezione",
+    'email_receipt_check_behaviour_never'       => 'Sempre non selezionato',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Porta',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Rispetta privacy',
+    'enforce_privacy_tooltip'                   => 'Rispetta la privacy dei tuoi clienti annullando i loro dati se cancellati',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Data Inizio Anno Fiscale',
+    'financial_year_apr'                        => '1mo di Aprile',
+    'financial_year_aug'                        => '1mo di Agosto',
+    'financial_year_dec'                        => '1mo di Dicembre',
+    'financial_year_feb'                        => '1mo di Febbraio',
+    'financial_year_jan'                        => '1mo di Gennaio',
+    'financial_year_jul'                        => '1mo di Luglio',
+    'financial_year_jun'                        => '1mo di Giugno',
+    'financial_year_mar'                        => '1mo di Marzo',
+    'financial_year_may'                        => '1mo di Maggio',
+    'financial_year_nov'                        => '1mo di Novembre',
+    'financial_year_oct'                        => '1mo di Ottobre',
+    'financial_year_sep'                        => '1mo di Settembre',
+    'floating_labels'                           => 'Etichette mobili',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key è un campo obbligatorio',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key è un campo obbligatorio',
+    'gcaptcha_tooltip'                          => "Per proteggere la Login page con Google reCAPTCHA, clicca sull'icona per una key pair per l'API.",
+    'general'                                   => 'Generali',
+    'general_configuration'                     => 'Configurazione Generale',
+    'giftcard_number'                           => 'Numero Carta Regalo',
+    'giftcard_random'                           => 'Genera Casualmente',
+    'giftcard_series'                           => 'Genera in Serie',
+    'image_allowed_file_types'                  => 'Tipi di file consentiti',
+    'image_max_height_tooltip'                  => 'Altezza massima consentita per i caricamenti di immagini in pixel (px).',
+    'image_max_size_tooltip'                    => 'Dimensione file massima consentita per il caricamento di immagini in kilobyte (kb).',
+    'image_max_width_tooltip'                   => 'Larghezza massima consentita per i caricamenti di immagini in pixel (px).',
+    'image_restrictions'                        => 'Restrizioni al caricamento delle immagini',
+    'include_hsn'                               => 'Includere il supporto per i codici HSN',
+    'info'                                      => 'Informazioni',
+    'info_configuration'                        => 'Informazioni Negozio',
+    'input_groups'                              => 'Gruppi di Ingresso',
+    'integrations'                              => 'Integrazioni',
+    'integrations_configuration'                => 'Integrazioni di terze parti',
+    'invoice'                                   => 'Fattura',
+    'invoice_configuration'                     => 'Impostazioni di Stampa Fattura',
+    'invoice_default_comments'                  => 'Commenti Fattura di Default',
+    'invoice_email_message'                     => 'Template Email di Fattura',
+    'invoice_enable'                            => 'Abilita Fatturazione',
+    'invoice_printer'                           => 'Stampante per Fattura',
+    'invoice_type'                              => 'Tipo fattura',
+    'is_readable'                               => 'è leggibile, ma le autorizzazioni sono impostate in modo errato. Impostalo su 640 o 660 e aggiorna.',
+    'is_writable'                               => 'è scrivibile, ma i permessi sono impostati in modo errato. Si prega di impostarlo su 750 e aggiornare.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => "Attenzione: Questa funzionalità funzionerà solo se è installato l'addon di FifeFox jsPrintSetup. Salvare ugualmente ?",
+    'language'                                  => 'Lingua',
+    'last_used_invoice_number'                  => 'Ultimo Numero Fattura usato',
+    'last_used_quote_number'                    => 'Ultimo Numero Preventivo usato',
+    'last_used_work_order_number'               => 'Ultimo Numero Ordine di Lavoro/Commessa usato',
+    'left'                                      => 'Sinistra',
+    'license'                                   => 'Licenza',
+    'license_configuration'                     => 'Contenuti della Licenza',
+    'line_sequence'                             => 'Sequenza Linea',
+    'lines_per_page'                            => 'Linee per Pagina',
+    'lines_per_page_number'                     => 'Le linee per Pagina devono essere un numero.',
+    'lines_per_page_required'                   => 'Linee per Pagina è un campo obbligatorio.',
+    'locale'                                    => 'Localizzazione',
+    'locale_configuration'                      => 'Configurazione Localizzazione',
+    'locale_info'                               => 'Informazioni di Configurazione Localizzazione',
+    'location'                                  => 'Magazzino',
+    'location_configuration'                    => 'Locazione Magazzino',
+    'location_info'                             => 'Informazioni di Configurazione Posizione',
+    'login_form'                                => 'Stile modulo di accesso',
+    'logout'                                    => 'Vuoi fare il backup prima di effettuare il logout? Premere [OK] per eseguirlo o [Cancella] per il logout.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp API Key',
+    'mailchimp_configuration'                   => 'Configurazione Mailchimp',
+    'mailchimp_key_successfully'                => 'API Key valida.',
+    'mailchimp_key_unsuccessfully'              => 'API Key non valida.',
+    'mailchimp_lists'                           => 'Lista/e Mailchimp',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'SMS',
+    'message_configuration'                     => 'Configurazione SMS',
+    'msg_msg'                                   => 'Testo Messaggio Salvato',
+    'msg_msg_placeholder'                       => 'Se vuoi utilizzare un template SMS, salva il tuo messaggio qui o lascia il campo in bianco.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID è un campo obbligatorio',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username è un campo obbligatorio',
+    'multi_pack_enabled'                        => 'Pacchetti multipli per articolo',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'nessuno',
+    'notify_alignment'                          => 'Posizione Popup di Notifica',
+    'number_format'                             => 'Formato Numero',
+    'number_locale'                             => 'Localizzazione',
+    'number_locale_invalid'                     => 'La località inserita non è valida. Controlla il link nel tooltip per cercare una località valida.',
+    'number_locale_required'                    => 'Numero Località è un campo obbligatorio.',
+    'number_locale_tooltip'                     => 'Cerca una Località adatta con questo link.',
+    'os_timezone'                               => 'OSPOS fuso orario:',
+    'ospos_info'                                => "Informazioni sull'installazione di OSPOS",
+    'payment_options_order'                     => 'Opzioni di Pagamento Ordine',
+    'payment_reference_code_length_limits'      => 'Codice di riferimento pagamento<br>Limiti di lunghezza',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Le autorizzazioni errate lasciano questo software a rischio.',
+    'phone'                                     => 'Telefono Azienda',
+    'phone_required'                            => 'Telefono Aziena è un campo obbligatorio.',
+    'print_bottom_margin'                       => 'Margine Inferiore',
+    'print_bottom_margin_number'                => 'Margine Inferiore deve essere un numero.',
+    'print_bottom_margin_required'              => 'Margine Inferiore è un campo richiesto.',
+    'print_delay_autoreturn'                    => 'Ritardo ritorno a Vendite',
+    'print_delay_autoreturn_number'             => 'Ritardo è un campo obbligatorio.',
+    'print_delay_autoreturn_required'           => 'Ritardo deve essere un numero.',
+    'print_footer'                              => 'Stampa Footer del Browser',
+    'print_header'                              => 'Stampa Intestazione del Browser',
+    'print_left_margin'                         => 'Margine sinistro',
+    'print_left_margin_number'                  => 'Margine sinistro deve essere un numero.',
+    'print_left_margin_required'                => 'Margine Sinistro è un campo obbligatorio.',
+    'print_receipt_check_behaviour'             => 'Checkbox stampa scontrino',
+    'print_receipt_check_behaviour_always'      => 'Sempre selezionato',
+    'print_receipt_check_behaviour_last'        => "Ricorda l'ultima selezione",
+    'print_receipt_check_behaviour_never'       => 'Sempre non selezionato',
+    'print_right_margin'                        => 'Margine Destro',
+    'print_right_margin_number'                 => 'Margine Destro deve essere un numero.',
+    'print_right_margin_required'               => 'Margine Destro è un campo obbligatorio.',
+    'print_silently'                            => 'Mostra Finestra di Stampa',
+    'print_top_margin'                          => 'Margine Superiore',
+    'print_top_margin_number'                   => 'Margine Superiore deve essere un numero.',
+    'print_top_margin_required'                 => 'Margine Superiore è un campo obbligatorio.',
+    'quantity_decimals'                         => 'Decimali Quantità',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Commento di default Stime',
+    'receipt'                                   => 'Scontrino',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Impostazioni di stampa Scontrino',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Grandezza Font',
+    'receipt_font_size_number'                  => 'Grandezza Font deve essere un numero.',
+    'receipt_font_size_required'                => 'Grandezza Font è un campo obbligatorio.',
+    'receipt_info'                              => 'Informazioni di Configurazione Scontrino',
+    'receipt_printer'                           => 'Stampante Ticket',
+    'receipt_short'                             => 'Corto',
+    'receipt_show_company_name'                 => 'Mostra Nome Compagnia',
+    'receipt_show_description'                  => 'Mostra Descrizione',
+    'receipt_show_serialnumber'                 => 'Mostra Numero Seriale',
+    'receipt_show_tax_ind'                      => 'Mostra indicatore fiscale',
+    'receipt_show_taxes'                        => 'Mostra Imposte',
+    'receipt_show_total_discount'               => 'Mostra Sconto Totale',
+    'receipt_template'                          => 'Template Scontrino',
+    'receiving_calculate_average_price'         => 'Calcola Prezzo medio (Ricezione)',
+    'recv_invoice_format'                       => 'Formato Fattura Acquisto',
+    'register_mode_default'                     => 'Modalità Registro Automatico/Default',
+    'report_an_issue'                           => 'Segnala un problema',
+    'return_policy_required'                    => 'Politica di Reso è un campo obbligatorio.',
+    'reward'                                    => 'Raccolta Punti',
+    'reward_configuration'                      => 'Configurazione Raccolta Punti',
+    'right'                                     => 'Destra',
+    'sales_invoice_format'                      => 'Formato Fattura di Vendita',
+    'sales_quote_format'                        => 'Formato Preventivo',
+    'mailpath_invalid'                          => 'Percorso sendmail non valido. Sono ammessi solo lettere, numeri, trattini, trattini bassi, barre, barre rovesciate, due punti, spazi e punti.',
+    'saved_successfully'                        => 'Configurazione salvata correttamente.',
+    'saved_unsuccessfully'                      => 'Salvataggio Configurazione Fallito.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Mostra icona ufficio',
+    'statistics'                                => 'Invia Statistiche',
+    'statistics_tooltip'                        => 'Invia statistiche per lo sviluppo e il miglioramento delle funzionalità proposte.',
+    'stock_location'                            => 'Posizione Magazzino',
+    'stock_location_duplicate'                  => 'Posizione Magazzino deve essere unico.',
+    'stock_location_invalid_chars'              => "Posizione Magazzino non può contenere '_'.",
+    'stock_location_required'                   => 'Posizione Magazzino è un campo obbligatorio.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Colonna 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Schema di Suggerimenti di ricerca',
+    'suggestions_second_column'                 => 'Colonna 2',
+    'suggestions_third_column'                  => 'Colonna 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Tavoli (Ristorazione)',
+    'table_configuration'                       => 'Configurazione Tavoli',
+    'takings_printer'                           => 'Stampa scontrino',
+    'tax'                                       => 'Imposte',
+    'tax_category'                              => 'Categoria Imposta',
+    'tax_category_duplicate'                    => 'Categoria tassa esistente.',
+    'tax_category_invalid_chars'                => 'Categoria tassa non valida.',
+    'tax_category_required'                     => 'Categoria tassa richiesta.',
+    'tax_category_used'                         => 'Categoria Imposta non può essere eliminata perchè è in utilizzo.',
+    'tax_configuration'                         => 'Configurazione Imposte',
+    'tax_decimals'                              => 'Decimali Imposta',
+    'tax_id'                                    => 'Codice Fiscale',
+    'tax_included'                              => 'Imposte incluse',
+    'theme'                                     => 'Tema',
+    'theme_preview'                             => 'Anteprima tema:',
+    'thousands_separator'                       => 'Separatore centinaia',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => 'Il fuso orario OSPOS è diverso dal fuso orario locale.',
+    'top'                                       => 'Sopra',
+    'use_destination_based_tax'                 => "Usa l'imposta basata sulla destinazione",
+    'user_timezone'                             => 'Fuso orario locale:',
+    'website'                                   => 'Sitoweb',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => "Supporto all'ordine (Work Order Support)",
+    'work_order_format'                         => 'Formato ordine di lavoro/commessa',
 ];
diff --git a/app/Language/it/Employees.php b/app/Language/it/Employees.php
index cce612d2f..5302e63d2 100644
--- a/app/Language/it/Employees.php
+++ b/app/Language/it/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informazioni",
-    "cannot_be_deleted"            => "Eliminazione dell'impiegato/i non consentita, uno o più hanno trattato delle vendite o stai cancellando il tuo account.",
-    "change_employee"              => "",
-    "change_password"              => "Cambia Password",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Sei sicuro di voler eliminare l'impiegato/i selezionato?",
-    "confirm_restore"              => "Sei sicuro di voler ripristinare gl'Impiegati selezionati?",
-    "current_password"             => "Password Corrente",
-    "current_password_invalid"     => "Password corrente non valida.",
-    "employee"                     => "Impiegato",
-    "error_adding_updating"        => "Aggiunta o aggiornamento di impiegati fallito.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Non puoi eliminare l'utente admin demo.",
-    "error_updating_demo_admin"    => "Non puoi cambiare l'utente admin demo.",
-    "language"                     => "Lingua",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "Nuovo Impiegato",
-    "none_selected"                => "Non hai selezionato nessun impiegato da eliminare.",
-    "one_or_multiple"              => "impiegato/i",
-    "password"                     => "Password",
-    "password_minlength"           => "La Password deve essere lunga almeno 8 caratteri.",
-    "password_must_match"          => "Le Password non corrispondono.",
-    "password_not_must_match"      => "La password corrente e quella nuova devono essere uniche.",
-    "password_required"            => "Password obbligatoria.",
-    "permission_desc"              => "Barra le caselle sotto per garantire l'accesso ai moduli.",
-    "permission_info"              => "Permessi",
-    "repeat_password"              => "Password di nuovo",
-    "subpermission_required"       => "Aggiungi almeno un permesso per ogni modulo.",
-    "successful_adding"            => "Impiegato aggiunto correttamente.",
-    "successful_change_password"   => "Password cambiata con successo.",
-    "successful_deleted"           => "Eliminato correttamente",
-    "successful_updating"          => "Hai correttamente aggiornato un impiegato",
-    "system_language"              => "Lingua di sistema",
-    "unsuccessful_change_password" => "Cambio password fallito.",
-    "update"                       => "Aggiornamento Impiegato",
-    "username"                     => "Username",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Lo Username deve essere almeno lungo 5 caratteri di lunghezza.",
-    "username_required"            => "Il campo Username è richiesto.",
+    'administrator'                          => 'Amministratore',
+    'basic_information'                      => 'Informazioni',
+    'cannot_be_deleted'                      => 'Eliminazione dell\'impiegato/i non consentita, uno o più hanno trattato delle vendite o stai cancellando il tuo account.',
+    'change_employee'                        => 'Cambia Impiegato',
+    'change_password'                        => 'Cambia Password',
+    'clerk'                                  => 'Impiegato',
+    'commission'                             => 'Commissione',
+    'confirm_delete'                         => 'Sei sicuro di voler eliminare l\'impiegato/i selezionato?',
+    'confirm_restore'                        => 'Sei sicuro di voler ripristinare gl\'Impiegati selezionati?',
+    'current_password'                       => 'Password Corrente',
+    'current_password_invalid'               => 'Password corrente non valida.',
+    'employee'                               => 'Impiegato',
+    'error_adding_updating'                  => 'Aggiunta o aggiornamento di impiegati fallito.',
+    'error_cannot_remove_own_minimum_grant'  => 'Non puoi rimuovere i tuoi permessi minimi di accesso ai moduli.',
+    'error_deleting_admin'                   => 'Non puoi eliminare un utente amministratore.',
+    'error_deleting_demo_admin'              => 'Non puoi eliminare l\'utente admin demo.',
+    'error_grant_change_disallowed'          => 'I cambiamenti dei permessi sono disabilitati in questa demo.',
+    'error_password_change_disallowed'       => 'I cambiamenti della password sono disabilitati in questa demo.',
+    'error_updating_admin'                   => 'Non puoi modificare un utente amministratore.',
+    'error_updating_demo_admin'              => 'Non puoi cambiare l\'utente admin demo.',
+    'language'                               => 'Lingua',
+    'login_info'                             => 'Login',
+    'manager'                                => 'Manager',
+    'new'                                    => 'Nuovo Impiegato',
+    'none_selected'                          => 'Non hai selezionato nessun impiegato da eliminare.',
+    'one_or_multiple'                        => 'impiegato/i',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'La Password deve essere lunga almeno 8 caratteri.',
+    'password_must_match'                    => 'Le Password non corrispondono.',
+    'password_not_must_match'                => 'La password corrente e quella nuova devono essere uniche.',
+    'password_required'                      => 'Password obbligatoria.',
+    'permission_desc'                        => 'Barra le caselle sotto per garantire l\'accesso ai moduli.',
+    'permission_info'                        => 'Permessi',
+    'repeat_password'                        => 'Password di nuovo',
+    'subpermission_required'                 => 'Aggiungi almeno un permesso per ogni modulo.',
+    'successful_adding'                      => 'Impiegato aggiunto correttamente.',
+    'successful_change_password'             => 'Password cambiata con successo.',
+    'successful_deleted'                     => 'Eliminato correttamente',
+    'successful_updating'                    => 'Hai correttamente aggiornato un impiegato',
+    'system_language'                        => 'Lingua di sistema',
+    'unsuccessful_change_password'           => 'Cambio password fallito.',
+    'update'                                 => 'Aggiornamento Impiegato',
+    'username'                               => 'Username',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Lo Username deve essere almeno lungo 5 caratteri di lunghezza.',
+    'username_required'                      => 'Il campo Username è richiesto.',
 ];
diff --git a/app/Language/it/Error.php b/app/Language/it/Error.php
index 0e9f47f80..af07d014a 100644
--- a/app/Language/it/Error.php
+++ b/app/Language/it/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Non hai l'autorizzazione per accedere al modulo denominato",
-    "unknown"              => "Errore sconosciuto",
+    'no_permission_module'           => 'Non hai l\'autorizzazione per accedere al modulo denominato',
+    'unable_to_create_env_file'      => 'Impossibile creare {filePath} per configurare throttle.key',
+    'unable_to_lock_file'            => 'Impossibile bloccare {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Impossibile aprire {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Impossibile salvare throttle.key in {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Impossibile leggere {filePath} per configurare throttle.key',
+    'unknown'                        => 'Errore sconosciuto',
 ];
diff --git a/app/Language/it/Items.php b/app/Language/it/Items.php
index 2acadfb33..f6c07c0cf 100644
--- a/app/Language/it/Items.php
+++ b/app/Language/it/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventario da aggiungere o sottrarre.",
-    "allow_alt_description"              => "Permetti Descrizione alternativa",
-    "amount_entry"                       => "Importo Inserito",
-    "bulk_edit"                          => "Modifica collettiva",
-    "buy_price_required"                 => "Prezzo d'acquisto è un campo obbligatorio.",
-    "cannot_be_deleted"                  => "Non è possibile eliminare l'articolo/i selezionato, uno o più sono stati inseriti nelle vendite.",
-    "cannot_find_item"                   => "Articolo non trovato.",
-    "categories"                         => "",
-    "category"                           => "Categoria",
-    "category_new"                       => "",
-    "category_required"                  => "Categoria è un campo obbligatorio.",
-    "change_all_to_allow_alt_desc"       => "Permetti descrizione alternativa a tutti.",
-    "change_all_to_not_allow_allow_desc" => "Non permettere Descrizione Alternativa a tutti.",
-    "change_all_to_serialized"           => "Cambia tutti a Serializzati",
-    "change_all_to_unserialized"         => "Cambia tutti i Non-Serializzati",
-    "change_image"                       => "Cambia Immagine",
-    "confirm_bulk_edit"                  => "Sei sicuro di voler modificare gl'Articoli selezionati?",
-    "confirm_bulk_edit_wipe_taxes"       => "Tutte le informazioni delle tasse degli Articoli saranno sostituiti.",
-    "confirm_delete"                     => "Sei sicuro di voler eliminare gli Articoli selezionati?",
-    "confirm_restore"                    => "Sei sicuro di voler ripristinare gli Articoli selezionati?",
-    "cost_price"                         => "Prezzo all'ingrosso",
-    "cost_price_number"                  => "Prezzo all'Ingrosso deve essere un numero.",
-    "cost_price_required"                => "Prezzo all'ingrosso è un campo obbligatorio.",
-    "count"                              => "Aggiorna Inventario",
-    "csv_import_failed"                  => "Importazione CSV fallita",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "L'upload del file non ha dati o non è formattato correttamente.",
-    "csv_import_partially_failed"        => "Si sono verificati {0} errori di importazione degli elementi nelle righe: {1}. Nessuna riga è stata importata.",
-    "csv_import_success"                 => "Importazione CSV dell'articolo riuscita.",
-    "current_quantity"                   => "Quantità Corrente",
-    "default_pack_name"                  => "Ogni",
-    "description"                        => "Descrizione",
-    "details_count"                      => "Dettagli Conteggio Inventario",
-    "do_nothing"                         => "Nessuna azione",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Modifica il campo desiderato dell'articolo selezionato.",
-    "edit_multiple_items"                => "Modifica multi-Articoli",
-    "empty_upc_items"                    => "Svuota Codice a Barre Articoli",
-    "error_adding_updating"              => "Errore aggiunta/aggiornamento Articoli",
-    "error_updating_multiple"            => "Errore aggiornamento Articoli",
-    "generate_barcodes"                  => "Genera Codice a Barre",
-    "hsn_code"                           => "Nomenclatura del sistema armonizzato",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Importazione Articoli da CSV",
-    "info_provided_by"                   => "Informazioni fornite da",
-    "inventory"                          => "Inventario",
-    "inventory_CSV_import_quantity"      => "Quantità importata da CSV",
-    "inventory_comments"                 => "Commenti",
-    "inventory_data_tracking"            => "Tracking dei Dati Inventario",
-    "inventory_date"                     => "Data",
-    "inventory_employee"                 => "Impiegato",
-    "inventory_in_out_quantity"          => "Quantità In/Out",
-    "inventory_remarks"                  => "Osservazioni",
-    "is_deleted"                         => "Eliminato",
-    "is_printed"                         => "",
-    "is_serialized"                      => "L'Articolo ha un Numero Seriale",
-    "item"                               => "Articolo",
-    "item_id"                            => "",
-    "item_number"                        => "Codice a Barre",
-    "item_number_duplicate"              => "Numero Articolo è già presente nel database.",
-    "kit"                                => "Kit",
-    "location"                           => "Posizione",
-    "low_inventory_items"                => "Articoli Fuori Stock",
-    "low_sell_item"                      => "Articolo di vendita bassa",
-    "manually_editing_of_quantity"       => "Modifica manualmente la Quantità",
-    "markup"                             => "",
-    "name"                               => "Nome Articolo",
-    "name_required"                      => "Nome Articolo è un campo obbligatorio.",
-    "new"                                => "Nuovo Articolo",
-    "no_description_items"               => "Nessuna Descrizione Articolo",
-    "no_items_to_display"                => "Nessun Articolo da mostrare.",
-    "none"                               => "Nessuno",
-    "none_selected"                      => "Non hai selezionato alcun articolo da modificare",
-    "nonstock"                           => "Non-stockato",
-    "number_information"                 => "Numero Articolo",
-    "number_required"                    => "Il Codice a barre è un campo obbligatorio.",
-    "one_or_multiple"                    => "articolo/i",
-    "pack_name"                          => "Nome confezione",
-    "qty_per_pack"                       => "Quantità per confezione",
-    "quantity"                           => "Quantità",
-    "quantity_number"                    => "Quantità deve essere un numero.",
-    "quantity_required"                  => "Quantità è un campo richiesto.",
-    "receiving_quantity"                 => "Quantità Ricezione",
-    "remove_image"                       => "Rimuovi Immagine",
-    "reorder_level"                      => "Livello di Riordino",
-    "reorder_level_number"               => "Livello di Riordino deve essere un numero.",
-    "reorder_level_required"             => "Livello di Riordino è un campo richiesto.",
-    "retrive_item_info"                  => "Recupera le informazioni sull'articolo",
-    "sales_tax_1"                        => "Imposte di vendita",
-    "sales_tax_2"                        => "Imposta di Vendita 2",
-    "search_attributes"                  => "Attributi di ricerca",
-    "select_image"                       => "Seleziona Immagine",
-    "serialized_items"                   => "Articoli Serializzati",
-    "standard"                           => "Standard",
-    "stock"                              => "Magazzino",
-    "stock_location"                     => "Posizione Magazzino",
-    "stock_type"                         => "Tipo Magazzino",
-    "successful_adding"                  => "Hai correttamente aggiunto un articolo",
-    "successful_bulk_edit"               => "Hai correttamente aggiornato uno o più articoli selezionati",
-    "successful_deleted"                 => "Eliminazione conclusa correttamente",
-    "successful_updating"                => "Hai aggiornato un articolo correttamente",
-    "supplier"                           => "Fornitore",
-    "tax_1"                              => "Imposta 1",
-    "tax_2"                              => "Imposta 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Categoria fiscale",
-    "tax_percent"                        => "Percentuale Imposta",
-    "tax_percent_number"                 => "Percentuale Imposta deve essere un numero",
-    "tax_percent_required"               => "Percentuale Imposta è un campo richiesto.",
-    "tax_percents"                       => "Percentuale Imposta(e)",
-    "temp"                               => "Temporanea",
-    "type"                               => "Tipo Articoli",
-    "unit_price"                         => "Prezzo al dettaglio",
-    "unit_price_number"                  => "Prezzo unitario deve essere un numero.",
-    "unit_price_required"                => "Prezzo al dettaglio è un campo obbligatorio.",
-    "upc_database"                       => "Archivio Codice a Barre",
-    "update"                             => "Aggiorna Articolo",
-    "use_inventory_menu"                 => "Usa Menu Inventario",
+    'add_minus'                          => 'Inventario da aggiungere o sottrarre.',
+    'allow_alt_description'              => 'Permetti Descrizione alternativa',
+    'amount_entry'                       => 'Importo Inserito',
+    'bulk_edit'                          => 'Modifica collettiva',
+    'buy_price_required'                 => 'Prezzo d\'acquisto è un campo obbligatorio.',
+    'cannot_be_deleted'                  => 'Non è possibile eliminare l\'articolo/i selezionato, uno o più sono stati inseriti nelle vendite.',
+    'cannot_find_item'                   => 'Articolo non trovato.',
+    'categories'                         => '',
+    'category'                           => 'Categoria',
+    'category_new'                       => '',
+    'category_required'                  => 'Categoria è un campo obbligatorio.',
+    'change_all_to_allow_alt_desc'       => 'Permetti descrizione alternativa a tutti.',
+    'change_all_to_not_allow_allow_desc' => 'Non permettere Descrizione Alternativa a tutti.',
+    'change_all_to_serialized'           => 'Cambia tutti a Serializzati',
+    'change_all_to_unserialized'         => 'Cambia tutti i Non-Serializzati',
+    'change_image'                       => 'Cambia Immagine',
+    'confirm_bulk_edit'                  => 'Sei sicuro di voler modificare gl\'Articoli selezionati?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Tutte le informazioni delle tasse degli Articoli saranno sostituiti.',
+    'confirm_delete'                     => 'Sei sicuro di voler eliminare gli Articoli selezionati?',
+    'confirm_restore'                    => 'Sei sicuro di voler ripristinare gli Articoli selezionati?',
+    'cost_price'                         => 'Prezzo all\'ingrosso',
+    'cost_price_number'                  => 'Prezzo all\'Ingrosso deve essere un numero.',
+    'cost_price_required'                => 'Prezzo all\'ingrosso è un campo obbligatorio.',
+    'count'                              => 'Aggiorna Inventario',
+    'csv_import_failed'                  => 'Importazione CSV fallita',
+    'csv_import_invalid_location'        => 'Trovata/e locazione/i di stock non valida/e: {0}. Solo le locazioni di stock valide sono ammesse.',
+    'csv_import_nodata_wrongformat'      => 'L\'upload del file non ha dati o non è formattato correttamente.',
+    'csv_import_partially_failed'        => 'Si sono verificati {0} errori di importazione degli elementi nelle righe: {1}. Nessuna riga è stata importata.',
+    'csv_import_success'                 => 'Importazione CSV dell\'articolo riuscita.',
+    'current_quantity'                   => 'Quantità Corrente',
+    'default_pack_name'                  => 'Ogni',
+    'description'                        => 'Descrizione',
+    'details_count'                      => 'Dettagli Conteggio Inventario',
+    'do_nothing'                         => 'Nessuna azione',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Modifica il campo desiderato dell\'articolo selezionato.',
+    'edit_multiple_items'                => 'Modifica multi-Articoli',
+    'empty_upc_items'                    => 'Svuota Codice a Barre Articoli',
+    'error_adding_updating'              => 'Errore aggiunta/aggiornamento Articoli',
+    'error_updating_multiple'            => 'Errore aggiornamento Articoli',
+    'generate_barcodes'                  => 'Genera Codice a Barre',
+    'hsn_code'                           => 'Nomenclatura del sistema armonizzato',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Importazione Articoli da CSV',
+    'info_provided_by'                   => 'Informazioni fornite da',
+    'inventory'                          => 'Inventario',
+    'inventory_CSV_import_quantity'      => 'Quantità importata da CSV',
+    'inventory_comments'                 => 'Commenti',
+    'inventory_data_tracking'            => 'Tracking dei Dati Inventario',
+    'inventory_date'                     => 'Data',
+    'inventory_employee'                 => 'Impiegato',
+    'inventory_in_out_quantity'          => 'Quantità In/Out',
+    'inventory_remarks'                  => 'Osservazioni',
+    'is_deleted'                         => 'Eliminato',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'L\'Articolo ha un Numero Seriale',
+    'item'                               => 'Articolo',
+    'item_id'                            => '',
+    'item_number'                        => 'Codice a Barre',
+    'item_number_duplicate'              => 'Numero Articolo è già presente nel database.',
+    'item_number_invalid'                => 'Il numero articolo contiene caratteri non consentiti.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Posizione',
+    'low_inventory_items'                => 'Articoli Fuori Stock',
+    'low_sell_item'                      => 'Articolo di vendita bassa',
+    'manually_editing_of_quantity'       => 'Modifica manualmente la Quantità',
+    'markup'                             => '',
+    'name'                               => 'Nome Articolo',
+    'name_required'                      => 'Nome Articolo è un campo obbligatorio.',
+    'new'                                => 'Nuovo Articolo',
+    'no_description_items'               => 'Nessuna Descrizione Articolo',
+    'no_items_to_display'                => 'Nessun Articolo da mostrare.',
+    'none'                               => 'Nessuno',
+    'none_selected'                      => 'Non hai selezionato alcun articolo da modificare',
+    'nonstock'                           => 'Non-stockato',
+    'number_information'                 => 'Numero Articolo',
+    'number_required'                    => 'Il Codice a barre è un campo obbligatorio.',
+    'one_or_multiple'                    => 'articolo/i',
+    'pack_name'                          => 'Nome confezione',
+    'qty_per_pack'                       => 'Quantità per confezione',
+    'quantity'                           => 'Quantità',
+    'quantity_number'                    => 'Quantità deve essere un numero.',
+    'quantity_required'                  => 'Quantità è un campo richiesto.',
+    'receiving_quantity'                 => 'Quantità Ricezione',
+    'remove_image'                       => 'Rimuovi Immagine',
+    'reorder_level'                      => 'Livello di Riordino',
+    'reorder_level_number'               => 'Livello di Riordino deve essere un numero.',
+    'reorder_level_required'             => 'Livello di Riordino è un campo richiesto.',
+    'retrive_item_info'                  => 'Recupera le informazioni sull\'articolo',
+    'sales_tax_1'                        => 'Imposte di vendita',
+    'sales_tax_2'                        => 'Imposta di Vendita 2',
+    'search_attributes'                  => 'Attributi di ricerca',
+    'select_image'                       => 'Seleziona Immagine',
+    'serialized_items'                   => 'Articoli Serializzati',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Magazzino',
+    'stock_location'                     => 'Posizione Magazzino',
+    'stock_type'                         => 'Tipo Magazzino',
+    'successful_adding'                  => 'Hai correttamente aggiunto un articolo',
+    'successful_bulk_edit'               => 'Hai correttamente aggiornato uno o più articoli selezionati',
+    'successful_deleted'                 => 'Eliminazione conclusa correttamente',
+    'successful_updating'                => 'Hai aggiornato un articolo correttamente',
+    'supplier'                           => 'Fornitore',
+    'tax_1'                              => 'Imposta 1',
+    'tax_2'                              => 'Imposta 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Categoria fiscale',
+    'tax_name_invalid'                   => 'Il nome dell\'imposta contiene caratteri non consentiti.',
+    'tax_percent'                        => 'Percentuale Imposta',
+    'tax_percent_number'                 => 'Percentuale Imposta deve essere un numero',
+    'tax_percent_required'               => 'Percentuale Imposta è un campo richiesto.',
+    'tax_percents'                       => 'Percentuale Imposta(e)',
+    'temp'                               => 'Temporanea',
+    'type'                               => 'Tipo Articoli',
+    'unit_price'                         => 'Prezzo al dettaglio',
+    'unit_price_number'                  => 'Prezzo unitario deve essere un numero.',
+    'unit_price_required'                => 'Prezzo al dettaglio è un campo obbligatorio.',
+    'upc_database'                       => 'Archivio Codice a Barre',
+    'update'                             => 'Aggiorna Articolo',
+    'use_inventory_menu'                 => 'Usa Menu Inventario',
 ];
diff --git a/app/Language/it/Login.php b/app/Language/it/Login.php
index d5cd91867..237ba0e3e 100644
--- a/app/Language/it/Login.php
+++ b/app/Language/it/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Non sono un robot.",
-    "go"                            => "Go",
-    "invalid_gcaptcha"              => "Verifica di non essere un robot.",
-    "invalid_installation"          => "L'installazione non è corretta, controlla il tuo file php.ini.",
-    "invalid_username_and_password" => "Username o Password non validi.",
-    "login"                         => "Login",
-    "logout"                        => "Uscita",
-    "migration_needed"              => "Dopo l'accesso verrà avviata una migrazione del database a {0}.",
-    "password"                      => "Password",
-    "required_username"             => "",
-    "username"                      => "Username",
-    "welcome"                       => "Benvenuto in {0}!",
+    "gcaptcha"                            => "Non sono un robot.",
+    "go"                                  => "Go",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Verifica di non essere un robot.",
+    "invalid_installation"                => "L'installazione non è corretta, controlla il tuo file php.ini.",
+    "invalid_username_and_password"       => "Username o Password non validi.",
+    "login"                               => "Login",
+    "logout"                              => "Uscita",
+    "migrating_database"                  => "Migrazione del database",
+    "migration_auth_message"              => "Le credenziali di amministratore sono richieste per autorizzare la migrazione del database alla versione {0}. Effettua il login per continuare.",
+    "migration_complete"                  => "Database inizializzato con successo!",
+    "migration_complete_login"            => "È ora possibile effettuare il login.",
+    "migration_complete_migrate"          => "Database migrato con successo!",
+    "migration_complete_redirect"         => "Migrazione completata. Reindirizzamento al login...",
+    "migration_error_connection"          => "Errore di connessione. Riprova.",
+    "migration_failed"                    => "Migrazione fallita",
+    "migration_initializing"              => "Inizializzazione database",
+    "migration_needed"                    => "Dopo l'accesso verrà avviata una migrazione del database a {0}.",
+    "migration_required"                  => "Migratione del database richiesta",
+    "migration_running"                   => "Esecuzione migrazioni database...",
+    "password"                            => "Password",
+    "required_username"                   => "Il campo nome utente è obbligatorio.",
+    'too_many_attempts'                   => 'Troppi tentativi. Attendere un momento e riprovare.',
+    "username"                            => "Username",
+    "welcome"                             => "Benvenuto in {0}!"
 ];
diff --git a/app/Language/it/Reports.php b/app/Language/it/Reports.php
index b461daa9b..9a0d9cc0d 100644
--- a/app/Language/it/Reports.php
+++ b/app/Language/it/Reports.php
@@ -146,4 +146,5 @@ return [
     "used"                                    => "Punti Usati",
     "work_orders"                             => "Ordini di lavoro",
     "zero_and_less"                           => "Zero e meno",
+    "toggle_cost_and_profit"                  => "Commuta Costo & Profitto",
 ];
diff --git a/app/Language/it/Sales.php b/app/Language/it/Sales.php
index c62a4c94c..740b0422c 100644
--- a/app/Language/it/Sales.php
+++ b/app/Language/it/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Punti Dispnibili",
-    "rewards_package"                  => "Punti Fedeltà",
-    "rewards_remaining_balance"        => "Valore Punti Rimanenti è ",
-    "account_number"                   => "Account #",
-    "add_payment"                      => "Aggiungi Pagamento",
-    "amount_due"                       => "Importo Dovuto",
-    "amount_tendered"                  => "Importo Offerto",
-    "authorized_signature"             => "Firma Autorizzata",
-    "cancel_sale"                      => "Annulla",
-    "cash"                             => "Contanti",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Adeguamento in contanti",
-    "cash_deposit"                     => "Deposito Contanti",
-    "cash_filter"                      => "Contanti",
-    "change_due"                       => "Resto Dovuto",
-    "change_price"                     => "Cambio prezzo di vendita",
-    "check"                            => "Assegno",
-    "check_balance"                    => "Promemoria Assegno",
-    "check_filter"                     => "Assegno",
-    "close"                            => "",
-    "comment"                          => "Commento",
-    "comments"                         => "Commenti",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Completata",
-    "confirm_cancel_sale"              => "Sei sicuro di voler annullare questa vendita? Tutti gli articoli saranno eliminati.",
-    "confirm_delete"                   => "Sei sicuro di voler eliminare la vendita selezionata?",
-    "confirm_restore"                  => "Sei sicuro di voler ripristinare la vendita selezionata?",
-    "credit"                           => "Carta di Credito",
-    "credit_deposit"                   => "Deposito Credito",
-    "credit_filter"                    => "Carta di credito",
-    "current_table"                    => "",
-    "customer"                         => "Nome",
-    "customer_address"                 => "Indirizzo",
-    "customer_discount"                => "Sconto",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Località",
-    "customer_mailchimp_status"        => "Stato Mailchimp",
-    "customer_optional"                => "(Opzionale)",
-    "customer_required"                => "(Richiesto)",
-    "customer_total"                   => "Totale",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Data di Vendita",
-    "date_range"                       => "Intervallo Data",
-    "date_required"                    => "Deve essere inserita una Data corretta.",
-    "date_type"                        => "Data è un campo obbligatorio.",
-    "debit"                            => "Carta di Debito",
-    "debit_filter"                     => "",
-    "delete"                           => "Permetti Eliminazione",
-    "delete_confirmation"              => "Sei sicuro di voler eliminare questa vendita? Questa azione non può essere annullata.",
-    "delete_entire_sale"               => "Cancella intera vendita",
-    "delete_successful"                => "Cancellazione Vendita terminata correttamente.",
-    "delete_unsuccessful"              => "Eliminazione Vendita Fallita.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Scartare",
-    "discard_quote"                    => "",
-    "discount"                         => "Sconto %",
-    "discount_included"                => "% Sconto",
-    "discount_short"                   => "%",
-    "due"                              => "Dovuto",
-    "due_filter"                       => "Dovuto",
-    "edit"                             => "Modifica",
-    "edit_item"                        => "Modifica Articolo",
-    "edit_sale"                        => "Modifica Vendita",
-    "email_receipt"                    => "Scontrino Email",
-    "employee"                         => "Impiegato",
-    "entry"                            => "Voce",
-    "error_editing_item"               => "Errore modificando un articolo",
-    "find_or_scan_item"                => "Scansiona o Cerca Articolo",
-    "find_or_scan_item_or_receipt"     => "Scansiona o Cerca Articolo o Scontrino",
-    "giftcard"                         => "Carta Regalo",
-    "giftcard_balance"                 => "Carta Regalo Bilancio",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Numero Carta Regalo",
-    "group_by_category"                => "Raggruppa per Categoria",
-    "group_by_type"                    => "Raggruppa per Tipo",
-    "hsn"                              => "HSN",
-    "id"                               => "ID vendita",
-    "include_prices"                   => "Includi i prezzi?",
-    "invoice"                          => "Fattura",
-    "invoice_confirm"                  => "Questa fattura sarà inviata a",
-    "invoice_enable"                   => "Crea Fattura",
-    "invoice_filter"                   => "Fatture",
-    "invoice_no_email"                 => "Questo cliente non ha un indirizzo email valido.",
-    "invoice_number"                   => "Fattura #",
-    "invoice_number_duplicate"         => "Numero Fattura deve essere unico.",
-    "invoice_sent"                     => "Fattura inviata a",
-    "invoice_total"                    => "Totale Fattura",
-    "invoice_type_custom_invoice"      => "Fattura Personalizzata (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Fattura con Imposta Personalizzata (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Fattura (invoice.php)",
-    "invoice_type_tax_invoice"         => "Fattura d'Imposta",
-    "invoice_unsent"                   => "Fatturazione fallita sarà inviata a",
-    "invoice_update"                   => "Ricalcola",
-    "item_insufficient_of_stock"       => "L'articolo non ha un magazzino sufficiente.",
-    "item_name"                        => "Nome Articolo",
-    "item_number"                      => "Articolo #",
-    "item_out_of_stock"                => "Articolo fuori stock.",
-    "key_browser"                      => "Scorciatoie utili",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Termina Preventivo/Fattura senza pagamento",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "Apri in modalità a schermo intero",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "Ingrandire",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "Rimpicciolisci",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "Stampa pagina corrente",
-    "key_restore"                      => "Ripristina visualizzazione/zoom originale",
-    "key_search"                       => "Tabelle dei rapporti di ricerca",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "Scorciatoie di sistema",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Modalità registra",
-    "must_enter_numeric"               => "Import Offerto deve essere un numero.",
-    "must_enter_numeric_giftcard"      => "Numero Carta Regalo deve essere un numero.",
-    "new_customer"                     => "Nuovo Cliente",
-    "new_item"                         => "Nuovo Articolo",
-    "no_description"                   => "Nessun",
-    "no_filter"                        => "Tutti",
-    "no_items_in_cart"                 => "Non ci sono Articoli nel carrello.",
-    "no_sales_to_display"              => "Nessuna Vendita da mostrare.",
-    "none_selected"                    => "Non hai selezionato alcuna vendita da cancellare.",
-    "nontaxed_ind"                     => " vendita non tassata ",
-    "not_authorized"                   => "Questa azione non può essere autorizzata.",
-    "one_or_multiple"                  => "Vendita/e",
-    "payment"                          => "Tipo di pagamento",
-    "payment_amount"                   => "Importo",
-    "payment_not_cover_total"          => "Pagamento Import deve essere maggiore o uguale al Totale.",
-    "payment_type"                     => "Tipo",
-    "payments"                         => "",
-    "payments_total"                   => "Totale Pagamenti",
-    "price"                            => "Prezzo",
-    "print_after_sale"                 => "Stampa dopo la vendita",
-    "quantity"                         => "Quantità",
-    "quantity_less_than_reorder_level" => "Attenzione: la Quantità desiderata è sotto al Livello di riordino per questo Articolo.",
-    "quantity_less_than_zero"          => "Attenzione: la Quantità desiderata non è sufficiente. Puoi ancora procedere alla vendita ma controlla l'inventario.",
-    "quantity_of_items"                => "Quantità di {0} Articolo",
-    "quote"                            => "Preventivo",
-    "quote_number"                     => "Numero Preventivo",
-    "quote_number_duplicate"           => "Numero Preventivo deve essere unico.",
-    "quote_sent"                       => "Preventivo inviato a",
-    "quote_unsent"                     => "Preventivo fallito d'essere inviato a",
-    "receipt"                          => "Scontrino di Vendita",
-    "receipt_no_email"                 => "Questo cliente non ha un'email valida.",
-    "receipt_number"                   => "Vendita #",
-    "receipt_sent"                     => "Scontrino inviato a",
-    "receipt_unsent"                   => "Scontrino fallito da inviare a",
-    "refund"                           => "Tipo di rimborso",
-    "register"                         => "Registrazione Vendita",
-    "remove_customer"                  => "Rimuovi Cliente",
-    "remove_discount"                  => "",
-    "return"                           => "Reso",
-    "rewards"                          => "Punti Raccolta",
-    "rewards_balance"                  => "Bilancio Punti Raccolta",
-    "sale"                             => "Vendita",
-    "sale_by_invoice"                  => "Fattura",
-    "sale_for_customer"                => "Cliente:",
-    "sale_time"                        => "Tempo",
-    "sales_tax"                        => "Imposte di Vendita",
-    "sales_total"                      => "",
-    "select_customer"                  => "Seleziona Cliente (Opzionale)",
-    "send_invoice"                     => "Invia Fattura",
-    "send_quote"                       => "Invia Preventivo",
-    "send_receipt"                     => "Invia Scontrino",
-    "send_work_order"                  => "Invia Commessa/Ordine di Lavoro",
-    "serial"                           => "Seriale",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Mostra Fattura",
-    "show_receipt"                     => "Mostra Scontrino",
-    "start_typing_customer_name"       => "Digita i dettagli del cliente...",
-    "start_typing_item_name"           => "Incomincia a digitare Nome Articolo o spara il Codice a Barre...",
-    "stock"                            => "Disponibilità",
-    "stock_location"                   => "Posizione Stock",
-    "sub_total"                        => "Subtotale",
-    "successfully_deleted"             => "Hai correttamente eliminato",
-    "successfully_restored"            => "Hai correttamente ripristinato",
-    "successfully_suspended_sale"      => "Vendita sospesa correttamente.",
-    "successfully_updated"             => "Aggiornamento vendita a buon fine.",
-    "suspend_sale"                     => "Sospendi",
-    "suspended_doc_id"                 => "Documento",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Sospeso",
-    "table"                            => "Tavolo",
-    "takings"                          => "Vendite del Giorno",
-    "tax"                              => "Imposte",
-    "tax_id"                           => "ID Imposta",
-    "tax_invoice"                      => "Fattura d'Imposta",
-    "tax_percent"                      => "Imposte %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Totale",
-    "total_tax_exclusive"              => "Imposte escluse",
-    "transaction_failed"               => "Transazione di Vendita fallita.",
-    "unable_to_add_item"               => "Aggiunta articolo alla vendita non riuscita",
-    "unsuccessfully_deleted"           => "Eliminazione Vendita/e fallita.",
-    "unsuccessfully_restored"          => "Ripristino Vendita/e fallita.",
-    "unsuccessfully_suspended_sale"    => "Vendita sospesa fallita.",
-    "unsuccessfully_updated"           => "Aggiornamento Vendita fallito.",
-    "unsuspend"                        => "Non-sospeso",
-    "unsuspend_and_delete"             => "Azione",
-    "update"                           => "Aggiorna",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Ordine di Lavoro",
-    "work_order_number"                => "Numero Ordine di Lavoro",
-    "work_order_number_duplicate"      => "Numero Ordine di Lavoro deve essere unico.",
-    "work_order_sent"                  => "Ordine di lavoro inviato",
-    "work_order_unsent"                => "Ordine di Lavoro fallito da inviare a",
+    'account_number'                    => 'Account #',
+    'add_payment'                       => 'Aggiungi Pagamento',
+    'amount_due'                        => 'Importo Dovuto',
+    'amount_due_not_covered'            => 'I pagamenti non coprono l\'importo dovuto.',
+    'amount_tendered'                   => 'Importo Offerto',
+    'authorized_signature'              => 'Firma Autorizzata',
+    'cancel_sale'                       => 'Annulla',
+    'cash'                              => 'Contanti',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Adeguamento in contanti',
+    'cash_deposit'                      => 'Deposito Contanti',
+    'cash_filter'                       => 'Contanti',
+    'change_due'                        => 'Resto Dovuto',
+    'change_price'                      => 'Cambio prezzo di vendita',
+    'check'                             => 'Assegno',
+    'check_balance'                     => 'Promemoria Assegno',
+    'check_filter'                      => 'Assegno',
+    'close'                             => '',
+    'comment'                           => 'Commento',
+    'comments'                          => 'Commenti',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Completata',
+    'confirm_cancel_sale'               => 'Sei sicuro di voler annullare questa vendita? Tutti gli articoli saranno eliminati.',
+    'confirm_delete'                    => 'Sei sicuro di voler eliminare la vendita selezionata?',
+    'confirm_restore'                   => 'Sei sicuro di voler ripristinare la vendita selezionata?',
+    'credit'                            => 'Carta di Credito',
+    'credit_deposit'                    => 'Deposito Credito',
+    'credit_filter'                     => 'Carta di credito',
+    'current_table'                     => '',
+    'customer'                          => 'Nome',
+    'customer_address'                  => 'Indirizzo',
+    'customer_discount'                 => 'Sconto',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Località',
+    'customer_mailchimp_status'         => 'Stato Mailchimp',
+    'customer_optional'                 => '(Opzionale)',
+    'customer_required'                 => '(Richiesto)',
+    'customer_total'                    => 'Totale',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Punti Dispnibili',
+    'daily_sales'                       => '',
+    'date'                              => 'Data di Vendita',
+    'date_range'                        => 'Intervallo Data',
+    'date_required'                     => 'Deve essere inserita una Data corretta.',
+    'date_type'                         => 'Data è un campo obbligatorio.',
+    'debit'                             => 'Carta di Debito',
+    'debit_filter'                      => '',
+    'delete'                            => 'Permetti Eliminazione',
+    'delete_confirmation'               => 'Sei sicuro di voler eliminare questa vendita? Questa azione non può essere annullata.',
+    'delete_entire_sale'                => 'Cancella intera vendita',
+    'delete_successful'                 => 'Cancellazione Vendita terminata correttamente.',
+    'delete_unsuccessful'               => 'Eliminazione Vendita Fallita.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Scartare',
+    'discard_quote'                     => '',
+    'discount'                          => 'Sconto %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Sconto',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Dovuto',
+    'due_filter'                        => 'Dovuto',
+    'edit'                              => 'Modifica',
+    'edit_item'                         => 'Modifica Articolo',
+    'edit_sale'                         => 'Modifica Vendita',
+    'email_receipt'                     => 'Scontrino Email',
+    'employee'                          => 'Impiegato',
+    'entry'                             => 'Voce',
+    'error_editing_item'                => 'Errore modificando un articolo',
+    'find_or_scan_item'                 => 'Scansiona o Cerca Articolo',
+    'find_or_scan_item_or_receipt'      => 'Scansiona o Cerca Articolo o Scontrino',
+    'giftcard'                          => 'Carta Regalo',
+    'giftcard_balance'                  => 'Carta Regalo Bilancio',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Numero Carta Regalo',
+    'group_by_category'                 => 'Raggruppa per Categoria',
+    'group_by_type'                     => 'Raggruppa per Tipo',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID vendita',
+    'include_prices'                    => 'Includi i prezzi?',
+    'insufficient_giftcard_balance'     => 'Saldo carta regalo insufficiente per questo pagamento.',
+    'insufficient_reward_points'        => 'Punti premio insufficienti per questo pagamento.',
+    'invoice'                           => 'Fattura',
+    'invoice_confirm'                   => 'Questa fattura sarà inviata a',
+    'invoice_enable'                    => 'Crea Fattura',
+    'invoice_filter'                    => 'Fatture',
+    'invoice_no_email'                  => 'Questo cliente non ha un indirizzo email valido.',
+    'invoice_number'                    => 'Fattura #',
+    'invoice_number_duplicate'          => 'Numero Fattura deve essere unico.',
+    'invoice_sent'                      => 'Fattura inviata a',
+    'invoice_total'                     => 'Totale Fattura',
+    'invoice_type_custom_invoice'       => 'Fattura Personalizzata (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Fattura con Imposta Personalizzata (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Fattura (invoice.php)',
+    'invoice_type_tax_invoice'          => "Fattura d'Imposta",
+    'invoice_unsent'                    => 'Fatturazione fallita sarà inviata a',
+    'invoice_update'                    => 'Ricalcola',
+    'item_insufficient_of_stock'        => "L'articolo non ha un magazzino sufficiente.",
+    'item_name'                         => 'Nome Articolo',
+    'item_number'                       => 'Articolo #',
+    'item_out_of_stock'                 => 'Articolo fuori stock.',
+    'key_browser'                       => 'Scorciatoie utili',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Termina Preventivo/Fattura senza pagamento',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => 'Apri in modalità a schermo intero',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => 'Ingrandire',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => 'Rimpicciolisci',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => 'Stampa pagina corrente',
+    'key_restore'                       => 'Ripristina visualizzazione/zoom originale',
+    'key_search'                        => 'Tabelle dei rapporti di ricerca',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => 'Scorciatoie di sistema',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Modalità registra',
+    'must_enter_numeric'                => 'Import Offerto deve essere un numero.',
+    'must_enter_numeric_giftcard'       => 'Numero Carta Regalo deve essere un numero.',
+    'must_enter_reference_code'         => 'Il numero di riferimento/recupero deve essere inserito.',
+    'negative_amount_tendered'          => 'L\'importo offerto non può essere negativo.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Nuovo Cliente',
+    'new_item'                          => 'Nuovo Articolo',
+    'no_description'                    => 'Nessun',
+    'no_filter'                         => 'Tutti',
+    'no_items_in_cart'                  => 'Non ci sono Articoli nel carrello.',
+    'no_sales_to_display'               => 'Nessuna Vendita da mostrare.',
+    'none_selected'                     => 'Non hai selezionato alcuna vendita da cancellare.',
+    'nontaxed_ind'                      => ' vendita non tassata ',
+    'not_authorized'                    => 'Questa azione non può essere autorizzata.',
+    'one_or_multiple'                   => 'Vendita/e',
+    'payment'                           => 'Tipo di pagamento',
+    'payment_amount'                    => 'Importo',
+    'payment_not_cover_total'           => 'Pagamento Import deve essere maggiore o uguale al Totale.',
+    'payment_type'                      => 'Tipo',
+    'payments'                          => '',
+    'payments_total'                    => 'Totale Pagamenti',
+    'price'                             => 'Prezzo',
+    'print_after_sale'                  => 'Stampa dopo la vendita',
+    'quantity'                          => 'Quantità',
+    'quantity_less_than_reorder_level'  => 'Attenzione: la Quantità desiderata è sotto al Livello di riordino per questo Articolo.',
+    'quantity_less_than_zero'           => "Attenzione: la Quantità desiderata non è sufficiente. Puoi ancora procedere alla vendita ma controlla l'inventario.",
+    'quantity_of_items'                 => 'Quantità di {0} Articolo',
+    'quote'                             => 'Preventivo',
+    'quote_number'                      => 'Numero Preventivo',
+    'quote_number_duplicate'            => 'Numero Preventivo deve essere unico.',
+    'quote_sent'                        => 'Preventivo inviato a',
+    'quote_unsent'                      => "Preventivo fallito d'essere inviato a",
+    'receipt'                           => 'Scontrino di Vendita',
+    'receipt_no_email'                  => "Questo cliente non ha un'email valida.",
+    'receipt_number'                    => 'Vendita #',
+    'receipt_sent'                      => 'Scontrino inviato a',
+    'receipt_unsent'                    => 'Scontrino fallito da inviare a',
+    'reference_code'                    => 'Codice di riferimento pagamento',
+    'reference_code_invalid_characters' => 'Il codice di riferimento deve contenere solo lettere e numeri.',
+    'reference_code_length_error'       => 'La lunghezza del codice di riferimento non è valida.',
+    'refund'                            => 'Tipo di rimborso',
+    'register'                          => 'Registrazione Vendita',
+    'remove_customer'                   => 'Rimuovi Cliente',
+    'remove_discount'                   => '',
+    'return'                            => 'Reso',
+    'rewards'                           => 'Punti Raccolta',
+    'rewards_balance'                   => 'Bilancio Punti Raccolta',
+    'rewards_package'                   => 'Punti Fedeltà',
+    'rewards_remaining_balance'         => 'Valore Punti Rimanenti è ',
+    'sale'                              => 'Vendita',
+    'sale_by_invoice'                   => 'Fattura',
+    'sale_for_customer'                 => 'Cliente:',
+    'sale_time'                         => 'Tempo',
+    'sales_tax'                         => 'Imposte di Vendita',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Seleziona Cliente (Opzionale)',
+    'send_invoice'                      => 'Invia Fattura',
+    'send_quote'                        => 'Invia Preventivo',
+    'send_receipt'                      => 'Invia Scontrino',
+    'send_work_order'                   => 'Invia Commessa/Ordine di Lavoro',
+    'serial'                            => 'Seriale',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Mostra Fattura',
+    'show_receipt'                      => 'Mostra Scontrino',
+    'start_typing_customer_name'        => 'Digita i dettagli del cliente...',
+    'start_typing_item_name'            => 'Incomincia a digitare Nome Articolo o spara il Codice a Barre...',
+    'stock'                             => 'Disponibilità',
+    'stock_location'                    => 'Posizione Stock',
+    'sub_total'                         => 'Subtotale',
+    'successfully_deleted'              => 'Hai correttamente eliminato',
+    'successfully_restored'             => 'Hai correttamente ripristinato',
+    'successfully_suspended_sale'       => 'Vendita sospesa correttamente.',
+    'successfully_updated'              => 'Aggiornamento vendita a buon fine.',
+    'suspend_sale'                      => 'Sospendi',
+    'suspended_doc_id'                  => 'Documento',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Sospeso',
+    'table'                             => 'Tavolo',
+    'takings'                           => 'Vendite del Giorno',
+    'tax'                               => 'Imposte',
+    'tax_id'                            => 'ID Imposta',
+    'tax_invoice'                       => "Fattura d'Imposta",
+    'tax_percent'                       => 'Imposte %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Totale',
+    'total_tax_exclusive'               => 'Imposte escluse',
+    'transaction_failed'                => 'Transazione di Vendita fallita.',
+    'unable_to_add_item'                => 'Aggiunta articolo alla vendita non riuscita',
+    'unsuccessfully_deleted'            => 'Eliminazione Vendita/e fallita.',
+    'unsuccessfully_restored'           => 'Ripristino Vendita/e fallita.',
+    'unsuccessfully_suspended_sale'     => 'Vendita sospesa fallita.',
+    'unsuccessfully_updated'            => 'Aggiornamento Vendita fallito.',
+    'unsuspend'                         => 'Non-sospeso',
+    'unsuspend_and_delete'              => 'Azione',
+    'update'                            => 'Aggiorna',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Ordine di Lavoro',
+    'work_order_number'                 => 'Numero Ordine di Lavoro',
+    'work_order_number_duplicate'       => 'Numero Ordine di Lavoro deve essere unico.',
+    'work_order_sent'                   => 'Ordine di lavoro inviato',
+    'work_order_unsent'                 => 'Ordine di Lavoro fallito da inviare a',
 ];
diff --git a/app/Language/ka/Calendar.php b/app/Language/ka/Calendar.php
new file mode 100644
index 000000000..3ca3c3825
--- /dev/null
+++ b/app/Language/ka/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "",
+    "mo"        => "",
+    "tu"        => "",
+    "we"        => "",
+    "th"        => "",
+    "fr"        => "",
+    "sa"        => "",
+    "sun"       => "",
+    "mon"       => "",
+    "tue"       => "",
+    "wed"       => "",
+    "thu"       => "",
+    "fri"       => "",
+    "sat"       => "",
+    "sunday"    => "",
+    "monday"    => "",
+    "tuesday"   => "",
+    "wednesday" => "",
+    "thursday"  => "",
+    "friday"    => "",
+    "saturday"  => "",
+    "jan"       => "",
+    "feb"       => "",
+    "mar"       => "",
+    "apr"       => "",
+    "may"       => "",
+    "jun"       => "",
+    "jul"       => "",
+    "aug"       => "",
+    "sep"       => "",
+    "oct"       => "",
+    "nov"       => "",
+    "dec"       => "",
+    "january"   => "",
+    "february"  => "",
+    "march"     => "",
+    "april"     => "",
+    "may"       => "",
+    "june"      => "",
+    "july"      => "",
+    "august"    => "",
+    "september" => "",
+    "october"   => "",
+    "november"  => "",
+    "december"  => "",
+];
diff --git a/app/Language/ka/Config.php b/app/Language/ka/Config.php
new file mode 100644
index 000000000..bf874f7fe
--- /dev/null
+++ b/app/Language/ka/Config.php
@@ -0,0 +1,338 @@
+<?php
+
+return [
+    'address'                                   => '',
+    'address_required'                          => '',
+    'all_set'                                   => '',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => '',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => '',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => '',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'გადახდის საცნობარო კოდი<br>სიგრძის შეზღუდვები',
+    'payment_reference_code_length_max_label'   => 'მაქს',
+    'payment_reference_code_length_min_label'   => 'მინ',
+    'perm_risk'                                 => '',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'sendmail-ის ბილიკი არასწორია. დაშვებულია მხოლოდ ასოები, ციფრები, დეფისები, ხაზგასმები, დახრილი ხაზები, უკუხაზები, ორწერტილები, ჰარეები და წერტილები.',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => '',
+    'server_notice'                             => '',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'shortcuts'                                 => '',
+    'shortcuts_configuration'                   => '',
+    'shortcuts_duplicate_bindings'              => '',
+    'shortcuts_save_error'                      => '',
+    'system_conf'                               => '',
+    'system_info'                               => '',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
+];
diff --git a/app/Language/ka/Employees.php b/app/Language/ka/Employees.php
new file mode 100644
index 000000000..9c0ddc14c
--- /dev/null
+++ b/app/Language/ka/Employees.php
@@ -0,0 +1,50 @@
+<?php
+
+return [
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'თქვენ არ შეგიძლიათ წაშალოთ თქვენი საკუთარი მინიმალური მოდულის წვდომის უფლებები.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'უფლებების ცვლილებები დეაქტივირებულია ამ დემოში.',
+    'error_password_change_disallowed'       => 'პაროლის ცვლილებები დეაქტივირებულია ამ დემოში.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
+];
diff --git a/app/Language/ka/Items.php b/app/Language/ka/Items.php
new file mode 100644
index 000000000..8559b0521
--- /dev/null
+++ b/app/Language/ka/Items.php
@@ -0,0 +1,124 @@
+<?php
+
+return [
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => '',
+    'category'                           => '',
+    'category_new'                       => '',
+    'category_required'                  => '',
+    'change_all_to_allow_alt_desc'       => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => '',
+    'confirm_bulk_edit'                  => '',
+    'confirm_bulk_edit_wipe_taxes'       => '',
+    'confirm_delete'                     => '',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => '',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'გადასახადის სახელი შეიცავს დაუშვებელ სიმბოლოებს.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
+];
diff --git a/app/Language/ka/Sales.php b/app/Language/ka/Sales.php
new file mode 100644
index 000000000..2b1b51b8b
--- /dev/null
+++ b/app/Language/ka/Sales.php
@@ -0,0 +1,242 @@
+<?php
+
+return [
+    'account_number'                    => '',
+    'add_payment'                       => '',
+    'amount_due'                        => '',
+    'amount_due_not_covered'            => 'გადახდები არ ფარავს გადასახდელ თანხას.',
+    'amount_tendered'                   => '',
+    'authorized_signature'              => '',
+    'bank_transfer'                     => '',
+    'cancel_sale'                       => '',
+    'cash'                              => '',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '',
+    'change_due'                        => '',
+    'change_price'                      => '',
+    'check'                             => '',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => '',
+    'comments'                          => '',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '',
+    'confirm_cancel_sale'               => '',
+    'confirm_delete'                    => '',
+    'confirm_restore'                   => '',
+    'credit'                            => '',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '',
+    'customer_address'                  => '',
+    'customer_discount'                 => '',
+    'customer_email'                    => '',
+    'customer_location'                 => '',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => '',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => '',
+    'date_range'                        => '',
+    'date_required'                     => '',
+    'date_type'                         => '',
+    'debit'                             => '',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => '',
+    'delete_entire_sale'                => '',
+    'delete_successful'                 => '',
+    'delete_unsuccessful'               => '',
+    'description_abbrv'                 => '',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '',
+    'edit_item'                         => '',
+    'edit_sale'                         => '',
+    'email_receipt'                     => '',
+    'employee'                          => '',
+    'entry'                             => '',
+    'error_editing_item'                => '',
+    'find_or_scan_item'                 => '',
+    'find_or_scan_item_or_receipt'      => '',
+    'giftcard'                          => '',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'საჩუქრის ბარათის არასაკმარისი ბალანსი ამ გადახდისთვის.',
+    'insufficient_reward_points'        => 'არასაკმარისი ჯილდოს პოინტები ამ გადახდისთვის.',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => '',
+    'key_customer_search'               => '',
+    'key_finish_quote'                  => '',
+    'key_finish_sale'                   => '',
+    'key_full'                          => '',
+    'key_function'                      => '',
+    'key_help'                          => '',
+    'key_help_modal'                    => '',
+    'key_in'                            => '',
+    'key_item_search'                   => '',
+    'key_out'                           => '',
+    'key_payment'                       => '',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => '',
+    'key_suspended'                     => '',
+    'key_system'                        => '',
+    'key_tendered'                      => '',
+    'key_title'                         => '',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'მიუთითეთ საცნობარო/მოძიების ნომერი.',
+    'negative_amount_tendered'          => 'გადახდილი თანხა არ შეიძლება იყოს უარყოფითი.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => '',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'გადახდის საცნობარო კოდი',
+    'reference_code_invalid_characters' => 'საცნობარო კოდი უნდა შეიცავდეს მხოლოდ ასოებს და ციფრებს.',
+    'reference_code_length_error'       => 'საცნობარო კოდის სიგრძე არასწორია.',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'selected_customer'                 => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wallet'                            => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
+];
diff --git a/app/Language/km/Attributes.php b/app/Language/km/Attributes.php
index 086c8d901..41a6c78c5 100644
--- a/app/Language/km/Attributes.php
+++ b/app/Language/km/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "ព៌តមានបន្ថែម មិនអាចមានអក្សរ '_' រឺ '|'",
-    "confirm_delete"                   => "តើអ្នកពិតជាចង់លុប ព៌តមានបន្ថែម ដែលបានជ្រើសរើស?",
-    "confirm_restore"                  => "តើអ្នកពិតជាដាក់ឡើងវិញនៅ ព៌តមានបន្ថែម ដែលបានជ្រើសរើស?",
-    "definition_cannot_be_deleted"     => "មិនអាចលុបព៌តមានបន្ថែមដែលបានជ្រើសរើស",
-    "definition_error_adding_updating" => "ព៌តមានបន្ថែម {0} មិនអាចថែម រឺកែប្រែបានឡើយ។​ សូមចូលទៅឆែករបាយការណ៍កំហុស។",
-    "definition_flags"                 => "ដាក់បង្ហាញព៌តមានបន្ថែម",
-    "definition_group"                 => "ក្រុម",
-    "definition_id"                    => "លេខរៀង",
-    "definition_name"                  => "បន្ថែម ព៌តមាន",
-    "definition_name_required"         => "ឈ្មោះនៃព៌តមានបន្ថែម​ គឺត្រូវការចាំបាច់ត្រូវបំពេញ",
-    "definition_one_or_multiple"       => "ព៌តមានបន្ថែម",
-    "definition_successful_adding"     => "",
-    "definition_successful_deleted"    => "",
-    "definition_successful_updating"   => "",
-    "definition_type"                  => "",
-    "definition_type_required"         => "",
-    "definition_unit"                  => "",
-    "definition_values"                => "",
-    "new"                              => "",
-    "no_attributes_to_display"         => "",
-    "receipt_visibility"               => "",
-    "show_in_items"                    => "",
-    "show_in_items_visibility"         => "",
-    "show_in_receipt"                  => "",
-    "show_in_receivings"               => "",
-    "show_in_receivings_visibility"    => "",
-    "show_in_sales"                    => "",
-    "show_in_sales_visibility"         => "",
-    "update"                           => "",
+    'attribute_value_invalid_chars'    => 'ព៌តមានបន្ថែម មិនអាចមានអក្សរ \'_\' រឺ \'|\'',
+    'confirm_delete'                   => 'តើអ្នកពិតជាចង់លុប ព៌តមានបន្ថែម ដែលបានជ្រើសរើស?',
+    'confirm_restore'                  => 'តើអ្នកពិតជាដាក់ឡើងវិញនៅ ព៌តមានបន្ថែម ដែលបានជ្រើសរើស?',
+    'definition_cannot_be_deleted'     => 'មិនអាចលុបព៌តមានបន្ថែមដែលបានជ្រើសរើស',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'ព៌តមានបន្ថែម {0} មិនអាចថែម រឺកែប្រែបានឡើយ។​ សូមចូលទៅឆែករបាយការណ៍កំហុស។',
+    'definition_flags'                 => 'ដាក់បង្ហាញព៌តមានបន្ថែម',
+    'definition_group'                 => 'ក្រុម',
+    'definition_id'                    => 'លេខរៀង',
+    'definition_name'                  => 'បន្ថែម ព៌តមាន',
+    'definition_name_required'         => 'ឈ្មោះនៃព៌តមានបន្ថែម​ គឺត្រូវការចាំបាច់ត្រូវបំពេញ',
+    'definition_one_or_multiple'       => 'ព៌តមានបន្ថែម',
+    'definition_successful_adding'     => '',
+    'definition_successful_deleted'    => '',
+    'definition_successful_updating'   => '',
+    'definition_type'                  => '',
+    'definition_type_required'         => '',
+    'definition_unit'                  => '',
+    'definition_values'                => '',
+    'new'                              => '',
+    'no_attributes_to_display'         => '',
+    'receipt_visibility'               => '',
+    'show_in_items'                    => '',
+    'show_in_items_visibility'         => '',
+    'show_in_receipt'                  => '',
+    'show_in_receivings'               => '',
+    'show_in_receivings_visibility'    => '',
+    'show_in_sales'                    => '',
+    'show_in_sales_visibility'         => '',
+    'show_in_search'                   => 'បង្ហាញក្នុងការស្វែងរក',
+    'show_in_search_visibility'        => 'ស្វែងរក',
+    'update'                           => '',
 ];
diff --git a/app/Language/km/Bootstrap_tables.php b/app/Language/km/Bootstrap_tables.php
index 9299868a2..7ccbddd1e 100644
--- a/app/Language/km/Bootstrap_tables.php
+++ b/app/Language/km/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "ទាំងអស់",
-    "columns"              => "ជួរឈរ",
-    "hide_show_pagination" => "លាក់/បង្ហាញ ទំព័រ",
-    "loading"              => "កំពុងរៀបចំ, សូមរងចាំ...",
-    "page_from_to"         => "បង្ហាញពី {0} ដល់​ {1} នៃ​ {2} ជួរដេក",
-    "refresh"              => "ធ្វើអោយថ្មី",
-    "rows_per_page"        => "{0} ជួរដេក ក្នុងមួយទំព័រ",
-    "toggle"               => "បិទបើក",
+    'all' => "ទាំងអស់",
+    'columns' => "ជួរឈរ",
+    'hide_show_pagination' => "លាក់/បង្ហាញ ទំព័រ",
+    'loading' => "កំពុងរៀបចំ, សូមរងចាំ",
+    'page_from_to' => "បង្ហាញពី {0} ដល់​ {1} នៃ​ {2} ជួរដេក",
+    'refresh' => "ធ្វើអោយថ្មី",
+    'rows_per_page' => "{0} ជួរដេក ក្នុងមួយទំព័រ",
+    'toggle' => "បិទបើក",
 ];
diff --git a/app/Language/km/Config.php b/app/Language/km/Config.php
index c599bb83c..7bdac6fda 100644
--- a/app/Language/km/Config.php
+++ b/app/Language/km/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "",
-    "address_required"                          => "",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '',
+    'address_required'                          => '',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'កូដយោងការទូទាត់<br>ដែនកំណត់ប្រវែង',
+    'payment_reference_code_length_max_label'   => 'អតិបរមា',
+    'payment_reference_code_length_min_label'   => 'អប្បបរមា',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'ផ្លូវ sendmail មិនត្រឹមត្រូវ។ អនុញ្ញាតតែអក្សរ លេខ សញ្ញាដាច់បន្ទាត់ សញ្ញាគូសក្រោម សញ្ញាចែកមុខ សញ្ញាចែកក្រោយ សញ្ញាចំណុចពីរ ចន្លោះ និងចំណុចប៉ុណ្ណោះ។',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/km/Employees.php b/app/Language/km/Employees.php
index 0ade4b3ea..c8eb80099 100644
--- a/app/Language/km/Employees.php
+++ b/app/Language/km/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "ព៌តមាន",
-    "cannot_be_deleted"            => "មិនអាចលុបបុគ្គលិកដែលបានជ្រើសរើស, មួយ ឬក៏ច្រើន នៃការលក់ ឬអ្នកកំពុងព្យាយាមលុបគណនីរបស់ខ្លួន។",
-    "change_employee"              => "",
-    "change_password"              => "ផ្លាស់ប្ដូរពាក្យសម្ងាត់",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "តើអ្នកពិតជាចង់លុបបុគ្គលិកដែលបានជ្រើសរើសមែនទេ?",
-    "confirm_restore"              => "តើអ្នកពិតជាចង់ដាក់មកវិញនៅបុគ្គលិកដែរបានជ្រើសរើស?",
-    "current_password"             => "ពាក្យសម្ងាត់បច្ចុប្បន្ន",
-    "current_password_invalid"     => "ពាក្យសម្ងាត់បច្ចុប្បន្ន មិនត្រឹមត្រូវ។",
-    "employee"                     => "បុគ្គលិក",
-    "error_adding_updating"        => "បន្ថែម ឬកែប្រែបុគ្គលិកមិនបានសំរេច។",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "អ្នកមិនអាចលុប គណនីសាកល្បង បានទេ។",
-    "error_updating_demo_admin"    => "អ្នកមិនអាចកែប្រែ គណនីសាកល្បងបានទេ។",
-    "language"                     => "ភាសា",
-    "login_info"                   => "ចូលទៅក្នុងប្រពន្ធ័",
-    "manager"                      => "",
-    "new"                          => "បុគ្គលិកថ្មី",
-    "none_selected"                => "អ្នកមិនបានជ្រើសរើស បុគ្គលិកណាមួយដើម្បីលុបនោះទេ។",
-    "one_or_multiple"              => "បុគ្គលិក",
-    "password"                     => "ពាក្យសម្ងាត់",
-    "password_minlength"           => "ពាក្យសម្ងាត់ ត្រូវតែមានយ៉ាងតិច​ 8 តួអក្សរ។",
-    "password_must_match"          => "ពាក្យសម្ងាត់មិនដូចគ្នា។",
-    "password_not_must_match"      => "ពាក្យសម្ងាត់បច្ចុប្បន្ន នឹងពាក្យសម្ងាត់ថ្មី ត្រូវតែមានតែមួយ។",
-    "password_required"            => "ត្រូវការពាក្យសម្ងាត់។",
-    "permission_desc"              => "ឆែកប្រអប់ខាងក្រោម ដើម្បីផ្ដល់សិទ្ធទៅក្នុងផ្នែកណាមួយ។",
-    "permission_info"              => "សិទ្ធិ",
-    "repeat_password"              => "ពាក្យសម្ងាត់ម្ដងទៀត",
-    "subpermission_required"       => "យ៉ាងហោចណាស់ក៏មាន ផ្នែកមួយត្រូវតែផ្ដល់សិទ្ធិ។",
-    "successful_adding"            => "ការបន្ថែមបុគ្គលិកបានទទួលជោគជ័យ។",
-    "successful_change_password"   => "ការផ្លាស់ប្ដូរពាក្យសម្ងាត់ទទួលបានជោគជ័យ។",
-    "successful_deleted"           => "អ្នកទទួលបានជោគជ័យក្នុងការលុប",
-    "successful_updating"          => "អ្នកទទួលបានជោគជ័យ ក្នុងការកែប្រែបុគ្គលិក",
-    "system_language"              => "ភាសារបស់ប្រព័ន្ធ",
-    "unsuccessful_change_password" => "ការផ្លាស់ប្ដូរពាក្យសម្ងាត់មិនបានសំរេច។",
-    "update"                       => "កែប្រែបុគ្គលិក",
-    "username"                     => "ឈ្នោះអ្នកប្រើប្រាស់",
-    "username_duplicate"           => "ឈ្មោះបុគ្គលិកត្រូវបានប្រើប្រាស់រួចរាល់។ សូមជ្រើសរើសសារជាថ្មី។",
-    "username_minlength"           => "ឈ្មោះអ្នកប្រើប្រាស់ត្រូវមាន 5 តួអក្សរយ៉ាងតិច។",
-    "username_required"            => "ឈ្មោះអ្នកប្រើប្រាស់ត្រូវការចាំបាច់។",
+    'administrator'                          => '',
+    'basic_information'                      => 'ព៌តមាន',
+    'cannot_be_deleted'                      => 'មិនអាចលុបបុគ្គលិកដែលបានជ្រើសរើស, មួយ ឬក៏ច្រើន នៃការលក់ ឬអ្នកកំពុងព្យាយាមលុបគណនីរបស់ខ្លួន។',
+    'change_employee'                        => '',
+    'change_password'                        => 'ផ្លាស់ប្ដូរពាក្យសម្ងាត់',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'តើអ្នកពិតជាចង់លុបបុគ្គលិកដែលបានជ្រើសរើសមែនទេ?',
+    'confirm_restore'                        => 'តើអ្នកពិតជាចង់ដាក់មកវិញនៅបុគ្គលិកដែរបានជ្រើសរើស?',
+    'current_password'                       => 'ពាក្យសម្ងាត់បច្ចុប្បន្ន',
+    'current_password_invalid'               => 'ពាក្យសម្ងាត់បច្ចុប្បន្ន មិនត្រឹមត្រូវ។',
+    'employee'                               => 'បុគ្គលិក',
+    'error_adding_updating'                  => 'បន្ថែម ឬកែប្រែបុគ្គលិកមិនបានសំរេច។',
+    'error_cannot_remove_own_minimum_grant'  => 'អ្នកមិនអាចដកសិទ្ធិចូលប្រើផ្នែកអប្បបរមារបស់ខ្លួនឯងបានទេ។',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'អ្នកមិនអាចលុប គណនីសាកល្បង បានទេ។',
+    'error_grant_change_disallowed'          => 'ការផ្លាស់ប្តូរលក្ខណៈប្រadministrative ត្រូវបានគ្របដណ្តប់ក្នុងលក្ខណៈពិសេស។',
+    'error_password_change_disallowed'       => 'ការផ្លាស់ប្តូរលេខសម្ងាត់ត្រូវបានគ្របដណ្តប់ក្នុងលក្ខណៈពិសេស។',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'អ្នកមិនអាចកែប្រែ គណនីសាកល្បងបានទេ។',
+    'language'                               => 'ភាសា',
+    'login_info'                             => 'ចូលទៅក្នុងប្រពន្ធ័',
+    'manager'                                => '',
+    'new'                                    => 'បុគ្គលិកថ្មី',
+    'none_selected'                          => 'អ្នកមិនបានជ្រើសរើស បុគ្គលិកណាមួយដើម្បីលុបនោះទេ។',
+    'one_or_multiple'                        => 'បុគ្គលិក',
+    'password'                               => 'ពាក្យសម្ងាត់',
+    'password_minlength'                     => 'ពាក្យសម្ងាត់ ត្រូវតែមានយ៉ាងតិច​ 8 តួអក្សរ។',
+    'password_must_match'                    => 'ពាក្យសម្ងាត់មិនដូចគ្នា។',
+    'password_not_must_match'                => 'ពាក្យសម្ងាត់បច្ចុប្បន្ន នឹងពាក្យសម្ងាត់ថ្មី ត្រូវតែមានតែមួយ។',
+    'password_required'                      => 'ត្រូវការពាក្យសម្ងាត់។',
+    'permission_desc'                        => 'ឆែកប្រអប់ខាងក្រោម ដើម្បីផ្ដល់សិទ្ធទៅក្នុងផ្នែកណាមួយ។',
+    'permission_info'                        => 'សិទ្ធិ',
+    'repeat_password'                        => 'ពាក្យសម្ងាត់ម្ដងទៀត',
+    'subpermission_required'                 => 'យ៉ាងហោចណាស់ក៏មាន ផ្នែកមួយត្រូវតែផ្ដល់សិទ្ធិ។',
+    'successful_adding'                      => 'ការបន្ថែមបុគ្គលិកបានទទួលជោគជ័យ។',
+    'successful_change_password'             => 'ការផ្លាស់ប្ដូរពាក្យសម្ងាត់ទទួលបានជោគជ័យ។',
+    'successful_deleted'                     => 'អ្នកទទួលបានជោគជ័យក្នុងការលុប',
+    'successful_updating'                    => 'អ្នកទទួលបានជោគជ័យ ក្នុងការកែប្រែបុគ្គលិក',
+    'system_language'                        => 'ភាសារបស់ប្រព័ន្ធ',
+    'unsuccessful_change_password'           => 'ការផ្លាស់ប្ដូរពាក្យសម្ងាត់មិនបានសំរេច។',
+    'update'                                 => 'កែប្រែបុគ្គលិក',
+    'username'                               => 'ឈ្នោះអ្នកប្រើប្រាស់',
+    'username_duplicate'                     => 'ឈ្មោះបុគ្គលិកត្រូវបានប្រើប្រាស់រួចរាល់។ សូមជ្រើសរើសសារជាថ្មី។',
+    'username_minlength'                     => 'ឈ្មោះអ្នកប្រើប្រាស់ត្រូវមាន 5 តួអក្សរយ៉ាងតិច។',
+    'username_required'                      => 'ឈ្មោះអ្នកប្រើប្រាស់ត្រូវការចាំបាច់។',
 ];
diff --git a/app/Language/km/Error.php b/app/Language/km/Error.php
index 4842a3ac9..95500ad28 100644
--- a/app/Language/km/Error.php
+++ b/app/Language/km/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "អ្នកមិនមានសិទ្ធដើម្បីចូលទៅ ផ្នែកនោះទេ",
-    "unknown"              => "កំហុសមិនស្គាល់",
+    'no_permission_module'           => 'អ្នកមិនមានសិទ្ធដើម្បីចូលទៅ ផ្នែកនោះទេ',
+    'unable_to_create_env_file'      => 'មិនអាចបង្កើត {filePath} ដើម្បីរៀបចំ throttle.key',
+    'unable_to_lock_file'            => 'មិនអាចចាក់សោ {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'មិនអាចបើក {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'មិនអាចរក្សាទុក throttle.key ទៅ {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'មិនអាចអាន {filePath} ដើម្បីរៀបចំ throttle.key',
+    'unknown'                        => 'កំហុសមិនស្គាល់',
 ];
diff --git a/app/Language/km/Items.php b/app/Language/km/Items.php
index 074ba5415..817f5053f 100644
--- a/app/Language/km/Items.php
+++ b/app/Language/km/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "ស្តុក​ សំរាប់បន្ថែម រឺក៏ដកទំនិញ។",
-    "allow_alt_description"              => "យល់ព្រម ចំពោះការពិព៌ណនា ផ្សេងទៀត",
-    "amount_entry"                       => "ចំនួន ត្រូវបញ្ជូល",
-    "bulk_edit"                          => "កែប្រែជាក្រុម",
-    "buy_price_required"                 => "តម្លៃទិញចូល ត្រូវតែបំពេញ។",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "ទំនិញរកមិនឃើញ។",
-    "categories"                         => "",
-    "category"                           => "ប្រភេទ",
-    "category_new"                       => "",
-    "category_required"                  => "ត្រូវការ ប្រភេទចាំបាច់។",
-    "change_all_to_allow_alt_desc"       => "អនុញ្ញាតអោយមានការព៌ណនាផ្សេងទៀត សំរាប់គ្រប់យ៉ាង។",
-    "change_all_to_not_allow_allow_desc" => "មិនអនុញ្ញាតអោយមានការព៌ណនាផ្សេងទៀត សំរាប់គ្រប់យ៉ាង។",
-    "change_all_to_serialized"           => "ផ្លាស់ប្ដូរទាំងអស់ទៅជាលំដាប់",
-    "change_all_to_unserialized"         => "ផ្លាស់ប្ដូរទាំងអស់ទៅជាមិនលំដាប់",
-    "change_image"                       => "ផ្លាស់ប្ដូររូបភាព",
-    "confirm_bulk_edit"                  => "តើអ្នកពិតជាចង់កែប្រែ ទំនិញដែលបានជ្រើសរើសមែនទេ?",
-    "confirm_bulk_edit_wipe_taxes"       => "រាល់ពន្ធលើទំនិញទាំងអស់ នឹងធ្វើការផ្លាស់ប្ដូរ។",
-    "confirm_delete"                     => "តើអ្នកពិតជាចង់លុបទំនិញដែលបានជ្រើសរើសមែនទេ?",
-    "confirm_restore"                    => "តើអ្នកពិតជាចង់ដាក់មកវិញនៅទំនិញដែលបានជ្រើសរើសមែនទេ?",
-    "cost_price"                         => "តម្លៃលក់ដុំ",
-    "cost_price_number"                  => "តម្លៃលក់ដុំត្រូវតែជាលេខ។",
-    "cost_price_required"                => "ត្រូវការតម្លៃលក់ដុំជាចាំបាច់។",
-    "count"                              => "កែប្រែ ទំនិញក្នុងស្តុក",
-    "csv_import_failed"                  => "CSV បញ្ចូលមិនបានសំរេច",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "ដាក់បញ្ជុល CSV មិនមានទិន្នន័យ ឬទំរង់មិនត្រឹមត្រូវ។",
-    "csv_import_partially_failed"        => "មានទំននិញ {0} បញ្ជូលមិនបានសំរេច នៅជួរ: {1}​ ។ គ្មានជួរណាមួយត្រូវបានបញ្ជូលនោះទេ។",
-    "csv_import_success"                 => "ទំនិញក្នុង CSV បញ្ចូលបានសំរេច។",
-    "current_quantity"                   => "បរិមាណបច្ចុប្បន្ន",
-    "default_pack_name"                  => "",
-    "description"                        => "បរិយាយ",
-    "details_count"                      => "ចំនួនទំនិញក្នុងស្ដុកជាក់លាក់",
-    "do_nothing"                         => "មិនធ្វើអ្វី",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "កែប្រែព៌តមានទៅលើកន្លែងដែលបានជ្រើសរើស។",
-    "edit_multiple_items"                => "កែប្រែ ទំនិញច្រើនក្នុងពេលតែមួយ",
-    "empty_upc_items"                    => "ទំនិញមិនមាន លេខកូត",
-    "error_adding_updating"              => "មានបញ្ហា បន្ថែម /កែប្រែទំនិញ",
-    "error_updating_multiple"            => "មានបញ្ហាកែប្រែទំនិញ",
-    "generate_barcodes"                  => "បង្កើតលេខកូត",
-    "hsn_code"                           => "",
-    "image"                              => "រូបសម្គាល់",
-    "import_items_csv"                   => "ទំនិញបញ្ចូលពី CSV",
-    "info_provided_by"                   => "ព៌តមានផ្ដល់ដោយ",
-    "inventory"                          => "ស្ដុកទំនិញ",
-    "inventory_CSV_import_quantity"      => "ចំនួនទំនិញ បញ្ចូលពី CSV",
-    "inventory_comments"                 => "មតិយោបល់",
-    "inventory_data_tracking"            => "តាមដានទិន្នន័យស្តុកទំនិញ",
-    "inventory_date"                     => "ថ្ងៃខែ",
-    "inventory_employee"                 => "បុគ្គលិក",
-    "inventory_in_out_quantity"          => "បរិមាណ ចូល/ចេញ",
-    "inventory_remarks"                  => "សំគាល់",
-    "is_deleted"                         => "បានលុប",
-    "is_printed"                         => "",
-    "is_serialized"                      => "ទំនិញមានលេខរៀង",
-    "item"                               => "ទំនិញ",
-    "item_id"                            => "",
-    "item_number"                        => "លេខកូត",
-    "item_number_duplicate"              => "លេខរបស់ទំនិញមាននៅក្នុងទិន្នន័យរួចរាល់។",
-    "kit"                                => "កញ្ចប់",
-    "location"                           => "ទីតាំង",
-    "low_inventory_items"                => "ទំនិញអស់ពីស្តុក",
-    "low_sell_item"                      => "ទំនិញជិតអស់",
-    "manually_editing_of_quantity"       => "កែប្រែចំនួនមានក្នុងស្តុក",
-    "markup"                             => "",
-    "name"                               => "ឈ្មោះទំនិញ",
-    "name_required"                      => "ឈោ្មះទំនិញត្រូវការចាំបាច់។",
-    "new"                                => "ទំនិញថ្មី",
-    "no_description_items"               => "ទំនិញមិនមានការបរិយាយ",
-    "no_items_to_display"                => "មិនមានទំនិញសំរាប់បង្ហាញ។",
-    "none"                               => "គ្មាន",
-    "none_selected"                      => "អ្នកមិនបានជ្រើសរើសទំនិញណាមួយសំរាប់កែប្រែនោះទេ",
-    "nonstock"                           => "មិនមានស្ដុក",
-    "number_information"                 => "លេខរបស់ទំនិញ",
-    "number_required"                    => "ត្រូវការលេខកូតចាំបាច់។",
-    "one_or_multiple"                    => "ទំនិញ",
-    "pack_name"                          => "កញ្ចប់ឈ្មោះ",
-    "qty_per_pack"                       => "បរិមាណក្នុងមួយកញ្ចប់",
-    "quantity"                           => "បរិមាណ",
-    "quantity_number"                    => "បរិមាណត្រូវតែជាលេខ។",
-    "quantity_required"                  => "បរិមាណ​ ត្រូវការជាចាំបាច់។",
-    "receiving_quantity"                 => "បរិមាណដែលបានទទួល",
-    "remove_image"                       => "ដករូបភាព",
-    "reorder_level"                      => "រៀបឡើងវិញនៅលំដាប់",
-    "reorder_level_number"               => "រៀបលេខលំដាប់ឡើងវិញត្រូវតែជាលេខ។",
-    "reorder_level_required"             => "រៀបលេខលំដាប់ឡើងវិញត្រូវការចាំបាច់។",
-    "retrive_item_info"                  => "ទាញយកព៌តមាននៃទំនិញ",
-    "sales_tax_1"                        => "ពន្ធនៃការលក់",
-    "sales_tax_2"                        => "ពន្ធនៃការលក់ 2",
-    "search_attributes"                  => "ស្វែងរកព៌តមានបន្ថែម",
-    "select_image"                       => "ជ្រើសរើសរូបភាព",
-    "serialized_items"                   => "ធ្វើអោយទំនិញមានលេខរៀង",
-    "standard"                           => "ស្តង់ដារ",
-    "stock"                              => "ស្តុក",
-    "stock_location"                     => "ទីតាំងស្តុក",
-    "stock_type"                         => "ប្រភេទ ស្តុក",
-    "successful_adding"                  => "អ្នកទទួលបានជោគជ័យក្នុងការបន្ថែមទំនិញ",
-    "successful_bulk_edit"               => "អ្នកទទួលបានជោគជ័យក្នុងការកែប្រែទំនិញ",
-    "successful_deleted"                 => "អ្នកទទួលបានជោគជ័យក្នុងការលុប",
-    "successful_updating"                => "អ្នកទទួលបានជោគជ័យក្នុងការកែប្រែទំនិញ",
-    "supplier"                           => "អ្នកផ្គត់ផ្គង់",
-    "tax_1"                              => "ពន្ធ​ 1",
-    "tax_2"                              => "ពន្ធ​ 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "ប្រភេទពន្ធ​",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "ភាគរយពន្ធត្រូវតែជាលេខគត់",
-    "tax_percent_required"               => "ភាគរយពន្ធត្រូវការជាចាំបាច់។",
-    "tax_percents"                       => "ភាគរយពន្ធ",
-    "temp"                               => "បណ្ដោះអាសន្ន",
-    "type"                               => "ប្រភេទទំនិញ",
-    "unit_price"                         => "តម្លៃរាយ",
-    "unit_price_number"                  => "តម្លៃក្នុងមួយឯកតា ត្រូវតែជាលេខ។",
-    "unit_price_required"                => "តម្លៃលក់រាយ ត្រូវការជាចាំបាច់។",
-    "upc_database"                       => "ទិន្នន័យ លេខកូត",
-    "update"                             => "កែប្រែទំនិញ",
-    "use_inventory_menu"                 => "ប្រើប្រាស់បញ្ជីទំនិញ",
+    'add_minus'                          => 'ស្តុក​ សំរាប់បន្ថែម រឺក៏ដកទំនិញ។',
+    'allow_alt_description'              => 'យល់ព្រម ចំពោះការពិព៌ណនា ផ្សេងទៀត',
+    'amount_entry'                       => 'ចំនួន ត្រូវបញ្ជូល',
+    'bulk_edit'                          => 'កែប្រែជាក្រុម',
+    'buy_price_required'                 => 'តម្លៃទិញចូល ត្រូវតែបំពេញ។',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => 'ទំនិញរកមិនឃើញ។',
+    'categories'                         => '',
+    'category'                           => 'ប្រភេទ',
+    'category_new'                       => '',
+    'category_required'                  => 'ត្រូវការ ប្រភេទចាំបាច់។',
+    'change_all_to_allow_alt_desc'       => 'អនុញ្ញាតអោយមានការព៌ណនាផ្សេងទៀត សំរាប់គ្រប់យ៉ាង។',
+    'change_all_to_not_allow_allow_desc' => 'មិនអនុញ្ញាតអោយមានការព៌ណនាផ្សេងទៀត សំរាប់គ្រប់យ៉ាង។',
+    'change_all_to_serialized'           => 'ផ្លាស់ប្ដូរទាំងអស់ទៅជាលំដាប់',
+    'change_all_to_unserialized'         => 'ផ្លាស់ប្ដូរទាំងអស់ទៅជាមិនលំដាប់',
+    'change_image'                       => 'ផ្លាស់ប្ដូររូបភាព',
+    'confirm_bulk_edit'                  => 'តើអ្នកពិតជាចង់កែប្រែ ទំនិញដែលបានជ្រើសរើសមែនទេ?',
+    'confirm_bulk_edit_wipe_taxes'       => 'រាល់ពន្ធលើទំនិញទាំងអស់ នឹងធ្វើការផ្លាស់ប្ដូរ។',
+    'confirm_delete'                     => 'តើអ្នកពិតជាចង់លុបទំនិញដែលបានជ្រើសរើសមែនទេ?',
+    'confirm_restore'                    => 'តើអ្នកពិតជាចង់ដាក់មកវិញនៅទំនិញដែលបានជ្រើសរើសមែនទេ?',
+    'cost_price'                         => 'តម្លៃលក់ដុំ',
+    'cost_price_number'                  => 'តម្លៃលក់ដុំត្រូវតែជាលេខ។',
+    'cost_price_required'                => 'ត្រូវការតម្លៃលក់ដុំជាចាំបាច់។',
+    'count'                              => 'កែប្រែ ទំនិញក្នុងស្តុក',
+    'csv_import_failed'                  => 'CSV បញ្ចូលមិនបានសំរេច',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'ដាក់បញ្ជុល CSV មិនមានទិន្នន័យ ឬទំរង់មិនត្រឹមត្រូវ។',
+    'csv_import_partially_failed'        => 'មានទំននិញ {0} បញ្ជូលមិនបានសំរេច នៅជួរ: {1}​ ។ គ្មានជួរណាមួយត្រូវបានបញ្ជូលនោះទេ។',
+    'csv_import_success'                 => 'ទំនិញក្នុង CSV បញ្ចូលបានសំរេច។',
+    'current_quantity'                   => 'បរិមាណបច្ចុប្បន្ន',
+    'default_pack_name'                  => '',
+    'description'                        => 'បរិយាយ',
+    'details_count'                      => 'ចំនួនទំនិញក្នុងស្ដុកជាក់លាក់',
+    'do_nothing'                         => 'មិនធ្វើអ្វី',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'កែប្រែព៌តមានទៅលើកន្លែងដែលបានជ្រើសរើស។',
+    'edit_multiple_items'                => 'កែប្រែ ទំនិញច្រើនក្នុងពេលតែមួយ',
+    'empty_upc_items'                    => 'ទំនិញមិនមាន លេខកូត',
+    'error_adding_updating'              => 'មានបញ្ហា បន្ថែម /កែប្រែទំនិញ',
+    'error_updating_multiple'            => 'មានបញ្ហាកែប្រែទំនិញ',
+    'generate_barcodes'                  => 'បង្កើតលេខកូត',
+    'hsn_code'                           => '',
+    'image'                              => 'រូបសម្គាល់',
+    'import_items_csv'                   => 'ទំនិញបញ្ចូលពី CSV',
+    'info_provided_by'                   => 'ព៌តមានផ្ដល់ដោយ',
+    'inventory'                          => 'ស្ដុកទំនិញ',
+    'inventory_CSV_import_quantity'      => 'ចំនួនទំនិញ បញ្ចូលពី CSV',
+    'inventory_comments'                 => 'មតិយោបល់',
+    'inventory_data_tracking'            => 'តាមដានទិន្នន័យស្តុកទំនិញ',
+    'inventory_date'                     => 'ថ្ងៃខែ',
+    'inventory_employee'                 => 'បុគ្គលិក',
+    'inventory_in_out_quantity'          => 'បរិមាណ ចូល/ចេញ',
+    'inventory_remarks'                  => 'សំគាល់',
+    'is_deleted'                         => 'បានលុប',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'ទំនិញមានលេខរៀង',
+    'item'                               => 'ទំនិញ',
+    'item_id'                            => '',
+    'item_number'                        => 'លេខកូត',
+    'item_number_duplicate'              => 'លេខរបស់ទំនិញមាននៅក្នុងទិន្នន័យរួចរាល់។',
+    'item_number_invalid'                => 'លេខរបស់ទំនិញមានតួអក្សរដែលមិនត្រូវបានអនុញ្ញាត។',
+    'kit'                                => 'កញ្ចប់',
+    'location'                           => 'ទីតាំង',
+    'low_inventory_items'                => 'ទំនិញអស់ពីស្តុក',
+    'low_sell_item'                      => 'ទំនិញជិតអស់',
+    'manually_editing_of_quantity'       => 'កែប្រែចំនួនមានក្នុងស្តុក',
+    'markup'                             => '',
+    'name'                               => 'ឈ្មោះទំនិញ',
+    'name_required'                      => 'ឈោ្មះទំនិញត្រូវការចាំបាច់។',
+    'new'                                => 'ទំនិញថ្មី',
+    'no_description_items'               => 'ទំនិញមិនមានការបរិយាយ',
+    'no_items_to_display'                => 'មិនមានទំនិញសំរាប់បង្ហាញ។',
+    'none'                               => 'គ្មាន',
+    'none_selected'                      => 'អ្នកមិនបានជ្រើសរើសទំនិញណាមួយសំរាប់កែប្រែនោះទេ',
+    'nonstock'                           => 'មិនមានស្ដុក',
+    'number_information'                 => 'លេខរបស់ទំនិញ',
+    'number_required'                    => 'ត្រូវការលេខកូតចាំបាច់។',
+    'one_or_multiple'                    => 'ទំនិញ',
+    'pack_name'                          => 'កញ្ចប់ឈ្មោះ',
+    'qty_per_pack'                       => 'បរិមាណក្នុងមួយកញ្ចប់',
+    'quantity'                           => 'បរិមាណ',
+    'quantity_number'                    => 'បរិមាណត្រូវតែជាលេខ។',
+    'quantity_required'                  => 'បរិមាណ​ ត្រូវការជាចាំបាច់។',
+    'receiving_quantity'                 => 'បរិមាណដែលបានទទួល',
+    'remove_image'                       => 'ដករូបភាព',
+    'reorder_level'                      => 'រៀបឡើងវិញនៅលំដាប់',
+    'reorder_level_number'               => 'រៀបលេខលំដាប់ឡើងវិញត្រូវតែជាលេខ។',
+    'reorder_level_required'             => 'រៀបលេខលំដាប់ឡើងវិញត្រូវការចាំបាច់។',
+    'retrive_item_info'                  => 'ទាញយកព៌តមាននៃទំនិញ',
+    'sales_tax_1'                        => 'ពន្ធនៃការលក់',
+    'sales_tax_2'                        => 'ពន្ធនៃការលក់ 2',
+    'search_attributes'                  => 'ស្វែងរកព៌តមានបន្ថែម',
+    'select_image'                       => 'ជ្រើសរើសរូបភាព',
+    'serialized_items'                   => 'ធ្វើអោយទំនិញមានលេខរៀង',
+    'standard'                           => 'ស្តង់ដារ',
+    'stock'                              => 'ស្តុក',
+    'stock_location'                     => 'ទីតាំងស្តុក',
+    'stock_type'                         => 'ប្រភេទ ស្តុក',
+    'successful_adding'                  => 'អ្នកទទួលបានជោគជ័យក្នុងការបន្ថែមទំនិញ',
+    'successful_bulk_edit'               => 'អ្នកទទួលបានជោគជ័យក្នុងការកែប្រែទំនិញ',
+    'successful_deleted'                 => 'អ្នកទទួលបានជោគជ័យក្នុងការលុប',
+    'successful_updating'                => 'អ្នកទទួលបានជោគជ័យក្នុងការកែប្រែទំនិញ',
+    'supplier'                           => 'អ្នកផ្គត់ផ្គង់',
+    'tax_1'                              => 'ពន្ធ​ 1',
+    'tax_2'                              => 'ពន្ធ​ 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'ប្រភេទពន្ធ​',
+    'tax_name_invalid'                   => 'ឈ្មោះពន្ធមានតួអក្សរដែលមិនត្រូវបានអនុញ្ញាត។',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => 'ភាគរយពន្ធត្រូវតែជាលេខគត់',
+    'tax_percent_required'               => 'ភាគរយពន្ធត្រូវការជាចាំបាច់។',
+    'tax_percents'                       => 'ភាគរយពន្ធ',
+    'temp'                               => 'បណ្ដោះអាសន្ន',
+    'type'                               => 'ប្រភេទទំនិញ',
+    'unit_price'                         => 'តម្លៃរាយ',
+    'unit_price_number'                  => 'តម្លៃក្នុងមួយឯកតា ត្រូវតែជាលេខ។',
+    'unit_price_required'                => 'តម្លៃលក់រាយ ត្រូវការជាចាំបាច់។',
+    'upc_database'                       => 'ទិន្នន័យ លេខកូត',
+    'update'                             => 'កែប្រែទំនិញ',
+    'use_inventory_menu'                 => 'ប្រើប្រាស់បញ្ជីទំនិញ',
 ];
diff --git a/app/Language/km/Login.php b/app/Language/km/Login.php
index 5ce999603..9e1e33d50 100644
--- a/app/Language/km/Login.php
+++ b/app/Language/km/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "ខ្ញុំមិនមែនជាម៉ាស៊ីនទេ។",
-    "go"                            => "ចាប់ផ្ដើម",
-    "invalid_gcaptcha"              => "មិនត្រឹមត្រូវខ្ញុំមិនមែនជាម៉ាស៊ីនទេ។",
-    "invalid_installation"          => "ការបញ្ចូលមិនត្រឹមត្រូវ, សូមពិនិត្យមើលឯកសារ php.ini របស់អ្នក។",
-    "invalid_username_and_password" => "ឈ្មោះឬក៏ពាក្យសំងាត់មិនត្រឹមត្រូវ។",
-    "login"                         => "ចូល",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "ពាក្យសំងាត់",
-    "required_username"             => "",
-    "username"                      => "ឈ្មោះ",
-    "welcome"                       => "",
+    "gcaptcha"                            => "ខ្ញុំមិនមែនជាម៉ាស៊ីនទេ។",
+    "go"                                  => "ចាប់ផ្ដើម",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "មិនត្រឹមត្រូវខ្ញុំមិនមែនជាម៉ាស៊ីនទេ។",
+    "invalid_installation"                => "ការបញ្ចូលមិនត្រឹមត្រូវ, សូមពិនិត្យមើលឯកសារ php.ini របស់អ្នក។",
+    "invalid_username_and_password"       => "ឈ្មោះឬក៏ពាក្យសំងាត់មិនត្រឹមត្រូវ។",
+    "login"                               => "ចូល",
+    "logout"                              => "",
+    "migrating_database"                  => "កំពុងធ្វើចំណាកស្រុកមូលដ្ឋានទិន្នន័យ",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "មូលដ្ឋានទិន្នន័យបានធ្វើចំណាកស្រុកដោយជោគជ័យ!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "ពាក្យសំងាត់",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'ការព្យាយាមច្រើនពេក។ សូមរង់ចាំបន្តិច ហើយព្យាយាមម្តងទៀត។',
+    "username"                            => "ឈ្មោះ",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/km/Reports.php b/app/Language/km/Reports.php
index eddf94a49..9d20f2d65 100644
--- a/app/Language/km/Reports.php
+++ b/app/Language/km/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/km/Sales.php b/app/Language/km/Sales.php
index 80868cbc3..36e80502e 100644
--- a/app/Language/km/Sales.php
+++ b/app/Language/km/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "ពិន្ទុដែលប្រើប្រាស់បាន",
-    "rewards_package"                  => "រង្វាន់",
-    "rewards_remaining_balance"        => "ពន្ទុកសំរាប់ដូរយករង្វាន់នៅសល់ ",
-    "account_number"                   => "លេខគណនី",
-    "add_payment"                      => "បញ្ជូលរបៀបបង់ប្រាក់",
-    "amount_due"                       => "ទឹកប្រាក់ដែលត្រូវបង់",
-    "amount_tendered"                  => "ទឹកប្រាក់បានមកពីការបង់ទាំងផ្សេងៗ",
-    "authorized_signature"             => "ហត្ថលេខា",
-    "cancel_sale"                      => "បោះបង់",
-    "cash"                             => "ប្រាក់",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "ទឹកប្រាក់ដែរធ្វើការកែប្រែ",
-    "cash_deposit"                     => "ប្រាក់កក់",
-    "cash_filter"                      => "ប្រាក់",
-    "change_due"                       => "សុពលភាពនៃការកែប្រែ",
-    "change_price"                     => "ប្ដូរតម្លៃលក់",
-    "check"                            => "ឆែក",
-    "check_balance"                    => "ឆែក ចំនួននៅសល់",
-    "check_filter"                     => "ឆែក",
-    "close"                            => "",
-    "comment"                          => "យោបល់",
-    "comments"                         => "យោបល់",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "សំរេច",
-    "confirm_cancel_sale"              => "តើអ្នកពិតជាចង់លុបការលក់នេះមែនទេ? រាល់ទំនិញទាំងអស់នឹងត្រូវបានលុប។",
-    "confirm_delete"                   => "តើអ្នកពិតជាចង់លុបការលក់ដែរបានជ្រើសរើសមែនទេ?",
-    "confirm_restore"                  => "តើអ្នកពិតជាចង់ដាក់មកវិញនៅការលក់ដែរបានជ្រើសរើសមែនទេ?",
-    "credit"                           => "បណ្ណ័មូលបត្របំណុល",
-    "credit_deposit"                   => "ដាក់ លុយ",
-    "credit_filter"                    => "បណ្ណ័មូលបត្របំណុល",
-    "current_table"                    => "",
-    "customer"                         => "អតិថិជន",
-    "customer_address"                 => "អាសយដ្ឋាន",
-    "customer_discount"                => "បញ្ចុះតម្លៃ",
-    "customer_email"                   => "អ៊ីម៉ែល",
-    "customer_location"                => "ទីតាំង",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "(ត្រូវការបញ្ចូល ប្រាក់ដែលត្រូវបង់)",
-    "customer_required"                => "(ត្រូវការ)",
-    "customer_total"                   => "សរុប",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "ថ្ងៃខែ លក់",
-    "date_range"                       => "ចន្លោះ ថ្ងៃខែ",
-    "date_required"                    => "ត្រូវតែបញ្ជូល ថ្ងៃខែ​ដែលត្រឹមត្រូវ",
-    "date_type"                        => "ត្រូវការបញ្ចូលថ្ងៃខែ​ជាចាំបាច់។",
-    "debit"                            => "កាត ធនាគារ",
-    "debit_filter"                     => "",
-    "delete"                           => "យល់ព្រម អោយលុប",
-    "delete_confirmation"              => "តើអ្នកពិតជាចង់លុបការលក់នេះមែនទេ? ធ្វើដូចនេះអ្នកមិនអាចហៅវាត្រលប់មកវិញទេ។",
-    "delete_entire_sale"               => "លុបការលក់ទាំងអស់",
-    "delete_successful"                => "ការលក់ ត្រូវបានលុបដោយជោគជ័យ។",
-    "delete_unsuccessful"              => "ការលក់ មិនត្រូវបានលុប។",
-    "description_abbrv"                => "បរិយាយ។",
-    "discard"                          => "មិនយកជាការ",
-    "discard_quote"                    => "",
-    "discount"                         => "បញ្ចុះតម្លៃ",
-    "discount_included"                => "បញ្ចុះតម្លៃ %",
-    "discount_short"                   => "%",
-    "due"                              => "ដល់ពេល",
-    "due_filter"                       => "ដល់ពេល",
-    "edit"                             => "កែប្រែ",
-    "edit_item"                        => "កែប្រែទំនិញ",
-    "edit_sale"                        => "កែប្រែការលក់",
-    "email_receipt"                    => "អ្នកទទួលអ៊ីម៉េល",
-    "employee"                         => "បុគ្គលិក",
-    "entry"                            => "បញ្ចូល",
-    "error_editing_item"               => "មានកំហុស ក្នុងការកែប្រែទំនិញ",
-    "find_or_scan_item"                => "ស្វែងរក ឬស្កេនទំនិញ",
-    "find_or_scan_item_or_receipt"     => "ស្វែងរក ឬ​ស្កេនទំនិញ ឬ វិក័យបត្រ",
-    "giftcard"                         => "កាតអំណោយ",
-    "giftcard_balance"                 => "សមតុល្យលើកាតអំណោយ",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "លេខកាតអំណោយ",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "",
-    "include_prices"                   => "",
-    "invoice"                          => "",
-    "invoice_confirm"                  => "",
-    "invoice_enable"                   => "",
-    "invoice_filter"                   => "",
-    "invoice_no_email"                 => "",
-    "invoice_number"                   => "",
-    "invoice_number_duplicate"         => "",
-    "invoice_sent"                     => "",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "",
-    "invoice_update"                   => "",
-    "item_insufficient_of_stock"       => "",
-    "item_name"                        => "",
-    "item_number"                      => "",
-    "item_out_of_stock"                => "",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "",
-    "new_customer"                     => "",
-    "new_item"                         => "",
-    "no_description"                   => "",
-    "no_filter"                        => "",
-    "no_items_in_cart"                 => "",
-    "no_sales_to_display"              => "",
-    "none_selected"                    => "",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "",
-    "payment_amount"                   => "",
-    "payment_not_cover_total"          => "",
-    "payment_type"                     => "",
-    "payments"                         => "",
-    "payments_total"                   => "",
-    "price"                            => "",
-    "print_after_sale"                 => "",
-    "quantity"                         => "",
-    "quantity_less_than_reorder_level" => "",
-    "quantity_less_than_zero"          => "",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "",
-    "receipt_sent"                     => "",
-    "receipt_unsent"                   => "",
-    "refund"                           => "",
-    "register"                         => "",
-    "remove_customer"                  => "",
-    "remove_discount"                  => "",
-    "return"                           => "",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "",
-    "sale_time"                        => "",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "",
-    "send_invoice"                     => "",
-    "send_quote"                       => "",
-    "send_receipt"                     => "",
-    "send_work_order"                  => "",
-    "serial"                           => "",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "",
-    "show_receipt"                     => "",
-    "start_typing_customer_name"       => "",
-    "start_typing_item_name"           => "",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "",
-    "successfully_deleted"             => "",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "",
-    "successfully_updated"             => "",
-    "suspend_sale"                     => "",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "",
-    "suspended_sales"                  => "",
-    "table"                            => "",
-    "takings"                          => "",
-    "tax"                              => "",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "",
-    "taxed_ind"                        => "",
-    "total"                            => "",
-    "total_tax_exclusive"              => "",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "",
-    "unsuccessfully_deleted"           => "",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "",
-    "unsuccessfully_updated"           => "",
-    "unsuspend"                        => "",
-    "unsuspend_and_delete"             => "",
-    "update"                           => "",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => 'លេខគណនី',
+    'add_payment'                       => 'បញ្ជូលរបៀបបង់ប្រាក់',
+    'amount_due'                        => 'ទឹកប្រាក់ដែលត្រូវបង់',
+    'amount_due_not_covered'            => 'ការទូទាត់មិនគ្របដណ្តប់ចំនួនទឹកប្រាក់ដែលត្រូវបង់ទេ។',
+    'amount_tendered'                   => 'ទឹកប្រាក់បានមកពីការបង់ទាំងផ្សេងៗ',
+    'authorized_signature'              => 'ហត្ថលេខា',
+    'cancel_sale'                       => 'បោះបង់',
+    'cash'                              => 'ប្រាក់',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'ទឹកប្រាក់ដែរធ្វើការកែប្រែ',
+    'cash_deposit'                      => 'ប្រាក់កក់',
+    'cash_filter'                       => 'ប្រាក់',
+    'change_due'                        => 'សុពលភាពនៃការកែប្រែ',
+    'change_price'                      => 'ប្ដូរតម្លៃលក់',
+    'check'                             => 'ឆែក',
+    'check_balance'                     => 'ឆែក ចំនួននៅសល់',
+    'check_filter'                      => 'ឆែក',
+    'close'                             => '',
+    'comment'                           => 'យោបល់',
+    'comments'                          => 'យោបល់',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'សំរេច',
+    'confirm_cancel_sale'               => 'តើអ្នកពិតជាចង់លុបការលក់នេះមែនទេ? រាល់ទំនិញទាំងអស់នឹងត្រូវបានលុប។',
+    'confirm_delete'                    => 'តើអ្នកពិតជាចង់លុបការលក់ដែរបានជ្រើសរើសមែនទេ?',
+    'confirm_restore'                   => 'តើអ្នកពិតជាចង់ដាក់មកវិញនៅការលក់ដែរបានជ្រើសរើសមែនទេ?',
+    'credit'                            => 'បណ្ណ័មូលបត្របំណុល',
+    'credit_deposit'                    => 'ដាក់ លុយ',
+    'credit_filter'                     => 'បណ្ណ័មូលបត្របំណុល',
+    'current_table'                     => '',
+    'customer'                          => 'អតិថិជន',
+    'customer_address'                  => 'អាសយដ្ឋាន',
+    'customer_discount'                 => 'បញ្ចុះតម្លៃ',
+    'customer_email'                    => 'អ៊ីម៉ែល',
+    'customer_location'                 => 'ទីតាំង',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '(ត្រូវការបញ្ចូល ប្រាក់ដែលត្រូវបង់)',
+    'customer_required'                 => '(ត្រូវការ)',
+    'customer_total'                    => 'សរុប',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'ពិន្ទុដែលប្រើប្រាស់បាន',
+    'daily_sales'                       => '',
+    'date'                              => 'ថ្ងៃខែ លក់',
+    'date_range'                        => 'ចន្លោះ ថ្ងៃខែ',
+    'date_required'                     => "ត្រូវតែបញ្ជូល ថ្ងៃខែ\u{200b}ដែលត្រឹមត្រូវ",
+    'date_type'                         => "ត្រូវការបញ្ចូលថ្ងៃខែ\u{200b}ជាចាំបាច់។",
+    'debit'                             => 'កាត ធនាគារ',
+    'debit_filter'                      => '',
+    'delete'                            => 'យល់ព្រម អោយលុប',
+    'delete_confirmation'               => 'តើអ្នកពិតជាចង់លុបការលក់នេះមែនទេ? ធ្វើដូចនេះអ្នកមិនអាចហៅវាត្រលប់មកវិញទេ។',
+    'delete_entire_sale'                => 'លុបការលក់ទាំងអស់',
+    'delete_successful'                 => 'ការលក់ ត្រូវបានលុបដោយជោគជ័យ។',
+    'delete_unsuccessful'               => 'ការលក់ មិនត្រូវបានលុប។',
+    'description_abbrv'                 => 'បរិយាយ។',
+    'discard'                           => 'មិនយកជាការ',
+    'discard_quote'                     => '',
+    'discount'                          => 'បញ្ចុះតម្លៃ',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => 'បញ្ចុះតម្លៃ %',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'ដល់ពេល',
+    'due_filter'                        => 'ដល់ពេល',
+    'edit'                              => 'កែប្រែ',
+    'edit_item'                         => 'កែប្រែទំនិញ',
+    'edit_sale'                         => 'កែប្រែការលក់',
+    'email_receipt'                     => 'អ្នកទទួលអ៊ីម៉េល',
+    'employee'                          => 'បុគ្គលិក',
+    'entry'                             => 'បញ្ចូល',
+    'error_editing_item'                => 'មានកំហុស ក្នុងការកែប្រែទំនិញ',
+    'find_or_scan_item'                 => 'ស្វែងរក ឬស្កេនទំនិញ',
+    'find_or_scan_item_or_receipt'      => "ស្វែងរក ឬ\u{200b}ស្កេនទំនិញ ឬ វិក័យបត្រ",
+    'giftcard'                          => 'កាតអំណោយ',
+    'giftcard_balance'                  => 'សមតុល្យលើកាតអំណោយ',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'លេខកាតអំណោយ',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'សមតុល្យលេខកូដឧបករណ៍ច្រើនគ្មាន់គ្រប់គ្រាន់សម្រាប់ការទូទាត់នេះ។',
+    'insufficient_reward_points'        => 'ពិន្ទុរង្វាន់មិនគ្រប់គ្រាន់សម្រាប់ការទូទាត់នេះ។',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'លេខយោង/ទាញយកត្រូវតែបញ្ចូល។',
+    'negative_amount_tendered'          => 'ទឹកប្រាក់បានមកពីការបង់មិនអាចជាចំនួនអវិជ្ជមានបានទេ។',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => '',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'កូដយោងការទូទាត់',
+    'reference_code_invalid_characters' => 'កូដយោងត្រូវតែមានតែអក្សរ និងលេខប៉ុណ្ណោះ។',
+    'reference_code_length_error'       => 'ប្រវែងកូដយោងមិនត្រឹមត្រូវ។',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => 'រង្វាន់',
+    'rewards_remaining_balance'         => 'ពន្ទុកសំរាប់ដូរយករង្វាន់នៅសល់ ',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/lo/Attributes.php b/app/Language/lo/Attributes.php
index 0ff33199d..10bcfa392 100644
--- a/app/Language/lo/Attributes.php
+++ b/app/Language/lo/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "ຄ່າແອດທິບິວບໍ່ສາມາດມີ ':' ຫລື '|'",
-    "confirm_delete"                   => "ແນ່ໃຈຫຼືບໍທີ່ຈະລືບລາຍການທີ່ເລືອກ",
-    "confirm_restore"                  => "ແນ່ໃຈຫຼືບໍທີ່ຈະຄືນຄ່າແອັດທິບິ້ວດັ່ງກ່າວ?",
-    "definition_cannot_be_deleted"     => "ບໍສາມາດລືບລາຍການທີ່ເລືອກໄດ້",
-    "definition_error_adding_updating" => "ລາຍການ {0} ບໍສາມາດເພີ່ມ ຫຼື ແກ້ໄຂ. ກະລຸນາກວດສອບຢູ່ log ຂໍ້ຜິດຜາດ",
-    "definition_flags"                 => "ຄູນສົມບັດການເບິ່ງເຫັນ",
-    "definition_group"                 => "ກຸ່ມ",
-    "definition_id"                    => "ລະຫັດ",
-    "definition_name"                  => "ເພີ່ມລາຍການ",
-    "definition_name_required"         => "ຕ້ອງໄດ້ລະບຸຊື່ລາຍການ",
-    "definition_one_or_multiple"       => "ລາຍການ",
-    "definition_successful_adding"     => "ເພີ່ມລາຍການສຳເລັດແລ້ວ",
-    "definition_successful_deleted"    => "ລຶບລາຍການສຳເລັດແລ້ວ",
-    "definition_successful_updating"   => "ແກ້ໄຂລາຍການສຳເລັດແລ້ວ",
-    "definition_type"                  => "ປະເພດລາຍການ",
-    "definition_type_required"         => "ປະເພດແອດທີບິວ ຈຳເປັນຕ້ອງໃຊ້",
-    "definition_unit"                  => "",
-    "definition_values"                => "",
-    "new"                              => "",
-    "no_attributes_to_display"         => "",
-    "receipt_visibility"               => "",
-    "show_in_items"                    => "",
-    "show_in_items_visibility"         => "",
-    "show_in_receipt"                  => "",
-    "show_in_receivings"               => "",
-    "show_in_receivings_visibility"    => "",
-    "show_in_sales"                    => "",
-    "show_in_sales_visibility"         => "",
-    "update"                           => "",
+    'attribute_value_invalid_chars'    => 'ຄ່າແອດທິບິວບໍ່ສາມາດມີ \':\' ຫລື \'|\'',
+    'confirm_delete'                   => 'ແນ່ໃຈຫຼືບໍທີ່ຈະລືບລາຍການທີ່ເລືອກ',
+    'confirm_restore'                  => 'ແນ່ໃຈຫຼືບໍທີ່ຈະຄືນຄ່າແອັດທິບິ້ວດັ່ງກ່າວ?',
+    'definition_cannot_be_deleted'     => 'ບໍສາມາດລືບລາຍການທີ່ເລືອກໄດ້',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'ລາຍການ {0} ບໍສາມາດເພີ່ມ ຫຼື ແກ້ໄຂ. ກະລຸນາກວດສອບຢູ່ log ຂໍ້ຜິດຜາດ',
+    'definition_flags'                 => 'ຄູນສົມບັດການເບິ່ງເຫັນ',
+    'definition_group'                 => 'ກຸ່ມ',
+    'definition_id'                    => 'ລະຫັດ',
+    'definition_name'                  => 'ເພີ່ມລາຍການ',
+    'definition_name_required'         => 'ຕ້ອງໄດ້ລະບຸຊື່ລາຍການ',
+    'definition_one_or_multiple'       => 'ລາຍການ',
+    'definition_successful_adding'     => 'ເພີ່ມລາຍການສຳເລັດແລ້ວ',
+    'definition_successful_deleted'    => 'ລຶບລາຍການສຳເລັດແລ້ວ',
+    'definition_successful_updating'   => 'ແກ້ໄຂລາຍການສຳເລັດແລ້ວ',
+    'definition_type'                  => 'ປະເພດລາຍການ',
+    'definition_type_required'         => 'ປະເພດແອດທີບິວ ຈຳເປັນຕ້ອງໃຊ້',
+    'definition_unit'                  => '',
+    'definition_values'                => '',
+    'new'                              => '',
+    'no_attributes_to_display'         => '',
+    'receipt_visibility'               => '',
+    'show_in_items'                    => '',
+    'show_in_items_visibility'         => '',
+    'show_in_receipt'                  => '',
+    'show_in_receivings'               => '',
+    'show_in_receivings_visibility'    => '',
+    'show_in_sales'                    => '',
+    'show_in_sales_visibility'         => '',
+    'show_in_search'                   => 'ສະແດງໃນການຄົ້ນຫາ',
+    'show_in_search_visibility'        => 'ຄົ້ນຫາ',
+    'update'                           => '',
 ];
diff --git a/app/Language/lo/Bootstrap_tables.php b/app/Language/lo/Bootstrap_tables.php
index b5124f0fc..446f0d527 100644
--- a/app/Language/lo/Bootstrap_tables.php
+++ b/app/Language/lo/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "ທັງໝົດ",
-    "columns"              => "ຖັນ",
-    "hide_show_pagination" => "ເຊື່ອງ/ສະແດງເລກທີໜ້າເຈ້ຍ",
-    "loading"              => "ກຳລັງໂຫຼດ, ກະລຸນາລໍຖ້າ...",
-    "page_from_to"         => "ສະແດງ {0} ຫາ {1} ຂອງ {2} ແຖວ",
-    "refresh"              => "Refresh",
-    "rows_per_page"        => "{0} ແຖວຕໍ່ໜ້າ",
-    "toggle"               => "Toggle",
+    'all' => "ທັງໝົດ",
+    'columns' => "ຖັນ",
+    'hide_show_pagination' => "ເຊື່ອງ/ສະແດງເລກທີໜ້າເຈ້ຍ",
+    'loading' => "ກຳລັງໂຫຼດ, ກະລຸນາລໍຖ້າ",
+    'page_from_to' => "ສະແດງ {0} ຫາ {1} ຂອງ {2} ແຖວ",
+    'refresh' => "Refresh",
+    'rows_per_page' => "{0} ແຖວຕໍ່ໜ້າ",
+    'toggle' => "Toggle",
 ];
diff --git a/app/Language/lo/Calendar.php b/app/Language/lo/Calendar.php
new file mode 100644
index 000000000..3ca3c3825
--- /dev/null
+++ b/app/Language/lo/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "",
+    "mo"        => "",
+    "tu"        => "",
+    "we"        => "",
+    "th"        => "",
+    "fr"        => "",
+    "sa"        => "",
+    "sun"       => "",
+    "mon"       => "",
+    "tue"       => "",
+    "wed"       => "",
+    "thu"       => "",
+    "fri"       => "",
+    "sat"       => "",
+    "sunday"    => "",
+    "monday"    => "",
+    "tuesday"   => "",
+    "wednesday" => "",
+    "thursday"  => "",
+    "friday"    => "",
+    "saturday"  => "",
+    "jan"       => "",
+    "feb"       => "",
+    "mar"       => "",
+    "apr"       => "",
+    "may"       => "",
+    "jun"       => "",
+    "jul"       => "",
+    "aug"       => "",
+    "sep"       => "",
+    "oct"       => "",
+    "nov"       => "",
+    "dec"       => "",
+    "january"   => "",
+    "february"  => "",
+    "march"     => "",
+    "april"     => "",
+    "may"       => "",
+    "june"      => "",
+    "july"      => "",
+    "august"    => "",
+    "september" => "",
+    "october"   => "",
+    "november"  => "",
+    "december"  => "",
+];
diff --git a/app/Language/lo/Config.php b/app/Language/lo/Config.php
index 0a40ee2bc..72a09feb2 100644
--- a/app/Language/lo/Config.php
+++ b/app/Language/lo/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "ທີ່ຢູ່ບໍລິສັດ",
-    "address_required"                          => "ກະລຸນາໃສ່ທີ່ຢູ່ບໍລິສັດ.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "ອະນຸຍາດໃຫ້ມີບາໂຄດຊໍ້າກັນ",
-    "apostrophe"                                => "ຈຸດລາຍນໍ້າ",
-    "backup_button"                             => "ການສຳຮອງ",
-    "backup_database"                           => "ການສຳຮອງຖານຂໍ້ມູນ",
-    "barcode"                                   => "ບາໂຄດ",
-    "barcode_company"                           => "ຊື່ບໍລິສັດ",
-    "barcode_configuration"                     => "ການຕັ້ງຄ່າກ່ຽວກັບ Barcode",
-    "barcode_content"                           => "ເນື່ອຫາຂອງ Barcode",
-    "barcode_first_row"                         => "ແຖວທີ 1",
-    "barcode_font"                              => "ຟອນທ໌",
-    "barcode_formats"                           => "ຮູບແບບການໃສ່ຂໍ້ມູນ",
-    "barcode_generate_if_empty"                 => "ສ້າງຖ້າວ່າງເປົ່າ.",
-    "barcode_height"                            => "ສູງ (px)",
-    "barcode_id"                                => "ລະຫັດສິນຄ້າ/ຊື່ສິນຄ້າ",
-    "barcode_info"                              => "ຂໍ້ມູນການຕັ້ງຄ່າກ່ຽວກັບ Barcode",
-    "barcode_layout"                            => "ການຈັດລຽງຮູບແບບ Barcode",
-    "barcode_name"                              => "ຊື່ສິນຄ້າ",
-    "barcode_number"                            => "ລະຫັດ Barcode",
-    "barcode_number_in_row"                     => "ຈຳນວນແຖວທີ່ໃຊ້",
-    "barcode_page_cellspacing"                  => "Display page cellspacing.",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "ລາຄາ",
-    "barcode_second_row"                        => "ແຖວທີ 2",
-    "barcode_third_row"                         => "ແຖວທີ 3",
-    "barcode_tooltip"                           => "ຄຳເຕືອນ: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.",
-    "barcode_type"                              => "ປະເພດ Barcode",
-    "barcode_width"                             => "ຄວາມກວ້າງ (px)",
-    "bottom"                                    => "ດ້ານລຸ່ມຂອງເຈ້ຍ",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "ຈຳນວນຕົວເລກເສດເງິນ",
-    "cash_decimals_tooltip"                     => "ກະລຸນາປັບຈຳນວນຕົວເລກເສດໃຫ້ເທົ່າກັນເພື່ອຈະໄດ້ບໍ່ມີການປັດມູນຄ່າເງິນ.",
-    "cash_rounding"                             => "ການປັດມູນຄ່າເງິນ",
-    "category_dropdown"                         => "",
-    "center"                                    => "ທາງກາງຂອງເຈ້ຍ",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "ເຄື່ອງຫມາຍຈຸດ",
-    "company"                                   => "ຊື່ບໍລິສັດ",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "ປ່ຽນຮູບ",
-    "company_logo"                              => "Logo ບໍລິສັດ",
-    "company_remove_image"                      => "ລຶບຮູບ",
-    "company_required"                          => "ກະລຸນາໃສ່ຊື່ບໍລິສັດ",
-    "company_select_image"                      => "ກະລຸນາເລືອກຮູບ",
-    "company_website_url"                       => "ທີ່ຢູ່ website ຂອງບໍລິສັດບໍ່ຖືກຕ້ອງ URL (http://...).",
-    "country_codes"                             => "ລະຫັດປະເທດ",
-    "country_codes_tooltip"                     => "ໃຊ້ເຄື່ອງຫມາຍຈຸດເພື່ອແຍກຫົວຫນ່ວຍເງິນຕາ",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "ຈຳນວນຕົວເລກເສດເງິນ",
-    "currency_symbol"                           => "ສັນຍະລັກຂອງເງິນ",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "ລາງວັນ",
-    "customer_reward_duplicate"                 => "ລາງວັນສຳຫລັບລູກຄ້າຕ້ອງມີຄວາມແຕກຕ່າງ",
-    "customer_reward_enable"                    => "ໃຊ້ງານລະບົບລາງວັນສຳຫລັບລູກຄ້າ",
-    "customer_reward_invalid_chars"             => "ລາງວັນບໍ່ສາມາດບັນຈຸໄດ້ '_'",
-    "customer_reward_required"                  => "ກະລຸນາກຳນົດລາງວັນ",
-    "customer_sales_tax_support"                => "ເປີດໃຊ້ອາກອນຊົມໃຊ້",
-    "date_or_time_format"                       => "Date and Time Filter",
-    "datetimeformat"                            => "ຮູບແບບວັນທີ່ ແລະ ເວລາ",
-    "decimal_point"                             => "ເຄື່ອງຫມາຍເລກເສດເງິນ",
-    "default_barcode_font_size_number"          => "ຂະຫນາດຂອງຕົວອັກສອນຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_barcode_font_size_required"        => "ກະລຸນາໃສ່ຂະຫນາດຂອງຕົວອັກສອນ.",
-    "default_barcode_height_number"             => "ຂະຫນາດຄວາມສູງຂອງ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_barcode_height_required"           => "ກະລຸນາໃສ່ຂະຫນາດຄວາມສູງຂອງ Barcode.",
-    "default_barcode_num_in_row_number"         => "ຈຳນວນແຖວຂອງ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_barcode_num_in_row_required"       => "ກະລຸນາໃສ່ຈຳນວນແຖວຂອງ Barcode.",
-    "default_barcode_page_cellspacing_number"   => "ຄວາມຫ່າງລະຫວ່າງຫ້ອງຂໍ້ມູນຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_barcode_page_cellspacing_required" => "ກະລຸນາໃສ່ຄວາມຫ່າງລະຫວ່າງຫ້ອງຂໍ້ມູນ.",
-    "default_barcode_page_width_number"         => "ຄວາມກວ້າງຂອງຫນ້າ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_barcode_page_width_required"       => "ກະລຸນາໃສ່ຄວາມກວ້າງຂອງຫນ້າ Barcode.",
-    "default_barcode_width_number"              => "ຄວາມກວ້າງຂອງ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_barcode_width_required"            => "ກະລຸນາກຳນົດຄວາມກວ້າງຂອງ Barcode.",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "ທີ່ມາຂອງອາກອນ",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "ເປີເຊັນສ່ວນຫລຸດ %",
-    "default_sales_discount_number"             => "ເປເຊັນສ່ວນຫລຸດ ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_sales_discount_required"           => "ກະລຸນາກຳນົດເປີເຊັນສ່ວນຫລຸດ.",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "ຊື່ຂອງອາກອນຕ້ອງເປັນຕົວອັກສອນ.",
-    "default_tax_name_required"                 => "ກະລຸນາໃສ່ຊື່ອາກອນ.",
-    "default_tax_rate"                          => "ອັດຕາອາກອນ %",
-    "default_tax_rate_1"                        => "ອັດຕາອາກອນທີ 1",
-    "default_tax_rate_2"                        => "ອັດຕາອາກອນທີ 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "ອັດຕາອາກອນ ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "default_tax_rate_required"                 => "ກະລຸນາກຳນົດອັດຕາອາກອນ.",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "ໂຕະສຳຫລັບຮ້ານອາຫານ",
-    "dinner_table_duplicate"                    => "ເລກໂຕະຕ້ອງບໍ່ຊໍ້າກັນ.",
-    "dinner_table_enable"                       => "ເປີດໃຊ້ງານລະບົບໂຕະສຳລັບຮ້ານອາຫານ",
-    "dinner_table_invalid_chars"                => "ບໍ່ສາມາດໃສ່ຊື່ໂຕະທີ່ມີ '_' ນີ້ໄດ້.",
-    "dinner_table_required"                     => "ກະລຸນາກຳນົດຊື່ໂຕະ.",
-    "dot"                                       => "ຈໍ້າເມັດ",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Fiscal Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Localization Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp API Key",
-    "mailchimp_configuration"                   => "Mailchimp Configuration",
-    "mailchimp_key_successfully"                => "API Key is valid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
-    "mailchimp_lists"                           => "Mailchimp List(s)",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
-    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Left must be a number.",
-    "print_left_margin_required"                => "Margin Left is a required field.",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Right must be a number.",
-    "print_right_margin_required"               => "Margin Right is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Top must be a number.",
-    "print_top_margin_required"                 => "Margin Top is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'ທີ່ຢູ່ບໍລິສັດ',
+    'address_required'                          => 'ກະລຸນາໃສ່ທີ່ຢູ່ບໍລິສັດ.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'ອະນຸຍາດໃຫ້ມີບາໂຄດຊໍ້າກັນ',
+    'apostrophe'                                => 'ຈຸດລາຍນໍ້າ',
+    'backup_button'                             => 'ການສຳຮອງ',
+    'backup_database'                           => 'ການສຳຮອງຖານຂໍ້ມູນ',
+    'barcode'                                   => 'ບາໂຄດ',
+    'barcode_company'                           => 'ຊື່ບໍລິສັດ',
+    'barcode_configuration'                     => 'ການຕັ້ງຄ່າກ່ຽວກັບ Barcode',
+    'barcode_content'                           => 'ເນື່ອຫາຂອງ Barcode',
+    'barcode_first_row'                         => 'ແຖວທີ 1',
+    'barcode_font'                              => 'ຟອນທ໌',
+    'barcode_formats'                           => 'ຮູບແບບການໃສ່ຂໍ້ມູນ',
+    'barcode_generate_if_empty'                 => 'ສ້າງຖ້າວ່າງເປົ່າ.',
+    'barcode_height'                            => 'ສູງ (px)',
+    'barcode_id'                                => 'ລະຫັດສິນຄ້າ/ຊື່ສິນຄ້າ',
+    'barcode_info'                              => 'ຂໍ້ມູນການຕັ້ງຄ່າກ່ຽວກັບ Barcode',
+    'barcode_layout'                            => 'ການຈັດລຽງຮູບແບບ Barcode',
+    'barcode_name'                              => 'ຊື່ສິນຄ້າ',
+    'barcode_number'                            => 'ລະຫັດ Barcode',
+    'barcode_number_in_row'                     => 'ຈຳນວນແຖວທີ່ໃຊ້',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing.',
+    'barcode_page_width'                        => 'Display page width',
+    'barcode_price'                             => 'ລາຄາ',
+    'barcode_second_row'                        => 'ແຖວທີ 2',
+    'barcode_third_row'                         => 'ແຖວທີ 3',
+    'barcode_tooltip'                           => 'ຄຳເຕືອນ: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.',
+    'barcode_type'                              => 'ປະເພດ Barcode',
+    'barcode_width'                             => 'ຄວາມກວ້າງ (px)',
+    'bottom'                                    => 'ດ້ານລຸ່ມຂອງເຈ້ຍ',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'ຈຳນວນຕົວເລກເສດເງິນ',
+    'cash_decimals_tooltip'                     => 'ກະລຸນາປັບຈຳນວນຕົວເລກເສດໃຫ້ເທົ່າກັນເພື່ອຈະໄດ້ບໍ່ມີການປັດມູນຄ່າເງິນ.',
+    'cash_rounding'                             => 'ການປັດມູນຄ່າເງິນ',
+    'category_dropdown'                         => '',
+    'center'                                    => 'ທາງກາງຂອງເຈ້ຍ',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'ເຄື່ອງຫມາຍຈຸດ',
+    'company'                                   => 'ຊື່ບໍລິສັດ',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'ປ່ຽນຮູບ',
+    'company_logo'                              => 'Logo ບໍລິສັດ',
+    'company_remove_image'                      => 'ລຶບຮູບ',
+    'company_required'                          => 'ກະລຸນາໃສ່ຊື່ບໍລິສັດ',
+    'company_select_image'                      => 'ກະລຸນາເລືອກຮູບ',
+    'company_website_url'                       => 'ທີ່ຢູ່ website ຂອງບໍລິສັດບໍ່ຖືກຕ້ອງ URL (http://...).',
+    'country_codes'                             => 'ລະຫັດປະເທດ',
+    'country_codes_tooltip'                     => 'ໃຊ້ເຄື່ອງຫມາຍຈຸດເພື່ອແຍກຫົວຫນ່ວຍເງິນຕາ',
+    'currency_code'                             => '',
+    'currency_decimals'                         => 'ຈຳນວນຕົວເລກເສດເງິນ',
+    'currency_symbol'                           => 'ສັນຍະລັກຂອງເງິນ',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'ລາງວັນ',
+    'customer_reward_duplicate'                 => 'ລາງວັນສຳຫລັບລູກຄ້າຕ້ອງມີຄວາມແຕກຕ່າງ',
+    'customer_reward_enable'                    => 'ໃຊ້ງານລະບົບລາງວັນສຳຫລັບລູກຄ້າ',
+    'customer_reward_invalid_chars'             => "ລາງວັນບໍ່ສາມາດບັນຈຸໄດ້ '_'",
+    'customer_reward_required'                  => 'ກະລຸນາກຳນົດລາງວັນ',
+    'customer_sales_tax_support'                => 'ເປີດໃຊ້ອາກອນຊົມໃຊ້',
+    'date_or_time_format'                       => 'Date and Time Filter',
+    'datetimeformat'                            => 'ຮູບແບບວັນທີ່ ແລະ ເວລາ',
+    'decimal_point'                             => 'ເຄື່ອງຫມາຍເລກເສດເງິນ',
+    'default_barcode_font_size_number'          => 'ຂະຫນາດຂອງຕົວອັກສອນຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_barcode_font_size_required'        => 'ກະລຸນາໃສ່ຂະຫນາດຂອງຕົວອັກສອນ.',
+    'default_barcode_height_number'             => 'ຂະຫນາດຄວາມສູງຂອງ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_barcode_height_required'           => 'ກະລຸນາໃສ່ຂະຫນາດຄວາມສູງຂອງ Barcode.',
+    'default_barcode_num_in_row_number'         => 'ຈຳນວນແຖວຂອງ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_barcode_num_in_row_required'       => 'ກະລຸນາໃສ່ຈຳນວນແຖວຂອງ Barcode.',
+    'default_barcode_page_cellspacing_number'   => 'ຄວາມຫ່າງລະຫວ່າງຫ້ອງຂໍ້ມູນຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_barcode_page_cellspacing_required' => 'ກະລຸນາໃສ່ຄວາມຫ່າງລະຫວ່າງຫ້ອງຂໍ້ມູນ.',
+    'default_barcode_page_width_number'         => 'ຄວາມກວ້າງຂອງຫນ້າ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_barcode_page_width_required'       => 'ກະລຸນາໃສ່ຄວາມກວ້າງຂອງຫນ້າ Barcode.',
+    'default_barcode_width_number'              => 'ຄວາມກວ້າງຂອງ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_barcode_width_required'            => 'ກະລຸນາກຳນົດຄວາມກວ້າງຂອງ Barcode.',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => 'ທີ່ມາຂອງອາກອນ',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => 'ເປີເຊັນສ່ວນຫລຸດ %',
+    'default_sales_discount_number'             => 'ເປເຊັນສ່ວນຫລຸດ ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_sales_discount_required'           => 'ກະລຸນາກຳນົດເປີເຊັນສ່ວນຫລຸດ.',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => 'ຊື່ຂອງອາກອນຕ້ອງເປັນຕົວອັກສອນ.',
+    'default_tax_name_required'                 => 'ກະລຸນາໃສ່ຊື່ອາກອນ.',
+    'default_tax_rate'                          => 'ອັດຕາອາກອນ %',
+    'default_tax_rate_1'                        => 'ອັດຕາອາກອນທີ 1',
+    'default_tax_rate_2'                        => 'ອັດຕາອາກອນທີ 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'ອັດຕາອາກອນ ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'default_tax_rate_required'                 => 'ກະລຸນາກຳນົດອັດຕາອາກອນ.',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => 'ໂຕະສຳຫລັບຮ້ານອາຫານ',
+    'dinner_table_duplicate'                    => 'ເລກໂຕະຕ້ອງບໍ່ຊໍ້າກັນ.',
+    'dinner_table_enable'                       => 'ເປີດໃຊ້ງານລະບົບໂຕະສຳລັບຮ້ານອາຫານ',
+    'dinner_table_invalid_chars'                => "ບໍ່ສາມາດໃສ່ຊື່ໂຕະທີ່ມີ '_' ນີ້ໄດ້.",
+    'dinner_table_required'                     => 'ກະລຸນາກຳນົດຊື່ໂຕະ.',
+    'dot'                                       => 'ຈໍ້າເມັດ',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Fiscal Year Start',
+    'financial_year_apr'                        => '1st of April',
+    'financial_year_aug'                        => '1st of August',
+    'financial_year_dec'                        => '1st of December',
+    'financial_year_feb'                        => '1st of February',
+    'financial_year_jan'                        => '1st of January',
+    'financial_year_jul'                        => '1st of July',
+    'financial_year_jun'                        => '1st of June',
+    'financial_year_mar'                        => '1st of March',
+    'financial_year_may'                        => '1st of May',
+    'financial_year_nov'                        => '1st of November',
+    'financial_year_oct'                        => '1st of October',
+    'financial_year_sep'                        => '1st of September',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key is a required field',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Store Information',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines per Page',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => 'Lines per Page is a required field.',
+    'locale'                                    => 'Localization',
+    'locale_configuration'                      => 'Localization Configuration',
+    'locale_info'                               => 'Localization Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => '',
+    'logout'                                    => 'Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp API Key',
+    'mailchimp_configuration'                   => 'Mailchimp Configuration',
+    'mailchimp_key_successfully'                => 'API Key is valid.',
+    'mailchimp_key_unsuccessfully'              => 'API Key is invalid.',
+    'mailchimp_lists'                           => 'Mailchimp List(s)',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here, otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localization',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a valid locale.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'ລະຫັດອ້າງອີງການຊຳລະເງິນ<br>ຂອບເຂດຄວາມຍາວ',
+    'payment_reference_code_length_max_label'   => 'ສູງສຸດ',
+    'payment_reference_code_length_min_label'   => 'ຕໍ່າສຸດ',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Phone is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Margin Bottom must be a number.',
+    'print_bottom_margin_required'              => 'Margin Bottom is a required field.',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Margin Left must be a number.',
+    'print_left_margin_required'                => 'Margin Left is a required field.',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Margin Right must be a number.',
+    'print_right_margin_required'               => 'Margin Right is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Margin Top must be a number.',
+    'print_top_margin_required'                 => 'Margin Top is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Calc avg. Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'ເສັ້ນທາງ sendmail ບໍ່ຖືກຕ້ອງ. ອະນຸຍາດສະເພາະຕົວອັກສອນ, ຕົວເລກ, ຂີດກາງ, ຂີດກ້ອງ, ຂີດຂ້າງໜ້າ, ຂີດຂ້າງຫຼັງ, ຈໍ້າສອງເມັດ, ວັກ ແລະ ຈຸດເທົ່ານັ້ນ.',
+    'saved_successfully'                        => 'Configuration save successful.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Stock location',
+    'stock_location_duplicate'                  => 'Stock Location must be unique.',
+    'stock_location_invalid_chars'              => "Stock Location can not contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 2',
+    'suggestions_third_column'                  => 'Column 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Receipt Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => 'Tax category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Tax Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => '',
+    'tax_included'                              => 'Tax Included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/lo/Employees.php b/app/Language/lo/Employees.php
index ef6ee7d18..e9b7f3978 100644
--- a/app/Language/lo/Employees.php
+++ b/app/Language/lo/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "ຂໍ້ມູນ",
-    "cannot_be_deleted"            => "ບໍ່ສາມາດລຶບພະນັກງານທີ່ເລືອກໄດ້, ຢ່າງໜ້ອຍມີ 1 ລາຍການຫຼືຫຼາຍກວ່ານັ້ນ ຍັງມີການຊື້ຂາຍກັນຢູ່ ຫຼື ທ່ານກຳລັງພະຍາຍາມລຶບບັນຊີຂອງຕົວເອງ.",
-    "change_employee"              => "",
-    "change_password"              => "ປ່ຽນ Password",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "ທ່ານຈະລຶບພະນັກງານທີ່ເລືອກແທ້ບໍ່ ?",
-    "confirm_restore"              => "",
-    "current_password"             => "Password ປັດຈຸບັນ",
-    "current_password_invalid"     => "Password ປັດຈຸບັນບໍ່ຖືກຕ້ອງ.",
-    "employee"                     => "ພະນັກງານ",
-    "error_adding_updating"        => "ເພີ່ມ ຫຼື ແກ້ໄຂ ພະນັກງານ ບໍ່ສຳເລັດ.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "ທ່ານບໍ່ສາມາດລຶບບັນຊີທົດລອງຜູ້ດູແລລະບົບໄດ້.",
-    "error_updating_demo_admin"    => "ທ່ານບໍ່ສາມາດປ່ຽນແປງບັນຊີທົດລອງຜູ້ດູແລລະບົບໄດ້.",
-    "language"                     => "ພາສາ",
-    "login_info"                   => "ເຂົ້າລະບົບ",
-    "manager"                      => "",
-    "new"                          => "ພະນັກງານໃໝ່",
-    "none_selected"                => "ທ່ານຍັງບໍ່ໄດ້ເລືອກພະນັກງານໃດເລີຍເພື່ອລຶບ.",
-    "one_or_multiple"              => "ພະນັກງານ",
-    "password"                     => "Password",
-    "password_minlength"           => "Password ຄວນໃສ່ຢ່າງໜ້ອຍ 8 ຕົວອັກສອນ.",
-    "password_must_match"          => "Password ບໍ່ຄືກັນ.",
-    "password_not_must_match"      => "Password ປັດຈຸບັນ ແລະ Password ໃໝ່ ຈະຕ້ອງບໍ່ຄືກັນ.",
-    "password_required"            => "Password ຈຳເປັນຕ້ອງໃສ່.",
-    "permission_desc"              => "ຕິກຂໍ້ມູນດ້ານລຸ່ມເພື່ອໃຫ້ສາມາດນຳໃຊ້ Modules ຕ່າງໆໄດ້.",
-    "permission_info"              => "ສິດ",
-    "repeat_password"              => "ລະຫັດຜ່ານອີກຄັ້ງ",
-    "subpermission_required"       => "Add at least one grant for each module.",
-    "successful_adding"            => "ເພີ່ມພະນັກງານສຳເລັດ.",
-    "successful_change_password"   => "ປ່ຽນລະຫັດຜ່ານສຳເລັດ.",
-    "successful_deleted"           => "ທ່ານລຶບສຳເລັດແລ້ວ",
-    "successful_updating"          => "ທ່ານແກ້ໄຂພະນັກງານສຳເລັດ",
-    "system_language"              => "ພາສາຂອງລະບົບ",
-    "unsuccessful_change_password" => "ປ່ຽນລະຫັດຜ່ານບໍ່ສຳເລັດ.",
-    "update"                       => "ແກ້ໄຂພະນັກງານ",
-    "username"                     => "ຊື່ຜູ້ໃຊ້",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Username ຕ້ອງໃສ່ຢ່າງໜ້ອຍ 5 ຕົວອັກສອນ.",
-    "username_required"            => "Username ຈຳເປັນຕ້ອງໃສ່.",
+    'administrator'                          => '',
+    'basic_information'                      => 'ຂໍ້ມູນ',
+    'cannot_be_deleted'                      => 'ບໍ່ສາມາດລຶບພະນັກງານທີ່ເລືອກໄດ້, ຢ່າງໜ້ອຍມີ 1 ລາຍການຫຼືຫຼາຍກວ່ານັ້ນ ຍັງມີການຊື້ຂາຍກັນຢູ່ ຫຼື ທ່ານກຳລັງພະຍາຍາມລຶບບັນຊີຂອງຕົວເອງ.',
+    'change_employee'                        => '',
+    'change_password'                        => 'ປ່ຽນ Password',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'ທ່ານຈະລຶບພະນັກງານທີ່ເລືອກແທ້ບໍ່ ?',
+    'confirm_restore'                        => '',
+    'current_password'                       => 'Password ປັດຈຸບັນ',
+    'current_password_invalid'               => 'Password ປັດຈຸບັນບໍ່ຖືກຕ້ອງ.',
+    'employee'                               => 'ພະນັກງານ',
+    'error_adding_updating'                  => 'ເພີ່ມ ຫຼື ແກ້ໄຂ ພະນັກງານ ບໍ່ສຳເລັດ.',
+    'error_cannot_remove_own_minimum_grant'  => 'ທ່ານບໍ່ສາມາດເອົາສິດອະນຸຍາດຂັ້ນຕ່ຳຂອງຕົນເອງອອກໄດ້.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'ທ່ານບໍ່ສາມາດລຶບບັນຊີທົດລອງຜູ້ດູແລລະບົບໄດ້.',
+    'error_grant_change_disallowed'          => 'ການປ່ຽນແປງສິດທິໄດ້ຖືກປິດໃນ demo ນີ້.',
+    'error_password_change_disallowed'       => 'ການປ່ຽນແປງລະຫັດຜ່ານໄດ້ຖືກປິດໃນ demo ນີ້.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'ທ່ານບໍ່ສາມາດປ່ຽນແປງບັນຊີທົດລອງຜູ້ດູແລລະບົບໄດ້.',
+    'language'                               => 'ພາສາ',
+    'login_info'                             => 'ເຂົ້າລະບົບ',
+    'manager'                                => '',
+    'new'                                    => 'ພະນັກງານໃໝ່',
+    'none_selected'                          => 'ທ່ານຍັງບໍ່ໄດ້ເລືອກພະນັກງານໃດເລີຍເພື່ອລຶບ.',
+    'one_or_multiple'                        => 'ພະນັກງານ',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'Password ຄວນໃສ່ຢ່າງໜ້ອຍ 8 ຕົວອັກສອນ.',
+    'password_must_match'                    => 'Password ບໍ່ຄືກັນ.',
+    'password_not_must_match'                => 'Password ປັດຈຸບັນ ແລະ Password ໃໝ່ ຈະຕ້ອງບໍ່ຄືກັນ.',
+    'password_required'                      => 'Password ຈຳເປັນຕ້ອງໃສ່.',
+    'permission_desc'                        => 'ຕິກຂໍ້ມູນດ້ານລຸ່ມເພື່ອໃຫ້ສາມາດນຳໃຊ້ Modules ຕ່າງໆໄດ້.',
+    'permission_info'                        => 'ສິດ',
+    'repeat_password'                        => 'ລະຫັດຜ່ານອີກຄັ້ງ',
+    'subpermission_required'                 => 'Add at least one grant for each module.',
+    'successful_adding'                      => 'ເພີ່ມພະນັກງານສຳເລັດ.',
+    'successful_change_password'             => 'ປ່ຽນລະຫັດຜ່ານສຳເລັດ.',
+    'successful_deleted'                     => 'ທ່ານລຶບສຳເລັດແລ້ວ',
+    'successful_updating'                    => 'ທ່ານແກ້ໄຂພະນັກງານສຳເລັດ',
+    'system_language'                        => 'ພາສາຂອງລະບົບ',
+    'unsuccessful_change_password'           => 'ປ່ຽນລະຫັດຜ່ານບໍ່ສຳເລັດ.',
+    'update'                                 => 'ແກ້ໄຂພະນັກງານ',
+    'username'                               => 'ຊື່ຜູ້ໃຊ້',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Username ຕ້ອງໃສ່ຢ່າງໜ້ອຍ 5 ຕົວອັກສອນ.',
+    'username_required'                      => 'Username ຈຳເປັນຕ້ອງໃສ່.',
 ];
diff --git a/app/Language/lo/Error.php b/app/Language/lo/Error.php
index 732c0ed3d..36dace41e 100644
--- a/app/Language/lo/Error.php
+++ b/app/Language/lo/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເຂົ້າເຖິງຂໍ້ມູນສ່ວນນີ້",
-    "unknown"              => "ບໍ່ຮູ້",
+    'no_permission_module'           => 'ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເຂົ້າເຖິງຂໍ້ມູນສ່ວນນີ້',
+    'unable_to_create_env_file'      => 'ບໍ່ສາມາດສ້າງ {filePath} ເພື່ອກຽມ throttle.key ໄດ້',
+    'unable_to_lock_file'            => 'ບໍ່ສາມາດລັອກ {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'ບໍ່ສາມາດເປີດ {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'ບໍ່ສາມາດບັນທຶກ throttle.key ໄປທີ່ {filePath} ໄດ້',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'ບໍ່ສາມາດອ່ານ {filePath} ເພື່ອກຽມ throttle.key ໄດ້',
+    'unknown'                        => 'ບໍ່ຮູ້',
 ];
diff --git a/app/Language/lo/Items.php b/app/Language/lo/Items.php
index 516aacda5..da8176e0f 100644
--- a/app/Language/lo/Items.php
+++ b/app/Language/lo/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "ເພີ່ມຫລືຫລຸດປະລິມານສິນຄ້າໃນສາງ",
-    "allow_alt_description"              => "ອະນຸຍາດໃຫ້ມີລາຍລະອຽດເສີມ",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "ແກ້ໄຂເປັນກຸ່ມ",
-    "buy_price_required"                 => "ກະລຸນາກຳນົດລາຄາ.",
-    "cannot_be_deleted"                  => "ບໍ່ສາມາດລຶບສິນຄ້າທີ່ເລືອກໄດ້, ໃນສິນຄ້າທີ່ເລືອກໄດ້ມີການຂາຍແລ້ວ.",
-    "cannot_find_item"                   => "ບໍ່ພົບສິນຄ້າ.",
-    "categories"                         => "",
-    "category"                           => "ປະເພດສິນຄ້າ",
-    "category_new"                       => "",
-    "category_required"                  => "ກະລຸນາກຳນົດປະເພດສິນຄ້າ.",
-    "change_all_to_allow_alt_desc"       => "ອະນຸບາດໃຫ້ມີລາຍລະອຽດເສີມທຸກສິນຄ້າ.",
-    "change_all_to_not_allow_allow_desc" => "ບໍ່ອະນຸຍາດໃຫ້ມີລາຍລະອຽດເສີດທຸກສິນຄ້າ.",
-    "change_all_to_serialized"           => "ປ່ຽນທັງຫມົດໃຫ້ເປັນເລກລຽງ",
-    "change_all_to_unserialized"         => "ປ່ຽນທັງຫມົດໃຫ້ເປັນເລກບໍ່ລຽງ",
-    "change_image"                       => "ປ່ຽນຮູບ",
-    "confirm_bulk_edit"                  => "ທ່ານຕ້ອງການລຶບສິນຄ້າທີ່ເລືອກໄວ້ບໍ່?",
-    "confirm_bulk_edit_wipe_taxes"       => "ຂໍ້ມູນພາສີຂອງທຸກສິນຄ້າຈະຖືກປ່ຽນແທນ.",
-    "confirm_delete"                     => "ທ່ານຕ້ອງການລຶບສິນຄ້າທີ່ເລືອກໄວ້ຫລືບໍ່?",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "ລາຄາຕົ້ນທຶນ",
-    "cost_price_number"                  => "ລາຄາຕົ້ນທຶນຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.",
-    "cost_price_required"                => "ກະລຸນາກຳນົດລາຄາຕົ້ນທຶນ.",
-    "count"                              => "ອັບເດດປະລິມານສິນຄ້າໃນສາງ",
-    "csv_import_failed"                  => "CSV import failed",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "The uploaded file has no data or is formatted incorrectly.",
-    "csv_import_partially_failed"        => "Item import successful with some failures:",
-    "csv_import_success"                 => "Item import successful.",
-    "current_quantity"                   => "ປະລິມານເຄື່ອງປັດຈຸບັນ",
-    "default_pack_name"                  => "",
-    "description"                        => "ລາຍລະອຽດສິນຄ້່າ",
-    "details_count"                      => "ນັບສິນຄ້າໃນສາງ",
-    "do_nothing"                         => "Do Nothing",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit the desired fields for selected item(s).",
-    "edit_multiple_items"                => "Editing Multiple Items",
-    "empty_upc_items"                    => "Empty Barcode Items",
-    "error_adding_updating"              => "Error adding/updating item",
-    "error_updating_multiple"            => "Error updating items",
-    "generate_barcodes"                  => "Generate Barcodes",
-    "hsn_code"                           => "",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Item Import from CSV",
-    "info_provided_by"                   => "Information provided by",
-    "inventory"                          => "Inventory",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Comments",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Date",
-    "inventory_employee"                 => "Employee",
-    "inventory_in_out_quantity"          => "In/Out Quantity",
-    "inventory_remarks"                  => "Remarks",
-    "is_deleted"                         => "Deleted",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item has Serial Number",
-    "item"                               => "Item",
-    "item_id"                            => "",
-    "item_number"                        => "Barcode",
-    "item_number_duplicate"              => "Item Number is already present in the database.",
-    "kit"                                => "Kit",
-    "location"                           => "Location",
-    "low_inventory_items"                => "Out Of Stock Items",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "Manual Edit of Quantity",
-    "markup"                             => "",
-    "name"                               => "Item Name",
-    "name_required"                      => "Item Name is a required field.",
-    "new"                                => "New Item",
-    "no_description_items"               => "No Description Items",
-    "no_items_to_display"                => "No Items to display.",
-    "none"                               => "None",
-    "none_selected"                      => "You have not selected any Item(s) to edit",
-    "nonstock"                           => "Non-stocked",
-    "number_information"                 => "Item Number",
-    "number_required"                    => "Barcode is a required field.",
-    "one_or_multiple"                    => "item(s)",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "Quantity",
-    "quantity_number"                    => "Quantity must be a number.",
-    "quantity_required"                  => "Quantity is a required field.",
-    "receiving_quantity"                 => "Receiving Quantity",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "Reorder Level",
-    "reorder_level_number"               => "Reorder Level must be a number.",
-    "reorder_level_required"             => "Reorder Level is a required field.",
-    "retrive_item_info"                  => "Retrive Item Info",
-    "sales_tax_1"                        => "Sales Tax",
-    "sales_tax_2"                        => "Sales Tax 2",
-    "search_attributes"                  => "Search Attributes",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "Serialized Items",
-    "standard"                           => "Standard",
-    "stock"                              => "Stock",
-    "stock_location"                     => "Stock location",
-    "stock_type"                         => "Stock Type",
-    "successful_adding"                  => "You have successfully added item",
-    "successful_bulk_edit"               => "You have successfully updated the selected item(s)",
-    "successful_deleted"                 => "You have successfully deleted",
-    "successful_updating"                => "You have successfully updated item",
-    "supplier"                           => "Supplier",
-    "tax_1"                              => "Tax 1",
-    "tax_2"                              => "Tax 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "Tax Percent",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "Tax Percent is a required field.",
-    "tax_percents"                       => "Tax Percent(s)",
-    "temp"                               => "",
-    "type"                               => "Item Type",
-    "unit_price"                         => "Retail Price",
-    "unit_price_number"                  => "Unit price must be a number.",
-    "unit_price_required"                => "Retail Price is a required field.",
-    "upc_database"                       => "Barcode Database",
-    "update"                             => "Update Item",
-    "use_inventory_menu"                 => "Use Inventory Menu",
+    'add_minus'                          => 'ເພີ່ມຫລືຫລຸດປະລິມານສິນຄ້າໃນສາງ',
+    'allow_alt_description'              => 'ອະນຸຍາດໃຫ້ມີລາຍລະອຽດເສີມ',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => 'ແກ້ໄຂເປັນກຸ່ມ',
+    'buy_price_required'                 => 'ກະລຸນາກຳນົດລາຄາ.',
+    'cannot_be_deleted'                  => 'ບໍ່ສາມາດລຶບສິນຄ້າທີ່ເລືອກໄດ້, ໃນສິນຄ້າທີ່ເລືອກໄດ້ມີການຂາຍແລ້ວ.',
+    'cannot_find_item'                   => 'ບໍ່ພົບສິນຄ້າ.',
+    'categories'                         => '',
+    'category'                           => 'ປະເພດສິນຄ້າ',
+    'category_new'                       => '',
+    'category_required'                  => 'ກະລຸນາກຳນົດປະເພດສິນຄ້າ.',
+    'change_all_to_allow_alt_desc'       => 'ອະນຸບາດໃຫ້ມີລາຍລະອຽດເສີມທຸກສິນຄ້າ.',
+    'change_all_to_not_allow_allow_desc' => 'ບໍ່ອະນຸຍາດໃຫ້ມີລາຍລະອຽດເສີດທຸກສິນຄ້າ.',
+    'change_all_to_serialized'           => 'ປ່ຽນທັງຫມົດໃຫ້ເປັນເລກລຽງ',
+    'change_all_to_unserialized'         => 'ປ່ຽນທັງຫມົດໃຫ້ເປັນເລກບໍ່ລຽງ',
+    'change_image'                       => 'ປ່ຽນຮູບ',
+    'confirm_bulk_edit'                  => 'ທ່ານຕ້ອງການລຶບສິນຄ້າທີ່ເລືອກໄວ້ບໍ່?',
+    'confirm_bulk_edit_wipe_taxes'       => 'ຂໍ້ມູນພາສີຂອງທຸກສິນຄ້າຈະຖືກປ່ຽນແທນ.',
+    'confirm_delete'                     => 'ທ່ານຕ້ອງການລຶບສິນຄ້າທີ່ເລືອກໄວ້ຫລືບໍ່?',
+    'confirm_restore'                    => '',
+    'cost_price'                         => 'ລາຄາຕົ້ນທຶນ',
+    'cost_price_number'                  => 'ລາຄາຕົ້ນທຶນຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ.',
+    'cost_price_required'                => 'ກະລຸນາກຳນົດລາຄາຕົ້ນທຶນ.',
+    'count'                              => 'ອັບເດດປະລິມານສິນຄ້າໃນສາງ',
+    'csv_import_failed'                  => 'CSV import failed',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'The uploaded file has no data or is formatted incorrectly.',
+    'csv_import_partially_failed'        => 'Item import successful with some failures:',
+    'csv_import_success'                 => 'Item import successful.',
+    'current_quantity'                   => 'ປະລິມານເຄື່ອງປັດຈຸບັນ',
+    'default_pack_name'                  => '',
+    'description'                        => 'ລາຍລະອຽດສິນຄ້່າ',
+    'details_count'                      => 'ນັບສິນຄ້າໃນສາງ',
+    'do_nothing'                         => 'Do Nothing',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit the desired fields for selected item(s).',
+    'edit_multiple_items'                => 'Editing Multiple Items',
+    'empty_upc_items'                    => 'Empty Barcode Items',
+    'error_adding_updating'              => 'Error adding/updating item',
+    'error_updating_multiple'            => 'Error updating items',
+    'generate_barcodes'                  => 'Generate Barcodes',
+    'hsn_code'                           => '',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Item Import from CSV',
+    'info_provided_by'                   => 'Information provided by',
+    'inventory'                          => 'Inventory',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Comments',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Date',
+    'inventory_employee'                 => 'Employee',
+    'inventory_in_out_quantity'          => 'In/Out Quantity',
+    'inventory_remarks'                  => 'Remarks',
+    'is_deleted'                         => 'Deleted',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item has Serial Number',
+    'item'                               => 'Item',
+    'item_id'                            => '',
+    'item_number'                        => 'Barcode',
+    'item_number_duplicate'              => 'Item Number is already present in the database.',
+    'item_number_invalid'                => 'Item Number contains disallowed characters.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Location',
+    'low_inventory_items'                => 'Out Of Stock Items',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => 'Manual Edit of Quantity',
+    'markup'                             => '',
+    'name'                               => 'Item Name',
+    'name_required'                      => 'Item Name is a required field.',
+    'new'                                => 'New Item',
+    'no_description_items'               => 'No Description Items',
+    'no_items_to_display'                => 'No Items to display.',
+    'none'                               => 'None',
+    'none_selected'                      => 'You have not selected any Item(s) to edit',
+    'nonstock'                           => 'Non-stocked',
+    'number_information'                 => 'Item Number',
+    'number_required'                    => 'Barcode is a required field.',
+    'one_or_multiple'                    => 'item(s)',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => 'Quantity',
+    'quantity_number'                    => 'Quantity must be a number.',
+    'quantity_required'                  => 'Quantity is a required field.',
+    'receiving_quantity'                 => 'Receiving Quantity',
+    'remove_image'                       => 'Remove Image',
+    'reorder_level'                      => 'Reorder Level',
+    'reorder_level_number'               => 'Reorder Level must be a number.',
+    'reorder_level_required'             => 'Reorder Level is a required field.',
+    'retrive_item_info'                  => 'Retrive Item Info',
+    'sales_tax_1'                        => 'Sales Tax',
+    'sales_tax_2'                        => 'Sales Tax 2',
+    'search_attributes'                  => 'Search Attributes',
+    'select_image'                       => 'Select Image',
+    'serialized_items'                   => 'Serialized Items',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Stock',
+    'stock_location'                     => 'Stock location',
+    'stock_type'                         => 'Stock Type',
+    'successful_adding'                  => 'You have successfully added item',
+    'successful_bulk_edit'               => 'You have successfully updated the selected item(s)',
+    'successful_deleted'                 => 'You have successfully deleted',
+    'successful_updating'                => 'You have successfully updated item',
+    'supplier'                           => 'Supplier',
+    'tax_1'                              => 'Tax 1',
+    'tax_2'                              => 'Tax 2',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'ຊື່ພາສີມີຕົວອັກສອນທີ່ບໍ່ອະນຸຍາດ.',
+    'tax_percent'                        => 'Tax Percent',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => 'Tax Percent is a required field.',
+    'tax_percents'                       => 'Tax Percent(s)',
+    'temp'                               => '',
+    'type'                               => 'Item Type',
+    'unit_price'                         => 'Retail Price',
+    'unit_price_number'                  => 'Unit price must be a number.',
+    'unit_price_required'                => 'Retail Price is a required field.',
+    'upc_database'                       => 'Barcode Database',
+    'update'                             => 'Update Item',
+    'use_inventory_menu'                 => 'Use Inventory Menu',
 ];
diff --git a/app/Language/lo/Login.php b/app/Language/lo/Login.php
index 610a1a35f..f57c951aa 100644
--- a/app/Language/lo/Login.php
+++ b/app/Language/lo/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "ຂ້ອຍບໍ່ແມ່ນເຄື່ອງຈັກ.",
-    "go"                            => "Go",
-    "invalid_gcaptcha"              => "ຍັງບໍ່ໄດ້ຕິກ ຂ້ອຍບໍ່ແມ່ນເຄື່ອງຈັກ.",
-    "invalid_installation"          => "ການຕິດຕັ້ງມີຂໍ້ຜິດພາດ, ກະລຸນາກວດສອບ php.ini file.",
-    "invalid_username_and_password" => "Username ຫຼື Password ບໍ່ຖືກຕ້ອງ.",
-    "login"                         => "ເຂົ້າລະບົບ",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Password",
-    "required_username"             => "",
-    "username"                      => "Username",
-    "welcome"                       => "",
+    "gcaptcha"                            => "ຂ້ອຍບໍ່ແມ່ນເຄື່ອງຈັກ.",
+    "go"                                  => "Go",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "ຍັງບໍ່ໄດ້ຕິກ ຂ້ອຍບໍ່ແມ່ນເຄື່ອງຈັກ.",
+    "invalid_installation"                => "ການຕິດຕັ້ງມີຂໍ້ຜິດພາດ, ກະລຸນາກວດສອບ php.ini file.",
+    "invalid_username_and_password"       => "Username ຫຼື Password ບໍ່ຖືກຕ້ອງ.",
+    "login"                               => "ເຂົ້າລະບົບ",
+    "logout"                              => "",
+    "migrating_database"                  => "ກໍາລັງຍ້າຍຖານຂໍ້ມູນ",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "ຍ້າຍຖານຂໍ້ມູນສໍາເລັດແລ້ວ!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Password",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'ພະຍາຍາມຫຼາຍເກີນໄປ. ກະລຸນາລໍຖ້າບຶດໜຶ່ງ ແລ້ວລອງໃໝ່ອີກຄັ້ງ.',
+    "username"                            => "Username",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/lo/Reports.php b/app/Language/lo/Reports.php
index fa31c61b5..581bb197d 100644
--- a/app/Language/lo/Reports.php
+++ b/app/Language/lo/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "Taxes",
     "taxes_summary_report"                    => "Taxes Summary Report",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Total Inventory Value",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/lo/Sales.php b/app/Language/lo/Sales.php
index 66745059f..26b3296aa 100644
--- a/app/Language/lo/Sales.php
+++ b/app/Language/lo/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Available Points",
-    "rewards_package"                  => "Rewards",
-    "rewards_remaining_balance"        => "Reward Points remaining value is ",
-    "account_number"                   => "",
-    "add_payment"                      => "Add Payment",
-    "amount_due"                       => "Amount Due",
-    "amount_tendered"                  => "Amount Tendered",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "Cancel",
-    "cash"                             => "Cash",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "Cash Deposit",
-    "cash_filter"                      => "Cash",
-    "change_due"                       => "Change Due",
-    "change_price"                     => "",
-    "check"                            => "Check",
-    "check_balance"                    => "Check remainder",
-    "check_filter"                     => "Check",
-    "close"                            => "",
-    "comment"                          => "Comment",
-    "comments"                         => "Comments",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Complete",
-    "confirm_cancel_sale"              => "Are you sure you want to clear this sale? All items will cleared.",
-    "confirm_delete"                   => "Are you sure you want to delete the selected Sale(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected Sale(s)?",
-    "credit"                           => "Credit Card",
-    "credit_deposit"                   => "Credit Deposit",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Name",
-    "customer_address"                 => "Address",
-    "customer_discount"                => "Discount",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Location",
-    "customer_mailchimp_status"        => "Mailchimp status",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Sale Date",
-    "date_range"                       => "Date Range",
-    "date_required"                    => "A correct date must be entered.",
-    "date_type"                        => "Date is a required field.",
-    "debit"                            => "Debit Card",
-    "debit_filter"                     => "",
-    "delete"                           => "Allow Delete",
-    "delete_confirmation"              => "Are you sure you want to delete this sale? This action cannot be undone.",
-    "delete_entire_sale"               => "Delete Entire Sale",
-    "delete_successful"                => "Sale delete successful.",
-    "delete_unsuccessful"              => "Sale delete failed.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Discard",
-    "discard_quote"                    => "",
-    "discount"                         => "Disc %",
-    "discount_included"                => "% Discount",
-    "discount_short"                   => "%",
-    "due"                              => "Due",
-    "due_filter"                       => "Due",
-    "edit"                             => "Edit",
-    "edit_item"                        => "Edit Item",
-    "edit_sale"                        => "Edit Sale",
-    "email_receipt"                    => "Email Receipt",
-    "employee"                         => "Employee",
-    "entry"                            => "Entry",
-    "error_editing_item"               => "Error editing item",
-    "find_or_scan_item"                => "Find or Scan Item",
-    "find_or_scan_item_or_receipt"     => "Find or Scan Item or Receipt",
-    "giftcard"                         => "Gift Card",
-    "giftcard_balance"                 => "Gift Card Balance",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gift Card Number",
-    "group_by_category"                => "Group by Category",
-    "group_by_type"                    => "Group by Type",
-    "hsn"                              => "",
-    "id"                               => "Sale ID",
-    "include_prices"                   => "Include Prices?",
-    "invoice"                          => "Invoice",
-    "invoice_confirm"                  => "This invoice will be sent to",
-    "invoice_enable"                   => "Create Invoice",
-    "invoice_filter"                   => "Invoices",
-    "invoice_no_email"                 => "This customer does not have a valid email address",
-    "invoice_number"                   => "Invoice #",
-    "invoice_number_duplicate"         => "Invoice Number must be unique.",
-    "invoice_sent"                     => "Invoice sent to",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "Invoice failed to be sent to",
-    "invoice_update"                   => "Recount",
-    "item_insufficient_of_stock"       => "Item has insufficient stock.",
-    "item_name"                        => "Item Name",
-    "item_number"                      => "Item #",
-    "item_out_of_stock"                => "Item is out of stock.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Register Mode",
-    "must_enter_numeric"               => "Amount Tendered must be a number.",
-    "must_enter_numeric_giftcard"      => "Gift Card Number must be a number.",
-    "new_customer"                     => "New Customer",
-    "new_item"                         => "New Item",
-    "no_description"                   => "None",
-    "no_filter"                        => "All",
-    "no_items_in_cart"                 => "There are no Items in the cart.",
-    "no_sales_to_display"              => "No Sales to display.",
-    "none_selected"                    => "You have not selected any Sale(s) to delete.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "This action is not authorized.",
-    "one_or_multiple"                  => "Sale(s)",
-    "payment"                          => "Payment Type",
-    "payment_amount"                   => "Amount",
-    "payment_not_cover_total"          => "Payment Amount must be greater than or equal to Total.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Payments Total",
-    "price"                            => "Price",
-    "print_after_sale"                 => "Print after Sale",
-    "quantity"                         => "Quantity",
-    "quantity_less_than_reorder_level" => "Warning: Desired Quantity is below Reorder Level for that Item.",
-    "quantity_less_than_zero"          => "Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.",
-    "quantity_of_items"                => "Quantity of {0} Items",
-    "quote"                            => "Quote",
-    "quote_number"                     => "Quote Number",
-    "quote_number_duplicate"           => "Quote Number must be unique.",
-    "quote_sent"                       => "Quote sent to",
-    "quote_unsent"                     => "Quote failed to be sent to",
-    "receipt"                          => "Sales Receipt",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "Sale #",
-    "receipt_sent"                     => "Receipt sent to",
-    "receipt_unsent"                   => "Receipt failed to be sent to",
-    "refund"                           => "",
-    "register"                         => "Sales Register",
-    "remove_customer"                  => "Remove Customer",
-    "remove_discount"                  => "",
-    "return"                           => "Return",
-    "rewards"                          => "Reward Points",
-    "rewards_balance"                  => "Reward Points Balance",
-    "sale"                             => "Sale",
-    "sale_by_invoice"                  => "Sale by Invoice",
-    "sale_for_customer"                => "Customer:",
-    "sale_time"                        => "Time",
-    "sales_tax"                        => "Sales Tax",
-    "sales_total"                      => "",
-    "select_customer"                  => "Select Customer (Optional)",
-    "send_invoice"                     => "Send Invoice",
-    "send_quote"                       => "Send Quote",
-    "send_receipt"                     => "Send Receipt",
-    "send_work_order"                  => "Send Work Order",
-    "serial"                           => "Serial",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Show Invoice",
-    "show_receipt"                     => "Show Receipt",
-    "start_typing_customer_name"       => "Start typing customer details...",
-    "start_typing_item_name"           => "Start typing Item Name or scan Barcode...",
-    "stock"                            => "Stock",
-    "stock_location"                   => "Stock Location",
-    "sub_total"                        => "Subtotal",
-    "successfully_deleted"             => "You have successfully deleted",
-    "successfully_restored"            => "You have successfully restored",
-    "successfully_suspended_sale"      => "Sale suspend successful.",
-    "successfully_updated"             => "Sale update successful.",
-    "suspend_sale"                     => "Suspend",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspended",
-    "table"                            => "Table",
-    "takings"                          => "Daily Sales",
-    "tax"                              => "Tax",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "Tax %",
-    "taxed_ind"                        => "",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Tax excluded",
-    "transaction_failed"               => "Sales Transaction failed.",
-    "unable_to_add_item"               => "Item add to Sale failed",
-    "unsuccessfully_deleted"           => "Sale(s) delete failed.",
-    "unsuccessfully_restored"          => "Sale(s) restore failed.",
-    "unsuccessfully_suspended_sale"    => "Sale suspend failed.",
-    "unsuccessfully_updated"           => "Sale update failed.",
-    "unsuspend"                        => "Unsuspend",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Update",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Work Order",
-    "work_order_number"                => "Work Order Number",
-    "work_order_number_duplicate"      => "Work Order Number must be unique.",
-    "work_order_sent"                  => "Work Order sent to",
-    "work_order_unsent"                => "Work Order failed to be sent to",
+    'account_number'                    => '',
+    'add_payment'                       => 'Add Payment',
+    'amount_due'                        => 'Amount Due',
+    'amount_due_not_covered'            => 'ການຊຳລະເງິນບໍ່ຄຸ້ມຈຳນວນທີ່ຕ້ອງຈ່າຍ.',
+    'amount_tendered'                   => 'Amount Tendered',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => 'Cancel',
+    'cash'                              => 'Cash',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => 'Cash Deposit',
+    'cash_filter'                       => 'Cash',
+    'change_due'                        => 'Change Due',
+    'change_price'                      => '',
+    'check'                             => 'Check',
+    'check_balance'                     => 'Check remainder',
+    'check_filter'                      => 'Check',
+    'close'                             => '',
+    'comment'                           => 'Comment',
+    'comments'                          => 'Comments',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Complete',
+    'confirm_cancel_sale'               => 'Are you sure you want to clear this sale? All items will cleared.',
+    'confirm_delete'                    => 'Are you sure you want to delete the selected Sale(s)?',
+    'confirm_restore'                   => 'Are you sure you want to restore the selected Sale(s)?',
+    'credit'                            => 'Credit Card',
+    'credit_deposit'                    => 'Credit Deposit',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Name',
+    'customer_address'                  => 'Address',
+    'customer_discount'                 => 'Discount',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Location',
+    'customer_mailchimp_status'         => 'Mailchimp status',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Available Points',
+    'daily_sales'                       => '',
+    'date'                              => 'Sale Date',
+    'date_range'                        => 'Date Range',
+    'date_required'                     => 'A correct date must be entered.',
+    'date_type'                         => 'Date is a required field.',
+    'debit'                             => 'Debit Card',
+    'debit_filter'                      => '',
+    'delete'                            => 'Allow Delete',
+    'delete_confirmation'               => 'Are you sure you want to delete this sale? This action cannot be undone.',
+    'delete_entire_sale'                => 'Delete Entire Sale',
+    'delete_successful'                 => 'Sale delete successful.',
+    'delete_unsuccessful'               => 'Sale delete failed.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Discard',
+    'discard_quote'                     => '',
+    'discount'                          => 'Disc %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Discount',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Due',
+    'due_filter'                        => 'Due',
+    'edit'                              => 'Edit',
+    'edit_item'                         => 'Edit Item',
+    'edit_sale'                         => 'Edit Sale',
+    'email_receipt'                     => 'Email Receipt',
+    'employee'                          => 'Employee',
+    'entry'                             => 'Entry',
+    'error_editing_item'                => 'Error editing item',
+    'find_or_scan_item'                 => 'Find or Scan Item',
+    'find_or_scan_item_or_receipt'      => 'Find or Scan Item or Receipt',
+    'giftcard'                          => 'Gift Card',
+    'giftcard_balance'                  => 'Gift Card Balance',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Gift Card Number',
+    'group_by_category'                 => 'Group by Category',
+    'group_by_type'                     => 'Group by Type',
+    'hsn'                               => '',
+    'id'                                => 'Sale ID',
+    'include_prices'                    => 'Include Prices?',
+    'insufficient_giftcard_balance'     => 'ຍອດເງິນບັດຂອງຂວັນບໍ່ພຽງພໍສໍາລັບການຊໍາລະນີ້.',
+    'insufficient_reward_points'        => 'ຄະແນນລາງວັນບໍ່ພຽງພໍສໍາລັບການຊໍາລະນີ້.',
+    'invoice'                           => 'Invoice',
+    'invoice_confirm'                   => 'This invoice will be sent to',
+    'invoice_enable'                    => 'Create Invoice',
+    'invoice_filter'                    => 'Invoices',
+    'invoice_no_email'                  => 'This customer does not have a valid email address',
+    'invoice_number'                    => 'Invoice #',
+    'invoice_number_duplicate'          => 'Invoice Number must be unique.',
+    'invoice_sent'                      => 'Invoice sent to',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => 'Invoice failed to be sent to',
+    'invoice_update'                    => 'Recount',
+    'item_insufficient_of_stock'        => 'Item has insufficient stock.',
+    'item_name'                         => 'Item Name',
+    'item_number'                       => 'Item #',
+    'item_out_of_stock'                 => 'Item is out of stock.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Register Mode',
+    'must_enter_numeric'                => 'Amount Tendered must be a number.',
+    'must_enter_numeric_giftcard'       => 'Gift Card Number must be a number.',
+    'must_enter_reference_code'         => 'ຕ້ອງປ້ອນໝາຍເລກອ້າງອີງ/ດຶງຂໍ້ມູນ.',
+    'negative_amount_tendered'          => 'ຈຳນວນເງິນທີ່ຈ່າຍບໍ່ສາມາດເປັນຄ່າລົບໄດ້.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'New Customer',
+    'new_item'                          => 'New Item',
+    'no_description'                    => 'None',
+    'no_filter'                         => 'All',
+    'no_items_in_cart'                  => 'There are no Items in the cart.',
+    'no_sales_to_display'               => 'No Sales to display.',
+    'none_selected'                     => 'You have not selected any Sale(s) to delete.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'This action is not authorized.',
+    'one_or_multiple'                   => 'Sale(s)',
+    'payment'                           => 'Payment Type',
+    'payment_amount'                    => 'Amount',
+    'payment_not_cover_total'           => 'Payment Amount must be greater than or equal to Total.',
+    'payment_type'                      => 'Type',
+    'payments'                          => '',
+    'payments_total'                    => 'Payments Total',
+    'price'                             => 'Price',
+    'print_after_sale'                  => 'Print after Sale',
+    'quantity'                          => 'Quantity',
+    'quantity_less_than_reorder_level'  => 'Warning: Desired Quantity is below Reorder Level for that Item.',
+    'quantity_less_than_zero'           => 'Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.',
+    'quantity_of_items'                 => 'Quantity of {0} Items',
+    'quote'                             => 'Quote',
+    'quote_number'                      => 'Quote Number',
+    'quote_number_duplicate'            => 'Quote Number must be unique.',
+    'quote_sent'                        => 'Quote sent to',
+    'quote_unsent'                      => 'Quote failed to be sent to',
+    'receipt'                           => 'Sales Receipt',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => 'Sale #',
+    'receipt_sent'                      => 'Receipt sent to',
+    'receipt_unsent'                    => 'Receipt failed to be sent to',
+    'reference_code'                    => 'ລະຫັດອ້າງອີງການຊຳລະເງິນ',
+    'reference_code_invalid_characters' => 'ລະຫັດອ້າງອີງຕ້ອງມີແຕ່ຕົວອັກສອນ ແລະ ຕົວເລກເທົ່ານັ້ນ.',
+    'reference_code_length_error'       => 'ຄວາມຍາວຂອງລະຫັດອ້າງອີງບໍ່ຖືກຕ້ອງ.',
+    'refund'                            => '',
+    'register'                          => 'Sales Register',
+    'remove_customer'                   => 'Remove Customer',
+    'remove_discount'                   => '',
+    'return'                            => 'Return',
+    'rewards'                           => 'Reward Points',
+    'rewards_balance'                   => 'Reward Points Balance',
+    'rewards_package'                   => 'Rewards',
+    'rewards_remaining_balance'         => 'Reward Points remaining value is ',
+    'sale'                              => 'Sale',
+    'sale_by_invoice'                   => 'Sale by Invoice',
+    'sale_for_customer'                 => 'Customer:',
+    'sale_time'                         => 'Time',
+    'sales_tax'                         => 'Sales Tax',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Select Customer (Optional)',
+    'send_invoice'                      => 'Send Invoice',
+    'send_quote'                        => 'Send Quote',
+    'send_receipt'                      => 'Send Receipt',
+    'send_work_order'                   => 'Send Work Order',
+    'serial'                            => 'Serial',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Show Invoice',
+    'show_receipt'                      => 'Show Receipt',
+    'start_typing_customer_name'        => 'Start typing customer details...',
+    'start_typing_item_name'            => 'Start typing Item Name or scan Barcode...',
+    'stock'                             => 'Stock',
+    'stock_location'                    => 'Stock Location',
+    'sub_total'                         => 'Subtotal',
+    'successfully_deleted'              => 'You have successfully deleted',
+    'successfully_restored'             => 'You have successfully restored',
+    'successfully_suspended_sale'       => 'Sale suspend successful.',
+    'successfully_updated'              => 'Sale update successful.',
+    'suspend_sale'                      => 'Suspend',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspended',
+    'table'                             => 'Table',
+    'takings'                           => 'Daily Sales',
+    'tax'                               => 'Tax',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => 'Tax %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Tax excluded',
+    'transaction_failed'                => 'Sales Transaction failed.',
+    'unable_to_add_item'                => 'Item add to Sale failed',
+    'unsuccessfully_deleted'            => 'Sale(s) delete failed.',
+    'unsuccessfully_restored'           => 'Sale(s) restore failed.',
+    'unsuccessfully_suspended_sale'     => 'Sale suspend failed.',
+    'unsuccessfully_updated'            => 'Sale update failed.',
+    'unsuspend'                         => 'Unsuspend',
+    'unsuspend_and_delete'              => 'Action',
+    'update'                            => 'Update',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Work Order',
+    'work_order_number'                 => 'Work Order Number',
+    'work_order_number_duplicate'       => 'Work Order Number must be unique.',
+    'work_order_sent'                   => 'Work Order sent to',
+    'work_order_unsent'                 => 'Work Order failed to be sent to',
 ];
diff --git a/app/Language/ml/Attributes.php b/app/Language/ml/Attributes.php
index 754c48fa0..37340d7b2 100644
--- a/app/Language/ml/Attributes.php
+++ b/app/Language/ml/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attribute value cannot contain ':' or '|'",
-    "confirm_delete"                   => "Are you sure you want to delete the selected attribute(s)?",
-    "confirm_restore"                  => "",
-    "definition_cannot_be_deleted"     => "Could not delete selected attribute(s)",
-    "definition_error_adding_updating" => "",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Attribute Name",
-    "definition_name_required"         => "Attribute name is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated attribute",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute type is a required field",
-    "definition_unit"                  => "",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Items to display",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'Attribute value cannot contain \':\' or \'|\'',
+    'confirm_delete'                   => 'Are you sure you want to restore the selected attribute(s)?',
+    'confirm_restore'                  => 'Are you sure you want to delete the selected attribute(s)?',
+    'definition_cannot_be_deleted'     => 'Could not delete selected attribute(s)',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute type is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated Item Kit',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute name is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Items to display.',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'തിരയലിൽ കാണിക്കുക',
+    'show_in_search_visibility'        => 'തിരയൽ',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/ml/Calendar.php b/app/Language/ml/Calendar.php
new file mode 100644
index 000000000..34ac990a2
--- /dev/null
+++ b/app/Language/ml/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "ഞാ",
+    "mo"        => "തി",
+    "tu"        => "ചൊ",
+    "we"        => "ബു",
+    "th"        => "വ്യാ",
+    "fr"        => "വെ",
+    "sa"        => "ശ",
+    "sun"       => "ഞായർ",
+    "mon"       => "തിങ്കൾ",
+    "tue"       => "ചൊവ്വ",
+    "wed"       => "ബുധൻ",
+    "thu"       => "വ്യാഴം",
+    "fri"       => "വെള്ളി",
+    "sat"       => "ശനി",
+    "sunday"    => "ഞായറാഴ്ച",
+    "monday"    => "തിങ്കളാഴ്ച",
+    "tuesday"   => "ചൊവ്വാഴ്ച",
+    "wednesday" => "ബുധനാഴ്ച",
+    "thursday"  => "വ്യാഴാഴ്ച",
+    "friday"    => "വെള്ളിയാഴ്ച",
+    "saturday"  => "ശനിയാഴ്ച",
+    "jan"       => "ജനു",
+    "feb"       => "ഫെബ്രു",
+    "mar"       => "മാർ",
+    "apr"       => "ഏപ്രി",
+    "may"       => "മേയ്",
+    "jun"       => "ജൂൺ",
+    "jul"       => "ജൂലൈ",
+    "aug"       => "ആഗ",
+    "sep"       => "സെപ്റ്റം",
+    "oct"       => "ഒക്ടോ",
+    "nov"       => "നവം",
+    "dec"       => "ഡിസം",
+    "january"   => "ജനുവരി",
+    "february"  => "ഫെബ്രുവരി",
+    "march"     => "മാർച്ച്",
+    "april"     => "ഏപ്രിൽ",
+    "may"       => "മേയ്",
+    "june"      => "ജൂൺ",
+    "july"      => "ജൂലൈ",
+    "august"    => "ആഗസ്റ്റ്",
+    "september" => "സെപ്റ്റംബർ",
+    "october"   => "ഒക്ടോബർ",
+    "november"  => "നവംബർ",
+    "december"  => "ഡിസംബർ",
+];
diff --git a/app/Language/ml/Config.php b/app/Language/ml/Config.php
index c599bb83c..d6901e6a8 100644
--- a/app/Language/ml/Config.php
+++ b/app/Language/ml/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "",
-    "address_required"                          => "",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '',
+    'address_required'                          => '',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'പേയ്‌മെന്റ് റഫറൻസ് കോഡ്<br>ദൈർഘ്യ പരിധികൾ',
+    'payment_reference_code_length_max_label'   => 'പരമാവധി',
+    'payment_reference_code_length_min_label'   => 'കുറഞ്ഞത്',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'അസാധുവായ sendmail പാത്ത്. അക്ഷരങ്ങൾ, അക്കങ്ങൾ, ഡാഷുകൾ, അടിവരകൾ, സ്ലാഷുകൾ, ബാക്ക്സ്ലാഷുകൾ, കോളനുകൾ, സ്പേസുകൾ, ഡോട്ടുകൾ എന്നിവ മാത്രമേ അനുവദനീയമായുള്ളൂ.',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/ml/Employees.php b/app/Language/ml/Employees.php
index 34a418062..db54af919 100644
--- a/app/Language/ml/Employees.php
+++ b/app/Language/ml/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'നിങ്ങളുടെ സ്വന്തം കുറഞ്ഞ മൊഡ്യൂൾ അനുമതികൾ നീക്കം ചെയ്യാൻ കഴിയില്ല.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'അനുമതി മാറ്റങ്ങൾ ഈ ഡെമോയിൽ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു.',
+    'error_password_change_disallowed'       => 'പാസ്‌വേർഡ് മാറ്റങ്ങൾ ഈ ഡെമോയിൽ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/ml/Error.php b/app/Language/ml/Error.php
index 64ebe1e41..175f49ebf 100644
--- a/app/Language/ml/Error.php
+++ b/app/Language/ml/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "",
-    "unknown"              => "",
+    'no_permission_module'           => 'ഈ പേരിലുള്ള മൊഡ്യൂൾ ആക്‌സസ് ചെയ്യാൻ നിങ്ങൾക്ക് അനുമതിയില്ല',
+    'unable_to_create_env_file'      => 'throttle.key സജ്ജീകരിക്കാൻ {filePath} സൃഷ്‌ടിക്കാൻ കഴിഞ്ഞില്ല',
+    'unable_to_lock_file'            => '{filePath} ലോക്ക് ചെയ്യാൻ കഴിഞ്ഞില്ല: {reason}',
+    'unable_to_open_lock_file'       => '{filePath} തുറക്കാൻ കഴിഞ്ഞില്ല: {reason}',
+    'unable_to_persist_throttle_key' => 'throttle.key {filePath}-ൽ സൂക്ഷിക്കാൻ കഴിഞ്ഞില്ല',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'throttle.key സജ്ജീകരിക്കാൻ {filePath} വായിക്കാൻ കഴിഞ്ഞില്ല',
+    'unknown'                        => 'അപ്രതീക്ഷിത പിശക്',
 ];
diff --git a/app/Language/ml/Items.php b/app/Language/ml/Items.php
index 42b2152bb..6d0b5c6f0 100644
--- a/app/Language/ml/Items.php
+++ b/app/Language/ml/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "",
-    "category"                           => "",
-    "category_new"                       => "",
-    "category_required"                  => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_bulk_edit_wipe_taxes"       => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => '',
+    'category'                           => '',
+    'category_new'                       => '',
+    'category_required'                  => '',
+    'change_all_to_allow_alt_desc'       => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => '',
+    'confirm_bulk_edit'                  => '',
+    'confirm_bulk_edit_wipe_taxes'       => '',
+    'confirm_delete'                     => '',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => 'ഇനം നമ്പറിൽ അനുവദനീയമല്ലാത്ത അക്ഷരങ്ങൾ അടങ്ങിയിരിക്കുന്നു.',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'നികുതി പേരിൽ അനുവദനീയമല്ലാത്ത അക്ഷരങ്ങൾ അടങ്ങിയിരിക്കുന്നു.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/ml/Login.php b/app/Language/ml/Login.php
index d443ab5b5..fcd730a72 100644
--- a/app/Language/ml/Login.php
+++ b/app/Language/ml/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "",
-    "login"                         => "",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "",
-    "required_username"             => "",
-    "username"                      => "",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "",
+    "login"                               => "",
+    "logout"                              => "",
+    "migrating_database"                  => "ഡേറ്റാബേസ് മൈഗ്രേറ്റ് ചെയ്യുന്നു",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "ഡേറ്റാബേസ് വിജയകരമായി മൈഗ്രേറ്റ് ചെയ്തു!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'വളരെയധികം ശ്രമങ്ങൾ. ദയവായി അല്പസമയം കാത്തിരുന്ന് വീണ്ടും ശ്രമിക്കുക.',
+    "username"                            => "",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/ml/Reports.php b/app/Language/ml/Reports.php
index 93316dfd2..15ff6bed9 100644
--- a/app/Language/ml/Reports.php
+++ b/app/Language/ml/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/ml/Sales.php b/app/Language/ml/Sales.php
index b38f57446..45d963989 100644
--- a/app/Language/ml/Sales.php
+++ b/app/Language/ml/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "",
-    "amount_due"                       => "",
-    "amount_tendered"                  => "",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "",
-    "cash"                             => "",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "",
-    "change_due"                       => "",
-    "change_price"                     => "",
-    "check"                            => "",
-    "check_balance"                    => "",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "",
-    "comments"                         => "",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "",
-    "confirm_cancel_sale"              => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "credit"                           => "",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "",
-    "customer_address"                 => "",
-    "customer_discount"                => "",
-    "customer_email"                   => "",
-    "customer_location"                => "",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "",
-    "date_range"                       => "",
-    "date_required"                    => "",
-    "date_type"                        => "",
-    "debit"                            => "",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "",
-    "delete_entire_sale"               => "",
-    "delete_successful"                => "",
-    "delete_unsuccessful"              => "",
-    "description_abbrv"                => "",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "",
-    "discount_included"                => "",
-    "discount_short"                   => "",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "",
-    "edit_item"                        => "",
-    "edit_sale"                        => "",
-    "email_receipt"                    => "",
-    "employee"                         => "",
-    "entry"                            => "",
-    "error_editing_item"               => "",
-    "find_or_scan_item"                => "",
-    "find_or_scan_item_or_receipt"     => "",
-    "giftcard"                         => "",
-    "giftcard_balance"                 => "",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "",
-    "include_prices"                   => "",
-    "invoice"                          => "",
-    "invoice_confirm"                  => "",
-    "invoice_enable"                   => "",
-    "invoice_filter"                   => "",
-    "invoice_no_email"                 => "",
-    "invoice_number"                   => "",
-    "invoice_number_duplicate"         => "",
-    "invoice_sent"                     => "",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "",
-    "invoice_update"                   => "",
-    "item_insufficient_of_stock"       => "",
-    "item_name"                        => "",
-    "item_number"                      => "",
-    "item_out_of_stock"                => "",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "",
-    "new_customer"                     => "",
-    "new_item"                         => "",
-    "no_description"                   => "",
-    "no_filter"                        => "",
-    "no_items_in_cart"                 => "",
-    "no_sales_to_display"              => "",
-    "none_selected"                    => "",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "",
-    "payment_amount"                   => "",
-    "payment_not_cover_total"          => "",
-    "payment_type"                     => "",
-    "payments"                         => "",
-    "payments_total"                   => "",
-    "price"                            => "",
-    "print_after_sale"                 => "",
-    "quantity"                         => "",
-    "quantity_less_than_reorder_level" => "",
-    "quantity_less_than_zero"          => "",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "",
-    "receipt_sent"                     => "",
-    "receipt_unsent"                   => "",
-    "refund"                           => "",
-    "register"                         => "",
-    "remove_customer"                  => "",
-    "remove_discount"                  => "",
-    "return"                           => "",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "",
-    "sale_time"                        => "",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "",
-    "send_invoice"                     => "",
-    "send_quote"                       => "",
-    "send_receipt"                     => "",
-    "send_work_order"                  => "",
-    "serial"                           => "",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "",
-    "show_receipt"                     => "",
-    "start_typing_customer_name"       => "",
-    "start_typing_item_name"           => "",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "",
-    "successfully_deleted"             => "",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "",
-    "successfully_updated"             => "",
-    "suspend_sale"                     => "",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "",
-    "suspended_sales"                  => "",
-    "table"                            => "",
-    "takings"                          => "",
-    "tax"                              => "",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "",
-    "taxed_ind"                        => "",
-    "total"                            => "",
-    "total_tax_exclusive"              => "",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "",
-    "unsuccessfully_deleted"           => "",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "",
-    "unsuccessfully_updated"           => "",
-    "unsuspend"                        => "",
-    "unsuspend_and_delete"             => "",
-    "update"                           => "",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => '',
+    'amount_due'                        => '',
+    'amount_due_not_covered'            => 'പേയ്‌മെന്റുകൾ അടയ്‌ക്കേണ്ട തുക ഉൾക്കൊള്ളുന്നില്ല.',
+    'amount_tendered'                   => '',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => '',
+    'cash'                              => '',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '',
+    'change_due'                        => '',
+    'change_price'                      => '',
+    'check'                             => '',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => '',
+    'comments'                          => '',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '',
+    'confirm_cancel_sale'               => '',
+    'confirm_delete'                    => '',
+    'confirm_restore'                   => '',
+    'credit'                            => '',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '',
+    'customer_address'                  => '',
+    'customer_discount'                 => '',
+    'customer_email'                    => '',
+    'customer_location'                 => '',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => '',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => '',
+    'date_range'                        => '',
+    'date_required'                     => '',
+    'date_type'                         => '',
+    'debit'                             => '',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => '',
+    'delete_entire_sale'                => '',
+    'delete_successful'                 => '',
+    'delete_unsuccessful'               => '',
+    'description_abbrv'                 => '',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '',
+    'edit_item'                         => '',
+    'edit_sale'                         => '',
+    'email_receipt'                     => '',
+    'employee'                          => '',
+    'entry'                             => '',
+    'error_editing_item'                => '',
+    'find_or_scan_item'                 => '',
+    'find_or_scan_item_or_receipt'      => '',
+    'giftcard'                          => '',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'ഈ പേയ്‌മെന്റിനായി പര്യാപ്ത ഗിഫ്റ്റ് കാർഡ് ബാലൻസ് ഇല്ല.',
+    'insufficient_reward_points'        => 'ഈ പേയ്‌മെന്റിനായി പര്യാപ്ത പുരസ്‌കാര പോയിന്‍റ് ഇല്ല.',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'റഫറൻസ്/റിട്രീവൽ നമ്പർ നൽകണം.',
+    'negative_amount_tendered'          => 'നൽകിയ തുക നെഗറ്റീവ് ആകാൻ പാടില്ല.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => '',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'പേയ്‌മെന്റ് റഫറൻസ് കോഡ്',
+    'reference_code_invalid_characters' => 'റഫറൻസ് കോഡിൽ അക്ഷരങ്ങളും അക്കങ്ങളും മാത്രം ഉണ്ടായിരിക്കണം.',
+    'reference_code_length_error'       => 'റഫറൻസ് കോഡിന്റെ ദൈർഘ്യം അസാധുവാണ്.',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/nb/Attributes.php b/app/Language/nb/Attributes.php
index 4e154bbbe..d67266cb5 100644
--- a/app/Language/nb/Attributes.php
+++ b/app/Language/nb/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attribute value cannot contain ':' or '|'",
-    "confirm_delete"                   => "Are you sure you want to delete the selected attribute(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected attribute(s)?",
-    "definition_cannot_be_deleted"     => "Could not delete selected attribute(s)",
-    "definition_error_adding_updating" => "Attribute {0} could not be added or updated. Please check the error log.",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Add Attribute",
-    "definition_name_required"         => "Attribute name is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated attribute",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute type is a required field",
-    "definition_unit"                  => "Measurement Unit",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Items to display",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'Attribute value cannot contain \':\' or \'|\'',
+    'confirm_delete'                   => 'Are you sure you want to delete the selected attribute(s)?',
+    'confirm_restore'                  => 'Are you sure you want to restore the selected attribute(s)?',
+    'definition_cannot_be_deleted'     => 'Could not delete selected attribute(s)',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute name is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated attribute',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute type is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Items to display',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'Vis i søk',
+    'show_in_search_visibility'        => 'Søk',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/nb/Calendar.php b/app/Language/nb/Calendar.php
new file mode 100644
index 000000000..5e9e48c7c
--- /dev/null
+++ b/app/Language/nb/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "Sø",
+    "mo"        => "Ma",
+    "tu"        => "Ti",
+    "we"        => "On",
+    "th"        => "To",
+    "fr"        => "Fr",
+    "sa"        => "Lø",
+    "sun"       => "Søn",
+    "mon"       => "Man",
+    "tue"       => "Tir",
+    "wed"       => "Ons",
+    "thu"       => "Tor",
+    "fri"       => "Fre",
+    "sat"       => "Lør",
+    "sunday"    => "Søndag",
+    "monday"    => "Mandag",
+    "tuesday"   => "Tirsdag",
+    "wednesday" => "Onsdag",
+    "thursday"  => "Torsdag",
+    "friday"    => "Fredag",
+    "saturday"  => "Lørdag",
+    "jan"       => "Jan",
+    "feb"       => "Feb",
+    "mar"       => "Mar",
+    "apr"       => "Apr",
+    "may"       => "Mai",
+    "jun"       => "Jun",
+    "jul"       => "Jul",
+    "aug"       => "Aug",
+    "sep"       => "Sep",
+    "oct"       => "Okt",
+    "nov"       => "Nov",
+    "dec"       => "Des",
+    "january"   => "Januar",
+    "february"  => "Februar",
+    "march"     => "Mars",
+    "april"     => "April",
+    "may"       => "Mai",
+    "june"      => "Juni",
+    "july"      => "Juli",
+    "august"    => "August",
+    "september" => "September",
+    "october"   => "Oktober",
+    "november"  => "November",
+    "december"  => "Desember",
+];
diff --git a/app/Language/nb/Config.php b/app/Language/nb/Config.php
index 44a8a13eb..0a2289089 100644
--- a/app/Language/nb/Config.php
+++ b/app/Language/nb/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "",
-    "address_required"                          => "",
-    "all_set"                                   => "",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "",
-    "server_notice"                             => "",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "",
-    "system_info"                               => "",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '',
+    'address_required'                          => '',
+    'all_set'                                   => '',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => '',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => '',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => '',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'Betalingsreferansekode<br>Lengdegrenser',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => '',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Ugyldig sendmail-sti. Kun bokstaver, tall, bindestreker, understreker, skråstreker, omvendte skråstreker, kolon, mellomrom og punktum er tillatt.',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => '',
+    'server_notice'                             => '',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => '',
+    'system_info'                               => '',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/nb/Employees.php b/app/Language/nb/Employees.php
index 34a418062..69b78b136 100644
--- a/app/Language/nb/Employees.php
+++ b/app/Language/nb/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'Du kan ikke fjerne dine egne minimumsrettigheter for moduler.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'Tillatelser kan ikke endres i denne demoen.',
+    'error_password_change_disallowed'       => 'Passordet kan ikke endres i denne demoen.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/nb/Error.php b/app/Language/nb/Error.php
index 64ebe1e41..5d66de671 100644
--- a/app/Language/nb/Error.php
+++ b/app/Language/nb/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "",
-    "unknown"              => "",
+    'no_permission_module'           => 'Du har ikke tillatelse til å få tilgang til modulen som heter',
+    'unable_to_create_env_file'      => 'Kan ikke opprette {filePath} for å klargjøre throttle.key',
+    'unable_to_lock_file'            => 'Kan ikke låse {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Kan ikke åpne {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Kan ikke lagre throttle.key til {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Kan ikke lese {filePath} for å klargjøre throttle.key',
+    'unknown'                        => 'Uventet feil',
 ];
diff --git a/app/Language/nb/Items.php b/app/Language/nb/Items.php
index 42b2152bb..16d5b743f 100644
--- a/app/Language/nb/Items.php
+++ b/app/Language/nb/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "",
-    "category"                           => "",
-    "category_new"                       => "",
-    "category_required"                  => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_bulk_edit_wipe_taxes"       => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => '',
+    'category'                           => '',
+    'category_new'                       => '',
+    'category_required'                  => '',
+    'change_all_to_allow_alt_desc'       => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => '',
+    'confirm_bulk_edit'                  => '',
+    'confirm_bulk_edit_wipe_taxes'       => '',
+    'confirm_delete'                     => '',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => 'Varenummer inneholder ikke-tillatte tegn.',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Avgiftsnavnet inneholder ikke-tillatte tegn.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/nb/Login.php b/app/Language/nb/Login.php
index d443ab5b5..51e33629d 100644
--- a/app/Language/nb/Login.php
+++ b/app/Language/nb/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "",
-    "login"                         => "",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "",
-    "required_username"             => "",
-    "username"                      => "",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "",
+    "login"                               => "",
+    "logout"                              => "",
+    "migrating_database"                  => "Migrerer database",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Database migrert!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'For mange forsøk. Vennligst vent litt og prøv igjen.',
+    "username"                            => "",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/nb/Reports.php b/app/Language/nb/Reports.php
index 93316dfd2..15ff6bed9 100644
--- a/app/Language/nb/Reports.php
+++ b/app/Language/nb/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/nb/Sales.php b/app/Language/nb/Sales.php
index b38f57446..9a83b77aa 100644
--- a/app/Language/nb/Sales.php
+++ b/app/Language/nb/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "",
-    "amount_due"                       => "",
-    "amount_tendered"                  => "",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "",
-    "cash"                             => "",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "",
-    "change_due"                       => "",
-    "change_price"                     => "",
-    "check"                            => "",
-    "check_balance"                    => "",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "",
-    "comments"                         => "",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "",
-    "confirm_cancel_sale"              => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "credit"                           => "",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "",
-    "customer_address"                 => "",
-    "customer_discount"                => "",
-    "customer_email"                   => "",
-    "customer_location"                => "",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "",
-    "date_range"                       => "",
-    "date_required"                    => "",
-    "date_type"                        => "",
-    "debit"                            => "",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "",
-    "delete_entire_sale"               => "",
-    "delete_successful"                => "",
-    "delete_unsuccessful"              => "",
-    "description_abbrv"                => "",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "",
-    "discount_included"                => "",
-    "discount_short"                   => "",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "",
-    "edit_item"                        => "",
-    "edit_sale"                        => "",
-    "email_receipt"                    => "",
-    "employee"                         => "",
-    "entry"                            => "",
-    "error_editing_item"               => "",
-    "find_or_scan_item"                => "",
-    "find_or_scan_item_or_receipt"     => "",
-    "giftcard"                         => "",
-    "giftcard_balance"                 => "",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "",
-    "include_prices"                   => "",
-    "invoice"                          => "",
-    "invoice_confirm"                  => "",
-    "invoice_enable"                   => "",
-    "invoice_filter"                   => "",
-    "invoice_no_email"                 => "",
-    "invoice_number"                   => "",
-    "invoice_number_duplicate"         => "",
-    "invoice_sent"                     => "",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "",
-    "invoice_update"                   => "",
-    "item_insufficient_of_stock"       => "",
-    "item_name"                        => "",
-    "item_number"                      => "",
-    "item_out_of_stock"                => "",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "",
-    "new_customer"                     => "",
-    "new_item"                         => "",
-    "no_description"                   => "",
-    "no_filter"                        => "",
-    "no_items_in_cart"                 => "",
-    "no_sales_to_display"              => "",
-    "none_selected"                    => "",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "",
-    "payment_amount"                   => "",
-    "payment_not_cover_total"          => "",
-    "payment_type"                     => "",
-    "payments"                         => "",
-    "payments_total"                   => "",
-    "price"                            => "",
-    "print_after_sale"                 => "",
-    "quantity"                         => "",
-    "quantity_less_than_reorder_level" => "",
-    "quantity_less_than_zero"          => "",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "",
-    "receipt_sent"                     => "",
-    "receipt_unsent"                   => "",
-    "refund"                           => "",
-    "register"                         => "",
-    "remove_customer"                  => "",
-    "remove_discount"                  => "",
-    "return"                           => "",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "",
-    "sale_time"                        => "",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "",
-    "send_invoice"                     => "",
-    "send_quote"                       => "",
-    "send_receipt"                     => "",
-    "send_work_order"                  => "",
-    "serial"                           => "",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "",
-    "show_receipt"                     => "",
-    "start_typing_customer_name"       => "",
-    "start_typing_item_name"           => "",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "",
-    "successfully_deleted"             => "",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "",
-    "successfully_updated"             => "",
-    "suspend_sale"                     => "",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "",
-    "suspended_sales"                  => "",
-    "table"                            => "",
-    "takings"                          => "",
-    "tax"                              => "",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "",
-    "taxed_ind"                        => "",
-    "total"                            => "",
-    "total_tax_exclusive"              => "",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "",
-    "unsuccessfully_deleted"           => "",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "",
-    "unsuccessfully_updated"           => "",
-    "unsuspend"                        => "",
-    "unsuspend_and_delete"             => "",
-    "update"                           => "",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => '',
+    'amount_due'                        => '',
+    'amount_due_not_covered'            => 'Betalingene dekker ikke det skyldige beløpet.',
+    'amount_tendered'                   => '',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => '',
+    'cash'                              => '',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '',
+    'change_due'                        => '',
+    'change_price'                      => '',
+    'check'                             => '',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => '',
+    'comments'                          => '',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '',
+    'confirm_cancel_sale'               => '',
+    'confirm_delete'                    => '',
+    'confirm_restore'                   => '',
+    'credit'                            => '',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '',
+    'customer_address'                  => '',
+    'customer_discount'                 => '',
+    'customer_email'                    => '',
+    'customer_location'                 => '',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => '',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => '',
+    'date_range'                        => '',
+    'date_required'                     => '',
+    'date_type'                         => '',
+    'debit'                             => '',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => '',
+    'delete_entire_sale'                => '',
+    'delete_successful'                 => '',
+    'delete_unsuccessful'               => '',
+    'description_abbrv'                 => '',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '',
+    'edit_item'                         => '',
+    'edit_sale'                         => '',
+    'email_receipt'                     => '',
+    'employee'                          => '',
+    'entry'                             => '',
+    'error_editing_item'                => '',
+    'find_or_scan_item'                 => '',
+    'find_or_scan_item_or_receipt'      => '',
+    'giftcard'                          => '',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Utilstrekkelig gavekortbalanse for denne betalingen.',
+    'insufficient_reward_points'        => 'Utilstrekkelige belønningspoeng for denne betalingen.',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'Referanse-/hentingsnummer må angis.',
+    'negative_amount_tendered'          => 'Det mottatte beløpet kan ikke være negativt.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => '',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'Betalingsreferansekode',
+    'reference_code_invalid_characters' => 'Referansekoden kan bare inneholde bokstaver og tall.',
+    'reference_code_length_error'       => 'Lengden på referansekoden er ugyldig.',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/nl-BE/Attributes.php b/app/Language/nl-BE/Attributes.php
index 6435fdec5..409a29b36 100644
--- a/app/Language/nl-BE/Attributes.php
+++ b/app/Language/nl-BE/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attribuut waarde kan geen ':' of '|' bevatten",
-    "confirm_delete"                   => "Bent u zeker dat u de geselecteerde attributen wil verwijderen?",
-    "confirm_restore"                  => "Bent u zeker dat u de geselecteerde attributen wil herstellen?",
-    "definition_cannot_be_deleted"     => "De geselecteerde attributen konden niet verwijderd worden",
-    "definition_error_adding_updating" => "Attribuut {0} kon niet toegevoegd of gewijzigd worden. Kijk de error logs na.",
-    "definition_flags"                 => "Zichtbaarheid",
-    "definition_group"                 => "Groep",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Nieuw attribuut",
-    "definition_name_required"         => "Attribuut naam is een verplicht veld",
-    "definition_one_or_multiple"       => "Attribu(u)t(en)",
-    "definition_successful_adding"     => "Attribuut succesvol toegevoegd",
-    "definition_successful_deleted"    => "Attribu(u)t(en) succesvol verwijderd",
-    "definition_successful_updating"   => "Wijzigingen bewaard voor",
-    "definition_type"                  => "Type",
-    "definition_type_required"         => "Attribuut type is een verplicht veld",
-    "definition_unit"                  => "Meeteenheid",
-    "definition_values"                => "Attribuut waardes",
-    "new"                              => "Nieuw Attribuut",
-    "no_attributes_to_display"         => "Er werden geen attributen gevonden",
-    "receipt_visibility"               => "Verkoop",
-    "show_in_items"                    => "Toon in producten",
-    "show_in_items_visibility"         => "Producten",
-    "show_in_receipt"                  => "Toon in verkoop",
-    "show_in_receivings"               => "Toon in orders",
-    "show_in_receivings_visibility"    => "Orders",
-    "show_in_sales"                    => "Toon in verkoop",
-    "show_in_sales_visibility"         => "Verkoop",
-    "update"                           => "Wijzig Attribuut",
+    'attribute_value_invalid_chars'    => 'Attribuut waarde kan geen \':\' of \'|\' bevatten',
+    'confirm_delete'                   => 'Bent u zeker dat u de geselecteerde attributen wil verwijderen?',
+    'confirm_restore'                  => 'Bent u zeker dat u de geselecteerde attributen wil herstellen?',
+    'definition_cannot_be_deleted'     => 'De geselecteerde attributen konden niet verwijderd worden',
+    'definition_invalid_group' => 'De geselecteerde groep bestaat niet of is ongeldig.',
+    'definition_error_adding_updating' => 'Attribuut {0} kon niet toegevoegd of gewijzigd worden. Kijk de error logs na.',
+    'definition_flags'                 => 'Zichtbaarheid',
+    'definition_group'                 => 'Groep',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Nieuw attribuut',
+    'definition_name_required'         => 'Attribuut naam is een verplicht veld',
+    'definition_one_or_multiple'       => 'Attribu(u)t(en)',
+    'definition_successful_adding'     => 'Attribuut succesvol toegevoegd',
+    'definition_successful_deleted'    => 'Attribu(u)t(en) succesvol verwijderd',
+    'definition_successful_updating'   => 'Wijzigingen bewaard voor',
+    'definition_type'                  => 'Type',
+    'definition_type_required'         => 'Attribuut type is een verplicht veld',
+    'definition_unit'                  => 'Meeteenheid',
+    'definition_values'                => 'Attribuut waardes',
+    'new'                              => 'Nieuw Attribuut',
+    'no_attributes_to_display'         => 'Er werden geen attributen gevonden',
+    'receipt_visibility'               => 'Verkoop',
+    'show_in_items'                    => 'Toon in producten',
+    'show_in_items_visibility'         => 'Producten',
+    'show_in_receipt'                  => 'Toon in verkoop',
+    'show_in_receivings'               => 'Toon in orders',
+    'show_in_receivings_visibility'    => 'Orders',
+    'show_in_sales'                    => 'Toon in verkoop',
+    'show_in_sales_visibility'         => 'Verkoop',
+    'show_in_search'                   => 'Toon in zoeken',
+    'show_in_search_visibility'        => 'Zoeken',
+    'update'                           => 'Wijzig Attribuut',
 ];
diff --git a/app/Language/nl-BE/Bootstrap_tables.php b/app/Language/nl-BE/Bootstrap_tables.php
index ffa4628b9..160627fbe 100644
--- a/app/Language/nl-BE/Bootstrap_tables.php
+++ b/app/Language/nl-BE/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "alle",
-    "columns"              => "Kolommen",
-    "hide_show_pagination" => "Toon %s record(s)",
-    "loading"              => "Laden, even geduld...",
-    "page_from_to"         => "Toon {0} tot {1} van {2} record(s)",
-    "refresh"              => "Vernieuwen",
-    "rows_per_page"        => "{0} records per pagina",
-    "toggle"               => "Omschakelen",
+    'all' => "alle",
+    'columns' => "Kolommen",
+    'hide_show_pagination' => "Toon %s record(s)",
+    'loading' => "Laden, even geduld",
+    'page_from_to' => "Toon {0} tot {1} van {2} record(s)",
+    'refresh' => "Vernieuwen",
+    'rows_per_page' => "{0} records per pagina",
+    'toggle' => "Omschakelen",
 ];
diff --git a/app/Language/nl-BE/Config.php b/app/Language/nl-BE/Config.php
index ad31fac06..b7432069a 100644
--- a/app/Language/nl-BE/Config.php
+++ b/app/Language/nl-BE/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adres",
-    "address_required"                          => "Het adres van het bedrijf moet ingevuld worden.",
-    "all_set"                                   => "All permissies zijn correct ingesteld!",
-    "allow_duplicate_barcodes"                  => "Sta gedupliceerde barcodes toe",
-    "apostrophe"                                => "apostrof",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "Streepjescode",
-    "barcode_company"                           => "Bedrijfsnaam",
-    "barcode_configuration"                     => "Barcode Configuratie",
-    "barcode_content"                           => "Inhoud Barcode",
-    "barcode_first_row"                         => "Rij 1",
-    "barcode_font"                              => "Lettertype",
-    "barcode_formats"                           => "Barcode Formaat",
-    "barcode_generate_if_empty"                 => "Genereer indien leeg.",
-    "barcode_height"                            => "Hoogte (px)",
-    "barcode_id"                                => "Product id/naam",
-    "barcode_info"                              => "Barcode instellingen",
-    "barcode_layout"                            => "Streepjescode-indeling",
-    "barcode_name"                              => "Productnaam",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Aantal per rij",
-    "barcode_page_cellspacing"                  => "Toon cellspatiëring.",
-    "barcode_page_width"                        => "Toon paginabreedte",
-    "barcode_price"                             => "Prijs",
-    "barcode_second_row"                        => "Rij 2",
-    "barcode_third_row"                         => "Rij 3",
-    "barcode_tooltip"                           => "Waarschuwing: Deze functie kan ertoe leiden dat er dubbele artikels worden geïmporteerd of aangemaakt. Niet gebruiken als u geen dubbele streepjescodes wilt.",
-    "barcode_type"                              => "Type Barcode",
-    "barcode_width"                             => "Breedte (px)",
-    "bottom"                                    => "Bodem",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Cash precisie",
-    "cash_decimals_tooltip"                     => "Als cash en currency precies niet hetzelfde zijn dan zal er geena afronding gebeuren.",
-    "cash_rounding"                             => "Cash Afronding",
-    "category_dropdown"                         => "Toon categorie als dropdown",
-    "center"                                    => "Midden",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "komma",
-    "company"                                   => "Bedrijfsnaam",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Selecteer Afbeelding",
-    "company_logo"                              => "Logo",
-    "company_remove_image"                      => "Verwijder Afbeelding",
-    "company_required"                          => "De bedrijfsnaam moet ingevuld worden",
-    "company_select_image"                      => "Selecteer Afbeelding",
-    "company_website_url"                       => "De website van het bedrijf is geen geldige URL (http://...).",
-    "country_codes"                             => "Land Codes",
-    "country_codes_tooltip"                     => "Komma's gescheiden lijst van landencodes voor het op naam opzoeken van het adres opzoeken.",
-    "currency_code"                             => "Munteenheid",
-    "currency_decimals"                         => "Valuta decimalen",
-    "currency_symbol"                           => "Valuta",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Punten",
-    "customer_reward_duplicate"                 => "Spaarpunten moeten uniek zijn.",
-    "customer_reward_enable"                    => "Activeer Spaarpunten",
-    "customer_reward_invalid_chars"             => "Spaarpunten kunnen geen '_' bevatten",
-    "customer_reward_required"                  => "Spaarpunten is een verplicht veld",
-    "customer_sales_tax_support"                => "Klant fiscale support",
-    "date_or_time_format"                       => "Datum en tijd filter",
-    "datetimeformat"                            => "Datum en tijd formaat",
-    "decimal_point"                             => "Decimale punt",
-    "default_barcode_font_size_number"          => "De barcode font grootte moet een getal zijn.",
-    "default_barcode_font_size_required"        => "De barcode font grootte is een verplicht veld.",
-    "default_barcode_height_number"             => "De barcode grootte moet een getal zijn.",
-    "default_barcode_height_required"           => "De barcode grootte is een verplicht veld.",
-    "default_barcode_num_in_row_number"         => "De barcode nummering moet een getal zijn.",
-    "default_barcode_num_in_row_required"       => "De barcode nummering is een verplicht veld.",
-    "default_barcode_page_cellspacing_number"   => "De barcode cellspatiëring moet een getal zijn.",
-    "default_barcode_page_cellspacing_required" => "De barcode pagina spatiëring is een verplicht veld.",
-    "default_barcode_page_width_number"         => "Standaardbreedte van de streepjescodepagina moet een getal zijn.",
-    "default_barcode_page_width_required"       => "De barcode breedte is een verplicht veld.",
-    "default_barcode_width_number"              => "De breedte van de barcode moet een getal zijn.",
-    "default_barcode_width_required"            => "De breedte van de barcode is een verplicht veld.",
-    "default_item_columns"                      => "Standaard Zichtbaarheid Kolommen",
-    "default_origin_tax_code"                   => "Standaard VAT code",
-    "default_receivings_discount"               => "Standaard Korting Orders",
-    "default_receivings_discount_number"        => "De korting moet een getal zijn.",
-    "default_receivings_discount_required"      => "De korting is een verplicht veld.",
-    "default_sales_discount"                    => "Standaard Korting Verkoop",
-    "default_sales_discount_number"             => "De korting moet een getal zijn.",
-    "default_sales_discount_required"           => "De korting is een verplicht veld.",
-    "default_tax_category"                      => "Standaard Tax Categorie",
-    "default_tax_code"                          => "Standaard Tax Code",
-    "default_tax_jurisdiction"                  => "Standaard Tax District",
-    "default_tax_name_number"                   => "Standaard VAT naam moet een string zijn.",
-    "default_tax_name_required"                 => "De naam van de VAT moet ingevuld worden.",
-    "default_tax_rate"                          => "Standaard VAT %",
-    "default_tax_rate_1"                        => "VAT 1 %",
-    "default_tax_rate_2"                        => "VAT 2 %",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Het percentage VAT moet een nummer zijn.",
-    "default_tax_rate_required"                 => "Het percentage VAT is een verplicht veld.",
-    "derive_sale_quantity"                      => "Laat Verkoop Afgeleide Hoeveelheid toe",
-    "derive_sale_quantity_tooltip"              => "Indien aangevinkt zal er een nieuw item type voorzien worden om items te ordenen",
-    "dinner_table"                              => "Tafel",
-    "dinner_table_duplicate"                    => "Tafel moet uniek zijn.",
-    "dinner_table_enable"                       => "Activeer Restomode",
-    "dinner_table_invalid_chars"                => "Tafel Naam kan geen '_' bevatten.",
-    "dinner_table_required"                     => "Tafel is een verplicht veld.",
-    "dot"                                       => "punt",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Pad naar Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Email Ticket",
-    "email_receipt_check_behaviour_always"      => "Altijd aan",
-    "email_receipt_check_behaviour_last"        => "Onthoud de laatste selectie",
-    "email_receipt_check_behaviour_never"       => "Altijd uitgetikt",
-    "email_smtp_crypto"                         => "SMTP Encryptie",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Wachtwoord",
-    "email_smtp_port"                           => "SMTP Poort",
-    "email_smtp_timeout"                        => "SMTP Time-out (s)",
-    "email_smtp_user"                           => "SMTP Gebruikersnaam",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Vereis privacy",
-    "enforce_privacy_tooltip"                   => "Bescherm klanten hun privacy door data obfuscatie toe te passen in geval van verwijdering",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "Er zijn problemen met de bestandsrechten, herstel ze en herlaad deze pagina.",
-    "financial_year"                            => "Start boekjaar",
-    "financial_year_apr"                        => "Eerste april",
-    "financial_year_aug"                        => "Eerste augustus",
-    "financial_year_dec"                        => "Eerste december",
-    "financial_year_feb"                        => "Eerste februari",
-    "financial_year_jan"                        => "Eerste januari",
-    "financial_year_jul"                        => "Eerste juli",
-    "financial_year_jun"                        => "Eerste juni",
-    "financial_year_mar"                        => "Eerste maart",
-    "financial_year_may"                        => "Eerste mei",
-    "financial_year_nov"                        => "Eerste november",
-    "financial_year_oct"                        => "Eerste oktober",
-    "financial_year_sep"                        => "Eerste september",
-    "floating_labels"                           => "Variabele Etiketten",
-    "gcaptcha_enable"                           => "Login Pagina reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA sleutel",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA sleutel is een verplicht veld",
-    "gcaptcha_site_key"                         => "reCAPTCHA site sleutel",
-    "gcaptcha_site_key_required"                => "reCAPTCHA site sleutel is een verplicht veld",
-    "gcaptcha_tooltip"                          => "Bescherm de login pagina met Google reCAPTCHA, klik op het icoon voor een API key pair.",
-    "general"                                   => "Algemene",
-    "general_configuration"                     => "Algemene Instellingen",
-    "giftcard_number"                           => "Cadeaubon Nummer",
-    "giftcard_random"                           => "Genereer Willekeurig",
-    "giftcard_series"                           => "Genereer in volgorde",
-    "image_allowed_file_types"                  => "Toegelaten bestandstypes",
-    "image_max_height_tooltip"                  => "Maximum toegelaten hoogte voor afbeeldingen in pixels (px).",
-    "image_max_size_tooltip"                    => "Maximum toegelaten bestandsgrootte voor afbeeldingen in kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Maximum toegelaten breedte voor afbeeldingen in pixels (px).",
-    "image_restrictions"                        => "Upload Instellingen voor Afbeeldingen",
-    "include_hsn"                               => "Ondersteuning voor HSN Codes",
-    "info"                                      => "Instellingen",
-    "info_configuration"                        => "Instellingen",
-    "input_groups"                              => "Invoer Groepen",
-    "integrations"                              => "Integraties",
-    "integrations_configuration"                => "Integraties",
-    "invoice"                                   => "Factuur",
-    "invoice_configuration"                     => "Print Instellingen",
-    "invoice_default_comments"                  => "Factuur Mededeling",
-    "invoice_email_message"                     => "Factuur Email Sjabloon",
-    "invoice_enable"                            => "Factureren inschakelen",
-    "invoice_printer"                           => "Factuur Printer",
-    "invoice_type"                              => "Factuur Type",
-    "is_readable"                               => "kan gelezen worden, maar de permissies zijn niet correct. Zet deze op 640 of 660 en vernieuw.",
-    "is_writable"                               => "kan beschreven worden, maar de permissies zijn niet correct. Zet deze op 750 en vernieuw.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Opgelet! De uitgeschakelde functionaliteit werkt enkel met de jsPrintSetup addon in Firefox. Toch opslaan?",
-    "language"                                  => "Taal",
-    "last_used_invoice_number"                  => "Laatst gebruikte factuurnummer",
-    "last_used_quote_number"                    => "Laatst gebruikte offertenummer",
-    "last_used_work_order_number"               => "Laatst gebruikte werkordernummer",
-    "left"                                      => "Links",
-    "license"                                   => "Licentie",
-    "license_configuration"                     => "Licentie Verklaring",
-    "line_sequence"                             => "Lijn nummer",
-    "lines_per_page"                            => "Lijnen Per Pagina",
-    "lines_per_page_number"                     => "Regels per pagina moet een nummer zijn.",
-    "lines_per_page_required"                   => "Regels per pagina is een verplicht veld.",
-    "locale"                                    => "Locatie",
-    "locale_configuration"                      => "Locatie Configuratie",
-    "locale_info"                               => "Locatie Configuratie Informatie",
-    "location"                                  => "Voorraad",
-    "location_configuration"                    => "Stock Locaties",
-    "location_info"                             => "Instellingen Locatie",
-    "login_form"                                => "Inlogformulier Stijl",
-    "logout"                                    => "Wilt u een backup maken alvorens uit te loggen? Klik [OK] voor backup of [Annuleer] om uit te loggen.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "MailChimp API Sleutel",
-    "mailchimp_configuration"                   => "MailChimp Configuratie",
-    "mailchimp_key_successfully"                => "API sleutel is geldig.",
-    "mailchimp_key_unsuccessfully"              => "API sleutel is ongeldig.",
-    "mailchimp_lists"                           => "MailChimp Lijst(en)",
-    "mailchimp_tooltip"                         => "Klik op het icoon voor een API sleutel.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Opgeslagen SMS-bericht",
-    "msg_msg_placeholder"                       => "Wilt u gebruik maken van een SMS-sjabloon? sla hier uw bericht op. Laat ander het vak leeg.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Wachtwoord is een verplicht veld",
-    "msg_src"                                   => "SMS-API Verzender ID",
-    "msg_src_required"                          => "SMS-API Verzender ID is een verplicht veld",
-    "msg_uid"                                   => "SMS-API Gebruikersnaam",
-    "msg_uid_required"                          => "SMS-API Gebruikersnaam is een verplicht veld",
-    "multi_pack_enabled"                        => "Multipack Ingeschakeld",
-    "no_risk"                                   => "Geen veiligheids-/kwetsbaarheidsrisico's.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notificatie Pop-up positie",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localisation",
-    "number_locale_invalid"                     => "De ingevoerde locatie is ongeldig. Controleer de link in de tooltip om een geldige waarde te vinden.",
-    "number_locale_required"                    => "Nummer formaat is een verplicht veld.",
-    "number_locale_tooltip"                     => "Vind een geldig formaat via deze link.",
-    "os_timezone"                               => "OSPOS Tijdzone:",
-    "ospos_info"                                => "OSPOS Installatiegegevens",
-    "payment_options_order"                     => "Betaal opties volgorde",
-    "perm_risk"                                 => "Verkeerd ingestelde permissies vormen een beveiligingsrisico.",
-    "phone"                                     => "Telefoon",
-    "phone_required"                            => "De telefoonnummer van het bedrijf is een verplicht veld.",
-    "print_bottom_margin"                       => "Marge Beneden",
-    "print_bottom_margin_number"                => "De ondermarge moet een getal zijn.",
-    "print_bottom_margin_required"              => "De ondermarge is een verplicht veld.",
-    "print_delay_autoreturn"                    => "Automatische retour voor vertraagde verkoop",
-    "print_delay_autoreturn_number"             => "Automatische retour voor vertraagde verkoop is een verplicht veld.",
-    "print_delay_autoreturn_required"           => "Automatische retour voor vertraagde verkoop moet een cijfer zijn.",
-    "print_footer"                              => "Print browser voettekst",
-    "print_header"                              => "Print browser koptekst",
-    "print_left_margin"                         => "Marge Links",
-    "print_left_margin_number"                  => "De linkermarge moet een getal zijn.",
-    "print_left_margin_required"                => "De linkermarge is een verplicht veld.",
-    "print_receipt_check_behaviour"             => "Print Ticket selectievakje",
-    "print_receipt_check_behaviour_always"      => "Altijd aangevinkt",
-    "print_receipt_check_behaviour_last"        => "Onthoud laatste selectie",
-    "print_receipt_check_behaviour_never"       => "Altijd uitgetikt",
-    "print_right_margin"                        => "Marge Rechts",
-    "print_right_margin_number"                 => "De rechtermarge moet een getal zijn.",
-    "print_right_margin_required"               => "De rechtermarge is een verplicht veld.",
-    "print_silently"                            => "Toon Printvenster",
-    "print_top_margin"                          => "Marge Boven",
-    "print_top_margin_number"                   => "De bovenmarge moet een getal zijn.",
-    "print_top_margin_required"                 => "De bovenmarge is een verplicht veld.",
-    "quantity_decimals"                         => "Kwantiteit Decimalen",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Standaard Offerte Commentaar",
-    "receipt"                                   => "Ontvangst",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Print Instellingen",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font grootte",
-    "receipt_font_size_number"                  => "Font grootte moet een nummer zijn.",
-    "receipt_font_size_required"                => "Font grootte is een verplicht veld.",
-    "receipt_info"                              => "Ticket Instellingen",
-    "receipt_printer"                           => "Bon Printer",
-    "receipt_short"                             => "Kort",
-    "receipt_show_company_name"                 => "Toon bedrijfsnaam",
-    "receipt_show_description"                  => "Laat beschrijving zien",
-    "receipt_show_serialnumber"                 => "Toon Serienummer",
-    "receipt_show_tax_ind"                      => "Toon Tax Indicator",
-    "receipt_show_taxes"                        => "Toon VAT",
-    "receipt_show_total_discount"               => "Toon Totale Korting",
-    "receipt_template"                          => "Bon sjabloon",
-    "receiving_calculate_average_price"         => "Bereken gem. Prijs (Ontvangend)",
-    "recv_invoice_format"                       => "Formattering Order #",
-    "register_mode_default"                     => "Standaard kassa mode",
-    "report_an_issue"                           => "Rapporteer een probleem",
-    "return_policy_required"                    => "De retourvoorwaarden moeten ingevuld worden.",
-    "reward"                                    => "Spaarpunten",
-    "reward_configuration"                      => "Spaarpunten configuratie",
-    "right"                                     => "Rechts",
-    "sales_invoice_format"                      => "Formattering Aankoop #",
-    "sales_quote_format"                        => "Offerte formaat",
-    "saved_successfully"                        => "Configuratie werd bewaard.",
-    "saved_unsuccessfully"                      => "Configuratie kon niet worden bewaard.",
-    "security_issue"                            => "Waarschuwing voor Veiligheidslek",
-    "server_notice"                             => "Gebruik de onderstaande info voor het melden van problemen.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Toon kantoor icoon",
-    "statistics"                                => "Verstuur statistieken",
-    "statistics_tooltip"                        => "Verstuur statistieken voor ontwikkeling en verbetering van de applicatie.",
-    "stock_location"                            => "Stock locatie",
-    "stock_location_duplicate"                  => "Vul een unieke naam in.",
-    "stock_location_invalid_chars"              => "Stock locatie kan geen '_' bevatten.",
-    "stock_location_required"                   => "Naam van de stock locatie is een verplicht veld.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Kolom 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Zoek Suggesties Layout",
-    "suggestions_second_column"                 => "Kolom 2",
-    "suggestions_third_column"                  => "Kolom 3",
-    "system_conf"                               => "Instelling en Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Tafel",
-    "table_configuration"                       => "Tafel Configuratie",
-    "takings_printer"                           => "Ontvangst Printer",
-    "tax"                                       => "VAT",
-    "tax_category"                              => "VAT Categorie",
-    "tax_category_duplicate"                    => "De ingevulde VAT categorie bestaat al.",
-    "tax_category_invalid_chars"                => "De ingevulde VAT categorie is ongeldig.",
-    "tax_category_required"                     => "De VAT categorie is verplicht.",
-    "tax_category_used"                         => "De VAT categorie kan niet verwijderd worden omdat die in gebruik is.",
-    "tax_configuration"                         => "VAT Configuratie",
-    "tax_decimals"                              => "Belasting Decimalen",
-    "tax_id"                                    => "Tax id",
-    "tax_included"                              => "VAT Inbegrepen",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "Voorbeeld Thema:",
-    "thousands_separator"                       => "duizenden Separator",
-    "timezone"                                  => "Tijdzone",
-    "timezone_error"                            => "OSPOS tijdzone is verschillend van uw lokale tijdzone.",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Activeer 'Destination Based Tax'",
-    "user_timezone"                             => "Lokale tijdzone:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Werk Order Ondersteuning",
-    "work_order_format"                         => "Werk Order Formaat",
+    'address'                                   => 'Adres',
+    'address_required'                          => 'Het adres van het bedrijf moet ingevuld worden.',
+    'all_set'                                   => 'All permissies zijn correct ingesteld!',
+    'allow_duplicate_barcodes'                  => 'Sta gedupliceerde barcodes toe',
+    'apostrophe'                                => 'apostrof',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => 'Streepjescode',
+    'barcode_company'                           => 'Bedrijfsnaam',
+    'barcode_configuration'                     => 'Barcode Configuratie',
+    'barcode_content'                           => 'Inhoud Barcode',
+    'barcode_first_row'                         => 'Rij 1',
+    'barcode_font'                              => 'Lettertype',
+    'barcode_formats'                           => 'Barcode Formaat',
+    'barcode_generate_if_empty'                 => 'Genereer indien leeg.',
+    'barcode_height'                            => 'Hoogte (px)',
+    'barcode_id'                                => 'Product id/naam',
+    'barcode_info'                              => 'Barcode instellingen',
+    'barcode_layout'                            => 'Streepjescode-indeling',
+    'barcode_name'                              => 'Productnaam',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Aantal per rij',
+    'barcode_page_cellspacing'                  => 'Toon cellspatiëring.',
+    'barcode_page_width'                        => 'Toon paginabreedte',
+    'barcode_price'                             => 'Prijs',
+    'barcode_second_row'                        => 'Rij 2',
+    'barcode_third_row'                         => 'Rij 3',
+    'barcode_tooltip'                           => 'Waarschuwing: Deze functie kan ertoe leiden dat er dubbele artikels worden geïmporteerd of aangemaakt. Niet gebruiken als u geen dubbele streepjescodes wilt.',
+    'barcode_type'                              => 'Type Barcode',
+    'barcode_width'                             => 'Breedte (px)',
+    'bottom'                                    => 'Bodem',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Cash precisie',
+    'cash_decimals_tooltip'                     => 'Als cash en currency precies niet hetzelfde zijn dan zal er geena afronding gebeuren.',
+    'cash_rounding'                             => 'Cash Afronding',
+    'category_dropdown'                         => 'Toon categorie als dropdown',
+    'center'                                    => 'Midden',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'komma',
+    'company'                                   => 'Bedrijfsnaam',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Selecteer Afbeelding',
+    'company_logo'                              => 'Logo',
+    'company_remove_image'                      => 'Verwijder Afbeelding',
+    'company_required'                          => 'De bedrijfsnaam moet ingevuld worden',
+    'company_select_image'                      => 'Selecteer Afbeelding',
+    'company_website_url'                       => 'De website van het bedrijf is geen geldige URL (http://...).',
+    'country_codes'                             => 'Land Codes',
+    'country_codes_tooltip'                     => "Komma's gescheiden lijst van landencodes voor het op naam opzoeken van het adres opzoeken.",
+    'currency_code'                             => 'Munteenheid',
+    'currency_decimals'                         => 'Valuta decimalen',
+    'currency_symbol'                           => 'Valuta',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Punten',
+    'customer_reward_duplicate'                 => 'Spaarpunten moeten uniek zijn.',
+    'customer_reward_enable'                    => 'Activeer Spaarpunten',
+    'customer_reward_invalid_chars'             => "Spaarpunten kunnen geen '_' bevatten",
+    'customer_reward_required'                  => 'Spaarpunten is een verplicht veld',
+    'customer_sales_tax_support'                => 'Klant fiscale support',
+    'date_or_time_format'                       => 'Datum en tijd filter',
+    'datetimeformat'                            => 'Datum en tijd formaat',
+    'decimal_point'                             => 'Decimale punt',
+    'default_barcode_font_size_number'          => 'De barcode font grootte moet een getal zijn.',
+    'default_barcode_font_size_required'        => 'De barcode font grootte is een verplicht veld.',
+    'default_barcode_height_number'             => 'De barcode grootte moet een getal zijn.',
+    'default_barcode_height_required'           => 'De barcode grootte is een verplicht veld.',
+    'default_barcode_num_in_row_number'         => 'De barcode nummering moet een getal zijn.',
+    'default_barcode_num_in_row_required'       => 'De barcode nummering is een verplicht veld.',
+    'default_barcode_page_cellspacing_number'   => 'De barcode cellspatiëring moet een getal zijn.',
+    'default_barcode_page_cellspacing_required' => 'De barcode pagina spatiëring is een verplicht veld.',
+    'default_barcode_page_width_number'         => 'Standaardbreedte van de streepjescodepagina moet een getal zijn.',
+    'default_barcode_page_width_required'       => 'De barcode breedte is een verplicht veld.',
+    'default_barcode_width_number'              => 'De breedte van de barcode moet een getal zijn.',
+    'default_barcode_width_required'            => 'De breedte van de barcode is een verplicht veld.',
+    'default_item_columns'                      => 'Standaard Zichtbaarheid Kolommen',
+    'default_origin_tax_code'                   => 'Standaard VAT code',
+    'default_receivings_discount'               => 'Standaard Korting Orders',
+    'default_receivings_discount_number'        => 'De korting moet een getal zijn.',
+    'default_receivings_discount_required'      => 'De korting is een verplicht veld.',
+    'default_sales_discount'                    => 'Standaard Korting Verkoop',
+    'default_sales_discount_number'             => 'De korting moet een getal zijn.',
+    'default_sales_discount_required'           => 'De korting is een verplicht veld.',
+    'default_tax_category'                      => 'Standaard Tax Categorie',
+    'default_tax_code'                          => 'Standaard Tax Code',
+    'default_tax_jurisdiction'                  => 'Standaard Tax District',
+    'default_tax_name_number'                   => 'Standaard VAT naam moet een string zijn.',
+    'default_tax_name_required'                 => 'De naam van de VAT moet ingevuld worden.',
+    'default_tax_rate'                          => 'Standaard VAT %',
+    'default_tax_rate_1'                        => 'VAT 1 %',
+    'default_tax_rate_2'                        => 'VAT 2 %',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Het percentage VAT moet een nummer zijn.',
+    'default_tax_rate_required'                 => 'Het percentage VAT is een verplicht veld.',
+    'derive_sale_quantity'                      => 'Laat Verkoop Afgeleide Hoeveelheid toe',
+    'derive_sale_quantity_tooltip'              => 'Indien aangevinkt zal er een nieuw item type voorzien worden om items te ordenen',
+    'dinner_table'                              => 'Tafel',
+    'dinner_table_duplicate'                    => 'Tafel moet uniek zijn.',
+    'dinner_table_enable'                       => 'Activeer Restomode',
+    'dinner_table_invalid_chars'                => "Tafel Naam kan geen '_' bevatten.",
+    'dinner_table_required'                     => 'Tafel is een verplicht veld.',
+    'dot'                                       => 'punt',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Pad naar Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Email Ticket',
+    'email_receipt_check_behaviour_always'      => 'Altijd aan',
+    'email_receipt_check_behaviour_last'        => 'Onthoud de laatste selectie',
+    'email_receipt_check_behaviour_never'       => 'Altijd uitgetikt',
+    'email_smtp_crypto'                         => 'SMTP Encryptie',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Wachtwoord',
+    'email_smtp_port'                           => 'SMTP Poort',
+    'email_smtp_timeout'                        => 'SMTP Time-out (s)',
+    'email_smtp_user'                           => 'SMTP Gebruikersnaam',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Vereis privacy',
+    'enforce_privacy_tooltip'                   => 'Bescherm klanten hun privacy door data obfuscatie toe te passen in geval van verwijdering',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'Er zijn problemen met de bestandsrechten, herstel ze en herlaad deze pagina.',
+    'financial_year'                            => 'Start boekjaar',
+    'financial_year_apr'                        => 'Eerste april',
+    'financial_year_aug'                        => 'Eerste augustus',
+    'financial_year_dec'                        => 'Eerste december',
+    'financial_year_feb'                        => 'Eerste februari',
+    'financial_year_jan'                        => 'Eerste januari',
+    'financial_year_jul'                        => 'Eerste juli',
+    'financial_year_jun'                        => 'Eerste juni',
+    'financial_year_mar'                        => 'Eerste maart',
+    'financial_year_may'                        => 'Eerste mei',
+    'financial_year_nov'                        => 'Eerste november',
+    'financial_year_oct'                        => 'Eerste oktober',
+    'financial_year_sep'                        => 'Eerste september',
+    'floating_labels'                           => 'Variabele Etiketten',
+    'gcaptcha_enable'                           => 'Login Pagina reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA sleutel',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA sleutel is een verplicht veld',
+    'gcaptcha_site_key'                         => 'reCAPTCHA site sleutel',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA site sleutel is een verplicht veld',
+    'gcaptcha_tooltip'                          => 'Bescherm de login pagina met Google reCAPTCHA, klik op het icoon voor een API key pair.',
+    'general'                                   => 'Algemene',
+    'general_configuration'                     => 'Algemene Instellingen',
+    'giftcard_number'                           => 'Cadeaubon Nummer',
+    'giftcard_random'                           => 'Genereer Willekeurig',
+    'giftcard_series'                           => 'Genereer in volgorde',
+    'image_allowed_file_types'                  => 'Toegelaten bestandstypes',
+    'image_max_height_tooltip'                  => 'Maximum toegelaten hoogte voor afbeeldingen in pixels (px).',
+    'image_max_size_tooltip'                    => 'Maximum toegelaten bestandsgrootte voor afbeeldingen in kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Maximum toegelaten breedte voor afbeeldingen in pixels (px).',
+    'image_restrictions'                        => 'Upload Instellingen voor Afbeeldingen',
+    'include_hsn'                               => 'Ondersteuning voor HSN Codes',
+    'info'                                      => 'Instellingen',
+    'info_configuration'                        => 'Instellingen',
+    'input_groups'                              => 'Invoer Groepen',
+    'integrations'                              => 'Integraties',
+    'integrations_configuration'                => 'Integraties',
+    'invoice'                                   => 'Factuur',
+    'invoice_configuration'                     => 'Print Instellingen',
+    'invoice_default_comments'                  => 'Factuur Mededeling',
+    'invoice_email_message'                     => 'Factuur Email Sjabloon',
+    'invoice_enable'                            => 'Factureren inschakelen',
+    'invoice_printer'                           => 'Factuur Printer',
+    'invoice_type'                              => 'Factuur Type',
+    'is_readable'                               => 'kan gelezen worden, maar de permissies zijn niet correct. Zet deze op 640 of 660 en vernieuw.',
+    'is_writable'                               => 'kan beschreven worden, maar de permissies zijn niet correct. Zet deze op 750 en vernieuw.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Opgelet! De uitgeschakelde functionaliteit werkt enkel met de jsPrintSetup addon in Firefox. Toch opslaan?',
+    'language'                                  => 'Taal',
+    'last_used_invoice_number'                  => 'Laatst gebruikte factuurnummer',
+    'last_used_quote_number'                    => 'Laatst gebruikte offertenummer',
+    'last_used_work_order_number'               => 'Laatst gebruikte werkordernummer',
+    'left'                                      => 'Links',
+    'license'                                   => 'Licentie',
+    'license_configuration'                     => 'Licentie Verklaring',
+    'line_sequence'                             => 'Lijn nummer',
+    'lines_per_page'                            => 'Lijnen Per Pagina',
+    'lines_per_page_number'                     => 'Regels per pagina moet een nummer zijn.',
+    'lines_per_page_required'                   => 'Regels per pagina is een verplicht veld.',
+    'locale'                                    => 'Locatie',
+    'locale_configuration'                      => 'Locatie Configuratie',
+    'locale_info'                               => 'Locatie Configuratie Informatie',
+    'location'                                  => 'Voorraad',
+    'location_configuration'                    => 'Stock Locaties',
+    'location_info'                             => 'Instellingen Locatie',
+    'login_form'                                => 'Inlogformulier Stijl',
+    'logout'                                    => 'Wilt u een backup maken alvorens uit te loggen? Klik [OK] voor backup of [Annuleer] om uit te loggen.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'MailChimp API Sleutel',
+    'mailchimp_configuration'                   => 'MailChimp Configuratie',
+    'mailchimp_key_successfully'                => 'API sleutel is geldig.',
+    'mailchimp_key_unsuccessfully'              => 'API sleutel is ongeldig.',
+    'mailchimp_lists'                           => 'MailChimp Lijst(en)',
+    'mailchimp_tooltip'                         => 'Klik op het icoon voor een API sleutel.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Opgeslagen SMS-bericht',
+    'msg_msg_placeholder'                       => 'Wilt u gebruik maken van een SMS-sjabloon? sla hier uw bericht op. Laat ander het vak leeg.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Verzender ID',
+    'msg_src_required'                          => 'SMS-API Verzender ID is een verplicht veld',
+    'msg_uid'                                   => 'SMS-API Gebruikersnaam',
+    'msg_uid_required'                          => 'SMS-API Gebruikersnaam is een verplicht veld',
+    'multi_pack_enabled'                        => 'Multipack Ingeschakeld',
+    'no_risk'                                   => "Geen veiligheids-/kwetsbaarheidsrisico's.",
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notificatie Pop-up positie',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localisation',
+    'number_locale_invalid'                     => 'De ingevoerde locatie is ongeldig. Controleer de link in de tooltip om een geldige waarde te vinden.',
+    'number_locale_required'                    => 'Nummer formaat is een verplicht veld.',
+    'number_locale_tooltip'                     => 'Vind een geldig formaat via deze link.',
+    'os_timezone'                               => 'OSPOS Tijdzone:',
+    'ospos_info'                                => 'OSPOS Installatiegegevens',
+    'payment_options_order'                     => 'Betaal opties volgorde',
+    'payment_reference_code_length_limits'      => 'Betalingsreferentiecode<br>Lengtelimieten',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Verkeerd ingestelde permissies vormen een beveiligingsrisico.',
+    'phone'                                     => 'Telefoon',
+    'phone_required'                            => 'De telefoonnummer van het bedrijf is een verplicht veld.',
+    'print_bottom_margin'                       => 'Marge Beneden',
+    'print_bottom_margin_number'                => 'De ondermarge moet een getal zijn.',
+    'print_bottom_margin_required'              => 'De ondermarge is een verplicht veld.',
+    'print_delay_autoreturn'                    => 'Automatische retour voor vertraagde verkoop',
+    'print_delay_autoreturn_number'             => 'Automatische retour voor vertraagde verkoop is een verplicht veld.',
+    'print_delay_autoreturn_required'           => 'Automatische retour voor vertraagde verkoop moet een cijfer zijn.',
+    'print_footer'                              => 'Print browser voettekst',
+    'print_header'                              => 'Print browser koptekst',
+    'print_left_margin'                         => 'Marge Links',
+    'print_left_margin_number'                  => 'De linkermarge moet een getal zijn.',
+    'print_left_margin_required'                => 'De linkermarge is een verplicht veld.',
+    'print_receipt_check_behaviour'             => 'Print Ticket selectievakje',
+    'print_receipt_check_behaviour_always'      => 'Altijd aangevinkt',
+    'print_receipt_check_behaviour_last'        => 'Onthoud laatste selectie',
+    'print_receipt_check_behaviour_never'       => 'Altijd uitgetikt',
+    'print_right_margin'                        => 'Marge Rechts',
+    'print_right_margin_number'                 => 'De rechtermarge moet een getal zijn.',
+    'print_right_margin_required'               => 'De rechtermarge is een verplicht veld.',
+    'print_silently'                            => 'Toon Printvenster',
+    'print_top_margin'                          => 'Marge Boven',
+    'print_top_margin_number'                   => 'De bovenmarge moet een getal zijn.',
+    'print_top_margin_required'                 => 'De bovenmarge is een verplicht veld.',
+    'quantity_decimals'                         => 'Kwantiteit Decimalen',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Standaard Offerte Commentaar',
+    'receipt'                                   => 'Ontvangst',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Print Instellingen',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font grootte',
+    'receipt_font_size_number'                  => 'Font grootte moet een nummer zijn.',
+    'receipt_font_size_required'                => 'Font grootte is een verplicht veld.',
+    'receipt_info'                              => 'Ticket Instellingen',
+    'receipt_printer'                           => 'Bon Printer',
+    'receipt_short'                             => 'Kort',
+    'receipt_show_company_name'                 => 'Toon bedrijfsnaam',
+    'receipt_show_description'                  => 'Laat beschrijving zien',
+    'receipt_show_serialnumber'                 => 'Toon Serienummer',
+    'receipt_show_tax_ind'                      => 'Toon Tax Indicator',
+    'receipt_show_taxes'                        => 'Toon VAT',
+    'receipt_show_total_discount'               => 'Toon Totale Korting',
+    'receipt_template'                          => 'Bon sjabloon',
+    'receiving_calculate_average_price'         => 'Bereken gem. Prijs (Ontvangend)',
+    'recv_invoice_format'                       => 'Formattering Order #',
+    'register_mode_default'                     => 'Standaard kassa mode',
+    'report_an_issue'                           => 'Rapporteer een probleem',
+    'return_policy_required'                    => 'De retourvoorwaarden moeten ingevuld worden.',
+    'reward'                                    => 'Spaarpunten',
+    'reward_configuration'                      => 'Spaarpunten configuratie',
+    'right'                                     => 'Rechts',
+    'sales_invoice_format'                      => 'Formattering Aankoop #',
+    'sales_quote_format'                        => 'Offerte formaat',
+    'mailpath_invalid'                          => 'Ongeldig sendmail-pad. Enkel letters, cijfers, streepjes, onderstrepingstekens, schuine strepen, omgekeerde schuine strepen, dubbele punten, spaties en punten zijn toegelaten.',
+    'saved_successfully'                        => 'Configuratie werd bewaard.',
+    'saved_unsuccessfully'                      => 'Configuratie kon niet worden bewaard.',
+    'security_issue'                            => 'Waarschuwing voor Veiligheidslek',
+    'server_notice'                             => 'Gebruik de onderstaande info voor het melden van problemen.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Toon kantoor icoon',
+    'statistics'                                => 'Verstuur statistieken',
+    'statistics_tooltip'                        => 'Verstuur statistieken voor ontwikkeling en verbetering van de applicatie.',
+    'stock_location'                            => 'Stock locatie',
+    'stock_location_duplicate'                  => 'Vul een unieke naam in.',
+    'stock_location_invalid_chars'              => "Stock locatie kan geen '_' bevatten.",
+    'stock_location_required'                   => 'Naam van de stock locatie is een verplicht veld.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Kolom 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Zoek Suggesties Layout',
+    'suggestions_second_column'                 => 'Kolom 2',
+    'suggestions_third_column'                  => 'Kolom 3',
+    'system_conf'                               => 'Instelling en Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Tafel',
+    'table_configuration'                       => 'Tafel Configuratie',
+    'takings_printer'                           => 'Ontvangst Printer',
+    'tax'                                       => 'VAT',
+    'tax_category'                              => 'VAT Categorie',
+    'tax_category_duplicate'                    => 'De ingevulde VAT categorie bestaat al.',
+    'tax_category_invalid_chars'                => 'De ingevulde VAT categorie is ongeldig.',
+    'tax_category_required'                     => 'De VAT categorie is verplicht.',
+    'tax_category_used'                         => 'De VAT categorie kan niet verwijderd worden omdat die in gebruik is.',
+    'tax_configuration'                         => 'VAT Configuratie',
+    'tax_decimals'                              => 'Belasting Decimalen',
+    'tax_id'                                    => 'Tax id',
+    'tax_included'                              => 'VAT Inbegrepen',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => 'Voorbeeld Thema:',
+    'thousands_separator'                       => 'duizenden Separator',
+    'timezone'                                  => 'Tijdzone',
+    'timezone_error'                            => 'OSPOS tijdzone is verschillend van uw lokale tijdzone.',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => "Activeer 'Destination Based Tax'",
+    'user_timezone'                             => 'Lokale tijdzone:',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Werk Order Ondersteuning',
+    'work_order_format'                         => 'Werk Order Formaat',
 ];
diff --git a/app/Language/nl-BE/Employees.php b/app/Language/nl-BE/Employees.php
index 347f1a3c5..a8364cad1 100644
--- a/app/Language/nl-BE/Employees.php
+++ b/app/Language/nl-BE/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informatie",
-    "cannot_be_deleted"            => "Kon de geselecteerde gebruilker(s) niet verwijderen, één of meerdere die u probeert te verwijderen hebben aankopen verwerkt.",
-    "change_employee"              => "",
-    "change_password"              => "Wijzig Paswoord",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Bent u zeker dat u de geselecteerde werknemers wil verwijderen?",
-    "confirm_restore"              => "Bent u zeker dat u de geselecteerde werknemers wil herstellen?",
-    "current_password"             => "Huidig Paswoord",
-    "current_password_invalid"     => "Huidig paswoord is ongeldig.",
-    "employee"                     => "Werknemer",
-    "error_adding_updating"        => "Fout bij het toevoegen/aanpassen medewerker.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Je kan de demo gebruilker niet verwijderen.",
-    "error_updating_demo_admin"    => "Jij kan de demo gebruiker niet veranderen.",
-    "language"                     => "Taal",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "N. Werknemer",
-    "none_selected"                => "U hebt geen werknemers geselecteerd.",
-    "one_or_multiple"              => "werknemer(s) verwijderd",
-    "password"                     => "Paswoord",
-    "password_minlength"           => "Paswoord moet minstens 8 characters lang zijn.",
-    "password_must_match"          => "Paswoorden komen niet overeen.",
-    "password_not_must_match"      => "Het huidige en het nieuwe paswoord moeten verschillend zijn.",
-    "password_required"            => "Paswoord moet ingevuld worden.",
-    "permission_desc"              => "Vink de selectievakjes hieronder aan om toegang te verlenen tot de modules.",
-    "permission_info"              => "Rechten",
-    "repeat_password"              => "Herhaal Paswoord",
-    "subpermission_required"       => "Selecteer minstens één permissie voor elke module.",
-    "successful_adding"            => "Je hebt met succes een medewerker toegevoegd.",
-    "successful_change_password"   => "Paswoord wijziging geslaagd.",
-    "successful_deleted"           => "Er werd(en)",
-    "successful_updating"          => "Je hebt met succes de medewerker gewijzigd",
-    "system_language"              => "Systeem taal",
-    "unsuccessful_change_password" => "Paswoord wijziging gefaald.",
-    "update"                       => "Update Werknemer",
-    "username"                     => "Gebruikersnaam",
-    "username_duplicate"           => "Werknemer gebruikersnaam is al in gebruik. Gelieve een andere te kiezen.",
-    "username_minlength"           => "Gebruikersnaam moet minstens 5 characters lang zijn.",
-    "username_required"            => "Gebruikersnaam moet ingevuld worden.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Informatie',
+    'cannot_be_deleted'                      => 'Kon de geselecteerde gebruiker(s) niet verwijderen',
+    'change_employee'                        => '',
+    'change_password'                        => 'Wijzig Paswoord',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Bent u zeker dat u de geselecteerde werknemers wil verwijderen?',
+    'confirm_restore'                        => 'Bent u zeker dat u de geselecteerde werknemers wil herstellen?',
+    'current_password'                       => 'Huidig Paswoord',
+    'current_password_invalid'               => 'Huidig paswoord is ongeldig.',
+    'employee'                               => 'Werknemer',
+    'error_adding_updating'                  => 'Fout bij het toevoegen/aanpassen medewerker.',
+    'error_cannot_remove_own_minimum_grant'  => 'U kan uw eigen minimale modulerechten niet verwijderen.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Je kan de demo gebruilker niet verwijderen.',
+    'error_grant_change_disallowed'          => 'Machtigingswijzigingen zijn uitgeschakeld in deze demo.',
+    'error_password_change_disallowed'       => 'Wachtwoordwijzigingen zijn uitgeschakeld in deze demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Jij kan de demo gebruiker niet veranderen.',
+    'language'                               => 'Taal',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'N. Werknemer',
+    'none_selected'                          => 'U hebt geen werknemers geselecteerd.',
+    'one_or_multiple'                        => 'werknemer(s) verwijderd',
+    'password'                               => 'Paswoord',
+    'password_minlength'                     => 'Paswoord moet minstens 8 characters lang zijn.',
+    'password_must_match'                    => 'Paswoorden komen niet overeen.',
+    'password_not_must_match'                => 'Het huidige en het nieuwe paswoord moeten verschillend zijn.',
+    'password_required'                      => 'Paswoord moet ingevuld worden.',
+    'permission_desc'                        => 'Vink de selectievakjes hieronder aan om toegang te verlenen tot de modules.',
+    'permission_info'                        => 'Rechten',
+    'repeat_password'                        => 'Herhaal Paswoord',
+    'subpermission_required'                 => 'Selecteer minstens één permissie voor elke module.',
+    'successful_adding'                      => 'Je hebt met succes een medewerker toegevoegd.',
+    'successful_change_password'             => 'Paswoord wijziging geslaagd.',
+    'successful_deleted'                     => 'Er werd(en)',
+    'successful_updating'                    => 'Je hebt met succes de medewerker gewijzigd',
+    'system_language'                        => 'Systeem taal',
+    'unsuccessful_change_password'           => 'Paswoord wijziging gefaald.',
+    'update'                                 => 'Update Werknemer',
+    'username'                               => 'Gebruikersnaam',
+    'username_duplicate'                     => 'Werknemer gebruikersnaam is al in gebruik. Gelieve een andere te kiezen.',
+    'username_minlength'                     => 'Gebruikersnaam moet minstens 5 characters lang zijn.',
+    'username_required'                      => 'Gebruikersnaam moet ingevuld worden.',
 ];
diff --git a/app/Language/nl-BE/Error.php b/app/Language/nl-BE/Error.php
index 48e0926a7..a10a22121 100644
--- a/app/Language/nl-BE/Error.php
+++ b/app/Language/nl-BE/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "U hebt geen toegang tot de module genaamd",
-    "unknown"              => "onbekend",
+    'no_permission_module'           => 'U hebt geen toegang tot de module genaamd',
+    'unable_to_create_env_file'      => 'Kan {filePath} niet aanmaken om throttle.key te voorzien',
+    'unable_to_lock_file'            => 'Kan {filePath} niet vergrendelen: {reason}',
+    'unable_to_open_lock_file'       => 'Kan {filePath} niet openen: {reason}',
+    'unable_to_persist_throttle_key' => 'Kan throttle.key niet opslaan naar {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Kan {filePath} niet lezen om throttle.key te voorzien',
+    'unknown'                        => 'onbekend',
 ];
diff --git a/app/Language/nl-BE/Items.php b/app/Language/nl-BE/Items.php
index bd49c3a60..a5b48c584 100644
--- a/app/Language/nl-BE/Items.php
+++ b/app/Language/nl-BE/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Correctie hoeveelheid.",
-    "allow_alt_description"              => "Aanpasbare omschrijving",
-    "amount_entry"                       => "Hoeveelheid",
-    "bulk_edit"                          => "Bewerk Selectie",
-    "buy_price_required"                 => "Inkoopprijs is een verplicht veld.",
-    "cannot_be_deleted"                  => "De geselecteerde producten konden niet worden verwijderd.",
-    "cannot_find_item"                   => "Product niet gevonden.",
-    "categories"                         => "",
-    "category"                           => "Categorie",
-    "category_new"                       => "",
-    "category_required"                  => "Categorie moet ingevuld worden.",
-    "change_all_to_allow_alt_desc"       => "Aanpasb. omschrijvingen voor alles.",
-    "change_all_to_not_allow_allow_desc" => "Vaste omschrijvingen voor alles.",
-    "change_all_to_serialized"           => "Genummerd",
-    "change_all_to_unserialized"         => "Niet genummerd",
-    "change_image"                       => "Selecteer Afbeelding",
-    "confirm_bulk_edit"                  => "Bent u zeker dat u de geselecteerde producten wil aanpassen?",
-    "confirm_bulk_edit_wipe_taxes"       => "Alle taxgegevens zullen overschreven worden.",
-    "confirm_delete"                     => "Bent u zeker dat u de geselecteerde producten wil verwijderen?",
-    "confirm_restore"                    => "Bent u zeker dat u de geselecteerde product(en) wil herstellen?",
-    "cost_price"                         => "Groothandelsprijs",
-    "cost_price_number"                  => "Groothandelsprijs moet een getal zijn.",
-    "cost_price_required"                => "Groothandelsprijs is een verplicht veld.",
-    "count"                              => "Update Stock",
-    "csv_import_failed"                  => "CSV import mislukt",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Het geüploade CSV-bestand bevat geen gegevens of is onjuist geformatteerd.",
-    "csv_import_partially_failed"        => "Er waren {0} artikel import fout(en) op regel(s): {1}. Er werden geen rijen geïmporteerd.",
-    "csv_import_success"                 => "Artikel CSV import geslaagd.",
-    "current_quantity"                   => "Huidige hoeveelheid",
-    "default_pack_name"                  => "Enkel",
-    "description"                        => "Omschrijving",
-    "details_count"                      => "Stockgegevens",
-    "do_nothing"                         => "Doe Niets",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Bewerk de gewenste velden voor het (de) geselecteerde artikel( en).",
-    "edit_multiple_items"                => "Meerdere Producten Bewerken",
-    "empty_upc_items"                    => "Zonder barcode",
-    "error_adding_updating"              => "Fout bij het toevoegen/aanpassen van een product",
-    "error_updating_multiple"            => "Fout bij het bewaren van producten",
-    "generate_barcodes"                  => "Genereer Barcodes",
-    "hsn_code"                           => "Geharmoniseerd Systeem Naamgeving",
-    "image"                              => "Afbeelding",
-    "import_items_csv"                   => "Importeer artikelen van een CSV sheet",
-    "info_provided_by"                   => "Info afgeleverd door",
-    "inventory"                          => "Stock",
-    "inventory_CSV_import_quantity"      => "Hoeveelheid Geïmporteerd uit CSV",
-    "inventory_comments"                 => "Commentaar",
-    "inventory_data_tracking"            => "Inventarisgegevens Bijhouden",
-    "inventory_date"                     => "Datum",
-    "inventory_employee"                 => "Werknemer",
-    "inventory_in_out_quantity"          => "In/Uit Hoeveelheid",
-    "inventory_remarks"                  => "Opmerkingen",
-    "is_deleted"                         => "Verwijderd",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Optelbaar",
-    "item"                               => "Product",
-    "item_id"                            => "",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "Artikelnummer is reeds aanwezig in de database.",
-    "kit"                                => "Set",
-    "location"                           => "Locatie",
-    "low_inventory_items"                => "Niet in stock",
-    "low_sell_item"                      => "Goedkoop artikel",
-    "manually_editing_of_quantity"       => "Manuele aanpassing hoeveelheid",
-    "markup"                             => "",
-    "name"                               => "Productnaam",
-    "name_required"                      => "Artikelnaam is een verplicht veld.",
-    "new"                                => "Nieuw Product",
-    "no_description_items"               => "Producten zonder omschrijving",
-    "no_items_to_display"                => "Geen artikelen om weer te geven.",
-    "none"                               => "Geen",
-    "none_selected"                      => "U hebt geen producten geselecteerd",
-    "nonstock"                           => "Geen Stock",
-    "number_information"                 => "Productnummer",
-    "number_required"                    => "Barcode is een verplicht veld.",
-    "one_or_multiple"                    => "product(en) verwijderd",
-    "pack_name"                          => "Pak Naam",
-    "qty_per_pack"                       => "Aantal per pak",
-    "quantity"                           => "Stock",
-    "quantity_number"                    => "Aantal moet een getal zijn.",
-    "quantity_required"                  => "Hoeveelheid is een verplicht veld.",
-    "receiving_quantity"                 => "Aantal per lijn",
-    "remove_image"                       => "Verwijder Afbeelding",
-    "reorder_level"                      => "Bestel niveau",
-    "reorder_level_number"               => "Nabestel Niveau moet een getal zijn.",
-    "reorder_level_required"             => "Nabestel Niveau is een verplicht veld.",
-    "retrive_item_info"                  => "Artikel Info Opvragen",
-    "sales_tax_1"                        => "VAT",
-    "sales_tax_2"                        => "VAT 2",
-    "search_attributes"                  => "Zoek Kenmerken",
-    "select_image"                       => "Selecteer Afbeelding",
-    "serialized_items"                   => "Artikelen met serienummer",
-    "standard"                           => "Standaard",
-    "stock"                              => "Voorraad",
-    "stock_location"                     => "Stock locatie",
-    "stock_type"                         => "Voorraad Type",
-    "successful_adding"                  => "Product succesvol toegevoegd",
-    "successful_bulk_edit"               => "Producten werden succesvol bewaard",
-    "successful_deleted"                 => "Er werd(en)",
-    "successful_updating"                => "Wijzigingen bewaard voor",
-    "supplier"                           => "Leverancier",
-    "tax_1"                              => "VAT",
-    "tax_2"                              => "VAT 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "BTW-Categorie",
-    "tax_percent"                        => "VAT %",
-    "tax_percent_number"                 => "Tax Percentage moet een numerieke waarde zijn",
-    "tax_percent_required"               => "BTW Percentage is een verplicht veld.",
-    "tax_percents"                       => "VAT",
-    "temp"                               => "Tijdelijk",
-    "type"                               => "Item Type",
-    "unit_price"                         => "Verkoopprijs",
-    "unit_price_number"                  => "Eenheidsprijs moet een getal zijn.",
-    "unit_price_required"                => "Verkoopprijs is een verplicht veld.",
-    "upc_database"                       => "UPC Database",
-    "update"                             => "Bewerk Product",
-    "use_inventory_menu"                 => "Gebruik inventaris menu",
+    'add_minus'                          => 'Correctie hoeveelheid.',
+    'allow_alt_description'              => 'Aanpasbare omschrijving',
+    'amount_entry'                       => 'Hoeveelheid',
+    'bulk_edit'                          => 'Bewerk Selectie',
+    'buy_price_required'                 => 'Inkoopprijs is een verplicht veld.',
+    'cannot_be_deleted'                  => 'De geselecteerde producten konden niet worden verwijderd.',
+    'cannot_find_item'                   => 'Product niet gevonden.',
+    'categories'                         => '',
+    'category'                           => 'Categorie',
+    'category_new'                       => '',
+    'category_required'                  => 'Categorie moet ingevuld worden.',
+    'change_all_to_allow_alt_desc'       => 'Aanpasb. omschrijvingen voor alles.',
+    'change_all_to_not_allow_allow_desc' => 'Vaste omschrijvingen voor alles.',
+    'change_all_to_serialized'           => 'Genummerd',
+    'change_all_to_unserialized'         => 'Niet genummerd',
+    'change_image'                       => 'Selecteer Afbeelding',
+    'confirm_bulk_edit'                  => 'Bent u zeker dat u de geselecteerde producten wil aanpassen?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Alle taxgegevens zullen overschreven worden.',
+    'confirm_delete'                     => 'Bent u zeker dat u de geselecteerde producten wil verwijderen?',
+    'confirm_restore'                    => 'Bent u zeker dat u de geselecteerde product(en) wil herstellen?',
+    'cost_price'                         => 'Groothandelsprijs',
+    'cost_price_number'                  => 'Groothandelsprijs moet een getal zijn.',
+    'cost_price_required'                => 'Groothandelsprijs is een verplicht veld.',
+    'count'                              => 'Update Stock',
+    'csv_import_failed'                  => 'CSV import mislukt',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Het geüploade CSV-bestand bevat geen gegevens of is onjuist geformatteerd.',
+    'csv_import_partially_failed'        => 'Er waren {0} artikel import fout(en) op regel(s): {1}. Er werden geen rijen geïmporteerd.',
+    'csv_import_success'                 => 'Artikel CSV import geslaagd.',
+    'current_quantity'                   => 'Huidige hoeveelheid',
+    'default_pack_name'                  => 'Enkel',
+    'description'                        => 'Omschrijving',
+    'details_count'                      => 'Stockgegevens',
+    'do_nothing'                         => 'Doe Niets',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Bewerk de gewenste velden voor het (de) geselecteerde artikel( en).',
+    'edit_multiple_items'                => 'Meerdere Producten Bewerken',
+    'empty_upc_items'                    => 'Zonder barcode',
+    'error_adding_updating'              => 'Fout bij het toevoegen/aanpassen van een product',
+    'error_updating_multiple'            => 'Fout bij het bewaren van producten',
+    'generate_barcodes'                  => 'Genereer Barcodes',
+    'hsn_code'                           => 'Geharmoniseerd Systeem Naamgeving',
+    'image'                              => 'Afbeelding',
+    'import_items_csv'                   => 'Importeer artikelen van een CSV sheet',
+    'info_provided_by'                   => 'Info afgeleverd door',
+    'inventory'                          => 'Stock',
+    'inventory_CSV_import_quantity'      => 'Hoeveelheid Geïmporteerd uit CSV',
+    'inventory_comments'                 => 'Commentaar',
+    'inventory_data_tracking'            => 'Inventarisgegevens Bijhouden',
+    'inventory_date'                     => 'Datum',
+    'inventory_employee'                 => 'Werknemer',
+    'inventory_in_out_quantity'          => 'In/Uit Hoeveelheid',
+    'inventory_remarks'                  => 'Opmerkingen',
+    'is_deleted'                         => 'Verwijderd',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Optelbaar',
+    'item'                               => 'Product',
+    'item_id'                            => '',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'Artikelnummer is reeds aanwezig in de database.',
+    'item_number_invalid'                => 'Artikelnummer bevat niet-toegestane tekens.',
+    'kit'                                => 'Set',
+    'location'                           => 'Locatie',
+    'low_inventory_items'                => 'Niet in stock',
+    'low_sell_item'                      => 'Goedkoop artikel',
+    'manually_editing_of_quantity'       => 'Manuele aanpassing hoeveelheid',
+    'markup'                             => '',
+    'name'                               => 'Productnaam',
+    'name_required'                      => 'Artikelnaam is een verplicht veld.',
+    'new'                                => 'Nieuw Product',
+    'no_description_items'               => 'Producten zonder omschrijving',
+    'no_items_to_display'                => 'Geen artikelen om weer te geven.',
+    'none'                               => 'Geen',
+    'none_selected'                      => 'U hebt geen producten geselecteerd',
+    'nonstock'                           => 'Geen Stock',
+    'number_information'                 => 'Productnummer',
+    'number_required'                    => 'Barcode is een verplicht veld.',
+    'one_or_multiple'                    => 'product(en) verwijderd',
+    'pack_name'                          => 'Pak Naam',
+    'qty_per_pack'                       => 'Aantal per pak',
+    'quantity'                           => 'Stock',
+    'quantity_number'                    => 'Aantal moet een getal zijn.',
+    'quantity_required'                  => 'Hoeveelheid is een verplicht veld.',
+    'receiving_quantity'                 => 'Aantal per lijn',
+    'remove_image'                       => 'Verwijder Afbeelding',
+    'reorder_level'                      => 'Bestel niveau',
+    'reorder_level_number'               => 'Nabestel Niveau moet een getal zijn.',
+    'reorder_level_required'             => 'Nabestel Niveau is een verplicht veld.',
+    'retrive_item_info'                  => 'Artikel Info Opvragen',
+    'sales_tax_1'                        => 'VAT',
+    'sales_tax_2'                        => 'VAT 2',
+    'search_attributes'                  => 'Zoek Kenmerken',
+    'select_image'                       => 'Selecteer Afbeelding',
+    'serialized_items'                   => 'Artikelen met serienummer',
+    'standard'                           => 'Standaard',
+    'stock'                              => 'Voorraad',
+    'stock_location'                     => 'Stock locatie',
+    'stock_type'                         => 'Voorraad Type',
+    'successful_adding'                  => 'Product succesvol toegevoegd',
+    'successful_bulk_edit'               => 'Producten werden succesvol bewaard',
+    'successful_deleted'                 => 'Er werd(en)',
+    'successful_updating'                => 'Wijzigingen bewaard voor',
+    'supplier'                           => 'Leverancier',
+    'tax_1'                              => 'VAT',
+    'tax_2'                              => 'VAT 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'BTW-Categorie',
+    'tax_name_invalid'                   => 'Belastingnaam bevat niet-toegestane tekens.',
+    'tax_percent'                        => 'VAT %',
+    'tax_percent_number'                 => 'Tax Percentage moet een numerieke waarde zijn',
+    'tax_percent_required'               => 'BTW Percentage is een verplicht veld.',
+    'tax_percents'                       => 'VAT',
+    'temp'                               => 'Tijdelijk',
+    'type'                               => 'Item Type',
+    'unit_price'                         => 'Verkoopprijs',
+    'unit_price_number'                  => 'Eenheidsprijs moet een getal zijn.',
+    'unit_price_required'                => 'Verkoopprijs is een verplicht veld.',
+    'upc_database'                       => 'UPC Database',
+    'update'                             => 'Bewerk Product',
+    'use_inventory_menu'                 => 'Gebruik inventaris menu',
 ];
diff --git a/app/Language/nl-BE/Login.php b/app/Language/nl-BE/Login.php
index cb3527d33..f8002d16e 100644
--- a/app/Language/nl-BE/Login.php
+++ b/app/Language/nl-BE/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Ik ben geen robot.",
-    "go"                            => "Verstuur",
-    "invalid_gcaptcha"              => "Controleer of u geen robot bent.",
-    "invalid_installation"          => "De installatie is onvolledig. Kijk uw php.ini file na.",
-    "invalid_username_and_password" => "Ongeldige gebruiker en/of paswoord.",
-    "login"                         => "Login",
-    "logout"                        => "Log-uit",
-    "migration_needed"              => "Een database migratie naar {0} zal starten na het inloggen.",
-    "password"                      => "Paswoord",
-    "required_username"             => "",
-    "username"                      => "Gebruiker",
-    "welcome"                       => "Welkom op {0}!",
+    "gcaptcha"                            => "Ik ben geen robot.",
+    "go"                                  => "Verstuur",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Controleer of u geen robot bent.",
+    "invalid_installation"                => "De installatie is onvolledig. Kijk uw php.ini file na.",
+    "invalid_username_and_password"       => "Ongeldige gebruiker en/of paswoord.",
+    "login"                               => "Login",
+    "logout"                              => "Log-uit",
+    "migrating_database"                  => "Database migreren",
+    "migration_auth_message"              => "Beheerdersreferenties zijn vereist om de databasemigratie naar versie {0} te autoriseren. Log in om verder te gaan.",
+    "migration_complete"                  => "Database succesvol geïnitialiseerd!",
+    "migration_complete_login"            => "U kunt nu inloggen.",
+    "migration_complete_migrate"          => "Database succesvol gemigreerd!",
+    "migration_complete_redirect"         => "Migratie voltooid. Doorsturen naar login...",
+    "migration_error_connection"          => "Verbindingsfout. Probeer het opnieuw.",
+    "migration_failed"                    => "Migratie mislukt",
+    "migration_initializing"              => "Database initialiseren",
+    "migration_needed"                    => "Een database migratie naar {0} zal starten na het inloggen.",
+    "migration_required"                  => "Database migratie vereist",
+    "migration_running"                   => "Databasemigraties uitvoeren...",
+    "password"                            => "Paswoord",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Te veel pogingen. Wacht even en probeer het opnieuw.',
+    "username"                            => "Gebruiker",
+    "welcome"                             => "Welkom op {0}!"
 ];
diff --git a/app/Language/nl-BE/Reports.php b/app/Language/nl-BE/Reports.php
index 0c4270f15..c0ce3f8a5 100644
--- a/app/Language/nl-BE/Reports.php
+++ b/app/Language/nl-BE/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "VAT %",
     "taxes"                                   => "Belastingen",
     "taxes_summary_report"                    => "Rapport Overzicht Belastingen",
+    "toggle_cost_and_profit"                  => "Kosten en winst wisselen",
     "total"                                   => "Totaal",
     "total_inventory_value"                   => "Totale waarde stock",
     "total_low_sell_quantity"                 => "Totale Lage Verkoophoeveelheid",
diff --git a/app/Language/nl-BE/Sales.php b/app/Language/nl-BE/Sales.php
index f2768e8ed..84e979d68 100644
--- a/app/Language/nl-BE/Sales.php
+++ b/app/Language/nl-BE/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Beschikbare Punten",
-    "rewards_package"                  => "Spaarpunten",
-    "rewards_remaining_balance"        => "Saldo Spaarpunten is ",
-    "account_number"                   => "Btw-nummer",
-    "add_payment"                      => "Betaal",
-    "amount_due"                       => "Te betalen",
-    "amount_tendered"                  => "Ontvangen bedrag",
-    "authorized_signature"             => "Handtekening",
-    "cancel_sale"                      => "Annuleer",
-    "cash"                             => "Contant",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Liquiditeitsaanpassing",
-    "cash_deposit"                     => "Cash",
-    "cash_filter"                      => "Contant",
-    "change_due"                       => "Wisselgeld terug",
-    "change_price"                     => "Wijzig Verkoopprijs",
-    "check"                            => "Waardebon",
-    "check_balance"                    => "Waardebon terug",
-    "check_filter"                     => "Waardebon",
-    "close"                            => "",
-    "comment"                          => "Commentaar",
-    "comments"                         => "Commentaar",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Bevestig",
-    "confirm_cancel_sale"              => "Weet u zeker dat u deze verkoop wilt annuleren? Alle items zullen worden gewist.",
-    "confirm_delete"                   => "Bent u zeker dat u de geselecteerde aankopen wil verwijderen?",
-    "confirm_restore"                  => "Bent u zeker dat u de geselecteerde aankopen wil verwijderen?",
-    "credit"                           => "Kredietkaart",
-    "credit_deposit"                   => "Credit",
-    "credit_filter"                    => "Kredietkaart",
-    "current_table"                    => "",
-    "customer"                         => "Klant",
-    "customer_address"                 => "Customer Address",
-    "customer_discount"                => "Korting",
-    "customer_email"                   => "Customer Email",
-    "customer_location"                => "Customer Location",
-    "customer_mailchimp_status"        => "MailChimp staat",
-    "customer_optional"                => "(Optioneel)",
-    "customer_required"                => "(Vereist)",
-    "customer_total"                   => "Totaal",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Datum",
-    "date_range"                       => "Periode",
-    "date_required"                    => "Gelieve een correcte datum in te vullen.",
-    "date_type"                        => "Er moet een correcte datum ingevuld worden.",
-    "debit"                            => "Bancontact",
-    "debit_filter"                     => "",
-    "delete"                           => "Verwijderen Toegestaan",
-    "delete_confirmation"              => "Weet u zeker dat u deze verkoop wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
-    "delete_entire_sale"               => "Verwijder",
-    "delete_successful"                => "De geselecteerde verko(o)p(en) werden verwijderd.",
-    "delete_unsuccessful"              => "De geselecteerde aankopen konden niet worden verwijderd.",
-    "description_abbrv"                => "Omschr.",
-    "discard"                          => "Annuleer",
-    "discard_quote"                    => "",
-    "discount"                         => "Korting",
-    "discount_included"                => "% Korting",
-    "discount_short"                   => "%",
-    "due"                              => "Tegoed",
-    "due_filter"                       => "Tegoed",
-    "edit"                             => "Bewerk",
-    "edit_item"                        => "Bewaar",
-    "edit_sale"                        => "Bewerk Ticket",
-    "email_receipt"                    => "Email Ticket",
-    "employee"                         => "Werknemer",
-    "entry"                            => "Rij",
-    "error_editing_item"               => "Fout bij bewerken",
-    "find_or_scan_item"                => "Zoek/Scan Product",
-    "find_or_scan_item_or_receipt"     => "Zoek/Scan Product of Ticket",
-    "giftcard"                         => "Cadeaubon",
-    "giftcard_balance"                 => "Cadeaubon Resterend",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Cadeaubon nummer",
-    "group_by_category"                => "Per Categorie",
-    "group_by_type"                    => "Per Type",
-    "hsn"                              => "HSN",
-    "id"                               => "Verkoop ID",
-    "include_prices"                   => "Prijzen inclusief?",
-    "invoice"                          => "Factuur",
-    "invoice_confirm"                  => "Deze factuur zal verstuurd worden naar",
-    "invoice_enable"                   => "Maak Factuur",
-    "invoice_filter"                   => "Facturen",
-    "invoice_no_email"                 => "Er werd geen email adres gevonden voor deze klant.",
-    "invoice_number"                   => "Factuur #",
-    "invoice_number_duplicate"         => "Vul een uniek factuurnummer in.",
-    "invoice_sent"                     => "Factuur verstuurd naar",
-    "invoice_total"                    => "Totaal Factuur",
-    "invoice_type_custom_invoice"      => "Factuur (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Factuur (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Factuur (invoice.php)",
-    "invoice_type_tax_invoice"         => "Factuur (tax_invoice.php)",
-    "invoice_unsent"                   => "Fout bij het versturen van factuur naar",
-    "invoice_update"                   => "Hernummer",
-    "item_insufficient_of_stock"       => "Product is niet meer in voorraad.",
-    "item_name"                        => "Naam",
-    "item_number"                      => "Product #",
-    "item_out_of_stock"                => "Product is niet meer in voorraad.",
-    "key_browser"                      => "Handige Snelkoppelingen",
-    "key_cancel"                       => "Annuleert Huidige Offerte/Factuur/Verkoop",
-    "key_customer_search"              => "Klant Zoeken",
-    "key_finish_quote"                 => "Beëindig Offerte/Factuur zonder betaling",
-    "key_finish_sale"                  => "Betaling Toevoegen en Factuur/Verkoop Voltooien",
-    "key_full"                         => "Openen op Volledig Scherm",
-    "key_function"                     => "Function",
-    "key_help"                         => "Sneltoetsen",
-    "key_help_modal"                   => "Open Sneltoetsen Venster",
-    "key_in"                           => "Inzoomen",
-    "key_item_search"                  => "Artikel Zoeken",
-    "key_out"                          => "Uitzoomen",
-    "key_payment"                      => "Betaalmiddel Toevoegen",
-    "key_print"                        => "Huidige Pagina Afdrukken",
-    "key_restore"                      => "Originele Weergave/Vergroting Herstellen",
-    "key_search"                       => "Zoeken in Rapporten Tabellen",
-    "key_suspend"                      => "Huidige Verkoop Uitstellen",
-    "key_suspended"                    => "Toon Uitgestelde Verkopen",
-    "key_system"                       => "Systeem Sneltoetsen",
-    "key_tendered"                     => "Wijziging Aangeboden Bedrag",
-    "key_title"                        => "Sneltoetsen Verkoop",
-    "mc"                               => "",
-    "mode"                             => "Type Registratie",
-    "must_enter_numeric"               => "Het ontvangen bedrag moet een numerieke waarde zijn.",
-    "must_enter_numeric_giftcard"      => "Er moet een geldige code worden ingevuld voor de cadeaubon.",
-    "new_customer"                     => "Nieuwe klant",
-    "new_item"                         => "Nieuw Product",
-    "no_description"                   => "Geen",
-    "no_filter"                        => "Alle",
-    "no_items_in_cart"                 => "Er zijn geen verkopen geselecteerd.",
-    "no_sales_to_display"              => "Er werden geen verkopen gevonden.",
-    "none_selected"                    => "U hebt geen verkopen geselecteerd.",
-    "nontaxed_ind"                     => " . ",
-    "not_authorized"                   => "Deze actie is niet toegestaan.",
-    "one_or_multiple"                  => "Verkoop(en)",
-    "payment"                          => "Betaalmethode",
-    "payment_amount"                   => "Bedrag",
-    "payment_not_cover_total"          => "Betaalde hoeveelheid is onvoldoende.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Betaald bedrag",
-    "price"                            => "Prijs",
-    "print_after_sale"                 => "Print Ticket",
-    "quantity"                         => "Aantal",
-    "quantity_less_than_reorder_level" => "Waarschuwing, de gewenste hoeveelheid stock is overschreden.",
-    "quantity_less_than_zero"          => "Waarschuwing: Gewenste hoeveelheid is onvoldoende. U kunt de verkoop nog steeds verwerken, maar controleer uw inventaris.",
-    "quantity_of_items"                => "Hoeveelheid van {0} items",
-    "quote"                            => "Offerte",
-    "quote_number"                     => "Offertenummer",
-    "quote_number_duplicate"           => "Offertenummer moet uniek zijn.",
-    "quote_sent"                       => "Offerte verzonden naar",
-    "quote_unsent"                     => "Offerte kon niet verzonden worden naar",
-    "receipt"                          => "Ticket #",
-    "receipt_no_email"                 => "De klant heeft geen geldig email adres.",
-    "receipt_number"                   => "Ticket #",
-    "receipt_sent"                     => "Ticket verstuurd naar",
-    "receipt_unsent"                   => "Fout bij het versturen van ticket naar",
-    "refund"                           => "Type Terugbetaling",
-    "register"                         => "Kassa",
-    "remove_customer"                  => "Verwijder Klant",
-    "remove_discount"                  => "",
-    "return"                           => "Retour",
-    "rewards"                          => "Punten",
-    "rewards_balance"                  => "Punten Balans",
-    "sale"                             => "Verkoop",
-    "sale_by_invoice"                  => "Verkoop op Factuur",
-    "sale_for_customer"                => "Klant:",
-    "sale_time"                        => "Datum",
-    "sales_tax"                        => "VAT",
-    "sales_total"                      => "",
-    "select_customer"                  => "Selecteer Klant",
-    "send_invoice"                     => "Verstuur Factuur",
-    "send_quote"                       => "Verstuur Offerte",
-    "send_receipt"                     => "Verstuur Ticket",
-    "send_work_order"                  => "Verstuur Werkorder",
-    "serial"                           => "Nummer",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Toon Factuur",
-    "show_receipt"                     => "Toon Ticket",
-    "start_typing_customer_name"       => "Typ naam klant...",
-    "start_typing_item_name"           => "Typ naam product of barcode...",
-    "stock"                            => "Voorraad",
-    "stock_location"                   => "Stock Locatie",
-    "sub_total"                        => "Subtotaal",
-    "successfully_deleted"             => "Uw aankoop werd verwijderd",
-    "successfully_restored"            => "U hebt hersteld",
-    "successfully_suspended_sale"      => "Wijzigingen bewaard voor verkoop.",
-    "successfully_updated"             => "Verkoop Update Geslaagd.",
-    "suspend_sale"                     => "Bewaar",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Bewaarde Aankopen",
-    "table"                            => "Tafel",
-    "takings"                          => "Overzicht",
-    "tax"                              => "VAT",
-    "tax_id"                           => "Tax id",
-    "tax_invoice"                      => "Vat Factuur",
-    "tax_percent"                      => "VAT %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Totaal",
-    "total_tax_exclusive"              => "Totaal",
-    "transaction_failed"               => "Transactie mislukt.",
-    "unable_to_add_item"               => "Artikel toevoegen aan Verkoop mislukt",
-    "unsuccessfully_deleted"           => "De aankoop kon niet verwijderd worden.",
-    "unsuccessfully_restored"          => "De verkoop kon niet hersteld worden.",
-    "unsuccessfully_suspended_sale"    => "Uw verkoop werd niet bewaard.",
-    "unsuccessfully_updated"           => "Fout bij het bewaren van verkoop.",
-    "unsuspend"                        => "Hervat",
-    "unsuspend_and_delete"             => "Actie",
-    "update"                           => "Bewerk",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Werkorder",
-    "work_order_number"                => "Werkorder Nummer",
-    "work_order_number_duplicate"      => "Werkorder Nummer moet uniek zijn.",
-    "work_order_sent"                  => "Werkorder verzonder naar",
-    "work_order_unsent"                => "Werkorder kon niet verzonden worden naar",
+    'account_number'                    => 'Btw-nummer',
+    'add_payment'                       => 'Betaal',
+    'amount_due'                        => 'Te betalen',
+    'amount_due_not_covered'            => 'De betalingen dekken het verschuldigde bedrag niet.',
+    'amount_tendered'                   => 'Ontvangen bedrag',
+    'authorized_signature'              => 'Handtekening',
+    'cancel_sale'                       => 'Annuleer',
+    'cash'                              => 'Contant',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Liquiditeitsaanpassing',
+    'cash_deposit'                      => 'Cash',
+    'cash_filter'                       => 'Contant',
+    'change_due'                        => 'Wisselgeld terug',
+    'change_price'                      => 'Wijzig Verkoopprijs',
+    'check'                             => 'Waardebon',
+    'check_balance'                     => 'Waardebon terug',
+    'check_filter'                      => 'Waardebon',
+    'close'                             => '',
+    'comment'                           => 'Commentaar',
+    'comments'                          => 'Commentaar',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Bevestig',
+    'confirm_cancel_sale'               => 'Weet u zeker dat u deze verkoop wilt annuleren? Alle items zullen worden gewist.',
+    'confirm_delete'                    => 'Bent u zeker dat u de geselecteerde aankopen wil verwijderen?',
+    'confirm_restore'                   => 'Bent u zeker dat u de geselecteerde aankopen wil verwijderen?',
+    'credit'                            => 'Kredietkaart',
+    'credit_deposit'                    => 'Credit',
+    'credit_filter'                     => 'Kredietkaart',
+    'current_table'                     => '',
+    'customer'                          => 'Klant',
+    'customer_address'                  => 'Customer Address',
+    'customer_discount'                 => 'Korting',
+    'customer_email'                    => 'Customer Email',
+    'customer_location'                 => 'Customer Location',
+    'customer_mailchimp_status'         => 'MailChimp staat',
+    'customer_optional'                 => '(Optioneel)',
+    'customer_required'                 => '(Vereist)',
+    'customer_total'                    => 'Totaal',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Beschikbare Punten',
+    'daily_sales'                       => '',
+    'date'                              => 'Datum',
+    'date_range'                        => 'Periode',
+    'date_required'                     => 'Gelieve een correcte datum in te vullen.',
+    'date_type'                         => 'Er moet een correcte datum ingevuld worden.',
+    'debit'                             => 'Bancontact',
+    'debit_filter'                      => '',
+    'delete'                            => 'Verwijderen Toegestaan',
+    'delete_confirmation'               => 'Weet u zeker dat u deze verkoop wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.',
+    'delete_entire_sale'                => 'Verwijder',
+    'delete_successful'                 => 'De geselecteerde verko(o)p(en) werden verwijderd.',
+    'delete_unsuccessful'               => 'De geselecteerde aankopen konden niet worden verwijderd.',
+    'description_abbrv'                 => 'Omschr.',
+    'discard'                           => 'Annuleer',
+    'discard_quote'                     => '',
+    'discount'                          => 'Korting',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Korting',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Tegoed',
+    'due_filter'                        => 'Tegoed',
+    'edit'                              => 'Bewerk',
+    'edit_item'                         => 'Bewaar',
+    'edit_sale'                         => 'Bewerk Ticket',
+    'email_receipt'                     => 'Email Ticket',
+    'employee'                          => 'Werknemer',
+    'entry'                             => 'Rij',
+    'error_editing_item'                => 'Fout bij bewerken',
+    'find_or_scan_item'                 => 'Zoek/Scan Product',
+    'find_or_scan_item_or_receipt'      => 'Zoek/Scan Product of Ticket',
+    'giftcard'                          => 'Cadeaubon',
+    'giftcard_balance'                  => 'Cadeaubon Resterend',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Cadeaubon nummer',
+    'group_by_category'                 => 'Per Categorie',
+    'group_by_type'                     => 'Per Type',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Verkoop ID',
+    'include_prices'                    => 'Prijzen inclusief?',
+    'insufficient_giftcard_balance'     => 'Onvoldoende cadeaukaart saldo voor deze betaling.',
+    'insufficient_reward_points'        => 'Onvoldoende beloningspunten voor deze betaling.',
+    'invoice'                           => 'Factuur',
+    'invoice_confirm'                   => 'Deze factuur zal verstuurd worden naar',
+    'invoice_enable'                    => 'Maak Factuur',
+    'invoice_filter'                    => 'Facturen',
+    'invoice_no_email'                  => 'Er werd geen email adres gevonden voor deze klant.',
+    'invoice_number'                    => 'Factuur #',
+    'invoice_number_duplicate'          => 'Vul een uniek factuurnummer in.',
+    'invoice_sent'                      => 'Factuur verstuurd naar',
+    'invoice_total'                     => 'Totaal Factuur',
+    'invoice_type_custom_invoice'       => 'Factuur (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Factuur (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Factuur (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Factuur (tax_invoice.php)',
+    'invoice_unsent'                    => 'Fout bij het versturen van factuur naar',
+    'invoice_update'                    => 'Hernummer',
+    'item_insufficient_of_stock'        => 'Product is niet meer in voorraad.',
+    'item_name'                         => 'Naam',
+    'item_number'                       => 'Product #',
+    'item_out_of_stock'                 => 'Product is niet meer in voorraad.',
+    'key_browser'                       => 'Handige Snelkoppelingen',
+    'key_cancel'                        => 'Annuleert Huidige Offerte/Factuur/Verkoop',
+    'key_customer_search'               => 'Klant Zoeken',
+    'key_finish_quote'                  => 'Beëindig Offerte/Factuur zonder betaling',
+    'key_finish_sale'                   => 'Betaling Toevoegen en Factuur/Verkoop Voltooien',
+    'key_full'                          => 'Openen op Volledig Scherm',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Sneltoetsen',
+    'key_help_modal'                    => 'Open Sneltoetsen Venster',
+    'key_in'                            => 'Inzoomen',
+    'key_item_search'                   => 'Artikel Zoeken',
+    'key_out'                           => 'Uitzoomen',
+    'key_payment'                       => 'Betaalmiddel Toevoegen',
+    'key_print'                         => 'Huidige Pagina Afdrukken',
+    'key_restore'                       => 'Originele Weergave/Vergroting Herstellen',
+    'key_search'                        => 'Zoeken in Rapporten Tabellen',
+    'key_suspend'                       => 'Huidige Verkoop Uitstellen',
+    'key_suspended'                     => 'Toon Uitgestelde Verkopen',
+    'key_system'                        => 'Systeem Sneltoetsen',
+    'key_tendered'                      => 'Wijziging Aangeboden Bedrag',
+    'key_title'                         => 'Sneltoetsen Verkoop',
+    'mc'                                => '',
+    'mode'                              => 'Type Registratie',
+    'must_enter_numeric'                => 'Het ontvangen bedrag moet een numerieke waarde zijn.',
+    'must_enter_numeric_giftcard'       => 'Er moet een geldige code worden ingevuld voor de cadeaubon.',
+    'must_enter_reference_code'         => 'Referentie-/ophaalnummer moet worden ingevoerd.',
+    'negative_amount_tendered'          => 'Het ontvangen bedrag mag niet negatief zijn.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Nieuwe klant',
+    'new_item'                          => 'Nieuw Product',
+    'no_description'                    => 'Geen',
+    'no_filter'                         => 'Alle',
+    'no_items_in_cart'                  => 'Er zijn geen verkopen geselecteerd.',
+    'no_sales_to_display'               => 'Er werden geen verkopen gevonden.',
+    'none_selected'                     => 'U hebt geen verkopen geselecteerd.',
+    'nontaxed_ind'                      => ' . ',
+    'not_authorized'                    => 'Deze actie is niet toegestaan.',
+    'one_or_multiple'                   => 'Verkoop(en)',
+    'payment'                           => 'Betaalmethode',
+    'payment_amount'                    => 'Bedrag',
+    'payment_not_cover_total'           => 'Betaalde hoeveelheid is onvoldoende.',
+    'payment_type'                      => 'Type',
+    'payments'                          => '',
+    'payments_total'                    => 'Betaald bedrag',
+    'price'                             => 'Prijs',
+    'print_after_sale'                  => 'Print Ticket',
+    'quantity'                          => 'Aantal',
+    'quantity_less_than_reorder_level'  => 'Waarschuwing, de gewenste hoeveelheid stock is overschreden.',
+    'quantity_less_than_zero'           => 'Waarschuwing: Gewenste hoeveelheid is onvoldoende. U kunt de verkoop nog steeds verwerken, maar controleer uw inventaris.',
+    'quantity_of_items'                 => 'Hoeveelheid van {0} items',
+    'quote'                             => 'Offerte',
+    'quote_number'                      => 'Offertenummer',
+    'quote_number_duplicate'            => 'Offertenummer moet uniek zijn.',
+    'quote_sent'                        => 'Offerte verzonden naar',
+    'quote_unsent'                      => 'Offerte kon niet verzonden worden naar',
+    'receipt'                           => 'Ticket #',
+    'receipt_no_email'                  => 'De klant heeft geen geldig email adres.',
+    'receipt_number'                    => 'Ticket #',
+    'receipt_sent'                      => 'Ticket verstuurd naar',
+    'receipt_unsent'                    => 'Fout bij het versturen van ticket naar',
+    'reference_code'                    => 'Betalingsreferentiecode',
+    'reference_code_invalid_characters' => 'De betalingsreferentiecode mag alleen letters en cijfers bevatten.',
+    'reference_code_length_error'       => 'De lengte van de betalingsreferentiecode is ongeldig.',
+    'refund'                            => 'Type Terugbetaling',
+    'register'                          => 'Kassa',
+    'remove_customer'                   => 'Verwijder Klant',
+    'remove_discount'                   => '',
+    'return'                            => 'Retour',
+    'rewards'                           => 'Punten',
+    'rewards_balance'                   => 'Punten Balans',
+    'rewards_package'                   => 'Spaarpunten',
+    'rewards_remaining_balance'         => 'Saldo Spaarpunten is ',
+    'sale'                              => 'Verkoop',
+    'sale_by_invoice'                   => 'Verkoop op Factuur',
+    'sale_for_customer'                 => 'Klant:',
+    'sale_time'                         => 'Datum',
+    'sales_tax'                         => 'VAT',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Selecteer Klant',
+    'send_invoice'                      => 'Verstuur Factuur',
+    'send_quote'                        => 'Verstuur Offerte',
+    'send_receipt'                      => 'Verstuur Ticket',
+    'send_work_order'                   => 'Verstuur Werkorder',
+    'serial'                            => 'Nummer',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Toon Factuur',
+    'show_receipt'                      => 'Toon Ticket',
+    'start_typing_customer_name'        => 'Typ naam klant...',
+    'start_typing_item_name'            => 'Typ naam product of barcode...',
+    'stock'                             => 'Voorraad',
+    'stock_location'                    => 'Stock Locatie',
+    'sub_total'                         => 'Subtotaal',
+    'successfully_deleted'              => 'Uw aankoop werd verwijderd',
+    'successfully_restored'             => 'U hebt hersteld',
+    'successfully_suspended_sale'       => 'Wijzigingen bewaard voor verkoop.',
+    'successfully_updated'              => 'Verkoop Update Geslaagd.',
+    'suspend_sale'                      => 'Bewaar',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Bewaarde Aankopen',
+    'table'                             => 'Tafel',
+    'takings'                           => 'Overzicht',
+    'tax'                               => 'VAT',
+    'tax_id'                            => 'Tax id',
+    'tax_invoice'                       => 'Vat Factuur',
+    'tax_percent'                       => 'VAT %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Totaal',
+    'total_tax_exclusive'               => 'Totaal',
+    'transaction_failed'                => 'Transactie mislukt.',
+    'unable_to_add_item'                => 'Artikel toevoegen aan Verkoop mislukt',
+    'unsuccessfully_deleted'            => 'De aankoop kon niet verwijderd worden.',
+    'unsuccessfully_restored'           => 'De verkoop kon niet hersteld worden.',
+    'unsuccessfully_suspended_sale'     => 'Uw verkoop werd niet bewaard.',
+    'unsuccessfully_updated'            => 'Fout bij het bewaren van verkoop.',
+    'unsuspend'                         => 'Hervat',
+    'unsuspend_and_delete'              => 'Actie',
+    'update'                            => 'Bewerk',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Werkorder',
+    'work_order_number'                 => 'Werkorder Nummer',
+    'work_order_number_duplicate'       => 'Werkorder Nummer moet uniek zijn.',
+    'work_order_sent'                   => 'Werkorder verzonder naar',
+    'work_order_unsent'                 => 'Werkorder kon niet verzonden worden naar',
 ];
diff --git a/app/Language/nl-NL/Attributes.php b/app/Language/nl-NL/Attributes.php
index 8bd1a67b2..207fc4ac8 100644
--- a/app/Language/nl-NL/Attributes.php
+++ b/app/Language/nl-NL/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Kenmerkwaarde mag niet '_' of '|' bevatten",
-    "confirm_delete"                   => "Weet u zeker dat u de geselecteerde kenmerken wilt verwijderen?",
-    "confirm_restore"                  => "Weet u zeker dat u de geselecteerde kenmerken wilt herstellen?",
-    "definition_cannot_be_deleted"     => "Kan geselecteerde kenmerk(en) niet verwijderen",
-    "definition_error_adding_updating" => "Kenmerk {0} kan niet worden toegevoegd of bijgewerkt. Bekijk het foutenlogboek.",
-    "definition_flags"                 => "Kenmerk zichtbaarheid",
-    "definition_group"                 => "Groep",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Kenmerk toevoegen",
-    "definition_name_required"         => "Kenmerknaam is een vereist veld",
-    "definition_one_or_multiple"       => "kenmerk(en)",
-    "definition_successful_adding"     => "U heeft een artikel toegevoegd",
-    "definition_successful_deleted"    => "U heeft verwijderd",
-    "definition_successful_updating"   => "U heeft het kenmerk bijgewerkt",
-    "definition_type"                  => "Kenmerk soort",
-    "definition_type_required"         => "Kenmerk soort is een vereist veld",
-    "definition_unit"                  => "Maateenheid",
-    "definition_values"                => "Kenmerkwaarden",
-    "new"                              => "Nieuw kenmerk",
-    "no_attributes_to_display"         => "Geen artikelen om te weergeven",
-    "receipt_visibility"               => "Kassabon",
-    "show_in_items"                    => "Weergeven in artikelen",
-    "show_in_items_visibility"         => "Artikelen",
-    "show_in_receipt"                  => "Weergeven op kassabon",
-    "show_in_receivings"               => "Weergeven in leveringen",
-    "show_in_receivings_visibility"    => "Leveringen",
-    "show_in_sales"                    => "Weergeven in verkopen",
-    "show_in_sales_visibility"         => "Verkopen",
-    "update"                           => "Kenmerk bijwerken",
+    'attribute_value_invalid_chars'    => 'Kenmerkwaarde mag niet \'_\' of \'|\' bevatten',
+    'confirm_delete'                   => 'Weet u zeker dat u de geselecteerde kenmerken wilt verwijderen?',
+    'confirm_restore'                  => 'Weet u zeker dat u de geselecteerde kenmerken wilt herstellen?',
+    'definition_cannot_be_deleted'     => 'Kan geselecteerde kenmerk(en) niet verwijderen',
+    'definition_invalid_group' => 'De geselecteerde groep bestaat niet of is ongeldig.',
+    'definition_error_adding_updating' => 'Kenmerk {0} kan niet worden toegevoegd of bijgewerkt. Bekijk het foutenlogboek.',
+    'definition_flags'                 => 'Kenmerk zichtbaarheid',
+    'definition_group'                 => 'Groep',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Kenmerk toevoegen',
+    'definition_name_required'         => 'Kenmerknaam is een vereist veld',
+    'definition_one_or_multiple'       => 'kenmerk(en)',
+    'definition_successful_adding'     => 'U heeft een artikel toegevoegd',
+    'definition_successful_deleted'    => 'U heeft verwijderd',
+    'definition_successful_updating'   => 'U heeft het kenmerk bijgewerkt',
+    'definition_type'                  => 'Kenmerk soort',
+    'definition_type_required'         => 'Kenmerk soort is een vereist veld',
+    'definition_unit'                  => 'Maateenheid',
+    'definition_values'                => 'Kenmerkwaarden',
+    'new'                              => 'Nieuw kenmerk',
+    'no_attributes_to_display'         => 'Geen artikelen om te weergeven',
+    'receipt_visibility'               => 'Kassabon',
+    'show_in_items'                    => 'Weergeven in artikelen',
+    'show_in_items_visibility'         => 'Artikelen',
+    'show_in_receipt'                  => 'Weergeven op kassabon',
+    'show_in_receivings'               => 'Weergeven in leveringen',
+    'show_in_receivings_visibility'    => 'Leveringen',
+    'show_in_sales'                    => 'Weergeven in verkopen',
+    'show_in_sales_visibility'         => 'Verkopen',
+    'show_in_search'                   => 'Weergeven in zoekopdrachten',
+    'show_in_search_visibility'        => 'Zoeken',
+    'update'                           => 'Kenmerk bijwerken',
 ];
diff --git a/app/Language/nl-NL/Bootstrap_tables.php b/app/Language/nl-NL/Bootstrap_tables.php
index 678fb508d..fbb190d2b 100644
--- a/app/Language/nl-NL/Bootstrap_tables.php
+++ b/app/Language/nl-NL/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "alles",
-    "columns"              => "Kolommen",
-    "hide_show_pagination" => "Verbergen/weergeven paginering",
-    "loading"              => "Laden, een ogenblik geduld...",
-    "page_from_to"         => "{0} tot {1} van {2} rijen weergegeven",
-    "refresh"              => "Vernieuwen",
-    "rows_per_page"        => "{0} rijen per pagina",
-    "toggle"               => "Wisselen",
+    'all' => "alles",
+    'columns' => "Kolommen",
+    'hide_show_pagination' => "Verbergen/weergeven paginering",
+    'loading' => "Laden, een ogenblik geduld",
+    'page_from_to' => "{0} tot {1} van {2} rijen weergegeven",
+    'refresh' => "Vernieuwen",
+    'rows_per_page' => "{0} rijen per pagina",
+    'toggle' => "Wisselen",
 ];
diff --git a/app/Language/nl-NL/Calendar.php b/app/Language/nl-NL/Calendar.php
new file mode 100644
index 000000000..d0b31c40b
--- /dev/null
+++ b/app/Language/nl-NL/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "Zo",
+    "mo"        => "Ma",
+    "tu"        => "Di",
+    "we"        => "Wo",
+    "th"        => "Do",
+    "fr"        => "Vr",
+    "sa"        => "Za",
+    "sun"       => "Zon",
+    "mon"       => "Maa",
+    "tue"       => "Din",
+    "wed"       => "Woe",
+    "thu"       => "Don",
+    "fri"       => "Vri",
+    "sat"       => "Zat",
+    "sunday"    => "Zondag",
+    "monday"    => "Maandag",
+    "tuesday"   => "Dinsdag",
+    "wednesday" => "Woensdag",
+    "thursday"  => "Donderdag",
+    "friday"    => "Vrijdag",
+    "saturday"  => "Zaterdag",
+    "jan"       => "Jan",
+    "feb"       => "Feb",
+    "mar"       => "Maa",
+    "apr"       => "Apr",
+    "may"       => "Mei",
+    "jun"       => "Jun",
+    "jul"       => "Jul",
+    "aug"       => "Aug",
+    "sep"       => "Sep",
+    "oct"       => "Okt",
+    "nov"       => "Nov",
+    "dec"       => "Dec",
+    "january"   => "Januari",
+    "february"  => "Februari",
+    "march"     => "Maart",
+    "april"     => "April",
+    "mayl"      => "Mei",
+    "june"      => "Juni",
+    "july"      => "Juli",
+    "august"    => "Augustus",
+    "september" => "September",
+    "october"   => "Oktober",
+    "november"  => "November",
+    "december"  => "December",
+];
\ No newline at end of file
diff --git a/app/Language/nl-NL/Common.php b/app/Language/nl-NL/Common.php
index fdf91bbdb..bce8314cc 100644
--- a/app/Language/nl-NL/Common.php
+++ b/app/Language/nl-NL/Common.php
@@ -3,18 +3,18 @@
 return [
     "address_1"                      => "Adres 1",
     "address_2"                      => "Adres 2",
-    "admin"                          => "",
+    "admin"                          => "Beheerder",
     "city"                           => "Plaats",
-    "clerk"                          => "",
+    "clerk"                          => "Bediende",
     "close"                          => "Sluiten",
-    "color"                          => "",
+    "color"                          => "Thema-kleuren",
     "comments"                       => "Opmerkingen",
     "common"                         => "algemeen",
     "confirm_search"                 => "U heeft één of meerdere rijen geselecteerd, deze zullen niet langer geselecteerd zijn na uw zoekopdracht. Weet u zeker dat u deze zoekopdracht wilt verzenden?",
     "copyrights"                     => "© 2010 - {0}",
     "correct_errors"                 => "Geïdentificeerd fouten oplossen voor het opslaan",
     "country"                        => "Land",
-    "dashboard"                      => "",
+    "dashboard"                      => "Dashboard",
     "date"                           => "Datum",
     "delete"                         => "Verwijderen",
     "det"                            => "details",
@@ -26,14 +26,14 @@ return [
     "export_csv_no"                  => "Nee",
     "export_csv_yes"                 => "Ja",
     "fields_required_message"        => "Rode velden zijn vereist",
-    "fields_required_message_unique" => "",
+    "fields_required_message_unique" => "Rode velden zijn vereist en moeten uniek zijn",
     "first_name"                     => "Voornaam",
     "first_name_required"            => "Voornaam is een vereist veld.",
     "first_page"                     => "Eerste",
     "gender"                         => "Geslacht",
     "gender_female"                  => "V",
     "gender_male"                    => "M",
-    "gender_undefined"               => "",
+    "gender_undefined"               => "Ongedefinieerd",
     "icon"                           => "Pictogram",
     "id"                             => "ID",
     "import"                         => "Importeren",
@@ -49,20 +49,20 @@ return [
     "learn_about_project"            => "om de laatste informatie over het project te bekijken.",
     "list_of"                        => "Lijst van",
     "logo"                           => "Logo",
-    "logo_mark"                      => "",
+    "logo_mark"                      => "Merk",
     "logout"                         => "Afmelden",
-    "manager"                        => "",
+    "manager"                        => "Manager",
     "migration_needed"               => "Een databasemigratie naar {0} zal starten na aanmelding.",
     "new"                            => "Nieuw",
-    "no"                             => "",
+    "no"                             => "Nee",
     "no_persons_to_display"          => "Er zijn geen personen om te weergeven.",
     "none_selected_text"             => "[Selecteren]",
     "or"                             => "OF",
-    "people"                         => "",
+    "people"                         => "Personen",
     "phone_number"                   => "Telefoonnummer",
-    "phone_number_required"          => "",
+    "phone_number_required"          => "Telefoonnummer is vereist",
     "please_visit_my"                => "Bezoek de",
-    "position"                       => "",
+    "position"                       => "Positie",
     "powered_by"                     => "Mogelijk gemaakt door",
     "price"                          => "Prijs",
     "print"                          => "Afdrukken",
@@ -73,8 +73,8 @@ return [
     "search"                         => "Zoeken",
     "search_options"                 => "Zoek opties",
     "searched_for"                   => "Gezocht naar",
-    "software_short"                 => "",
-    "software_title"                 => "",
+    "software_short"                 => "OSPOS",
+    "software_title"                 => "Open Source Point of Sale",
     "state"                          => "Provincie",
     "submit"                         => "Verzenden",
     "total_spent"                    => "Totaal uitgegeven",
@@ -83,7 +83,7 @@ return [
     "website"                        => "opensourcepos.org",
     "welcome"                        => "Welkom",
     "welcome_message"                => "Welkom bij OSPOS, klik op een module hieronder om te beginnen.",
-    "yes"                            => "",
-    "you_are_using_ospos"            => "",
+    "yes"                            => "Ja",
+    "you_are_using_ospos"            => "U gebruikt Open Source Point Of Sale Versie",
     "zip"                            => "Postcode",
 ];
diff --git a/app/Language/nl-NL/Config.php b/app/Language/nl-NL/Config.php
index 21cf16ef1..4234d84a6 100644
--- a/app/Language/nl-NL/Config.php
+++ b/app/Language/nl-NL/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Bedrijfsadres",
-    "address_required"                          => "Bedrijfsadres is een vereist veld.",
-    "all_set"                                   => "Alle bestandsmachtigingen zijn juist ingesteld!",
-    "allow_duplicate_barcodes"                  => "Dezelfde streepjescodes toestaan",
-    "apostrophe"                                => "apostrof",
-    "backup_button"                             => "Reservekopie",
-    "backup_database"                           => "Reservekopie database",
-    "barcode"                                   => "Streepjescode",
-    "barcode_company"                           => "Bedrijfsnaam",
-    "barcode_configuration"                     => "Streepjescode configuratie",
-    "barcode_content"                           => "Streepjescode inhoud",
-    "barcode_first_row"                         => "Rij 1",
-    "barcode_font"                              => "Lettertype",
-    "barcode_formats"                           => "Indelingen invoeren",
-    "barcode_generate_if_empty"                 => "Genereren wanneer leeg.",
-    "barcode_height"                            => "Hoogte (px)",
-    "barcode_id"                                => "Artikel ID/Naam",
-    "barcode_info"                              => "Streepjescode configuratie informatie",
-    "barcode_layout"                            => "Streepjescode indeling",
-    "barcode_name"                              => "Naam",
-    "barcode_number"                            => "Streepjescode",
-    "barcode_number_in_row"                     => "Nummer in rij",
-    "barcode_page_cellspacing"                  => "Pagina cel afstand weergeven.",
-    "barcode_page_width"                        => "Pagina breedte weergeven",
-    "barcode_price"                             => "Prijs",
-    "barcode_second_row"                        => "Rij 2",
-    "barcode_third_row"                         => "Rij 3",
-    "barcode_tooltip"                           => "Waarschuwing: Deze functie kan veroorzaken dat er dubbele items worden geïmporteerd of aangemaakt. Niet gebruiken als u geen dubbele streepjescodes wilt.",
-    "barcode_type"                              => "Streepjescode soort",
-    "barcode_width"                             => "Breedte (px)",
-    "bottom"                                    => "Onderaan",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Contant decimalen",
-    "cash_decimals_tooltip"                     => "Wanneer contant decimalen en valuta decimalen gelijk zijn, vindt er geen contant afronding plaats. Tenzij contant afronding is ingesteld op halveren vijf.",
-    "cash_rounding"                             => "Contant afronding",
-    "category_dropdown"                         => "Categorie als vervolgkeuzelijst weergeven",
-    "center"                                    => "Centreren",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "komma",
-    "company"                                   => "Bedrijfsnaam",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Afbeelding wijzigen",
-    "company_logo"                              => "Bedrijfslogo",
-    "company_remove_image"                      => "Afbeelding verwijderen",
-    "company_required"                          => "Bedrijfsnaam is een vereist veld",
-    "company_select_image"                      => "Afbeelding selecteren",
-    "company_website_url"                       => "Bedrijfswebsite is geen geldige URL (http://...).",
-    "country_codes"                             => "Land codes",
-    "country_codes_tooltip"                     => "Kommagescheiden lijst van land codes voor het opzoeken van adres bij naam.",
-    "currency_code"                             => "Valuta code",
-    "currency_decimals"                         => "Valuta decimalen",
-    "currency_symbol"                           => "Valuta symbool",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Beloning",
-    "customer_reward_duplicate"                 => "Beloning moet uniek zijn.",
-    "customer_reward_enable"                    => "Klantbeloningen inschakelen",
-    "customer_reward_invalid_chars"             => "Beloning met '_' niet bevatten",
-    "customer_reward_required"                  => "Beloning is een vereist veld",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Datum en tijd filter",
-    "datetimeformat"                            => "Datum en tijd indeling",
-    "decimal_point"                             => "Decimaal punt",
-    "default_barcode_font_size_number"          => "Standaard streepjescode lettergrootte moet een getal zijn.",
-    "default_barcode_font_size_required"        => "Standaard streepjescode lettergrootte is een vereist veld.",
-    "default_barcode_height_number"             => "Standaard streepjescode hoogte moet een getal zijn.",
-    "default_barcode_height_required"           => "Standaard streepjescode hoogte is een vereist veld.",
-    "default_barcode_num_in_row_number"         => "Standaard streepjescode nummer in een rij moet een getal zijn.",
-    "default_barcode_num_in_row_required"       => "Standaard streepjescode nummer in een rij is een vereist veld.",
-    "default_barcode_page_cellspacing_number"   => "Standaard streepjescode pagina cel afstand moet een getal zijn.",
-    "default_barcode_page_cellspacing_required" => "Standaard streepjescode pagina cel afstand is een vereist veld.",
-    "default_barcode_page_width_number"         => "Standaard streepjescode pagina breedte moet een getal zijn.",
-    "default_barcode_page_width_required"       => "Standaard streepjescode pagina breedte is een vereist veld.",
-    "default_barcode_width_number"              => "Standaard streepjescode breedte moet een getal zijn.",
-    "default_barcode_width_required"            => "Standaard streepjescode breedte is een vereist veld.",
-    "default_item_columns"                      => "Standaard zichtbare artikelkolommen",
-    "default_origin_tax_code"                   => "Standaard oorsprong belastingcode",
-    "default_receivings_discount"               => "Standaard leveringskorting",
-    "default_receivings_discount_number"        => "Standaard leveringskorting moet een getal zijn.",
-    "default_receivings_discount_required"      => "Standaard leveringskorting is een vereist veld.",
-    "default_sales_discount"                    => "Standaard verkoopkorting",
-    "default_sales_discount_number"             => "Standaard verkoopkorting moet een getal zijn.",
-    "default_sales_discount_required"           => "Standaard verkoopkorting is een vereist veld.",
-    "default_tax_category"                      => "Standaard belastingcategorie",
-    "default_tax_code"                          => "Standaard belastingcode",
-    "default_tax_jurisdiction"                  => "Standaard BTW-jurisdictie",
-    "default_tax_name_number"                   => "Standaard belastingnaam moet een tekenreeks zijn.",
-    "default_tax_name_required"                 => "Standaard belastingnaam is een vereist veld.",
-    "default_tax_rate"                          => "Standaard belastingtarief %",
-    "default_tax_rate_1"                        => "Belasting 1 tarief",
-    "default_tax_rate_2"                        => "Belasting 2 tarief",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Standaard belastingtarief moet een getal zijn.",
-    "default_tax_rate_required"                 => "Standaard belastingtarief is een vereist veld.",
-    "derive_sale_quantity"                      => "Afgeleide verkoophoeveelheid toestaan",
-    "derive_sale_quantity_tooltip"              => "Wanneer aangevinkt zal er een nieuwe artikelsoort worden aangeleverd voor artikelen geordend op uitgebreid bedrag",
-    "dinner_table"                              => "Tafel",
-    "dinner_table_duplicate"                    => "Tafel moet uniek zijn.",
-    "dinner_table_enable"                       => "Eettafels inschakelen",
-    "dinner_table_invalid_chars"                => "Tafelnaam mag '_' niet bevatten.",
-    "dinner_table_required"                     => "Tafel is een vereist veld.",
-    "dot"                                       => "punt",
-    "email"                                     => "E-mail",
-    "email_configuration"                       => "E-mail configuratie",
-    "email_mailpath"                            => "Pad naar Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "E-mail ontvangstbevestiging selectievakje",
-    "email_receipt_check_behaviour_always"      => "Altijd geselecteerd",
-    "email_receipt_check_behaviour_last"        => "Laatste selectie onthouden",
-    "email_receipt_check_behaviour_never"       => "Nooit geselecteerd",
-    "email_smtp_crypto"                         => "SMTP encryptie",
-    "email_smtp_host"                           => "SMTP server",
-    "email_smtp_pass"                           => "SMTP wachtwoord",
-    "email_smtp_port"                           => "SMTP poort",
-    "email_smtp_timeout"                        => "SMTP time-out (s)",
-    "email_smtp_user"                           => "SMTP gebruikersnaam",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Privacy afdwingen",
-    "enforce_privacy_tooltip"                   => "Privacy van klanten beschermen door data te versleutelen als deze verwijderd wordt",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "Er zijn problemen met bestandsmachtigingen. Eerst oplossen en pagina vernieuwen.",
-    "financial_year"                            => "Begin boekjaar",
-    "financial_year_apr"                        => "1 april",
-    "financial_year_aug"                        => "1 augustus",
-    "financial_year_dec"                        => "1 december",
-    "financial_year_feb"                        => "1 februari",
-    "financial_year_jan"                        => "1 januari",
-    "financial_year_jul"                        => "1 juli",
-    "financial_year_jun"                        => "1 juni",
-    "financial_year_mar"                        => "1 maart",
-    "financial_year_may"                        => "1 mei",
-    "financial_year_nov"                        => "1 november",
-    "financial_year_oct"                        => "1 oktober",
-    "financial_year_sep"                        => "1 september",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Aanmeldingspagina reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA geheime sleutel",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA geheime sleutel is een vereist veld",
-    "gcaptcha_site_key"                         => "reCAPTCHA site sleutel",
-    "gcaptcha_site_key_required"                => "reCAPTCHA site sleutel is een vereist veld",
-    "gcaptcha_tooltip"                          => "Aanmeldingspagina beschermen met Google reCAPTCHA. Klik op het pictogram om API sleutel te koppelen.",
-    "general"                                   => "Algemeen",
-    "general_configuration"                     => "Algemene configuratie",
-    "giftcard_number"                           => "Cadeaubonnummer",
-    "giftcard_random"                           => "Willekeurige genereren",
-    "giftcard_series"                           => "Genereren in series",
-    "image_allowed_file_types"                  => "Toegestane bestandstypen",
-    "image_max_height_tooltip"                  => "Maximaal toegestane hoogte van afbeelding uploads in pixels (px).",
-    "image_max_size_tooltip"                    => "Maximaal toegestane bestandsgrootte van afbeelding uploads in kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Maximaal toegestane breedte van afbeelding uploads in pixels (px).",
-    "image_restrictions"                        => "Afbeelding upload beperkingen",
-    "include_hsn"                               => "Ondersteuning voor HSN codes inschakelen",
-    "info"                                      => "Informatie",
-    "info_configuration"                        => "Winkelinformatie",
-    "input_groups"                              => "",
-    "integrations"                              => "Integraties",
-    "integrations_configuration"                => "Derde partij integraties",
-    "invoice"                                   => "Factuur",
-    "invoice_configuration"                     => "Factuur afdrukinstellingen",
-    "invoice_default_comments"                  => "Standaard factuur opmerkingen",
-    "invoice_email_message"                     => "Factuur e-mail sjabloon",
-    "invoice_enable"                            => "Facturering inschakelen",
-    "invoice_printer"                           => "Factuur printer",
-    "invoice_type"                              => "Factuur soort",
-    "is_readable"                               => "is leesbaar, maar de machtigingen zijn onjuist ingesteld. Instellen op 640 of 660 en vernieuwen.",
-    "is_writable"                               => "is schrijfbaar, maar de machtigingen zijn onjuist ingesteld. Instellen op 750 en vernieuwen.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Waarschuwing: Deze functionaliteit werkt alleen wanneer je de FireFox jsPrintSetup invoegtoepassing hebt geïnstalleerd. Toch opslaan?",
-    "language"                                  => "Taal",
-    "last_used_invoice_number"                  => "Laatst gebruikte factuurnummer",
-    "last_used_quote_number"                    => "Laatst gebruikte offertenummer",
-    "last_used_work_order_number"               => "Laatst gebruikte W/O-nummer",
-    "left"                                      => "Links",
-    "license"                                   => "Licentie",
-    "license_configuration"                     => "Licentieoverzicht",
-    "line_sequence"                             => "Lijn volgorde",
-    "lines_per_page"                            => "Lijnen per pagina",
-    "lines_per_page_number"                     => "Lijnen per pagina moet een getal zijn.",
-    "lines_per_page_required"                   => "Lijnen per pagina is een vereist veld.",
-    "locale"                                    => "Lokalisatie",
-    "locale_configuration"                      => "Lokalisatie configuratie",
-    "locale_info"                               => "Lokalisatie configuratie informatie",
-    "location"                                  => "Voorraad",
-    "location_configuration"                    => "Voorraadlocaties",
-    "location_info"                             => "Locatie configuratie informatie",
-    "login_form"                                => "Stijl aanmeldformulier",
-    "logout"                                    => "Wilt u een reservekopie maken voor het afmelden? Klik op [OK] om te bevestigen of op [Annuleren] om toch af te melden.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "MailChimp API-sleutel",
-    "mailchimp_configuration"                   => "MailChimp configuratie",
-    "mailchimp_key_successfully"                => "API-sleutel is geldig.",
-    "mailchimp_key_unsuccessfully"              => "API-sleutel is ongeldig.",
-    "mailchimp_lists"                           => "MailChimp lijst(en)",
-    "mailchimp_tooltip"                         => "Klik op het pictogram voor een API-sleutel.",
-    "message"                                   => "Bericht",
-    "message_configuration"                     => "Bericht configuratie",
-    "msg_msg"                                   => "Opgeslagen sms-bericht",
-    "msg_msg_placeholder"                       => "Sla uw bericht hier op als u een sms-sjabloon wilt maken, zo niet laat het vak leeg.",
-    "msg_pwd"                                   => "Sms API wachtwoord",
-    "msg_pwd_required"                          => "Sms API wachtwoord is een vereist veld",
-    "msg_src"                                   => "Sms API afzender ID",
-    "msg_src_required"                          => "Sms API afzender ID is een vereist veld",
-    "msg_uid"                                   => "Sms API gebruikersnaam",
-    "msg_uid_required"                          => "Sms API gebruikersnaam is een vereist veld",
-    "multi_pack_enabled"                        => "Meerdere pakketten per artikel",
-    "no_risk"                                   => "Geen kwetsbaarheden/beveiligingsrisico's.",
-    "none"                                      => "geen",
-    "notify_alignment"                          => "Meldingspop-up positie",
-    "number_format"                             => "Nummer indeling",
-    "number_locale"                             => "Lokalisatie",
-    "number_locale_invalid"                     => "De ingevoerde landinstelling is ongeldig. Bekijk de koppeling in de knopinfo om een geldige landinstelling te vinden.",
-    "number_locale_required"                    => "Nummer landinstelling is een vereist veld.",
-    "number_locale_tooltip"                     => "Vind een geschikte landinstelling via deze koppeling.",
-    "os_timezone"                               => "OSPOS tijdzone:",
-    "ospos_info"                                => "OSPOS installatie info",
-    "payment_options_order"                     => "Betalingsopties volgorde",
-    "perm_risk"                                 => "Onjuiste machtigingen zijn een risico voor deze software.",
-    "phone"                                     => "Telefoonnummer bedrijf",
-    "phone_required"                            => "Telefoonnummer bedrijf is een vereist veld.",
-    "print_bottom_margin"                       => "Marge onderkant",
-    "print_bottom_margin_number"                => "Marge onderkant moet een getal zijn.",
-    "print_bottom_margin_required"              => "Marge onderkant is een vereist veld.",
-    "print_delay_autoreturn"                    => "Vertraging automatisch terugkeren naar verkoop",
-    "print_delay_autoreturn_number"             => "Vertraging automatisch terugkeren naar verkoop is een vereist veld.",
-    "print_delay_autoreturn_required"           => "Vertraging automatisch terugkeren naar verkoop moet een getal zijn.",
-    "print_footer"                              => "Browser voettekst afdrukken",
-    "print_header"                              => "Browser koptekst afdrukken",
-    "print_left_margin"                         => "Marge linkerkant",
-    "print_left_margin_number"                  => "Marge linkerkant moet een getal zijn.",
-    "print_left_margin_required"                => "Marge linkerkant is een vereist veld.",
-    "print_receipt_check_behaviour"             => "Kassabon afdrukken selectievakje",
-    "print_receipt_check_behaviour_always"      => "Altijd geselecteerd",
-    "print_receipt_check_behaviour_last"        => "Laatst gebruikt onthouden",
-    "print_receipt_check_behaviour_never"       => "Nooit geselecteerd",
-    "print_right_margin"                        => "Marge rechterkant",
-    "print_right_margin_number"                 => "Marge rechterkant moet een getal zijn.",
-    "print_right_margin_required"               => "Marge rechterkant is een vereist veld.",
-    "print_silently"                            => "Dialoogvenster afdrukken weergeven",
-    "print_top_margin"                          => "Marge bovenkant",
-    "print_top_margin_number"                   => "Marge bovenkant moet een getal zijn.",
-    "print_top_margin_required"                 => "Marge bovenkant is een vereist veld.",
-    "quantity_decimals"                         => "Hoeveelheid decimalen",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Standaard offerte opmerkingen",
-    "receipt"                                   => "Kassabon",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Kassabon afdrukinstellingen",
-    "receipt_default"                           => "Standaard",
-    "receipt_font_size"                         => "Lettergrootte",
-    "receipt_font_size_number"                  => "Lettergrootte moet een getal zijn.",
-    "receipt_font_size_required"                => "Lettergrootte is een vereist veld.",
-    "receipt_info"                              => "Kassabon configuratie informatie",
-    "receipt_printer"                           => "Ticket printer",
-    "receipt_short"                             => "Kort",
-    "receipt_show_company_name"                 => "Bedrijfsnaam weergeven",
-    "receipt_show_description"                  => "Beschrijving weergeven",
-    "receipt_show_serialnumber"                 => "Serienummer weergeven",
-    "receipt_show_tax_ind"                      => "Belastingindicator weergeven",
-    "receipt_show_taxes"                        => "Belastingen weergeven",
-    "receipt_show_total_discount"               => "Totale korting weergeven",
-    "receipt_template"                          => "Kassabon sjabloon",
-    "receiving_calculate_average_price"         => "Gemiddelde prijs berekenen (levering)",
-    "recv_invoice_format"                       => "Leveringen factuurindeling",
-    "register_mode_default"                     => "Standaard kassa modus",
-    "report_an_issue"                           => "Probleem melden",
-    "return_policy_required"                    => "Retourbeleid is een vereist veld.",
-    "reward"                                    => "Beloning",
-    "reward_configuration"                      => "Beloning configuratie",
-    "right"                                     => "Rechts",
-    "sales_invoice_format"                      => "Indeling verkoopfactuur",
-    "sales_quote_format"                        => "Indeling verkoopofferte",
-    "saved_successfully"                        => "Configuratie opgeslagen.",
-    "saved_unsuccessfully"                      => "Configuratie opslaan mislukt.",
-    "security_issue"                            => "Beveilingskwetsbaarheid waarschuwing",
-    "server_notice"                             => "Gebruik onderstaande info om het probleem te melden.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Kantoor pictogram weergeven",
-    "statistics"                                => "Statistieken verzenden",
-    "statistics_tooltip"                        => "Statistieken verzenden voor ontwikkelings- en functie verbeteringen.",
-    "stock_location"                            => "Voorraadlocatie",
-    "stock_location_duplicate"                  => "Voorraadlocatie moet uniek zijn.",
-    "stock_location_invalid_chars"              => "Voorraadlocatie mag '_' niet bevatten.",
-    "stock_location_required"                   => "Voorraadlocatie is een vereist veld.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Kolom 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Indeling zoeksuggesties",
-    "suggestions_second_column"                 => "Kolom 2",
-    "suggestions_third_column"                  => "Kolom 3",
-    "system_conf"                               => "Installatie & configuratie",
-    "system_info"                               => "Systeeminfo",
-    "table"                                     => "Tafel",
-    "table_configuration"                       => "Tafel configuratie",
-    "takings_printer"                           => "Kassabon printer",
-    "tax"                                       => "Belasting",
-    "tax_category"                              => "belastingcategorie",
-    "tax_category_duplicate"                    => "De ingevoerde belastingcategorie bestaat al.",
-    "tax_category_invalid_chars"                => "De ingevoerde belastingcategorie is ongeldig.",
-    "tax_category_required"                     => "De belastingcategorie is vereist.",
-    "tax_category_used"                         => "Kan belastingcategorie niet verwijderen omdat deze in gebruik is.",
-    "tax_configuration"                         => "Belasting configuratie",
-    "tax_decimals"                              => "Belasting decimalen",
-    "tax_id"                                    => "Belasting ID",
-    "tax_included"                              => "Inclusief belasting",
-    "theme"                                     => "Thema",
-    "theme_preview"                             => "Thema voorbeeld:",
-    "thousands_separator"                       => "Duizenden scheidingsteken",
-    "timezone"                                  => "Tijdzone",
-    "timezone_error"                            => "OSPOS tijdzone is anders dan uw lokale tijdzone.",
-    "top"                                       => "Boven",
-    "use_destination_based_tax"                 => "Bestemming gebaseerde belasting gebruiken",
-    "user_timezone"                             => "Lokale tijdzone:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Werkorder ondersteuning",
-    "work_order_format"                         => "Indeling werkorder",
+    'address'                                   => 'Bedrijfsadres',
+    'address_required'                          => 'Bedrijfsadres is een vereist veld.',
+    'all_set'                                   => 'Alle bestandsmachtigingen zijn juist ingesteld!',
+    'allow_duplicate_barcodes'                  => 'Dezelfde streepjescodes toestaan',
+    'apostrophe'                                => 'apostrof',
+    'backup_button'                             => 'Reservekopie',
+    'backup_database'                           => 'Reservekopie database',
+    'barcode'                                   => 'Streepjescode',
+    'barcode_company'                           => 'Bedrijfsnaam',
+    'barcode_configuration'                     => 'Streepjescode configuratie',
+    'barcode_content'                           => 'Streepjescode inhoud',
+    'barcode_first_row'                         => 'Rij 1',
+    'barcode_font'                              => 'Lettertype',
+    'barcode_formats'                           => 'Indelingen invoeren',
+    'barcode_generate_if_empty'                 => 'Genereren wanneer leeg.',
+    'barcode_height'                            => 'Hoogte (px)',
+    'barcode_id'                                => 'Artikel ID/Naam',
+    'barcode_info'                              => 'Streepjescode configuratie informatie',
+    'barcode_layout'                            => 'Streepjescode indeling',
+    'barcode_name'                              => 'Naam',
+    'barcode_number'                            => 'Streepjescode',
+    'barcode_number_in_row'                     => 'Nummer in rij',
+    'barcode_page_cellspacing'                  => 'Pagina cel afstand weergeven.',
+    'barcode_page_width'                        => 'Pagina breedte weergeven',
+    'barcode_price'                             => 'Prijs',
+    'barcode_second_row'                        => 'Rij 2',
+    'barcode_third_row'                         => 'Rij 3',
+    'barcode_tooltip'                           => 'Waarschuwing: Deze functie kan veroorzaken dat er dubbele items worden geïmporteerd of aangemaakt. Niet gebruiken als u geen dubbele streepjescodes wilt.',
+    'barcode_type'                              => 'Streepjescode soort',
+    'barcode_width'                             => 'Breedte (px)',
+    'bottom'                                    => 'Onderaan',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Contant decimalen',
+    'cash_decimals_tooltip'                     => 'Wanneer contant decimalen en valuta decimalen gelijk zijn, vindt er geen contant afronding plaats. Tenzij contant afronding is ingesteld op halveren vijf.',
+    'cash_rounding'                             => 'Contant afronding',
+    'category_dropdown'                         => 'Categorie als vervolgkeuzelijst weergeven',
+    'center'                                    => 'Centreren',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'komma',
+    'company'                                   => 'Bedrijfsnaam',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Afbeelding wijzigen',
+    'company_logo'                              => 'Bedrijfslogo',
+    'company_remove_image'                      => 'Afbeelding verwijderen',
+    'company_required'                          => 'Bedrijfsnaam is een vereist veld',
+    'company_select_image'                      => 'Afbeelding selecteren',
+    'company_website_url'                       => 'Bedrijfswebsite is geen geldige URL (http://...).',
+    'country_codes'                             => 'Land codes',
+    'country_codes_tooltip'                     => 'Kommagescheiden lijst van land codes voor het opzoeken van adres bij naam.',
+    'currency_code'                             => 'Valuta code',
+    'currency_decimals'                         => 'Valuta decimalen',
+    'currency_symbol'                           => 'Valuta symbool',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Beloning',
+    'customer_reward_duplicate'                 => 'Beloning moet uniek zijn.',
+    'customer_reward_enable'                    => 'Klantbeloningen inschakelen',
+    'customer_reward_invalid_chars'             => "Beloning met '_' niet bevatten",
+    'customer_reward_required'                  => 'Beloning is een vereist veld',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Datum en tijd filter',
+    'datetimeformat'                            => 'Datum en tijd indeling',
+    'decimal_point'                             => 'Decimaal punt',
+    'default_barcode_font_size_number'          => 'Standaard streepjescode lettergrootte moet een getal zijn.',
+    'default_barcode_font_size_required'        => 'Standaard streepjescode lettergrootte is een vereist veld.',
+    'default_barcode_height_number'             => 'Standaard streepjescode hoogte moet een getal zijn.',
+    'default_barcode_height_required'           => 'Standaard streepjescode hoogte is een vereist veld.',
+    'default_barcode_num_in_row_number'         => 'Standaard streepjescode nummer in een rij moet een getal zijn.',
+    'default_barcode_num_in_row_required'       => 'Standaard streepjescode nummer in een rij is een vereist veld.',
+    'default_barcode_page_cellspacing_number'   => 'Standaard streepjescode pagina cel afstand moet een getal zijn.',
+    'default_barcode_page_cellspacing_required' => 'Standaard streepjescode pagina cel afstand is een vereist veld.',
+    'default_barcode_page_width_number'         => 'Standaard streepjescode pagina breedte moet een getal zijn.',
+    'default_barcode_page_width_required'       => 'Standaard streepjescode pagina breedte is een vereist veld.',
+    'default_barcode_width_number'              => 'Standaard streepjescode breedte moet een getal zijn.',
+    'default_barcode_width_required'            => 'Standaard streepjescode breedte is een vereist veld.',
+    'default_item_columns'                      => 'Standaard zichtbare artikelkolommen',
+    'default_origin_tax_code'                   => 'Standaard oorsprong belastingcode',
+    'default_receivings_discount'               => 'Standaard leveringskorting',
+    'default_receivings_discount_number'        => 'Standaard leveringskorting moet een getal zijn.',
+    'default_receivings_discount_required'      => 'Standaard leveringskorting is een vereist veld.',
+    'default_sales_discount'                    => 'Standaard verkoopkorting',
+    'default_sales_discount_number'             => 'Standaard verkoopkorting moet een getal zijn.',
+    'default_sales_discount_required'           => 'Standaard verkoopkorting is een vereist veld.',
+    'default_tax_category'                      => 'Standaard belastingcategorie',
+    'default_tax_code'                          => 'Standaard belastingcode',
+    'default_tax_jurisdiction'                  => 'Standaard BTW-jurisdictie',
+    'default_tax_name_number'                   => 'Standaard belastingnaam moet een tekenreeks zijn.',
+    'default_tax_name_required'                 => 'Standaard belastingnaam is een vereist veld.',
+    'default_tax_rate'                          => 'Standaard belastingtarief %',
+    'default_tax_rate_1'                        => 'Belasting 1 tarief',
+    'default_tax_rate_2'                        => 'Belasting 2 tarief',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Standaard belastingtarief moet een getal zijn.',
+    'default_tax_rate_required'                 => 'Standaard belastingtarief is een vereist veld.',
+    'derive_sale_quantity'                      => 'Afgeleide verkoophoeveelheid toestaan',
+    'derive_sale_quantity_tooltip'              => 'Wanneer aangevinkt zal er een nieuwe artikelsoort worden aangeleverd voor artikelen geordend op uitgebreid bedrag',
+    'dinner_table'                              => 'Tafel',
+    'dinner_table_duplicate'                    => 'Tafel moet uniek zijn.',
+    'dinner_table_enable'                       => 'Eettafels inschakelen',
+    'dinner_table_invalid_chars'                => "Tafelnaam mag '_' niet bevatten.",
+    'dinner_table_required'                     => 'Tafel is een vereist veld.',
+    'dot'                                       => 'punt',
+    'email'                                     => 'E-mail',
+    'email_configuration'                       => 'E-mail configuratie',
+    'email_mailpath'                            => 'Pad naar Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'E-mail ontvangstbevestiging selectievakje',
+    'email_receipt_check_behaviour_always'      => 'Altijd geselecteerd',
+    'email_receipt_check_behaviour_last'        => 'Laatste selectie onthouden',
+    'email_receipt_check_behaviour_never'       => 'Nooit geselecteerd',
+    'email_smtp_crypto'                         => 'SMTP encryptie',
+    'email_smtp_host'                           => 'SMTP server',
+    'email_smtp_pass'                           => 'SMTP wachtwoord',
+    'email_smtp_port'                           => 'SMTP poort',
+    'email_smtp_timeout'                        => 'SMTP time-out (s)',
+    'email_smtp_user'                           => 'SMTP gebruikersnaam',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Privacy afdwingen',
+    'enforce_privacy_tooltip'                   => 'Privacy van klanten beschermen door data te versleutelen als deze verwijderd wordt',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'Er zijn problemen met bestandsmachtigingen. Eerst oplossen en pagina vernieuwen.',
+    'financial_year'                            => 'Begin boekjaar',
+    'financial_year_apr'                        => '1 april',
+    'financial_year_aug'                        => '1 augustus',
+    'financial_year_dec'                        => '1 december',
+    'financial_year_feb'                        => '1 februari',
+    'financial_year_jan'                        => '1 januari',
+    'financial_year_jul'                        => '1 juli',
+    'financial_year_jun'                        => '1 juni',
+    'financial_year_mar'                        => '1 maart',
+    'financial_year_may'                        => '1 mei',
+    'financial_year_nov'                        => '1 november',
+    'financial_year_oct'                        => '1 oktober',
+    'financial_year_sep'                        => '1 september',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Aanmeldingspagina reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA geheime sleutel',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA geheime sleutel is een vereist veld',
+    'gcaptcha_site_key'                         => 'reCAPTCHA site sleutel',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA site sleutel is een vereist veld',
+    'gcaptcha_tooltip'                          => 'Aanmeldingspagina beschermen met Google reCAPTCHA. Klik op het pictogram om API sleutel te koppelen.',
+    'general'                                   => 'Algemeen',
+    'general_configuration'                     => 'Algemene configuratie',
+    'giftcard_number'                           => 'Cadeaubonnummer',
+    'giftcard_random'                           => 'Willekeurige genereren',
+    'giftcard_series'                           => 'Genereren in series',
+    'image_allowed_file_types'                  => 'Toegestane bestandstypen',
+    'image_max_height_tooltip'                  => 'Maximaal toegestane hoogte van afbeelding uploads in pixels (px).',
+    'image_max_size_tooltip'                    => 'Maximaal toegestane bestandsgrootte van afbeelding uploads in kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Maximaal toegestane breedte van afbeelding uploads in pixels (px).',
+    'image_restrictions'                        => 'Afbeelding upload beperkingen',
+    'include_hsn'                               => 'Ondersteuning voor HSN codes inschakelen',
+    'info'                                      => 'Informatie',
+    'info_configuration'                        => 'Winkelinformatie',
+    'input_groups'                              => '',
+    'integrations'                              => 'Integraties',
+    'integrations_configuration'                => 'Derde partij integraties',
+    'invoice'                                   => 'Factuur',
+    'invoice_configuration'                     => 'Factuur afdrukinstellingen',
+    'invoice_default_comments'                  => 'Standaard factuur opmerkingen',
+    'invoice_email_message'                     => 'Factuur e-mail sjabloon',
+    'invoice_enable'                            => 'Facturering inschakelen',
+    'invoice_printer'                           => 'Factuur printer',
+    'invoice_type'                              => 'Factuur soort',
+    'is_readable'                               => 'is leesbaar, maar de machtigingen zijn onjuist ingesteld. Instellen op 640 of 660 en vernieuwen.',
+    'is_writable'                               => 'is schrijfbaar, maar de machtigingen zijn onjuist ingesteld. Instellen op 750 en vernieuwen.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Waarschuwing: Deze functionaliteit werkt alleen wanneer je de FireFox jsPrintSetup invoegtoepassing hebt geïnstalleerd. Toch opslaan?',
+    'language'                                  => 'Taal',
+    'last_used_invoice_number'                  => 'Laatst gebruikte factuurnummer',
+    'last_used_quote_number'                    => 'Laatst gebruikte offertenummer',
+    'last_used_work_order_number'               => 'Laatst gebruikte W/O-nummer',
+    'left'                                      => 'Links',
+    'license'                                   => 'Licentie',
+    'license_configuration'                     => 'Licentieoverzicht',
+    'line_sequence'                             => 'Lijn volgorde',
+    'lines_per_page'                            => 'Lijnen per pagina',
+    'lines_per_page_number'                     => 'Lijnen per pagina moet een getal zijn.',
+    'lines_per_page_required'                   => 'Lijnen per pagina is een vereist veld.',
+    'locale'                                    => 'Lokalisatie',
+    'locale_configuration'                      => 'Lokalisatie configuratie',
+    'locale_info'                               => 'Lokalisatie configuratie informatie',
+    'location'                                  => 'Voorraad',
+    'location_configuration'                    => 'Voorraadlocaties',
+    'location_info'                             => 'Locatie configuratie informatie',
+    'login_form'                                => 'Stijl aanmeldformulier',
+    'logout'                                    => 'Wilt u een reservekopie maken voor het afmelden? Klik op [OK] om te bevestigen of op [Annuleren] om toch af te melden.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'MailChimp API-sleutel',
+    'mailchimp_configuration'                   => 'MailChimp configuratie',
+    'mailchimp_key_successfully'                => 'API-sleutel is geldig.',
+    'mailchimp_key_unsuccessfully'              => 'API-sleutel is ongeldig.',
+    'mailchimp_lists'                           => 'MailChimp lijst(en)',
+    'mailchimp_tooltip'                         => 'Klik op het pictogram voor een API-sleutel.',
+    'message'                                   => 'Bericht',
+    'message_configuration'                     => 'Bericht configuratie',
+    'msg_msg'                                   => 'Opgeslagen sms-bericht',
+    'msg_msg_placeholder'                       => 'Sla uw bericht hier op als u een sms-sjabloon wilt maken, zo niet laat het vak leeg.',
+    'msg_pwd'                                   => 'Sms API wachtwoord',
+    'msg_src'                                   => 'Sms API afzender ID',
+    'msg_src_required'                          => 'Sms API afzender ID is een vereist veld',
+    'msg_uid'                                   => 'Sms API gebruikersnaam',
+    'msg_uid_required'                          => 'Sms API gebruikersnaam is een vereist veld',
+    'multi_pack_enabled'                        => 'Meerdere pakketten per artikel',
+    'no_risk'                                   => "Geen kwetsbaarheden/beveiligingsrisico's.",
+    'none'                                      => 'geen',
+    'notify_alignment'                          => 'Meldingspop-up positie',
+    'number_format'                             => 'Nummer indeling',
+    'number_locale'                             => 'Lokalisatie',
+    'number_locale_invalid'                     => 'De ingevoerde landinstelling is ongeldig. Bekijk de koppeling in de knopinfo om een geldige landinstelling te vinden.',
+    'number_locale_required'                    => 'Nummer landinstelling is een vereist veld.',
+    'number_locale_tooltip'                     => 'Vind een geschikte landinstelling via deze koppeling.',
+    'os_timezone'                               => 'OSPOS tijdzone:',
+    'ospos_info'                                => 'OSPOS installatie info',
+    'payment_options_order'                     => 'Betalingsopties volgorde',
+    'payment_reference_code_length_limits'      => 'Betalingsreferentiecode<br>Lengtelimieten',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Onjuiste machtigingen zijn een risico voor deze software.',
+    'phone'                                     => 'Telefoonnummer bedrijf',
+    'phone_required'                            => 'Telefoonnummer bedrijf is een vereist veld.',
+    'print_bottom_margin'                       => 'Marge onderkant',
+    'print_bottom_margin_number'                => 'Marge onderkant moet een getal zijn.',
+    'print_bottom_margin_required'              => 'Marge onderkant is een vereist veld.',
+    'print_delay_autoreturn'                    => 'Vertraging automatisch terugkeren naar verkoop',
+    'print_delay_autoreturn_number'             => 'Vertraging automatisch terugkeren naar verkoop is een vereist veld.',
+    'print_delay_autoreturn_required'           => 'Vertraging automatisch terugkeren naar verkoop moet een getal zijn.',
+    'print_footer'                              => 'Browser voettekst afdrukken',
+    'print_header'                              => 'Browser koptekst afdrukken',
+    'print_left_margin'                         => 'Marge linkerkant',
+    'print_left_margin_number'                  => 'Marge linkerkant moet een getal zijn.',
+    'print_left_margin_required'                => 'Marge linkerkant is een vereist veld.',
+    'print_receipt_check_behaviour'             => 'Kassabon afdrukken selectievakje',
+    'print_receipt_check_behaviour_always'      => 'Altijd geselecteerd',
+    'print_receipt_check_behaviour_last'        => 'Laatst gebruikt onthouden',
+    'print_receipt_check_behaviour_never'       => 'Nooit geselecteerd',
+    'print_right_margin'                        => 'Marge rechterkant',
+    'print_right_margin_number'                 => 'Marge rechterkant moet een getal zijn.',
+    'print_right_margin_required'               => 'Marge rechterkant is een vereist veld.',
+    'print_silently'                            => 'Dialoogvenster afdrukken weergeven',
+    'print_top_margin'                          => 'Marge bovenkant',
+    'print_top_margin_number'                   => 'Marge bovenkant moet een getal zijn.',
+    'print_top_margin_required'                 => 'Marge bovenkant is een vereist veld.',
+    'quantity_decimals'                         => 'Hoeveelheid decimalen',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Standaard offerte opmerkingen',
+    'receipt'                                   => 'Kassabon',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Kassabon afdrukinstellingen',
+    'receipt_default'                           => 'Standaard',
+    'receipt_font_size'                         => 'Lettergrootte',
+    'receipt_font_size_number'                  => 'Lettergrootte moet een getal zijn.',
+    'receipt_font_size_required'                => 'Lettergrootte is een vereist veld.',
+    'receipt_info'                              => 'Kassabon configuratie informatie',
+    'receipt_printer'                           => 'Ticket printer',
+    'receipt_short'                             => 'Kort',
+    'receipt_show_company_name'                 => 'Bedrijfsnaam weergeven',
+    'receipt_show_description'                  => 'Beschrijving weergeven',
+    'receipt_show_serialnumber'                 => 'Serienummer weergeven',
+    'receipt_show_tax_ind'                      => 'Belastingindicator weergeven',
+    'receipt_show_taxes'                        => 'Belastingen weergeven',
+    'receipt_show_total_discount'               => 'Totale korting weergeven',
+    'receipt_template'                          => 'Kassabon sjabloon',
+    'receiving_calculate_average_price'         => 'Gemiddelde prijs berekenen (levering)',
+    'recv_invoice_format'                       => 'Leveringen factuurindeling',
+    'register_mode_default'                     => 'Standaard kassa modus',
+    'report_an_issue'                           => 'Probleem melden',
+    'return_policy_required'                    => 'Retourbeleid is een vereist veld.',
+    'reward'                                    => 'Beloning',
+    'reward_configuration'                      => 'Beloning configuratie',
+    'right'                                     => 'Rechts',
+    'sales_invoice_format'                      => 'Indeling verkoopfactuur',
+    'sales_quote_format'                        => 'Indeling verkoopofferte',
+    'mailpath_invalid'                          => 'Ongeldig sendmail-pad. Alleen letters, cijfers, streepjes, onderstrepingstekens, schuine strepen, omgekeerde schuine strepen, dubbele punten, spaties en punten zijn toegestaan.',
+    'saved_successfully'                        => 'Configuratie opgeslagen.',
+    'saved_unsuccessfully'                      => 'Configuratie opslaan mislukt.',
+    'security_issue'                            => 'Beveilingskwetsbaarheid waarschuwing',
+    'server_notice'                             => 'Gebruik onderstaande info om het probleem te melden.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Kantoor pictogram weergeven',
+    'statistics'                                => 'Statistieken verzenden',
+    'statistics_tooltip'                        => 'Statistieken verzenden voor ontwikkelings- en functie verbeteringen.',
+    'stock_location'                            => 'Voorraadlocatie',
+    'stock_location_duplicate'                  => 'Voorraadlocatie moet uniek zijn.',
+    'stock_location_invalid_chars'              => "Voorraadlocatie mag '_' niet bevatten.",
+    'stock_location_required'                   => 'Voorraadlocatie is een vereist veld.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Kolom 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Indeling zoeksuggesties',
+    'suggestions_second_column'                 => 'Kolom 2',
+    'suggestions_third_column'                  => 'Kolom 3',
+    'system_conf'                               => 'Installatie & configuratie',
+    'system_info'                               => 'Systeeminfo',
+    'table'                                     => 'Tafel',
+    'table_configuration'                       => 'Tafel configuratie',
+    'takings_printer'                           => 'Kassabon printer',
+    'tax'                                       => 'Belasting',
+    'tax_category'                              => 'belastingcategorie',
+    'tax_category_duplicate'                    => 'De ingevoerde belastingcategorie bestaat al.',
+    'tax_category_invalid_chars'                => 'De ingevoerde belastingcategorie is ongeldig.',
+    'tax_category_required'                     => 'De belastingcategorie is vereist.',
+    'tax_category_used'                         => 'Kan belastingcategorie niet verwijderen omdat deze in gebruik is.',
+    'tax_configuration'                         => 'Belasting configuratie',
+    'tax_decimals'                              => 'Belasting decimalen',
+    'tax_id'                                    => 'Belasting ID',
+    'tax_included'                              => 'Inclusief belasting',
+    'theme'                                     => 'Thema',
+    'theme_preview'                             => 'Thema voorbeeld:',
+    'thousands_separator'                       => 'Duizenden scheidingsteken',
+    'timezone'                                  => 'Tijdzone',
+    'timezone_error'                            => 'OSPOS tijdzone is anders dan uw lokale tijdzone.',
+    'top'                                       => 'Boven',
+    'use_destination_based_tax'                 => 'Bestemming gebaseerde belasting gebruiken',
+    'user_timezone'                             => 'Lokale tijdzone:',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Werkorder ondersteuning',
+    'work_order_format'                         => 'Indeling werkorder',
 ];
diff --git a/app/Language/nl-NL/Employees.php b/app/Language/nl-NL/Employees.php
index f288602c3..e62e282c3 100644
--- a/app/Language/nl-NL/Employees.php
+++ b/app/Language/nl-NL/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informatie",
-    "cannot_be_deleted"            => "Kan geselecteerde werknemer(s) niet verwijderen, één of meerdere bevatten verwerkte verkopen of u probeert uw account te verwijderen.",
-    "change_employee"              => "",
-    "change_password"              => "Wachtwoord wijzigen",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Weet u zeker dat u de geselecteerde werknemer(s) wilt verwijderen?",
-    "confirm_restore"              => "Weet u zeker dat u de geselecteerde werknemer(s) wilt herstellen?",
-    "current_password"             => "Huidige wachtwoord",
-    "current_password_invalid"     => "Huidige wachtwoord is ongeldig.",
-    "employee"                     => "Werknemer",
-    "error_adding_updating"        => "Werknemer toevoegen of bijwerken mislukt.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Kan de demo admin gebruiker niet verwijderen.",
-    "error_updating_demo_admin"    => "Kan de demo admin gebruiker niet wijzigen.",
-    "language"                     => "Taal",
-    "login_info"                   => "Aanmelden",
-    "manager"                      => "",
-    "new"                          => "Nieuwe werknemer",
-    "none_selected"                => "Geen werknemer(s) geselecteerd om te verwijderen.",
-    "one_or_multiple"              => "werknemer(s)",
-    "password"                     => "Wachtwoord",
-    "password_minlength"           => "Wachtwoord moet minstens 8 karakters bevatten.",
-    "password_must_match"          => "Wachtwoorden komen niet overeen.",
-    "password_not_must_match"      => "Huidige wachtwoord en nieuwe wachtwoord moeten uniek zijn.",
-    "password_required"            => "Wachtwoord is vereist.",
-    "permission_desc"              => "De selectievakjes hieronder selecteren om toegang te verlenen tot modules.",
-    "permission_info"              => "Machtigingen",
-    "repeat_password"              => "Wachtwoord opnieuw",
-    "subpermission_required"       => "Tenminste eenmaal toegang verlenen voor elke module.",
-    "successful_adding"            => "Werknemer toegevoegd.",
-    "successful_change_password"   => "Wachtwoord gewijzigd.",
-    "successful_deleted"           => "U heeft verwijderd",
-    "successful_updating"          => "Werknemer bijgewerkt",
-    "system_language"              => "Systeemtaal",
-    "unsuccessful_change_password" => "Wachtwoord wijzigen mislukt.",
-    "update"                       => "Werknemer bijwerken",
-    "username"                     => "Gebruikersnaam",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Gebruikersnaam moet minstens 5 karakters bevatten.",
-    "username_required"            => "Gebruikersnaam is een vereist veld.",
+    'administrator'                          => 'Beheerder',
+    'basic_information'                      => 'Informatie',
+    'cannot_be_deleted'                      => 'Kan geselecteerde werknemer(s) niet verwijderen',
+    'change_employee'                        => 'Werknemer wijzigen',
+    'change_password'                        => 'Wachtwoord wijzigen',
+    'clerk'                                  => 'Bediende',
+    'commission'                             => 'Commissie',
+    'confirm_delete'                         => 'Weet u zeker dat u de geselecteerde werknemer(s) wilt verwijderen?',
+    'confirm_restore'                        => 'Weet u zeker dat u de geselecteerde werknemer(s) wilt herstellen?',
+    'current_password'                       => 'Huidige wachtwoord',
+    'current_password_invalid'               => 'Huidige wachtwoord is ongeldig.',
+    'employee'                               => 'Werknemer',
+    'error_adding_updating'                  => 'Werknemer toevoegen of bijwerken mislukt.',
+    'error_cannot_remove_own_minimum_grant'  => 'U kunt uw eigen minimale machtigingen voor modules niet verwijderen.',
+    'error_deleting_admin'                   => 'U kunt een beheerder niet verwijderen.',
+    'error_deleting_demo_admin'              => 'Kan de demo admin gebruiker niet verwijderen.',
+    'error_grant_change_disallowed'          => 'Machtigingswijzigingen zijn uitgeschakeld in deze demo.',
+    'error_password_change_disallowed'       => 'Wachtwoordwijzigingen zijn uitgeschakeld in deze demo.',
+    'error_updating_admin'                   => 'U kunt een beheerder niet wijzigen.',
+    'error_updating_demo_admin'              => 'Kan de demo admin gebruiker niet wijzigen.',
+    'language'                               => 'Taal',
+    'login_info'                             => 'Aanmelden',
+    'manager'                                => 'Manager',
+    'new'                                    => 'Nieuwe werknemer',
+    'none_selected'                          => 'Geen werknemer(s) geselecteerd om te verwijderen.',
+    'one_or_multiple'                        => 'werknemer(s)',
+    'password'                               => 'Wachtwoord',
+    'password_minlength'                     => 'Wachtwoord moet minstens 8 karakters bevatten.',
+    'password_must_match'                    => 'Wachtwoorden komen niet overeen.',
+    'password_not_must_match'                => 'Huidige wachtwoord en nieuwe wachtwoord moeten uniek zijn.',
+    'password_required'                      => 'Wachtwoord is vereist.',
+    'permission_desc'                        => 'De selectievakjes hieronder selecteren om toegang te verlenen tot modules.',
+    'permission_info'                        => 'Machtigingen',
+    'repeat_password'                        => 'Wachtwoord opnieuw',
+    'subpermission_required'                 => 'Tenminste eenmaal toegang verlenen voor elke module.',
+    'successful_adding'                      => 'Werknemer toegevoegd.',
+    'successful_change_password'             => 'Wachtwoord gewijzigd.',
+    'successful_deleted'                     => 'U heeft verwijderd',
+    'successful_updating'                    => 'Werknemer bijgewerkt',
+    'system_language'                        => 'Systeemtaal',
+    'unsuccessful_change_password'           => 'Wachtwoord wijzigen mislukt.',
+    'update'                                 => 'Werknemer bijwerken',
+    'username'                               => 'Gebruikersnaam',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Gebruikersnaam moet minstens 5 karakters bevatten.',
+    'username_required'                      => 'Gebruikersnaam is een vereist veld.',
 ];
diff --git a/app/Language/nl-NL/Error.php b/app/Language/nl-NL/Error.php
index a6dc506e5..46b1009dc 100644
--- a/app/Language/nl-NL/Error.php
+++ b/app/Language/nl-NL/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "U bent niet gemachtigd voor toegang tot de module genaamd",
-    "unknown"              => "Onverwachte fout",
+    'no_permission_module'           => 'U bent niet gemachtigd voor toegang tot de module genaamd',
+    'unable_to_create_env_file'      => 'Kan {filePath} niet aanmaken om throttle.key te voorzien',
+    'unable_to_lock_file'            => 'Kan {filePath} niet vergrendelen: {reason}',
+    'unable_to_open_lock_file'       => 'Kan {filePath} niet openen: {reason}',
+    'unable_to_persist_throttle_key' => 'Kan throttle.key niet opslaan naar {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Kan {filePath} niet lezen om throttle.key te voorzien',
+    'unknown'                        => 'Onverwachte fout',
 ];
diff --git a/app/Language/nl-NL/Items.php b/app/Language/nl-NL/Items.php
index d220b11ed..abd4a3fb3 100644
--- a/app/Language/nl-NL/Items.php
+++ b/app/Language/nl-NL/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Voorraad om toe te voegen of af te trekken.",
-    "allow_alt_description"              => "Alternatieve beschrijving toestaan",
-    "amount_entry"                       => "Aantal vermelding",
-    "bulk_edit"                          => "Bewerken in bulk",
-    "buy_price_required"                 => "Inkoopprijs is een vereist veld.",
-    "cannot_be_deleted"                  => "Kan de geselecteerde artikel(en) niet verwijderen, één of meer van de geselecteerde artikelen bevatten verkopen.",
-    "cannot_find_item"                   => "Artikel niet gevonden.",
-    "categories"                         => "",
-    "category"                           => "Categorie",
-    "category_new"                       => "",
-    "category_required"                  => "Categorie is een vereist veld.",
-    "change_all_to_allow_alt_desc"       => "Alternatieve beschrijving toestaan voor alles.",
-    "change_all_to_not_allow_allow_desc" => "Alternatieve beschrijving niet toestaan voor alles.",
-    "change_all_to_serialized"           => "Alles veranderen naar genummerd",
-    "change_all_to_unserialized"         => "Alles veranderen naar ongenummerd",
-    "change_image"                       => "Afbeelding veranderen",
-    "confirm_bulk_edit"                  => "Weet u zeker dat u de geselecteerde artikel(en) wilt bewerken?",
-    "confirm_bulk_edit_wipe_taxes"       => "Alle artikelbelasting informatie zal worden vervangen.",
-    "confirm_delete"                     => "Weet u zeker dat u de geselecteerde artikel(en) wilt verwijderen?",
-    "confirm_restore"                    => "Weet u zeker dat u de geselecteerde artikel(en) wilt herstellen?",
-    "cost_price"                         => "Inkoopprijs",
-    "cost_price_number"                  => "Inkoopprijs moet een getal zijn.",
-    "cost_price_required"                => "Inkoopprijs is een vereist veld.",
-    "count"                              => "Voorraad bijwerken",
-    "csv_import_failed"                  => "CSV importeren mislukt",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Het geüploade CSV-bestand bevat geen gegevens or heeft de verkeerde indeling.",
-    "csv_import_partially_failed"        => "Er zijn {0} artikel import fout(en) in lijn(en): {1}. Geen rijen geïmporteerd.",
-    "csv_import_success"                 => "Artikel CSV geïmporteerd.",
-    "current_quantity"                   => "Huidige hoeveelheid",
-    "default_pack_name"                  => "Per stuk",
-    "description"                        => "Beschrijving",
-    "details_count"                      => "Voorraadtelling details",
-    "do_nothing"                         => "Niets doen",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "De gewenste velden bewerken voor de geselecteerde artikel(en).",
-    "edit_multiple_items"                => "Meerdere artikelen aan het bewerken",
-    "empty_upc_items"                    => "Artikelen zonder streepjescode",
-    "error_adding_updating"              => "Fout bij toevoegen/bijwerken artikel",
-    "error_updating_multiple"            => "Fout bij bijwerken artikelen",
-    "generate_barcodes"                  => "Streepjescodes genereren",
-    "hsn_code"                           => "Harmonized System Nomenclature",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Artikel importeren vanuit CSV",
-    "info_provided_by"                   => "Informatie aangeleverd door",
-    "inventory"                          => "Voorraad",
-    "inventory_CSV_import_quantity"      => "Hoeveelheid geïmporteerd vanuit CSV",
-    "inventory_comments"                 => "Opmerkingen",
-    "inventory_data_tracking"            => "Voorraad gegevens bijhouden",
-    "inventory_date"                     => "Datum",
-    "inventory_employee"                 => "Werknemer",
-    "inventory_in_out_quantity"          => "In/uit hoeveelheid",
-    "inventory_remarks"                  => "Opmerkingen",
-    "is_deleted"                         => "Verwijderd",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Artikel heeft serienummer",
-    "item"                               => "Artikel",
-    "item_id"                            => "",
-    "item_number"                        => "Streepjescode",
-    "item_number_duplicate"              => "Artikelnummer is al aanwezig in de database.",
-    "kit"                                => "Set",
-    "location"                           => "Locatie",
-    "low_inventory_items"                => "Artikelen niet voorradig",
-    "low_sell_item"                      => "Lage verkoop artikel",
-    "manually_editing_of_quantity"       => "Hoeveelheid handmatig bewerken",
-    "markup"                             => "",
-    "name"                               => "Artikelnaam",
-    "name_required"                      => "Artikelnaam is een vereist veld.",
-    "new"                                => "Nieuw artikel",
-    "no_description_items"               => "Artikelen zonder beschrijving",
-    "no_items_to_display"                => "Geen artikelen om te weergeven.",
-    "none"                               => "Geen",
-    "none_selected"                      => "Geen artikel(en) geselecteerd om te bewerken",
-    "nonstock"                           => "Niet-voorradig",
-    "number_information"                 => "Artikelnummer",
-    "number_required"                    => "Streepjescode is een vereist veld.",
-    "one_or_multiple"                    => "artikel(en)",
-    "pack_name"                          => "Verpakkingnaam",
-    "qty_per_pack"                       => "Hoeveelheid per verpakking",
-    "quantity"                           => "Hoeveelheid",
-    "quantity_number"                    => "Hoeveelheid moet een getal zijn.",
-    "quantity_required"                  => "Hoeveelheid is een vereist veld.",
-    "receiving_quantity"                 => "Leveringshoeveelheid",
-    "remove_image"                       => "Afbeelding verwijderen",
-    "reorder_level"                      => "Opnieuw bestellen niveau",
-    "reorder_level_number"               => "Opnieuw bestellen niveau moet een getal zijn.",
-    "reorder_level_required"             => "Opnieuw bestellen niveau is een vereist veld.",
-    "retrive_item_info"                  => "Artikelinfo ophalen",
-    "sales_tax_1"                        => "BTW",
-    "sales_tax_2"                        => "BTW 2",
-    "search_attributes"                  => "Zoekkenmerken",
-    "select_image"                       => "Afbeelding selecteren",
-    "serialized_items"                   => "Artikelen met serienummer",
-    "standard"                           => "Standaard",
-    "stock"                              => "Voorraad",
-    "stock_location"                     => "Voorraadlocatie",
-    "stock_type"                         => "Voorraadsoort",
-    "successful_adding"                  => "Artikel toegevoegd",
-    "successful_bulk_edit"               => "Geselecteerde artikel(en) bijgewerkt",
-    "successful_deleted"                 => "U heeft verwijderd",
-    "successful_updating"                => "Artikel bijgewerkt",
-    "supplier"                           => "Leverancier",
-    "tax_1"                              => "Belasting 1",
-    "tax_2"                              => "Belasting 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Belastingcategorie",
-    "tax_percent"                        => "VAT %",
-    "tax_percent_number"                 => "Belastingpercentage moet een numerieke waarde zijn",
-    "tax_percent_required"               => "Belastingpercentage is een vereist veld.",
-    "tax_percents"                       => "Belastingpercentage(s)",
-    "temp"                               => "Tijdelijk",
-    "type"                               => "Artikelsoort",
-    "unit_price"                         => "Verkoopprijs",
-    "unit_price_number"                  => "Eenheid prijs moet een getal zijn.",
-    "unit_price_required"                => "Verkoopprijs is een vereist veld.",
-    "upc_database"                       => "Streepjescode database",
-    "update"                             => "Artikel bijwerken",
-    "use_inventory_menu"                 => "Voorraadmenu gebruiken",
+    'add_minus'                          => 'Voorraad om toe te voegen of af te trekken.',
+    'allow_alt_description'              => 'Alternatieve beschrijving toestaan',
+    'amount_entry'                       => 'Aantal vermelding',
+    'bulk_edit'                          => 'Bewerken in bulk',
+    'buy_price_required'                 => 'Inkoopprijs is een vereist veld.',
+    'cannot_be_deleted'                  => 'Kan de geselecteerde artikel(en) niet verwijderen, één of meer van de geselecteerde artikelen bevatten verkopen.',
+    'cannot_find_item'                   => 'Artikel niet gevonden.',
+    'categories'                         => '',
+    'category'                           => 'Categorie',
+    'category_new'                       => '',
+    'category_required'                  => 'Categorie is een vereist veld.',
+    'change_all_to_allow_alt_desc'       => 'Alternatieve beschrijving toestaan voor alles.',
+    'change_all_to_not_allow_allow_desc' => 'Alternatieve beschrijving niet toestaan voor alles.',
+    'change_all_to_serialized'           => 'Alles veranderen naar genummerd',
+    'change_all_to_unserialized'         => 'Alles veranderen naar ongenummerd',
+    'change_image'                       => 'Afbeelding veranderen',
+    'confirm_bulk_edit'                  => 'Weet u zeker dat u de geselecteerde artikel(en) wilt bewerken?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Alle artikelbelasting informatie zal worden vervangen.',
+    'confirm_delete'                     => 'Weet u zeker dat u de geselecteerde artikel(en) wilt verwijderen?',
+    'confirm_restore'                    => 'Weet u zeker dat u de geselecteerde artikel(en) wilt herstellen?',
+    'cost_price'                         => 'Inkoopprijs',
+    'cost_price_number'                  => 'Inkoopprijs moet een getal zijn.',
+    'cost_price_required'                => 'Inkoopprijs is een vereist veld.',
+    'count'                              => 'Voorraad bijwerken',
+    'csv_import_failed'                  => 'CSV importeren mislukt',
+    'csv_import_invalid_location'        => 'Ongeldige voorraadlocatie(s) gevonden: {0}. Alleen geldige voorraadlocaties zijn toegestaan.',
+    'csv_import_nodata_wrongformat'      => 'Het geüploade CSV-bestand bevat geen gegevens or heeft de verkeerde indeling.',
+    'csv_import_partially_failed'        => 'Er zijn {0} artikel import fout(en) in lijn(en): {1}. Geen rijen geïmporteerd.',
+    'csv_import_success'                 => 'Artikel CSV geïmporteerd.',
+    'current_quantity'                   => 'Huidige hoeveelheid',
+    'default_pack_name'                  => 'Per stuk',
+    'description'                        => 'Beschrijving',
+    'details_count'                      => 'Voorraadtelling details',
+    'do_nothing'                         => 'Niets doen',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'De gewenste velden bewerken voor de geselecteerde artikel(en).',
+    'edit_multiple_items'                => 'Meerdere artikelen aan het bewerken',
+    'empty_upc_items'                    => 'Artikelen zonder streepjescode',
+    'error_adding_updating'              => 'Fout bij toevoegen/bijwerken artikel',
+    'error_updating_multiple'            => 'Fout bij bijwerken artikelen',
+    'generate_barcodes'                  => 'Streepjescodes genereren',
+    'hsn_code'                           => 'Harmonized System Nomenclature',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Artikel importeren vanuit CSV',
+    'info_provided_by'                   => 'Informatie aangeleverd door',
+    'inventory'                          => 'Voorraad',
+    'inventory_CSV_import_quantity'      => 'Hoeveelheid geïmporteerd vanuit CSV',
+    'inventory_comments'                 => 'Opmerkingen',
+    'inventory_data_tracking'            => 'Voorraad gegevens bijhouden',
+    'inventory_date'                     => 'Datum',
+    'inventory_employee'                 => 'Werknemer',
+    'inventory_in_out_quantity'          => 'In/uit hoeveelheid',
+    'inventory_remarks'                  => 'Opmerkingen',
+    'is_deleted'                         => 'Verwijderd',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Artikel heeft serienummer',
+    'item'                               => 'Artikel',
+    'item_id'                            => '',
+    'item_number'                        => 'Streepjescode',
+    'item_number_duplicate'              => 'Artikelnummer is al aanwezig in de database.',
+    'item_number_invalid'                => 'Artikelnummer bevat niet-toegestane tekens.',
+    'kit'                                => 'Set',
+    'location'                           => 'Locatie',
+    'low_inventory_items'                => 'Artikelen niet voorradig',
+    'low_sell_item'                      => 'Lage verkoop artikel',
+    'manually_editing_of_quantity'       => 'Hoeveelheid handmatig bewerken',
+    'markup'                             => '',
+    'name'                               => 'Artikelnaam',
+    'name_required'                      => 'Artikelnaam is een vereist veld.',
+    'new'                                => 'Nieuw artikel',
+    'no_description_items'               => 'Artikelen zonder beschrijving',
+    'no_items_to_display'                => 'Geen artikelen om te weergeven.',
+    'none'                               => 'Geen',
+    'none_selected'                      => 'Geen artikel(en) geselecteerd om te bewerken',
+    'nonstock'                           => 'Niet-voorradig',
+    'number_information'                 => 'Artikelnummer',
+    'number_required'                    => 'Streepjescode is een vereist veld.',
+    'one_or_multiple'                    => 'artikel(en)',
+    'pack_name'                          => 'Verpakkingnaam',
+    'qty_per_pack'                       => 'Hoeveelheid per verpakking',
+    'quantity'                           => 'Hoeveelheid',
+    'quantity_number'                    => 'Hoeveelheid moet een getal zijn.',
+    'quantity_required'                  => 'Hoeveelheid is een vereist veld.',
+    'receiving_quantity'                 => 'Leveringshoeveelheid',
+    'remove_image'                       => 'Afbeelding verwijderen',
+    'reorder_level'                      => 'Opnieuw bestellen niveau',
+    'reorder_level_number'               => 'Opnieuw bestellen niveau moet een getal zijn.',
+    'reorder_level_required'             => 'Opnieuw bestellen niveau is een vereist veld.',
+    'retrive_item_info'                  => 'Artikelinfo ophalen',
+    'sales_tax_1'                        => 'BTW',
+    'sales_tax_2'                        => 'BTW 2',
+    'search_attributes'                  => 'Zoekkenmerken',
+    'select_image'                       => 'Afbeelding selecteren',
+    'serialized_items'                   => 'Artikelen met serienummer',
+    'standard'                           => 'Standaard',
+    'stock'                              => 'Voorraad',
+    'stock_location'                     => 'Voorraadlocatie',
+    'stock_type'                         => 'Voorraadsoort',
+    'successful_adding'                  => 'Artikel toegevoegd',
+    'successful_bulk_edit'               => 'Geselecteerde artikel(en) bijgewerkt',
+    'successful_deleted'                 => 'U heeft verwijderd',
+    'successful_updating'                => 'Artikel bijgewerkt',
+    'supplier'                           => 'Leverancier',
+    'tax_1'                              => 'Belasting 1',
+    'tax_2'                              => 'Belasting 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Belastingcategorie',
+    'tax_name_invalid'                   => 'Belastingnaam bevat niet-toegestane tekens.',
+    'tax_percent'                        => 'VAT %',
+    'tax_percent_number'                 => 'Belastingpercentage moet een numerieke waarde zijn',
+    'tax_percent_required'               => 'Belastingpercentage is een vereist veld.',
+    'tax_percents'                       => 'Belastingpercentage(s)',
+    'temp'                               => 'Tijdelijk',
+    'type'                               => 'Artikelsoort',
+    'unit_price'                         => 'Verkoopprijs',
+    'unit_price_number'                  => 'Eenheid prijs moet een getal zijn.',
+    'unit_price_required'                => 'Verkoopprijs is een vereist veld.',
+    'upc_database'                       => 'Streepjescode database',
+    'update'                             => 'Artikel bijwerken',
+    'use_inventory_menu'                 => 'Voorraadmenu gebruiken',
 ];
diff --git a/app/Language/nl-NL/Login.php b/app/Language/nl-NL/Login.php
index 9dfde1688..c0a8be5e0 100644
--- a/app/Language/nl-NL/Login.php
+++ b/app/Language/nl-NL/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Ik ben geen robot.",
-    "go"                            => "Aanmelden",
-    "invalid_gcaptcha"              => "Bewijs dat je geen robot bent.",
-    "invalid_installation"          => "De installatie is niet juist, controleer uw php.ini bestand.",
-    "invalid_username_and_password" => "Ongeldige gebruikersnaam en/of wachtwoord.",
-    "login"                         => "Aanmelden",
-    "logout"                        => "Afmelden",
-    "migration_needed"              => "Een databasemigratie naar {0} zal starten na aanmelding.",
-    "password"                      => "Wachtwoord",
-    "required_username"             => "Het gebruikersnaam veld is verplicht.",
-    "username"                      => "Gebruikersnaam",
-    "welcome"                       => "Welkom bij {0}!",
+    "gcaptcha"                            => "Ik ben geen robot.",
+    "go"                                  => "Aanmelden",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Bewijs dat je geen robot bent.",
+    "invalid_installation"                => "De installatie is niet juist, controleer uw php.ini bestand.",
+    "invalid_username_and_password"       => "Ongeldige gebruikersnaam en/of wachtwoord.",
+    "login"                               => "Aanmelden",
+    "logout"                              => "Afmelden",
+    "migrating_database"                  => "Database migreren",
+    "migration_auth_message"              => "Beheerdersreferenties zijn vereist om de databasemigratie naar versie {0} te autoriseren. Log in om verder te gaan.",
+    "migration_complete"                  => "Database succesvol geïnitialiseerd!",
+    "migration_complete_login"            => "U kunt nu inloggen.",
+    "migration_complete_migrate"          => "Database succesvol gemigreerd!",
+    "migration_complete_redirect"         => "Migratie voltooid. Doorsturen naar login...",
+    "migration_error_connection"          => "Verbindingsfout. Probeer het opnieuw.",
+    "migration_failed"                    => "Migratie mislukt",
+    "migration_initializing"              => "Database initialiseren",
+    "migration_needed"                    => "Een databasemigratie naar {0} zal starten na aanmelding.",
+    "migration_required"                  => "Database migratie vereist",
+    "migration_running"                   => "Databasemigraties uitvoeren...",
+    "password"                            => "Wachtwoord",
+    "required_username"                   => "Het gebruikersnaam veld is verplicht.",
+    'too_many_attempts'                   => 'Te veel pogingen. Wacht even en probeer het opnieuw.',
+    "username"                            => "Gebruikersnaam",
+    "welcome"                             => "Welkom bij {0}!"
 ];
diff --git a/app/Language/nl-NL/Reports.php b/app/Language/nl-NL/Reports.php
index d330efec6..7f57c89f5 100644
--- a/app/Language/nl-NL/Reports.php
+++ b/app/Language/nl-NL/Reports.php
@@ -146,4 +146,5 @@ return [
     "used"                                    => "Punten gebruikt",
     "work_orders"                             => "Werkorders",
     "zero_and_less"                           => "Nul en minder",
+    "toggle_cost_and_profit"                  => "Kosten en winst wisselen",
 ];
diff --git a/app/Language/nl-NL/Sales.php b/app/Language/nl-NL/Sales.php
index e9cdce8a3..94d549e54 100644
--- a/app/Language/nl-NL/Sales.php
+++ b/app/Language/nl-NL/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Beschikbare punten",
-    "rewards_package"                  => "Beloningen",
-    "rewards_remaining_balance"        => "Resterende beloningspunten waarde is ",
-    "account_number"                   => "Account #",
-    "add_payment"                      => "Betaling toevoegen",
-    "amount_due"                       => "Te betalen bedrag",
-    "amount_tendered"                  => "Betaald bedrag",
-    "authorized_signature"             => "Geautoriseerde handtekening",
-    "cancel_sale"                      => "Annuleren",
-    "cash"                             => "Contant",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Contant correctie",
-    "cash_deposit"                     => "Contact storting",
-    "cash_filter"                      => "Contant",
-    "change_due"                       => "Wisselgeld tegoed",
-    "change_price"                     => "Verkoopprijs wijzigen",
-    "check"                            => "Cheque",
-    "check_balance"                    => "Cheque restant",
-    "check_filter"                     => "Cheque",
-    "close"                            => "",
-    "comment"                          => "Opmerking",
-    "comments"                         => "Opmerkingen",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Voltooien",
-    "confirm_cancel_sale"              => "Weet u zeker dat u deze verkoop wilt wissen? Alle artikelen worden gewist.",
-    "confirm_delete"                   => "Weet u zeker dat u de geselecteerde verko(o)p(en) wilt verwijderen?",
-    "confirm_restore"                  => "Weet u zeker dat u de geselecteerde verko(o)p(en) wilt herstellen?",
-    "credit"                           => "Creditcard",
-    "credit_deposit"                   => "Krediet storting",
-    "credit_filter"                    => "Creditcard",
-    "current_table"                    => "",
-    "customer"                         => "Klant",
-    "customer_address"                 => "Adres",
-    "customer_discount"                => "Korting",
-    "customer_email"                   => "E-mail",
-    "customer_location"                => "Locatie",
-    "customer_mailchimp_status"        => "MailChimp Status",
-    "customer_optional"                => "(Vereist voor te betalen betalingen)",
-    "customer_required"                => "(Vereist)",
-    "customer_total"                   => "Totaal",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Verkoopdatum",
-    "date_range"                       => "Datumbereik",
-    "date_required"                    => "Een juiste datum moet ingevuld worden.",
-    "date_type"                        => "Datum is een vereist veld.",
-    "debit"                            => "Betaalpas",
-    "debit_filter"                     => "",
-    "delete"                           => "Verwijderen toestaan",
-    "delete_confirmation"              => "Weet u zeker dat u deze verkoop wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
-    "delete_entire_sale"               => "Volledige verkoop verwijderen",
-    "delete_successful"                => "Verkoop verwijderd.",
-    "delete_unsuccessful"              => "Verkoop verwijderen mislukt.",
-    "description_abbrv"                => "Beschr.",
-    "discard"                          => "Negeren",
-    "discard_quote"                    => "",
-    "discount"                         => "Krtng",
-    "discount_included"                => "% korting",
-    "discount_short"                   => "%",
-    "due"                              => "Te betalen",
-    "due_filter"                       => "Te betalen",
-    "edit"                             => "Bewerken",
-    "edit_item"                        => "Artikel bewerken",
-    "edit_sale"                        => "Verkoop bewerken",
-    "email_receipt"                    => "E-mail kassabon",
-    "employee"                         => "Werknemer",
-    "entry"                            => "Vermelding",
-    "error_editing_item"               => "Fout bij artikel bewerken",
-    "find_or_scan_item"                => "Artikel zoeken of scannen",
-    "find_or_scan_item_or_receipt"     => "Artikel of kassabon vinden of scannen",
-    "giftcard"                         => "Cadeaubon",
-    "giftcard_balance"                 => "Cadeaubon saldo",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Cadeaubonnummer",
-    "group_by_category"                => "Groeperen op categorie",
-    "group_by_type"                    => "Groeperen op soort",
-    "hsn"                              => "HSN",
-    "id"                               => "Verkoop ID",
-    "include_prices"                   => "Prijzen opnemen?",
-    "invoice"                          => "Factuur",
-    "invoice_confirm"                  => "Deze factuur zal verzonden worden naar",
-    "invoice_enable"                   => "Factuurnummer",
-    "invoice_filter"                   => "Facturen",
-    "invoice_no_email"                 => "Deze klant bevat geen geldig e-mailadres.",
-    "invoice_number"                   => "Factuur #",
-    "invoice_number_duplicate"         => "Factuurnummer {0} moet uniek zijn.",
-    "invoice_sent"                     => "Factuur verzonden naar",
-    "invoice_total"                    => "Factuurtotaal",
-    "invoice_type_custom_invoice"      => "Aangepaste factuur (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Aangepaste belastingfactuur (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Factuur (invoice.php)",
-    "invoice_type_tax_invoice"         => "Belastingfactuur (tax_invoice.php)",
-    "invoice_unsent"                   => "Fout bij verzenden van factuur naar",
-    "invoice_update"                   => "Opnieuw tellen",
-    "item_insufficient_of_stock"       => "Artikel heeft onvoldoende voorraad.",
-    "item_name"                        => "Artikelnaam",
-    "item_number"                      => "Artikel #",
-    "item_out_of_stock"                => "Artikel is niet voorradig.",
-    "key_browser"                      => "Handige snelkoppelingen",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Voltooi Offerte/Factuur zonder betaling",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "Openen in volledig scherm",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "Inzoomen",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "Uitzoomen",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "Huidige pagina afdrukken",
-    "key_restore"                      => "Originele weergave/grootte herstellen",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Registratie modus",
-    "must_enter_numeric"               => "Betaald bedrag moet een getal zijn.",
-    "must_enter_numeric_giftcard"      => "Cadeaubonnummer moet een getal zijn.",
-    "new_customer"                     => "Nieuwe klant",
-    "new_item"                         => "Nieuw artikel",
-    "no_description"                   => "Geen beschrijving",
-    "no_filter"                        => "Alles",
-    "no_items_in_cart"                 => "Geen artikelen in de winkelwagen.",
-    "no_sales_to_display"              => "Geen verkopen om te weergeven.",
-    "none_selected"                    => "Geen verko(o)p(en) geselecteerd om te verwijderen.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "Deze actie is niet geautoriseerd.",
-    "one_or_multiple"                  => "Verko(o)p(en)",
-    "payment"                          => "Betalingssoort",
-    "payment_amount"                   => "Bedrag",
-    "payment_not_cover_total"          => "Betaalde bedrag moet groter of gelijk zijn aan totaal.",
-    "payment_type"                     => "Soort",
-    "payments"                         => "",
-    "payments_total"                   => "Betalingstotaal",
-    "price"                            => "Prijs",
-    "print_after_sale"                 => "Afdrukken na verkoop",
-    "quantity"                         => "Hoeveelheid",
-    "quantity_less_than_reorder_level" => "Waarschuwing: gewenste hoeveelheid is lager dan het opnieuw bestellen niveau voor dit artikel.",
-    "quantity_less_than_zero"          => "Waarschuwing: gewenste hoeveelheid is onvoldoende. De verkoop kan nog steeds verwerkt worden, maar controleer de voorraad.",
-    "quantity_of_items"                => "Hoeveelheid van {0} artikelen",
-    "quote"                            => "Offerte",
-    "quote_number"                     => "Offertenummer",
-    "quote_number_duplicate"           => "Offertenummer moet uniek zijn.",
-    "quote_sent"                       => "Offerte verzonden naar",
-    "quote_unsent"                     => "Offerte niet verzonden naar",
-    "receipt"                          => "Kassabon",
-    "receipt_no_email"                 => "Deze klant bevat geen geldig e-mailadres.",
-    "receipt_number"                   => "Verkoop #",
-    "receipt_sent"                     => "Kassabon verzonden naar",
-    "receipt_unsent"                   => "Kassabon niet verzonden naar",
-    "refund"                           => "Terugbetaling soort",
-    "register"                         => "Verkoopregister",
-    "remove_customer"                  => "Klant verwijderen",
-    "remove_discount"                  => "",
-    "return"                           => "Retourneren",
-    "rewards"                          => "Beloningspunten",
-    "rewards_balance"                  => "Beloningspunten balans",
-    "sale"                             => "Verkoop",
-    "sale_by_invoice"                  => "Verkopen op factuur",
-    "sale_for_customer"                => "Klant:",
-    "sale_time"                        => "Tijd",
-    "sales_tax"                        => "BTW",
-    "sales_total"                      => "",
-    "select_customer"                  => "Klant selecteren",
-    "send_invoice"                     => "Factuur verzenden",
-    "send_quote"                       => "Offerte verzenden",
-    "send_receipt"                     => "Kassabon verzenden",
-    "send_work_order"                  => "Werkorder verzenden",
-    "serial"                           => "Serieel",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Factuur weergeven",
-    "show_receipt"                     => "Kassabon weergeven",
-    "start_typing_customer_name"       => "Begin met typen klantgegevens...",
-    "start_typing_item_name"           => "Begin met typen artikelnaam of scan streepjescode...",
-    "stock"                            => "Voorraad",
-    "stock_location"                   => "Voorraadlocatie",
-    "sub_total"                        => "Subtotaal",
-    "successfully_deleted"             => "U heeft verwijderd",
-    "successfully_restored"            => "U heeft hersteld",
-    "successfully_suspended_sale"      => "Verkoop gesluimerd.",
-    "successfully_updated"             => "Verkoop bijgewerkt.",
-    "suspend_sale"                     => "Sluimeren",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Gesluimerd",
-    "table"                            => "Tafel",
-    "takings"                          => "Dagelijkse verkopen",
-    "tax"                              => "Belasting",
-    "tax_id"                           => "Belasting ID",
-    "tax_invoice"                      => "Belastingfactuur",
-    "tax_percent"                      => "Belasting %",
-    "taxed_ind"                        => "B",
-    "total"                            => "Totaal",
-    "total_tax_exclusive"              => "Belasting uitsluiten",
-    "transaction_failed"               => "Verkooptransactie mislukt.",
-    "unable_to_add_item"               => "Artikel toevoegen aan verkoop mislukt",
-    "unsuccessfully_deleted"           => "Verko(o)p(en) verwijderen mislukt.",
-    "unsuccessfully_restored"          => "Verko(o)p(en) herstellen mislukt.",
-    "unsuccessfully_suspended_sale"    => "Verkoop sluimeren mislukt.",
-    "unsuccessfully_updated"           => "Verkoop bijwerken mislukt.",
-    "unsuspend"                        => "Ontsluimeren",
-    "unsuspend_and_delete"             => "Actie",
-    "update"                           => "Bijwerken",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Werkorder",
-    "work_order_number"                => "Werkordernummer",
-    "work_order_number_duplicate"      => "Werkordernummer moet uniek zijn.",
-    "work_order_sent"                  => "Werkorder verzonden naar",
-    "work_order_unsent"                => "Werkorder niet verzonden naar",
+    'account_number'                    => 'Account #',
+    'add_payment'                       => 'Betaling toevoegen',
+    'amount_due'                        => 'Te betalen bedrag',
+    'amount_due_not_covered'            => 'De betalingen dekken het verschuldigde bedrag niet.',
+    'amount_tendered'                   => 'Betaald bedrag',
+    'authorized_signature'              => 'Geautoriseerde handtekening',
+    'cancel_sale'                       => 'Annuleren',
+    'cash'                              => 'Contant',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Contant correctie',
+    'cash_deposit'                      => 'Contact storting',
+    'cash_filter'                       => 'Contant',
+    'change_due'                        => 'Wisselgeld tegoed',
+    'change_price'                      => 'Verkoopprijs wijzigen',
+    'check'                             => 'Cheque',
+    'check_balance'                     => 'Cheque restant',
+    'check_filter'                      => 'Cheque',
+    'close'                             => '',
+    'comment'                           => 'Opmerking',
+    'comments'                          => 'Opmerkingen',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Voltooien',
+    'confirm_cancel_sale'               => 'Weet u zeker dat u deze verkoop wilt wissen? Alle artikelen worden gewist.',
+    'confirm_delete'                    => 'Weet u zeker dat u de geselecteerde verko(o)p(en) wilt verwijderen?',
+    'confirm_restore'                   => 'Weet u zeker dat u de geselecteerde verko(o)p(en) wilt herstellen?',
+    'credit'                            => 'Creditcard',
+    'credit_deposit'                    => 'Krediet storting',
+    'credit_filter'                     => 'Creditcard',
+    'current_table'                     => '',
+    'customer'                          => 'Klant',
+    'customer_address'                  => 'Adres',
+    'customer_discount'                 => 'Korting',
+    'customer_email'                    => 'E-mail',
+    'customer_location'                 => 'Locatie',
+    'customer_mailchimp_status'         => 'MailChimp Status',
+    'customer_optional'                 => '(Vereist voor te betalen betalingen)',
+    'customer_required'                 => '(Vereist)',
+    'customer_total'                    => 'Totaal',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Beschikbare punten',
+    'daily_sales'                       => '',
+    'date'                              => 'Verkoopdatum',
+    'date_range'                        => 'Datumbereik',
+    'date_required'                     => 'Een juiste datum moet ingevuld worden.',
+    'date_type'                         => 'Datum is een vereist veld.',
+    'debit'                             => 'Betaalpas',
+    'debit_filter'                      => '',
+    'delete'                            => 'Verwijderen toestaan',
+    'delete_confirmation'               => 'Weet u zeker dat u deze verkoop wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.',
+    'delete_entire_sale'                => 'Volledige verkoop verwijderen',
+    'delete_successful'                 => 'Verkoop verwijderd.',
+    'delete_unsuccessful'               => 'Verkoop verwijderen mislukt.',
+    'description_abbrv'                 => 'Beschr.',
+    'discard'                           => 'Negeren',
+    'discard_quote'                     => '',
+    'discount'                          => 'Krtng',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% korting',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Te betalen',
+    'due_filter'                        => 'Te betalen',
+    'edit'                              => 'Bewerken',
+    'edit_item'                         => 'Artikel bewerken',
+    'edit_sale'                         => 'Verkoop bewerken',
+    'email_receipt'                     => 'E-mail kassabon',
+    'employee'                          => 'Werknemer',
+    'entry'                             => 'Vermelding',
+    'error_editing_item'                => 'Fout bij artikel bewerken',
+    'find_or_scan_item'                 => 'Artikel zoeken of scannen',
+    'find_or_scan_item_or_receipt'      => 'Artikel of kassabon vinden of scannen',
+    'giftcard'                          => 'Cadeaubon',
+    'giftcard_balance'                  => 'Cadeaubon saldo',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Cadeaubonnummer',
+    'group_by_category'                 => 'Groeperen op categorie',
+    'group_by_type'                     => 'Groeperen op soort',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Verkoop ID',
+    'include_prices'                    => 'Prijzen opnemen?',
+    'insufficient_giftcard_balance'     => 'Onvoldoende cadeaukaart saldo voor deze betaling.',
+    'insufficient_reward_points'        => 'Onvoldoende beloningspunten voor deze betaling.',
+    'invoice'                           => 'Factuur',
+    'invoice_confirm'                   => 'Deze factuur zal verzonden worden naar',
+    'invoice_enable'                    => 'Factuurnummer',
+    'invoice_filter'                    => 'Facturen',
+    'invoice_no_email'                  => 'Deze klant bevat geen geldig e-mailadres.',
+    'invoice_number'                    => 'Factuur #',
+    'invoice_number_duplicate'          => 'Factuurnummer {0} moet uniek zijn.',
+    'invoice_sent'                      => 'Factuur verzonden naar',
+    'invoice_total'                     => 'Factuurtotaal',
+    'invoice_type_custom_invoice'       => 'Aangepaste factuur (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Aangepaste belastingfactuur (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Factuur (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Belastingfactuur (tax_invoice.php)',
+    'invoice_unsent'                    => 'Fout bij verzenden van factuur naar',
+    'invoice_update'                    => 'Opnieuw tellen',
+    'item_insufficient_of_stock'        => 'Artikel heeft onvoldoende voorraad.',
+    'item_name'                         => 'Artikelnaam',
+    'item_number'                       => 'Artikel #',
+    'item_out_of_stock'                 => 'Artikel is niet voorradig.',
+    'key_browser'                       => 'Handige snelkoppelingen',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Voltooi Offerte/Factuur zonder betaling',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => 'Openen in volledig scherm',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => 'Inzoomen',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => 'Uitzoomen',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => 'Huidige pagina afdrukken',
+    'key_restore'                       => 'Originele weergave/grootte herstellen',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Registratie modus',
+    'must_enter_numeric'                => 'Betaald bedrag moet een getal zijn.',
+    'must_enter_numeric_giftcard'       => 'Cadeaubonnummer moet een getal zijn.',
+    'must_enter_reference_code'         => 'Referentie-/ophaalnummer moet worden ingevoerd.',
+    'negative_amount_tendered'          => 'Het betaalde bedrag mag niet negatief zijn.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Nieuwe klant',
+    'new_item'                          => 'Nieuw artikel',
+    'no_description'                    => 'Geen beschrijving',
+    'no_filter'                         => 'Alles',
+    'no_items_in_cart'                  => 'Geen artikelen in de winkelwagen.',
+    'no_sales_to_display'               => 'Geen verkopen om te weergeven.',
+    'none_selected'                     => 'Geen verko(o)p(en) geselecteerd om te verwijderen.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'Deze actie is niet geautoriseerd.',
+    'one_or_multiple'                   => 'Verko(o)p(en)',
+    'payment'                           => 'Betalingssoort',
+    'payment_amount'                    => 'Bedrag',
+    'payment_not_cover_total'           => 'Betaalde bedrag moet groter of gelijk zijn aan totaal.',
+    'payment_type'                      => 'Soort',
+    'payments'                          => '',
+    'payments_total'                    => 'Betalingstotaal',
+    'price'                             => 'Prijs',
+    'print_after_sale'                  => 'Afdrukken na verkoop',
+    'quantity'                          => 'Hoeveelheid',
+    'quantity_less_than_reorder_level'  => 'Waarschuwing: gewenste hoeveelheid is lager dan het opnieuw bestellen niveau voor dit artikel.',
+    'quantity_less_than_zero'           => 'Waarschuwing: gewenste hoeveelheid is onvoldoende. De verkoop kan nog steeds verwerkt worden, maar controleer de voorraad.',
+    'quantity_of_items'                 => 'Hoeveelheid van {0} artikelen',
+    'quote'                             => 'Offerte',
+    'quote_number'                      => 'Offertenummer',
+    'quote_number_duplicate'            => 'Offertenummer moet uniek zijn.',
+    'quote_sent'                        => 'Offerte verzonden naar',
+    'quote_unsent'                      => 'Offerte niet verzonden naar',
+    'receipt'                           => 'Kassabon',
+    'receipt_no_email'                  => 'Deze klant bevat geen geldig e-mailadres.',
+    'receipt_number'                    => 'Verkoop #',
+    'receipt_sent'                      => 'Kassabon verzonden naar',
+    'receipt_unsent'                    => 'Kassabon niet verzonden naar',
+    'reference_code'                    => 'Betalingsreferentiecode',
+    'reference_code_invalid_characters' => 'De betalingsreferentiecode mag alleen letters en cijfers bevatten.',
+    'reference_code_length_error'       => 'De lengte van de betalingsreferentiecode is ongeldig.',
+    'refund'                            => 'Terugbetaling soort',
+    'register'                          => 'Verkoopregister',
+    'remove_customer'                   => 'Klant verwijderen',
+    'remove_discount'                   => '',
+    'return'                            => 'Retourneren',
+    'rewards'                           => 'Beloningspunten',
+    'rewards_balance'                   => 'Beloningspunten balans',
+    'rewards_package'                   => 'Beloningen',
+    'rewards_remaining_balance'         => 'Resterende beloningspunten waarde is ',
+    'sale'                              => 'Verkoop',
+    'sale_by_invoice'                   => 'Verkopen op factuur',
+    'sale_for_customer'                 => 'Klant:',
+    'sale_time'                         => 'Tijd',
+    'sales_tax'                         => 'BTW',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Klant selecteren',
+    'send_invoice'                      => 'Factuur verzenden',
+    'send_quote'                        => 'Offerte verzenden',
+    'send_receipt'                      => 'Kassabon verzenden',
+    'send_work_order'                   => 'Werkorder verzenden',
+    'serial'                            => 'Serieel',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Factuur weergeven',
+    'show_receipt'                      => 'Kassabon weergeven',
+    'start_typing_customer_name'        => 'Begin met typen klantgegevens...',
+    'start_typing_item_name'            => 'Begin met typen artikelnaam of scan streepjescode...',
+    'stock'                             => 'Voorraad',
+    'stock_location'                    => 'Voorraadlocatie',
+    'sub_total'                         => 'Subtotaal',
+    'successfully_deleted'              => 'U heeft verwijderd',
+    'successfully_restored'             => 'U heeft hersteld',
+    'successfully_suspended_sale'       => 'Verkoop gesluimerd.',
+    'successfully_updated'              => 'Verkoop bijgewerkt.',
+    'suspend_sale'                      => 'Sluimeren',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Gesluimerd',
+    'table'                             => 'Tafel',
+    'takings'                           => 'Dagelijkse verkopen',
+    'tax'                               => 'Belasting',
+    'tax_id'                            => 'Belasting ID',
+    'tax_invoice'                       => 'Belastingfactuur',
+    'tax_percent'                       => 'Belasting %',
+    'taxed_ind'                         => 'B',
+    'total'                             => 'Totaal',
+    'total_tax_exclusive'               => 'Belasting uitsluiten',
+    'transaction_failed'                => 'Verkooptransactie mislukt.',
+    'unable_to_add_item'                => 'Artikel toevoegen aan verkoop mislukt',
+    'unsuccessfully_deleted'            => 'Verko(o)p(en) verwijderen mislukt.',
+    'unsuccessfully_restored'           => 'Verko(o)p(en) herstellen mislukt.',
+    'unsuccessfully_suspended_sale'     => 'Verkoop sluimeren mislukt.',
+    'unsuccessfully_updated'            => 'Verkoop bijwerken mislukt.',
+    'unsuspend'                         => 'Ontsluimeren',
+    'unsuspend_and_delete'              => 'Actie',
+    'update'                            => 'Bijwerken',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Werkorder',
+    'work_order_number'                 => 'Werkordernummer',
+    'work_order_number_duplicate'       => 'Werkordernummer moet uniek zijn.',
+    'work_order_sent'                   => 'Werkorder verzonden naar',
+    'work_order_unsent'                 => 'Werkorder niet verzonden naar',
 ];
diff --git a/app/Language/pl/Attributes.php b/app/Language/pl/Attributes.php
index 1975f20c1..cf184f01d 100644
--- a/app/Language/pl/Attributes.php
+++ b/app/Language/pl/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Wartość atrybutu nie może zawierać'_' lub '|'",
-    "confirm_delete"                   => "Czy jesteś pewny, że chcesz usunąć wybrane atrybuty?",
-    "confirm_restore"                  => "Czy jesteś pewien, że chcesz przywrócić zaznaczone atrybuty?",
-    "definition_cannot_be_deleted"     => "Nie można usunąć wybranych atrybutów",
-    "definition_error_adding_updating" => "Atrybut 51 nie może zostać dodany lub zaktualizowany. Sprawdź dziennik błędów.",
-    "definition_flags"                 => "Widoczność atrybutu",
-    "definition_group"                 => "Grupa",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Dodaj atrybut",
-    "definition_name_required"         => "Nazwa atrybutu jest wymagana",
-    "definition_one_or_multiple"       => "atrybut(y)",
-    "definition_successful_adding"     => "Pomyślnie dodano element",
-    "definition_successful_deleted"    => "Pomyślnie usunięto",
-    "definition_successful_updating"   => "Pomyślnie zaktualizowano atrybut",
-    "definition_type"                  => "Typ atrybutu",
-    "definition_type_required"         => "Typ atrybutu jest wymagany",
-    "definition_unit"                  => "Jednostka miary",
-    "definition_values"                => "Wartość atrybutu",
-    "new"                              => "Nowy atrybut",
-    "no_attributes_to_display"         => "Brak elementów do wyświetlenia",
-    "receipt_visibility"               => "Paragon",
-    "show_in_items"                    => "Pokaż w produktach",
-    "show_in_items_visibility"         => "Produkty",
-    "show_in_receipt"                  => "Pokaż w paragonie",
-    "show_in_receivings"               => "Pokaż w dostawach",
-    "show_in_receivings_visibility"    => "Dostawy",
-    "show_in_sales"                    => "Pokaż w sprzedażach",
-    "show_in_sales_visibility"         => "Sprzedaże",
-    "update"                           => "Zaktualizuj atrybut",
+    'attribute_value_invalid_chars'    => 'Wartość atrybutu nie może zawierać\'_\' lub \'|\'',
+    'confirm_delete'                   => 'Czy jesteś pewny, że chcesz usunąć wybrane atrybuty?',
+    'confirm_restore'                  => 'Czy jesteś pewien, że chcesz przywrócić zaznaczone atrybuty?',
+    'definition_cannot_be_deleted'     => 'Nie można usunąć wybranych atrybutów',
+    'definition_invalid_group' => 'Wybrana grupa nie istnieje lub jest nieprawidłowa.',
+    'definition_error_adding_updating' => 'Atrybut 51 nie może zostać dodany lub zaktualizowany. Sprawdź dziennik błędów.',
+    'definition_flags'                 => 'Widoczność atrybutu',
+    'definition_group'                 => 'Grupa',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Dodaj atrybut',
+    'definition_name_required'         => 'Nazwa atrybutu jest wymagana',
+    'definition_one_or_multiple'       => 'atrybut(y)',
+    'definition_successful_adding'     => 'Pomyślnie dodano element',
+    'definition_successful_deleted'    => 'Pomyślnie usunięto',
+    'definition_successful_updating'   => 'Pomyślnie zaktualizowano atrybut',
+    'definition_type'                  => 'Typ atrybutu',
+    'definition_type_required'         => 'Typ atrybutu jest wymagany',
+    'definition_unit'                  => 'Jednostka miary',
+    'definition_values'                => 'Wartość atrybutu',
+    'new'                              => 'Nowy atrybut',
+    'no_attributes_to_display'         => 'Brak elementów do wyświetlenia',
+    'receipt_visibility'               => 'Paragon',
+    'show_in_items'                    => 'Pokaż w produktach',
+    'show_in_items_visibility'         => 'Produkty',
+    'show_in_receipt'                  => 'Pokaż w paragonie',
+    'show_in_receivings'               => 'Pokaż w dostawach',
+    'show_in_receivings_visibility'    => 'Dostawy',
+    'show_in_sales'                    => 'Pokaż w sprzedażach',
+    'show_in_sales_visibility'         => 'Sprzedaże',
+    'show_in_search'                   => 'Pokaż w wyszukiwaniu',
+    'show_in_search_visibility'        => 'Wyszukiwanie',
+    'update'                           => 'Zaktualizuj atrybut',
 ];
diff --git a/app/Language/pl/Bootstrap_tables.php b/app/Language/pl/Bootstrap_tables.php
index 93c41b3f9..016174010 100644
--- a/app/Language/pl/Bootstrap_tables.php
+++ b/app/Language/pl/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "wszystko",
-    "columns"              => "Kolumny",
-    "hide_show_pagination" => "Ukryj/pokaż paginację",
-    "loading"              => "Ładowanie, proszę czekać...",
-    "page_from_to"         => "Pokazuję od {0} do {1} z {2} wierszy",
-    "refresh"              => "Odśwież",
-    "rows_per_page"        => "{0} wierszy na stronę",
-    "toggle"               => "Włącz",
+    'all' => "wszystko",
+    'columns' => "Kolumny",
+    'hide_show_pagination' => "Ukryj/pokaż paginację",
+    'loading' => "Ładowanie, proszę czekać",
+    'page_from_to' => "Pokazuję od {0} do {1} z {2} wierszy",
+    'refresh' => "Odśwież",
+    'rows_per_page' => "{0} wierszy na stronę",
+    'toggle' => "Włącz",
 ];
diff --git a/app/Language/pl/Cashups.php b/app/Language/pl/Cashups.php
index 91570a2f1..17d4575fe 100644
--- a/app/Language/pl/Cashups.php
+++ b/app/Language/pl/Cashups.php
@@ -1,50 +1,50 @@
 <?php
 
 return [
-    "amount"                     => "Liczba",
-    "amount_number"              => "",
-    "amount_required"            => "",
-    "cancel_cashups"             => "",
-    "cancel_cashups_enter"       => "",
-    "cannot_be_deleted"          => "",
-    "cash_difference"            => "",
-    "close_date"                 => "",
-    "close_employee"             => "",
-    "closed_amount_card"         => "",
-    "closed_amount_cash"         => "",
-    "closed_amount_check"        => "",
-    "closed_amount_due"          => "",
-    "closed_amount_giftcard"     => "",
-    "closed_amount_total"        => "",
-    "closed_date"                => "",
-    "confirm_delete"             => "",
-    "confirm_restore"            => "",
-    "confirm_submit"             => "",
-    "date_number"                => "",
-    "date_required"              => "",
-    "description"                => "",
-    "enable_expected"            => "",
-    "error_adding_updating"      => "",
-    "giftcard"                   => "",
-    "id"                         => "",
-    "info"                       => "",
-    "info_employee"              => "",
-    "is_deleted"                 => "",
-    "new"                        => "",
-    "no_cashups_to_display"      => "",
-    "none_selected"              => "",
-    "note"                       => "",
-    "one_or_multiple"            => "",
-    "open_amount_cash"           => "",
-    "open_date"                  => "",
-    "open_employee"              => "",
-    "opened_date"                => "",
-    "successful_adding"          => "",
-    "successful_deleted"         => "",
-    "successful_updating"        => "",
-    "total"                      => "",
-    "transfer_amount_cash"       => "",
-    "transfer_amount_cash_minus" => "",
-    "update"                     => "",
-    "warning"                    => "",
+    'amount' => "Liczba",
+    'amount_number' => "",
+    'amount_required' => "",
+    'cancel_cashups' => "",
+    'cancel_cashups_enter' => "",
+    'cannot_be_deleted' => "",
+    'cash_difference' => "",
+    'close_date' => "",
+    'close_employee' => "",
+    'closed_amount_card' => "",
+    'closed_amount_cash' => "",
+    'closed_amount_check' => "",
+    'closed_amount_due' => "",
+    'closed_amount_giftcard' => "",
+    'closed_amount_total' => "",
+    'closed_date' => "",
+    'confirm_delete' => "",
+    'confirm_restore' => "",
+    'confirm_submit' => "",
+    'date_number' => "",
+    'date_required' => "",
+    'description' => "Opis",
+    'enable_expected' => "",
+    'error_adding_updating' => "",
+    'giftcard' => "",
+    'id' => "",
+    'info' => "",
+    'info_employee' => "",
+    'is_deleted' => "",
+    'new' => "",
+    'no_cashups_to_display' => "",
+    'none_selected' => "",
+    'note' => "",
+    'one_or_multiple' => "",
+    'open_amount_cash' => "",
+    'open_date' => "",
+    'open_employee' => "",
+    'opened_date' => "",
+    'successful_adding' => "",
+    'successful_deleted' => "",
+    'successful_updating' => "",
+    'total' => "",
+    'transfer_amount_cash' => "",
+    'transfer_amount_cash_minus' => "",
+    'update' => "",
+    'warning' => "",
 ];
diff --git a/app/Language/pl/Config.php b/app/Language/pl/Config.php
index c599bb83c..a156817d2 100644
--- a/app/Language/pl/Config.php
+++ b/app/Language/pl/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "",
-    "address_required"                          => "",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => 'Adres Firmy',
+    'address_required'                          => 'Adres Firmy jest polem wymaganym.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Zezwalaj na duplikaty kodów kreskowych',
+    'apostrophe'                                => 'apostrof',
+    'backup_button'                             => 'Kopia zapasowa',
+    'backup_database'                           => 'Kopia zapasowa bazy danych',
+    'barcode'                                   => 'Kod kreskowy',
+    'barcode_company'                           => 'Nazwa firmy',
+    'barcode_configuration'                     => 'Konfiguracja Kodów Kreskowych',
+    'barcode_content'                           => 'Kontent Kodów Kreskowych',
+    'barcode_first_row'                         => 'Wiersz 1',
+    'barcode_font'                              => 'Czcionka',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => 'Numer Karty Podarunkowej',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'Kod referencyjny płatności<br>Limity długości',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Nieprawidłowa ścieżka sendmail. Dozwolone są tylko litery, cyfry, myślniki, podkreślenia, ukośniki, ukośniki odwrotne, dwukropki, spacje i kropki.',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/pl/Customers.php b/app/Language/pl/Customers.php
index 29eb9f886..332aaaca0 100644
--- a/app/Language/pl/Customers.php
+++ b/app/Language/pl/Customers.php
@@ -1,57 +1,57 @@
 <?php
 
 return [
-    "account_number"                => "Konto #",
-    "account_number_duplicate"      => "",
-    "available_points"              => "Dostępne punkty",
-    "available_points_value"        => "",
-    "average"                       => "",
-    "avg_discount"                  => "",
-    "basic_information"             => "",
-    "cannot_be_deleted"             => "",
-    "company_name"                  => "",
-    "confirm_delete"                => "",
-    "confirm_restore"               => "",
-    "consent"                       => "",
-    "consent_required"              => "",
-    "csv_import_failed"             => "",
-    "csv_import_nodata_wrongformat" => "",
-    "csv_import_partially_failed"   => "",
-    "csv_import_success"            => "",
-    "customer"                      => "",
-    "date"                          => "",
-    "discount"                      => "",
-    "discount_fixed"                => "",
-    "discount_percent"              => "",
-    "discount_type"                 => "",
-    "email_duplicate"               => "",
-    "employee"                      => "",
-    "error_adding_updating"         => "",
-    "import_items_csv"              => "",
-    "mailchimp_activity_click"      => "",
-    "mailchimp_activity_lastopen"   => "",
-    "mailchimp_activity_open"       => "",
-    "mailchimp_activity_total"      => "",
-    "mailchimp_activity_unopen"     => "",
-    "mailchimp_email_client"        => "",
-    "mailchimp_info"                => "",
-    "mailchimp_member_rating"       => "",
-    "mailchimp_status"              => "",
-    "mailchimp_vip"                 => "",
-    "max"                           => "",
-    "min"                           => "",
-    "new"                           => "",
-    "none_selected"                 => "",
-    "one_or_multiple"               => "",
-    "quantity"                      => "",
-    "stats_info"                    => "",
-    "successful_adding"             => "",
-    "successful_deleted"            => "",
-    "successful_updating"           => "",
-    "tax_code"                      => "",
-    "tax_id"                        => "",
-    "taxable"                       => "",
-    "total"                         => "",
-    "update"                        => "",
-    "rewards_package"               => "",
+    'account_number' => "Konto #",
+    'account_number_duplicate' => "",
+    'available_points' => "Dostępne punkty",
+    'available_points_value' => "",
+    'average' => "",
+    'avg_discount' => "",
+    'basic_information' => "",
+    'cannot_be_deleted' => "",
+    'company_name' => "",
+    'confirm_delete' => "",
+    'confirm_restore' => "",
+    'consent' => "",
+    'consent_required' => "",
+    'csv_import_failed' => "",
+    'csv_import_nodata_wrongformat' => "",
+    'csv_import_partially_failed' => "",
+    'csv_import_success' => "",
+    'customer' => "",
+    'date' => "",
+    'discount' => "",
+    'discount_fixed' => "",
+    'discount_percent' => "",
+    'discount_type' => "",
+    'email_duplicate' => "",
+    'employee' => "",
+    'error_adding_updating' => "",
+    'import_items_csv' => "",
+    'mailchimp_activity_click' => "",
+    'mailchimp_activity_lastopen' => "",
+    'mailchimp_activity_open' => "",
+    'mailchimp_activity_total' => "",
+    'mailchimp_activity_unopen' => "",
+    'mailchimp_email_client' => "",
+    'mailchimp_info' => "",
+    'mailchimp_member_rating' => "",
+    'mailchimp_status' => "",
+    'mailchimp_vip' => "",
+    'max' => "",
+    'min' => "",
+    'new' => "",
+    'none_selected' => "",
+    'one_or_multiple' => "",
+    'quantity' => "Ilość",
+    'stats_info' => "",
+    'successful_adding' => "",
+    'successful_deleted' => "",
+    'successful_updating' => "",
+    'tax_code' => "",
+    'tax_id' => "",
+    'taxable' => "",
+    'total' => "",
+    'update' => "",
+    'rewards_package' => "",
 ];
diff --git a/app/Language/pl/Employees.php b/app/Language/pl/Employees.php
index 6cdf0364f..38b9fefdc 100644
--- a/app/Language/pl/Employees.php
+++ b/app/Language/pl/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informacje",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => 'Informacje',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'Nie możesz usunąć własnych minimalnych uprawnień do modułów.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'Zmiany uprawnień są wyłączone w tej wersji demo.',
+    'error_password_change_disallowed'       => 'Zmiany hasła są wyłączone w tej wersji demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/pl/Error.php b/app/Language/pl/Error.php
index 35a6e713e..33f5e0d78 100644
--- a/app/Language/pl/Error.php
+++ b/app/Language/pl/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Nie masz dostępu do modułu",
-    "unknown"              => "Niespodziewany błąd",
+    'no_permission_module'           => 'Nie masz dostępu do modułu',
+    'unable_to_create_env_file'      => 'Nie można utworzyć {filePath}, aby przygotować throttle.key',
+    'unable_to_lock_file'            => 'Nie można zablokować {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Nie można otworzyć {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Nie można zapisać throttle.key w {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Nie można odczytać {filePath}, aby przygotować throttle.key',
+    'unknown'                        => 'Niespodziewany błąd',
 ];
diff --git a/app/Language/pl/Expenses.php b/app/Language/pl/Expenses.php
index 981b5e6f3..ebe2d1092 100644
--- a/app/Language/pl/Expenses.php
+++ b/app/Language/pl/Expenses.php
@@ -1,51 +1,51 @@
 <?php
 
 return [
-    "add_item"                   => "Dodaj wydatek",
-    "amount"                     => "",
-    "amount_number"              => "",
-    "amount_required"            => "",
-    "by_category"                => "",
-    "cannot_be_deleted"          => "",
-    "cash"                       => "",
-    "cash_filter"                => "",
-    "categories_name"            => "",
-    "category_required"          => "",
-    "check"                      => "",
-    "check_filter"               => "",
-    "confirm_delete"             => "",
-    "confirm_restore"            => "",
-    "credit"                     => "",
-    "credit_filter"              => "",
-    "date"                       => "",
-    "date_number"                => "",
-    "date_required"              => "",
-    "debit"                      => "",
-    "debit_filter"               => "",
-    "description"                => "",
-    "due"                        => "",
-    "due_filter"                 => "",
-    "employee"                   => "",
-    "error_adding_updating"      => "",
-    "expense_id"                 => "",
-    "expenses_employee"          => "",
-    "info"                       => "",
-    "ip_address"                 => "",
-    "is_deleted"                 => "",
-    "name_required"              => "",
-    "new"                        => "",
-    "new_supplier"               => "",
-    "no_expenses_to_display"     => "",
-    "none_selected"              => "",
-    "one_or_multiple"            => "",
-    "payment"                    => "",
-    "start_typing_supplier_name" => "",
-    "successful_adding"          => "",
-    "successful_deleted"         => "",
-    "successful_updating"        => "",
-    "supplier_name"              => "",
-    "supplier_tax_code"          => "",
-    "tax_amount"                 => "",
-    "tax_amount_number"          => "",
-    "update"                     => "",
+    'add_item' => "Dodaj wydatek",
+    'amount' => "",
+    'amount_number' => "",
+    'amount_required' => "",
+    'by_category' => "",
+    'cannot_be_deleted' => "Nie można usunąć Kategorię Wydatki",
+    'cash' => "",
+    'cash_filter' => "",
+    'categories_name' => "",
+    'category_required' => "",
+    'check' => "",
+    'check_filter' => "",
+    'confirm_delete' => "",
+    'confirm_restore' => "",
+    'credit' => "",
+    'credit_filter' => "",
+    'date' => "",
+    'date_number' => "",
+    'date_required' => "",
+    'debit' => "",
+    'debit_filter' => "",
+    'description' => "Opis",
+    'due' => "",
+    'due_filter' => "",
+    'employee' => "",
+    'error_adding_updating' => "",
+    'expense_id' => "",
+    'expenses_employee' => "",
+    'info' => "",
+    'ip_address' => "",
+    'is_deleted' => "",
+    'name_required' => "",
+    'new' => "",
+    'new_supplier' => "",
+    'no_expenses_to_display' => "",
+    'none_selected' => "",
+    'one_or_multiple' => "",
+    'payment' => "",
+    'start_typing_supplier_name' => "",
+    'successful_adding' => "",
+    'successful_deleted' => "",
+    'successful_updating' => "",
+    'supplier_name' => "",
+    'supplier_tax_code' => "",
+    'tax_amount' => "",
+    'tax_amount_number' => "",
+    'update' => "",
 ];
diff --git a/app/Language/pl/Expenses_categories.php b/app/Language/pl/Expenses_categories.php
index ed2aa02b3..c9e82523a 100644
--- a/app/Language/pl/Expenses_categories.php
+++ b/app/Language/pl/Expenses_categories.php
@@ -1,23 +1,23 @@
 <?php
 
 return [
-    "category_name_required"            => "",
-    "add_item"                          => "",
-    "cannot_be_deleted"                 => "",
-    "category_id"                       => "",
-    "confirm_delete"                    => "",
-    "confirm_restore"                   => "",
-    "description"                       => "",
-    "error_adding_updating"             => "",
-    "info"                              => "",
-    "name"                              => "",
-    "new"                               => "",
-    "no_expenses_categories_to_display" => "",
-    "none_selected"                     => "",
-    "one_or_multiple"                   => "",
-    "quantity"                          => "",
-    "successful_adding"                 => "",
-    "successful_deleted"                => "",
-    "successful_updating"               => "",
-    "update"                            => "",
+    'category_name_required' => "Nazwa Kategorii Wydatków jest wymagana",
+    'add_item' => "Dodaj Kategorię",
+    'cannot_be_deleted' => "Nie można usunąć Kategorię Wydatki",
+    'category_id' => "Id",
+    'confirm_delete' => "Czy jesteś pewien, że chcesz usunąć zaznaczone Kategorie Wydatków?",
+    'confirm_restore' => "Czy jesteś pewien, że chcesz przywrócić zaznaczone Kategorie Wydatków?",
+    'description' => "Opis kategorii",
+    'error_adding_updating' => "Błąd podczas dodawania lub aktualizowania Kategorii Wydatków",
+    'info' => "Kategoria Wydatków - Informacje",
+    'name' => "Nazwa Kategorii",
+    'new' => "Nowa Kategoria",
+    'no_expenses_categories_to_display' => "Brak Kategorii do wyświetlenia",
+    'none_selected' => "Nie zaznaczono żadnej Kategorii Wydatków",
+    'one_or_multiple' => "Kategoria Wydatki",
+    'quantity' => "Ilość",
+    'successful_adding' => "Kategoria Wydatków została dodana",
+    'successful_deleted' => "Kategoria Wydatków została usunięta",
+    'successful_updating' => "Kategoria Wydatków została zaktualizowana",
+    'update' => "Aktualizacja Kategorii",
 ];
diff --git a/app/Language/pl/Giftcards.php b/app/Language/pl/Giftcards.php
index e120d8b0d..fc09e2894 100644
--- a/app/Language/pl/Giftcards.php
+++ b/app/Language/pl/Giftcards.php
@@ -1,72 +1,72 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "Zezwól na alternatywny opis",
-    "bulk_edit"                          => "Edycja zbiorcza",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_giftcard"               => "",
-    "cannot_use"                         => "",
-    "card_value"                         => "",
-    "category"                           => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "current_quantity"                   => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_giftcards"            => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "giftcard"                           => "",
-    "giftcard_number"                    => "",
-    "info_provided_by"                   => "",
-    "inventory_comments"                 => "",
-    "is_serialized"                      => "",
-    "low_inventory_giftcards"            => "",
-    "manually_editing_of_quantity"       => "",
-    "must_select_giftcard_for_barcode"   => "",
-    "new"                                => "",
-    "no_description_giftcards"           => "",
-    "no_giftcards_to_display"            => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "number"                             => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "person_id"                          => "",
-    "quantity"                           => "",
-    "quantity_required"                  => "",
-    "remaining_balance"                  => "",
-    "reorder_level"                      => "",
-    "retrive_giftcard_info"              => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "serialized_giftcards"               => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_percent"                        => "",
-    "tax_percents"                       => "",
-    "unit_price"                         => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
-    "value"                              => "",
-    "value_required"                     => "",
+    'add_minus' => "Ilość do dodania lub odjęcia.",
+    'allow_alt_description' => "Zezwól na alternatywny opis",
+    'bulk_edit' => "Edycja zbiorcza",
+    'cannot_be_deleted' => "",
+    'cannot_find_giftcard' => "Nie odnaleziono Karty Podarunkowej",
+    'cannot_use' => "Nie można użyć Karty Podarunkowej {0} w tej sprzedaży: nieprawidłowy klient.",
+    'card_value' => "Wartość",
+    'category' => "Kategoria",
+    'change_all_to_allow_alt_desc' => "",
+    'change_all_to_not_allow_allow_desc' => "",
+    'change_all_to_serialized' => "",
+    'change_all_to_unserialized' => "",
+    'confirm_bulk_edit' => "Czy jesteś pewny, że chcesz edytować wybrane Karty Podarunkowe?",
+    'confirm_delete' => "",
+    'confirm_restore' => "",
+    'cost_price' => "",
+    'count' => "",
+    'csv_import_failed' => "Nie udało się zaimportować CSV.",
+    'current_quantity' => "Aktualna Ilość",
+    'description' => "Opis",
+    'details_count' => "",
+    'do_nothing' => "Nic nie rób",
+    'edit_fields_you_want_to_update' => "",
+    'edit_multiple_giftcards' => "Edytuj wiele Kart Podarunkowych",
+    'error_adding_updating' => "Dodanie lub aktualizacja Karty Podarunkowej nie powiodła się.",
+    'error_updating_multiple' => "",
+    'generate_barcodes' => "Generuj kody kreskowe",
+    'giftcard' => "Karta Podarunkowa",
+    'giftcard_number' => "Numer Karty Podarunkowej",
+    'info_provided_by' => "Informacje dostarczone przez",
+    'inventory_comments' => "Komentarze",
+    'is_serialized' => "",
+    'low_inventory_giftcards' => "",
+    'manually_editing_of_quantity' => "",
+    'must_select_giftcard_for_barcode' => "",
+    'new' => "",
+    'no_description_giftcards' => "",
+    'no_giftcards_to_display' => "",
+    'none' => "",
+    'none_selected' => "",
+    'number' => "",
+    'number_information' => "",
+    'number_required' => "",
+    'one_or_multiple' => "",
+    'person_id' => "",
+    'quantity' => "Ilość",
+    'quantity_required' => "",
+    'remaining_balance' => "",
+    'reorder_level' => "",
+    'retrive_giftcard_info' => "",
+    'sales_tax_1' => "",
+    'sales_tax_2' => "",
+    'serialized_giftcards' => "",
+    'successful_adding' => "",
+    'successful_bulk_edit' => "",
+    'successful_deleted' => "",
+    'successful_updating' => "",
+    'supplier' => "",
+    'tax_1' => "",
+    'tax_2' => "",
+    'tax_percent' => "",
+    'tax_percents' => "",
+    'unit_price' => "",
+    'upc_database' => "",
+    'update' => "",
+    'use_inventory_menu' => "",
+    'value' => "",
+    'value_required' => "",
 ];
diff --git a/app/Language/pl/Item_kits.php b/app/Language/pl/Item_kits.php
index 9d98af25e..973d6cde9 100644
--- a/app/Language/pl/Item_kits.php
+++ b/app/Language/pl/Item_kits.php
@@ -1,42 +1,42 @@
 <?php
 
 return [
-    "add_item"                  => "Dodaj element",
-    "all"                       => "",
-    "cannot_be_deleted"         => "",
-    "confirm_delete"            => "",
-    "confirm_restore"           => "",
-    "description"               => "",
-    "discount"                  => "",
-    "discount_fixed"            => "",
-    "discount_percent"          => "",
-    "discount_type"             => "",
-    "error_adding_updating"     => "",
-    "find_kit_item"             => "",
-    "info"                      => "",
-    "item"                      => "",
-    "item_kit_number"           => "",
-    "item_kit_number_duplicate" => "",
-    "item_number"               => "",
-    "item_number_duplicate"     => "",
-    "items"                     => "",
-    "kit"                       => "",
-    "kit_and_components"        => "",
-    "kit_and_stock"             => "",
-    "kit_only"                  => "",
-    "name"                      => "",
-    "new"                       => "",
-    "no_item_kits_to_display"   => "",
-    "none_selected"             => "",
-    "one_or_multiple"           => "",
-    "price_option"              => "",
-    "priced_only"               => "",
-    "print_option"              => "",
-    "quantity"                  => "",
-    "sequence"                  => "",
-    "successful_adding"         => "",
-    "successful_deleted"        => "",
-    "successful_updating"       => "",
-    "unit_price"                => "",
-    "update"                    => "",
+    'add_item' => "Dodaj element",
+    'all' => "",
+    'cannot_be_deleted' => "",
+    'confirm_delete' => "",
+    'confirm_restore' => "",
+    'description' => "",
+    'discount' => "",
+    'discount_fixed' => "",
+    'discount_percent' => "",
+    'discount_type' => "",
+    'error_adding_updating' => "",
+    'find_kit_item' => "",
+    'info' => "",
+    'item' => "",
+    'item_kit_number' => "",
+    'item_kit_number_duplicate' => "",
+    'item_number' => "",
+    'item_number_duplicate' => "",
+    'items' => "",
+    'kit' => "",
+    'kit_and_components' => "",
+    'kit_and_stock' => "",
+    'kit_only' => "",
+    'name' => "",
+    'new' => "",
+    'no_item_kits_to_display' => "",
+    'none_selected' => "",
+    'one_or_multiple' => "",
+    'price_option' => "",
+    'priced_only' => "",
+    'print_option' => "",
+    'quantity' => "Ilość",
+    'sequence' => "",
+    'successful_adding' => "",
+    'successful_deleted' => "",
+    'successful_updating' => "",
+    'unit_price' => "",
+    'update' => "",
 ];
diff --git a/app/Language/pl/Items.php b/app/Language/pl/Items.php
index 42b2152bb..80126ddcf 100644
--- a/app/Language/pl/Items.php
+++ b/app/Language/pl/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "",
-    "category"                           => "",
-    "category_new"                       => "",
-    "category_required"                  => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_bulk_edit_wipe_taxes"       => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus' => 'Ilość do dodania lub odjęcia.',
+    'allow_alt_description' => '',
+    'amount_entry' => '',
+    'bulk_edit' => '',
+    'buy_price_required' => '',
+    'cannot_be_deleted' => '',
+    'cannot_find_item' => '',
+    'categories' => '',
+    'category' => 'Kategoria',
+    'category_new' => '',
+    'category_required' => '',
+    'change_all_to_allow_alt_desc' => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized' => '',
+    'change_all_to_unserialized' => '',
+    'change_image' => '',
+    'confirm_bulk_edit' => '',
+    'confirm_bulk_edit_wipe_taxes' => '',
+    'confirm_delete' => '',
+    'confirm_restore' => '',
+    'cost_price' => '',
+    'cost_price_number' => '',
+    'cost_price_required' => '',
+    'count' => '',
+    'csv_import_failed' => '',
+    'csv_import_invalid_location' => '',
+    'csv_import_nodata_wrongformat' => '',
+    'csv_import_partially_failed' => '',
+    'csv_import_success' => '',
+    'current_quantity' => 'Aktualna Ilość',
+    'default_pack_name' => '',
+    'description' => 'Opis',
+    'details_count' => '',
+    'do_nothing' => 'Nic nie rób',
+    'edit' => '',
+    'edit_fields_you_want_to_update' => '',
+    'edit_multiple_items' => '',
+    'empty_upc_items' => '',
+    'error_adding_updating' => '',
+    'error_updating_multiple' => '',
+    'generate_barcodes' => 'Generuj kody kreskowe',
+    'hsn_code' => '',
+    'image' => '',
+    'import_items_csv' => '',
+    'info_provided_by' => '',
+    'inventory' => '',
+    'inventory_CSV_import_quantity' => '',
+    'inventory_comments' => 'Komentarze',
+    'inventory_data_tracking' => '',
+    'inventory_date' => '',
+    'inventory_employee' => '',
+    'inventory_in_out_quantity' => '',
+    'inventory_remarks' => '',
+    'is_deleted' => '',
+    'is_printed' => '',
+    'is_serialized' => '',
+    'item' => '',
+    'item_id' => '',
+    'item_number' => '',
+    'item_number_duplicate' => '',
+    'item_number_invalid' => 'Numer przedmiotu zawiera niedozwolone znaki.',
+    'kit' => '',
+    'location' => '',
+    'low_inventory_items' => '',
+    'low_sell_item' => '',
+    'manually_editing_of_quantity' => '',
+    'markup' => '',
+    'name' => '',
+    'name_required' => '',
+    'new' => '',
+    'no_description_items' => '',
+    'no_items_to_display' => '',
+    'none' => '',
+    'none_selected' => '',
+    'nonstock' => '',
+    'number_information' => '',
+    'number_required' => '',
+    'one_or_multiple' => '',
+    'pack_name' => '',
+    'qty_per_pack' => '',
+    'quantity' => 'Ilość',
+    'quantity_number' => '',
+    'quantity_required' => '',
+    'receiving_quantity' => '',
+    'remove_image' => '',
+    'reorder_level' => '',
+    'reorder_level_number' => '',
+    'reorder_level_required' => '',
+    'retrive_item_info' => '',
+    'sales_tax_1' => '',
+    'sales_tax_2' => '',
+    'search_attributes' => '',
+    'select_image' => '',
+    'serialized_items' => '',
+    'standard' => '',
+    'stock' => '',
+    'stock_location' => '',
+    'stock_type' => '',
+    'successful_adding' => '',
+    'successful_bulk_edit' => '',
+    'successful_deleted' => '',
+    'successful_updating' => '',
+    'supplier' => '',
+    'tax_1' => '',
+    'tax_2' => '',
+    'tax_3' => '',
+    'tax_category' => '',
+    'tax_name_invalid' => 'Nazwa podatku zawiera niedozwolone znaki.',
+    'tax_percent' => '',
+    'tax_percent_number' => '',
+    'tax_percent_required' => '',
+    'tax_percents' => '',
+    'temp' => '',
+    'type' => '',
+    'unit_price' => '',
+    'unit_price_number' => '',
+    'unit_price_required' => '',
+    'upc_database' => '',
+    'update' => '',
+    'use_inventory_menu' => '',
 ];
diff --git a/app/Language/pl/Login.php b/app/Language/pl/Login.php
index 399a94a22..10f680e0b 100644
--- a/app/Language/pl/Login.php
+++ b/app/Language/pl/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Nie jestem robotem.",
-    "go"                            => "Idź",
-    "invalid_gcaptcha"              => "Udowodnij, że nie jesteś robotem.",
-    "invalid_installation"          => "Instalacja nie jest poprawna, sprawdź swój plik php.ini.",
-    "invalid_username_and_password" => "Niepoprawna nazwa użytkownika i/lub hasło.",
-    "login"                         => "Zaloguj",
-    "logout"                        => "Wyloguj",
-    "migration_needed"              => "Migracja bazy danych do {0} zacznie się po zalogowaniu.",
-    "password"                      => "Hasło",
-    "required_username"             => "",
-    "username"                      => "Nazwa użytkownika",
-    "welcome"                       => "Witaj w {0}!",
+    "gcaptcha"                            => "Nie jestem robotem.",
+    "go"                                  => "Idź",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Udowodnij, że nie jesteś robotem.",
+    "invalid_installation"                => "Instalacja nie jest poprawna, sprawdź swój plik php.ini.",
+    "invalid_username_and_password"       => "Niepoprawna nazwa użytkownika i/lub hasło.",
+    "login"                               => "Zaloguj",
+    "logout"                              => "Wyloguj",
+    "migrating_database"                  => "Migracja bazy danych",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Baza danych została pomyślnie zmigrowana!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "Migracja bazy danych do {0} zacznie się po zalogowaniu.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Hasło",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Zbyt wiele prób. Proszę chwilę poczekać i spróbować ponownie.',
+    "username"                            => "Nazwa użytkownika",
+    "welcome"                             => "Witaj w {0}!"
 ];
diff --git a/app/Language/pl/Reports.php b/app/Language/pl/Reports.php
index 3c2a941a2..b1b4644d6 100644
--- a/app/Language/pl/Reports.php
+++ b/app/Language/pl/Reports.php
@@ -1,149 +1,150 @@
 <?php
 
 return [
-    "all"                                     => "Wszystko",
-    "authority"                               => "",
-    "canceled"                                => "",
-    "categories"                              => "",
-    "categories_summary_report"               => "",
-    "category"                                => "",
-    "code_canceled"                           => "",
-    "code_invoice"                            => "",
-    "code_pos"                                => "",
-    "code_quote"                              => "",
-    "code_return"                             => "",
-    "code_type"                               => "",
-    "code_work_order"                         => "",
-    "comments"                                => "",
-    "commission"                              => "",
-    "complete"                                => "",
-    "completed_sales"                         => "",
-    "confirm_delete"                          => "",
-    "confirm_restore"                         => "",
-    "cost"                                    => "",
-    "cost_price"                              => "",
-    "count"                                   => "",
-    "customer"                                => "",
-    "customers"                               => "",
-    "customers_summary_report"                => "",
-    "date"                                    => "",
-    "date_range"                              => "",
-    "description"                             => "",
-    "detailed_receivings_report"              => "",
-    "detailed_receivings_report_input"        => "",
-    "detailed_reports"                        => "",
-    "detailed_requisition_report"             => "",
-    "detailed_sales_report"                   => "",
-    "discount"                                => "",
-    "discount_fixed"                          => "",
-    "discount_percent"                        => "",
-    "discount_type"                           => "",
-    "discounts"                               => "",
-    "discounts_summary_report"                => "",
-    "earned"                                  => "",
-    "employee"                                => "",
-    "employees"                               => "",
-    "employees_summary_report"                => "",
-    "expenses"                                => "",
-    "expenses_amount"                         => "",
-    "expenses_categories"                     => "",
-    "expenses_categories_summary_report"      => "",
-    "expenses_category"                       => "",
-    "expenses_payment_amount"                 => "",
-    "expenses_tax_amount"                     => "",
-    "expenses_total_amount"                   => "",
-    "expenses_total_tax_amount"               => "",
-    "graphical_reports"                       => "",
-    "inventory"                               => "",
-    "inventory_low"                           => "",
-    "inventory_low_report"                    => "",
-    "inventory_reports"                       => "",
-    "inventory_summary"                       => "",
-    "inventory_summary_report"                => "",
-    "item"                                    => "",
-    "item_count"                              => "",
-    "item_name"                               => "",
-    "item_number"                             => "",
-    "items"                                   => "",
-    "items_purchased"                         => "",
-    "items_received"                          => "",
-    "items_summary_report"                    => "",
-    "jurisdiction"                            => "",
-    "low_inventory"                           => "",
-    "low_inventory_report"                    => "",
-    "low_sell_quantity"                       => "",
-    "more_than_zero"                          => "",
-    "name"                                    => "",
-    "no_reports_to_display"                   => "",
-    "payment_type"                            => "",
-    "payments"                                => "",
-    "payments_summary_report"                 => "",
-    "profit"                                  => "",
-    "quantity"                                => "",
-    "quantity_purchased"                      => "",
-    "quotes"                                  => "",
-    "received_by"                             => "",
-    "receiving_id"                            => "",
-    "receiving_type"                          => "",
-    "receivings"                              => "",
-    "reorder_level"                           => "",
-    "report"                                  => "",
-    "report_input"                            => "",
-    "reports"                                 => "",
-    "requisition"                             => "",
-    "requisition_by"                          => "",
-    "requisition_id"                          => "",
-    "requisition_item"                        => "",
-    "requisition_item_quantity"               => "",
-    "requisition_related_item"                => "",
-    "requisition_related_item_total_quantity" => "",
-    "requisition_related_item_unit_quantity"  => "",
-    "requisitions"                            => "",
-    "returns"                                 => "",
-    "revenue"                                 => "",
-    "sale_id"                                 => "",
-    "sale_type"                               => "",
-    "sales"                                   => "",
-    "sales_amount"                            => "",
-    "sales_summary_report"                    => "",
-    "sales_taxes"                             => "",
-    "sales_taxes_summary_report"              => "",
-    "serial_number"                           => "",
-    "service_charge"                          => "",
-    "sold_by"                                 => "",
-    "sold_items"                              => "",
-    "sold_to"                                 => "",
-    "stock_location"                          => "",
-    "sub_total_value"                         => "",
-    "subtotal"                                => "",
-    "summary_reports"                         => "",
-    "supplied_by"                             => "",
-    "supplier"                                => "",
-    "suppliers"                               => "",
-    "suppliers_summary_report"                => "",
-    "tax"                                     => "",
-    "tax_category"                            => "",
-    "tax_name"                                => "",
-    "tax_percent"                             => "",
-    "tax_rate"                                => "",
-    "taxes"                                   => "",
-    "taxes_summary_report"                    => "",
-    "total"                                   => "",
-    "total_inventory_value"                   => "",
-    "total_low_sell_quantity"                 => "",
-    "total_quantity"                          => "",
-    "total_retail"                            => "",
-    "trans_amount"                            => "",
-    "trans_due"                               => "",
-    "trans_group"                             => "",
-    "trans_nopay_sales"                       => "",
-    "trans_payments"                          => "",
-    "trans_refunded"                          => "",
-    "trans_sales"                             => "",
-    "trans_type"                              => "",
-    "type"                                    => "",
-    "unit_price"                              => "",
-    "used"                                    => "",
-    "work_orders"                             => "",
-    "zero_and_less"                           => "",
+    'all' => "Wszystko",
+    'authority' => "",
+    'canceled' => "",
+    'categories' => "",
+    'categories_summary_report' => "",
+    'category' => "Kategoria",
+    'code_canceled' => "",
+    'code_invoice' => "",
+    'code_pos' => "",
+    'code_quote' => "",
+    'code_return' => "",
+    'code_type' => "",
+    'code_work_order' => "",
+    'comments' => "",
+    'commission' => "",
+    'complete' => "",
+    'completed_sales' => "",
+    'confirm_delete' => "",
+    'confirm_restore' => "",
+    'cost' => "",
+    'cost_price' => "",
+    'count' => "",
+    'customer' => "",
+    'customers' => "",
+    'customers_summary_report' => "",
+    'date' => "",
+    'date_range' => "",
+    'description' => "Opis",
+    'detailed_receivings_report' => "",
+    'detailed_receivings_report_input' => "",
+    'detailed_reports' => "",
+    'detailed_requisition_report' => "",
+    'detailed_sales_report' => "",
+    'discount' => "",
+    'discount_fixed' => "",
+    'discount_percent' => "",
+    'discount_type' => "",
+    'discounts' => "",
+    'discounts_summary_report' => "",
+    'earned' => "",
+    'employee' => "",
+    'employees' => "",
+    'employees_summary_report' => "",
+    'expenses' => "",
+    'expenses_amount' => "",
+    'expenses_categories' => "",
+    'expenses_categories_summary_report' => "",
+    'expenses_category' => "",
+    'expenses_payment_amount' => "",
+    'expenses_tax_amount' => "",
+    'expenses_total_amount' => "",
+    'expenses_total_tax_amount' => "",
+    'graphical_reports' => "",
+    'inventory' => "",
+    'inventory_low' => "",
+    'inventory_low_report' => "",
+    'inventory_reports' => "",
+    'inventory_summary' => "",
+    'inventory_summary_report' => "",
+    'item' => "",
+    'item_count' => "",
+    'item_name' => "",
+    'item_number' => "",
+    'items' => "",
+    'items_purchased' => "",
+    'items_received' => "",
+    'items_summary_report' => "",
+    'jurisdiction' => "",
+    'low_inventory' => "",
+    'low_inventory_report' => "",
+    'low_sell_quantity' => "",
+    'more_than_zero' => "",
+    'name' => "",
+    'no_reports_to_display' => "",
+    'payment_type' => "",
+    'payments' => "",
+    'payments_summary_report' => "",
+    'profit' => "",
+    'quantity' => "Ilość",
+    'quantity_purchased' => "",
+    'quotes' => "",
+    'received_by' => "",
+    'receiving_id' => "",
+    'receiving_type' => "",
+    'receivings' => "",
+    'reorder_level' => "",
+    'report' => "",
+    'report_input' => "",
+    'reports' => "",
+    'requisition' => "",
+    'requisition_by' => "",
+    'requisition_id' => "",
+    'requisition_item' => "",
+    'requisition_item_quantity' => "",
+    'requisition_related_item' => "",
+    'requisition_related_item_total_quantity' => "",
+    'requisition_related_item_unit_quantity' => "",
+    'requisitions' => "",
+    'returns' => "",
+    'revenue' => "",
+    'sale_id' => "",
+    'sale_type' => "",
+    'sales' => "",
+    'sales_amount' => "",
+    'sales_summary_report' => "",
+    'sales_taxes' => "",
+    'sales_taxes_summary_report' => "",
+    'serial_number' => "",
+    'service_charge' => "",
+    'sold_by' => "",
+    'sold_items' => "",
+    'sold_to' => "",
+    'stock_location' => "",
+    'sub_total_value' => "",
+    'subtotal' => "",
+    'summary_reports' => "",
+    'supplied_by' => "",
+    'supplier' => "",
+    'suppliers' => "",
+    'suppliers_summary_report' => "",
+    'tax' => "",
+    'tax_category' => "",
+    'tax_name' => "",
+    'tax_percent' => "",
+    'tax_rate' => "",
+    'taxes' => "",
+    'taxes_summary_report' => "",
+    'toggle_cost_and_profit' => "",
+    'total' => "",
+    'total_inventory_value' => "",
+    'total_low_sell_quantity' => "",
+    'total_quantity' => "",
+    'total_retail' => "",
+    'trans_amount' => "",
+    'trans_due' => "",
+    'trans_group' => "",
+    'trans_nopay_sales' => "",
+    'trans_payments' => "",
+    'trans_refunded' => "",
+    'trans_sales' => "",
+    'trans_type' => "",
+    'type' => "",
+    'unit_price' => "",
+    'used' => "",
+    'work_orders' => "",
+    'zero_and_less' => "",
 ];
diff --git a/app/Language/pl/Sales.php b/app/Language/pl/Sales.php
index 3e8d5f3c5..c56616e5b 100644
--- a/app/Language/pl/Sales.php
+++ b/app/Language/pl/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Dostępne punkty",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "",
-    "amount_due"                       => "",
-    "amount_tendered"                  => "",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "",
-    "cash"                             => "",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "",
-    "change_due"                       => "",
-    "change_price"                     => "",
-    "check"                            => "",
-    "check_balance"                    => "",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "",
-    "comments"                         => "",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "",
-    "confirm_cancel_sale"              => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "credit"                           => "",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "",
-    "customer_address"                 => "",
-    "customer_discount"                => "",
-    "customer_email"                   => "",
-    "customer_location"                => "",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "",
-    "date_range"                       => "",
-    "date_required"                    => "",
-    "date_type"                        => "",
-    "debit"                            => "",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "",
-    "delete_entire_sale"               => "",
-    "delete_successful"                => "",
-    "delete_unsuccessful"              => "",
-    "description_abbrv"                => "",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "",
-    "discount_included"                => "",
-    "discount_short"                   => "",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "",
-    "edit_item"                        => "",
-    "edit_sale"                        => "",
-    "email_receipt"                    => "",
-    "employee"                         => "",
-    "entry"                            => "",
-    "error_editing_item"               => "",
-    "find_or_scan_item"                => "",
-    "find_or_scan_item_or_receipt"     => "",
-    "giftcard"                         => "",
-    "giftcard_balance"                 => "",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "",
-    "include_prices"                   => "",
-    "invoice"                          => "",
-    "invoice_confirm"                  => "",
-    "invoice_enable"                   => "",
-    "invoice_filter"                   => "",
-    "invoice_no_email"                 => "",
-    "invoice_number"                   => "",
-    "invoice_number_duplicate"         => "",
-    "invoice_sent"                     => "",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "",
-    "invoice_update"                   => "",
-    "item_insufficient_of_stock"       => "",
-    "item_name"                        => "",
-    "item_number"                      => "",
-    "item_out_of_stock"                => "",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "",
-    "new_customer"                     => "",
-    "new_item"                         => "",
-    "no_description"                   => "",
-    "no_filter"                        => "",
-    "no_items_in_cart"                 => "",
-    "no_sales_to_display"              => "",
-    "none_selected"                    => "",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "",
-    "payment_amount"                   => "",
-    "payment_not_cover_total"          => "",
-    "payment_type"                     => "",
-    "payments"                         => "",
-    "payments_total"                   => "",
-    "price"                            => "",
-    "print_after_sale"                 => "",
-    "quantity"                         => "",
-    "quantity_less_than_reorder_level" => "",
-    "quantity_less_than_zero"          => "",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "",
-    "receipt_sent"                     => "",
-    "receipt_unsent"                   => "",
-    "refund"                           => "",
-    "register"                         => "",
-    "remove_customer"                  => "",
-    "remove_discount"                  => "",
-    "return"                           => "",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "",
-    "sale_time"                        => "",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "",
-    "send_invoice"                     => "",
-    "send_quote"                       => "",
-    "send_receipt"                     => "",
-    "send_work_order"                  => "",
-    "serial"                           => "",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "",
-    "show_receipt"                     => "",
-    "start_typing_customer_name"       => "",
-    "start_typing_item_name"           => "",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "",
-    "successfully_deleted"             => "",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "",
-    "successfully_updated"             => "",
-    "suspend_sale"                     => "",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "",
-    "suspended_sales"                  => "",
-    "table"                            => "",
-    "takings"                          => "",
-    "tax"                              => "",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "",
-    "taxed_ind"                        => "",
-    "total"                            => "",
-    "total_tax_exclusive"              => "",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "",
-    "unsuccessfully_deleted"           => "",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "",
-    "unsuccessfully_updated"           => "",
-    "unsuspend"                        => "",
-    "unsuspend_and_delete"             => "",
-    "update"                           => "",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => '',
+    'amount_due'                        => '',
+    'amount_due_not_covered'            => 'Płatności nie pokrywają należnej kwoty.',
+    'amount_tendered'                   => '',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => '',
+    'cash'                              => '',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '',
+    'change_due'                        => '',
+    'change_price'                      => '',
+    'check'                             => '',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => '',
+    'comments'                          => '',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '',
+    'confirm_cancel_sale'               => '',
+    'confirm_delete'                    => '',
+    'confirm_restore'                   => '',
+    'credit'                            => '',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '',
+    'customer_address'                  => '',
+    'customer_discount'                 => '',
+    'customer_email'                    => '',
+    'customer_location'                 => '',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => '',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Dostępne punkty',
+    'daily_sales'                       => '',
+    'date'                              => '',
+    'date_range'                        => '',
+    'date_required'                     => '',
+    'date_type'                         => '',
+    'debit'                             => '',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => '',
+    'delete_entire_sale'                => '',
+    'delete_successful'                 => '',
+    'delete_unsuccessful'               => '',
+    'description_abbrv'                 => '',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '',
+    'edit_item'                         => '',
+    'edit_sale'                         => '',
+    'email_receipt'                     => '',
+    'employee'                          => '',
+    'entry'                             => '',
+    'error_editing_item'                => '',
+    'find_or_scan_item'                 => '',
+    'find_or_scan_item_or_receipt'      => '',
+    'giftcard'                          => 'Karta Podarunkowa',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Numer Karty Podarunkowej',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'Niewystarczające saldo karty podarunkowej dla tej płatności.',
+    'insufficient_reward_points'        => 'Niewystarczające punkty nagród dla tej płatności.',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'Należy podać numer referencyjny/pobierania.',
+    'negative_amount_tendered'          => 'Otrzymana kwota nie może być ujemna.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => 'Ilość',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'Kod referencyjny płatności',
+    'reference_code_invalid_characters' => 'Kod referencyjny może zawierać tylko litery i cyfry.',
+    'reference_code_length_error'       => 'Długość kodu referencyjnego jest nieprawidłowa.',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/pl/Suppliers.php b/app/Language/pl/Suppliers.php
index eff9250fd..a9186487d 100644
--- a/app/Language/pl/Suppliers.php
+++ b/app/Language/pl/Suppliers.php
@@ -1,25 +1,25 @@
 <?php
 
 return [
-    "account_number"        => "Numer konta",
-    "agency_name"           => "",
-    "cannot_be_deleted"     => "",
-    "category"              => "",
-    "company_name"          => "",
-    "company_name_required" => "",
-    "confirm_delete"        => "",
-    "confirm_restore"       => "",
-    "cost"                  => "",
-    "error_adding_updating" => "",
-    "goods"                 => "",
-    "new"                   => "",
-    "none_selected"         => "",
-    "one_or_multiple"       => "",
-    "successful_adding"     => "",
-    "successful_deleted"    => "",
-    "successful_updating"   => "",
-    "supplier"              => "",
-    "supplier_id"           => "",
-    "tax_id"                => "",
-    "update"                => "",
+    'account_number' => "Numer konta",
+    'agency_name' => "",
+    'cannot_be_deleted' => "",
+    'category' => "Kategoria",
+    'company_name' => "",
+    'company_name_required' => "",
+    'confirm_delete' => "",
+    'confirm_restore' => "",
+    'cost' => "",
+    'error_adding_updating' => "",
+    'goods' => "",
+    'new' => "",
+    'none_selected' => "",
+    'one_or_multiple' => "",
+    'successful_adding' => "",
+    'successful_deleted' => "",
+    'successful_updating' => "",
+    'supplier' => "",
+    'supplier_id' => "",
+    'tax_id' => "",
+    'update' => "",
 ];
diff --git a/app/Language/pt-BR/Attributes.php b/app/Language/pt-BR/Attributes.php
index 06848de15..a69b5031f 100644
--- a/app/Language/pt-BR/Attributes.php
+++ b/app/Language/pt-BR/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Valor do atributo não pode conter ':' ou '|'",
-    "confirm_delete"                   => "Tem certeza de que deseja excluir os atributos selecionados?",
-    "confirm_restore"                  => "Tem certeza de que deseja restaurar o(s) atributo(s) selecionado(s)?",
-    "definition_cannot_be_deleted"     => "Não foi possível excluir atributo selecionado (s)",
-    "definition_error_adding_updating" => "Atributo {0} não pode ser adicionado ou atualizado. Por favor verifique o log de erros.",
-    "definition_flags"                 => "Visibilidade de atributo",
-    "definition_group"                 => "Grupo",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Adicionar Atributo",
-    "definition_name_required"         => "Nome do atributo é um campo obrigatório",
-    "definition_one_or_multiple"       => "Atributo(s)",
-    "definition_successful_adding"     => "Você adicionou com êxito o item",
-    "definition_successful_deleted"    => "Você excluiu com êxito",
-    "definition_successful_updating"   => "Você atualizou com êxito o atributo",
-    "definition_type"                  => "Tipo de atributo",
-    "definition_type_required"         => "Tipo de atributo é um campo obrigatório",
-    "definition_unit"                  => "Unidade de medida",
-    "definition_values"                => "Valores de atributo",
-    "new"                              => "Novo Atributo",
-    "no_attributes_to_display"         => "Não há itens para exibir",
-    "receipt_visibility"               => "Recibo",
-    "show_in_items"                    => "Mostrar em itens",
-    "show_in_items_visibility"         => "Itens",
-    "show_in_receipt"                  => "Mostrar no recibo",
-    "show_in_receivings"               => "Mostrar em recebimentos",
-    "show_in_receivings_visibility"    => "Recebimentos",
-    "show_in_sales"                    => "Mostrar em vendas",
-    "show_in_sales_visibility"         => "Vendas",
-    "update"                           => "Atualizar atributo",
+    'attribute_value_invalid_chars'    => 'Valor do atributo não pode conter \':\' ou \'|\'',
+    'confirm_delete'                   => 'Tem certeza de que deseja excluir os atributos selecionados?',
+    'confirm_restore'                  => 'Tem certeza de que deseja restaurar o(s) atributo(s) selecionado(s)?',
+    'definition_cannot_be_deleted'     => 'Não foi possível excluir atributo selecionado (s)',
+    'definition_invalid_group' => 'O grupo selecionado não existe ou é inválido.',
+    'definition_error_adding_updating' => 'Atributo {0} não pode ser adicionado ou atualizado. Por favor verifique o log de erros.',
+    'definition_flags'                 => 'Visibilidade de atributo',
+    'definition_group'                 => 'Grupo',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Adicionar Atributo',
+    'definition_name_required'         => 'Nome do atributo é um campo obrigatório',
+    'definition_one_or_multiple'       => 'Atributo(s)',
+    'definition_successful_adding'     => 'Você adicionou com êxito o item',
+    'definition_successful_deleted'    => 'Você excluiu com êxito',
+    'definition_successful_updating'   => 'Você atualizou com êxito o atributo',
+    'definition_type'                  => 'Tipo de atributo',
+    'definition_type_required'         => 'Tipo de atributo é um campo obrigatório',
+    'definition_unit'                  => 'Unidade de medida',
+    'definition_values'                => 'Valores de atributo',
+    'new'                              => 'Novo Atributo',
+    'no_attributes_to_display'         => 'Não há itens para exibir',
+    'receipt_visibility'               => 'Recibo',
+    'show_in_items'                    => 'Mostrar em itens',
+    'show_in_items_visibility'         => 'Itens',
+    'show_in_receipt'                  => 'Mostrar no recibo',
+    'show_in_receivings'               => 'Mostrar em recebimentos',
+    'show_in_receivings_visibility'    => 'Recebimentos',
+    'show_in_sales'                    => 'Mostrar em vendas',
+    'show_in_sales_visibility'         => 'Vendas',
+    'show_in_search'                   => 'Mostrar na busca',
+    'show_in_search_visibility'        => 'Busca',
+    'update'                           => 'Atualizar atributo',
 ];
diff --git a/app/Language/pt-BR/Bootstrap_tables.php b/app/Language/pt-BR/Bootstrap_tables.php
index cae106f55..3dcce4ba4 100644
--- a/app/Language/pt-BR/Bootstrap_tables.php
+++ b/app/Language/pt-BR/Bootstrap_tables.php
@@ -4,7 +4,7 @@ return [
     'all' => "Tudo",
     'columns' => "Colunas",
     'hide_show_pagination' => "Ocultar/Exibir paginação",
-    'loading' => "Carregando, aguarde...",
+    'loading' => "Carregando, aguarde",
     'page_from_to' => "Exibindo {0} até {1} de {2} linhas",
     'refresh' => "Recarregar",
     'rows_per_page' => "registros por página",
diff --git a/app/Language/pt-BR/Common.php b/app/Language/pt-BR/Common.php
index 7a6d5f84a..474980b82 100644
--- a/app/Language/pt-BR/Common.php
+++ b/app/Language/pt-BR/Common.php
@@ -3,18 +3,18 @@
 return [
     'address_1' => "Endereço",
     'address_2' => "Complemento",
-    'admin' => "",
+    'admin' => "Administrador",
     'city' => "Cidade",
-    'clerk' => "",
+    'clerk' => "Funcionário",
     'close' => "Fechar",
-    'color' => "",
+    'color' => "Cores do tema",
     'comments' => "Comentários",
     'common' => "comum",
     'confirm_search' => "Você selecionou uma ou mais linhas,  estes não serão mais selecionados após a sua pesquisa. Tem certeza de que deseja enviar esta pesquisa?",
     'copyrights' => "© 2010 - {0}",
     'correct_errors' => "Por favor, corrija os erros identificados antes de salvar",
     'country' => "País",
-    'dashboard' => "",
+    'dashboard' => "Painel",
     'date' => "Data",
     'delete' => "Apagar",
     'det' => "detalhes",
@@ -26,14 +26,14 @@ return [
     'export_csv_no' => "Não",
     'export_csv_yes' => "Sim",
     'fields_required_message' => "Campos em vermelho são obrigatórios",
-    'fields_required_message_unique' => "",
+    'fields_required_message_unique' => "Campos em vermelho são obrigatórios e devem ser únicos",
     'first_name' => "Nome",
     'first_name_required' => "O nome é requerido.",
     'first_page' => "Primeira",
     'gender' => "Sexo",
     'gender_female' => "F",
     'gender_male' => "M",
-    'gender_undefined' => "",
+    'gender_undefined' => "Indefinido",
     'icon' => "Ícone",
     'id' => "Id",
     'import' => "Importar",
@@ -51,18 +51,18 @@ return [
     'logo' => "Logotipo",
     'logo_mark' => "Símbolo da marca",
     'logout' => "Sair",
-    'manager' => "",
+    'manager' => "Gerente",
     'migration_needed' => "Uma migração do banco de dados para {0} será iniciada após o login.",
     'new' => "Novo",
-    'no' => "nao",
+    'no' => "Não",
     'no_persons_to_display' => "Não existem pessoas para mostrar.",
     'none_selected_text' => "Selecione",
     'or' => "ou",
-    'people' => "",
+    'people' => "Pessoas",
     'phone_number' => "Telefone",
     'phone_number_required' => "Número do telefone é requerido",
     'please_visit_my' => "Para saber mais sobre esta aplicação visite o website do projeto |",
-    'position' => "",
+    'position' => "Posição",
     'powered_by' => "Desenvolvido por",
     'price' => "Preço",
     'print' => "Imprimir",
@@ -83,7 +83,7 @@ return [
     'website' => "opensourcepos.org",
     'welcome' => "Bem-vindo",
     'welcome_message' => "Bem-vindo.",
-    'yes' => "sim",
+    'yes' => "Sim",
     'you_are_using_ospos' => "Você está usando Open Source Point Of Sale Versão",
     'zip' => "CEP",
 ];
diff --git a/app/Language/pt-BR/Config.php b/app/Language/pt-BR/Config.php
index a7ffcbe95..079794b85 100644
--- a/app/Language/pt-BR/Config.php
+++ b/app/Language/pt-BR/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Endereço da empresa",
-    "address_required"                          => "Endereço da empresa é um campo obrigatório.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Permitir códigos de barras duplicados",
-    "apostrophe"                                => "apóstrofe",
-    "backup_button"                             => "Cópia de Segurança",
-    "backup_database"                           => "Cópia de Segurança",
-    "barcode"                                   => "Código de Barras",
-    "barcode_company"                           => "Nome da Empresa",
-    "barcode_configuration"                     => "Configuração do Código de Barras",
-    "barcode_content"                           => "Conteúdo do código de barras",
-    "barcode_first_row"                         => "Linha 1",
-    "barcode_font"                              => "Fonte",
-    "barcode_formats"                           => "Formatos de entrada",
-    "barcode_generate_if_empty"                 => "Gerar se vazio.",
-    "barcode_height"                            => "Altura (px)",
-    "barcode_id"                                => "Item Id/Nome",
-    "barcode_info"                              => "Informação de configuração de códigos de barras",
-    "barcode_layout"                            => "Layout Código de barras",
-    "barcode_name"                              => "Nome",
-    "barcode_number"                            => "Código de Barras",
-    "barcode_number_in_row"                     => "Número de linhas",
-    "barcode_page_cellspacing"                  => "Espaçamento das células na página de exibição.",
-    "barcode_page_width"                        => "Largura da página de exibição",
-    "barcode_price"                             => "Preço",
-    "barcode_second_row"                        => "Linha 2",
-    "barcode_third_row"                         => "Linha 3",
-    "barcode_tooltip"                           => "Aviso: esse recurso pode fazer com que itens duplicados sejam importados ou criados. Não use se você não quiser códigos de barras duplicados.",
-    "barcode_type"                              => "Tipo de código de barras",
-    "barcode_width"                             => "Largura (px)",
-    "bottom"                                    => "Inferior",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Decimais da moeda",
-    "cash_decimals_tooltip"                     => "Se os decimais de caixa e os decimais de moeda forem os mesmos, não haverá arredondamento de caixa.",
-    "cash_rounding"                             => "Arredondamento de Caixa",
-    "category_dropdown"                         => "Mostrar Categoria como campo suspenso",
-    "center"                                    => "Centro",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "Vírgula",
-    "company"                                   => "Nome da empresa",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Trocar imagem",
-    "company_logo"                              => "Logo da empresa",
-    "company_remove_image"                      => "Remover imagem",
-    "company_required"                          => "Nome da empresa é requerido",
-    "company_select_image"                      => "Selecionar imagem",
-    "company_website_url"                       => "Site da empresa não é uma URL válida (http://...).",
-    "country_codes"                             => "Código do país",
-    "country_codes_tooltip"                     => "Vírgula lista de códigos de país separado para pesquisa de endereços pelo nome.",
-    "currency_code"                             => "Código da moeda",
-    "currency_decimals"                         => "Decimais da moeda",
-    "currency_symbol"                           => "Simbolo moeda",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Recompensa",
-    "customer_reward_duplicate"                 => "Recompensa deve ser única.",
-    "customer_reward_enable"                    => "Ativar recompensas do cliente",
-    "customer_reward_invalid_chars"             => "Recompensa não pode conter '_'",
-    "customer_reward_required"                  => "Recompensa é um campo obrigatório",
-    "customer_sales_tax_support"                => "Suporte ao imposto sobre vendas do cliente",
-    "date_or_time_format"                       => "Filtro de data e hora",
-    "datetimeformat"                            => "Formato da data e hora",
-    "decimal_point"                             => "Ponto decimal",
-    "default_barcode_font_size_number"          => "O tamanho da fonte do código de barras padrão deve ser um número.",
-    "default_barcode_font_size_required"        => "O tamanho da fonte do código de barras padrão é um campo obrigatório.",
-    "default_barcode_height_number"             => "A altura do código de barras padrão deve ser um número.",
-    "default_barcode_height_required"           => "A altura do código de barras padrão é um campo obrigatório.",
-    "default_barcode_num_in_row_number"         => "O número de código de barras padrão na linha deve ser um número.",
-    "default_barcode_num_in_row_required"       => "O número de código de barras padrão na linha é um campo obrigatório.",
-    "default_barcode_page_cellspacing_number"   => "O espaçamento das células na página de código de barras padrão deve ser um número.",
-    "default_barcode_page_cellspacing_required" => "O espaçamento das células na página de código de barras padrão é um campo obrigatório.",
-    "default_barcode_page_width_number"         => "A largura da página de código de barras padrão deve ser um número.",
-    "default_barcode_page_width_required"       => "A largura da página de código de barras padrão é um campo obrigatório.",
-    "default_barcode_width_number"              => "A largura do código de barras padrão deve ser um número.",
-    "default_barcode_width_required"            => "A largura do código de barras padrão é um campo obrigatório.",
-    "default_item_columns"                      => "Colunas de itens visíveis padrão",
-    "default_origin_tax_code"                   => "Código de imposto de origem padrão",
-    "default_receivings_discount"               => "Desconto de recebimento padrão",
-    "default_receivings_discount_number"        => "Desconto de recebimento padrão deve ser um número.",
-    "default_receivings_discount_required"      => "Desconto de recebimento padrão é um campo obrigatório.",
-    "default_sales_discount"                    => "Desconto de vendas padrão",
-    "default_sales_discount_number"             => "O desconto de vendas padrão deve ser um número.",
-    "default_sales_discount_required"           => "O desconto de vendas padrão é um campo obrigatório.",
-    "default_tax_category"                      => "Categoria de imposto padrão",
-    "default_tax_code"                          => "Código Tributário Padrão",
-    "default_tax_jurisdiction"                  => "Jurisdição fiscal padrão",
-    "default_tax_name_number"                   => "O nome do imposto padrão deve ser uma string.",
-    "default_tax_name_required"                 => "Nome da taxa padrão é requerida.",
-    "default_tax_rate"                          => "Imposto Tarifa Padrão %",
-    "default_tax_rate_1"                        => "Imposto 1 Tarifa",
-    "default_tax_rate_2"                        => "Imposto 2 Tarifa",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "A taxa de Imposto padrão deve ser um número.",
-    "default_tax_rate_required"                 => "A taxa de Imposto padrão é um campo obrigatório.",
-    "derive_sale_quantity"                      => "Permitir quantidade de venda derivada",
-    "derive_sale_quantity_tooltip"              => "Se marcado, um novo tipo de item será fornecido para itens solicitados por quantidade estendida",
-    "dinner_table"                              => "Mesa",
-    "dinner_table_duplicate"                    => "A mesa deve ser única.",
-    "dinner_table_enable"                       => "Ativar mesas de jantar",
-    "dinner_table_invalid_chars"                => "O nome da mesa não pode conter '_'.",
-    "dinner_table_required"                     => "A mesa é um campo obrigatório.",
-    "dot"                                       => "ponto",
-    "email"                                     => "E-mail",
-    "email_configuration"                       => "Configuração de Email",
-    "email_mailpath"                            => "Caminho para Sendmail",
-    "email_protocol"                            => "Protocolo",
-    "email_receipt_check_behaviour"             => "Caixa de seleção de recibo de e-mail",
-    "email_receipt_check_behaviour_always"      => "Sempre selecionado",
-    "email_receipt_check_behaviour_last"        => "Lembrar da última seleção",
-    "email_receipt_check_behaviour_never"       => "Sempre desativado",
-    "email_smtp_crypto"                         => "Criptografia SMTP",
-    "email_smtp_host"                           => "Servidor SMTP",
-    "email_smtp_pass"                           => "Senha SMTP",
-    "email_smtp_port"                           => "Porta SMTP",
-    "email_smtp_timeout"                        => "SMTP Tempo esgotado",
-    "email_smtp_user"                           => "Nome de usuário SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Reforce a privacidade",
-    "enforce_privacy_tooltip"                   => "Proteja a privacidade dos clientes, impondo a codificação de dados no caso de seus dados serem excluídos",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Início do ano fiscal",
-    "financial_year_apr"                        => "1 de abril",
-    "financial_year_aug"                        => "1 de agosto",
-    "financial_year_dec"                        => "1 de dezembro",
-    "financial_year_feb"                        => "1 de fevereiro",
-    "financial_year_jan"                        => "1 de janeiro",
-    "financial_year_jul"                        => "1 de julho",
-    "financial_year_jun"                        => "1 de junho",
-    "financial_year_mar"                        => "1 de março",
-    "financial_year_may"                        => "1 de maio",
-    "financial_year_nov"                        => "1 de novembro",
-    "financial_year_oct"                        => "1 de outubro",
-    "financial_year_sep"                        => "1 de setembro",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Página de login reCAPTCHA",
-    "gcaptcha_secret_key"                       => "Chave secreta do reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "A chave secreta reCAPTCHA é um campo obrigatório",
-    "gcaptcha_site_key"                         => "Chave do site reCAPTCHA",
-    "gcaptcha_site_key_required"                => "A chave do site reCAPTCHA é um campo obrigatório",
-    "gcaptcha_tooltip"                          => "Proteja a página de login com o Google reCAPTCHA e clique no ícone de um par de chaves de API.",
-    "general"                                   => "Gerais",
-    "general_configuration"                     => "Configurações Gerais",
-    "giftcard_number"                           => "Número cartão presente",
-    "giftcard_random"                           => "Geração aleaória",
-    "giftcard_series"                           => "Gerado em serie",
-    "image_allowed_file_types"                  => "Tipos de arquivo permitidos",
-    "image_max_height_tooltip"                  => "Altura máxima permitida para envio de imagens em pixels (px).",
-    "image_max_size_tooltip"                    => "Tamanho máximo permitido para envio de imagens em kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Largura máxima permitida para envio de imagens em pixels (px).",
-    "image_restrictions"                        => "Restrições no envio de imagens",
-    "include_hsn"                               => "Incluir suporte para códigos HSN",
-    "info"                                      => "Informações",
-    "info_configuration"                        => "Informações da loja",
-    "input_groups"                              => "",
-    "integrations"                              => "Integrações",
-    "integrations_configuration"                => "Integrações de terceiros",
-    "invoice"                                   => "Fatura",
-    "invoice_configuration"                     => "Configuração de Impressão",
-    "invoice_default_comments"                  => "Comentário",
-    "invoice_email_message"                     => "Modelo de e-mail Fatura",
-    "invoice_enable"                            => "Habilitar faturamento",
-    "invoice_printer"                           => "Imprimir fatura",
-    "invoice_type"                              => "Tipo Fatura",
-    "is_readable"                               => "É readable, mas as permissões estão incorretas. Por favor defina para 640 ou 660 e recarregue.",
-    "is_writable"                               => "É writable, mas as permissões estão incorretas. Por favor defina para 750 e recarrege.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Aviso! Esta funcionalidade só irá funcionar se você tem o addon FireFox jsPrintSetup instalado. Salvar de qualquer maneira?",
-    "language"                                  => "Linguagem",
-    "last_used_invoice_number"                  => "Último número de fatura usado",
-    "last_used_quote_number"                    => "Último número de cotação usada",
-    "last_used_work_order_number"               => "Último número de ordem de serviço usado",
-    "left"                                      => "Esquerda",
-    "license"                                   => "Licenças",
-    "license_configuration"                     => "Declaração de licença",
-    "line_sequence"                             => "Sequência de Linhas",
-    "lines_per_page"                            => "Linhas por página",
-    "lines_per_page_number"                     => "Linhas por página deve ser um número.",
-    "lines_per_page_required"                   => "As linhas por página é um campo obrigatório.",
-    "locale"                                    => "Localização",
-    "locale_configuration"                      => "Configuração de Localização",
-    "locale_info"                               => "Informações da Configuração de Localização",
-    "location"                                  => "Estoque",
-    "location_configuration"                    => "Localização do Estoque",
-    "location_info"                             => "Informações da localização",
-    "login_form"                                => "",
-    "logout"                                    => "Você não quer fazer uma cópia de segurança antes de sair? Clique [OK] para fazer a cópia de segurança.",
-    "mailchimp"                                 => "Configuração Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp chave API",
-    "mailchimp_configuration"                   => "Configuração Mailchimp",
-    "mailchimp_key_successfully"                => "API chave válida.",
-    "mailchimp_key_unsuccessfully"              => "API chave inválida.",
-    "mailchimp_lists"                           => "Lista(s) Mailchimp",
-    "mailchimp_tooltip"                         => "Clique no ícone de uma chave de API.",
-    "message"                                   => "Mensagem",
-    "message_configuration"                     => "Configuração de Mensagens",
-    "msg_msg"                                   => "Salvar mensagem de texto",
-    "msg_msg_placeholder"                       => "Se você deseja usar um modelo de SMS salvar a sua mensagem aqui. Caso contrário, deixe a caixa em branco.",
-    "msg_pwd"                                   => "SMS-API senha",
-    "msg_pwd_required"                          => "SMS-API Senha é um campo obrigatório",
-    "msg_src"                                   => "SMS-API Remetente ID",
-    "msg_src_required"                          => "SMS-API Remetente ID é um campo obrigatório",
-    "msg_uid"                                   => "SMS-API usuário",
-    "msg_uid_required"                          => "SMS-API usuário é um campo obrigatório",
-    "multi_pack_enabled"                        => "Vários pacotes por item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "nenhum",
-    "notify_alignment"                          => "Notificação Posição Popup",
-    "number_format"                             => "Formato do número",
-    "number_locale"                             => "Localização",
-    "number_locale_invalid"                     => "A localidade digitada é inválida. Verifique o link na dica para encontrar um valor aceitável.",
-    "number_locale_required"                    => "Número Local é um campo obrigatório.",
-    "number_locale_tooltip"                     => "Encontrar um local adequado através deste link.",
-    "os_timezone"                               => "Fuso horário do OSPOS:",
-    "ospos_info"                                => "Informações de instalação do OSPOS",
-    "payment_options_order"                     => "Opções da ordem de pagamento",
-    "perm_risk"                                 => "Permissões incorretas deixam este software em risco.",
-    "phone"                                     => "Telefone",
-    "phone_required"                            => "Telefone da Empresa é requerido.",
-    "print_bottom_margin"                       => "Margem inferior",
-    "print_bottom_margin_number"                => "A margem inferior padrão deve ser um número.",
-    "print_bottom_margin_required"              => "A margem inferior padrão é um campo obrigatório.",
-    "print_delay_autoreturn"                    => "Retorno automático para atraso de venda",
-    "print_delay_autoreturn_number"             => "Retorno automático para venda é um campo obrigatório.",
-    "print_delay_autoreturn_required"           => "Retorno automático para devolução de venda deve ser um número.",
-    "print_footer"                              => "Imprimir rodapé do navegador",
-    "print_header"                              => "Imprimir o cabeçalho do navegador",
-    "print_left_margin"                         => "Margem esquerda",
-    "print_left_margin_number"                  => "A margem esquerda padrão deve ser um número.",
-    "print_left_margin_required"                => "A margem esquerda padrão é um campo obrigatório.",
-    "print_receipt_check_behaviour"             => "Caixa seleção Recibo de impressão",
-    "print_receipt_check_behaviour_always"      => "Sempre verificado",
-    "print_receipt_check_behaviour_last"        => "Lembre-se da última seleção",
-    "print_receipt_check_behaviour_never"       => "Sempre desmarcado",
-    "print_right_margin"                        => "Margem Direita",
-    "print_right_margin_number"                 => "A margem direita padrão deve ser um número.",
-    "print_right_margin_required"               => "A margem direita padrão é um campo obrigatório.",
-    "print_silently"                            => "Mostrar caixa de diálogo de impressão",
-    "print_top_margin"                          => "Margem superior",
-    "print_top_margin_number"                   => "A margem superior padrão deve ser um número.",
-    "print_top_margin_required"                 => "A margem superior padrão é um campo obrigatório.",
-    "quantity_decimals"                         => "Número de decimais",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Comentários de cotação padrão",
-    "receipt"                                   => "Recibo",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Configuração de Impressão",
-    "receipt_default"                           => "Padrão",
-    "receipt_font_size"                         => "Tamanho da fonte",
-    "receipt_font_size_number"                  => "Tamanho da fonte deve ser um número.",
-    "receipt_font_size_required"                => "Tamanho da fonte é requerido.",
-    "receipt_info"                              => "Informações de configuração de Recibos",
-    "receipt_printer"                           => "Imprimir recibo",
-    "receipt_short"                             => "Pequeno",
-    "receipt_show_company_name"                 => "Mostrar nome da empresa",
-    "receipt_show_description"                  => "Exibir descrição",
-    "receipt_show_serialnumber"                 => "Exibir número serial",
-    "receipt_show_tax_ind"                      => "Mostrar indicator de impostos",
-    "receipt_show_taxes"                        => "Mostrar Impostos",
-    "receipt_show_total_discount"               => "Mostrar total desconto",
-    "receipt_template"                          => "Modelo de recibo",
-    "receiving_calculate_average_price"         => "Calc Médio de Preço (Recebimento)",
-    "recv_invoice_format"                       => "Formato da fatura de recebimento",
-    "register_mode_default"                     => "Modo de registro padrão",
-    "report_an_issue"                           => "Reporte um problema",
-    "return_policy_required"                    => "A política de devolução é um campo obrigatório.",
-    "reward"                                    => "Recompensa",
-    "reward_configuration"                      => "Configuração de recompensa",
-    "right"                                     => "Direita",
-    "sales_invoice_format"                      => "Formato da Fatura de Vendas",
-    "sales_quote_format"                        => "Formato de cotação de vendas",
-    "saved_successfully"                        => "Configuração salva com sucesso.",
-    "saved_unsuccessfully"                      => "Configuração não salva.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Por favor, use as informações abaixo para o relatório de problemas.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Mostrar ícone do escritório",
-    "statistics"                                => "Enviar estatísticas",
-    "statistics_tooltip"                        => "Envie estatísticas para desenvolvimento e aprimoramento de recursos.",
-    "stock_location"                            => "Localização do Estoque",
-    "stock_location_duplicate"                  => "Por favor, use um nome de localização única.",
-    "stock_location_invalid_chars"              => "O nome do local de ações não pode conter '_'.",
-    "stock_location_required"                   => "Número da localização do estoque é um campo obrigatório.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Coluna 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Layout de sugestões de pesquisa",
-    "suggestions_second_column"                 => "Coluna 2",
-    "suggestions_third_column"                  => "Coluna 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Mesa",
-    "table_configuration"                       => "Configuração da mesa",
-    "takings_printer"                           => "Imprimir Vendas",
-    "tax"                                       => "Imp",
-    "tax_category"                              => "Categoria de imposto",
-    "tax_category_duplicate"                    => "A categoria de imposto inserida já existe.",
-    "tax_category_invalid_chars"                => "A categoria de imposto inserida é inválida.",
-    "tax_category_required"                     => "A  categoria de imposto é obrigatória.",
-    "tax_category_used"                         => "A categoria de imposto não pode ser excluída porque está sendo usada.",
-    "tax_configuration"                         => "Configuração de impostos",
-    "tax_decimals"                              => "Decimais da taxa",
-    "tax_id"                                    => "Id imposto",
-    "tax_included"                              => "Imposto Incluído",
-    "theme"                                     => "Tema",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Separador de milhar",
-    "timezone"                                  => "Fuso horário",
-    "timezone_error"                            => "O fuso horário do OSPOS é diferente do fuso horário local.",
-    "top"                                       => "Topo",
-    "use_destination_based_tax"                 => "Use o Imposto Baseado em Destino",
-    "user_timezone"                             => "Fuso horário local:",
-    "website"                                   => "OSPOS",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Suporte para Ordem de Serviço",
-    "work_order_format"                         => "Formato Ordem de Serviço",
+    'address'                                   => 'Endereço da empresa',
+    'address_required'                          => 'Endereço da empresa é um campo obrigatório.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Permitir códigos de barras duplicados',
+    'apostrophe'                                => 'apóstrofe',
+    'backup_button'                             => 'Cópia de Segurança',
+    'backup_database'                           => 'Cópia de Segurança',
+    'barcode'                                   => 'Código de Barras',
+    'barcode_company'                           => 'Nome da Empresa',
+    'barcode_configuration'                     => 'Configuração do Código de Barras',
+    'barcode_content'                           => 'Conteúdo do código de barras',
+    'barcode_first_row'                         => 'Linha 1',
+    'barcode_font'                              => 'Fonte',
+    'barcode_formats'                           => 'Formatos de entrada',
+    'barcode_generate_if_empty'                 => 'Gerar se vazio.',
+    'barcode_height'                            => 'Altura (px)',
+    'barcode_id'                                => 'Item Id/Nome',
+    'barcode_info'                              => 'Informação de configuração de códigos de barras',
+    'barcode_layout'                            => 'Layout Código de barras',
+    'barcode_name'                              => 'Nome',
+    'barcode_number'                            => 'Código de Barras',
+    'barcode_number_in_row'                     => 'Número de linhas',
+    'barcode_page_cellspacing'                  => 'Espaçamento das células na página de exibição.',
+    'barcode_page_width'                        => 'Largura da página de exibição',
+    'barcode_price'                             => 'Preço',
+    'barcode_second_row'                        => 'Linha 2',
+    'barcode_third_row'                         => 'Linha 3',
+    'barcode_tooltip'                           => 'Aviso: esse recurso pode fazer com que itens duplicados sejam importados ou criados. Não use se você não quiser códigos de barras duplicados.',
+    'barcode_type'                              => 'Tipo de código de barras',
+    'barcode_width'                             => 'Largura (px)',
+    'bottom'                                    => 'Inferior',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Decimais da moeda',
+    'cash_decimals_tooltip'                     => 'Se os decimais de caixa e os decimais de moeda forem os mesmos, não haverá arredondamento de caixa.',
+    'cash_rounding'                             => 'Arredondamento de Caixa',
+    'category_dropdown'                         => 'Mostrar Categoria como campo suspenso',
+    'center'                                    => 'Centro',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'Vírgula',
+    'company'                                   => 'Nome da empresa',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Trocar imagem',
+    'company_logo'                              => 'Logo da empresa',
+    'company_remove_image'                      => 'Remover imagem',
+    'company_required'                          => 'Nome da empresa é requerido',
+    'company_select_image'                      => 'Selecionar imagem',
+    'company_website_url'                       => 'Site da empresa não é uma URL válida (http://...).',
+    'country_codes'                             => 'Código do país',
+    'country_codes_tooltip'                     => 'Vírgula lista de códigos de país separado para pesquisa de endereços pelo nome.',
+    'currency_code'                             => 'Código da moeda',
+    'currency_decimals'                         => 'Decimais da moeda',
+    'currency_symbol'                           => 'Simbolo moeda',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Recompensa',
+    'customer_reward_duplicate'                 => 'Recompensa deve ser única.',
+    'customer_reward_enable'                    => 'Ativar recompensas do cliente',
+    'customer_reward_invalid_chars'             => "Recompensa não pode conter '_'",
+    'customer_reward_required'                  => 'Recompensa é um campo obrigatório',
+    'customer_sales_tax_support'                => 'Suporte ao imposto sobre vendas do cliente',
+    'date_or_time_format'                       => 'Filtro de data e hora',
+    'datetimeformat'                            => 'Formato da data e hora',
+    'decimal_point'                             => 'Ponto decimal',
+    'default_barcode_font_size_number'          => 'O tamanho da fonte do código de barras padrão deve ser um número.',
+    'default_barcode_font_size_required'        => 'O tamanho da fonte do código de barras padrão é um campo obrigatório.',
+    'default_barcode_height_number'             => 'A altura do código de barras padrão deve ser um número.',
+    'default_barcode_height_required'           => 'A altura do código de barras padrão é um campo obrigatório.',
+    'default_barcode_num_in_row_number'         => 'O número de código de barras padrão na linha deve ser um número.',
+    'default_barcode_num_in_row_required'       => 'O número de código de barras padrão na linha é um campo obrigatório.',
+    'default_barcode_page_cellspacing_number'   => 'O espaçamento das células na página de código de barras padrão deve ser um número.',
+    'default_barcode_page_cellspacing_required' => 'O espaçamento das células na página de código de barras padrão é um campo obrigatório.',
+    'default_barcode_page_width_number'         => 'A largura da página de código de barras padrão deve ser um número.',
+    'default_barcode_page_width_required'       => 'A largura da página de código de barras padrão é um campo obrigatório.',
+    'default_barcode_width_number'              => 'A largura do código de barras padrão deve ser um número.',
+    'default_barcode_width_required'            => 'A largura do código de barras padrão é um campo obrigatório.',
+    'default_item_columns'                      => 'Colunas de itens visíveis padrão',
+    'default_origin_tax_code'                   => 'Código de imposto de origem padrão',
+    'default_receivings_discount'               => 'Desconto de recebimento padrão',
+    'default_receivings_discount_number'        => 'Desconto de recebimento padrão deve ser um número.',
+    'default_receivings_discount_required'      => 'Desconto de recebimento padrão é um campo obrigatório.',
+    'default_sales_discount'                    => 'Desconto de vendas padrão',
+    'default_sales_discount_number'             => 'O desconto de vendas padrão deve ser um número.',
+    'default_sales_discount_required'           => 'O desconto de vendas padrão é um campo obrigatório.',
+    'default_tax_category'                      => 'Categoria de imposto padrão',
+    'default_tax_code'                          => 'Código Tributário Padrão',
+    'default_tax_jurisdiction'                  => 'Jurisdição fiscal padrão',
+    'default_tax_name_number'                   => 'O nome do imposto padrão deve ser uma string.',
+    'default_tax_name_required'                 => 'Nome da taxa padrão é requerida.',
+    'default_tax_rate'                          => 'Imposto Tarifa Padrão %',
+    'default_tax_rate_1'                        => 'Imposto 1 Tarifa',
+    'default_tax_rate_2'                        => 'Imposto 2 Tarifa',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'A taxa de Imposto padrão deve ser um número.',
+    'default_tax_rate_required'                 => 'A taxa de Imposto padrão é um campo obrigatório.',
+    'derive_sale_quantity'                      => 'Permitir quantidade de venda derivada',
+    'derive_sale_quantity_tooltip'              => 'Se marcado, um novo tipo de item será fornecido para itens solicitados por quantidade estendida',
+    'dinner_table'                              => 'Mesa',
+    'dinner_table_duplicate'                    => 'A mesa deve ser única.',
+    'dinner_table_enable'                       => 'Ativar mesas de jantar',
+    'dinner_table_invalid_chars'                => "O nome da mesa não pode conter '_'.",
+    'dinner_table_required'                     => 'A mesa é um campo obrigatório.',
+    'dot'                                       => 'ponto',
+    'email'                                     => 'E-mail',
+    'email_configuration'                       => 'Configuração de Email',
+    'email_mailpath'                            => 'Caminho para Sendmail',
+    'email_protocol'                            => 'Protocolo',
+    'email_receipt_check_behaviour'             => 'Caixa de seleção de recibo de e-mail',
+    'email_receipt_check_behaviour_always'      => 'Sempre selecionado',
+    'email_receipt_check_behaviour_last'        => 'Lembrar da última seleção',
+    'email_receipt_check_behaviour_never'       => 'Sempre desativado',
+    'email_smtp_crypto'                         => 'Criptografia SMTP',
+    'email_smtp_host'                           => 'Servidor SMTP',
+    'email_smtp_pass'                           => 'Senha SMTP',
+    'email_smtp_port'                           => 'Porta SMTP',
+    'email_smtp_timeout'                        => 'SMTP Tempo esgotado',
+    'email_smtp_user'                           => 'Nome de usuário SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Reforce a privacidade',
+    'enforce_privacy_tooltip'                   => 'Proteja a privacidade dos clientes, impondo a codificação de dados no caso de seus dados serem excluídos',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Início do ano fiscal',
+    'financial_year_apr'                        => '1 de abril',
+    'financial_year_aug'                        => '1 de agosto',
+    'financial_year_dec'                        => '1 de dezembro',
+    'financial_year_feb'                        => '1 de fevereiro',
+    'financial_year_jan'                        => '1 de janeiro',
+    'financial_year_jul'                        => '1 de julho',
+    'financial_year_jun'                        => '1 de junho',
+    'financial_year_mar'                        => '1 de março',
+    'financial_year_may'                        => '1 de maio',
+    'financial_year_nov'                        => '1 de novembro',
+    'financial_year_oct'                        => '1 de outubro',
+    'financial_year_sep'                        => '1 de setembro',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Página de login reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'Chave secreta do reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'A chave secreta reCAPTCHA é um campo obrigatório',
+    'gcaptcha_site_key'                         => 'Chave do site reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'A chave do site reCAPTCHA é um campo obrigatório',
+    'gcaptcha_tooltip'                          => 'Proteja a página de login com o Google reCAPTCHA e clique no ícone de um par de chaves de API.',
+    'general'                                   => 'Gerais',
+    'general_configuration'                     => 'Configurações Gerais',
+    'giftcard_number'                           => 'Número cartão presente',
+    'giftcard_random'                           => 'Geração aleaória',
+    'giftcard_series'                           => 'Gerado em serie',
+    'image_allowed_file_types'                  => 'Tipos de arquivo permitidos',
+    'image_max_height_tooltip'                  => 'Altura máxima permitida para envio de imagens em pixels (px).',
+    'image_max_size_tooltip'                    => 'Tamanho máximo permitido para envio de imagens em kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Largura máxima permitida para envio de imagens em pixels (px).',
+    'image_restrictions'                        => 'Restrições no envio de imagens',
+    'include_hsn'                               => 'Incluir suporte para códigos HSN',
+    'info'                                      => 'Informações',
+    'info_configuration'                        => 'Informações da loja',
+    'input_groups'                              => '',
+    'integrations'                              => 'Integrações',
+    'integrations_configuration'                => 'Integrações de terceiros',
+    'invoice'                                   => 'Fatura',
+    'invoice_configuration'                     => 'Configuração de Impressão',
+    'invoice_default_comments'                  => 'Comentário',
+    'invoice_email_message'                     => 'Modelo de e-mail Fatura',
+    'invoice_enable'                            => 'Habilitar faturamento',
+    'invoice_printer'                           => 'Imprimir fatura',
+    'invoice_type'                              => 'Tipo Fatura',
+    'is_readable'                               => 'É readable, mas as permissões estão incorretas. Por favor defina para 640 ou 660 e recarregue.',
+    'is_writable'                               => 'É writable, mas as permissões estão incorretas. Por favor defina para 750 e recarrege.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Aviso! Esta funcionalidade só irá funcionar se você tem o addon FireFox jsPrintSetup instalado. Salvar de qualquer maneira?',
+    'language'                                  => 'Linguagem',
+    'last_used_invoice_number'                  => 'Último número de fatura usado',
+    'last_used_quote_number'                    => 'Último número de cotação usada',
+    'last_used_work_order_number'               => 'Último número de ordem de serviço usado',
+    'left'                                      => 'Esquerda',
+    'license'                                   => 'Licenças',
+    'license_configuration'                     => 'Declaração de licença',
+    'line_sequence'                             => 'Sequência de Linhas',
+    'lines_per_page'                            => 'Linhas por página',
+    'lines_per_page_number'                     => 'Linhas por página deve ser um número.',
+    'lines_per_page_required'                   => 'As linhas por página é um campo obrigatório.',
+    'locale'                                    => 'Localização',
+    'locale_configuration'                      => 'Configuração de Localização',
+    'locale_info'                               => 'Informações da Configuração de Localização',
+    'location'                                  => 'Estoque',
+    'location_configuration'                    => 'Localização do Estoque',
+    'location_info'                             => 'Informações da localização',
+    'login_form'                                => '',
+    'logout'                                    => 'Você não quer fazer uma cópia de segurança antes de sair? Clique [OK] para fazer a cópia de segurança.',
+    'mailchimp'                                 => 'Configuração Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp chave API',
+    'mailchimp_configuration'                   => 'Configuração Mailchimp',
+    'mailchimp_key_successfully'                => 'API chave válida.',
+    'mailchimp_key_unsuccessfully'              => 'API chave inválida.',
+    'mailchimp_lists'                           => 'Lista(s) Mailchimp',
+    'mailchimp_tooltip'                         => 'Clique no ícone de uma chave de API.',
+    'message'                                   => 'Mensagem',
+    'message_configuration'                     => 'Configuração de Mensagens',
+    'msg_msg'                                   => 'Salvar mensagem de texto',
+    'msg_msg_placeholder'                       => 'Se você deseja usar um modelo de SMS salvar a sua mensagem aqui. Caso contrário, deixe a caixa em branco.',
+    'msg_pwd'                                   => 'SMS-API senha',
+    'msg_src'                                   => 'SMS-API Remetente ID',
+    'msg_src_required'                          => 'SMS-API Remetente ID é um campo obrigatório',
+    'msg_uid'                                   => 'SMS-API usuário',
+    'msg_uid_required'                          => 'SMS-API usuário é um campo obrigatório',
+    'multi_pack_enabled'                        => 'Vários pacotes por item',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'nenhum',
+    'notify_alignment'                          => 'Notificação Posição Popup',
+    'number_format'                             => 'Formato do número',
+    'number_locale'                             => 'Localização',
+    'number_locale_invalid'                     => 'A localidade digitada é inválida. Verifique o link na dica para encontrar um valor aceitável.',
+    'number_locale_required'                    => 'Número Local é um campo obrigatório.',
+    'number_locale_tooltip'                     => 'Encontrar um local adequado através deste link.',
+    'os_timezone'                               => 'Fuso horário do OSPOS:',
+    'ospos_info'                                => 'Informações de instalação do OSPOS',
+    'payment_options_order'                     => 'Opções da ordem de pagamento',
+    'payment_reference_code_length_limits'      => 'Código de referência do pagamento<br>Limites de comprimento',
+    'payment_reference_code_length_max_label'   => 'Máx',
+    'payment_reference_code_length_min_label'   => 'Mín',
+    'perm_risk'                                 => 'Permissões incorretas deixam este software em risco.',
+    'phone'                                     => 'Telefone',
+    'phone_required'                            => 'Telefone da Empresa é requerido.',
+    'print_bottom_margin'                       => 'Margem inferior',
+    'print_bottom_margin_number'                => 'A margem inferior padrão deve ser um número.',
+    'print_bottom_margin_required'              => 'A margem inferior padrão é um campo obrigatório.',
+    'print_delay_autoreturn'                    => 'Retorno automático para atraso de venda',
+    'print_delay_autoreturn_number'             => 'Retorno automático para venda é um campo obrigatório.',
+    'print_delay_autoreturn_required'           => 'Retorno automático para devolução de venda deve ser um número.',
+    'print_footer'                              => 'Imprimir rodapé do navegador',
+    'print_header'                              => 'Imprimir o cabeçalho do navegador',
+    'print_left_margin'                         => 'Margem esquerda',
+    'print_left_margin_number'                  => 'A margem esquerda padrão deve ser um número.',
+    'print_left_margin_required'                => 'A margem esquerda padrão é um campo obrigatório.',
+    'print_receipt_check_behaviour'             => 'Caixa seleção Recibo de impressão',
+    'print_receipt_check_behaviour_always'      => 'Sempre verificado',
+    'print_receipt_check_behaviour_last'        => 'Lembre-se da última seleção',
+    'print_receipt_check_behaviour_never'       => 'Sempre desmarcado',
+    'print_right_margin'                        => 'Margem Direita',
+    'print_right_margin_number'                 => 'A margem direita padrão deve ser um número.',
+    'print_right_margin_required'               => 'A margem direita padrão é um campo obrigatório.',
+    'print_silently'                            => 'Mostrar caixa de diálogo de impressão',
+    'print_top_margin'                          => 'Margem superior',
+    'print_top_margin_number'                   => 'A margem superior padrão deve ser um número.',
+    'print_top_margin_required'                 => 'A margem superior padrão é um campo obrigatório.',
+    'quantity_decimals'                         => 'Número de decimais',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Comentários de cotação padrão',
+    'receipt'                                   => 'Recibo',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Configuração de Impressão',
+    'receipt_default'                           => 'Padrão',
+    'receipt_font_size'                         => 'Tamanho da fonte',
+    'receipt_font_size_number'                  => 'Tamanho da fonte deve ser um número.',
+    'receipt_font_size_required'                => 'Tamanho da fonte é requerido.',
+    'receipt_info'                              => 'Informações de configuração de Recibos',
+    'receipt_printer'                           => 'Imprimir recibo',
+    'receipt_short'                             => 'Pequeno',
+    'receipt_show_company_name'                 => 'Mostrar nome da empresa',
+    'receipt_show_description'                  => 'Exibir descrição',
+    'receipt_show_serialnumber'                 => 'Exibir número serial',
+    'receipt_show_tax_ind'                      => 'Mostrar indicator de impostos',
+    'receipt_show_taxes'                        => 'Mostrar Impostos',
+    'receipt_show_total_discount'               => 'Mostrar total desconto',
+    'receipt_template'                          => 'Modelo de recibo',
+    'receiving_calculate_average_price'         => 'Calc Médio de Preço (Recebimento)',
+    'recv_invoice_format'                       => 'Formato da fatura de recebimento',
+    'register_mode_default'                     => 'Modo de registro padrão',
+    'report_an_issue'                           => 'Reporte um problema',
+    'return_policy_required'                    => 'A política de devolução é um campo obrigatório.',
+    'reward'                                    => 'Recompensa',
+    'reward_configuration'                      => 'Configuração de recompensa',
+    'right'                                     => 'Direita',
+    'sales_invoice_format'                      => 'Formato da Fatura de Vendas',
+    'sales_quote_format'                        => 'Formato de cotação de vendas',
+    'mailpath_invalid'                          => 'Caminho do sendmail inválido. Apenas letras, números, traços, sublinhados, barras, barras invertidas, dois-pontos, espaços e pontos são permitidos.',
+    'saved_successfully'                        => 'Configuração salva com sucesso.',
+    'saved_unsuccessfully'                      => 'Configuração não salva.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Por favor, use as informações abaixo para o relatório de problemas.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Mostrar ícone do escritório',
+    'statistics'                                => 'Enviar estatísticas',
+    'statistics_tooltip'                        => 'Envie estatísticas para desenvolvimento e aprimoramento de recursos.',
+    'stock_location'                            => 'Localização do Estoque',
+    'stock_location_duplicate'                  => 'Por favor, use um nome de localização única.',
+    'stock_location_invalid_chars'              => "O nome do local de ações não pode conter '_'.",
+    'stock_location_required'                   => 'Número da localização do estoque é um campo obrigatório.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Coluna 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Layout de sugestões de pesquisa',
+    'suggestions_second_column'                 => 'Coluna 2',
+    'suggestions_third_column'                  => 'Coluna 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Mesa',
+    'table_configuration'                       => 'Configuração da mesa',
+    'takings_printer'                           => 'Imprimir Vendas',
+    'tax'                                       => 'Imp',
+    'tax_category'                              => 'Categoria de imposto',
+    'tax_category_duplicate'                    => 'A categoria de imposto inserida já existe.',
+    'tax_category_invalid_chars'                => 'A categoria de imposto inserida é inválida.',
+    'tax_category_required'                     => 'A  categoria de imposto é obrigatória.',
+    'tax_category_used'                         => 'A categoria de imposto não pode ser excluída porque está sendo usada.',
+    'tax_configuration'                         => 'Configuração de impostos',
+    'tax_decimals'                              => 'Decimais da taxa',
+    'tax_id'                                    => 'Id imposto',
+    'tax_included'                              => 'Imposto Incluído',
+    'theme'                                     => 'Tema',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Separador de milhar',
+    'timezone'                                  => 'Fuso horário',
+    'timezone_error'                            => 'O fuso horário do OSPOS é diferente do fuso horário local.',
+    'top'                                       => 'Topo',
+    'use_destination_based_tax'                 => 'Use o Imposto Baseado em Destino',
+    'user_timezone'                             => 'Fuso horário local:',
+    'website'                                   => 'OSPOS',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Suporte para Ordem de Serviço',
+    'work_order_format'                         => 'Formato Ordem de Serviço',
 ];
diff --git a/app/Language/pt-BR/Employees.php b/app/Language/pt-BR/Employees.php
index 655d2bf6e..982229e32 100644
--- a/app/Language/pt-BR/Employees.php
+++ b/app/Language/pt-BR/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Informações do Funcionário",
-    "cannot_be_deleted"            => "Não foi possível excluir funcionários selecionados, um ou mais dos funcionários processou vendas ou você está tentando excluir-se :).",
-    "change_employee"              => "",
-    "change_password"              => "Alterar senha",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Tem certeza de que deseja excluir os funcionários selecionados?",
-    "confirm_restore"              => "Tem certeza de que deseja restaurar o (s) empregado (s) selecionado (s)?",
-    "current_password"             => "Senha atual",
-    "current_password_invalid"     => "Senha atual inválida.",
-    "employee"                     => "Funcionário",
-    "error_adding_updating"        => "Erro ao adicionar/atualizar funcionário.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Você não pode excluir o usuário administrador de demonstração.",
-    "error_updating_demo_admin"    => "Você não pode alterar o usuário de demonstração de administração.",
-    "language"                     => "Linguagem",
-    "login_info"                   => "Autenticação",
-    "manager"                      => "",
-    "new"                          => "Novo Funcionário",
-    "none_selected"                => "Você não selecionou nenhum funcionário para excluir.",
-    "one_or_multiple"              => "funcionário(s)",
-    "password"                     => "Senha",
-    "password_minlength"           => "As senhas devem ter pelo menos 8 caracteres.",
-    "password_must_match"          => "As senhas não correspondem.",
-    "password_not_must_match"      => "A senha atual e a nova senha devem ser exclusivas.",
-    "password_required"            => "Senha requerida.",
-    "permission_desc"              => "Marque as caixas abaixo para conceder acesso aos módulos.",
-    "permission_info"              => "Permissões de acesso do funcionário",
-    "repeat_password"              => "Confirme a senha",
-    "subpermission_required"       => "Adicione pelo menos um privilégio para cada módulo.",
-    "successful_adding"            => "Você adicionou o funcionário com sucesso.",
-    "successful_change_password"   => "Alteração de senha bem sucedida.",
-    "successful_deleted"           => "Você apagou o funcionário com sucesso",
-    "successful_updating"          => "Você atualizou com sucesso o funcionário",
-    "system_language"              => "Idioma do sistema",
-    "unsuccessful_change_password" => "Falha na mudança de senha.",
-    "update"                       => "Atualizar funcionário",
-    "username"                     => "Usuário",
-    "username_duplicate"           => "",
-    "username_minlength"           => "O nome de usuário deve ter pelo menos 5 caracteres.",
-    "username_required"            => "Nome de Usuário é um campo obrigatório.",
+    'administrator'                          => 'Administrador',
+    'basic_information'                      => 'Informações do Funcionário',
+    'cannot_be_deleted'                      => 'Não foi possível excluir funcionários selecionados',
+    'change_employee'                        => 'Alterar Funcionário',
+    'change_password'                        => 'Alterar senha',
+    'clerk'                                  => 'Funcionário',
+    'commission'                             => 'Comissão',
+    'confirm_delete'                         => 'Tem certeza de que deseja excluir os funcionários selecionados?',
+    'confirm_restore'                        => 'Tem certeza de que deseja restaurar o (s) empregado (s) selecionado (s)?',
+    'current_password'                       => 'Senha atual',
+    'current_password_invalid'               => 'Senha atual inválida.',
+    'employee'                               => 'Funcionário',
+    'error_adding_updating'                  => 'Erro ao adicionar/atualizar funcionário.',
+    'error_cannot_remove_own_minimum_grant'  => 'Você não pode remover suas próprias permissões mínimas de módulo.',
+    'error_deleting_admin'                   => 'Você não pode excluir um usuário administrador.',
+    'error_deleting_demo_admin'              => 'Você não pode excluir o usuário administrador de demonstração.',
+    'error_grant_change_disallowed'          => 'As alterações de permissão são desabilitadas nesta demonstração.',
+    'error_password_change_disallowed'       => 'As alterações de senha são desabilitadas nesta demonstração.',
+    'error_updating_admin'                   => 'Você não pode modificar um usuário administrador.',
+    'error_updating_demo_admin'              => 'Você não pode alterar o usuário de demonstração de administração.',
+    'language'                               => 'Linguagem',
+    'login_info'                             => 'Autenticação',
+    'manager'                                => 'Gerente',
+    'new'                                    => 'Novo Funcionário',
+    'none_selected'                          => 'Você não selecionou nenhum funcionário para excluir.',
+    'one_or_multiple'                        => 'funcionário(s)',
+    'password'                               => 'Senha',
+    'password_minlength'                     => 'As senhas devem ter pelo menos 8 caracteres.',
+    'password_must_match'                    => 'As senhas não correspondem.',
+    'password_not_must_match'                => 'A senha atual e a nova senha devem ser exclusivas.',
+    'password_required'                      => 'Senha requerida.',
+    'permission_desc'                        => 'Marque as caixas abaixo para conceder acesso aos módulos.',
+    'permission_info'                        => 'Permissões de acesso do funcionário',
+    'repeat_password'                        => 'Confirme a senha',
+    'subpermission_required'                 => 'Adicione pelo menos um privilégio para cada módulo.',
+    'successful_adding'                      => 'Você adicionou o funcionário com sucesso.',
+    'successful_change_password'             => 'Alteração de senha bem sucedida.',
+    'successful_deleted'                     => 'Você apagou o funcionário com sucesso',
+    'successful_updating'                    => 'Você atualizou com sucesso o funcionário',
+    'system_language'                        => 'Idioma do sistema',
+    'unsuccessful_change_password'           => 'Falha na mudança de senha.',
+    'update'                                 => 'Atualizar funcionário',
+    'username'                               => 'Usuário',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'O nome de usuário deve ter pelo menos 5 caracteres.',
+    'username_required'                      => 'Nome de Usuário é um campo obrigatório.',
 ];
diff --git a/app/Language/pt-BR/Error.php b/app/Language/pt-BR/Error.php
index d63d1da4d..b524104dd 100644
--- a/app/Language/pt-BR/Error.php
+++ b/app/Language/pt-BR/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Você não tem permissão para acessar o módulo chamado",
-    "unknown"              => "Desconhecido",
+    'no_permission_module'           => 'Você não tem permissão para acessar o módulo chamado',
+    'unable_to_create_env_file'      => 'Não foi possível criar {filePath} para provisionar throttle.key',
+    'unable_to_lock_file'            => 'Não foi possível bloquear {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Não foi possível abrir {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Não foi possível persistir throttle.key em {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Não foi possível ler {filePath} para provisionar throttle.key',
+    'unknown'                        => 'Desconhecido',
 ];
diff --git a/app/Language/pt-BR/Items.php b/app/Language/pt-BR/Items.php
index b35b4c117..bf7b1cb3e 100644
--- a/app/Language/pt-BR/Items.php
+++ b/app/Language/pt-BR/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventário para adicionar/subtrair.",
-    "allow_alt_description"              => "Permitir atualizar descrição",
-    "amount_entry"                       => "Entrada de montante",
-    "bulk_edit"                          => "Editar Múltiplos Itens",
-    "buy_price_required"                 => "Preço de compra é um campo obrigatório.",
-    "cannot_be_deleted"                  => "Não foi possível excluir os itens selecionados um ou mais dos itens selecionados tem vendas.",
-    "cannot_find_item"                   => "Não consegue encontrar qualquer informação sobre o produto.",
-    "categories"                         => "",
-    "category"                           => "Categoria",
-    "category_new"                       => "",
-    "category_required"                  => "Categoria é um campo obrigatório.",
-    "change_all_to_allow_alt_desc"       => "Permitir alterar desconto para todos.",
-    "change_all_to_not_allow_allow_desc" => "Não Permitir alterar desconto para todos.",
-    "change_all_to_serialized"           => "Alterar todos para serializados",
-    "change_all_to_unserialized"         => "Alterar todos para não serializados",
-    "change_image"                       => "Substituir imagem",
-    "confirm_bulk_edit"                  => "Tem certeza de que deseja editar todos os itens selecionados?",
-    "confirm_bulk_edit_wipe_taxes"       => "Tem certeza de que deseja editar todos os impostos selecionados?.",
-    "confirm_delete"                     => "Tem certeza de que deseja excluir os itens selecionados?",
-    "confirm_restore"                    => "Tem certeza de que deseja restaurar o (s) item (ns) selecionado (s)?",
-    "cost_price"                         => "Preço de Custo",
-    "cost_price_number"                  => "Preço de custo deve ser um número.",
-    "cost_price_required"                => "Preço de custo é um campo obrigatório.",
-    "count"                              => "Acrescentar ao Inventário",
-    "csv_import_failed"                  => "Importação do CSV falhou",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Seu arquivo enviado não contém dados ou formato errado.",
-    "csv_import_partially_failed"        => "Houve {0} falha na importação de itens na(s) linha(s): {1}. Nenhuma linha foi importada.",
-    "csv_import_success"                 => "Importação de Itens com sucesso.",
-    "current_quantity"                   => "Quantidade Atual",
-    "default_pack_name"                  => "Cada",
-    "description"                        => "Descrição",
-    "details_count"                      => "Detalhes da contagem de inventário",
-    "do_nothing"                         => "Nada a fazer",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Editar os campos que deseja editar para todos os itens selecionados.",
-    "edit_multiple_items"                => "Editando Múltiplos Itens",
-    "empty_upc_items"                    => "Vazio UPC Itens",
-    "error_adding_updating"              => "Erro ao adicionar/atualizar item",
-    "error_updating_multiple"            => "Erro na atualização de itens",
-    "generate_barcodes"                  => "Gerar Códigos de Barras",
-    "hsn_code"                           => "Nomenclatura do Sistema Harmonizado",
-    "image"                              => "Imagem",
-    "import_items_csv"                   => "Importar planilha de produtos do CSV",
-    "info_provided_by"                   => "Informação fornecida por",
-    "inventory"                          => "Inventário",
-    "inventory_CSV_import_quantity"      => "Quantidade importada do CSV",
-    "inventory_comments"                 => "Comentário",
-    "inventory_data_tracking"            => "Acompanhamento de dados de inventário",
-    "inventory_date"                     => "Data",
-    "inventory_employee"                 => "Funcionário",
-    "inventory_in_out_quantity"          => "Quantidade In / Out",
-    "inventory_remarks"                  => "Observações",
-    "is_deleted"                         => "Apagado",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item tem Número Serial",
-    "item"                               => "Produto",
-    "item_id"                            => "",
-    "item_number"                        => "Cod. Barra",
-    "item_number_duplicate"              => "O número do item já está presente na base de dados.",
-    "kit"                                => "Conjunto",
-    "location"                           => "Localização",
-    "low_inventory_items"                => "Itens sem estoque",
-    "low_sell_item"                      => "Item de baixa venda",
-    "manually_editing_of_quantity"       => "Editar manualmente a quantidade",
-    "markup"                             => "",
-    "name"                               => "Nome produto",
-    "name_required"                      => "Nome do item é um campo obrigatório.",
-    "new"                                => "Novo Item",
-    "no_description_items"               => "Sem descrição dos Itens",
-    "no_items_to_display"                => "Sem itens para mostrar.",
-    "none"                               => "Nenhum",
-    "none_selected"                      => "Não selecionou nenhum produto para editar",
-    "nonstock"                           => "Sem estoque",
-    "number_information"                 => "Item Número",
-    "number_required"                    => "Cod. Barra é um campo obrigatório.",
-    "one_or_multiple"                    => "item(s)",
-    "pack_name"                          => "Nome do pacote",
-    "qty_per_pack"                       => "Quantidade por embalagem",
-    "quantity"                           => "Quantidade",
-    "quantity_number"                    => "Quantidade deve ser um número.",
-    "quantity_required"                  => "Quantidade é um campo obrigatório.",
-    "receiving_quantity"                 => "Quantidade a receber",
-    "remove_image"                       => "Remover imagem",
-    "reorder_level"                      => "Nível de reposição",
-    "reorder_level_number"               => "Nível de reposição deve ser um número.",
-    "reorder_level_required"             => "Nível de reposição é um campo obrigatório.",
-    "retrive_item_info"                  => "Recuperar Informação do Item",
-    "sales_tax_1"                        => "Imposto de venda",
-    "sales_tax_2"                        => "Imposto de venda 2",
-    "search_attributes"                  => "pesquisar atributos",
-    "select_image"                       => "Selecionar imagem",
-    "serialized_items"                   => "Serializar Itens",
-    "standard"                           => "Padrão",
-    "stock"                              => "Estoque",
-    "stock_location"                     => "Localização do estoque",
-    "stock_type"                         => "Tipo estoque",
-    "successful_adding"                  => "Você adicionou o item com sucesso",
-    "successful_bulk_edit"               => "Você atualizou com sucesso os itens selecionados",
-    "successful_deleted"                 => "Você excluiu com sucesso",
-    "successful_updating"                => "Você atualizou com sucesso o item",
-    "supplier"                           => "Fornecedor",
-    "tax_1"                              => "Imposto 1",
-    "tax_2"                              => "Imposto 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Categoria de imposto",
-    "tax_percent"                        => "Percentual Imposto",
-    "tax_percent_number"                 => "Porcentagem de imposto deve ser um valor numérico",
-    "tax_percent_required"               => "Imposto Percentual um campo obrigatório.",
-    "tax_percents"                       => "Imposto Percentual",
-    "temp"                               => "Temporário",
-    "type"                               => "Tipo item",
-    "unit_price"                         => "Preço Varejo",
-    "unit_price_number"                  => "Preço unitário deve ser um número.",
-    "unit_price_required"                => "Preço de varejo é um campo obrigatório.",
-    "upc_database"                       => "Base de dados UPC",
-    "update"                             => "Atualizar Item",
-    "use_inventory_menu"                 => "Usar Menu Inventário",
+    'add_minus'                          => 'Inventário para adicionar/subtrair.',
+    'allow_alt_description'              => 'Permitir atualizar descrição',
+    'amount_entry'                       => 'Entrada de montante',
+    'bulk_edit'                          => 'Editar Múltiplos Itens',
+    'buy_price_required'                 => 'Preço de compra é um campo obrigatório.',
+    'cannot_be_deleted'                  => 'Não foi possível excluir os itens selecionados um ou mais dos itens selecionados tem vendas.',
+    'cannot_find_item'                   => 'Não consegue encontrar qualquer informação sobre o produto.',
+    'categories'                         => '',
+    'category'                           => 'Categoria',
+    'category_new'                       => '',
+    'category_required'                  => 'Categoria é um campo obrigatório.',
+    'change_all_to_allow_alt_desc'       => 'Permitir alterar desconto para todos.',
+    'change_all_to_not_allow_allow_desc' => 'Não Permitir alterar desconto para todos.',
+    'change_all_to_serialized'           => 'Alterar todos para serializados',
+    'change_all_to_unserialized'         => 'Alterar todos para não serializados',
+    'change_image'                       => 'Substituir imagem',
+    'confirm_bulk_edit'                  => 'Tem certeza de que deseja editar todos os itens selecionados?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Tem certeza de que deseja editar todos os impostos selecionados?.',
+    'confirm_delete'                     => 'Tem certeza de que deseja excluir os itens selecionados?',
+    'confirm_restore'                    => 'Tem certeza de que deseja restaurar o (s) item (ns) selecionado (s)?',
+    'cost_price'                         => 'Preço de Custo',
+    'cost_price_number'                  => 'Preço de custo deve ser um número.',
+    'cost_price_required'                => 'Preço de custo é um campo obrigatório.',
+    'count'                              => 'Acrescentar ao Inventário',
+    'csv_import_failed'                  => 'Importação do CSV falhou',
+    'csv_import_invalid_location'        => 'Local(is) de estoque inválido(s) encontrado(s): {0}. Apenas locais de estoque válidos são permitidos.',
+    'csv_import_nodata_wrongformat'      => 'Seu arquivo enviado não contém dados ou formato errado.',
+    'csv_import_partially_failed'        => 'Houve {0} falha na importação de itens na(s) linha(s): {1}. Nenhuma linha foi importada.',
+    'csv_import_success'                 => 'Importação de Itens com sucesso.',
+    'current_quantity'                   => 'Quantidade Atual',
+    'default_pack_name'                  => 'Cada',
+    'description'                        => 'Descrição',
+    'details_count'                      => 'Detalhes da contagem de inventário',
+    'do_nothing'                         => 'Nada a fazer',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Editar os campos que deseja editar para todos os itens selecionados.',
+    'edit_multiple_items'                => 'Editando Múltiplos Itens',
+    'empty_upc_items'                    => 'Vazio UPC Itens',
+    'error_adding_updating'              => 'Erro ao adicionar/atualizar item',
+    'error_updating_multiple'            => 'Erro na atualização de itens',
+    'generate_barcodes'                  => 'Gerar Códigos de Barras',
+    'hsn_code'                           => 'Nomenclatura do Sistema Harmonizado',
+    'image'                              => 'Imagem',
+    'import_items_csv'                   => 'Importar planilha de produtos do CSV',
+    'info_provided_by'                   => 'Informação fornecida por',
+    'inventory'                          => 'Inventário',
+    'inventory_CSV_import_quantity'      => 'Quantidade importada do CSV',
+    'inventory_comments'                 => 'Comentário',
+    'inventory_data_tracking'            => 'Acompanhamento de dados de inventário',
+    'inventory_date'                     => 'Data',
+    'inventory_employee'                 => 'Funcionário',
+    'inventory_in_out_quantity'          => 'Quantidade In / Out',
+    'inventory_remarks'                  => 'Observações',
+    'is_deleted'                         => 'Apagado',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item tem Número Serial',
+    'item'                               => 'Produto',
+    'item_id'                            => '',
+    'item_number'                        => 'Cod. Barra',
+    'item_number_duplicate'              => 'O número do item já está presente na base de dados.',
+    'item_number_invalid'                => 'O número do item contém caracteres não permitidos.',
+    'kit'                                => 'Conjunto',
+    'location'                           => 'Localização',
+    'low_inventory_items'                => 'Itens sem estoque',
+    'low_sell_item'                      => 'Item de baixa venda',
+    'manually_editing_of_quantity'       => 'Editar manualmente a quantidade',
+    'markup'                             => '',
+    'name'                               => 'Nome produto',
+    'name_required'                      => 'Nome do item é um campo obrigatório.',
+    'new'                                => 'Novo Item',
+    'no_description_items'               => 'Sem descrição dos Itens',
+    'no_items_to_display'                => 'Sem itens para mostrar.',
+    'none'                               => 'Nenhum',
+    'none_selected'                      => 'Não selecionou nenhum produto para editar',
+    'nonstock'                           => 'Sem estoque',
+    'number_information'                 => 'Item Número',
+    'number_required'                    => 'Cod. Barra é um campo obrigatório.',
+    'one_or_multiple'                    => 'item(s)',
+    'pack_name'                          => 'Nome do pacote',
+    'qty_per_pack'                       => 'Quantidade por embalagem',
+    'quantity'                           => 'Quantidade',
+    'quantity_number'                    => 'Quantidade deve ser um número.',
+    'quantity_required'                  => 'Quantidade é um campo obrigatório.',
+    'receiving_quantity'                 => 'Quantidade a receber',
+    'remove_image'                       => 'Remover imagem',
+    'reorder_level'                      => 'Nível de reposição',
+    'reorder_level_number'               => 'Nível de reposição deve ser um número.',
+    'reorder_level_required'             => 'Nível de reposição é um campo obrigatório.',
+    'retrive_item_info'                  => 'Recuperar Informação do Item',
+    'sales_tax_1'                        => 'Imposto de venda',
+    'sales_tax_2'                        => 'Imposto de venda 2',
+    'search_attributes'                  => 'pesquisar atributos',
+    'select_image'                       => 'Selecionar imagem',
+    'serialized_items'                   => 'Serializar Itens',
+    'standard'                           => 'Padrão',
+    'stock'                              => 'Estoque',
+    'stock_location'                     => 'Localização do estoque',
+    'stock_type'                         => 'Tipo estoque',
+    'successful_adding'                  => 'Você adicionou o item com sucesso',
+    'successful_bulk_edit'               => 'Você atualizou com sucesso os itens selecionados',
+    'successful_deleted'                 => 'Você excluiu com sucesso',
+    'successful_updating'                => 'Você atualizou com sucesso o item',
+    'supplier'                           => 'Fornecedor',
+    'tax_1'                              => 'Imposto 1',
+    'tax_2'                              => 'Imposto 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Categoria de imposto',
+    'tax_name_invalid'                   => 'O nome do imposto contém caracteres não permitidos.',
+    'tax_percent'                        => 'Percentual Imposto',
+    'tax_percent_number'                 => 'Porcentagem de imposto deve ser um valor numérico',
+    'tax_percent_required'               => 'Imposto Percentual um campo obrigatório.',
+    'tax_percents'                       => 'Imposto Percentual',
+    'temp'                               => 'Temporário',
+    'type'                               => 'Tipo item',
+    'unit_price'                         => 'Preço Varejo',
+    'unit_price_number'                  => 'Preço unitário deve ser um número.',
+    'unit_price_required'                => 'Preço de varejo é um campo obrigatório.',
+    'upc_database'                       => 'Base de dados UPC',
+    'update'                             => 'Atualizar Item',
+    'use_inventory_menu'                 => 'Usar Menu Inventário',
 ];
diff --git a/app/Language/pt-BR/Login.php b/app/Language/pt-BR/Login.php
index 92504e3c2..fd4b96583 100644
--- a/app/Language/pt-BR/Login.php
+++ b/app/Language/pt-BR/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    'gcaptcha' => "Não sou um robô.",
-    'go' => "Entrar",
-    'invalid_gcaptcha' => "Inválido eu não sou um robô.",
-    'invalid_installation' => "A instalação não está correta, verifique o seu arquivo php.ini.",
-    'invalid_username_and_password' => "Usuário ou senha inválido.",
-    'login' => "Autenticação",
-    'logout' => "Sair",
-    'migration_needed' => "Uma migração do banco de dados para {0} será iniciada após o login.",
-    'password' => "Senha",
-    'required_username' => "O campo nome de usuário é obrigatório.",
-    'username' => "Usuário",
-    'welcome' => "Bem-vindo！",
+    "gcaptcha"                            => "Não sou um robô.",
+    "go"                                  => "Entrar",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Inválido eu não sou um robô.",
+    "invalid_installation"                => "A instalação não está correta, verifique o seu arquivo php.ini.",
+    "invalid_username_and_password"       => "Usuário ou senha inválido.",
+    "login"                               => "Autenticação",
+    "logout"                              => "Sair",
+    "migrating_database"                  => "",
+    "migration_auth_message"              => "Credenciais de administrador são necessárias para autorizar a migração do banco de dados para a versão {0}. Faça login para continuar.",
+    "migration_complete"                  => "Banco de dados inicializado com sucesso!",
+    "migration_complete_login"            => "Agora você pode fazer login.",
+    "migration_complete_migrate"          => "",
+    "migration_complete_redirect"         => "Migração concluída. Redirecionando para login...",
+    "migration_error_connection"          => "Erro de conexão. Por favor, tente novamente.",
+    "migration_failed"                    => "Migração falhou",
+    "migration_initializing"              => "Inicializando banco de dados",
+    "migration_needed"                    => "Uma migração do banco de dados para {0} será iniciada após o login.",
+    "migration_required"                  => "Migração de banco de dados necessária",
+    "migration_running"                   => "Executando migrações do banco de dados...",
+    "password"                            => "Senha",
+    "required_username"                   => "O campo nome de usuário é obrigatório.",
+    'too_many_attempts'                   => 'Muitas tentativas. Aguarde um momento e tente novamente.',
+    "username"                            => "Usuário",
+    "welcome"                             => "Bem-vindo ao {0}!"
 ];
diff --git a/app/Language/pt-BR/Reports.php b/app/Language/pt-BR/Reports.php
index 8c3ad09c2..f51e5a8d4 100644
--- a/app/Language/pt-BR/Reports.php
+++ b/app/Language/pt-BR/Reports.php
@@ -146,4 +146,5 @@ return [
     "used"                                    => "Pontos usados",
     "work_orders"                             => "Ordens de trabalho",
     "zero_and_less"                           => "Zero e menor",
+    "toggle_cost_and_profit"                  => "Alternar Custo & Lucro",
 ];
diff --git a/app/Language/pt-BR/Sales.php b/app/Language/pt-BR/Sales.php
index 1456d5c28..4e6ccce3a 100644
--- a/app/Language/pt-BR/Sales.php
+++ b/app/Language/pt-BR/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Pontos Disponíveis",
-    "rewards_package"                  => "Recompensa",
-    "rewards_remaining_balance"        => "O valor restante dos pontos de recompensa é ",
-    "account_number"                   => "Montante º",
-    "add_payment"                      => "Pagar",
-    "amount_due"                       => "Diferença",
-    "amount_tendered"                  => "A Pagar",
-    "authorized_signature"             => "Assinatura autorizada",
-    "cancel_sale"                      => "Cancelar",
-    "cash"                             => "Dinheiro",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Ajuste de Dinheiro",
-    "cash_deposit"                     => "Depósito em dinheiro",
-    "cash_filter"                      => "Dinheiro",
-    "change_due"                       => "Troco",
-    "change_price"                     => "Mudar o Preço de Venda",
-    "check"                            => "Cheque",
-    "check_balance"                    => "Cheque restante",
-    "check_filter"                     => "Cheque",
-    "close"                            => "",
-    "comment"                          => "Cementário",
-    "comments"                         => "Comentários",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Finalizar",
-    "confirm_cancel_sale"              => "Tem certeza de que deseja apagar esta venda? Todos os itens serão apagados.",
-    "confirm_delete"                   => "Tem certeza de que deseja excluir as vendas selecionados?",
-    "confirm_restore"                  => "Tem certeza de que deseja restaurar a (s) venda (ões) selecionada (s)?",
-    "credit"                           => "Cartão Crédito",
-    "credit_deposit"                   => "Depósito de crédito",
-    "credit_filter"                    => "Cartão de Crédito",
-    "current_table"                    => "",
-    "customer"                         => "Cliente",
-    "customer_address"                 => "Endereço",
-    "customer_discount"                => "Desconto",
-    "customer_email"                   => "e-mail",
-    "customer_location"                => "Localização",
-    "customer_mailchimp_status"        => "Status Mailchimp",
-    "customer_optional"                => "(Obrigatório para pagamentos vencidos)",
-    "customer_required"                => "(Requerido)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Data Venda",
-    "date_range"                       => "Intervalo de datas",
-    "date_required"                    => "A data correta precisa ser preenchida.",
-    "date_type"                        => "Data é requerida.",
-    "debit"                            => "Cartão Débito",
-    "debit_filter"                     => "",
-    "delete"                           => "Permitir exclusão",
-    "delete_confirmation"              => "Tem certeza de que deseja excluir esta venda, esta ação não pode ser desfeita.",
-    "delete_entire_sale"               => "Apagar toda a venda",
-    "delete_successful"                => "Apagado com sucesso.",
-    "delete_unsuccessful"              => "Foi excluído com sucesso uma venda.",
-    "description_abbrv"                => "Descrição.",
-    "discard"                          => "Descartar",
-    "discard_quote"                    => "",
-    "discount"                         => "Desconto",
-    "discount_included"                => "% Desconto",
-    "discount_short"                   => "%",
-    "due"                              => "Vencimento",
-    "due_filter"                       => "Vencimento",
-    "edit"                             => "Editar",
-    "edit_item"                        => "Atualizar",
-    "edit_sale"                        => "Editar Venda",
-    "email_receipt"                    => "E-mail Recebido",
-    "employee"                         => "Empregado",
-    "entry"                            => "Entrada",
-    "error_editing_item"               => "Erro editando item",
-    "find_or_scan_item"                => "Pesquisar Item",
-    "find_or_scan_item_or_receipt"     => "Produto",
-    "giftcard"                         => "Cupom",
-    "giftcard_balance"                 => "Balanço de Cartões presente",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Número cartão presente",
-    "group_by_category"                => "Agrupar por Categoria",
-    "group_by_type"                    => "Agrupar por Tipo",
-    "hsn"                              => "HSN",
-    "id"                               => "Venda ID",
-    "include_prices"                   => "Incluir Preços?",
-    "invoice"                          => "Fatura",
-    "invoice_confirm"                  => "Esta fatura será enviada para",
-    "invoice_enable"                   => "Criar Fatura",
-    "invoice_filter"                   => "Faturas",
-    "invoice_no_email"                 => "Este cliente não tem um endereço de e-mail válido.",
-    "invoice_number"                   => "Fatura nº",
-    "invoice_number_duplicate"         => "Por favor insira um número de fatura única.",
-    "invoice_sent"                     => "Enviar Fatura para",
-    "invoice_total"                    => "Total da fatura",
-    "invoice_type_custom_invoice"      => "Fatura personalizada (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Fatura fiscal personalizada (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Fatura (invoice.php)",
-    "invoice_type_tax_invoice"         => "Fatura fiscal (tax_invoice.php)",
-    "invoice_unsent"                   => "Fatura não devem ser enviados para",
-    "invoice_update"                   => "Recontagem",
-    "item_insufficient_of_stock"       => "Item insuficiente no estoque.",
-    "item_name"                        => "Produto",
-    "item_number"                      => "Item nº",
-    "item_out_of_stock"                => "Item sem estoque.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Registrar como",
-    "must_enter_numeric"               => "Deve entrar valor numérico para montante da proposta apresentada.",
-    "must_enter_numeric_giftcard"      => "Deve entrar valor numérico para o número de cartão presente.",
-    "new_customer"                     => "Novo Cliente",
-    "new_item"                         => "Novo Item",
-    "no_description"                   => "Sem descrição",
-    "no_filter"                        => "Todos",
-    "no_items_in_cart"                 => "Não há itens na cesta.",
-    "no_sales_to_display"              => "Sem vendas para mostrar.",
-    "none_selected"                    => "Você não selecionou nenhuma venda para apagar.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "Esta ação não é autorizada.",
-    "one_or_multiple"                  => "venda(s)",
-    "payment"                          => "Forma de pagamento",
-    "payment_amount"                   => "Conta",
-    "payment_not_cover_total"          => "Valor do pagamento não cobre total.",
-    "payment_type"                     => "Tipo",
-    "payments"                         => "",
-    "payments_total"                   => "Total Pago",
-    "price"                            => "Preço",
-    "print_after_sale"                 => "Imprimir ao final",
-    "quantity"                         => "Quantidade",
-    "quantity_less_than_reorder_level" => "Aviso, quantidade desejada está abaixo do nível de reabastecimento.",
-    "quantity_less_than_zero"          => "Aviso, Quantidade desejado é insuficiente. Você ainda pode processar a venda  mas verifique seu inventário.",
-    "quantity_of_items"                => "Quantidade de {0} itens",
-    "quote"                            => "Cotação",
-    "quote_number"                     => "Cotação número",
-    "quote_number_duplicate"           => "O número de cotação deve ser exclusivo.",
-    "quote_sent"                       => "Cotação enviada para",
-    "quote_unsent"                     => "As cotações não foram enviadas para",
-    "receipt"                          => "Vendas",
-    "receipt_no_email"                 => "Este cliente não possui um endereço de email válido.",
-    "receipt_number"                   => "Venda nº",
-    "receipt_sent"                     => "Enviar recibo para",
-    "receipt_unsent"                   => "Recibo não devem ser enviados para",
-    "refund"                           => "Tipo de Reembolso",
-    "register"                         => "Registar Venda",
-    "remove_customer"                  => "Remover Cliente",
-    "remove_discount"                  => "",
-    "return"                           => "Devolução",
-    "rewards"                          => "Pontos de recompensa",
-    "rewards_balance"                  => "Saldo de pontos de recompensa",
-    "sale"                             => "Venda",
-    "sale_by_invoice"                  => "Venda por fatura",
-    "sale_for_customer"                => "Cliente:",
-    "sale_time"                        => "Data",
-    "sales_tax"                        => "Imposto de venda",
-    "sales_total"                      => "",
-    "select_customer"                  => "Selecionar Cliente",
-    "send_invoice"                     => "Enviar fatura",
-    "send_quote"                       => "enviar cotação",
-    "send_receipt"                     => "Enviar recibo",
-    "send_work_order"                  => "Enviar ordem de trabalho",
-    "serial"                           => "Série",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "fatura",
-    "show_receipt"                     => "recibo",
-    "start_typing_customer_name"       => "Nome Cliente ...",
-    "start_typing_item_name"           => "Produto ...",
-    "stock"                            => "Estoque",
-    "stock_location"                   => "Estoque",
-    "sub_total"                        => "Sub-total",
-    "successfully_deleted"             => "Apagado com sucesso",
-    "successfully_restored"            => "Você restaurou com sucesso",
-    "successfully_suspended_sale"      => "Suspenso com sucesso.",
-    "successfully_updated"             => "Venda atualizada.",
-    "suspend_sale"                     => "Suspender",
-    "suspended_doc_id"                 => "Documento",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspenso",
-    "table"                            => "Mesa",
-    "takings"                          => "Vendas",
-    "tax"                              => "Taxa",
-    "tax_id"                           => "Id imposto",
-    "tax_invoice"                      => "Fatura de imposto",
-    "tax_percent"                      => "Taxa %",
-    "taxed_ind"                        => "Indicador de Taxa de Vendas",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "taxas excluídas",
-    "transaction_failed"               => "Falha na transação Vendas.",
-    "unable_to_add_item"               => "Não é possível adicionar item à venda",
-    "unsuccessfully_deleted"           => "Venda(s) não pode ser excluído.",
-    "unsuccessfully_restored"          => "Falha na restauração de venda (s).",
-    "unsuccessfully_suspended_sale"    => "Suspenso com sucesso.",
-    "unsuccessfully_updated"           => "Venda sem sucesso na atualização.",
-    "unsuspend"                        => "Não suspenso",
-    "unsuspend_and_delete"             => "Retornar e apagar",
-    "update"                           => "Editar Venda",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Ordem de trabalho",
-    "work_order_number"                => "Número da ordem de trabalho",
-    "work_order_number_duplicate"      => "O número da ordem de serviço deve ser exclusivo.",
-    "work_order_sent"                  => "Ordem de trabalho enviada para",
-    "work_order_unsent"                => "A ordem de serviço não foi enviada para",
+    'account_number'                    => 'Montante º',
+    'add_payment'                       => 'Pagar',
+    'amount_due'                        => 'Diferença',
+    'amount_due_not_covered'            => 'Os pagamentos não cobrem o valor devido.',
+    'amount_tendered'                   => 'A Pagar',
+    'authorized_signature'              => 'Assinatura autorizada',
+    'cancel_sale'                       => 'Cancelar',
+    'cash'                              => 'Dinheiro',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Ajuste de Dinheiro',
+    'cash_deposit'                      => 'Depósito em dinheiro',
+    'cash_filter'                       => 'Dinheiro',
+    'change_due'                        => 'Troco',
+    'change_price'                      => 'Mudar o Preço de Venda',
+    'check'                             => 'Cheque',
+    'check_balance'                     => 'Cheque restante',
+    'check_filter'                      => 'Cheque',
+    'close'                             => '',
+    'comment'                           => 'Cementário',
+    'comments'                          => 'Comentários',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Finalizar',
+    'confirm_cancel_sale'               => 'Tem certeza de que deseja apagar esta venda? Todos os itens serão apagados.',
+    'confirm_delete'                    => 'Tem certeza de que deseja excluir as vendas selecionados?',
+    'confirm_restore'                   => 'Tem certeza de que deseja restaurar a (s) venda (ões) selecionada (s)?',
+    'credit'                            => 'Cartão Crédito',
+    'credit_deposit'                    => 'Depósito de crédito',
+    'credit_filter'                     => 'Cartão de Crédito',
+    'current_table'                     => '',
+    'customer'                          => 'Cliente',
+    'customer_address'                  => 'Endereço',
+    'customer_discount'                 => 'Desconto',
+    'customer_email'                    => 'e-mail',
+    'customer_location'                 => 'Localização',
+    'customer_mailchimp_status'         => 'Status Mailchimp',
+    'customer_optional'                 => '(Obrigatório para pagamentos vencidos)',
+    'customer_required'                 => '(Requerido)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Pontos Disponíveis',
+    'daily_sales'                       => '',
+    'date'                              => 'Data Venda',
+    'date_range'                        => 'Intervalo de datas',
+    'date_required'                     => 'A data correta precisa ser preenchida.',
+    'date_type'                         => 'Data é requerida.',
+    'debit'                             => 'Cartão Débito',
+    'debit_filter'                      => '',
+    'delete'                            => 'Permitir exclusão',
+    'delete_confirmation'               => 'Tem certeza de que deseja excluir esta venda, esta ação não pode ser desfeita.',
+    'delete_entire_sale'                => 'Apagar toda a venda',
+    'delete_successful'                 => 'Apagado com sucesso.',
+    'delete_unsuccessful'               => 'Foi excluído com sucesso uma venda.',
+    'description_abbrv'                 => 'Descrição.',
+    'discard'                           => 'Descartar',
+    'discard_quote'                     => '',
+    'discount'                          => 'Desconto',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Desconto',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Vencimento',
+    'due_filter'                        => 'Vencimento',
+    'edit'                              => 'Editar',
+    'edit_item'                         => 'Atualizar',
+    'edit_sale'                         => 'Editar Venda',
+    'email_receipt'                     => 'E-mail Recebido',
+    'employee'                          => 'Empregado',
+    'entry'                             => 'Entrada',
+    'error_editing_item'                => 'Erro editando item',
+    'find_or_scan_item'                 => 'Pesquisar Item',
+    'find_or_scan_item_or_receipt'      => 'Produto',
+    'giftcard'                          => 'Cupom',
+    'giftcard_balance'                  => 'Balanço de Cartões presente',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Número cartão presente',
+    'group_by_category'                 => 'Agrupar por Categoria',
+    'group_by_type'                     => 'Agrupar por Tipo',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Venda ID',
+    'include_prices'                    => 'Incluir Preços?',
+    'insufficient_giftcard_balance'     => 'Saldo insuficiente do cartão presente para este pagamento.',
+    'insufficient_reward_points'        => 'Pontos de recompensa insuficientes para este pagamento.',
+    'invoice'                           => 'Fatura',
+    'invoice_confirm'                   => 'Esta fatura será enviada para',
+    'invoice_enable'                    => 'Criar Fatura',
+    'invoice_filter'                    => 'Faturas',
+    'invoice_no_email'                  => 'Este cliente não tem um endereço de e-mail válido.',
+    'invoice_number'                    => 'Fatura nº',
+    'invoice_number_duplicate'          => 'Por favor insira um número de fatura única.',
+    'invoice_sent'                      => 'Enviar Fatura para',
+    'invoice_total'                     => 'Total da fatura',
+    'invoice_type_custom_invoice'       => 'Fatura personalizada (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Fatura fiscal personalizada (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Fatura (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Fatura fiscal (tax_invoice.php)',
+    'invoice_unsent'                    => 'Fatura não devem ser enviados para',
+    'invoice_update'                    => 'Recontagem',
+    'item_insufficient_of_stock'        => 'Item insuficiente no estoque.',
+    'item_name'                         => 'Produto',
+    'item_number'                       => 'Item nº',
+    'item_out_of_stock'                 => 'Item sem estoque.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Registrar como',
+    'must_enter_numeric'                => 'Deve entrar valor numérico para montante da proposta apresentada.',
+    'must_enter_numeric_giftcard'       => 'Deve entrar valor numérico para o número de cartão presente.',
+    'must_enter_reference_code'         => 'O número de referência/recuperação deve ser informado.',
+    'negative_amount_tendered'          => 'O valor pago não pode ser negativo.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Novo Cliente',
+    'new_item'                          => 'Novo Item',
+    'no_description'                    => 'Sem descrição',
+    'no_filter'                         => 'Todos',
+    'no_items_in_cart'                  => 'Não há itens na cesta.',
+    'no_sales_to_display'               => 'Sem vendas para mostrar.',
+    'none_selected'                     => 'Você não selecionou nenhuma venda para apagar.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'Esta ação não é autorizada.',
+    'one_or_multiple'                   => 'venda(s)',
+    'payment'                           => 'Forma de pagamento',
+    'payment_amount'                    => 'Conta',
+    'payment_not_cover_total'           => 'Valor do pagamento não cobre total.',
+    'payment_type'                      => 'Tipo',
+    'payments'                          => '',
+    'payments_total'                    => 'Total Pago',
+    'price'                             => 'Preço',
+    'print_after_sale'                  => 'Imprimir ao final',
+    'quantity'                          => 'Quantidade',
+    'quantity_less_than_reorder_level'  => 'Aviso, quantidade desejada está abaixo do nível de reabastecimento.',
+    'quantity_less_than_zero'           => 'Aviso, Quantidade desejado é insuficiente. Você ainda pode processar a venda  mas verifique seu inventário.',
+    'quantity_of_items'                 => 'Quantidade de {0} itens',
+    'quote'                             => 'Cotação',
+    'quote_number'                      => 'Cotação número',
+    'quote_number_duplicate'            => 'O número de cotação deve ser exclusivo.',
+    'quote_sent'                        => 'Cotação enviada para',
+    'quote_unsent'                      => 'As cotações não foram enviadas para',
+    'receipt'                           => 'Vendas',
+    'receipt_no_email'                  => 'Este cliente não possui um endereço de email válido.',
+    'receipt_number'                    => 'Venda nº',
+    'receipt_sent'                      => 'Enviar recibo para',
+    'receipt_unsent'                    => 'Recibo não devem ser enviados para',
+    'reference_code'                    => 'Código de referência do pagamento',
+    'reference_code_invalid_characters' => 'O código de referência deve conter apenas letras e números.',
+    'reference_code_length_error'       => 'O comprimento do código de referência é inválido.',
+    'refund'                            => 'Tipo de Reembolso',
+    'register'                          => 'Registar Venda',
+    'remove_customer'                   => 'Remover Cliente',
+    'remove_discount'                   => '',
+    'return'                            => 'Devolução',
+    'rewards'                           => 'Pontos de recompensa',
+    'rewards_balance'                   => 'Saldo de pontos de recompensa',
+    'rewards_package'                   => 'Recompensa',
+    'rewards_remaining_balance'         => 'O valor restante dos pontos de recompensa é ',
+    'sale'                              => 'Venda',
+    'sale_by_invoice'                   => 'Venda por fatura',
+    'sale_for_customer'                 => 'Cliente:',
+    'sale_time'                         => 'Data',
+    'sales_tax'                         => 'Imposto de venda',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Selecionar Cliente',
+    'send_invoice'                      => 'Enviar fatura',
+    'send_quote'                        => 'enviar cotação',
+    'send_receipt'                      => 'Enviar recibo',
+    'send_work_order'                   => 'Enviar ordem de trabalho',
+    'serial'                            => 'Série',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'fatura',
+    'show_receipt'                      => 'recibo',
+    'start_typing_customer_name'        => 'Nome Cliente ...',
+    'start_typing_item_name'            => 'Produto ...',
+    'stock'                             => 'Estoque',
+    'stock_location'                    => 'Estoque',
+    'sub_total'                         => 'Sub-total',
+    'successfully_deleted'              => 'Apagado com sucesso',
+    'successfully_restored'             => 'Você restaurou com sucesso',
+    'successfully_suspended_sale'       => 'Suspenso com sucesso.',
+    'successfully_updated'              => 'Venda atualizada.',
+    'suspend_sale'                      => 'Suspender',
+    'suspended_doc_id'                  => 'Documento',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspenso',
+    'table'                             => 'Mesa',
+    'takings'                           => 'Vendas',
+    'tax'                               => 'Taxa',
+    'tax_id'                            => 'Id imposto',
+    'tax_invoice'                       => 'Fatura de imposto',
+    'tax_percent'                       => 'Taxa %',
+    'taxed_ind'                         => 'Indicador de Taxa de Vendas',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'taxas excluídas',
+    'transaction_failed'                => 'Falha na transação Vendas.',
+    'unable_to_add_item'                => 'Não é possível adicionar item à venda',
+    'unsuccessfully_deleted'            => 'Venda(s) não pode ser excluído.',
+    'unsuccessfully_restored'           => 'Falha na restauração de venda (s).',
+    'unsuccessfully_suspended_sale'     => 'Suspenso com sucesso.',
+    'unsuccessfully_updated'            => 'Venda sem sucesso na atualização.',
+    'unsuspend'                         => 'Não suspenso',
+    'unsuspend_and_delete'              => 'Retornar e apagar',
+    'update'                            => 'Editar Venda',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Ordem de trabalho',
+    'work_order_number'                 => 'Número da ordem de trabalho',
+    'work_order_number_duplicate'       => 'O número da ordem de serviço deve ser exclusivo.',
+    'work_order_sent'                   => 'Ordem de trabalho enviada para',
+    'work_order_unsent'                 => 'A ordem de serviço não foi enviada para',
 ];
diff --git a/app/Language/ro/Attributes.php b/app/Language/ro/Attributes.php
index 5a2599b46..7032d6bb2 100644
--- a/app/Language/ro/Attributes.php
+++ b/app/Language/ro/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Valoare atribut nu poate contine ':' sau '|'",
-    "confirm_delete"                   => "Sigur doriti stergerea atributului/atributelor selectat(e)?",
-    "confirm_restore"                  => "",
-    "definition_cannot_be_deleted"     => "Nu se poate sterge atributul/atributele selectat(e)",
-    "definition_error_adding_updating" => "",
-    "definition_flags"                 => "Vizibilitate atribut",
-    "definition_group"                 => "Grup",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Adauga atribut",
-    "definition_name_required"         => "Nume atribut este un camp obligatoriu",
-    "definition_one_or_multiple"       => "atribut(e)",
-    "definition_successful_adding"     => "Ati adaugat articolul cu succes",
-    "definition_successful_deleted"    => "Ati sters cu succes",
-    "definition_successful_updating"   => "Ati actualizat atributul cu succes",
-    "definition_type"                  => "Tip Atribut",
-    "definition_type_required"         => "Tip Atribut este camp obligatoriu",
-    "definition_unit"                  => "",
-    "definition_values"                => "Valori Atribut",
-    "new"                              => "Atribut nou",
-    "no_attributes_to_display"         => "Nu sunt articole de afisat",
-    "receipt_visibility"               => "Chitanta",
-    "show_in_items"                    => "Arata in articole",
-    "show_in_items_visibility"         => "Articole",
-    "show_in_receipt"                  => "Arata in chitanta",
-    "show_in_receivings"               => "Arata in receptii",
-    "show_in_receivings_visibility"    => "Receptii",
-    "show_in_sales"                    => "Arata in vanzari",
-    "show_in_sales_visibility"         => "Vanzari",
-    "update"                           => "Actualizare Atribut",
+    'attribute_value_invalid_chars'    => 'Valoare atribut nu poate contine \':\' sau \'|\'',
+    'confirm_delete'                   => 'Sigur doriti stergerea atributului/atributelor selectat(e)?',
+    'confirm_restore'                  => '',
+    'definition_cannot_be_deleted'     => 'Nu se poate sterge atributul/atributele selectat(e)',
+    'definition_invalid_group' => 'Grupul selectat nu există sau este invalid.',
+    'definition_error_adding_updating' => '',
+    'definition_flags'                 => 'Vizibilitate atribut',
+    'definition_group'                 => 'Grup',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Adauga atribut',
+    'definition_name_required'         => 'Nume atribut este un camp obligatoriu',
+    'definition_one_or_multiple'       => 'atribut(e)',
+    'definition_successful_adding'     => 'Ati adaugat articolul cu succes',
+    'definition_successful_deleted'    => 'Ati sters cu succes',
+    'definition_successful_updating'   => 'Ati actualizat atributul cu succes',
+    'definition_type'                  => 'Tip Atribut',
+    'definition_type_required'         => 'Tip Atribut este camp obligatoriu',
+    'definition_unit'                  => '',
+    'definition_values'                => 'Valori Atribut',
+    'new'                              => 'Atribut nou',
+    'no_attributes_to_display'         => 'Nu sunt articole de afisat',
+    'receipt_visibility'               => 'Chitanta',
+    'show_in_items'                    => 'Arata in articole',
+    'show_in_items_visibility'         => 'Articole',
+    'show_in_receipt'                  => 'Arata in chitanta',
+    'show_in_receivings'               => 'Arata in receptii',
+    'show_in_receivings_visibility'    => 'Receptii',
+    'show_in_sales'                    => 'Arata in vanzari',
+    'show_in_sales_visibility'         => 'Vanzari',
+    'show_in_search'                   => 'Arata in cautare',
+    'show_in_search_visibility'        => 'Cautare',
+    'update'                           => 'Actualizare Atribut',
 ];
diff --git a/app/Language/ro/Bootstrap_tables.php b/app/Language/ro/Bootstrap_tables.php
index 464368737..f5d5041ed 100644
--- a/app/Language/ro/Bootstrap_tables.php
+++ b/app/Language/ro/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Toate",
-    "columns"              => "Coloane",
-    "hide_show_pagination" => "Ascunde/Arată paginare",
-    "loading"              => "Se încarcă, vă rugăm așteptați...",
-    "page_from_to"         => "Arată {0} până la {1} din {2} rânduri",
-    "refresh"              => "Reîmprospătare",
-    "rows_per_page"        => "{0} rânduri per pagină",
-    "toggle"               => "Comută",
+    'all' => "Toate",
+    'columns' => "Coloane",
+    'hide_show_pagination' => "Ascunde/Arată paginare",
+    'loading' => "Se încarcă, vă rugăm așteptați",
+    'page_from_to' => "Arată {0} până la {1} din {2} rânduri",
+    'refresh' => "Reîmprospătare",
+    'rows_per_page' => "{0} rânduri per pagină",
+    'toggle' => "Comută",
 ];
diff --git a/app/Language/ro/Config.php b/app/Language/ro/Config.php
index e8d13c8cf..c6cd733d0 100644
--- a/app/Language/ro/Config.php
+++ b/app/Language/ro/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Adresa companiei",
-    "address_required"                          => "Adresa companiei este un câmp obligatoriu.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Permiteți coduri de bare duplicate",
-    "apostrophe"                                => "apostrof",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Rezervă de date",
-    "barcode"                                   => "Barcode",
-    "barcode_company"                           => "Numele Companiei",
-    "barcode_configuration"                     => "Configurarea codului de bare",
-    "barcode_content"                           => "Conținutul codului de bare",
-    "barcode_first_row"                         => "Rândul 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Formate de intrare",
-    "barcode_generate_if_empty"                 => "Generați dacă este gol.",
-    "barcode_height"                            => "Înălțime (px)",
-    "barcode_id"                                => "Element Id / Nume",
-    "barcode_info"                              => "Informații privind configurația codurilor de bare",
-    "barcode_layout"                            => "Formatul de coduri de bare",
-    "barcode_name"                              => "Nume",
-    "barcode_number"                            => "Cod de bare",
-    "barcode_number_in_row"                     => "Numar în rânduri",
-    "barcode_page_cellspacing"                  => "Afișați spațiul celular în pagină.",
-    "barcode_page_width"                        => "Afișați lățimea paginii",
-    "barcode_price"                             => "Preț",
-    "barcode_second_row"                        => "Rândul 2",
-    "barcode_third_row"                         => "Rândul 3",
-    "barcode_tooltip"                           => "Avertisment: această caracteristică poate determina importul sau crearea elementelor duplicate. Nu utilizați dacă nu doriți coduri de bare duplicat.",
-    "barcode_type"                              => "Tipul codului de bare",
-    "barcode_width"                             => "Lățime (px)",
-    "bottom"                                    => "Subsol",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Decimale de numerar",
-    "cash_decimals_tooltip"                     => "Dacă decimalele în numerar și decimalele monetare sunt aceleași, atunci nu va avea loc nicio rotunjire a numerarului.",
-    "cash_rounding"                             => "Rotunjire numerar",
-    "category_dropdown"                         => "",
-    "center"                                    => "Centru",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "virgula",
-    "company"                                   => "Numele Companiei",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Schimbați imaginea",
-    "company_logo"                              => "Sigla companiei",
-    "company_remove_image"                      => "Eliminați imaginea",
-    "company_required"                          => "Numele companiei este obligatoriu",
-    "company_select_image"                      => "Selectati imaginea",
-    "company_website_url"                       => "Site-ul Web al companie nu este un URL valid (http://...).",
-    "country_codes"                             => "Cod tara",
-    "country_codes_tooltip"                     => "Lista separata prin virgula a codurilor tarilor pentru cautarea adresei.",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "Zecimale Valuta",
-    "currency_symbol"                           => "Simbol Valuta",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Recompensa",
-    "customer_reward_duplicate"                 => "Recompensa trebuie sa fie unica",
-    "customer_reward_enable"                    => "Activatie Recompensare Client",
-    "customer_reward_invalid_chars"             => "Recompensa nu poate contine '_'",
-    "customer_reward_required"                  => "Recompensa este un camp obligatoriu",
-    "customer_sales_tax_support"                => "Suport Clienti privind Taxele pe Vanzari",
-    "date_or_time_format"                       => "Filtru Data si Timp",
-    "datetimeformat"                            => "Format Data si Timp",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => 'Adresa companiei',
+    'address_required'                          => 'Adresa companiei este un câmp obligatoriu.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Permiteți coduri de bare duplicate',
+    'apostrophe'                                => 'apostrof',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Rezervă de date',
+    'barcode'                                   => 'Barcode',
+    'barcode_company'                           => 'Numele Companiei',
+    'barcode_configuration'                     => 'Configurarea codului de bare',
+    'barcode_content'                           => 'Conținutul codului de bare',
+    'barcode_first_row'                         => 'Rândul 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Formate de intrare',
+    'barcode_generate_if_empty'                 => 'Generați dacă este gol.',
+    'barcode_height'                            => 'Înălțime (px)',
+    'barcode_id'                                => 'Element Id / Nume',
+    'barcode_info'                              => 'Informații privind configurația codurilor de bare',
+    'barcode_layout'                            => 'Formatul de coduri de bare',
+    'barcode_name'                              => 'Nume',
+    'barcode_number'                            => 'Cod de bare',
+    'barcode_number_in_row'                     => 'Numar în rânduri',
+    'barcode_page_cellspacing'                  => 'Afișați spațiul celular în pagină.',
+    'barcode_page_width'                        => 'Afișați lățimea paginii',
+    'barcode_price'                             => 'Preț',
+    'barcode_second_row'                        => 'Rândul 2',
+    'barcode_third_row'                         => 'Rândul 3',
+    'barcode_tooltip'                           => 'Avertisment: această caracteristică poate determina importul sau crearea elementelor duplicate. Nu utilizați dacă nu doriți coduri de bare duplicat.',
+    'barcode_type'                              => 'Tipul codului de bare',
+    'barcode_width'                             => 'Lățime (px)',
+    'bottom'                                    => 'Subsol',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Decimale de numerar',
+    'cash_decimals_tooltip'                     => 'Dacă decimalele în numerar și decimalele monetare sunt aceleași, atunci nu va avea loc nicio rotunjire a numerarului.',
+    'cash_rounding'                             => 'Rotunjire numerar',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Centru',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'virgula',
+    'company'                                   => 'Numele Companiei',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Schimbați imaginea',
+    'company_logo'                              => 'Sigla companiei',
+    'company_remove_image'                      => 'Eliminați imaginea',
+    'company_required'                          => 'Numele companiei este obligatoriu',
+    'company_select_image'                      => 'Selectati imaginea',
+    'company_website_url'                       => 'Site-ul Web al companie nu este un URL valid (http://...).',
+    'country_codes'                             => 'Cod tara',
+    'country_codes_tooltip'                     => 'Lista separata prin virgula a codurilor tarilor pentru cautarea adresei.',
+    'currency_code'                             => '',
+    'currency_decimals'                         => 'Zecimale Valuta',
+    'currency_symbol'                           => 'Simbol Valuta',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Recompensa',
+    'customer_reward_duplicate'                 => 'Recompensa trebuie sa fie unica',
+    'customer_reward_enable'                    => 'Activatie Recompensare Client',
+    'customer_reward_invalid_chars'             => "Recompensa nu poate contine '_'",
+    'customer_reward_required'                  => 'Recompensa este un camp obligatoriu',
+    'customer_sales_tax_support'                => 'Suport Clienti privind Taxele pe Vanzari',
+    'date_or_time_format'                       => 'Filtru Data si Timp',
+    'datetimeformat'                            => 'Format Data si Timp',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'Cod de referință plată<br>Limite de lungime',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'Cale sendmail invalidă. Sunt permise doar litere, cifre, liniuțe, liniuțe de subliniere, bare oblice, bare oblice inverse, două puncte, spații și puncte.',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/ro/Employees.php b/app/Language/ro/Employees.php
index 34a418062..30963dc16 100644
--- a/app/Language/ro/Employees.php
+++ b/app/Language/ro/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'Nu vă puteți elimina propriile permisiuni minime pentru module.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'Modificările permisiunilor sunt dezactivate în această demo.',
+    'error_password_change_disallowed'       => 'Modificările parolei sunt dezactivate în această demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/ro/Error.php b/app/Language/ro/Error.php
index b81903d5a..d1b54166b 100644
--- a/app/Language/ro/Error.php
+++ b/app/Language/ro/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Nu aveti permisiunea de acces a modulului numit",
-    "unknown"              => "Eroare neasteptata",
+    'no_permission_module'           => 'Nu aveti permisiunea de acces a modulului numit',
+    'unable_to_create_env_file'      => 'Nu s-a putut crea {filePath} pentru a aproviziona throttle.key',
+    'unable_to_lock_file'            => 'Nu s-a putut bloca {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Nu s-a putut deschide {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Nu s-a putut persista throttle.key in {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Nu s-a putut citi {filePath} pentru a aproviziona throttle.key',
+    'unknown'                        => 'Eroare neasteptata',
 ];
diff --git a/app/Language/ro/Items.php b/app/Language/ro/Items.php
index ec03d6e5a..6fec958f3 100644
--- a/app/Language/ro/Items.php
+++ b/app/Language/ro/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "Categorii - selectare numar produs.",
-    "category"                           => "Categorie",
-    "category_new"                       => "Categorie noua",
-    "category_required"                  => "Campul Categorie este obligatoriu.",
-    "change_all_to_allow_alt_desc"       => "Permite descriere alternativa pentru tot.",
-    "change_all_to_not_allow_allow_desc" => "Nu permite descriere alternativa pentru tot.",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "Schimbare imagine",
-    "confirm_bulk_edit"                  => "Sigur doriti editarea produsului/produselor selectate?",
-    "confirm_bulk_edit_wipe_taxes"       => "Toate informatiile cu privire la taxe, vor fi inlocuite.",
-    "confirm_delete"                     => "Sigur doriti stergerea produselor selectate?",
-    "confirm_restore"                    => "Sigur doriti restaurarea produselor selectate?",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => 'Categorii - selectare numar produs.',
+    'category'                           => 'Categorie',
+    'category_new'                       => 'Categorie noua',
+    'category_required'                  => 'Campul Categorie este obligatoriu.',
+    'change_all_to_allow_alt_desc'       => 'Permite descriere alternativa pentru tot.',
+    'change_all_to_not_allow_allow_desc' => 'Nu permite descriere alternativa pentru tot.',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => 'Schimbare imagine',
+    'confirm_bulk_edit'                  => 'Sigur doriti editarea produsului/produselor selectate?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Toate informatiile cu privire la taxe, vor fi inlocuite.',
+    'confirm_delete'                     => 'Sigur doriti stergerea produselor selectate?',
+    'confirm_restore'                    => 'Sigur doriti restaurarea produselor selectate?',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => 'Numărul articolului conține caractere nepermise.',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'Numele taxei conține caractere nepermise.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/ro/Login.php b/app/Language/ro/Login.php
index d443ab5b5..c33f2a276 100644
--- a/app/Language/ro/Login.php
+++ b/app/Language/ro/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "",
-    "login"                         => "",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "",
-    "required_username"             => "",
-    "username"                      => "",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "",
+    "login"                               => "",
+    "logout"                              => "",
+    "migrating_database"                  => "Migrare bază de date",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Baza de date a fost migrată cu succes!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Prea multe încercări. Vă rugăm așteptați un moment și încercați din nou.',
+    "username"                            => "",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/ro/Reports.php b/app/Language/ro/Reports.php
index 93316dfd2..15ff6bed9 100644
--- a/app/Language/ro/Reports.php
+++ b/app/Language/ro/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/ro/Sales.php b/app/Language/ro/Sales.php
index 815b1176d..fb65da5b9 100644
--- a/app/Language/ro/Sales.php
+++ b/app/Language/ro/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Puncte disponibile",
-    "rewards_package"                  => "Recompense",
-    "rewards_remaining_balance"        => "Valoarea ramasa a punctelor de fidelizare este ",
-    "account_number"                   => "Cont #",
-    "add_payment"                      => "Adauga Plata",
-    "amount_due"                       => "Suma datorata",
-    "amount_tendered"                  => "Suma Oferita",
-    "authorized_signature"             => "Semnatura Autorizata",
-    "cancel_sale"                      => "Anuleaza",
-    "cash"                             => "Numerar",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "Depozit Numerar",
-    "cash_filter"                      => "Numerar",
-    "change_due"                       => "Rest datorat",
-    "change_price"                     => "",
-    "check"                            => "Bon/cec",
-    "check_balance"                    => "Verificati restul",
-    "check_filter"                     => "Bon/cec",
-    "close"                            => "",
-    "comment"                          => "Comentariu",
-    "comments"                         => "Comentarii",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Finalizare",
-    "confirm_cancel_sale"              => "Sigur vreti sa eliminati aceasta vanzare? Toate articolele vor fi sterse.",
-    "confirm_delete"                   => "Sigur doriti stergerea Vanzarii/Vanzarilor selectate?",
-    "confirm_restore"                  => "Sigur doriti restabilirea Vanzarii/Vanzarilor selectate?",
-    "credit"                           => "Card Credit",
-    "credit_deposit"                   => "Depozit Credit",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Nume",
-    "customer_address"                 => "Adresa",
-    "customer_discount"                => "Reducere",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Amplasare",
-    "customer_mailchimp_status"        => "Situatie Mailchimp",
-    "customer_optional"                => "(Optional)",
-    "customer_required"                => "(Necesar)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Data Vanzare",
-    "date_range"                       => "Perioada",
-    "date_required"                    => "Trebuie introdusa o data corecta.",
-    "date_type"                        => "Data este un camp obligatoriu.",
-    "debit"                            => "Card Debit",
-    "debit_filter"                     => "",
-    "delete"                           => "Permite Stergerea",
-    "delete_confirmation"              => "Sigur doriti stergerea acestei vanzari? Nu puteti reveni anterior dupa aceasta actiune.",
-    "delete_entire_sale"               => "Sterge Toata Vanzarea",
-    "delete_successful"                => "Stergere vanzare reusita.",
-    "delete_unsuccessful"              => "Stergere vanzare nereusita.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Renunta",
-    "discard_quote"                    => "",
-    "discount"                         => "Reducere",
-    "discount_included"                => "% Reducere",
-    "discount_short"                   => "%",
-    "due"                              => "Datorat",
-    "due_filter"                       => "De plata",
-    "edit"                             => "Editare",
-    "edit_item"                        => "Editare Articol",
-    "edit_sale"                        => "Editare Vanzare",
-    "email_receipt"                    => "Transmite Chitanta pe email",
-    "employee"                         => "Salariat",
-    "entry"                            => "Intrare",
-    "error_editing_item"               => "Eroare editare articol",
-    "find_or_scan_item"                => "Gaseste sau scaneaza Articol",
-    "find_or_scan_item_or_receipt"     => "Gaseste sau scaneaza Articol sau Chitanta",
-    "giftcard"                         => "Card Cadou",
-    "giftcard_balance"                 => "Sold Card Cadou",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Numar Card Cadou",
-    "group_by_category"                => "Grupare dupa Categorie",
-    "group_by_type"                    => "Grupare dupa Tip",
-    "hsn"                              => "HSN",
-    "id"                               => "ID Vanzare",
-    "include_prices"                   => "Include Preturi?",
-    "invoice"                          => "Factura",
-    "invoice_confirm"                  => "Aceasta factura va fi trimisa catre",
-    "invoice_enable"                   => "Creare Factura",
-    "invoice_filter"                   => "Facturi",
-    "invoice_no_email"                 => "Adresa de email a acestui client nu este valida.",
-    "invoice_number"                   => "Factura #",
-    "invoice_number_duplicate"         => "Numar Factura trebuie sa fie unic.",
-    "invoice_sent"                     => "Factura trimisa catre",
-    "invoice_total"                    => "Total Factura",
-    "invoice_type_custom_invoice"      => "Factura Personalizata (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Factura Fiscala Personalizata (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Factura (invoice.php)",
-    "invoice_type_tax_invoice"         => "Factura Fiscala (tax_invoice.php)",
-    "invoice_unsent"                   => "Factura nu a putut fi trimisă catre",
-    "invoice_update"                   => "Renumara",
-    "item_insufficient_of_stock"       => "Articol cu fara stoc suficient.",
-    "item_name"                        => "Nume Articol",
-    "item_number"                      => "Articol #",
-    "item_out_of_stock"                => "Articolul nu este in stoc.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Mod inregistrare",
-    "must_enter_numeric"               => "Valoare ofertata trebuie sa fie numerica.",
-    "must_enter_numeric_giftcard"      => "Numar Card Cadou trebuie sa fie numeric.",
-    "new_customer"                     => "Client nou",
-    "new_item"                         => "Articol nou",
-    "no_description"                   => "Fara descriere",
-    "no_filter"                        => "Toate",
-    "no_items_in_cart"                 => "Nu sunt articole in cosul de cumparaturi.",
-    "no_sales_to_display"              => "Nu sunt Vanzari de afisat.",
-    "none_selected"                    => "Nu ati selecta nicio Vanzare de sters.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "Aceasta actiune nu este autorizata.",
-    "one_or_multiple"                  => "Vanzare(i)",
-    "payment"                          => "Tip Plata",
-    "payment_amount"                   => "Valoare",
-    "payment_not_cover_total"          => "Valoarea de Plata trebuie sa fie mai mare sau egala decat Totalul.",
-    "payment_type"                     => "Tip",
-    "payments"                         => "",
-    "payments_total"                   => "Total Plati",
-    "price"                            => "Pret",
-    "print_after_sale"                 => "Tipareste dupa Vanzare",
-    "quantity"                         => "Cantitate",
-    "quantity_less_than_reorder_level" => "Avertisment: Cantitatea dorita este sub nivelul de resuplinire a acestui Articol.",
-    "quantity_less_than_zero"          => "Avertisment: Cantitatea dorita este insuficienta. Vanzarea poate continua, dar verificati-va stocul.",
-    "quantity_of_items"                => "Cantitatea a {0} Articole",
-    "quote"                            => "Cotatie",
-    "quote_number"                     => "Numar Cotatie",
-    "quote_number_duplicate"           => "Numar Cotatie trebuie sa fie unic.",
-    "quote_sent"                       => "Cotatie trimisa catre",
-    "quote_unsent"                     => "Timitere cotatie nereusita catre",
-    "receipt"                          => "Chitanta Vanzari",
-    "receipt_no_email"                 => "Acest client nu are adresa de email valida.",
-    "receipt_number"                   => "Vanzare #",
-    "receipt_sent"                     => "Chitanta trimisa catre",
-    "receipt_unsent"                   => "Trimitere chitanta nereusita catre",
-    "refund"                           => "",
-    "register"                         => "Registru Vanzari",
-    "remove_customer"                  => "Eliminati Clientul",
-    "remove_discount"                  => "",
-    "return"                           => "Inapoiere",
-    "rewards"                          => "Puncte fidelizare",
-    "rewards_balance"                  => "Sold Puncte fidelizare",
-    "sale"                             => "Vanzare",
-    "sale_by_invoice"                  => "Vanzare cu Factura",
-    "sale_for_customer"                => "Client:",
-    "sale_time"                        => "Timp",
-    "sales_tax"                        => "Taxa",
-    "sales_total"                      => "",
-    "select_customer"                  => "Selectare Client",
-    "send_invoice"                     => "Trimite Factura",
-    "send_quote"                       => "Trimite Cotatie",
-    "send_receipt"                     => "Trimite Chitanta",
-    "send_work_order"                  => "Trimite Comanda de Lucru",
-    "serial"                           => "Serie",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Arata Factura",
-    "show_receipt"                     => "Arata Chitanta",
-    "start_typing_customer_name"       => "Incepeti sa tastati detaliile clientului ...",
-    "start_typing_item_name"           => "Incepeti tastarea Nume Articol sau scanati Cod de bare ...",
-    "stock"                            => "Stoc",
-    "stock_location"                   => "Locatie Stoc",
-    "sub_total"                        => "Subtotal",
-    "successfully_deleted"             => "Ati reusit stergerea",
-    "successfully_restored"            => "Ati reusit restaurarea",
-    "successfully_suspended_sale"      => "Suspendare vanzare reusita.",
-    "successfully_updated"             => "Actualizare vanzare reusita.",
-    "suspend_sale"                     => "Suspendare",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspendata",
-    "table"                            => "Masa",
-    "takings"                          => "Vanzari Zilnice",
-    "tax"                              => "Taxa",
-    "tax_id"                           => "Id Taxa",
-    "tax_invoice"                      => "Factura Fiscala",
-    "tax_percent"                      => "Taxa %",
-    "taxed_ind"                        => "",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Fara taxe",
-    "transaction_failed"               => "Tranzactie nereusita.",
-    "unable_to_add_item"               => "Adaugare articol la Vanzare nereusita",
-    "unsuccessfully_deleted"           => "Stergere Vanzare(i) nereusita.",
-    "unsuccessfully_restored"          => "Restaurare Vanzare(i) nereusita.",
-    "unsuccessfully_suspended_sale"    => "Suspendare Vanzare nereusita.",
-    "unsuccessfully_updated"           => "Actualizare Vanzare nereusita.",
-    "unsuspend"                        => "Nesuspendata",
-    "unsuspend_and_delete"             => "Actiune",
-    "update"                           => "Actualizare",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => 'Cont #',
+    'add_payment'                       => 'Adauga Plata',
+    'amount_due'                        => 'Suma datorata',
+    'amount_due_not_covered'            => 'Plățile nu acoperă suma datorată.',
+    'amount_tendered'                   => 'Suma Oferita',
+    'authorized_signature'              => 'Semnatura Autorizata',
+    'cancel_sale'                       => 'Anuleaza',
+    'cash'                              => 'Numerar',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => 'Depozit Numerar',
+    'cash_filter'                       => 'Numerar',
+    'change_due'                        => 'Rest datorat',
+    'change_price'                      => '',
+    'check'                             => 'Bon/cec',
+    'check_balance'                     => 'Verificati restul',
+    'check_filter'                      => 'Bon/cec',
+    'close'                             => '',
+    'comment'                           => 'Comentariu',
+    'comments'                          => 'Comentarii',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Finalizare',
+    'confirm_cancel_sale'               => 'Sigur vreti sa eliminati aceasta vanzare? Toate articolele vor fi sterse.',
+    'confirm_delete'                    => 'Sigur doriti stergerea Vanzarii/Vanzarilor selectate?',
+    'confirm_restore'                   => 'Sigur doriti restabilirea Vanzarii/Vanzarilor selectate?',
+    'credit'                            => 'Card Credit',
+    'credit_deposit'                    => 'Depozit Credit',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Nume',
+    'customer_address'                  => 'Adresa',
+    'customer_discount'                 => 'Reducere',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Amplasare',
+    'customer_mailchimp_status'         => 'Situatie Mailchimp',
+    'customer_optional'                 => '(Optional)',
+    'customer_required'                 => '(Necesar)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Puncte disponibile',
+    'daily_sales'                       => '',
+    'date'                              => 'Data Vanzare',
+    'date_range'                        => 'Perioada',
+    'date_required'                     => 'Trebuie introdusa o data corecta.',
+    'date_type'                         => 'Data este un camp obligatoriu.',
+    'debit'                             => 'Card Debit',
+    'debit_filter'                      => '',
+    'delete'                            => 'Permite Stergerea',
+    'delete_confirmation'               => 'Sigur doriti stergerea acestei vanzari? Nu puteti reveni anterior dupa aceasta actiune.',
+    'delete_entire_sale'                => 'Sterge Toata Vanzarea',
+    'delete_successful'                 => 'Stergere vanzare reusita.',
+    'delete_unsuccessful'               => 'Stergere vanzare nereusita.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Renunta',
+    'discard_quote'                     => '',
+    'discount'                          => 'Reducere',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Reducere',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Datorat',
+    'due_filter'                        => 'De plata',
+    'edit'                              => 'Editare',
+    'edit_item'                         => 'Editare Articol',
+    'edit_sale'                         => 'Editare Vanzare',
+    'email_receipt'                     => 'Transmite Chitanta pe email',
+    'employee'                          => 'Salariat',
+    'entry'                             => 'Intrare',
+    'error_editing_item'                => 'Eroare editare articol',
+    'find_or_scan_item'                 => 'Gaseste sau scaneaza Articol',
+    'find_or_scan_item_or_receipt'      => 'Gaseste sau scaneaza Articol sau Chitanta',
+    'giftcard'                          => 'Card Cadou',
+    'giftcard_balance'                  => 'Sold Card Cadou',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Numar Card Cadou',
+    'group_by_category'                 => 'Grupare dupa Categorie',
+    'group_by_type'                     => 'Grupare dupa Tip',
+    'hsn'                               => 'HSN',
+    'id'                                => 'ID Vanzare',
+    'include_prices'                    => 'Include Preturi?',
+    'insufficient_giftcard_balance'     => 'Soldul cardului de cadou insuficient pentru această plată.',
+    'insufficient_reward_points'        => 'Puncte de recompensă insuficiente pentru această plată.',
+    'invoice'                           => 'Factura',
+    'invoice_confirm'                   => 'Aceasta factura va fi trimisa catre',
+    'invoice_enable'                    => 'Creare Factura',
+    'invoice_filter'                    => 'Facturi',
+    'invoice_no_email'                  => 'Adresa de email a acestui client nu este valida.',
+    'invoice_number'                    => 'Factura #',
+    'invoice_number_duplicate'          => 'Numar Factura trebuie sa fie unic.',
+    'invoice_sent'                      => 'Factura trimisa catre',
+    'invoice_total'                     => 'Total Factura',
+    'invoice_type_custom_invoice'       => 'Factura Personalizata (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Factura Fiscala Personalizata (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Factura (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Factura Fiscala (tax_invoice.php)',
+    'invoice_unsent'                    => 'Factura nu a putut fi trimisă catre',
+    'invoice_update'                    => 'Renumara',
+    'item_insufficient_of_stock'        => 'Articol cu fara stoc suficient.',
+    'item_name'                         => 'Nume Articol',
+    'item_number'                       => 'Articol #',
+    'item_out_of_stock'                 => 'Articolul nu este in stoc.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Mod inregistrare',
+    'must_enter_numeric'                => 'Valoare ofertata trebuie sa fie numerica.',
+    'must_enter_numeric_giftcard'       => 'Numar Card Cadou trebuie sa fie numeric.',
+    'must_enter_reference_code'         => 'Numărul de referință/recuperare trebuie introdus.',
+    'negative_amount_tendered'          => 'Suma oferită nu poate fi negativă.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Client nou',
+    'new_item'                          => 'Articol nou',
+    'no_description'                    => 'Fara descriere',
+    'no_filter'                         => 'Toate',
+    'no_items_in_cart'                  => 'Nu sunt articole in cosul de cumparaturi.',
+    'no_sales_to_display'               => 'Nu sunt Vanzari de afisat.',
+    'none_selected'                     => 'Nu ati selecta nicio Vanzare de sters.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'Aceasta actiune nu este autorizata.',
+    'one_or_multiple'                   => 'Vanzare(i)',
+    'payment'                           => 'Tip Plata',
+    'payment_amount'                    => 'Valoare',
+    'payment_not_cover_total'           => 'Valoarea de Plata trebuie sa fie mai mare sau egala decat Totalul.',
+    'payment_type'                      => 'Tip',
+    'payments'                          => '',
+    'payments_total'                    => 'Total Plati',
+    'price'                             => 'Pret',
+    'print_after_sale'                  => 'Tipareste dupa Vanzare',
+    'quantity'                          => 'Cantitate',
+    'quantity_less_than_reorder_level'  => 'Avertisment: Cantitatea dorita este sub nivelul de resuplinire a acestui Articol.',
+    'quantity_less_than_zero'           => 'Avertisment: Cantitatea dorita este insuficienta. Vanzarea poate continua, dar verificati-va stocul.',
+    'quantity_of_items'                 => 'Cantitatea a {0} Articole',
+    'quote'                             => 'Cotatie',
+    'quote_number'                      => 'Numar Cotatie',
+    'quote_number_duplicate'            => 'Numar Cotatie trebuie sa fie unic.',
+    'quote_sent'                        => 'Cotatie trimisa catre',
+    'quote_unsent'                      => 'Timitere cotatie nereusita catre',
+    'receipt'                           => 'Chitanta Vanzari',
+    'receipt_no_email'                  => 'Acest client nu are adresa de email valida.',
+    'receipt_number'                    => 'Vanzare #',
+    'receipt_sent'                      => 'Chitanta trimisa catre',
+    'receipt_unsent'                    => 'Trimitere chitanta nereusita catre',
+    'reference_code'                    => 'Cod de referință plată',
+    'reference_code_invalid_characters' => 'Codul de referință trebuie să conțină doar litere și cifre.',
+    'reference_code_length_error'       => 'Lungimea codului de referință este invalidă.',
+    'refund'                            => '',
+    'register'                          => 'Registru Vanzari',
+    'remove_customer'                   => 'Eliminati Clientul',
+    'remove_discount'                   => '',
+    'return'                            => 'Inapoiere',
+    'rewards'                           => 'Puncte fidelizare',
+    'rewards_balance'                   => 'Sold Puncte fidelizare',
+    'rewards_package'                   => 'Recompense',
+    'rewards_remaining_balance'         => 'Valoarea ramasa a punctelor de fidelizare este ',
+    'sale'                              => 'Vanzare',
+    'sale_by_invoice'                   => 'Vanzare cu Factura',
+    'sale_for_customer'                 => 'Client:',
+    'sale_time'                         => 'Timp',
+    'sales_tax'                         => 'Taxa',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Selectare Client',
+    'send_invoice'                      => 'Trimite Factura',
+    'send_quote'                        => 'Trimite Cotatie',
+    'send_receipt'                      => 'Trimite Chitanta',
+    'send_work_order'                   => 'Trimite Comanda de Lucru',
+    'serial'                            => 'Serie',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Arata Factura',
+    'show_receipt'                      => 'Arata Chitanta',
+    'start_typing_customer_name'        => 'Incepeti sa tastati detaliile clientului ...',
+    'start_typing_item_name'            => 'Incepeti tastarea Nume Articol sau scanati Cod de bare ...',
+    'stock'                             => 'Stoc',
+    'stock_location'                    => 'Locatie Stoc',
+    'sub_total'                         => 'Subtotal',
+    'successfully_deleted'              => 'Ati reusit stergerea',
+    'successfully_restored'             => 'Ati reusit restaurarea',
+    'successfully_suspended_sale'       => 'Suspendare vanzare reusita.',
+    'successfully_updated'              => 'Actualizare vanzare reusita.',
+    'suspend_sale'                      => 'Suspendare',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspendata',
+    'table'                             => 'Masa',
+    'takings'                           => 'Vanzari Zilnice',
+    'tax'                               => 'Taxa',
+    'tax_id'                            => 'Id Taxa',
+    'tax_invoice'                       => 'Factura Fiscala',
+    'tax_percent'                       => 'Taxa %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Fara taxe',
+    'transaction_failed'                => 'Tranzactie nereusita.',
+    'unable_to_add_item'                => 'Adaugare articol la Vanzare nereusita',
+    'unsuccessfully_deleted'            => 'Stergere Vanzare(i) nereusita.',
+    'unsuccessfully_restored'           => 'Restaurare Vanzare(i) nereusita.',
+    'unsuccessfully_suspended_sale'     => 'Suspendare Vanzare nereusita.',
+    'unsuccessfully_updated'            => 'Actualizare Vanzare nereusita.',
+    'unsuspend'                         => 'Nesuspendata',
+    'unsuspend_and_delete'              => 'Actiune',
+    'update'                            => 'Actualizare',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/ru/Attributes.php b/app/Language/ru/Attributes.php
index 896fd9053..f77199be3 100644
--- a/app/Language/ru/Attributes.php
+++ b/app/Language/ru/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Значение атрибута не может содержать ':' или '|'",
-    "confirm_delete"                   => "Вы уверены, что хотите удалить выбранные атрибут(ы)?",
-    "confirm_restore"                  => "Вы уверены, что хотите восстановить выбранные атрибут(ы)?",
-    "definition_cannot_be_deleted"     => "Не удалось удалить выбранные атрибут(ы)",
-    "definition_error_adding_updating" => "Атрибут {0} не может быть добавлен или обновлен. Пожалуйста, проверьте журнал ошибок.",
-    "definition_flags"                 => "Видимость атрибута",
-    "definition_group"                 => "Группа",
-    "definition_id"                    => "№",
-    "definition_name"                  => "Добавить атрибут",
-    "definition_name_required"         => "Название атрибута - обязательное поле",
-    "definition_one_or_multiple"       => "атрибут(ы)",
-    "definition_successful_adding"     => "Вы успешно добавили товар",
-    "definition_successful_deleted"    => "Успешно удалено",
-    "definition_successful_updating"   => "Обновлено успешно",
-    "definition_type"                  => "Тип атрибута",
-    "definition_type_required"         => "Название атрибута - обязательное поле",
-    "definition_unit"                  => "Единица измерения",
-    "definition_values"                => "Значения атрибута",
-    "new"                              => "Новый атрибут",
-    "no_attributes_to_display"         => "Нет товаров для отображения",
-    "receipt_visibility"               => "Чек",
-    "show_in_items"                    => "Показать в товарах",
-    "show_in_items_visibility"         => "Товары",
-    "show_in_receipt"                  => "Показать в квитанции",
-    "show_in_receivings"               => "Показать в закупках",
-    "show_in_receivings_visibility"    => "Закупки",
-    "show_in_sales"                    => "Показать в продажах",
-    "show_in_sales_visibility"         => "Продажи",
-    "update"                           => "Обновить атрибут",
+    'attribute_value_invalid_chars'    => 'Значение атрибута не может содержать \':\' или \'|\'',
+    'confirm_delete'                   => 'Вы уверены, что хотите удалить выбранные атрибут(ы)?',
+    'confirm_restore'                  => 'Вы уверены, что хотите восстановить выбранные атрибут(ы)?',
+    'definition_cannot_be_deleted'     => 'Не удалось удалить выбранные атрибут(ы)',
+    'definition_invalid_group' => 'Выбранная группа не существует или недействительна.',
+    'definition_error_adding_updating' => 'Атрибут {0} не может быть добавлен или обновлен. Пожалуйста, проверьте журнал ошибок.',
+    'definition_flags'                 => 'Видимость атрибута',
+    'definition_group'                 => 'Группа',
+    'definition_id'                    => '№',
+    'definition_name'                  => 'Добавить атрибут',
+    'definition_name_required'         => 'Название атрибута - обязательное поле',
+    'definition_one_or_multiple'       => 'атрибут(ы)',
+    'definition_successful_adding'     => 'Вы успешно добавили товар',
+    'definition_successful_deleted'    => 'Успешно удалено',
+    'definition_successful_updating'   => 'Обновлено успешно',
+    'definition_type'                  => 'Тип атрибута',
+    'definition_type_required'         => 'Название атрибута - обязательное поле',
+    'definition_unit'                  => 'Единица измерения',
+    'definition_values'                => 'Значения атрибута',
+    'new'                              => 'Новый атрибут',
+    'no_attributes_to_display'         => 'Нет товаров для отображения',
+    'receipt_visibility'               => 'Чек',
+    'show_in_items'                    => 'Показать в товарах',
+    'show_in_items_visibility'         => 'Товары',
+    'show_in_receipt'                  => 'Показать в квитанции',
+    'show_in_receivings'               => 'Показать в закупках',
+    'show_in_receivings_visibility'    => 'Закупки',
+    'show_in_sales'                    => 'Показать в продажах',
+    'show_in_sales_visibility'         => 'Продажи',
+    'show_in_search'                   => 'Показать в поиске',
+    'show_in_search_visibility'        => 'Поиск',
+    'update'                           => 'Обновить атрибут',
 ];
diff --git a/app/Language/ru/Bootstrap_tables.php b/app/Language/ru/Bootstrap_tables.php
index 95df0c46a..8a988997f 100644
--- a/app/Language/ru/Bootstrap_tables.php
+++ b/app/Language/ru/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "все",
-    "columns"              => "Колонки",
-    "hide_show_pagination" => "Скрыть/Показать нумерацию страниц",
-    "loading"              => "Пожалуйста, подождите, идёт загрузка...",
-    "page_from_to"         => "Показать с {0} по {1} из {2} записей",
-    "refresh"              => "Обновить",
-    "rows_per_page"        => "{0} записей на страницу",
-    "toggle"               => "Переключить",
+    'all' => "все",
+    'columns' => "Колонки",
+    'hide_show_pagination' => "Скрыть/Показать нумерацию страниц",
+    'loading' => "Пожалуйста, подождит, идёт загрузка",
+    'page_from_to' => "Показать с {0} по {1} из {2} записей",
+    'refresh' => "Обновить",
+    'rows_per_page' => "{0} записей на страницу",
+    'toggle' => "Переключить",
 ];
diff --git a/app/Language/ru/Config.php b/app/Language/ru/Config.php
index cf1d7000c..6a772bb41 100644
--- a/app/Language/ru/Config.php
+++ b/app/Language/ru/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Адрес компании",
-    "address_required"                          => "Адрес компании - обязательное поле для заполнения.",
-    "all_set"                                   => "Все права доступа к файлам установлены правильно!",
-    "allow_duplicate_barcodes"                  => "Разрешить дубликаты штрих-кодов",
-    "apostrophe"                                => "апостроф",
-    "backup_button"                             => "Резервная копия",
-    "backup_database"                           => "Резервная копия базы данных",
-    "barcode"                                   => "Штрих-код",
-    "barcode_company"                           => "Название компании",
-    "barcode_configuration"                     => "Параметры штрих-кода",
-    "barcode_content"                           => "Содержание штрих-кода",
-    "barcode_first_row"                         => "Строка 1",
-    "barcode_font"                              => "Шрифт",
-    "barcode_formats"                           => "Формат ввода",
-    "barcode_generate_if_empty"                 => "Сгенерировать новый, если пусто.",
-    "barcode_height"                            => "Высота (пикс.)",
-    "barcode_id"                                => "№ товара/Название",
-    "barcode_info"                              => "Информация о параметрах штрих-кода",
-    "barcode_layout"                            => "Макет штрих-кода",
-    "barcode_name"                              => "Название",
-    "barcode_number"                            => "Штрих-код",
-    "barcode_number_in_row"                     => "Номер в строке",
-    "barcode_page_cellspacing"                  => "Расстояние между ячейками.",
-    "barcode_page_width"                        => "Ширина страницы",
-    "barcode_price"                             => "Цена",
-    "barcode_second_row"                        => "Строка 2",
-    "barcode_third_row"                         => "Строка 3",
-    "barcode_tooltip"                           => "Предупреждение: Эта функция может привести к тому, что будут созданы или импортированы дублирующиеся товары. Не используйте, если вы не хотите дублировать штрих-коды.",
-    "barcode_type"                              => "Тип штрих-кода",
-    "barcode_width"                             => "Ширина (пикс.)",
-    "bottom"                                    => "Конец",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Цены - десятичные дроби",
-    "cash_decimals_tooltip"                     => "Если десятичные дроби для цен и валюты совпадают, то это не будет выполняться, если для цен не установлено округление до пяти.",
-    "cash_rounding"                             => "Округление цен",
-    "category_dropdown"                         => "Показывать категории всплывающим списом",
-    "center"                                    => "Центр",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "Запятая",
-    "company"                                   => "Название компании",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Сменить изображение",
-    "company_logo"                              => "Логотип компании",
-    "company_remove_image"                      => "Удалить изображение",
-    "company_required"                          => "Название компании - обязательное поле для заполнения",
-    "company_select_image"                      => "Выбрать изображение",
-    "company_website_url"                       => "Веб-сайт компании не является допустимым адресом (https://...).",
-    "country_codes"                             => "Коды cтран",
-    "country_codes_tooltip"                     => "Разделенный запятыми список кодов стран для поиска адреса.",
-    "currency_code"                             => "Код валюты",
-    "currency_decimals"                         => "Валюта - десятичные дроби",
-    "currency_symbol"                           => "Символ валюты",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Вознаграждение",
-    "customer_reward_duplicate"                 => "Вознаграждение должно быть уникальным.",
-    "customer_reward_enable"                    => "Включить программу лояльности",
-    "customer_reward_invalid_chars"             => "Вознаграждение не может содержать '_'",
-    "customer_reward_required"                  => "Вознаграждение - обязательное поле для заполнения",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Фильтр даты и времени",
-    "datetimeformat"                            => "Формат даты и времени",
-    "decimal_point"                             => "Разделитель десятичных",
-    "default_barcode_font_size_number"          => "Размер шрифта штрих-кода должен быть введен цифрами.",
-    "default_barcode_font_size_required"        => "Размер шрифта штрих-кода - обязательное поле.",
-    "default_barcode_height_number"             => "Высота штрих-кода должна быть введена цифрами.",
-    "default_barcode_height_required"           => "Высота штрих-кода - обязательное поле.",
-    "default_barcode_num_in_row_number"         => "Номер штрих-кода должен быть введен цифрами.",
-    "default_barcode_num_in_row_required"       => "Номер штрих-кода - обязательное поле.",
-    "default_barcode_page_cellspacing_number"   => "Расстояние между ячейками страницы штрих-кода должено быть введено цифрами.",
-    "default_barcode_page_cellspacing_required" => "Расстояние между ячейками страницы штрих-кода - обязательное поле.",
-    "default_barcode_page_width_number"         => "Ширина страницы штрих-кода должна быть введена цифрами.",
-    "default_barcode_page_width_required"       => "Ширина страницы штрих-кода - обязательное поле.",
-    "default_barcode_width_number"              => "Ширина штрих-кода должна быть введена цифрами.",
-    "default_barcode_width_required"            => "Ширина штрих-кода - обязательное поле.",
-    "default_item_columns"                      => "Колонки по умолчанию",
-    "default_origin_tax_code"                   => "Код налога по умолчанию",
-    "default_receivings_discount"               => "Скидка на закупки по умолчанию",
-    "default_receivings_discount_number"        => "Скидка на закупки должна быть введена цифрами.",
-    "default_receivings_discount_required"      => "Скидка на закупки - обязательное поле.",
-    "default_sales_discount"                    => "Скидка с продаж по умолчанию",
-    "default_sales_discount_number"             => "Скидка с продаж должна быть введена цифрами.",
-    "default_sales_discount_required"           => "Скидка с продаж - обязательное поле.",
-    "default_tax_category"                      => "Категория налогов по умолчанию",
-    "default_tax_code"                          => "Код налога по умолчанию",
-    "default_tax_jurisdiction"                  => "Налоговая юрисдикция по умолчанию",
-    "default_tax_name_number"                   => "Название налога должно быть строкой.",
-    "default_tax_name_required"                 => "Название налога - обязательное поле.",
-    "default_tax_rate"                          => "Ставка налога по умолчанию (в %)",
-    "default_tax_rate_1"                        => "Ставка налога 1",
-    "default_tax_rate_2"                        => "Ставка налога 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Ставка налога должна быть введена цифрами.",
-    "default_tax_rate_required"                 => "Ставка налога - обязательное поле.",
-    "derive_sale_quantity"                      => "Разрешить кол-во основанное на продажах",
-    "derive_sale_quantity_tooltip"              => "Если этот флажок установлен, для товаров, заказанных на расширенную сумму, будет предоставлен новый тип товара",
-    "dinner_table"                              => "Столы",
-    "dinner_table_duplicate"                    => "Стол должен быть уникальным.",
-    "dinner_table_enable"                       => "Включить обеденные столы",
-    "dinner_table_invalid_chars"                => "Название стола не может содержать '_'.",
-    "dinner_table_required"                     => "Название стола - обязательное поле.",
-    "dot"                                       => "точка",
-    "email"                                     => "Эл. почта",
-    "email_configuration"                       => "Параметры эл. почты",
-    "email_mailpath"                            => "Адрес эл. почты",
-    "email_protocol"                            => "Протокол",
-    "email_receipt_check_behaviour"             => "Чек по эл. почте",
-    "email_receipt_check_behaviour_always"      => "Всегда активно",
-    "email_receipt_check_behaviour_last"        => "Запомнить последний выбор",
-    "email_receipt_check_behaviour_never"       => "Всегда неактивно",
-    "email_smtp_crypto"                         => "Шифрование SMTP",
-    "email_smtp_host"                           => "Сервер SMTP",
-    "email_smtp_pass"                           => "Пароль SMTP",
-    "email_smtp_port"                           => "Порт SMTP",
-    "email_smtp_timeout"                        => "Задержка SMTP (сек.)",
-    "email_smtp_user"                           => "Имя пользователя SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Конфиденциальность",
-    "enforce_privacy_tooltip"                   => "Защитите конфиденциальность клиентов, применяя шифрование данных в случае их удаления",
-    "fax"                                       => "Факс",
-    "file_perm"                                 => "Есть проблемы с правами доступа к файлам. Пожалуйста, исправьте и перезагрузите эту страницу.",
-    "financial_year"                            => "Начало финансового года",
-    "financial_year_apr"                        => "1-е апреля",
-    "financial_year_aug"                        => "1-е августа",
-    "financial_year_dec"                        => "1-е декабря",
-    "financial_year_feb"                        => "1-е февраля",
-    "financial_year_jan"                        => "1-е января",
-    "financial_year_jul"                        => "1-е июля",
-    "financial_year_jun"                        => "1-е июня",
-    "financial_year_mar"                        => "1-е марта",
-    "financial_year_may"                        => "1-е мая",
-    "financial_year_nov"                        => "1-е ноября",
-    "financial_year_oct"                        => "1-е октября",
-    "financial_year_sep"                        => "1-е сентября",
-    "floating_labels"                           => "Всплывающие заголовки",
-    "gcaptcha_enable"                           => "Страница входа с защитой reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA секретный ключ",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA секретный ключ - обязательное поле",
-    "gcaptcha_site_key"                         => "reCAPTCHA Ключ сайта",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Ключ сайта - обязательное поле",
-    "gcaptcha_tooltip"                          => "Защитите страницу входа с помощью Google reCAPTCHA.",
-    "general"                                   => "Основные",
-    "general_configuration"                     => "Общие настройки",
-    "giftcard_number"                           => "Номер подарочной карты",
-    "giftcard_random"                           => "Сгенерировать случайно",
-    "giftcard_series"                           => "Сгенерировать в серии",
-    "image_allowed_file_types"                  => "Доступные типы файлов",
-    "image_max_height_tooltip"                  => "Максимально допустимая высота загружаемых изображений в пикселях.",
-    "image_max_size_tooltip"                    => "Максимально допустимый размер загружаемого файла изображения в килобайтах (кб).",
-    "image_max_width_tooltip"                   => "Максимально допустимая ширина загружаемых изображений в пикселях.",
-    "image_restrictions"                        => "Ограничения на загрузку изображений",
-    "include_hsn"                               => "Включить поддержку кодов HSN",
-    "info"                                      => "Информация",
-    "info_configuration"                        => "Информация о магазине",
-    "input_groups"                              => "Входные группы",
-    "integrations"                              => "Интеграции",
-    "integrations_configuration"                => "Сторонние интеграции",
-    "invoice"                                   => "Счет (накладная)",
-    "invoice_configuration"                     => "Настройки печати накладной",
-    "invoice_default_comments"                  => "Комментарии к накладной по умолчанию",
-    "invoice_email_message"                     => "Шаблон эл. письма накладной",
-    "invoice_enable"                            => "Включить накладные",
-    "invoice_printer"                           => "Принтер накладных",
-    "invoice_type"                              => "Тип накладной",
-    "is_readable"                               => "доступно для чтения, но права выставлены неправильно. Установите их на 640 или 660 и обновите эту страницу.",
-    "is_writable"                               => "доступно для чтения, но права установлены неправильно. Установите их на 750 и обновите эту страницу.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Предупреждение: эта функция будет работать, только если у вас установлено дополнение FireFox jsPrintSetup. Все равно сохранить?",
-    "language"                                  => "Язык",
-    "last_used_invoice_number"                  => "Последний использованный номер накладной",
-    "last_used_quote_number"                    => "Последний номер предложения",
-    "last_used_work_order_number"               => "Последний номер рабочего заказа",
-    "left"                                      => "Слева",
-    "license"                                   => "Лицензии",
-    "license_configuration"                     => "Заявление о лицензии",
-    "line_sequence"                             => "Последовательность строк",
-    "lines_per_page"                            => "Кол-во строк на страницу",
-    "lines_per_page_number"                     => "Кол-во строк на страницу должно быть введено цифрами.",
-    "lines_per_page_required"                   => "Кол-во строк на страницу - обязательное поле.",
-    "locale"                                    => "Локализация",
-    "locale_configuration"                      => "Параметры локализации",
-    "locale_info"                               => "Информация о параметрах локализации",
-    "location"                                  => "Склад",
-    "location_configuration"                    => "Расположение складов",
-    "location_info"                             => "Информация о параметрах расположения",
-    "login_form"                                => "Стиль формы входа",
-    "logout"                                    => "Вы хотите сделать резервную копию перед выходом из системы? Нажмите [OK] для резервного копирования или [Отмена] для выхода.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "MailChimp API-ключ",
-    "mailchimp_configuration"                   => "Настройки MailChimp",
-    "mailchimp_key_successfully"                => "API-ключ верен.",
-    "mailchimp_key_unsuccessfully"              => "Неверный API-ключ.",
-    "mailchimp_lists"                           => "Списки MailChimp",
-    "mailchimp_tooltip"                         => "Нажмите на значок API-ключа.",
-    "message"                                   => "SMS",
-    "message_configuration"                     => "Настройки сообщений",
-    "msg_msg"                                   => "Сохраненные текстовые сообщения",
-    "msg_msg_placeholder"                       => "Если вы хотите использовать шаблон SMS, сохраните свое сообщение здесь, в противном случае оставьте поле пустым.",
-    "msg_pwd"                                   => "Пароль SMS-API",
-    "msg_pwd_required"                          => "Пароль SMS-API - обязательное поле",
-    "msg_src"                                   => "ID отправителя SMS-API",
-    "msg_src_required"                          => "ID отправителя SMS-API - обязательное поле",
-    "msg_uid"                                   => "Пользователь SMS-API",
-    "msg_uid_required"                          => "Пользователь SMS-API - обязательное поле",
-    "multi_pack_enabled"                        => "Несколько упаковок на товар",
-    "no_risk"                                   => "Нет рисков безопасности/уязвимостей.",
-    "none"                                      => "нет",
-    "notify_alignment"                          => "Позиция всплывающего уведомления",
-    "number_format"                             => "Формат номера",
-    "number_locale"                             => "Локализация",
-    "number_locale_invalid"                     => "Введенный регион недействителен. Проверьте ссылку во всплывающей подсказке, чтобы найти допустимый регион.",
-    "number_locale_required"                    => "Региональный номер - обязательное поле.",
-    "number_locale_tooltip"                     => "Найдите подходящий регион по этой ссылке.",
-    "os_timezone"                               => "Часовой пояс системы:",
-    "ospos_info"                                => "Информация об установке OSPOS",
-    "payment_options_order"                     => "Параметры оплаты заказа",
-    "perm_risk"                                 => "Неправильные разрешения на доступ подвергают это программное обеспечение риску.",
-    "phone"                                     => "Телефон компании",
-    "phone_required"                            => "Телефон компании - обязательное поле.",
-    "print_bottom_margin"                       => "Отступ снизу",
-    "print_bottom_margin_number"                => "Отступ снизу должен быть введен цифрами.",
-    "print_bottom_margin_required"              => "Отступ снизу - обязательное поле.",
-    "print_delay_autoreturn"                    => "Задержка автовозврата",
-    "print_delay_autoreturn_number"             => "Задержка автовозврата - обязательное поле.",
-    "print_delay_autoreturn_required"           => "Задержка автовозврата должна быть введена цифрами.",
-    "print_footer"                              => "Печать нижнего колонтитула браузера",
-    "print_header"                              => "Печать верхнего колонтитула браузера",
-    "print_left_margin"                         => "Отступ слева",
-    "print_left_margin_number"                  => "Отступ слева должен быть введен цифрами.",
-    "print_left_margin_required"                => "Отступ слева - обязательное поле.",
-    "print_receipt_check_behaviour"             => "Опция печати квитанции",
-    "print_receipt_check_behaviour_always"      => "Всегда активно",
-    "print_receipt_check_behaviour_last"        => "Запомнить последний выбор",
-    "print_receipt_check_behaviour_never"       => "Всегда неактивно",
-    "print_right_margin"                        => "Отступ справа",
-    "print_right_margin_number"                 => "Отступ справа должен быть введен цифрами.",
-    "print_right_margin_required"               => "Отступ справа - обязательное поле.",
-    "print_silently"                            => "Показывать уведомление о печати",
-    "print_top_margin"                          => "Отступ сверху",
-    "print_top_margin_number"                   => "Отступ сверху должен быть введен цифрами.",
-    "print_top_margin_required"                 => "Отступ сверху - обязательное поле.",
-    "quantity_decimals"                         => "Количество - десятичные дроби",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Комментарий для предложения по умолчанию",
-    "receipt"                                   => "Чек",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Параметры печати чека",
-    "receipt_default"                           => "По умолчанию",
-    "receipt_font_size"                         => "Размер шрифта",
-    "receipt_font_size_number"                  => "Размер шрифта должен быть введен цифрами.",
-    "receipt_font_size_required"                => "Размер шрифта - обязательное поле.",
-    "receipt_info"                              => "Информация о настройках квитанций",
-    "receipt_printer"                           => "Билетный принтер",
-    "receipt_short"                             => "Короткий",
-    "receipt_show_company_name"                 => "Показывать название компании",
-    "receipt_show_description"                  => "Показывать описание",
-    "receipt_show_serialnumber"                 => "Показывать серийный номер",
-    "receipt_show_tax_ind"                      => "Показывать налоговый индикатор",
-    "receipt_show_taxes"                        => "Показывать налоги",
-    "receipt_show_total_discount"               => "Показывать общую скидку",
-    "receipt_template"                          => "Шаблон чека",
-    "receiving_calculate_average_price"         => "Расчет сред. цены (закупки)",
-    "recv_invoice_format"                       => "Формат накладной для закупок",
-    "register_mode_default"                     => "Режим регистрации по умолчанию",
-    "report_an_issue"                           => "Сообщить о проблеме",
-    "return_policy_required"                    => "Политика возврата - обязательное поле.",
-    "reward"                                    => "Программа лояльности",
-    "reward_configuration"                      => "Параметры программы лояльности",
-    "right"                                     => "Справа",
-    "sales_invoice_format"                      => "Формат накладной для продаж",
-    "sales_quote_format"                        => "Формат предложений на продажу",
-    "saved_successfully"                        => "Конфигурация успешно сохранена.",
-    "saved_unsuccessfully"                      => "Произошла ошибка при сохранении конфигурации.",
-    "security_issue"                            => "Предупреждение об уязвимости системы безопасности",
-    "server_notice"                             => "Пожалуйста, используйте приведенную ниже информацию для сообщения о проблеме.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Показать значок \"Офис\"",
-    "statistics"                                => "Отправить статистику",
-    "statistics_tooltip"                        => "Отправляйте статистику для разработки и улучшения функций.",
-    "stock_location"                            => "Расположение склада",
-    "stock_location_duplicate"                  => "Местоположение склада должно быть уникальным.",
-    "stock_location_invalid_chars"              => "Местоположение склада не может содержать '_'.",
-    "stock_location_required"                   => "Местонахождение склада - обязательное поле.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Колонка 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Макет предложений поиска",
-    "suggestions_second_column"                 => "Колонка 2",
-    "suggestions_third_column"                  => "Колонка 3",
-    "system_conf"                               => "Информация",
-    "system_info"                               => "Системная информация",
-    "table"                                     => "Столики",
-    "table_configuration"                       => "Настройка столов",
-    "takings_printer"                           => "Чековый принтер",
-    "tax"                                       => "Налог",
-    "tax_category"                              => "Категория налога",
-    "tax_category_duplicate"                    => "Введенная налоговая категория уже существует.",
-    "tax_category_invalid_chars"                => "Введенная налоговая категория недействительна.",
-    "tax_category_required"                     => "Налоговая категория - обязательна для заполнения.",
-    "tax_category_used"                         => "Налоговая категория не может быть удалена, поскольку она используется.",
-    "tax_configuration"                         => "Параметры налогов",
-    "tax_decimals"                              => "Налоги - десятичные дроби",
-    "tax_id"                                    => "№ налога",
-    "tax_included"                              => "Вкл. налоги",
-    "theme"                                     => "Тема",
-    "theme_preview"                             => "Предпросмотр темы:",
-    "thousands_separator"                       => "Разделитель тысяч",
-    "timezone"                                  => "Часовой пояс",
-    "timezone_error"                            => "Часовой пояс системы отличается от вашего местного часового пояса.",
-    "top"                                       => "Вверх",
-    "use_destination_based_tax"                 => "Использовать налог на основе пункта назначения",
-    "user_timezone"                             => "Ваш часовой пояс:",
-    "website"                                   => "Веб-сайт",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Поддержка рабочих заказов",
-    "work_order_format"                         => "Формат рабочих заказов",
+    'address'                                   => 'Адрес компании',
+    'address_required'                          => 'Адрес компании - обязательное поле для заполнения.',
+    'all_set'                                   => 'Все права доступа к файлам установлены правильно!',
+    'allow_duplicate_barcodes'                  => 'Разрешить дубликаты штрих-кодов',
+    'apostrophe'                                => 'апостроф',
+    'backup_button'                             => 'Резервная копия',
+    'backup_database'                           => 'Резервная копия базы данных',
+    'barcode'                                   => 'Штрих-код',
+    'barcode_company'                           => 'Название компании',
+    'barcode_configuration'                     => 'Параметры штрих-кода',
+    'barcode_content'                           => 'Содержание штрих-кода',
+    'barcode_first_row'                         => 'Строка 1',
+    'barcode_font'                              => 'Шрифт',
+    'barcode_formats'                           => 'Формат ввода',
+    'barcode_generate_if_empty'                 => 'Сгенерировать новый, если пусто.',
+    'barcode_height'                            => 'Высота (пикс.)',
+    'barcode_id'                                => '№ товара/Название',
+    'barcode_info'                              => 'Информация о параметрах штрих-кода',
+    'barcode_layout'                            => 'Макет штрих-кода',
+    'barcode_name'                              => 'Название',
+    'barcode_number'                            => 'Штрих-код',
+    'barcode_number_in_row'                     => 'Номер в строке',
+    'barcode_page_cellspacing'                  => 'Расстояние между ячейками.',
+    'barcode_page_width'                        => 'Ширина страницы',
+    'barcode_price'                             => 'Цена',
+    'barcode_second_row'                        => 'Строка 2',
+    'barcode_third_row'                         => 'Строка 3',
+    'barcode_tooltip'                           => 'Предупреждение: Эта функция может привести к тому, что будут созданы или импортированы дублирующиеся товары. Не используйте, если вы не хотите дублировать штрих-коды.',
+    'barcode_type'                              => 'Тип штрих-кода',
+    'barcode_width'                             => 'Ширина (пикс.)',
+    'bottom'                                    => 'Конец',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Цены - десятичные дроби',
+    'cash_decimals_tooltip'                     => 'Если десятичные дроби для цен и валюты совпадают, то это не будет выполняться, если для цен не установлено округление до пяти.',
+    'cash_rounding'                             => 'Округление цен',
+    'category_dropdown'                         => 'Показывать категории всплывающим списом',
+    'center'                                    => 'Центр',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'Запятая',
+    'company'                                   => 'Название компании',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Сменить изображение',
+    'company_logo'                              => 'Логотип компании',
+    'company_remove_image'                      => 'Удалить изображение',
+    'company_required'                          => 'Название компании - обязательное поле для заполнения',
+    'company_select_image'                      => 'Выбрать изображение',
+    'company_website_url'                       => 'Веб-сайт компании не является допустимым адресом (https://...).',
+    'country_codes'                             => 'Коды cтран',
+    'country_codes_tooltip'                     => 'Разделенный запятыми список кодов стран для поиска адреса.',
+    'currency_code'                             => 'Код валюты',
+    'currency_decimals'                         => 'Валюта - десятичные дроби',
+    'currency_symbol'                           => 'Символ валюты',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Вознаграждение',
+    'customer_reward_duplicate'                 => 'Вознаграждение должно быть уникальным.',
+    'customer_reward_enable'                    => 'Включить программу лояльности',
+    'customer_reward_invalid_chars'             => "Вознаграждение не может содержать '_'",
+    'customer_reward_required'                  => 'Вознаграждение - обязательное поле для заполнения',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Фильтр даты и времени',
+    'datetimeformat'                            => 'Формат даты и времени',
+    'decimal_point'                             => 'Разделитель десятичных',
+    'default_barcode_font_size_number'          => 'Размер шрифта штрих-кода должен быть введен цифрами.',
+    'default_barcode_font_size_required'        => 'Размер шрифта штрих-кода - обязательное поле.',
+    'default_barcode_height_number'             => 'Высота штрих-кода должна быть введена цифрами.',
+    'default_barcode_height_required'           => 'Высота штрих-кода - обязательное поле.',
+    'default_barcode_num_in_row_number'         => 'Номер штрих-кода должен быть введен цифрами.',
+    'default_barcode_num_in_row_required'       => 'Номер штрих-кода - обязательное поле.',
+    'default_barcode_page_cellspacing_number'   => 'Расстояние между ячейками страницы штрих-кода должено быть введено цифрами.',
+    'default_barcode_page_cellspacing_required' => 'Расстояние между ячейками страницы штрих-кода - обязательное поле.',
+    'default_barcode_page_width_number'         => 'Ширина страницы штрих-кода должна быть введена цифрами.',
+    'default_barcode_page_width_required'       => 'Ширина страницы штрих-кода - обязательное поле.',
+    'default_barcode_width_number'              => 'Ширина штрих-кода должна быть введена цифрами.',
+    'default_barcode_width_required'            => 'Ширина штрих-кода - обязательное поле.',
+    'default_item_columns'                      => 'Колонки по умолчанию',
+    'default_origin_tax_code'                   => 'Код налога по умолчанию',
+    'default_receivings_discount'               => 'Скидка на закупки по умолчанию',
+    'default_receivings_discount_number'        => 'Скидка на закупки должна быть введена цифрами.',
+    'default_receivings_discount_required'      => 'Скидка на закупки - обязательное поле.',
+    'default_sales_discount'                    => 'Скидка с продаж по умолчанию',
+    'default_sales_discount_number'             => 'Скидка с продаж должна быть введена цифрами.',
+    'default_sales_discount_required'           => 'Скидка с продаж - обязательное поле.',
+    'default_tax_category'                      => 'Категория налогов по умолчанию',
+    'default_tax_code'                          => 'Код налога по умолчанию',
+    'default_tax_jurisdiction'                  => 'Налоговая юрисдикция по умолчанию',
+    'default_tax_name_number'                   => 'Название налога должно быть строкой.',
+    'default_tax_name_required'                 => 'Название налога - обязательное поле.',
+    'default_tax_rate'                          => 'Ставка налога по умолчанию (в %)',
+    'default_tax_rate_1'                        => 'Ставка налога 1',
+    'default_tax_rate_2'                        => 'Ставка налога 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Ставка налога должна быть введена цифрами.',
+    'default_tax_rate_required'                 => 'Ставка налога - обязательное поле.',
+    'derive_sale_quantity'                      => 'Разрешить кол-во основанное на продажах',
+    'derive_sale_quantity_tooltip'              => 'Если этот флажок установлен, для товаров, заказанных на расширенную сумму, будет предоставлен новый тип товара',
+    'dinner_table'                              => 'Столы',
+    'dinner_table_duplicate'                    => 'Стол должен быть уникальным.',
+    'dinner_table_enable'                       => 'Включить обеденные столы',
+    'dinner_table_invalid_chars'                => "Название стола не может содержать '_'.",
+    'dinner_table_required'                     => 'Название стола - обязательное поле.',
+    'dot'                                       => 'точка',
+    'email'                                     => 'Эл. почта',
+    'email_configuration'                       => 'Параметры эл. почты',
+    'email_mailpath'                            => 'Адрес эл. почты',
+    'email_protocol'                            => 'Протокол',
+    'email_receipt_check_behaviour'             => 'Чек по эл. почте',
+    'email_receipt_check_behaviour_always'      => 'Всегда активно',
+    'email_receipt_check_behaviour_last'        => 'Запомнить последний выбор',
+    'email_receipt_check_behaviour_never'       => 'Всегда неактивно',
+    'email_smtp_crypto'                         => 'Шифрование SMTP',
+    'email_smtp_host'                           => 'Сервер SMTP',
+    'email_smtp_pass'                           => 'Пароль SMTP',
+    'email_smtp_port'                           => 'Порт SMTP',
+    'email_smtp_timeout'                        => 'Задержка SMTP (сек.)',
+    'email_smtp_user'                           => 'Имя пользователя SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Конфиденциальность',
+    'enforce_privacy_tooltip'                   => 'Защитите конфиденциальность клиентов, применяя шифрование данных в случае их удаления',
+    'fax'                                       => 'Факс',
+    'file_perm'                                 => 'Есть проблемы с правами доступа к файлам. Пожалуйста, исправьте и перезагрузите эту страницу.',
+    'financial_year'                            => 'Начало финансового года',
+    'financial_year_apr'                        => '1-е апреля',
+    'financial_year_aug'                        => '1-е августа',
+    'financial_year_dec'                        => '1-е декабря',
+    'financial_year_feb'                        => '1-е февраля',
+    'financial_year_jan'                        => '1-е января',
+    'financial_year_jul'                        => '1-е июля',
+    'financial_year_jun'                        => '1-е июня',
+    'financial_year_mar'                        => '1-е марта',
+    'financial_year_may'                        => '1-е мая',
+    'financial_year_nov'                        => '1-е ноября',
+    'financial_year_oct'                        => '1-е октября',
+    'financial_year_sep'                        => '1-е сентября',
+    'floating_labels'                           => 'Всплывающие заголовки',
+    'gcaptcha_enable'                           => 'Страница входа с защитой reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA секретный ключ',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA секретный ключ - обязательное поле',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Ключ сайта',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Ключ сайта - обязательное поле',
+    'gcaptcha_tooltip'                          => 'Защитите страницу входа с помощью Google reCAPTCHA.',
+    'general'                                   => 'Основные',
+    'general_configuration'                     => 'Общие настройки',
+    'giftcard_number'                           => 'Номер подарочной карты',
+    'giftcard_random'                           => 'Сгенерировать случайно',
+    'giftcard_series'                           => 'Сгенерировать в серии',
+    'image_allowed_file_types'                  => 'Доступные типы файлов',
+    'image_max_height_tooltip'                  => 'Максимально допустимая высота загружаемых изображений в пикселях.',
+    'image_max_size_tooltip'                    => 'Максимально допустимый размер загружаемого файла изображения в килобайтах (кб).',
+    'image_max_width_tooltip'                   => 'Максимально допустимая ширина загружаемых изображений в пикселях.',
+    'image_restrictions'                        => 'Ограничения на загрузку изображений',
+    'include_hsn'                               => 'Включить поддержку кодов HSN',
+    'info'                                      => 'Информация',
+    'info_configuration'                        => 'Информация о магазине',
+    'input_groups'                              => 'Входные группы',
+    'integrations'                              => 'Интеграции',
+    'integrations_configuration'                => 'Сторонние интеграции',
+    'invoice'                                   => 'Счет (накладная)',
+    'invoice_configuration'                     => 'Настройки печати накладной',
+    'invoice_default_comments'                  => 'Комментарии к накладной по умолчанию',
+    'invoice_email_message'                     => 'Шаблон эл. письма накладной',
+    'invoice_enable'                            => 'Включить накладные',
+    'invoice_printer'                           => 'Принтер накладных',
+    'invoice_type'                              => 'Тип накладной',
+    'is_readable'                               => 'доступно для чтения, но права выставлены неправильно. Установите их на 640 или 660 и обновите эту страницу.',
+    'is_writable'                               => 'доступно для чтения, но права установлены неправильно. Установите их на 750 и обновите эту страницу.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Предупреждение: эта функция будет работать, только если у вас установлено дополнение FireFox jsPrintSetup. Все равно сохранить?',
+    'language'                                  => 'Язык',
+    'last_used_invoice_number'                  => 'Последний использованный номер накладной',
+    'last_used_quote_number'                    => 'Последний номер предложения',
+    'last_used_work_order_number'               => 'Последний номер рабочего заказа',
+    'left'                                      => 'Слева',
+    'license'                                   => 'Лицензии',
+    'license_configuration'                     => 'Заявление о лицензии',
+    'line_sequence'                             => 'Последовательность строк',
+    'lines_per_page'                            => 'Кол-во строк на страницу',
+    'lines_per_page_number'                     => 'Кол-во строк на страницу должно быть введено цифрами.',
+    'lines_per_page_required'                   => 'Кол-во строк на страницу - обязательное поле.',
+    'locale'                                    => 'Локализация',
+    'locale_configuration'                      => 'Параметры локализации',
+    'locale_info'                               => 'Информация о параметрах локализации',
+    'location'                                  => 'Склад',
+    'location_configuration'                    => 'Расположение складов',
+    'location_info'                             => 'Информация о параметрах расположения',
+    'login_form'                                => 'Стиль формы входа',
+    'logout'                                    => 'Вы хотите сделать резервную копию перед выходом из системы? Нажмите [OK] для резервного копирования или [Отмена] для выхода.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'MailChimp API-ключ',
+    'mailchimp_configuration'                   => 'Настройки MailChimp',
+    'mailchimp_key_successfully'                => 'API-ключ верен.',
+    'mailchimp_key_unsuccessfully'              => 'Неверный API-ключ.',
+    'mailchimp_lists'                           => 'Списки MailChimp',
+    'mailchimp_tooltip'                         => 'Нажмите на значок API-ключа.',
+    'message'                                   => 'SMS',
+    'message_configuration'                     => 'Настройки сообщений',
+    'msg_msg'                                   => 'Сохраненные текстовые сообщения',
+    'msg_msg_placeholder'                       => 'Если вы хотите использовать шаблон SMS, сохраните свое сообщение здесь, в противном случае оставьте поле пустым.',
+    'msg_pwd'                                   => 'Пароль SMS-API',
+    'msg_src'                                   => 'ID отправителя SMS-API',
+    'msg_src_required'                          => 'ID отправителя SMS-API - обязательное поле',
+    'msg_uid'                                   => 'Пользователь SMS-API',
+    'msg_uid_required'                          => 'Пользователь SMS-API - обязательное поле',
+    'multi_pack_enabled'                        => 'Несколько упаковок на товар',
+    'no_risk'                                   => 'Нет рисков безопасности/уязвимостей.',
+    'none'                                      => 'нет',
+    'notify_alignment'                          => 'Позиция всплывающего уведомления',
+    'number_format'                             => 'Формат номера',
+    'number_locale'                             => 'Локализация',
+    'number_locale_invalid'                     => 'Введенный регион недействителен. Проверьте ссылку во всплывающей подсказке, чтобы найти допустимый регион.',
+    'number_locale_required'                    => 'Региональный номер - обязательное поле.',
+    'number_locale_tooltip'                     => 'Найдите подходящий регион по этой ссылке.',
+    'os_timezone'                               => 'Часовой пояс системы:',
+    'ospos_info'                                => 'Информация об установке OSPOS',
+    'payment_options_order'                     => 'Параметры оплаты заказа',
+    'payment_reference_code_length_limits'      => 'Код ссылки на платёж<br>Ограничения длины',
+    'payment_reference_code_length_max_label'   => 'Макс',
+    'payment_reference_code_length_min_label'   => 'Мин',
+    'perm_risk'                                 => 'Неправильные разрешения на доступ подвергают это программное обеспечение риску.',
+    'phone'                                     => 'Телефон компании',
+    'phone_required'                            => 'Телефон компании - обязательное поле.',
+    'print_bottom_margin'                       => 'Отступ снизу',
+    'print_bottom_margin_number'                => 'Отступ снизу должен быть введен цифрами.',
+    'print_bottom_margin_required'              => 'Отступ снизу - обязательное поле.',
+    'print_delay_autoreturn'                    => 'Задержка автовозврата',
+    'print_delay_autoreturn_number'             => 'Задержка автовозврата - обязательное поле.',
+    'print_delay_autoreturn_required'           => 'Задержка автовозврата должна быть введена цифрами.',
+    'print_footer'                              => 'Печать нижнего колонтитула браузера',
+    'print_header'                              => 'Печать верхнего колонтитула браузера',
+    'print_left_margin'                         => 'Отступ слева',
+    'print_left_margin_number'                  => 'Отступ слева должен быть введен цифрами.',
+    'print_left_margin_required'                => 'Отступ слева - обязательное поле.',
+    'print_receipt_check_behaviour'             => 'Опция печати квитанции',
+    'print_receipt_check_behaviour_always'      => 'Всегда активно',
+    'print_receipt_check_behaviour_last'        => 'Запомнить последний выбор',
+    'print_receipt_check_behaviour_never'       => 'Всегда неактивно',
+    'print_right_margin'                        => 'Отступ справа',
+    'print_right_margin_number'                 => 'Отступ справа должен быть введен цифрами.',
+    'print_right_margin_required'               => 'Отступ справа - обязательное поле.',
+    'print_silently'                            => 'Показывать уведомление о печати',
+    'print_top_margin'                          => 'Отступ сверху',
+    'print_top_margin_number'                   => 'Отступ сверху должен быть введен цифрами.',
+    'print_top_margin_required'                 => 'Отступ сверху - обязательное поле.',
+    'quantity_decimals'                         => 'Количество - десятичные дроби',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Комментарий для предложения по умолчанию',
+    'receipt'                                   => 'Чек',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Параметры печати чека',
+    'receipt_default'                           => 'По умолчанию',
+    'receipt_font_size'                         => 'Размер шрифта',
+    'receipt_font_size_number'                  => 'Размер шрифта должен быть введен цифрами.',
+    'receipt_font_size_required'                => 'Размер шрифта - обязательное поле.',
+    'receipt_info'                              => 'Информация о настройках квитанций',
+    'receipt_printer'                           => 'Билетный принтер',
+    'receipt_short'                             => 'Короткий',
+    'receipt_show_company_name'                 => 'Показывать название компании',
+    'receipt_show_description'                  => 'Показывать описание',
+    'receipt_show_serialnumber'                 => 'Показывать серийный номер',
+    'receipt_show_tax_ind'                      => 'Показывать налоговый индикатор',
+    'receipt_show_taxes'                        => 'Показывать налоги',
+    'receipt_show_total_discount'               => 'Показывать общую скидку',
+    'receipt_template'                          => 'Шаблон чека',
+    'receiving_calculate_average_price'         => 'Расчет сред. цены (закупки)',
+    'recv_invoice_format'                       => 'Формат накладной для закупок',
+    'register_mode_default'                     => 'Режим регистрации по умолчанию',
+    'report_an_issue'                           => 'Сообщить о проблеме',
+    'return_policy_required'                    => 'Политика возврата - обязательное поле.',
+    'reward'                                    => 'Программа лояльности',
+    'reward_configuration'                      => 'Параметры программы лояльности',
+    'right'                                     => 'Справа',
+    'sales_invoice_format'                      => 'Формат накладной для продаж',
+    'sales_quote_format'                        => 'Формат предложений на продажу',
+    'mailpath_invalid'                          => 'Неверный путь sendmail. Разрешены только буквы, цифры, дефисы, подчёркивания, слеши, обратные слеши, двоеточия, пробелы и точки.',
+    'saved_successfully'                        => 'Конфигурация успешно сохранена.',
+    'saved_unsuccessfully'                      => 'Произошла ошибка при сохранении конфигурации.',
+    'security_issue'                            => 'Предупреждение об уязвимости системы безопасности',
+    'server_notice'                             => 'Пожалуйста, используйте приведенную ниже информацию для сообщения о проблеме.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Показать значок "Офис"',
+    'statistics'                                => 'Отправить статистику',
+    'statistics_tooltip'                        => 'Отправляйте статистику для разработки и улучшения функций.',
+    'stock_location'                            => 'Расположение склада',
+    'stock_location_duplicate'                  => 'Местоположение склада должно быть уникальным.',
+    'stock_location_invalid_chars'              => "Местоположение склада не может содержать '_'.",
+    'stock_location_required'                   => 'Местонахождение склада - обязательное поле.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Колонка 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Макет предложений поиска',
+    'suggestions_second_column'                 => 'Колонка 2',
+    'suggestions_third_column'                  => 'Колонка 3',
+    'system_conf'                               => 'Информация',
+    'system_info'                               => 'Системная информация',
+    'table'                                     => 'Столики',
+    'table_configuration'                       => 'Настройка столов',
+    'takings_printer'                           => 'Чековый принтер',
+    'tax'                                       => 'Налог',
+    'tax_category'                              => 'Категория налога',
+    'tax_category_duplicate'                    => 'Введенная налоговая категория уже существует.',
+    'tax_category_invalid_chars'                => 'Введенная налоговая категория недействительна.',
+    'tax_category_required'                     => 'Налоговая категория - обязательна для заполнения.',
+    'tax_category_used'                         => 'Налоговая категория не может быть удалена, поскольку она используется.',
+    'tax_configuration'                         => 'Параметры налогов',
+    'tax_decimals'                              => 'Налоги - десятичные дроби',
+    'tax_id'                                    => '№ налога',
+    'tax_included'                              => 'Вкл. налоги',
+    'theme'                                     => 'Тема',
+    'theme_preview'                             => 'Предпросмотр темы:',
+    'thousands_separator'                       => 'Разделитель тысяч',
+    'timezone'                                  => 'Часовой пояс',
+    'timezone_error'                            => 'Часовой пояс системы отличается от вашего местного часового пояса.',
+    'top'                                       => 'Вверх',
+    'use_destination_based_tax'                 => 'Использовать налог на основе пункта назначения',
+    'user_timezone'                             => 'Ваш часовой пояс:',
+    'website'                                   => 'Веб-сайт',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Поддержка рабочих заказов',
+    'work_order_format'                         => 'Формат рабочих заказов',
 ];
diff --git a/app/Language/ru/Employees.php b/app/Language/ru/Employees.php
index fd2260ca2..ee42ed962 100644
--- a/app/Language/ru/Employees.php
+++ b/app/Language/ru/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Информация",
-    "cannot_be_deleted"            => "Не удалось удалить выбранных сотрудников, один или несколько из них обработали продажи или вы пытаетесь удалить свою учетную запись.",
-    "change_employee"              => "",
-    "change_password"              => "Смена пароля",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Вы уверены, что хотите удалить выбранных сотрудников?",
-    "confirm_restore"              => "Вы уверены, что хотите восстановить выбранных сотрудников?",
-    "current_password"             => "Текущий пароль",
-    "current_password_invalid"     => "Текущий пароль введен неверно.",
-    "employee"                     => "Сотрудник",
-    "error_adding_updating"        => "Ошибка при добавлении/обновлении сотрудника.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Вы не можете удалить демо-администратора.",
-    "error_updating_demo_admin"    => "Вы не можете изменить демо-администратора.",
-    "language"                     => "Язык",
-    "login_info"                   => "Вход",
-    "manager"                      => "",
-    "new"                          => "Новый сотрудник",
-    "none_selected"                => "Вы не выбрали ни одного сотрудника для удаления.",
-    "one_or_multiple"              => "сотрудник(и)",
-    "password"                     => "Пароль",
-    "password_minlength"           => "Пароль должен быть не менее 8 символов.",
-    "password_must_match"          => "Пароли не совпадают.",
-    "password_not_must_match"      => "Текущий пароль и новый пароль должны быть уникальными.",
-    "password_required"            => "Ввод пароля - обязателен.",
-    "permission_desc"              => "Отметьте флажками ниже, чтобы предоставить доступ к модулям.",
-    "permission_info"              => "Права доступа",
-    "repeat_password"              => "Повтор пароля",
-    "subpermission_required"       => "Добавьте хотя бы одно разрешение для каждого модуля.",
-    "successful_adding"            => "Сотрудник успешно создан.",
-    "successful_change_password"   => "Смена пароля прошла успешно.",
-    "successful_deleted"           => "Успешно удалено",
-    "successful_updating"          => "Информация о сотруднике успешно обновлена",
-    "system_language"              => "Язык системы",
-    "unsuccessful_change_password" => "Не удалось изменить пароль.",
-    "update"                       => "Обновление сотрудника",
-    "username"                     => "Имя пользователя",
-    "username_duplicate"           => "Имя пользователя сотрудника уже используется. Пожалуйста, выберите другое.",
-    "username_minlength"           => "Имя пользователя должно быть не менее 5 символов.",
-    "username_required"            => "Имя пользователя - обязательное поле для заполнения.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Информация',
+    'cannot_be_deleted'                      => 'Не удалось удалить выбранных сотрудников, один или несколько из них обработали продажи или вы пытаетесь удалить свою учетную запись.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Смена пароля',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Вы уверены, что хотите удалить выбранных сотрудников?',
+    'confirm_restore'                        => 'Вы уверены, что хотите восстановить выбранных сотрудников?',
+    'current_password'                       => 'Текущий пароль',
+    'current_password_invalid'               => 'Текущий пароль введен неверно.',
+    'employee'                               => 'Сотрудник',
+    'error_adding_updating'                  => 'Ошибка при добавлении/обновлении сотрудника.',
+    'error_cannot_remove_own_minimum_grant'  => 'Вы не можете удалить собственные минимальные права доступа к модулям.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Вы не можете удалить демо-администратора.',
+    'error_grant_change_disallowed'          => 'Изменения прав доступа отключены в этой демонстрации.',
+    'error_password_change_disallowed'       => 'Изменение пароля отключено в этой демонстрации.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Вы не можете изменить демо-администратора.',
+    'language'                               => 'Язык',
+    'login_info'                             => 'Вход',
+    'manager'                                => '',
+    'new'                                    => 'Новый сотрудник',
+    'none_selected'                          => 'Вы не выбрали ни одного сотрудника для удаления.',
+    'one_or_multiple'                        => 'сотрудник(и)',
+    'password'                               => 'Пароль',
+    'password_minlength'                     => 'Пароль должен быть не менее 8 символов.',
+    'password_must_match'                    => 'Пароли не совпадают.',
+    'password_not_must_match'                => 'Текущий пароль и новый пароль должны быть уникальными.',
+    'password_required'                      => 'Ввод пароля - обязателен.',
+    'permission_desc'                        => 'Отметьте флажками ниже, чтобы предоставить доступ к модулям.',
+    'permission_info'                        => 'Права доступа',
+    'repeat_password'                        => 'Повтор пароля',
+    'subpermission_required'                 => 'Добавьте хотя бы одно разрешение для каждого модуля.',
+    'successful_adding'                      => 'Сотрудник успешно создан.',
+    'successful_change_password'             => 'Смена пароля прошла успешно.',
+    'successful_deleted'                     => 'Успешно удалено',
+    'successful_updating'                    => 'Информация о сотруднике успешно обновлена',
+    'system_language'                        => 'Язык системы',
+    'unsuccessful_change_password'           => 'Не удалось изменить пароль.',
+    'update'                                 => 'Обновление сотрудника',
+    'username'                               => 'Имя пользователя',
+    'username_duplicate'                     => 'Имя пользователя сотрудника уже используется. Пожалуйста, выберите другое.',
+    'username_minlength'                     => 'Имя пользователя должно быть не менее 5 символов.',
+    'username_required'                      => 'Имя пользователя - обязательное поле для заполнения.',
 ];
diff --git a/app/Language/ru/Error.php b/app/Language/ru/Error.php
index 1c097af52..39e767e00 100644
--- a/app/Language/ru/Error.php
+++ b/app/Language/ru/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "У вас нет разрешения на доступ к модулю",
-    "unknown"              => "Неизвестная ошибка",
+    'no_permission_module'           => 'У вас нет разрешения на доступ к модулю',
+    'unable_to_create_env_file'      => 'Не удалось создать {filePath} для настройки throttle.key',
+    'unable_to_lock_file'            => 'Не удалось заблокировать {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Не удалось открыть {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Не удалось сохранить throttle.key в {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Не удалось прочитать {filePath} для настройки throttle.key',
+    'unknown'                        => 'Неизвестная ошибка',
 ];
diff --git a/app/Language/ru/Items.php b/app/Language/ru/Items.php
index 73d0fc357..6b8b2e96c 100644
--- a/app/Language/ru/Items.php
+++ b/app/Language/ru/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Добавить/убрать товар.",
-    "allow_alt_description"              => "Разрешить альтернативные описания",
-    "amount_entry"                       => "Ввод количества",
-    "bulk_edit"                          => "Массовое редактирование",
-    "buy_price_required"                 => "Цена покупки - обязательное поле.",
-    "cannot_be_deleted"                  => "Не удалось удалить выбраннй(ые) товар(ы), так как у одного или нескольких выбранных товаров есть продажи.",
-    "cannot_find_item"                   => "Товар не найден.",
-    "categories"                         => "",
-    "category"                           => "Категория",
-    "category_new"                       => "",
-    "category_required"                  => "Категория - обязательное поле.",
-    "change_all_to_allow_alt_desc"       => "Разрешить альтернативное описание для всех.",
-    "change_all_to_not_allow_allow_desc" => "Не разрешать альтернативные описания для всех.",
-    "change_all_to_serialized"           => "Выбрать все",
-    "change_all_to_unserialized"         => "Снять выделение со всех",
-    "change_image"                       => "Изменить изображение",
-    "confirm_bulk_edit"                  => "Вы уверены, что хотите редактировать выбранные товары?",
-    "confirm_bulk_edit_wipe_taxes"       => "Вся информация о налогах на товар будет изменена.",
-    "confirm_delete"                     => "Вы уверены, что хотите удалить выбранные товары?",
-    "confirm_restore"                    => "Вы уверены, что хотите восстановить выбранные товары?",
-    "cost_price"                         => "Оптовая цена",
-    "cost_price_number"                  => "Оптовая цена должна быть числом.",
-    "cost_price_required"                => "Оптовая цена - обязательное поле.",
-    "count"                              => "Обновление запасов",
-    "csv_import_failed"                  => "Ошибка импорта CSV",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Загруженный файл CSV не содержит данных или имеет неправильный формат.",
-    "csv_import_partially_failed"        => "В строке (строках) произошло {0} ошибок импорта: {1}. Ничего не было импортировано.",
-    "csv_import_success"                 => "Товар успешно импортирован из CSV.",
-    "current_quantity"                   => "Текущее количество",
-    "default_pack_name"                  => "Каждый",
-    "description"                        => "Описание",
-    "details_count"                      => "Сведения о запасах",
-    "do_nothing"                         => "Ничего не делать",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Отредактируйте нужные поля у выбранных товаров.",
-    "edit_multiple_items"                => "Редактирование нескольких товаров",
-    "empty_upc_items"                    => "Штрих-код товара(ов) пуст",
-    "error_adding_updating"              => "Ошибка при добавлении/обновлении товара",
-    "error_updating_multiple"            => "Ошибка при обновлении товаров",
-    "generate_barcodes"                  => "Генерация штрих-кодов",
-    "hsn_code"                           => "Согласованная система номенклатуры",
-    "image"                              => "Изображение",
-    "import_items_csv"                   => "Импорт товаров из CSV",
-    "info_provided_by"                   => "Информация предоставлена",
-    "inventory"                          => "Запасы",
-    "inventory_CSV_import_quantity"      => "Импортированое количество из CSV",
-    "inventory_comments"                 => "Комментарии",
-    "inventory_data_tracking"            => "Отслеживание запасов",
-    "inventory_date"                     => "Дата",
-    "inventory_employee"                 => "Сотрудник",
-    "inventory_in_out_quantity"          => "Количество (Приход / Уход)",
-    "inventory_remarks"                  => "Пометки",
-    "is_deleted"                         => "Удаленный",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Товар имеет серийный номер",
-    "item"                               => "Товар",
-    "item_id"                            => "",
-    "item_number"                        => "Штрих-код",
-    "item_number_duplicate"              => "Товар с таким номером уже присутствует в базе данных.",
-    "kit"                                => "Комплект",
-    "location"                           => "Расположение",
-    "low_inventory_items"                => "Товары не в наличии",
-    "low_sell_item"                      => "Товар с низким уровнем продаж",
-    "manually_editing_of_quantity"       => "Ручное редактирование количества",
-    "markup"                             => "",
-    "name"                               => "Название товара",
-    "name_required"                      => "Название товара - обязательно для заполнения.",
-    "new"                                => "Новый товар",
-    "no_description_items"               => "Нет описания товаров",
-    "no_items_to_display"                => "Нет товаров для отображения.",
-    "none"                               => "Нет",
-    "none_selected"                      => "Вы не выбрали ни одного товара для редактирования",
-    "nonstock"                           => "Нет в наличии",
-    "number_information"                 => "Номер товара",
-    "number_required"                    => "Штрихкод - обязательное поле для заполнения.",
-    "one_or_multiple"                    => "товар(ов)",
-    "pack_name"                          => "Название упаковки",
-    "qty_per_pack"                       => "Количество в упаковке",
-    "quantity"                           => "Количество",
-    "quantity_number"                    => "Количество должно быть числом.",
-    "quantity_required"                  => "Количество - обязательное поле для заполнения.",
-    "receiving_quantity"                 => "Количество закупок",
-    "remove_image"                       => "Удалить изображение",
-    "reorder_level"                      => "Уровень повторного заказа",
-    "reorder_level_number"               => "Уровень повторного заказа должно быть числом.",
-    "reorder_level_required"             => "Уровень повторного заказа - обязательное поле для заполнения.",
-    "retrive_item_info"                  => "Информация о получении товара",
-    "sales_tax_1"                        => "Налог на продажу",
-    "sales_tax_2"                        => "Налог на продажу 2",
-    "search_attributes"                  => "Поиск атрибутов",
-    "select_image"                       => "Выбрать изображение",
-    "serialized_items"                   => "Выбранные товары",
-    "standard"                           => "Стандарт",
-    "stock"                              => "В наличии",
-    "stock_location"                     => "Расположение запасов",
-    "stock_type"                         => "Наличие",
-    "successful_adding"                  => "Вы успешно добавили товар",
-    "successful_bulk_edit"               => "Вы успешно обновили выбранный товар(ы)",
-    "successful_deleted"                 => "Успешно удалено",
-    "successful_updating"                => "Товар успешно обновлен",
-    "supplier"                           => "Поставщик",
-    "tax_1"                              => "Налог 1",
-    "tax_2"                              => "Налог 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Категория налога",
-    "tax_percent"                        => "процент налога",
-    "tax_percent_number"                 => "Налоговый процент должен быть числом",
-    "tax_percent_required"               => "Налоговый процент - обязательно для заполнения.",
-    "tax_percents"                       => "Налоговый процент",
-    "temp"                               => "Временный",
-    "type"                               => "Тип товара",
-    "unit_price"                         => "Розничная цена",
-    "unit_price_number"                  => "Розничная цена должна быть числом.",
-    "unit_price_required"                => "Розничная цена - обязательное поле для заполнения.",
-    "upc_database"                       => "База данных штрих-кодов",
-    "update"                             => "Обновление товара",
-    "use_inventory_menu"                 => "Использовать меню запасов",
+    'add_minus'                          => 'Добавить/убрать товар.',
+    'allow_alt_description'              => 'Разрешить альтернативные описания',
+    'amount_entry'                       => 'Ввод количества',
+    'bulk_edit'                          => 'Массовое редактирование',
+    'buy_price_required'                 => 'Цена покупки - обязательное поле.',
+    'cannot_be_deleted'                  => 'Не удалось удалить выбраннй(ые) товар(ы), так как у одного или нескольких выбранных товаров есть продажи.',
+    'cannot_find_item'                   => 'Товар не найден.',
+    'categories'                         => '',
+    'category'                           => 'Категория',
+    'category_new'                       => '',
+    'category_required'                  => 'Категория - обязательное поле.',
+    'change_all_to_allow_alt_desc'       => 'Разрешить альтернативное описание для всех.',
+    'change_all_to_not_allow_allow_desc' => 'Не разрешать альтернативные описания для всех.',
+    'change_all_to_serialized'           => 'Выбрать все',
+    'change_all_to_unserialized'         => 'Снять выделение со всех',
+    'change_image'                       => 'Изменить изображение',
+    'confirm_bulk_edit'                  => 'Вы уверены, что хотите редактировать выбранные товары?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Вся информация о налогах на товар будет изменена.',
+    'confirm_delete'                     => 'Вы уверены, что хотите удалить выбранные товары?',
+    'confirm_restore'                    => 'Вы уверены, что хотите восстановить выбранные товары?',
+    'cost_price'                         => 'Оптовая цена',
+    'cost_price_number'                  => 'Оптовая цена должна быть числом.',
+    'cost_price_required'                => 'Оптовая цена - обязательное поле.',
+    'count'                              => 'Обновление запасов',
+    'csv_import_failed'                  => 'Ошибка импорта CSV',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Загруженный файл CSV не содержит данных или имеет неправильный формат.',
+    'csv_import_partially_failed'        => 'В строке (строках) произошло {0} ошибок импорта: {1}. Ничего не было импортировано.',
+    'csv_import_success'                 => 'Товар успешно импортирован из CSV.',
+    'current_quantity'                   => 'Текущее количество',
+    'default_pack_name'                  => 'Каждый',
+    'description'                        => 'Описание',
+    'details_count'                      => 'Сведения о запасах',
+    'do_nothing'                         => 'Ничего не делать',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Отредактируйте нужные поля у выбранных товаров.',
+    'edit_multiple_items'                => 'Редактирование нескольких товаров',
+    'empty_upc_items'                    => 'Штрих-код товара(ов) пуст',
+    'error_adding_updating'              => 'Ошибка при добавлении/обновлении товара',
+    'error_updating_multiple'            => 'Ошибка при обновлении товаров',
+    'generate_barcodes'                  => 'Генерация штрих-кодов',
+    'hsn_code'                           => 'Согласованная система номенклатуры',
+    'image'                              => 'Изображение',
+    'import_items_csv'                   => 'Импорт товаров из CSV',
+    'info_provided_by'                   => 'Информация предоставлена',
+    'inventory'                          => 'Запасы',
+    'inventory_CSV_import_quantity'      => 'Импортированое количество из CSV',
+    'inventory_comments'                 => 'Комментарии',
+    'inventory_data_tracking'            => 'Отслеживание запасов',
+    'inventory_date'                     => 'Дата',
+    'inventory_employee'                 => 'Сотрудник',
+    'inventory_in_out_quantity'          => 'Количество (Приход / Уход)',
+    'inventory_remarks'                  => 'Пометки',
+    'is_deleted'                         => 'Удаленный',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Товар имеет серийный номер',
+    'item'                               => 'Товар',
+    'item_id'                            => '',
+    'item_number'                        => 'Штрих-код',
+    'item_number_duplicate'              => 'Товар с таким номером уже присутствует в базе данных.',
+    'item_number_invalid'                => 'Номер товара содержит недопустимые символы.',
+    'kit'                                => 'Комплект',
+    'location'                           => 'Расположение',
+    'low_inventory_items'                => 'Товары не в наличии',
+    'low_sell_item'                      => 'Товар с низким уровнем продаж',
+    'manually_editing_of_quantity'       => 'Ручное редактирование количества',
+    'markup'                             => '',
+    'name'                               => 'Название товара',
+    'name_required'                      => 'Название товара - обязательно для заполнения.',
+    'new'                                => 'Новый товар',
+    'no_description_items'               => 'Нет описания товаров',
+    'no_items_to_display'                => 'Нет товаров для отображения.',
+    'none'                               => 'Нет',
+    'none_selected'                      => 'Вы не выбрали ни одного товара для редактирования',
+    'nonstock'                           => 'Нет в наличии',
+    'number_information'                 => 'Номер товара',
+    'number_required'                    => 'Штрихкод - обязательное поле для заполнения.',
+    'one_or_multiple'                    => 'товар(ов)',
+    'pack_name'                          => 'Название упаковки',
+    'qty_per_pack'                       => 'Количество в упаковке',
+    'quantity'                           => 'Количество',
+    'quantity_number'                    => 'Количество должно быть числом.',
+    'quantity_required'                  => 'Количество - обязательное поле для заполнения.',
+    'receiving_quantity'                 => 'Количество закупок',
+    'remove_image'                       => 'Удалить изображение',
+    'reorder_level'                      => 'Уровень повторного заказа',
+    'reorder_level_number'               => 'Уровень повторного заказа должно быть числом.',
+    'reorder_level_required'             => 'Уровень повторного заказа - обязательное поле для заполнения.',
+    'retrive_item_info'                  => 'Информация о получении товара',
+    'sales_tax_1'                        => 'Налог на продажу',
+    'sales_tax_2'                        => 'Налог на продажу 2',
+    'search_attributes'                  => 'Поиск атрибутов',
+    'select_image'                       => 'Выбрать изображение',
+    'serialized_items'                   => 'Выбранные товары',
+    'standard'                           => 'Стандарт',
+    'stock'                              => 'В наличии',
+    'stock_location'                     => 'Расположение запасов',
+    'stock_type'                         => 'Наличие',
+    'successful_adding'                  => 'Вы успешно добавили товар',
+    'successful_bulk_edit'               => 'Вы успешно обновили выбранный товар(ы)',
+    'successful_deleted'                 => 'Успешно удалено',
+    'successful_updating'                => 'Товар успешно обновлен',
+    'supplier'                           => 'Поставщик',
+    'tax_1'                              => 'Налог 1',
+    'tax_2'                              => 'Налог 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Категория налога',
+    'tax_name_invalid'                   => 'Название налога содержит недопустимые символы.',
+    'tax_percent'                        => 'процент налога',
+    'tax_percent_number'                 => 'Налоговый процент должен быть числом',
+    'tax_percent_required'               => 'Налоговый процент - обязательно для заполнения.',
+    'tax_percents'                       => 'Налоговый процент',
+    'temp'                               => 'Временный',
+    'type'                               => 'Тип товара',
+    'unit_price'                         => 'Розничная цена',
+    'unit_price_number'                  => 'Розничная цена должна быть числом.',
+    'unit_price_required'                => 'Розничная цена - обязательное поле для заполнения.',
+    'upc_database'                       => 'База данных штрих-кодов',
+    'update'                             => 'Обновление товара',
+    'use_inventory_menu'                 => 'Использовать меню запасов',
 ];
diff --git a/app/Language/ru/Login.php b/app/Language/ru/Login.php
index 9390a626c..9eb860d1d 100644
--- a/app/Language/ru/Login.php
+++ b/app/Language/ru/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Я не робот.",
-    "go"                            => "Войти",
-    "invalid_gcaptcha"              => "Пожалуйста, подтвердите, что вы не робот.",
-    "invalid_installation"          => "Ошибка установки, проверьте файл php.ini.",
-    "invalid_username_and_password" => "Неверное имя пользователя или пароль.",
-    "login"                         => "Вход",
-    "logout"                        => "Выход",
-    "migration_needed"              => "Миграция базы данных в {0} начнется после входа в систему.",
-    "password"                      => "Пароль",
-    "required_username"             => "",
-    "username"                      => "Имя пользователя",
-    "welcome"                       => "Панель управления",
+    "gcaptcha"                            => "Я не робот.",
+    "go"                                  => "Войти",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Пожалуйста, подтвердите, что вы не робот.",
+    "invalid_installation"                => "Ошибка установки, проверьте файл php.ini.",
+    "invalid_username_and_password"       => "Неверное имя пользователя или пароль.",
+    "login"                               => "Вход",
+    "logout"                              => "Выход",
+    "migrating_database"                  => "Миграция базы данных",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "База данных успешно перенесена!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "Миграция базы данных в {0} начнется после входа в систему.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Пароль",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Слишком много попыток. Пожалуйста, подождите немного и попробуйте снова.',
+    "username"                            => "Имя пользователя",
+    "welcome"                             => "Панель управления"
 ];
diff --git a/app/Language/ru/Sales.php b/app/Language/ru/Sales.php
index 7a3c2a977..9c8ddfa64 100644
--- a/app/Language/ru/Sales.php
+++ b/app/Language/ru/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Доступные баллы",
-    "rewards_package"                  => "Награды",
-    "rewards_remaining_balance"        => "Остаток бонусных баллов составляет ",
-    "account_number"                   => "Счет #",
-    "add_payment"                      => "Добавить оплату",
-    "amount_due"                       => "Сумма задолженности",
-    "amount_tendered"                  => "Предложенная сумма",
-    "authorized_signature"             => "Подпись уполномоченного лица",
-    "cancel_sale"                      => "Отменить продажу",
-    "cash"                             => "Наличные",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Денежная корректировка",
-    "cash_deposit"                     => "Наличный депозит",
-    "cash_filter"                      => "Наличные",
-    "change_due"                       => "Изменение задолженности",
-    "change_price"                     => "Изменить цену продажи",
-    "check"                            => "Банковский чек",
-    "check_balance"                    => "Проверка остатка",
-    "check_filter"                     => "Банковский чек",
-    "close"                            => "",
-    "comment"                          => "Комментарий",
-    "comments"                         => "Комментарии",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Завершить продажу",
-    "confirm_cancel_sale"              => "Вы уверены, что хотите удалить эту продажу? Все товары будут очищены.",
-    "confirm_delete"                   => "Вы уверены, что хотите удалить выбранные продажи?",
-    "confirm_restore"                  => "Вы уверены, что хотите восстановить выбранные продажи?",
-    "credit"                           => "Кредитная карта",
-    "credit_deposit"                   => "Кредитный депозит",
-    "credit_filter"                    => "Кредитная карта",
-    "current_table"                    => "",
-    "customer"                         => "Клиент",
-    "customer_address"                 => "Адрес",
-    "customer_discount"                => "Скидка",
-    "customer_email"                   => "Эл. почта",
-    "customer_location"                => "Расположение",
-    "customer_mailchimp_status"        => "Статус Mailchimp",
-    "customer_optional"                => "(Требуется для своевременной оплаты)",
-    "customer_required"                => "(Необходимо)",
-    "customer_total"                   => "Итог",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Дата продажи",
-    "date_range"                       => "Диапазон дат",
-    "date_required"                    => "Необходимо ввести правильную дату.",
-    "date_type"                        => "Дата - обязательное поле для заполнения.",
-    "debit"                            => "Дебетовая карта",
-    "debit_filter"                     => "",
-    "delete"                           => "Разрешить удаление",
-    "delete_confirmation"              => "Вы уверены, что хотите удалить эту продажу? Это действие не может быть отменено.",
-    "delete_entire_sale"               => "Удалить все продажи",
-    "delete_successful"                => "Успешно удалено.",
-    "delete_unsuccessful"              => "Ошибка при удалении продажи.",
-    "description_abbrv"                => "Опис.",
-    "discard"                          => "Брак",
-    "discard_quote"                    => "",
-    "discount"                         => "Скидка",
-    "discount_included"                => "% скидки",
-    "discount_short"                   => "%",
-    "due"                              => "Долг",
-    "due_filter"                       => "Долг",
-    "edit"                             => "Правка",
-    "edit_item"                        => "Редактировать товар",
-    "edit_sale"                        => "Редактировать продажу",
-    "email_receipt"                    => "Послать квитанцию по эл. почте",
-    "employee"                         => "Сотрудник",
-    "entry"                            => "Запись",
-    "error_editing_item"               => "Ошибка при редактировании товара",
-    "find_or_scan_item"                => "Найти/Сканировать товар",
-    "find_or_scan_item_or_receipt"     => "Найти/Сканировать товара или квитанцию",
-    "giftcard"                         => "Подарочная карта",
-    "giftcard_balance"                 => "Баланс подарочной карты",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Номер подарочной карты",
-    "group_by_category"                => "Сгруппировать по категориям",
-    "group_by_type"                    => "Сгруппировать по типу",
-    "hsn"                              => "",
-    "id"                               => "№ продажи",
-    "include_prices"                   => "Включить цены?",
-    "invoice"                          => "Накладная",
-    "invoice_confirm"                  => "Эта накладная будет отправлена",
-    "invoice_enable"                   => "Номер накладной",
-    "invoice_filter"                   => "Накладные",
-    "invoice_no_email"                 => "У этого клиента нет действующего адреса электронной почты.",
-    "invoice_number"                   => "Накладная #",
-    "invoice_number_duplicate"         => "Номер накладной {0} должен быть уникальным.",
-    "invoice_sent"                     => "Накладная отправлена",
-    "invoice_total"                    => "Общая сумма накладной",
-    "invoice_type_custom_invoice"      => "Пользовательская накладная (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Пользовательская налоговая накладная (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Накладная (invoice.php)",
-    "invoice_type_tax_invoice"         => "Налоговая накладная (tax_invoice.php)",
-    "invoice_unsent"                   => "Не удалось отправить накладную",
-    "invoice_update"                   => "Пересчет",
-    "item_insufficient_of_stock"       => "Недостаточно товара в наличии.",
-    "item_name"                        => "Название товара",
-    "item_number"                      => "№ товара",
-    "item_out_of_stock"                => "Этот товар отсутствует в наличии.",
-    "key_browser"                      => "Сочетания клавиш",
-    "key_cancel"                       => "Отмена текущих предложений/накладных/продаж",
-    "key_customer_search"              => "Поиск клиента",
-    "key_finish_quote"                 => "Закрыть предложение/накладную без оплаты",
-    "key_finish_sale"                  => "Добавить платеж и заполнить накладную/продажу",
-    "key_full"                         => "Открыть в полноэкранном режиме",
-    "key_function"                     => "Назначение",
-    "key_help"                         => "Сочетания клавиш",
-    "key_help_modal"                   => "Показать сочетания клавиш",
-    "key_in"                           => "Увеличить",
-    "key_item_search"                  => "Поиск товара",
-    "key_out"                          => "Отдалить",
-    "key_payment"                      => "Добавить оплату",
-    "key_print"                        => "Распечатать текущую страницу",
-    "key_restore"                      => "Восстановить исходное отображение/увеличение",
-    "key_search"                       => "Поиск таблиц отчетов",
-    "key_suspend"                      => "Приостановить текущую продажу",
-    "key_suspended"                    => "Показать приостановленные продажи",
-    "key_system"                       => "Системные горячие клавиши",
-    "key_tendered"                     => "Изменить предложенную сумму",
-    "key_title"                        => "Сочетания клавиш для продаж",
-    "mc"                               => "",
-    "mode"                             => "Режим журнала",
-    "must_enter_numeric"               => "Предложенная сумма должна быть числом.",
-    "must_enter_numeric_giftcard"      => "Номер подарочной карты должен быть числом.",
-    "new_customer"                     => "Новый клиент",
-    "new_item"                         => "Новый товар",
-    "no_description"                   => "Нет описания",
-    "no_filter"                        => "Все",
-    "no_items_in_cart"                 => "Нет товаров в корзине.",
-    "no_sales_to_display"              => "Нет продаж для отображения.",
-    "none_selected"                    => "Вы не выбрали ни одной продажи для удаления.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "Это действие не разрешено.",
-    "one_or_multiple"                  => "Продажа(ы)",
-    "payment"                          => "Тип оплаты",
-    "payment_amount"                   => "Сумма",
-    "payment_not_cover_total"          => "Сумма оплаты должна быть больше или равна общей сумме.",
-    "payment_type"                     => "Тип",
-    "payments"                         => "",
-    "payments_total"                   => "Всего оплат",
-    "price"                            => "Цена",
-    "print_after_sale"                 => "Распечатать после продажи",
-    "quantity"                         => "Кол-во",
-    "quantity_less_than_reorder_level" => "Внимание: желаемое количество ниже уровня повторного заказа для этого товара.",
-    "quantity_less_than_zero"          => "Предупреждение: Желаемое количество недостаточно. Вы по-прежнему можете оформить продажу, но проверьте свои запасы.",
-    "quantity_of_items"                => "Кол-во товара {0}",
-    "quote"                            => "Предложение",
-    "quote_number"                     => "№ предложения",
-    "quote_number_duplicate"           => "Номер предложения должен быть уникальным.",
-    "quote_sent"                       => "Предложение отправлено",
-    "quote_unsent"                     => "Предложение не было отправлено",
-    "receipt"                          => "Товарный чек",
-    "receipt_no_email"                 => "У этого клиента нет действующего адреса электронной почты.",
-    "receipt_number"                   => "Продажа #",
-    "receipt_sent"                     => "Чек отправлен",
-    "receipt_unsent"                   => "Чек не отправлен",
-    "refund"                           => "Тип возврата",
-    "register"                         => "Журнал продаж",
-    "remove_customer"                  => "Удалить клиента",
-    "remove_discount"                  => "",
-    "return"                           => "Возврат",
-    "rewards"                          => "Бонусные баллы",
-    "rewards_balance"                  => "Баланс бонусных баллов",
-    "sale"                             => "Продажа",
-    "sale_by_invoice"                  => "Продажа по накладной",
-    "sale_for_customer"                => "Клиент:",
-    "sale_time"                        => "Время",
-    "sales_tax"                        => "Налог с продаж",
-    "sales_total"                      => "",
-    "select_customer"                  => "Выберите клиента",
-    "send_invoice"                     => "Отправить накладную",
-    "send_quote"                       => "Отправить предложение",
-    "send_receipt"                     => "Отправить чек",
-    "send_work_order"                  => "Отправить рабочий заказ",
-    "serial"                           => "Серийный номер",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Показать накладную",
-    "show_receipt"                     => "Показать чек",
-    "start_typing_customer_name"       => "Начните печатать имя клиента...",
-    "start_typing_item_name"           => "Сосканируйте штрих-код или начните печатать название товара...",
-    "stock"                            => "Запасы",
-    "stock_location"                   => "Расположение склада",
-    "sub_total"                        => "Промежуточный итог",
-    "successfully_deleted"             => "Успешно удалено",
-    "successfully_restored"            => "Успешно восстановлено",
-    "successfully_suspended_sale"      => "Продажа успешно приостановлена.",
-    "successfully_updated"             => "Продажа успешно обновлена.",
-    "suspend_sale"                     => "Приостановка продажи",
-    "suspended_doc_id"                 => "Документ",
-    "suspended_sale_id"                => "№",
-    "suspended_sales"                  => "Приостановлено",
-    "table"                            => "Таблица",
-    "takings"                          => "Ежедневные продажи",
-    "tax"                              => "Налог",
-    "tax_id"                           => "№ налога",
-    "tax_invoice"                      => "Налоговая накладная",
-    "tax_percent"                      => "Налоговые %",
-    "taxed_ind"                        => "Н",
-    "total"                            => "Итог",
-    "total_tax_exclusive"              => "Без налога",
-    "transaction_failed"               => "Ошибка транзакции продажи.",
-    "unable_to_add_item"               => "Не удалось добавить товар в продажу",
-    "unsuccessfully_deleted"           => "Продажу(и) удалить не удалось.",
-    "unsuccessfully_restored"          => "Не удалось восстановить продажу(и).",
-    "unsuccessfully_suspended_sale"    => "Не удалось приостановить продажу.",
-    "unsuccessfully_updated"           => "Не удалось обновить продажу.",
-    "unsuspend"                        => "Возобновить",
-    "unsuspend_and_delete"             => "Действие",
-    "update"                           => "Обновить",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Рабочий заказ",
-    "work_order_number"                => "Номер рабочего заказа",
-    "work_order_number_duplicate"      => "Номер рабочего заказа должен быть уникальным.",
-    "work_order_sent"                  => "Рабочий заказ отправлен",
-    "work_order_unsent"                => "Не удалось отправить рабочий заказ",
+    'account_number'                    => 'Счет #',
+    'add_payment'                       => 'Добавить оплату',
+    'amount_due'                        => 'Сумма задолженности',
+    'amount_due_not_covered'            => 'Платежи не покрывают причитающуюся сумму.',
+    'amount_tendered'                   => 'Предложенная сумма',
+    'authorized_signature'              => 'Подпись уполномоченного лица',
+    'cancel_sale'                       => 'Отменить продажу',
+    'cash'                              => 'Наличные',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Денежная корректировка',
+    'cash_deposit'                      => 'Наличный депозит',
+    'cash_filter'                       => 'Наличные',
+    'change_due'                        => 'Изменение задолженности',
+    'change_price'                      => 'Изменить цену продажи',
+    'check'                             => 'Банковский чек',
+    'check_balance'                     => 'Проверка остатка',
+    'check_filter'                      => 'Банковский чек',
+    'close'                             => '',
+    'comment'                           => 'Комментарий',
+    'comments'                          => 'Комментарии',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Завершить продажу',
+    'confirm_cancel_sale'               => 'Вы уверены, что хотите удалить эту продажу? Все товары будут очищены.',
+    'confirm_delete'                    => 'Вы уверены, что хотите удалить выбранные продажи?',
+    'confirm_restore'                   => 'Вы уверены, что хотите восстановить выбранные продажи?',
+    'credit'                            => 'Кредитная карта',
+    'credit_deposit'                    => 'Кредитный депозит',
+    'credit_filter'                     => 'Кредитная карта',
+    'current_table'                     => '',
+    'customer'                          => 'Клиент',
+    'customer_address'                  => 'Адрес',
+    'customer_discount'                 => 'Скидка',
+    'customer_email'                    => 'Эл. почта',
+    'customer_location'                 => 'Расположение',
+    'customer_mailchimp_status'         => 'Статус Mailchimp',
+    'customer_optional'                 => '(Требуется для своевременной оплаты)',
+    'customer_required'                 => '(Необходимо)',
+    'customer_total'                    => 'Итог',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Доступные баллы',
+    'daily_sales'                       => '',
+    'date'                              => 'Дата продажи',
+    'date_range'                        => 'Диапазон дат',
+    'date_required'                     => 'Необходимо ввести правильную дату.',
+    'date_type'                         => 'Дата - обязательное поле для заполнения.',
+    'debit'                             => 'Дебетовая карта',
+    'debit_filter'                      => '',
+    'delete'                            => 'Разрешить удаление',
+    'delete_confirmation'               => 'Вы уверены, что хотите удалить эту продажу? Это действие не может быть отменено.',
+    'delete_entire_sale'                => 'Удалить все продажи',
+    'delete_successful'                 => 'Успешно удалено.',
+    'delete_unsuccessful'               => 'Ошибка при удалении продажи.',
+    'description_abbrv'                 => 'Опис.',
+    'discard'                           => 'Брак',
+    'discard_quote'                     => '',
+    'discount'                          => 'Скидка',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% скидки',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Долг',
+    'due_filter'                        => 'Долг',
+    'edit'                              => 'Правка',
+    'edit_item'                         => 'Редактировать товар',
+    'edit_sale'                         => 'Редактировать продажу',
+    'email_receipt'                     => 'Послать квитанцию по эл. почте',
+    'employee'                          => 'Сотрудник',
+    'entry'                             => 'Запись',
+    'error_editing_item'                => 'Ошибка при редактировании товара',
+    'find_or_scan_item'                 => 'Найти/Сканировать товар',
+    'find_or_scan_item_or_receipt'      => 'Найти/Сканировать товара или квитанцию',
+    'giftcard'                          => 'Подарочная карта',
+    'giftcard_balance'                  => 'Баланс подарочной карты',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Номер подарочной карты',
+    'group_by_category'                 => 'Сгруппировать по категориям',
+    'group_by_type'                     => 'Сгруппировать по типу',
+    'hsn'                               => '',
+    'id'                                => '№ продажи',
+    'include_prices'                    => 'Включить цены?',
+    'insufficient_giftcard_balance'     => 'Недостаточный баланс подарочной карты для этого платежа.',
+    'insufficient_reward_points'        => 'Недостаточно баллов вознаграждения для этого платежа.',
+    'invoice'                           => 'Накладная',
+    'invoice_confirm'                   => 'Эта накладная будет отправлена',
+    'invoice_enable'                    => 'Номер накладной',
+    'invoice_filter'                    => 'Накладные',
+    'invoice_no_email'                  => 'У этого клиента нет действующего адреса электронной почты.',
+    'invoice_number'                    => 'Накладная #',
+    'invoice_number_duplicate'          => 'Номер накладной {0} должен быть уникальным.',
+    'invoice_sent'                      => 'Накладная отправлена',
+    'invoice_total'                     => 'Общая сумма накладной',
+    'invoice_type_custom_invoice'       => 'Пользовательская накладная (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Пользовательская налоговая накладная (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Накладная (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Налоговая накладная (tax_invoice.php)',
+    'invoice_unsent'                    => 'Не удалось отправить накладную',
+    'invoice_update'                    => 'Пересчет',
+    'item_insufficient_of_stock'        => 'Недостаточно товара в наличии.',
+    'item_name'                         => 'Название товара',
+    'item_number'                       => '№ товара',
+    'item_out_of_stock'                 => 'Этот товар отсутствует в наличии.',
+    'key_browser'                       => 'Сочетания клавиш',
+    'key_cancel'                        => 'Отмена текущих предложений/накладных/продаж',
+    'key_customer_search'               => 'Поиск клиента',
+    'key_finish_quote'                  => 'Закрыть предложение/накладную без оплаты',
+    'key_finish_sale'                   => 'Добавить платеж и заполнить накладную/продажу',
+    'key_full'                          => 'Открыть в полноэкранном режиме',
+    'key_function'                      => 'Назначение',
+    'key_help'                          => 'Сочетания клавиш',
+    'key_help_modal'                    => 'Показать сочетания клавиш',
+    'key_in'                            => 'Увеличить',
+    'key_item_search'                   => 'Поиск товара',
+    'key_out'                           => 'Отдалить',
+    'key_payment'                       => 'Добавить оплату',
+    'key_print'                         => 'Распечатать текущую страницу',
+    'key_restore'                       => 'Восстановить исходное отображение/увеличение',
+    'key_search'                        => 'Поиск таблиц отчетов',
+    'key_suspend'                       => 'Приостановить текущую продажу',
+    'key_suspended'                     => 'Показать приостановленные продажи',
+    'key_system'                        => 'Системные горячие клавиши',
+    'key_tendered'                      => 'Изменить предложенную сумму',
+    'key_title'                         => 'Сочетания клавиш для продаж',
+    'mc'                                => '',
+    'mode'                              => 'Режим журнала',
+    'must_enter_numeric'                => 'Предложенная сумма должна быть числом.',
+    'must_enter_numeric_giftcard'       => 'Номер подарочной карты должен быть числом.',
+    'must_enter_reference_code'         => 'Необходимо ввести справочный/поисковый номер.',
+    'negative_amount_tendered'          => 'Предложенная сумма не может быть отрицательной.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Новый клиент',
+    'new_item'                          => 'Новый товар',
+    'no_description'                    => 'Нет описания',
+    'no_filter'                         => 'Все',
+    'no_items_in_cart'                  => 'Нет товаров в корзине.',
+    'no_sales_to_display'               => 'Нет продаж для отображения.',
+    'none_selected'                     => 'Вы не выбрали ни одной продажи для удаления.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'Это действие не разрешено.',
+    'one_or_multiple'                   => 'Продажа(ы)',
+    'payment'                           => 'Тип оплаты',
+    'payment_amount'                    => 'Сумма',
+    'payment_not_cover_total'           => 'Сумма оплаты должна быть больше или равна общей сумме.',
+    'payment_type'                      => 'Тип',
+    'payments'                          => '',
+    'payments_total'                    => 'Всего оплат',
+    'price'                             => 'Цена',
+    'print_after_sale'                  => 'Распечатать после продажи',
+    'quantity'                          => 'Кол-во',
+    'quantity_less_than_reorder_level'  => 'Внимание: желаемое количество ниже уровня повторного заказа для этого товара.',
+    'quantity_less_than_zero'           => 'Предупреждение: Желаемое количество недостаточно. Вы по-прежнему можете оформить продажу, но проверьте свои запасы.',
+    'quantity_of_items'                 => 'Кол-во товара {0}',
+    'quote'                             => 'Предложение',
+    'quote_number'                      => '№ предложения',
+    'quote_number_duplicate'            => 'Номер предложения должен быть уникальным.',
+    'quote_sent'                        => 'Предложение отправлено',
+    'quote_unsent'                      => 'Предложение не было отправлено',
+    'receipt'                           => 'Товарный чек',
+    'receipt_no_email'                  => 'У этого клиента нет действующего адреса электронной почты.',
+    'receipt_number'                    => 'Продажа #',
+    'receipt_sent'                      => 'Чек отправлен',
+    'receipt_unsent'                    => 'Чек не отправлен',
+    'reference_code'                    => 'Код ссылки на платёж',
+    'reference_code_invalid_characters' => 'Код ссылки должен содержать только буквы и цифры.',
+    'reference_code_length_error'       => 'Длина кода ссылки недопустима.',
+    'refund'                            => 'Тип возврата',
+    'register'                          => 'Журнал продаж',
+    'remove_customer'                   => 'Удалить клиента',
+    'remove_discount'                   => '',
+    'return'                            => 'Возврат',
+    'rewards'                           => 'Бонусные баллы',
+    'rewards_balance'                   => 'Баланс бонусных баллов',
+    'rewards_package'                   => 'Награды',
+    'rewards_remaining_balance'         => 'Остаток бонусных баллов составляет ',
+    'sale'                              => 'Продажа',
+    'sale_by_invoice'                   => 'Продажа по накладной',
+    'sale_for_customer'                 => 'Клиент:',
+    'sale_time'                         => 'Время',
+    'sales_tax'                         => 'Налог с продаж',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Выберите клиента',
+    'send_invoice'                      => 'Отправить накладную',
+    'send_quote'                        => 'Отправить предложение',
+    'send_receipt'                      => 'Отправить чек',
+    'send_work_order'                   => 'Отправить рабочий заказ',
+    'serial'                            => 'Серийный номер',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Показать накладную',
+    'show_receipt'                      => 'Показать чек',
+    'start_typing_customer_name'        => 'Начните печатать имя клиента...',
+    'start_typing_item_name'            => 'Сосканируйте штрих-код или начните печатать название товара...',
+    'stock'                             => 'Запасы',
+    'stock_location'                    => 'Расположение склада',
+    'sub_total'                         => 'Промежуточный итог',
+    'successfully_deleted'              => 'Успешно удалено',
+    'successfully_restored'             => 'Успешно восстановлено',
+    'successfully_suspended_sale'       => 'Продажа успешно приостановлена.',
+    'successfully_updated'              => 'Продажа успешно обновлена.',
+    'suspend_sale'                      => 'Приостановка продажи',
+    'suspended_doc_id'                  => 'Документ',
+    'suspended_sale_id'                 => '№',
+    'suspended_sales'                   => 'Приостановлено',
+    'table'                             => 'Таблица',
+    'takings'                           => 'Ежедневные продажи',
+    'tax'                               => 'Налог',
+    'tax_id'                            => '№ налога',
+    'tax_invoice'                       => 'Налоговая накладная',
+    'tax_percent'                       => 'Налоговые %',
+    'taxed_ind'                         => 'Н',
+    'total'                             => 'Итог',
+    'total_tax_exclusive'               => 'Без налога',
+    'transaction_failed'                => 'Ошибка транзакции продажи.',
+    'unable_to_add_item'                => 'Не удалось добавить товар в продажу',
+    'unsuccessfully_deleted'            => 'Продажу(и) удалить не удалось.',
+    'unsuccessfully_restored'           => 'Не удалось восстановить продажу(и).',
+    'unsuccessfully_suspended_sale'     => 'Не удалось приостановить продажу.',
+    'unsuccessfully_updated'            => 'Не удалось обновить продажу.',
+    'unsuspend'                         => 'Возобновить',
+    'unsuspend_and_delete'              => 'Действие',
+    'update'                            => 'Обновить',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Рабочий заказ',
+    'work_order_number'                 => 'Номер рабочего заказа',
+    'work_order_number_duplicate'       => 'Номер рабочего заказа должен быть уникальным.',
+    'work_order_sent'                   => 'Рабочий заказ отправлен',
+    'work_order_unsent'                 => 'Не удалось отправить рабочий заказ',
 ];
diff --git a/app/Language/sv/Attributes.php b/app/Language/sv/Attributes.php
index c86125997..3d9dac43c 100644
--- a/app/Language/sv/Attributes.php
+++ b/app/Language/sv/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attributvärdet får inte innehålla '_' eller '|'",
-    "confirm_delete"                   => "Är du säker på att du vill ta bort de valda attributen?",
-    "confirm_restore"                  => "Är du säker på att du vill återställa de valda attributen?",
-    "definition_cannot_be_deleted"     => "Det gick inte att ta bort valda attribut",
-    "definition_error_adding_updating" => "Attribut{0} kunde inte läggas till eller uppdateras. Kontrollera felloggen.",
-    "definition_flags"                 => "Attribut synlighet",
-    "definition_group"                 => "Grupp",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Lägg till attribut",
-    "definition_name_required"         => "Attributnamn är ett obligatoriskt fält",
-    "definition_one_or_multiple"       => "attribut",
-    "definition_successful_adding"     => "Du har lagt till artikeln",
-    "definition_successful_deleted"    => "Du har tagit bort",
-    "definition_successful_updating"   => "Du har uppdaterat attributet",
-    "definition_type"                  => "Attributtyp",
-    "definition_type_required"         => "Attributtyp är ett obligatoriskt fält",
-    "definition_unit"                  => "Måttenhet",
-    "definition_values"                => "Attributvärden",
-    "new"                              => "Nytt attribut",
-    "no_attributes_to_display"         => "Inga artiklar att visa",
-    "receipt_visibility"               => "Kvitto",
-    "show_in_items"                    => "Visa i artiklar",
-    "show_in_items_visibility"         => "Artiklar",
-    "show_in_receipt"                  => "Visa i kvitto",
-    "show_in_receivings"               => "Visa i mottagande",
-    "show_in_receivings_visibility"    => "Inleveranser",
-    "show_in_sales"                    => "Visa i försäljning",
-    "show_in_sales_visibility"         => "Försäljning",
-    "update"                           => "Uppdatera attribut",
+    'attribute_value_invalid_chars'    => 'Attributvärdet får inte innehålla \'_\' eller \'|\'',
+    'confirm_delete'                   => 'Är du säker på att du vill ta bort de valda attributen?',
+    'confirm_restore'                  => 'Är du säker på att du vill återställa de valda attributen?',
+    'definition_cannot_be_deleted'     => 'Det gick inte att ta bort valda attribut',
+    'definition_invalid_group' => 'Den valda gruppen finns inte eller är ogiltig.',
+    'definition_error_adding_updating' => 'Attribut{0} kunde inte läggas till eller uppdateras. Kontrollera felloggen.',
+    'definition_flags'                 => 'Attribut synlighet',
+    'definition_group'                 => 'Grupp',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Lägg till attribut',
+    'definition_name_required'         => 'Attributnamn är ett obligatoriskt fält',
+    'definition_one_or_multiple'       => 'attribut',
+    'definition_successful_adding'     => 'Du har lagt till artikeln',
+    'definition_successful_deleted'    => 'Du har tagit bort',
+    'definition_successful_updating'   => 'Du har uppdaterat attributet',
+    'definition_type'                  => 'Attributtyp',
+    'definition_type_required'         => 'Attributtyp är ett obligatoriskt fält',
+    'definition_unit'                  => 'Måttenhet',
+    'definition_values'                => 'Attributvärden',
+    'new'                              => 'Nytt attribut',
+    'no_attributes_to_display'         => 'Inga artiklar att visa',
+    'receipt_visibility'               => 'Kvitto',
+    'show_in_items'                    => 'Visa i artiklar',
+    'show_in_items_visibility'         => 'Artiklar',
+    'show_in_receipt'                  => 'Visa i kvitto',
+    'show_in_receivings'               => 'Visa i mottagande',
+    'show_in_receivings_visibility'    => 'Inleveranser',
+    'show_in_sales'                    => 'Visa i försäljning',
+    'show_in_sales_visibility'         => 'Försäljning',
+    'show_in_search'                   => 'Visa i sökning',
+    'show_in_search_visibility'        => 'Sökning',
+    'update'                           => 'Uppdatera attribut',
 ];
diff --git a/app/Language/sv/Bootstrap_tables.php b/app/Language/sv/Bootstrap_tables.php
index b07165db1..d5630e0da 100644
--- a/app/Language/sv/Bootstrap_tables.php
+++ b/app/Language/sv/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "alla",
-    "columns"              => "Kolumner",
-    "hide_show_pagination" => "Dölj/visa sida",
-    "loading"              => "Laddar, vänligen vänta...",
-    "page_from_to"         => "Visar {0} till {1} av {2} rader",
-    "refresh"              => "Ladda om",
-    "rows_per_page"        => "{0} rader per sida",
-    "toggle"               => "Växla",
+    'all' => "alla",
+    'columns' => "Kolumner",
+    'hide_show_pagination' => "Dölj/visa sida",
+    'loading' => "Laddar, vänligen vänta",
+    'page_from_to' => "Visar {0} till {1} av {2} rader",
+    'refresh' => "Ladda om",
+    'rows_per_page' => "{0} rader per sida",
+    'toggle' => "Växla",
 ];
diff --git a/app/Language/sv/Config.php b/app/Language/sv/Config.php
index aab3ad14d..af545ad2e 100644
--- a/app/Language/sv/Config.php
+++ b/app/Language/sv/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Företagsadress",
-    "address_required"                          => "Företagsadress är ett obligatoriskt fält.",
-    "all_set"                                   => "Alla filbehörigheter är korrekt inställda!",
-    "allow_duplicate_barcodes"                  => "Tillåt duplicera streckkoder",
-    "apostrophe"                                => "apostrof",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Säkerhetskopiera databas",
-    "barcode"                                   => "Streckkod",
-    "barcode_company"                           => "Företagsnamn",
-    "barcode_configuration"                     => "Streckkodskonfiguration",
-    "barcode_content"                           => "Streckkod innehåll",
-    "barcode_first_row"                         => "Rad 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Inmatningsformat",
-    "barcode_generate_if_empty"                 => "Skapa om tom.",
-    "barcode_height"                            => "Höjd (px)",
-    "barcode_id"                                => "Artikel-id / namn",
-    "barcode_info"                              => "Streckkodskonfigurationsinformation",
-    "barcode_layout"                            => "Streckkodslayout",
-    "barcode_name"                              => "Namn",
-    "barcode_number"                            => "Streckkod",
-    "barcode_number_in_row"                     => "Antal i rad",
-    "barcode_page_cellspacing"                  => "Visa kolumnbredd.",
-    "barcode_page_width"                        => "Visa sidbredd",
-    "barcode_price"                             => "Pris",
-    "barcode_second_row"                        => "Rad 2",
-    "barcode_third_row"                         => "Rad 3",
-    "barcode_tooltip"                           => "Varning: Den här funktionen kan orsaka att duplicerade objekt importeras eller skapas. Använd inte om du inte vill ha dubbla streckkoder.",
-    "barcode_type"                              => "Streckkodstyp",
-    "barcode_width"                             => "Bredd (px)",
-    "bottom"                                    => "Botten",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Kontant decimaler",
-    "cash_decimals_tooltip"                     => "Om kontanterna och valutadecimalen är desamma kommer ingen öresutjämning att äga rum.",
-    "cash_rounding"                             => "Öresavjämning",
-    "category_dropdown"                         => "Visa kategori som en rullgardinsmeny",
-    "center"                                    => "Mitten",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "komma",
-    "company"                                   => "Företasnamn",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Ändra bild",
-    "company_logo"                              => "Företagslogo",
-    "company_remove_image"                      => "Radera bild",
-    "company_required"                          => "Företagsnamn är ett obligatoriskt fält",
-    "company_select_image"                      => "Välj Bild",
-    "company_website_url"                       => "Företagets webbplats är inte en giltig URL (http: // ...).",
-    "country_codes"                             => "Landskod",
-    "country_codes_tooltip"                     => "Kommaseparerad lista över landskoder för nominatimadressuppslag.",
-    "currency_code"                             => "Valutakod",
-    "currency_decimals"                         => "Valuta Decimaler",
-    "currency_symbol"                           => "Valutasymbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Bonus",
-    "customer_reward_duplicate"                 => "Bonus måste vara unik.",
-    "customer_reward_enable"                    => "Aktivera kundbonus",
-    "customer_reward_invalid_chars"             => "Bonus kan inte innehålla '_'",
-    "customer_reward_required"                  => "Bonus är ett obligatoriskt fält",
-    "customer_sales_tax_support"                => "Kundomsättningskatt Support",
-    "date_or_time_format"                       => "Datum och tidsfilter",
-    "datetimeformat"                            => "Datum och tid Format",
-    "decimal_point"                             => "Decimalpunkt",
-    "default_barcode_font_size_number"          => "Standard streckkods teckensnittstorlek måste vara ett nummer.",
-    "default_barcode_font_size_required"        => "Standard streckkodstorlekstorlek är ett obligatoriskt fält.",
-    "default_barcode_height_number"             => "Standard streckkodshöjd måste vara ett nummer.",
-    "default_barcode_height_required"           => "Standard streckkodshöjd är ett obligatoriskt fält.",
-    "default_barcode_num_in_row_number"         => "Standard streckkodsnummer i rad måste vara ett nummer.",
-    "default_barcode_num_in_row_required"       => "Standard streckkodsnummer i rad måste vara ett nummer.",
-    "default_barcode_page_cellspacing_number"   => "Standard Streckkodssida Cellspacing måste vara ett nummer.",
-    "default_barcode_page_cellspacing_required" => "Standard Streckkodssida Cellspacing är ett obligatoriskt fält.",
-    "default_barcode_page_width_number"         => "Standard streckkodssidans bredd måste vara ett nummer.",
-    "default_barcode_page_width_required"       => "Standard streckkodssidans bredd är ett obligatoriskt fält.",
-    "default_barcode_width_number"              => "Standard streckkodsbredd måste vara ett nummer.",
-    "default_barcode_width_required"            => "Standard streckkodsbredd är ett obligatoriskt fält.",
-    "default_item_columns"                      => "Standard synliga artikel kolumner",
-    "default_origin_tax_code"                   => "Standard Urkomstskattkod",
-    "default_receivings_discount"               => "Standardmottagningsrabatt",
-    "default_receivings_discount_number"        => "Standardmottagningsrabatten måste vara ett nummer.",
-    "default_receivings_discount_required"      => "Standardmottagningsrabatt är ett obligatoriskt fält.",
-    "default_sales_discount"                    => "Standard Försäljningsrabatt %",
-    "default_sales_discount_number"             => "Standardförsäljningsrabatt måste vara ett nummer.",
-    "default_sales_discount_required"           => "Standardförsäljningsrabatt är ett obligatoriskt fält.",
-    "default_tax_category"                      => "Standardskattskategori",
-    "default_tax_code"                          => "Standard skattetabell",
-    "default_tax_jurisdiction"                  => "Standardskattejurisdiktion",
-    "default_tax_name_number"                   => "Standardskattnamn måste vara en sträng.",
-    "default_tax_name_required"                 => "Standardskattnamn är ett obligatoriskt fält.",
-    "default_tax_rate"                          => "Standardskattesats%",
-    "default_tax_rate_1"                        => "Skattesats 1",
-    "default_tax_rate_2"                        => "Skattesats 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Standardskattesats måste vara ett nummer.",
-    "default_tax_rate_required"                 => "Standardskattesats är ett obligatoriskt fält.",
-    "derive_sale_quantity"                      => "Tillåt avledad försäljningskvantitet",
-    "derive_sale_quantity_tooltip"              => "Om den är markerad kommer en ny objekttyp att tillhandahållas för poster som beställts med förlängd mängd",
-    "dinner_table"                              => "Bord",
-    "dinner_table_duplicate"                    => "Bordsnummer måste vara unik.",
-    "dinner_table_enable"                       => "Aktivera bord",
-    "dinner_table_invalid_chars"                => "Bordsnamn får inte innehålla '_'.",
-    "dinner_table_required"                     => "Bord är ett obligatoriskt fält.",
-    "dot"                                       => "punkt",
-    "email"                                     => "E-post",
-    "email_configuration"                       => "E-mail Konfiguration",
-    "email_mailpath"                            => "Sökväg till Sendmail",
-    "email_protocol"                            => "Protokol",
-    "email_receipt_check_behaviour"             => "Kryssruta för e-postkvitto",
-    "email_receipt_check_behaviour_always"      => "Alltid förikryssad",
-    "email_receipt_check_behaviour_last"        => "Kom ihåg det senaste valet",
-    "email_receipt_check_behaviour_never"       => "Alltid urkryssad",
-    "email_smtp_crypto"                         => "SMTP kryptering",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Lösenord",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout",
-    "email_smtp_user"                           => "SMTP Användarnamn",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Upprätthålla integritet",
-    "enforce_privacy_tooltip"                   => "Skydda kundernas integritet genom att kryptera data om deras data raderas",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Räkenskapsårets början",
-    "financial_year_apr"                        => "1 april",
-    "financial_year_aug"                        => "1 augusti",
-    "financial_year_dec"                        => "1 december",
-    "financial_year_feb"                        => "1 februari",
-    "financial_year_jan"                        => "1 januari",
-    "financial_year_jul"                        => "1 juli",
-    "financial_year_jun"                        => "1 juni",
-    "financial_year_mar"                        => "1 mars",
-    "financial_year_may"                        => "1 maj",
-    "financial_year_nov"                        => "1 november",
-    "financial_year_oct"                        => "1 oktober",
-    "financial_year_sep"                        => "1 september",
-    "floating_labels"                           => "Flytande etiketter",
-    "gcaptcha_enable"                           => "Inloggningssida reCAPTCHA",
-    "gcaptcha_secret_key"                       => "Hemlig nyckel för reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key är ett obligatoriskt fält",
-    "gcaptcha_site_key"                         => "Sid-nyckel för reCAPTCHA",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key är ett obligatoriskt fält",
-    "gcaptcha_tooltip"                          => "Skydda inloggningssidan med Google reCAPTCHA, klicka på ikonen för ett API-nyckelpar.",
-    "general"                                   => "Allmämt",
-    "general_configuration"                     => "Allmänna inställningar",
-    "giftcard_number"                           => "Presentkortsnummer",
-    "giftcard_random"                           => "Slumpa fram",
-    "giftcard_series"                           => "Generera i serie",
-    "image_allowed_file_types"                  => "Tillåtna filtyper",
-    "image_max_height_tooltip"                  => "Högsta tillåtna höjd för bilduppladdningar i pixlar (px).",
-    "image_max_size_tooltip"                    => "Högsta tillåtna filstorlek för bilduppladdningar i kilobyte (kb).",
-    "image_max_width_tooltip"                   => "Högsta tillåtna bredd för bilduppladdningar i pixlar (px).",
-    "image_restrictions"                        => "Begränsningar för bildöverföring",
-    "include_hsn"                               => "Inkludera stöd för HSN-koder",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Butiksinformation",
-    "input_groups"                              => "Inmatningsgrupper",
-    "integrations"                              => "Integrationer",
-    "integrations_configuration"                => "Tredjepartsintegrationer",
-    "invoice"                                   => "Faktura",
-    "invoice_configuration"                     => "Faktura utskriftsinställningar",
-    "invoice_default_comments"                  => "Standardfaktura kommentarer",
-    "invoice_email_message"                     => "Faktura e-postmall",
-    "invoice_enable"                            => "Aktivera Fakturering",
-    "invoice_printer"                           => "Faktura skrivare",
-    "invoice_type"                              => "Fakturatyp",
-    "is_readable"                               => "är läsbar, men behörigheterna är felaktigt inställda. Ställ in den på 640 eller 660 och uppdatera.",
-    "is_writable"                               => "är skrivbar, men behörigheterna är felaktigt inställda. Ställ in den på 750 och uppdatera.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Varning: Den här funktionaliteten fungerar bara om du har installerat FireFox jsPrintSetup addon. Spara ändå?",
-    "language"                                  => "Språk",
-    "last_used_invoice_number"                  => "Senast använt Fakturanummer",
-    "last_used_quote_number"                    => "Senast använt Qouta nummer",
-    "last_used_work_order_number"               => "Senast använt arbetsordernummer",
-    "left"                                      => "Vänster",
-    "license"                                   => "Licens",
-    "license_configuration"                     => "Licensvilkor",
-    "line_sequence"                             => "Linjesekvens",
-    "lines_per_page"                            => "Linjer per sida",
-    "lines_per_page_number"                     => "Linjer per sida måste vara ett nummer.",
-    "lines_per_page_required"                   => "Linjer per sida är ett obligatoriskt fält.",
-    "locale"                                    => "Lokalisering",
-    "locale_configuration"                      => "Lokaliseringskonfiguration",
-    "locale_info"                               => "Lokaliseringskonfigurationsinformation",
-    "location"                                  => "Lager",
-    "location_configuration"                    => "Lagerplatser",
-    "location_info"                             => "Platskonfigurationsinformation",
-    "login_form"                                => "Formulär-stil för inloggning",
-    "logout"                                    => "Vill du göra en säkerhetskopiering innan du loggar ut? Klicka på [OK] för att säkerhetskopiera eller [Avbryt] för att logga ut.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "API-nyckel för MailChimp",
-    "mailchimp_configuration"                   => "Mailchimp konfiguration",
-    "mailchimp_key_successfully"                => "API-nyckeln är giltig.",
-    "mailchimp_key_unsuccessfully"              => "API-nyckeln är ogiltig.",
-    "mailchimp_lists"                           => "MailChimp Listor",
-    "mailchimp_tooltip"                         => "Klicka på ikonen för en API-nyckel.",
-    "message"                                   => "Medelande",
-    "message_configuration"                     => "Meddelandekonfiguration",
-    "msg_msg"                                   => "Sparade SMS",
-    "msg_msg_placeholder"                       => "Om du vill använda en SMS-mall, spara ditt meddelande här, annars lämna rutan tomt.",
-    "msg_pwd"                                   => "SMS-API-lösenord",
-    "msg_pwd_required"                          => "SMS-API lösenord är ett obligatoriskt fält",
-    "msg_src"                                   => "SMS-API Sender-ID",
-    "msg_src_required"                          => "SMS-API Sender-ID är ett obligatoriskt fält",
-    "msg_uid"                                   => "SMS-API Användarnamn",
-    "msg_uid_required"                          => "SMS-API Användarnamn är ett obligatoriskt fält",
-    "multi_pack_enabled"                        => "Flera paket per artikel",
-    "no_risk"                                   => "Ingen säkerhet/sårbarhetsrisker.",
-    "none"                                      => "inga",
-    "notify_alignment"                          => "Meddelande Popup Position",
-    "number_format"                             => "Nummerformat",
-    "number_locale"                             => "Lokalisering",
-    "number_locale_invalid"                     => "Den angivna lokaliseringen är ogiltig. Kontrollera länken i verktygstipset för att hitta en giltig plats.",
-    "number_locale_required"                    => "Nummerlandskap är ett obligatoriskt fält.",
-    "number_locale_tooltip"                     => "Hitta en lämplig ort genom denna länk.",
-    "os_timezone"                               => "OSPOS-tidszon:",
-    "ospos_info"                                => "OSPOS installationsinfo",
-    "payment_options_order"                     => "Betalningsalternativ ordnning",
-    "perm_risk"                                 => "Felaktiga behörigheter gör att denna programvara är i fara.",
-    "phone"                                     => "Företagets telefon",
-    "phone_required"                            => "Företagets telefon är ett obligatoriskt fält.",
-    "print_bottom_margin"                       => "Marginal botten",
-    "print_bottom_margin_number"                => "Marginalbotten måste vara ett nummer.",
-    "print_bottom_margin_required"              => "Marginalbotten är ett obligatoriskt fält.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale-försening",
-    "print_delay_autoreturn_number"             => "Fördröjning av autoreturn to Sale är ett obligatoriskt fält.",
-    "print_delay_autoreturn_required"           => "Fördröjning av autoreturn to Sale måste vara ett nummer.",
-    "print_footer"                              => "Skriv ut sidfot",
-    "print_header"                              => "Skriv ut sidhuvudet",
-    "print_left_margin"                         => "Marginal vänster",
-    "print_left_margin_number"                  => "Marginal vänster måste vara ett nummer.",
-    "print_left_margin_required"                => "Marginal vänster är ett obligatoriskt fält.",
-    "print_receipt_check_behaviour"             => "Kryssrutan Skriv ut kvitto",
-    "print_receipt_check_behaviour_always"      => "Kontrolleras alltid",
-    "print_receipt_check_behaviour_last"        => "Kom ihåg det senaste valet",
-    "print_receipt_check_behaviour_never"       => "Alltid urkryssad",
-    "print_right_margin"                        => "Marginal höger",
-    "print_right_margin_number"                 => "Marginal höger måste vara ett tal.",
-    "print_right_margin_required"               => "Marginal höger är ett obligatoriskt fält.",
-    "print_silently"                            => "Visa utskriftsdialog",
-    "print_top_margin"                          => "Marginal top",
-    "print_top_margin_number"                   => "Marginal Top måste vara ett nummer.",
-    "print_top_margin_required"                 => "Margin Top är ett obligatoriskt fält.",
-    "quantity_decimals"                         => "Antal decimaler",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Standardoffert kommentar",
-    "receipt"                                   => "Kvitto",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Kvittosutskriftsinställningar",
-    "receipt_default"                           => "Standard",
-    "receipt_font_size"                         => "Textstorlek",
-    "receipt_font_size_number"                  => "Teckensnittstorlek måste vara ett nummer.",
-    "receipt_font_size_required"                => "Teckensnittstorlek är ett obligatoriskt fält.",
-    "receipt_info"                              => "Kvittokonfigurationsinformation",
-    "receipt_printer"                           => "Kvittoskrivare",
-    "receipt_short"                             => "Kort",
-    "receipt_show_company_name"                 => "Visa företagsnamn",
-    "receipt_show_description"                  => "Visa beskrivning",
-    "receipt_show_serialnumber"                 => "Visa serienummer",
-    "receipt_show_tax_ind"                      => "Visa skatteindikator",
-    "receipt_show_taxes"                        => "Visa skatter",
-    "receipt_show_total_discount"               => "Visa total rabatt",
-    "receipt_template"                          => "Kvitto mall",
-    "receiving_calculate_average_price"         => "Beräkna avg. Pris (Inleverans)",
-    "recv_invoice_format"                       => "Mottagningsfakturaformat",
-    "register_mode_default"                     => "Standardregisterläge",
-    "report_an_issue"                           => "Rapportera ett problem",
-    "return_policy_required"                    => "Returpolicy är ett obligatoriskt fält.",
-    "reward"                                    => "Bonus",
-    "reward_configuration"                      => "Bonuskonfiguration",
-    "right"                                     => "Höger",
-    "sales_invoice_format"                      => "Försäljningsfakturaformat",
-    "sales_quote_format"                        => "Försäljningsquotaformat",
-    "saved_successfully"                        => "Konfigurationen sparades.",
-    "saved_unsuccessfully"                      => "Konfigurationsbesparingen misslyckades.",
-    "security_issue"                            => "Varning för säkerhetsrisker",
-    "server_notice"                             => "Vänligen använd nedanstående info för fel-rapportering.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Visa kontorsikon",
-    "statistics"                                => "Skicka statistik",
-    "statistics_tooltip"                        => "Skicka statistik för utveckling och funktionsförbättringsändamål.",
-    "stock_location"                            => "Lagerplats",
-    "stock_location_duplicate"                  => "Lagerplats måste vara unik.",
-    "stock_location_invalid_chars"              => "Lagerplatsen kan inte innehålla '_'.",
-    "stock_location_required"                   => "Lagerplats är ett obligatoriskt fält.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Kolumn 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Sök förslag till layout",
-    "suggestions_second_column"                 => "Kolumn 2",
-    "suggestions_third_column"                  => "Kolumn 3",
-    "system_conf"                               => "Ställ in & Konf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Bord",
-    "table_configuration"                       => "Bordsinställningar",
-    "takings_printer"                           => "Kvittoskrivare",
-    "tax"                                       => "Skatt",
-    "tax_category"                              => "Skattekategori",
-    "tax_category_duplicate"                    => "Den angivna skattekategori existerar redan.",
-    "tax_category_invalid_chars"                => "Den angivna skattekategori är ogiltig.",
-    "tax_category_required"                     => "Skattekategori krävs.",
-    "tax_category_used"                         => "Skattekategori kan inte raderas eftersom den används.",
-    "tax_configuration"                         => "Skattkonfiguration",
-    "tax_decimals"                              => "Skatt decimaler",
-    "tax_id"                                    => "Skatteid",
-    "tax_included"                              => "Skatt ingår",
-    "theme"                                     => "Tema",
-    "theme_preview"                             => "Förhandsgranska tema:",
-    "thousands_separator"                       => "Tusentals separator",
-    "timezone"                                  => "Tidszon",
-    "timezone_error"                            => "OSPOS-tidszon skiljer sig från din lokala tidszon.",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Använd destinationsbaserad skatt",
-    "user_timezone"                             => "Lokal tidszon:",
-    "website"                                   => "Hemsida",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Arbetsorderstöd",
-    "work_order_format"                         => "Arbetsorderformat",
+    'address'                                   => 'Företagsadress',
+    'address_required'                          => 'Företagsadress är ett obligatoriskt fält.',
+    'all_set'                                   => 'Alla filbehörigheter är korrekt inställda!',
+    'allow_duplicate_barcodes'                  => 'Tillåt duplicera streckkoder',
+    'apostrophe'                                => 'apostrof',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Säkerhetskopiera databas',
+    'barcode'                                   => 'Streckkod',
+    'barcode_company'                           => 'Företagsnamn',
+    'barcode_configuration'                     => 'Streckkodskonfiguration',
+    'barcode_content'                           => 'Streckkod innehåll',
+    'barcode_first_row'                         => 'Rad 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Inmatningsformat',
+    'barcode_generate_if_empty'                 => 'Skapa om tom.',
+    'barcode_height'                            => 'Höjd (px)',
+    'barcode_id'                                => 'Artikel-id / namn',
+    'barcode_info'                              => 'Streckkodskonfigurationsinformation',
+    'barcode_layout'                            => 'Streckkodslayout',
+    'barcode_name'                              => 'Namn',
+    'barcode_number'                            => 'Streckkod',
+    'barcode_number_in_row'                     => 'Antal i rad',
+    'barcode_page_cellspacing'                  => 'Visa kolumnbredd.',
+    'barcode_page_width'                        => 'Visa sidbredd',
+    'barcode_price'                             => 'Pris',
+    'barcode_second_row'                        => 'Rad 2',
+    'barcode_third_row'                         => 'Rad 3',
+    'barcode_tooltip'                           => 'Varning: Den här funktionen kan orsaka att duplicerade objekt importeras eller skapas. Använd inte om du inte vill ha dubbla streckkoder.',
+    'barcode_type'                              => 'Streckkodstyp',
+    'barcode_width'                             => 'Bredd (px)',
+    'bottom'                                    => 'Botten',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Kontant decimaler',
+    'cash_decimals_tooltip'                     => 'Om kontanterna och valutadecimalen är desamma kommer ingen öresutjämning att äga rum.',
+    'cash_rounding'                             => 'Öresavjämning',
+    'category_dropdown'                         => 'Visa kategori som en rullgardinsmeny',
+    'center'                                    => 'Mitten',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'komma',
+    'company'                                   => 'Företasnamn',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Ändra bild',
+    'company_logo'                              => 'Företagslogo',
+    'company_remove_image'                      => 'Radera bild',
+    'company_required'                          => 'Företagsnamn är ett obligatoriskt fält',
+    'company_select_image'                      => 'Välj Bild',
+    'company_website_url'                       => 'Företagets webbplats är inte en giltig URL (http: // ...).',
+    'country_codes'                             => 'Landskod',
+    'country_codes_tooltip'                     => 'Kommaseparerad lista över landskoder för nominatimadressuppslag.',
+    'currency_code'                             => 'Valutakod',
+    'currency_decimals'                         => 'Valuta Decimaler',
+    'currency_symbol'                           => 'Valutasymbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Bonus',
+    'customer_reward_duplicate'                 => 'Bonus måste vara unik.',
+    'customer_reward_enable'                    => 'Aktivera kundbonus',
+    'customer_reward_invalid_chars'             => "Bonus kan inte innehålla '_'",
+    'customer_reward_required'                  => 'Bonus är ett obligatoriskt fält',
+    'customer_sales_tax_support'                => 'Kundomsättningskatt Support',
+    'date_or_time_format'                       => 'Datum och tidsfilter',
+    'datetimeformat'                            => 'Datum och tid Format',
+    'decimal_point'                             => 'Decimalpunkt',
+    'default_barcode_font_size_number'          => 'Standard streckkods teckensnittstorlek måste vara ett nummer.',
+    'default_barcode_font_size_required'        => 'Standard streckkodstorlekstorlek är ett obligatoriskt fält.',
+    'default_barcode_height_number'             => 'Standard streckkodshöjd måste vara ett nummer.',
+    'default_barcode_height_required'           => 'Standard streckkodshöjd är ett obligatoriskt fält.',
+    'default_barcode_num_in_row_number'         => 'Standard streckkodsnummer i rad måste vara ett nummer.',
+    'default_barcode_num_in_row_required'       => 'Standard streckkodsnummer i rad måste vara ett nummer.',
+    'default_barcode_page_cellspacing_number'   => 'Standard Streckkodssida Cellspacing måste vara ett nummer.',
+    'default_barcode_page_cellspacing_required' => 'Standard Streckkodssida Cellspacing är ett obligatoriskt fält.',
+    'default_barcode_page_width_number'         => 'Standard streckkodssidans bredd måste vara ett nummer.',
+    'default_barcode_page_width_required'       => 'Standard streckkodssidans bredd är ett obligatoriskt fält.',
+    'default_barcode_width_number'              => 'Standard streckkodsbredd måste vara ett nummer.',
+    'default_barcode_width_required'            => 'Standard streckkodsbredd är ett obligatoriskt fält.',
+    'default_item_columns'                      => 'Standard synliga artikel kolumner',
+    'default_origin_tax_code'                   => 'Standard Urkomstskattkod',
+    'default_receivings_discount'               => 'Standardmottagningsrabatt',
+    'default_receivings_discount_number'        => 'Standardmottagningsrabatten måste vara ett nummer.',
+    'default_receivings_discount_required'      => 'Standardmottagningsrabatt är ett obligatoriskt fält.',
+    'default_sales_discount'                    => 'Standard Försäljningsrabatt %',
+    'default_sales_discount_number'             => 'Standardförsäljningsrabatt måste vara ett nummer.',
+    'default_sales_discount_required'           => 'Standardförsäljningsrabatt är ett obligatoriskt fält.',
+    'default_tax_category'                      => 'Standardskattskategori',
+    'default_tax_code'                          => 'Standard skattetabell',
+    'default_tax_jurisdiction'                  => 'Standardskattejurisdiktion',
+    'default_tax_name_number'                   => 'Standardskattnamn måste vara en sträng.',
+    'default_tax_name_required'                 => 'Standardskattnamn är ett obligatoriskt fält.',
+    'default_tax_rate'                          => 'Standardskattesats%',
+    'default_tax_rate_1'                        => 'Skattesats 1',
+    'default_tax_rate_2'                        => 'Skattesats 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Standardskattesats måste vara ett nummer.',
+    'default_tax_rate_required'                 => 'Standardskattesats är ett obligatoriskt fält.',
+    'derive_sale_quantity'                      => 'Tillåt avledad försäljningskvantitet',
+    'derive_sale_quantity_tooltip'              => 'Om den är markerad kommer en ny objekttyp att tillhandahållas för poster som beställts med förlängd mängd',
+    'dinner_table'                              => 'Bord',
+    'dinner_table_duplicate'                    => 'Bordsnummer måste vara unik.',
+    'dinner_table_enable'                       => 'Aktivera bord',
+    'dinner_table_invalid_chars'                => "Bordsnamn får inte innehålla '_'.",
+    'dinner_table_required'                     => 'Bord är ett obligatoriskt fält.',
+    'dot'                                       => 'punkt',
+    'email'                                     => 'E-post',
+    'email_configuration'                       => 'E-mail Konfiguration',
+    'email_mailpath'                            => 'Sökväg till Sendmail',
+    'email_protocol'                            => 'Protokol',
+    'email_receipt_check_behaviour'             => 'Kryssruta för e-postkvitto',
+    'email_receipt_check_behaviour_always'      => 'Alltid förikryssad',
+    'email_receipt_check_behaviour_last'        => 'Kom ihåg det senaste valet',
+    'email_receipt_check_behaviour_never'       => 'Alltid urkryssad',
+    'email_smtp_crypto'                         => 'SMTP kryptering',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Lösenord',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout',
+    'email_smtp_user'                           => 'SMTP Användarnamn',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Upprätthålla integritet',
+    'enforce_privacy_tooltip'                   => 'Skydda kundernas integritet genom att kryptera data om deras data raderas',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Räkenskapsårets början',
+    'financial_year_apr'                        => '1 april',
+    'financial_year_aug'                        => '1 augusti',
+    'financial_year_dec'                        => '1 december',
+    'financial_year_feb'                        => '1 februari',
+    'financial_year_jan'                        => '1 januari',
+    'financial_year_jul'                        => '1 juli',
+    'financial_year_jun'                        => '1 juni',
+    'financial_year_mar'                        => '1 mars',
+    'financial_year_may'                        => '1 maj',
+    'financial_year_nov'                        => '1 november',
+    'financial_year_oct'                        => '1 oktober',
+    'financial_year_sep'                        => '1 september',
+    'floating_labels'                           => 'Flytande etiketter',
+    'gcaptcha_enable'                           => 'Inloggningssida reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'Hemlig nyckel för reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key är ett obligatoriskt fält',
+    'gcaptcha_site_key'                         => 'Sid-nyckel för reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key är ett obligatoriskt fält',
+    'gcaptcha_tooltip'                          => 'Skydda inloggningssidan med Google reCAPTCHA, klicka på ikonen för ett API-nyckelpar.',
+    'general'                                   => 'Allmämt',
+    'general_configuration'                     => 'Allmänna inställningar',
+    'giftcard_number'                           => 'Presentkortsnummer',
+    'giftcard_random'                           => 'Slumpa fram',
+    'giftcard_series'                           => 'Generera i serie',
+    'image_allowed_file_types'                  => 'Tillåtna filtyper',
+    'image_max_height_tooltip'                  => 'Högsta tillåtna höjd för bilduppladdningar i pixlar (px).',
+    'image_max_size_tooltip'                    => 'Högsta tillåtna filstorlek för bilduppladdningar i kilobyte (kb).',
+    'image_max_width_tooltip'                   => 'Högsta tillåtna bredd för bilduppladdningar i pixlar (px).',
+    'image_restrictions'                        => 'Begränsningar för bildöverföring',
+    'include_hsn'                               => 'Inkludera stöd för HSN-koder',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Butiksinformation',
+    'input_groups'                              => 'Inmatningsgrupper',
+    'integrations'                              => 'Integrationer',
+    'integrations_configuration'                => 'Tredjepartsintegrationer',
+    'invoice'                                   => 'Faktura',
+    'invoice_configuration'                     => 'Faktura utskriftsinställningar',
+    'invoice_default_comments'                  => 'Standardfaktura kommentarer',
+    'invoice_email_message'                     => 'Faktura e-postmall',
+    'invoice_enable'                            => 'Aktivera Fakturering',
+    'invoice_printer'                           => 'Faktura skrivare',
+    'invoice_type'                              => 'Fakturatyp',
+    'is_readable'                               => 'är läsbar, men behörigheterna är felaktigt inställda. Ställ in den på 640 eller 660 och uppdatera.',
+    'is_writable'                               => 'är skrivbar, men behörigheterna är felaktigt inställda. Ställ in den på 750 och uppdatera.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Varning: Den här funktionaliteten fungerar bara om du har installerat FireFox jsPrintSetup addon. Spara ändå?',
+    'language'                                  => 'Språk',
+    'last_used_invoice_number'                  => 'Senast använt Fakturanummer',
+    'last_used_quote_number'                    => 'Senast använt Qouta nummer',
+    'last_used_work_order_number'               => 'Senast använt arbetsordernummer',
+    'left'                                      => 'Vänster',
+    'license'                                   => 'Licens',
+    'license_configuration'                     => 'Licensvilkor',
+    'line_sequence'                             => 'Linjesekvens',
+    'lines_per_page'                            => 'Linjer per sida',
+    'lines_per_page_number'                     => 'Linjer per sida måste vara ett nummer.',
+    'lines_per_page_required'                   => 'Linjer per sida är ett obligatoriskt fält.',
+    'locale'                                    => 'Lokalisering',
+    'locale_configuration'                      => 'Lokaliseringskonfiguration',
+    'locale_info'                               => 'Lokaliseringskonfigurationsinformation',
+    'location'                                  => 'Lager',
+    'location_configuration'                    => 'Lagerplatser',
+    'location_info'                             => 'Platskonfigurationsinformation',
+    'login_form'                                => 'Formulär-stil för inloggning',
+    'logout'                                    => 'Vill du göra en säkerhetskopiering innan du loggar ut? Klicka på [OK] för att säkerhetskopiera eller [Avbryt] för att logga ut.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'API-nyckel för MailChimp',
+    'mailchimp_configuration'                   => 'Mailchimp konfiguration',
+    'mailchimp_key_successfully'                => 'API-nyckeln är giltig.',
+    'mailchimp_key_unsuccessfully'              => 'API-nyckeln är ogiltig.',
+    'mailchimp_lists'                           => 'MailChimp Listor',
+    'mailchimp_tooltip'                         => 'Klicka på ikonen för en API-nyckel.',
+    'message'                                   => 'Medelande',
+    'message_configuration'                     => 'Meddelandekonfiguration',
+    'msg_msg'                                   => 'Sparade SMS',
+    'msg_msg_placeholder'                       => 'Om du vill använda en SMS-mall, spara ditt meddelande här, annars lämna rutan tomt.',
+    'msg_pwd'                                   => 'SMS-API-lösenord',
+    'msg_src'                                   => 'SMS-API Sender-ID',
+    'msg_src_required'                          => 'SMS-API Sender-ID är ett obligatoriskt fält',
+    'msg_uid'                                   => 'SMS-API Användarnamn',
+    'msg_uid_required'                          => 'SMS-API Användarnamn är ett obligatoriskt fält',
+    'multi_pack_enabled'                        => 'Flera paket per artikel',
+    'no_risk'                                   => 'Ingen säkerhet/sårbarhetsrisker.',
+    'none'                                      => 'inga',
+    'notify_alignment'                          => 'Meddelande Popup Position',
+    'number_format'                             => 'Nummerformat',
+    'number_locale'                             => 'Lokalisering',
+    'number_locale_invalid'                     => 'Den angivna lokaliseringen är ogiltig. Kontrollera länken i verktygstipset för att hitta en giltig plats.',
+    'number_locale_required'                    => 'Nummerlandskap är ett obligatoriskt fält.',
+    'number_locale_tooltip'                     => 'Hitta en lämplig ort genom denna länk.',
+    'os_timezone'                               => 'OSPOS-tidszon:',
+    'ospos_info'                                => 'OSPOS installationsinfo',
+    'payment_options_order'                     => 'Betalningsalternativ ordnning',
+    'payment_reference_code_length_limits'      => 'Betalningsreferenskod<br>Längdgränser',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Felaktiga behörigheter gör att denna programvara är i fara.',
+    'phone'                                     => 'Företagets telefon',
+    'phone_required'                            => 'Företagets telefon är ett obligatoriskt fält.',
+    'print_bottom_margin'                       => 'Marginal botten',
+    'print_bottom_margin_number'                => 'Marginalbotten måste vara ett nummer.',
+    'print_bottom_margin_required'              => 'Marginalbotten är ett obligatoriskt fält.',
+    'print_delay_autoreturn'                    => 'Autoreturn to Sale-försening',
+    'print_delay_autoreturn_number'             => 'Fördröjning av autoreturn to Sale är ett obligatoriskt fält.',
+    'print_delay_autoreturn_required'           => 'Fördröjning av autoreturn to Sale måste vara ett nummer.',
+    'print_footer'                              => 'Skriv ut sidfot',
+    'print_header'                              => 'Skriv ut sidhuvudet',
+    'print_left_margin'                         => 'Marginal vänster',
+    'print_left_margin_number'                  => 'Marginal vänster måste vara ett nummer.',
+    'print_left_margin_required'                => 'Marginal vänster är ett obligatoriskt fält.',
+    'print_receipt_check_behaviour'             => 'Kryssrutan Skriv ut kvitto',
+    'print_receipt_check_behaviour_always'      => 'Kontrolleras alltid',
+    'print_receipt_check_behaviour_last'        => 'Kom ihåg det senaste valet',
+    'print_receipt_check_behaviour_never'       => 'Alltid urkryssad',
+    'print_right_margin'                        => 'Marginal höger',
+    'print_right_margin_number'                 => 'Marginal höger måste vara ett tal.',
+    'print_right_margin_required'               => 'Marginal höger är ett obligatoriskt fält.',
+    'print_silently'                            => 'Visa utskriftsdialog',
+    'print_top_margin'                          => 'Marginal top',
+    'print_top_margin_number'                   => 'Marginal Top måste vara ett nummer.',
+    'print_top_margin_required'                 => 'Margin Top är ett obligatoriskt fält.',
+    'quantity_decimals'                         => 'Antal decimaler',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Standardoffert kommentar',
+    'receipt'                                   => 'Kvitto',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Kvittosutskriftsinställningar',
+    'receipt_default'                           => 'Standard',
+    'receipt_font_size'                         => 'Textstorlek',
+    'receipt_font_size_number'                  => 'Teckensnittstorlek måste vara ett nummer.',
+    'receipt_font_size_required'                => 'Teckensnittstorlek är ett obligatoriskt fält.',
+    'receipt_info'                              => 'Kvittokonfigurationsinformation',
+    'receipt_printer'                           => 'Kvittoskrivare',
+    'receipt_short'                             => 'Kort',
+    'receipt_show_company_name'                 => 'Visa företagsnamn',
+    'receipt_show_description'                  => 'Visa beskrivning',
+    'receipt_show_serialnumber'                 => 'Visa serienummer',
+    'receipt_show_tax_ind'                      => 'Visa skatteindikator',
+    'receipt_show_taxes'                        => 'Visa skatter',
+    'receipt_show_total_discount'               => 'Visa total rabatt',
+    'receipt_template'                          => 'Kvitto mall',
+    'receiving_calculate_average_price'         => 'Beräkna avg. Pris (Inleverans)',
+    'recv_invoice_format'                       => 'Mottagningsfakturaformat',
+    'register_mode_default'                     => 'Standardregisterläge',
+    'report_an_issue'                           => 'Rapportera ett problem',
+    'return_policy_required'                    => 'Returpolicy är ett obligatoriskt fält.',
+    'reward'                                    => 'Bonus',
+    'reward_configuration'                      => 'Bonuskonfiguration',
+    'right'                                     => 'Höger',
+    'sales_invoice_format'                      => 'Försäljningsfakturaformat',
+    'sales_quote_format'                        => 'Försäljningsquotaformat',
+    'mailpath_invalid'                          => 'Ogiltig sendmail-sökväg. Endast bokstäver, siffror, bindestreck, understreck, snedstreck, omvända snedstreck, kolon, mellanslag och punkter tillåts.',
+    'saved_successfully'                        => 'Konfigurationen sparades.',
+    'saved_unsuccessfully'                      => 'Konfigurationsbesparingen misslyckades.',
+    'security_issue'                            => 'Varning för säkerhetsrisker',
+    'server_notice'                             => 'Vänligen använd nedanstående info för fel-rapportering.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Visa kontorsikon',
+    'statistics'                                => 'Skicka statistik',
+    'statistics_tooltip'                        => 'Skicka statistik för utveckling och funktionsförbättringsändamål.',
+    'stock_location'                            => 'Lagerplats',
+    'stock_location_duplicate'                  => 'Lagerplats måste vara unik.',
+    'stock_location_invalid_chars'              => "Lagerplatsen kan inte innehålla '_'.",
+    'stock_location_required'                   => 'Lagerplats är ett obligatoriskt fält.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Kolumn 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Sök förslag till layout',
+    'suggestions_second_column'                 => 'Kolumn 2',
+    'suggestions_third_column'                  => 'Kolumn 3',
+    'system_conf'                               => 'Ställ in & Konf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Bord',
+    'table_configuration'                       => 'Bordsinställningar',
+    'takings_printer'                           => 'Kvittoskrivare',
+    'tax'                                       => 'Skatt',
+    'tax_category'                              => 'Skattekategori',
+    'tax_category_duplicate'                    => 'Den angivna skattekategori existerar redan.',
+    'tax_category_invalid_chars'                => 'Den angivna skattekategori är ogiltig.',
+    'tax_category_required'                     => 'Skattekategori krävs.',
+    'tax_category_used'                         => 'Skattekategori kan inte raderas eftersom den används.',
+    'tax_configuration'                         => 'Skattkonfiguration',
+    'tax_decimals'                              => 'Skatt decimaler',
+    'tax_id'                                    => 'Skatteid',
+    'tax_included'                              => 'Skatt ingår',
+    'theme'                                     => 'Tema',
+    'theme_preview'                             => 'Förhandsgranska tema:',
+    'thousands_separator'                       => 'Tusentals separator',
+    'timezone'                                  => 'Tidszon',
+    'timezone_error'                            => 'OSPOS-tidszon skiljer sig från din lokala tidszon.',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => 'Använd destinationsbaserad skatt',
+    'user_timezone'                             => 'Lokal tidszon:',
+    'website'                                   => 'Hemsida',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Arbetsorderstöd',
+    'work_order_format'                         => 'Arbetsorderformat',
 ];
diff --git a/app/Language/sv/Employees.php b/app/Language/sv/Employees.php
index db2146f9a..82ace0d1a 100644
--- a/app/Language/sv/Employees.php
+++ b/app/Language/sv/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Information",
-    "cannot_be_deleted"            => "Det går inte att radera valda anställda, en eller flera av de behandlade försäljningarna eller du försöker radera ditt konto.",
-    "change_employee"              => "",
-    "change_password"              => "Ändra lösenord",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Är du säker på att du vill radera de valda arbetstagarna?",
-    "confirm_restore"              => "Är du säker på att du vill återställa valda anställda (er)?",
-    "current_password"             => "Nuvarande lösenord",
-    "current_password_invalid"     => "Nuvarande lösenord är fel.",
-    "employee"                     => "Anställd",
-    "error_adding_updating"        => "Anställd lägg till eller uppdatering misslyckades.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Du kan inte radera demo admin-användaren.",
-    "error_updating_demo_admin"    => "Du kan inte ändra demo admin-användaren.",
-    "language"                     => "Språk",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "Ny anställd",
-    "none_selected"                => "Du har inte valt någon anställd att radera.",
-    "one_or_multiple"              => "Anställda",
-    "password"                     => "Lösenord",
-    "password_minlength"           => "Lösenordet måste vara minst 8 tecken i längd.",
-    "password_must_match"          => "Lösenorden matchar ej.",
-    "password_not_must_match"      => "Nuvarande lösenord och nytt lösenord måste vara unikt.",
-    "password_required"            => "Lösenord krävs.",
-    "permission_desc"              => "Markera rutorna nedan för att ge tillgång till moduler.",
-    "permission_info"              => "Behörigheter",
-    "repeat_password"              => "Lösenord igen",
-    "subpermission_required"       => "Lägg till minst en behörighet för varje modul.",
-    "successful_adding"            => "Tillägg av anställd lyckades.",
-    "successful_change_password"   => "Lösenordsbyte lyckades.",
-    "successful_deleted"           => "Du har tagit bort",
-    "successful_updating"          => "Du har uppdaterat anställda",
-    "system_language"              => "System Språk",
-    "unsuccessful_change_password" => "Lösenordsbyte misslyckades.",
-    "update"                       => "Uppdatera anställd",
-    "username"                     => "Användarnamn",
-    "username_duplicate"           => "Användarnamnet för den anställda används redan. Vänligen välj ett annat.",
-    "username_minlength"           => "Användarnamnet måste vara minst 5 tecken långt.",
-    "username_required"            => "Användarnamnet är ett obligatoriskt fält.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Information',
+    'cannot_be_deleted'                      => 'Det går inte att radera valda anställda, en eller flera av dem har behandlat försäljningar eller du försöker radera ditt konto.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Ändra lösenord',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Är du säker på att du vill radera de valda arbetstagarna?',
+    'confirm_restore'                        => 'Är du säker på att du vill återställa valda anställda (er)?',
+    'current_password'                       => 'Nuvarande lösenord',
+    'current_password_invalid'               => 'Nuvarande lösenord är fel.',
+    'employee'                               => 'Anställd',
+    'error_adding_updating'                  => 'Anställd lägg till eller uppdatering misslyckades.',
+    'error_cannot_remove_own_minimum_grant'  => 'Du kan inte ta bort dina egna minimibehörigheter för moduler.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Du kan inte radera demo admin-användaren.',
+    'error_grant_change_disallowed'          => 'Behörighetsändringar är inaktiverade i denna demo.',
+    'error_password_change_disallowed'       => 'Lösenordsändringar är inaktiverade i denna demo.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Du kan inte ändra demo admin-användaren.',
+    'language'                               => 'Språk',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'Ny anställd',
+    'none_selected'                          => 'Du har inte valt någon anställd att radera.',
+    'one_or_multiple'                        => 'Anställda',
+    'password'                               => 'Lösenord',
+    'password_minlength'                     => 'Lösenordet måste vara minst 8 tecken i längd.',
+    'password_must_match'                    => 'Lösenorden matchar ej.',
+    'password_not_must_match'                => 'Nuvarande lösenord och nytt lösenord måste vara unikt.',
+    'password_required'                      => 'Lösenord krävs.',
+    'permission_desc'                        => 'Markera rutorna nedan för att ge tillgång till moduler.',
+    'permission_info'                        => 'Behörigheter',
+    'repeat_password'                        => 'Lösenord igen',
+    'subpermission_required'                 => 'Lägg till minst en behörighet för varje modul.',
+    'successful_adding'                      => 'Tillägg av anställd lyckades.',
+    'successful_change_password'             => 'Lösenordsbyte lyckades.',
+    'successful_deleted'                     => 'Du har tagit bort',
+    'successful_updating'                    => 'Du har uppdaterat anställda',
+    'system_language'                        => 'System Språk',
+    'unsuccessful_change_password'           => 'Lösenordsbyte misslyckades.',
+    'update'                                 => 'Uppdatera anställd',
+    'username'                               => 'Användarnamn',
+    'username_duplicate'                     => 'Användarnamnet för den anställda används redan. Vänligen välj ett annat.',
+    'username_minlength'                     => 'Användarnamnet måste vara minst 5 tecken långt.',
+    'username_required'                      => 'Användarnamnet är ett obligatoriskt fält.',
 ];
diff --git a/app/Language/sv/Error.php b/app/Language/sv/Error.php
index 2a6a0caaa..ef99bea07 100644
--- a/app/Language/sv/Error.php
+++ b/app/Language/sv/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Du har inte rättigheter till modulen",
-    "unknown"              => "Oväntat fel",
+    'no_permission_module'           => 'Du har inte rättigheter till modulen',
+    'unable_to_create_env_file'      => 'Det gick inte att skapa {filePath} för att etablera throttle.key',
+    'unable_to_lock_file'            => 'Det gick inte att låsa {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Det gick inte att öppna {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Det gick inte att spara throttle.key i {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Det gick inte att läsa {filePath} för att etablera throttle.key',
+    'unknown'                        => 'Oväntat fel',
 ];
diff --git a/app/Language/sv/Items.php b/app/Language/sv/Items.php
index 75cbc6fea..fbd2e1929 100644
--- a/app/Language/sv/Items.php
+++ b/app/Language/sv/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Lager att lägga till eller ta bort.",
-    "allow_alt_description"              => "Tillåt alternativ beskrivning",
-    "amount_entry"                       => "Belopp",
-    "bulk_edit"                          => "Massändra",
-    "buy_price_required"                 => "Köppriset är ett obligatoriskt fält.",
-    "cannot_be_deleted"                  => "Kunde inte radera valda objekt, en eller flera av de valda objekten har försäljning.",
-    "cannot_find_item"                   => "Artikeln hittades inte.",
-    "categories"                         => "",
-    "category"                           => "Kategori",
-    "category_new"                       => "",
-    "category_required"                  => "Kategori är ett obligatoriskt fält.",
-    "change_all_to_allow_alt_desc"       => "Tillåt alternativ beskrivning för alla.",
-    "change_all_to_not_allow_allow_desc" => "Tillåt inte alternativ beskrivning för alla.",
-    "change_all_to_serialized"           => "Ändra allt till Serialized",
-    "change_all_to_unserialized"         => "Ändra allt till ej Serialized",
-    "change_image"                       => "Ändra bild",
-    "confirm_bulk_edit"                  => "Är du säker på att du vill redigera valda artiklar?",
-    "confirm_bulk_edit_wipe_taxes"       => "All Artikel Skatteinformation kommer att ersättas.",
-    "confirm_delete"                     => "Är du säker på att du vill radera valda artiklar?",
-    "confirm_restore"                    => "Är du säker på att du vill återställa valda artiklar?",
-    "cost_price"                         => "Grossistpris",
-    "cost_price_number"                  => "Grosistpriset måste vara ett nummer.",
-    "cost_price_required"                => "Grossistpris är ett obligatoriskt fält.",
-    "count"                              => "Uppdatera Inventory",
-    "csv_import_failed"                  => "CSV-import misslyckades",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Den uppladdade filen har ingen data eller är formaterad felaktigt.",
-    "csv_import_partially_failed"        => "Det fanns{0} importfel (er) på rad (er):{1}. Inga rader importerades.",
-    "csv_import_success"                 => "Artikelimporten lyckades.",
-    "current_quantity"                   => "Nuvarande antal",
-    "default_pack_name"                  => "Varje",
-    "description"                        => "Beskrivning",
-    "details_count"                      => "Inventarieringsuppgifter",
-    "do_nothing"                         => "Gör ingeting",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Redigera önskade fält för valda artiklar.",
-    "edit_multiple_items"                => "Redigering av flera artiklar",
-    "empty_upc_items"                    => "Tomma streckkodsposter",
-    "error_adding_updating"              => "Det gick inte att lägga till / uppdatera artiklar",
-    "error_updating_multiple"            => "Ett fel uppstod vid uppdatering av artiklar",
-    "generate_barcodes"                  => "Generera streckkoder",
-    "hsn_code"                           => "Harmoniserade systemnomenklaturen",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Artikelimport från CSV",
-    "info_provided_by"                   => "Information tillhandahållen av",
-    "inventory"                          => "Lager",
-    "inventory_CSV_import_quantity"      => "Antal importerat från CSV",
-    "inventory_comments"                 => "Kommentarer",
-    "inventory_data_tracking"            => "Lagerspårning",
-    "inventory_date"                     => "Datum",
-    "inventory_employee"                 => "Anställd",
-    "inventory_in_out_quantity"          => "In / Out Mängd",
-    "inventory_remarks"                  => "Anmärkningar",
-    "is_deleted"                         => "Raderad",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Artikeln har serienummer",
-    "item"                               => "Artikel",
-    "item_id"                            => "",
-    "item_number"                        => "Streckkod",
-    "item_number_duplicate"              => "Artikelnummer finns redan i databasen.",
-    "kit"                                => "Kit",
-    "location"                           => "Lagerplats",
-    "low_inventory_items"                => "Artikeln slutsåld",
-    "low_sell_item"                      => "Låg försäljnings artikel",
-    "manually_editing_of_quantity"       => "Manuell redigering av antal",
-    "markup"                             => "",
-    "name"                               => "Artikelnamn",
-    "name_required"                      => "Artikelnamn är ett obligatoriskt fält.",
-    "new"                                => "Ny artikel",
-    "no_description_items"               => "Inga beskrivning av artikel",
-    "no_items_to_display"                => "Inga artiklar att visa.",
-    "none"                               => "inga",
-    "none_selected"                      => "Du har inte valt några artiklar att redigera",
-    "nonstock"                           => "Icke-lager",
-    "number_information"                 => "Artikelnummer",
-    "number_required"                    => "Streckkod är ett obligatoriskt fält.",
-    "one_or_multiple"                    => "Artikel",
-    "pack_name"                          => "Förpackningsnamn",
-    "qty_per_pack"                       => "Antal per förpackning",
-    "quantity"                           => "Kvantitet",
-    "quantity_number"                    => "Antal måste vara ett nummer.",
-    "quantity_required"                  => "Antal är ett obligatoriskt fält.",
-    "receiving_quantity"                 => "Mottagningskvantitet",
-    "remove_image"                       => "Radera bild",
-    "reorder_level"                      => "Nivå för ombeställning",
-    "reorder_level_number"               => "Omordningsnivå måste vara ett nummer.",
-    "reorder_level_required"             => "Återbeställningsnivå är ett obligatoriskt fält.",
-    "retrive_item_info"                  => "Hämta artikelinfo",
-    "sales_tax_1"                        => "Moms",
-    "sales_tax_2"                        => "Moms 2",
-    "search_attributes"                  => "Sök attribut",
-    "select_image"                       => "Välj Bild",
-    "serialized_items"                   => "Serialiserade artiklar",
-    "standard"                           => "Standard",
-    "stock"                              => "Lager",
-    "stock_location"                     => "Lagerplats",
-    "stock_type"                         => "Lagertyp",
-    "successful_adding"                  => "Du har lagt till Artikeln",
-    "successful_bulk_edit"               => "Du har uppdaterat den valda atikeln",
-    "successful_deleted"                 => "Du har tagit bort artikeln",
-    "successful_updating"                => "Du har uppdaterat artikeln",
-    "supplier"                           => "Leverantör",
-    "tax_1"                              => "Skatt 1",
-    "tax_2"                              => "Skatt 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Skattekategori",
-    "tax_percent"                        => "Skatt %",
-    "tax_percent_number"                 => "Skattprocent måste vara ett numeriskt värde",
-    "tax_percent_required"               => "Skattprocent är ett obligatoriskt fält.",
-    "tax_percents"                       => "Skatt %",
-    "temp"                               => "Tillfällig",
-    "type"                               => "Artikeltyp",
-    "unit_price"                         => "Försäljningspris",
-    "unit_price_number"                  => "Enhetspriset måste vara ett nummer.",
-    "unit_price_required"                => "Enhetspriset är ett obligatoriskt fält.",
-    "upc_database"                       => "Streckkod databas",
-    "update"                             => "Uppdatera artikeln",
-    "use_inventory_menu"                 => "Använd Inventory Menu",
+    'add_minus'                          => 'Lager att lägga till eller ta bort.',
+    'allow_alt_description'              => 'Tillåt alternativ beskrivning',
+    'amount_entry'                       => 'Belopp',
+    'bulk_edit'                          => 'Massändra',
+    'buy_price_required'                 => 'Köppriset är ett obligatoriskt fält.',
+    'cannot_be_deleted'                  => 'Kunde inte radera valda objekt, en eller flera av de valda objekten har försäljning.',
+    'cannot_find_item'                   => 'Artikeln hittades inte.',
+    'categories'                         => '',
+    'category'                           => 'Kategori',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategori är ett obligatoriskt fält.',
+    'change_all_to_allow_alt_desc'       => 'Tillåt alternativ beskrivning för alla.',
+    'change_all_to_not_allow_allow_desc' => 'Tillåt inte alternativ beskrivning för alla.',
+    'change_all_to_serialized'           => 'Ändra allt till Serialized',
+    'change_all_to_unserialized'         => 'Ändra allt till ej Serialized',
+    'change_image'                       => 'Ändra bild',
+    'confirm_bulk_edit'                  => 'Är du säker på att du vill redigera valda artiklar?',
+    'confirm_bulk_edit_wipe_taxes'       => 'All Artikel Skatteinformation kommer att ersättas.',
+    'confirm_delete'                     => 'Är du säker på att du vill radera valda artiklar?',
+    'confirm_restore'                    => 'Är du säker på att du vill återställa valda artiklar?',
+    'cost_price'                         => 'Grossistpris',
+    'cost_price_number'                  => 'Grosistpriset måste vara ett nummer.',
+    'cost_price_required'                => 'Grossistpris är ett obligatoriskt fält.',
+    'count'                              => 'Uppdatera Inventory',
+    'csv_import_failed'                  => 'CSV-import misslyckades',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Den uppladdade filen har ingen data eller är formaterad felaktigt.',
+    'csv_import_partially_failed'        => 'Det fanns{0} importfel (er) på rad (er):{1}. Inga rader importerades.',
+    'csv_import_success'                 => 'Artikelimporten lyckades.',
+    'current_quantity'                   => 'Nuvarande antal',
+    'default_pack_name'                  => 'Varje',
+    'description'                        => 'Beskrivning',
+    'details_count'                      => 'Inventarieringsuppgifter',
+    'do_nothing'                         => 'Gör ingeting',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Redigera önskade fält för valda artiklar.',
+    'edit_multiple_items'                => 'Redigering av flera artiklar',
+    'empty_upc_items'                    => 'Tomma streckkodsposter',
+    'error_adding_updating'              => 'Det gick inte att lägga till / uppdatera artiklar',
+    'error_updating_multiple'            => 'Ett fel uppstod vid uppdatering av artiklar',
+    'generate_barcodes'                  => 'Generera streckkoder',
+    'hsn_code'                           => 'Harmoniserade systemnomenklaturen',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Artikelimport från CSV',
+    'info_provided_by'                   => 'Information tillhandahållen av',
+    'inventory'                          => 'Lager',
+    'inventory_CSV_import_quantity'      => 'Antal importerat från CSV',
+    'inventory_comments'                 => 'Kommentarer',
+    'inventory_data_tracking'            => 'Lagerspårning',
+    'inventory_date'                     => 'Datum',
+    'inventory_employee'                 => 'Anställd',
+    'inventory_in_out_quantity'          => 'In / Out Mängd',
+    'inventory_remarks'                  => 'Anmärkningar',
+    'is_deleted'                         => 'Raderad',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Artikeln har serienummer',
+    'item'                               => 'Artikel',
+    'item_id'                            => '',
+    'item_number'                        => 'Streckkod',
+    'item_number_duplicate'              => 'Artikelnummer finns redan i databasen.',
+    'item_number_invalid'                => 'Artikelnumret innehåller otillåtna tecken.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Lagerplats',
+    'low_inventory_items'                => 'Artikeln slutsåld',
+    'low_sell_item'                      => 'Låg försäljnings artikel',
+    'manually_editing_of_quantity'       => 'Manuell redigering av antal',
+    'markup'                             => '',
+    'name'                               => 'Artikelnamn',
+    'name_required'                      => 'Artikelnamn är ett obligatoriskt fält.',
+    'new'                                => 'Ny artikel',
+    'no_description_items'               => 'Inga beskrivning av artikel',
+    'no_items_to_display'                => 'Inga artiklar att visa.',
+    'none'                               => 'inga',
+    'none_selected'                      => 'Du har inte valt några artiklar att redigera',
+    'nonstock'                           => 'Icke-lager',
+    'number_information'                 => 'Artikelnummer',
+    'number_required'                    => 'Streckkod är ett obligatoriskt fält.',
+    'one_or_multiple'                    => 'Artikel',
+    'pack_name'                          => 'Förpackningsnamn',
+    'qty_per_pack'                       => 'Antal per förpackning',
+    'quantity'                           => 'Kvantitet',
+    'quantity_number'                    => 'Antal måste vara ett nummer.',
+    'quantity_required'                  => 'Antal är ett obligatoriskt fält.',
+    'receiving_quantity'                 => 'Mottagningskvantitet',
+    'remove_image'                       => 'Radera bild',
+    'reorder_level'                      => 'Nivå för ombeställning',
+    'reorder_level_number'               => 'Omordningsnivå måste vara ett nummer.',
+    'reorder_level_required'             => 'Återbeställningsnivå är ett obligatoriskt fält.',
+    'retrive_item_info'                  => 'Hämta artikelinfo',
+    'sales_tax_1'                        => 'Moms',
+    'sales_tax_2'                        => 'Moms 2',
+    'search_attributes'                  => 'Sök attribut',
+    'select_image'                       => 'Välj Bild',
+    'serialized_items'                   => 'Serialiserade artiklar',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Lager',
+    'stock_location'                     => 'Lagerplats',
+    'stock_type'                         => 'Lagertyp',
+    'successful_adding'                  => 'Du har lagt till Artikeln',
+    'successful_bulk_edit'               => 'Du har uppdaterat den valda atikeln',
+    'successful_deleted'                 => 'Du har tagit bort artikeln',
+    'successful_updating'                => 'Du har uppdaterat artikeln',
+    'supplier'                           => 'Leverantör',
+    'tax_1'                              => 'Skatt 1',
+    'tax_2'                              => 'Skatt 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Skattekategori',
+    'tax_name_invalid'                   => 'Skattenamnet innehåller otillåtna tecken.',
+    'tax_percent'                        => 'Skatt %',
+    'tax_percent_number'                 => 'Skattprocent måste vara ett numeriskt värde',
+    'tax_percent_required'               => 'Skattprocent är ett obligatoriskt fält.',
+    'tax_percents'                       => 'Skatt %',
+    'temp'                               => 'Tillfällig',
+    'type'                               => 'Artikeltyp',
+    'unit_price'                         => 'Försäljningspris',
+    'unit_price_number'                  => 'Enhetspriset måste vara ett nummer.',
+    'unit_price_required'                => 'Enhetspriset är ett obligatoriskt fält.',
+    'upc_database'                       => 'Streckkod databas',
+    'update'                             => 'Uppdatera artikeln',
+    'use_inventory_menu'                 => 'Använd Inventory Menu',
 ];
diff --git a/app/Language/sv/Login.php b/app/Language/sv/Login.php
index 32b49ebc7..8415fdfca 100644
--- a/app/Language/sv/Login.php
+++ b/app/Language/sv/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Jag är inte en robot.",
-    "go"                            => "Logga in",
-    "invalid_gcaptcha"              => "Ogiltig jag är ingen robot.",
-    "invalid_installation"          => "Installationen är inte korrekt, kontrollera din php.ini fil.",
-    "invalid_username_and_password" => "Ogiltigt användarnamn eller lösenord.",
-    "login"                         => "Login",
-    "logout"                        => "Logga ut",
-    "migration_needed"              => "En migration av databasen till {0} kommer att påbörjas efter inloggningen.",
-    "password"                      => "Lösenord",
-    "required_username"             => "Fältet för användarnamn krävs.",
-    "username"                      => "Användarnamn",
-    "welcome"                       => "Välkommen till {0}!",
+    "gcaptcha"                            => "Jag är inte en robot.",
+    "go"                                  => "Logga in",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Ogiltig jag är ingen robot.",
+    "invalid_installation"                => "Installationen är inte korrekt, kontrollera din php.ini fil.",
+    "invalid_username_and_password"       => "Ogiltigt användarnamn eller lösenord.",
+    "login"                               => "Login",
+    "logout"                              => "Logga ut",
+    "migrating_database"                  => "Migrerar databas",
+    "migration_auth_message"              => "Admin-uppgifter krävs för att godkänna databasmigrationen till version {0}. Logga in för att fortsätta.",
+    "migration_complete"                  => "Databas initierad framgångsrikt!",
+    "migration_complete_login"            => "Du kan nu logga in.",
+    "migration_complete_migrate"          => "Databasen har migrerats!",
+    "migration_complete_redirect"         => "Migration klar. Omdirigerar till login...",
+    "migration_error_connection"          => "Anslutningsfel. Försök igen.",
+    "migration_failed"                    => "Migration misslyckades",
+    "migration_initializing"              => "Initierar databas",
+    "migration_needed"                    => "En migration av databasen till {0} kommer att påbörjas efter inloggningen.",
+    "migration_required"                  => "Databasmigration krävs",
+    "migration_running"                   => "Kör databasmigrationer...",
+    "password"                            => "Lösenord",
+    "required_username"                   => "Fältet för användarnamn krävs.",
+    'too_many_attempts'                   => 'För många försök. Vänta en stund och försök igen.',
+    "username"                            => "Användarnamn",
+    "welcome"                             => "Välkommen till {0}!"
 ];
diff --git a/app/Language/sv/Reports.php b/app/Language/sv/Reports.php
index 68f79b1a3..232531637 100644
--- a/app/Language/sv/Reports.php
+++ b/app/Language/sv/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Skattesats",
     "taxes"                                   => "Skatter",
     "taxes_summary_report"                    => "Sammanfattningsrapport för skatter",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Totalt",
     "total_inventory_value"                   => "Totalt lagervärde",
     "total_low_sell_quantity"                 => "Totalt lågt säljare antal",
diff --git a/app/Language/sv/Sales.php b/app/Language/sv/Sales.php
index b492a389f..55d11ca2d 100644
--- a/app/Language/sv/Sales.php
+++ b/app/Language/sv/Sales.php
@@ -1,226 +1,240 @@
 <?php
 
 return [
-    "customers_available_points"       => "Tillgängliga poäng",
-    "rewards_package"                  => "Belöning",
-    "rewards_remaining_balance"        => "Beloppets återstående värde är ",
-    "account_number"                   => "Konto #",
-    "add_payment"                      => "Lägg till betalning",
-    "amount_due"                       => "Belopp",
-    "amount_tendered"                  => "Upplagt belopp",
-    "authorized_signature"             => "Auktoriserad signatur",
-    "cancel_sale"                      => "Avbryt",
-    "cash"                             => "Kontant",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Kontantjustering",
-    "cash_deposit"                     => "Kontant insättning",
-    "cash_filter"                      => "Kontant",
-    "change_due"                       => "Ändra förfallna",
-    "change_price"                     => "Ändra försäljningspris",
-    "check"                            => "Kontrollera",
-    "check_balance"                    => "Kontrollera resten",
-    "check_filter"                     => "Kontrollera",
-    "close"                            => "",
-    "comment"                          => "Kommentar",
-    "comments"                         => "Kommentarer",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Slutför",
-    "confirm_cancel_sale"              => "Är du säker på att du vill rensa den här försäljningen? Alla objekt kommer att rensas.",
-    "confirm_delete"                   => "Är du säker på att du vill radera de valda försäljningarna?",
-    "confirm_restore"                  => "Är du säker på att du vill återställa den valda försäljningen?",
-    "credit"                           => "Kreditkort",
-    "credit_deposit"                   => "Kreditkort",
-    "credit_filter"                    => "Kreditkort",
-    "current_table"                    => "",
-    "customer"                         => "Namn",
-    "customer_address"                 => "Adress",
-    "customer_discount"                => "Rabatt",
-    "customer_email"                   => "E-mail",
-    "customer_location"                => "Plats",
-    "customer_mailchimp_status"        => "MailChimp status",
-    "customer_optional"                => "(Krävs för förfallna betalningar)",
-    "customer_required"                => "(Nödvändig)",
-    "customer_total"                   => "Totalt",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Försäljningsdag",
-    "date_range"                       => "Datumintervall",
-    "date_required"                    => "Ett korrekt datum måste anges.",
-    "date_type"                        => "Datum är ett obligatoriskt fält.",
-    "debit"                            => "Kontokort",
-    "debit_filter"                     => "",
-    "delete"                           => "Tillåt radera",
-    "delete_confirmation"              => "Är du säker på att du vill radera denna försäljning? Den här åtgärden kan inte ångras.",
-    "delete_entire_sale"               => "Ta bort hela försäljningen",
-    "delete_successful"                => "Försäljningen raderades.",
-    "delete_unsuccessful"              => "Försäljningsradering misslyckades.",
-    "description_abbrv"                => "Beskr.",
-    "discard"                          => "Kassera",
-    "discard_quote"                    => "",
-    "discount"                         => "Rabatt %",
-    "discount_included"                => "% Rabatt",
-    "discount_short"                   => "%",
-    "due"                              => "skuld",
-    "due_filter"                       => "skuld",
-    "edit"                             => "Ändra",
-    "edit_item"                        => "Ändra Artikel",
-    "edit_sale"                        => "Ändra försäljning",
-    "email_receipt"                    => "E-mail kvitto",
-    "employee"                         => "Anställd",
-    "entry"                            => "Post",
-    "error_editing_item"               => "Ändra artikel misslyckades",
-    "find_or_scan_item"                => "Hitta eller skanna artikel",
-    "find_or_scan_item_or_receipt"     => "Hitta eller skanna artikel eller kvitto",
-    "giftcard"                         => "Presentkort",
-    "giftcard_balance"                 => "Presentkortsbalans",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Presentkortsnummer",
-    "group_by_category"                => "Gruppera per kategori",
-    "group_by_type"                    => "Gruppera per typ",
-    "hsn"                              => "HSN",
-    "id"                               => "Försäljnings-ID",
-    "include_prices"                   => "Inkludera priser?",
-    "invoice"                          => "Faktura",
-    "invoice_confirm"                  => "Denna faktura skickas till",
-    "invoice_enable"                   => "Fakturanummer",
-    "invoice_filter"                   => "Fakturor",
-    "invoice_no_email"                 => "Den här kunden har ingen giltig e-postadress.",
-    "invoice_number"                   => "Faktura #",
-    "invoice_number_duplicate"         => "Fakturanummer måste vara unika.",
-    "invoice_sent"                     => "Faktura skickad till",
-    "invoice_total"                    => "Faktura totalt",
-    "invoice_type_custom_invoice"      => "Anpassad faktura (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Anpassad momsfaktura (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Faktura (faktura.php",
-    "invoice_type_tax_invoice"         => "Skattefaktura (tax_invoice.php)",
-    "invoice_unsent"                   => "Faktura misslyckades med att skickas till",
-    "invoice_update"                   => "Omräkning",
-    "item_insufficient_of_stock"       => "Artikeln har otillräckligt lager.",
-    "item_name"                        => "Namn på artikel",
-    "item_number"                      => "Artikel #",
-    "item_out_of_stock"                => "Artikel är slut på lager.",
-    "key_browser"                      => "Hjälpfulla genvägar",
-    "key_cancel"                       => "Avbryter nuvarande Kvot/Faktura/Försäljning",
-    "key_customer_search"              => "Kundsökning",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Lägg till betalning och fullständig faktura/försäljning",
-    "key_full"                         => "Öppna i fullskärmsläge",
-    "key_function"                     => "Function",
-    "key_help"                         => "Genvägar",
-    "key_help_modal"                   => "Öppna fönstret för genvägar",
-    "key_in"                           => "Zooma in",
-    "key_item_search"                  => "Sök efter produkt",
-    "key_out"                          => "Zooma ut",
-    "key_payment"                      => "Lägg till betalning",
-    "key_print"                        => "Skriv ut aktuell sida",
-    "key_restore"                      => "Återställ originalskärmen/Zoomningen",
-    "key_search"                       => "Sök i rapporttabeller",
-    "key_suspend"                      => "Skjut upp pågående försäljning",
-    "key_suspended"                    => "Visa uppskjutna försäljningar",
-    "key_system"                       => "System-genvägar",
-    "key_tendered"                     => "Redigera det remitterade beloppet",
-    "key_title"                        => "Tangentbordsgenvägar för försäljning",
-    "mc"                               => "",
-    "mode"                             => "Registrera läge",
-    "must_enter_numeric"               => "Belopp som anslås måste vara ett nummer.",
-    "must_enter_numeric_giftcard"      => "Presentkortets nummer måste vara ett nummer.",
-    "new_customer"                     => "Ny kund",
-    "new_item"                         => "Ny artikel",
-    "no_description"                   => "Inget",
-    "no_filter"                        => "Alla",
-    "no_items_in_cart"                 => "Det finns inga varor i kundvagnen.",
-    "no_sales_to_display"              => "Ingen försäljning att visa.",
-    "none_selected"                    => "Du har inte valt någon Försäljning (ar) att radera.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "Den här åtgärden är inte tillåten.",
-    "one_or_multiple"                  => "Försäljning(ar)",
-    "payment"                          => "Betalningstyp",
-    "payment_amount"                   => "Belopp",
-    "payment_not_cover_total"          => "Betalningsbeloppet måste vara större än eller lika med Totalt.",
-    "payment_type"                     => "Typ",
-    "payments"                         => "",
-    "payments_total"                   => "Betalningar Totalt",
-    "price"                            => "Pris",
-    "print_after_sale"                 => "Skriv ut efter försäljning",
-    "quantity"                         => "Antal",
-    "quantity_less_than_reorder_level" => "Varning: Önskat antal är under påfyllnadsnivå för den aktuella produkten.",
-    "quantity_less_than_zero"          => "Varning: Önskat antal är otillräckligt. Du kan fortfarande bearbeta försäljningen, men granska din inventering.",
-    "quantity_of_items"                => "Antal {0} objekt",
-    "quote"                            => "Kvot",
-    "quote_number"                     => "Quote nummer",
-    "quote_number_duplicate"           => "Quote nummer måste vara unikt.",
-    "quote_sent"                       => "Quote skickat till",
-    "quote_unsent"                     => "Quote misslyckades att skickas till",
-    "receipt"                          => "Kvitto",
-    "receipt_no_email"                 => "Denna kund har ingen giltig e-postadress.",
-    "receipt_number"                   => "Försäljning #",
-    "receipt_sent"                     => "Kvitto skickat till",
-    "receipt_unsent"                   => "Kvittot misslyckades med att skickas till",
-    "refund"                           => "Återbetalningstyp",
-    "register"                         => "Försäljningsregister",
-    "remove_customer"                  => "Ta bort kund",
-    "remove_discount"                  => "",
-    "return"                           => "Retur",
-    "rewards"                          => "Belöningspoäng",
-    "rewards_balance"                  => "Belöningspoäng Balans",
-    "sale"                             => "Försäljning",
-    "sale_by_invoice"                  => "Försäljning via faktura",
-    "sale_for_customer"                => "Kund:",
-    "sale_time"                        => "Tid",
-    "sales_tax"                        => "Försäljnings skatt",
-    "sales_total"                      => "",
-    "select_customer"                  => "Välj kund (valfritt)",
-    "send_invoice"                     => "Skicka faktura",
-    "send_quote"                       => "Skicka Quote",
-    "send_receipt"                     => "Skicka kvitto",
-    "send_work_order"                  => "Skicka arbetsorder",
-    "serial"                           => "Serie",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Visa faktura",
-    "show_receipt"                     => "Visa kvitto",
-    "start_typing_customer_name"       => "Börja skriva kunduppgifter ...",
-    "start_typing_item_name"           => "Börja skriva typnamn eller skanna streckkod ...",
-    "stock"                            => "Lager",
-    "stock_location"                   => "Lagerplats",
-    "sub_total"                        => "Delsumma",
-    "successfully_deleted"             => "Du har tagit bort",
-    "successfully_restored"            => "Du har lyckats återställa",
-    "successfully_suspended_sale"      => "Försäljning avbruten.",
-    "successfully_updated"             => "Försäljningsuppdatering lyckades.",
-    "suspend_sale"                     => "Avbruten",
-    "suspended_doc_id"                 => "Dokument",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Avbruten",
-    "table"                            => "Tabell",
-    "takings"                          => "Daglig försäljning",
-    "tax"                              => "Skatt",
-    "tax_id"                           => "Skatteid",
-    "tax_invoice"                      => "Skatte faktura",
-    "tax_percent"                      => "Skattesats %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Totalt",
-    "total_tax_exclusive"              => "Skatt exkluderad",
-    "transaction_failed"               => "Försäljningstransaktionen misslyckades.",
-    "unable_to_add_item"               => "Artikel tillägg till försäljning misslyckades",
-    "unsuccessfully_deleted"           => "Försäljning (ar) radering misslyckades.",
-    "unsuccessfully_restored"          => "Återställningen av försäljning (ar) misslyckades.",
-    "unsuccessfully_suspended_sale"    => "Försäljningsuppehåll misslyckades.",
-    "unsuccessfully_updated"           => "Försäljnings uppdatering misslyckades.",
-    "unsuspend"                        => "Återuppta",
-    "unsuspend_and_delete"             => "Verkställ",
-    "update"                           => "Uppdatera",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Arbetsorder",
-    "work_order_number"                => "Arbetsorder nummer",
-    "work_order_number_duplicate"      => "Arbetsorder nummer måste vara unikt.",
-    "work_order_sent"                  => "Arbetsorder skickad till",
-    "work_order_unsent"                => "Arbetsorder gick ej att skicka till",
-    "selected_customer"                => "Vald kund",
+    'account_number'                    => 'Konto #',
+    'add_payment'                       => 'Lägg till betalning',
+    'amount_due'                        => 'Belopp',
+    'amount_due_not_covered'            => 'Betalningarna täcker inte det förfallna beloppet.',
+    'amount_tendered'                   => 'Upplagt belopp',
+    'authorized_signature'              => 'Auktoriserad signatur',
+    'cancel_sale'                       => 'Avbryt',
+    'cash'                              => 'Kontant',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Kontantjustering',
+    'cash_deposit'                      => 'Kontant insättning',
+    'cash_filter'                       => 'Kontant',
+    'change_due'                        => 'Ändra förfallna',
+    'change_price'                      => 'Ändra försäljningspris',
+    'check'                             => 'Kontrollera',
+    'check_balance'                     => 'Kontrollera resten',
+    'check_filter'                      => 'Kontrollera',
+    'close'                             => '',
+    'comment'                           => 'Kommentar',
+    'comments'                          => 'Kommentarer',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Slutför',
+    'confirm_cancel_sale'               => 'Är du säker på att du vill rensa den här försäljningen? Alla objekt kommer att rensas.',
+    'confirm_delete'                    => 'Är du säker på att du vill radera de valda försäljningarna?',
+    'confirm_restore'                   => 'Är du säker på att du vill återställa den valda försäljningen?',
+    'credit'                            => 'Kreditkort',
+    'credit_deposit'                    => 'Kreditkort',
+    'credit_filter'                     => 'Kreditkort',
+    'current_table'                     => '',
+    'customer'                          => 'Namn',
+    'customer_address'                  => 'Adress',
+    'customer_discount'                 => 'Rabatt',
+    'customer_email'                    => 'E-mail',
+    'customer_location'                 => 'Plats',
+    'customer_mailchimp_status'         => 'MailChimp status',
+    'customer_optional'                 => '(Krävs för förfallna betalningar)',
+    'customer_required'                 => '(Nödvändig)',
+    'customer_total'                    => 'Totalt',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Tillgängliga poäng',
+    'daily_sales'                       => '',
+    'date'                              => 'Försäljningsdag',
+    'date_range'                        => 'Datumintervall',
+    'date_required'                     => 'Ett korrekt datum måste anges.',
+    'date_type'                         => 'Datum är ett obligatoriskt fält.',
+    'debit'                             => 'Kontokort',
+    'debit_filter'                      => '',
+    'delete'                            => 'Tillåt radera',
+    'delete_confirmation'               => 'Är du säker på att du vill radera denna försäljning? Den här åtgärden kan inte ångras.',
+    'delete_entire_sale'                => 'Ta bort hela försäljningen',
+    'delete_successful'                 => 'Försäljningen raderades.',
+    'delete_unsuccessful'               => 'Försäljningsradering misslyckades.',
+    'description_abbrv'                 => 'Beskr.',
+    'discard'                           => 'Kassera',
+    'discard_quote'                     => '',
+    'discount'                          => 'Rabatt %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Rabatt',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'skuld',
+    'due_filter'                        => 'skuld',
+    'edit'                              => 'Ändra',
+    'edit_item'                         => 'Ändra Artikel',
+    'edit_sale'                         => 'Ändra försäljning',
+    'email_receipt'                     => 'E-mail kvitto',
+    'employee'                          => 'Anställd',
+    'entry'                             => 'Post',
+    'error_editing_item'                => 'Ändra artikel misslyckades',
+    'find_or_scan_item'                 => 'Hitta eller skanna artikel',
+    'find_or_scan_item_or_receipt'      => 'Hitta eller skanna artikel eller kvitto',
+    'giftcard'                          => 'Presentkort',
+    'giftcard_balance'                  => 'Presentkortsbalans',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Presentkortsnummer',
+    'group_by_category'                 => 'Gruppera per kategori',
+    'group_by_type'                     => 'Gruppera per typ',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Försäljnings-ID',
+    'include_prices'                    => 'Inkludera priser?',
+    'insufficient_giftcard_balance'     => 'Otillräckligt presentkortsaldo för denna betalning.',
+    'insufficient_reward_points'        => 'Otillräckliga belöningspoäng för denna betalning.',
+    'invoice'                           => 'Faktura',
+    'invoice_confirm'                   => 'Denna faktura skickas till',
+    'invoice_enable'                    => 'Fakturanummer',
+    'invoice_filter'                    => 'Fakturor',
+    'invoice_no_email'                  => 'Den här kunden har ingen giltig e-postadress.',
+    'invoice_number'                    => 'Faktura #',
+    'invoice_number_duplicate'          => 'Fakturanummer måste vara unika.',
+    'invoice_sent'                      => 'Faktura skickad till',
+    'invoice_total'                     => 'Faktura totalt',
+    'invoice_type_custom_invoice'       => 'Anpassad faktura (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Anpassad momsfaktura (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Faktura (faktura.php',
+    'invoice_type_tax_invoice'          => 'Skattefaktura (tax_invoice.php)',
+    'invoice_unsent'                    => 'Faktura misslyckades med att skickas till',
+    'invoice_update'                    => 'Omräkning',
+    'item_insufficient_of_stock'        => 'Artikeln har otillräckligt lager.',
+    'item_name'                         => 'Namn på artikel',
+    'item_number'                       => 'Artikel #',
+    'item_out_of_stock'                 => 'Artikel är slut på lager.',
+    'key_browser'                       => 'Hjälpfulla genvägar',
+    'key_cancel'                        => 'Avbryter nuvarande Kvot/Faktura/Försäljning',
+    'key_customer_search'               => 'Kundsökning',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Lägg till betalning och fullständig faktura/försäljning',
+    'key_full'                          => 'Öppna i fullskärmsläge',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Genvägar',
+    'key_help_modal'                    => 'Öppna fönstret för genvägar',
+    'key_in'                            => 'Zooma in',
+    'key_item_search'                   => 'Sök efter produkt',
+    'key_out'                           => 'Zooma ut',
+    'key_payment'                       => 'Lägg till betalning',
+    'key_print'                         => 'Skriv ut aktuell sida',
+    'key_restore'                       => 'Återställ originalskärmen/Zoomningen',
+    'key_search'                        => 'Sök i rapporttabeller',
+    'key_suspend'                       => 'Skjut upp pågående försäljning',
+    'key_suspended'                     => 'Visa uppskjutna försäljningar',
+    'key_system'                        => 'System-genvägar',
+    'key_tendered'                      => 'Redigera det remitterade beloppet',
+    'key_title'                         => 'Tangentbordsgenvägar för försäljning',
+    'mc'                                => '',
+    'mode'                              => 'Registrera läge',
+    'must_enter_numeric'                => 'Belopp som anslås måste vara ett nummer.',
+    'must_enter_numeric_giftcard'       => 'Presentkortets nummer måste vara ett nummer.',
+    'must_enter_reference_code'         => 'Referens-/hämtningsnummer måste anges.',
+    'negative_amount_tendered'          => 'Det upplagda beloppet kan inte vara negativt.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Ny kund',
+    'new_item'                          => 'Ny artikel',
+    'no_description'                    => 'Inget',
+    'no_filter'                         => 'Alla',
+    'no_items_in_cart'                  => 'Det finns inga varor i kundvagnen.',
+    'no_sales_to_display'               => 'Ingen försäljning att visa.',
+    'none_selected'                     => 'Du har inte valt någon Försäljning (ar) att radera.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'Den här åtgärden är inte tillåten.',
+    'one_or_multiple'                   => 'Försäljning(ar)',
+    'payment'                           => 'Betalningstyp',
+    'payment_amount'                    => 'Belopp',
+    'payment_not_cover_total'           => 'Betalningsbeloppet måste vara större än eller lika med Totalt.',
+    'payment_type'                      => 'Typ',
+    'payments'                          => '',
+    'payments_total'                    => 'Betalningar Totalt',
+    'price'                             => 'Pris',
+    'print_after_sale'                  => 'Skriv ut efter försäljning',
+    'quantity'                          => 'Antal',
+    'quantity_less_than_reorder_level'  => 'Varning: Önskat antal är under påfyllnadsnivå för den aktuella produkten.',
+    'quantity_less_than_zero'           => 'Varning: Önskat antal är otillräckligt. Du kan fortfarande bearbeta försäljningen, men granska din inventering.',
+    'quantity_of_items'                 => 'Antal {0} objekt',
+    'quote'                             => 'Kvot',
+    'quote_number'                      => 'Quote nummer',
+    'quote_number_duplicate'            => 'Quote nummer måste vara unikt.',
+    'quote_sent'                        => 'Quote skickat till',
+    'quote_unsent'                      => 'Quote misslyckades att skickas till',
+    'receipt'                           => 'Kvitto',
+    'receipt_no_email'                  => 'Denna kund har ingen giltig e-postadress.',
+    'receipt_number'                    => 'Försäljning #',
+    'receipt_sent'                      => 'Kvitto skickat till',
+    'receipt_unsent'                    => 'Kvittot misslyckades med att skickas till',
+    'reference_code'                    => 'Betalningsreferenskod',
+    'reference_code_invalid_characters' => 'Referenskoden får bara innehålla bokstäver och siffror.',
+    'reference_code_length_error'       => 'Referenskodens längd är ogiltig.',
+    'refund'                            => 'Återbetalningstyp',
+    'register'                          => 'Försäljningsregister',
+    'remove_customer'                   => 'Ta bort kund',
+    'remove_discount'                   => '',
+    'return'                            => 'Retur',
+    'rewards'                           => 'Belöningspoäng',
+    'rewards_balance'                   => 'Belöningspoäng Balans',
+    'rewards_package'                   => 'Belöning',
+    'rewards_remaining_balance'         => 'Beloppets återstående värde är ',
+    'sale'                              => 'Försäljning',
+    'sale_by_invoice'                   => 'Försäljning via faktura',
+    'sale_for_customer'                 => 'Kund:',
+    'sale_time'                         => 'Tid',
+    'sales_tax'                         => 'Försäljnings skatt',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Välj kund (valfritt)',
+    'selected_customer'                 => 'Vald kund',
+    'send_invoice'                      => 'Skicka faktura',
+    'send_quote'                        => 'Skicka Quote',
+    'send_receipt'                      => 'Skicka kvitto',
+    'send_work_order'                   => 'Skicka arbetsorder',
+    'serial'                            => 'Serie',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Visa faktura',
+    'show_receipt'                      => 'Visa kvitto',
+    'start_typing_customer_name'        => 'Börja skriva kunduppgifter ...',
+    'start_typing_item_name'            => 'Börja skriva typnamn eller skanna streckkod ...',
+    'stock'                             => 'Lager',
+    'stock_location'                    => 'Lagerplats',
+    'sub_total'                         => 'Delsumma',
+    'successfully_deleted'              => 'Du har tagit bort',
+    'successfully_restored'             => 'Du har lyckats återställa',
+    'successfully_suspended_sale'       => 'Försäljning avbruten.',
+    'successfully_updated'              => 'Försäljningsuppdatering lyckades.',
+    'suspend_sale'                      => 'Avbruten',
+    'suspended_doc_id'                  => 'Dokument',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Avbruten',
+    'table'                             => 'Tabell',
+    'takings'                           => 'Daglig försäljning',
+    'tax'                               => 'Skatt',
+    'tax_id'                            => 'Skatteid',
+    'tax_invoice'                       => 'Skatte faktura',
+    'tax_percent'                       => 'Skattesats %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Totalt',
+    'total_tax_exclusive'               => 'Skatt exkluderad',
+    'transaction_failed'                => 'Försäljningstransaktionen misslyckades.',
+    'unable_to_add_item'                => 'Artikel tillägg till försäljning misslyckades',
+    'unsuccessfully_deleted'            => 'Försäljning (ar) radering misslyckades.',
+    'unsuccessfully_restored'           => 'Återställningen av försäljning (ar) misslyckades.',
+    'unsuccessfully_suspended_sale'     => 'Försäljningsuppehåll misslyckades.',
+    'unsuccessfully_updated'            => 'Försäljnings uppdatering misslyckades.',
+    'unsuspend'                         => 'Återuppta',
+    'unsuspend_and_delete'              => 'Verkställ',
+    'update'                            => 'Uppdatera',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Arbetsorder',
+    'work_order_number'                 => 'Arbetsorder nummer',
+    'work_order_number_duplicate'       => 'Arbetsorder nummer måste vara unikt.',
+    'work_order_sent'                   => 'Arbetsorder skickad till',
+    'work_order_unsent'                 => 'Arbetsorder gick ej att skicka till',
 ];
diff --git a/app/Language/sw-KE/Attributes.php b/app/Language/sw-KE/Attributes.php
index 9953939c0..07927944d 100644
--- a/app/Language/sw-KE/Attributes.php
+++ b/app/Language/sw-KE/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Thamani ya sifa haiwezi kuwa na '_' au '|'",
-    "confirm_delete"                   => "Una uhakika unataka kufuta sifa iliyochaguliwa/zilizochaguliwa?",
-    "confirm_restore"                  => "Una uhakika unataka kurejesha sifa iliyochaguliwa/zilizochaguliwa?",
-    "definition_cannot_be_deleted"     => "Haiwezekani kufuta sifa iliyochaguliwa/zilizochaguliwa",
-    "definition_error_adding_updating" => "Sifa {0} haiwezekani kuongezwa au kusasishwa. Tafadhali angalia logi ya makosa.",
-    "definition_flags"                 => "Uonekano wa Sifa",
-    "definition_group"                 => "Kundi",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Ongeza Sifa",
-    "definition_name_required"         => "Jina la sifa ni kiashiria kinachohitajika",
-    "definition_one_or_multiple"       => "Sifa",
-    "definition_successful_adding"     => "Umefanikiwa kuongeza kipengee(Item)",
-    "definition_successful_deleted"    => "Umefanikiwa kufuta",
-    "definition_successful_updating"   => "Umefanikiwa kusasisha sifa",
-    "definition_type"                  => "Aina ya Sifa",
-    "definition_type_required"         => "Aina ya sifa ni kiashiria kinachohitajika",
-    "definition_unit"                  => "Kipimo",
-    "definition_values"                => "Thamani za Sifa",
-    "new"                              => "Sifa Mpya",
-    "no_attributes_to_display"         => "Hakuna Sifa za kuonyesha",
-    "receipt_visibility"               => "Risiti",
-    "show_in_items"                    => "Onyesha kwenye bidhaa",
-    "show_in_items_visibility"         => "Bidhaa",
-    "show_in_receipt"                  => "Onyesha kwenye risiti",
-    "show_in_receivings"               => "Onyesha kwenye Manunuzi",
-    "show_in_receivings_visibility"    => "Manunuzi",
-    "show_in_sales"                    => "Onyesha kwenye Mauzo",
-    "show_in_sales_visibility"         => "Mauzo",
-    "update"                           => "Sasisha Sifa",
-];
\ No newline at end of file
+    'attribute_value_invalid_chars'    => 'Thamani ya sifa haiwezi kuwa na \'_\' au \'|\'',
+    'confirm_delete'                   => 'Una uhakika unataka kufuta sifa iliyochaguliwa/zilizochaguliwa?',
+    'confirm_restore'                  => 'Una uhakika unataka kurejesha sifa iliyochaguliwa/zilizochaguliwa?',
+    'definition_cannot_be_deleted'     => 'Haiwezekani kufuta sifa iliyochaguliwa/zilizochaguliwa',
+    'definition_invalid_group' => 'Kikundi ulichochagua hakipo au hakitoshi.',
+    'definition_error_adding_updating' => 'Sifa {0} haiwezekani kuongezwa au kusasishwa. Tafadhali angalia logi ya makosa.',
+    'definition_flags'                 => 'Uonekano wa Sifa',
+    'definition_group'                 => 'Kundi',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Ongeza Sifa',
+    'definition_name_required'         => 'Jina la sifa ni kiashiria kinachohitajika',
+    'definition_one_or_multiple'       => 'Sifa',
+    'definition_successful_adding'     => 'Umefanikiwa kuongeza kipengee(Item)',
+    'definition_successful_deleted'    => 'Umefanikiwa kufuta',
+    'definition_successful_updating'   => 'Umefanikiwa kusasisha sifa',
+    'definition_type'                  => 'Aina ya Sifa',
+    'definition_type_required'         => 'Aina ya sifa ni kiashiria kinachohitajika',
+    'definition_unit'                  => 'Kipimo',
+    'definition_values'                => 'Thamani za Sifa',
+    'new'                              => 'Sifa Mpya',
+    'no_attributes_to_display'         => 'Hakuna Sifa za kuonyesha',
+    'receipt_visibility'               => 'Risiti',
+    'show_in_items'                    => 'Onyesha kwenye bidhaa',
+    'show_in_items_visibility'         => 'Bidhaa',
+    'show_in_receipt'                  => 'Onyesha kwenye risiti',
+    'show_in_receivings'               => 'Onyesha kwenye Manunuzi',
+    'show_in_receivings_visibility'    => 'Manunuzi',
+    'show_in_sales'                    => 'Onyesha kwenye Mauzo',
+    'show_in_sales_visibility'         => 'Mauzo',
+    'show_in_search'                   => 'Onyesha kwenye Utafutaji',
+    'show_in_search_visibility'        => 'Utafutaji',
+    'update'                           => 'Sasisha Sifa',
+];
diff --git a/app/Language/sw-KE/Bootstrap_tables.php b/app/Language/sw-KE/Bootstrap_tables.php
index a991b6233..abeeed2cd 100644
--- a/app/Language/sw-KE/Bootstrap_tables.php
+++ b/app/Language/sw-KE/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Zote",
-    "columns"              => "Safu wima",
-    "hide_show_pagination" => "Ficha/Onyesha upangaji kurasa",
-    "loading"              => "Inapakia, tafadhali subiri...",
-    "page_from_to"         => "Inaonyesha {0} hadi {1} kati ya Mistari {2}",
-    "refresh"              => "Sasisha",
-    "rows_per_page"        => "Mistari {0} kwa kila ukurasa",
-    "toggle"               => "Badilisha",
-];
\ No newline at end of file
+    'all' => "Zote",
+    'columns' => "Safu wima",
+    'hide_show_pagination' => "Ficha/Onyesha upangaji kurasa",
+    'loading' => "Inapakia, tafadhali subiri",
+    'page_from_to' => "Inaonyesha {0} hadi {1} kati ya Mistari {2}",
+    'refresh' => "Sasisha",
+    'rows_per_page' => "Mistari {0} kwa kila ukurasa",
+    'toggle' => "Badilisha",
+];
diff --git a/app/Language/sw-KE/Config.php b/app/Language/sw-KE/Config.php
index 4a89635a7..8ca0caf26 100644
--- a/app/Language/sw-KE/Config.php
+++ b/app/Language/sw-KE/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Anwani ya Kampuni",
-    "address_required"                          => "Anwani ya kampuni ni kiashiria kinachohitajika.",
-    "all_set"                                   => "Ruhusa zote za faili zimewekwa vizuri!",
-    "allow_duplicate_barcodes"                  => "Ruhusu Misimbomstari iliyorudiwa",
-    "apostrophe"                                => "apostrofi",
-    "backup_button"                             => "Hifadhi Nakala",
-    "backup_database"                           => "Hifadhi Nakala ya Hifadhidata",
-    "barcode"                                   => "Msimbo wa Mstari",
-    "barcode_company"                           => "Jina la Kampuni",
-    "barcode_configuration"                     => "Mpangilio wa Msimbomstari",
-    "barcode_content"                           => "Yaliyomo kwenye Msimbomstari",
-    "barcode_first_row"                         => "Safu 1",
-    "barcode_font"                              => "Aina ya Herufi",
-    "barcode_formats"                           => "Aina za Uingizaji",
-    "barcode_generate_if_empty"                 => "Tengeneza ikiwa tupu.",
-    "barcode_height"                            => "Urefu (px)",
-    "barcode_id"                                => "Id ya Bidhaa/Jina",
-    "barcode_info"                              => "Taarifa za Mpangilio wa Msimbomstari",
-    "barcode_layout"                            => "Mpangilio wa Msimbomstari",
-    "barcode_name"                              => "Jina",
-    "barcode_number"                            => "Msimbomstari",
-    "barcode_number_in_row"                     => "Idadi kwenye safu",
-    "barcode_page_cellspacing"                  => "Onyesha nafasi kati ya seli za ukurasa.",
-    "barcode_page_width"                        => "Onyesha upana wa ukurasa",
-    "barcode_price"                             => "Bei",
-    "barcode_second_row"                        => "Safu 2",
-    "barcode_third_row"                         => "Safu 3",
-    "barcode_tooltip"                           => "Tahadhari: Kipengele hiki kinaweza kusababisha kurudiwa kwa bidhaa zilizoingizwa au kuundwa. Usitumie ikiwa hutaki Msimbomstari(Barcode) zilizorudiwa.",
-    "barcode_type"                              => "Aina ya Msimbomstari",
-    "barcode_width"                             => "Upana (px)",
-    "bottom"                                    => "Chini",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Desimali za Fedha Taslimu",
-    "cash_decimals_tooltip"                     => "Ikiwa Desimali za Fedha Taslimu na Desimali za Sarafu ni sawa basi hakuna mzunguko wa fedha taslimu utakaofanyika, isipokuwa Mzunguko wa Fedha Taslimu umewekwa kwenye Nusu Tano.",
-    "cash_rounding"                             => "Mzunguko wa Fedha Taslimu",
-    "category_dropdown"                         => "Onyesha Kategoria kama orodha ya kushuka",
-    "center"                                    => "Katikati",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "koma",
-    "company"                                   => "Jina la Kampuni",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Badilisha Picha",
-    "company_logo"                              => "Nembo ya Kampuni",
-    "company_remove_image"                      => "Ondoa Picha",
-    "company_required"                          => "Jina la kampuni ni kiashiria kinachohitajika",
-    "company_select_image"                      => "Chagua Picha",
-    "company_website_url"                       => "Tovuti ya kampuni si URL halali (http://...).",
-    "country_codes"                             => "Msimbo wa Nchi",
-    "country_codes_tooltip"                     => "Orodha ya misimbo ya nchi zilizotenganishwa kwa koma kwa utafutaji wa anwani wa uteuzi.",
-    "currency_code"                             => "Nambari ya Sarafu",
-    "currency_decimals"                         => "Desimali za Sarafu",
-    "currency_symbol"                           => "Alama ya Sarafu",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Zawadi",
-    "customer_reward_duplicate"                 => "Zawadi lazima iwe ya kipekee.",
-    "customer_reward_enable"                    => "Washa Zawadi kwa Wateja",
-    "customer_reward_invalid_chars"             => "Zawadi haiwezi kuwa na '_'",
-    "customer_reward_required"                  => "Zawadi ni kiashiria kinachohitajika",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Kichujio cha Tarehe na Muda",
-    "datetimeformat"                            => "Muundo wa Tarehe na Muda",
-    "decimal_point"                             => "Nukta ya Desimali",
-    "default_barcode_font_size_number"          => "Ukubwa wa herufi wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_font_size_required"        => "Ukubwa wa herufi wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_height_number"             => "Urefu wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_height_required"           => "Urefu wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_num_in_row_number"         => "Idadi ya Msimbomstari kwenye safu lazima iwe nambari.",
-    "default_barcode_num_in_row_required"       => "Idadi ya Msimbomstari kwenye safu ni kiashiria kinachohitajika.",
-    "default_barcode_page_cellspacing_number"   => "Nafasi kati ya chumba cha ukurasa wa Msimbomstari lazima iwe nambari.",
-    "default_barcode_page_cellspacing_required" => "Nafasi kati ya chumba cha ukurasa wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_page_width_number"         => "Upana wa ukurasa wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_page_width_required"       => "Upana wa ukurasa wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_width_number"              => "Upana wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_width_required"            => "Upana wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_item_columns"                      => "Safu wima za Bidhaa Zinazoonekana Kwa Chaguo-msingi",
-    "default_origin_tax_code"                   => "Nambari ya Kodi ya Asili kwa Chaguo-msingi",
-    "default_receivings_discount"               => "Punguzo la Manunuzi kwa Chaguo-msingi",
-    "default_receivings_discount_number"        => "Punguzo la Manunuzi kwa Chaguo-msingi lazima liwe nambari.",
-    "default_receivings_discount_required"      => "Punguzo la Manunuzi kwa Chaguo-msingi ni kiashiria kinachohitajika.",
-    "default_sales_discount"                    => "Punguzo la Mauzo kwa Chaguo-msingi",
-    "default_sales_discount_number"             => "Punguzo la Mauzo kwa Chaguo-msingi lazima liwe nambari.",
-    "default_sales_discount_required"           => "Punguzo la Mauzo kwa Chaguo-msingi ni kiashiria kinachohitajika.",
-    "default_tax_category"                      => "Aina ya Kodi kwa Chaguo-msingi",
-    "default_tax_code"                          => "Nambari ya Kodi kwa Chaguo-msingi",
-    "default_tax_jurisdiction"                  => "Eneo la Kodi kwa Chaguo-msingi",
-    "default_tax_name_number"                   => "Jina la Kodi lazima liwe maandishi.",
-    "default_tax_name_required"                 => "Jina la Kodi ni kiashiria kinachohitajika.",
-    "default_tax_rate"                          => "Kiwango cha Kodi kwa Chaguo-msingi %",
-    "default_tax_rate_1"                        => "Kiwango cha Kodi 1",
-    "default_tax_rate_2"                        => "Kiwango cha Kodi 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Kiwango cha Kodi kwa Chaguo-msingi lazima kiwe nambari.",
-    "default_tax_rate_required"                 => "Kiwango cha Kodi kwa Chaguo-msingi ni kiashiria kinachohitajika.",
-    "derive_sale_quantity"                      => "Ruhusu Kiasi cha Mauzo Kilichotokana",
-    "derive_sale_quantity_tooltip"              => "Ikiwa imechaguliwa basi aina mpya ya bidhaa itatolewa kwa bidhaa zilizoagizwa kwa kiasi kilichoongezwa",
-    "dinner_table"                              => "Jedwali",
-    "dinner_table_duplicate"                    => "Jedwali lazima iwe ya kipekee.",
-    "dinner_table_enable"                       => "Washa Jedwali za Chakula",
-    "dinner_table_invalid_chars"                => "Jina la Jedwali haliwezi kuwa na '_'.",
-    "dinner_table_required"                     => "Jedwali ni kiashiria kinachohitajika.",
-    "dot"                                       => "nukta",
-    "email"                                     => "Barua Pepe",
-    "email_configuration"                       => "Mpangilio wa Barua Pepe",
-    "email_mailpath"                            => "Njia ya Sendmail",
-    "email_protocol"                            => "Itifaki",
-    "email_receipt_check_behaviour"             => "Kisanduku cha Risiti ya Barua Pepe",
-    "email_receipt_check_behaviour_always"      => "Daima imechaguliwa",
-    "email_receipt_check_behaviour_last"        => "Kumbuka chaguo la mwisho",
-    "email_receipt_check_behaviour_never"       => "Daima haijachaguliwa",
-    "email_smtp_crypto"                         => "Usimbaji wa SMTP",
-    "email_smtp_host"                           => "Seva ya SMTP",
-    "email_smtp_pass"                           => "Nenosiri la SMTP",
-    "email_smtp_port"                           => "Lango la SMTP",
-    "email_smtp_timeout"                        => "Muda wa SMTP kuisha",
-    "email_smtp_user"                           => "Jina la Mtumiaji la SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Lazimisha Faragha",
-    "enforce_privacy_tooltip"                   => "Linda faragha ya Wateja kwa kulazimisha kuchanganya data endapo data zao zitafutwa",
-    "fax"                                       => "Faksi",
-    "file_perm"                                 => "Kuna matatizo na ruhusa za faili. Tafadhali rekebisha na upakie upya ukurasa huu.",
-    "financial_year"                            => "Mwanzo wa Mwaka wa Fedha",
-    "financial_year_apr"                        => "1 Aprili",
-    "financial_year_aug"                        => "1 Agosti",
-    "financial_year_dec"                        => "1 Desemba",
-    "financial_year_feb"                        => "1 Februari",
-    "financial_year_jan"                        => "1 Januari",
-    "financial_year_jul"                        => "1 Julai",
-    "financial_year_jun"                        => "1 Juni",
-    "financial_year_mar"                        => "1 Machi",
-    "financial_year_may"                        => "1 Mei",
-    "financial_year_nov"                        => "1 Novemba",
-    "financial_year_oct"                        => "1 Oktoba",
-    "financial_year_sep"                        => "1 Septemba",
-    "floating_labels"                           => "Lebo Zinazoelea",
-    "gcaptcha_enable"                           => "Ukurasa wa Ingia reCAPTCHA",
-    "gcaptcha_secret_key"                       => "Funguo ya Siri ya reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "Funguo ya Siri ya reCAPTCHA ni kiashiria kinachohitajika",
-    "gcaptcha_site_key"                         => "Funguo ya Tovuti ya reCAPTCHA",
-    "gcaptcha_site_key_required"                => "Funguo ya Tovuti ya reCAPTCHA ni kiashiria kinachohitajika",
-    "gcaptcha_tooltip"                          => "Linda ukurasa wa Ingia kwa Google reCAPTCHA, bonyeza ikoni kupata jozi ya funguo za API.",
-    "general"                                   => "Jumla",
-    "general_configuration"                     => "Mpangilio wa Jumla",
-    "giftcard_number"                           => "Nambari ya Kadi ya Zawadi",
-    "giftcard_random"                           => "Tengeneza kwa Nasibu",
-    "giftcard_series"                           => "Tengeneza kwa Mfululizo",
-    "image_allowed_file_types"                  => "Aina za faili zinazoruhusiwa",
-    "image_max_height_tooltip"                  => "Urefu wa juu wa picha zinazopakiwa kwa pikseli (px).",
-    "image_max_size_tooltip"                    => "Ukubwa wa juu wa faili za picha zinazopakiwa kwa kilobaiti (kb).",
-    "image_max_width_tooltip"                   => "Upana wa juu wa picha zinazopakiwa kwa pikseli (px).",
-    "image_restrictions"                        => "Vizuizi vya Upakiaji wa Picha",
-    "include_hsn"                               => "Jumuisha Msaada wa Nambari za HSN",
-    "info"                                      => "Taarifa",
-    "info_configuration"                        => "Taarifa za Duka",
-    "input_groups"                              => "Makundi ya Uingizaji",
-    "integrations"                              => "Muunganiko",
-    "integrations_configuration"                => "Muunganiko wa Watu wengine",
-    "invoice"                                   => "Ankara",
-    "invoice_configuration"                     => "Mpangilio wa Uchapishaji wa Ankara",
-    "invoice_default_comments"                  => "Maoni ya Chaguo-msingi ya Ankara",
-    "invoice_email_message"                     => "Kiolezo cha Barua Pepe ya Ankara",
-    "invoice_enable"                            => "Washa Utoaji wa Ankara",
-    "invoice_printer"                           => "Kichapishi cha Ankara",
-    "invoice_type"                              => "Aina ya Ankara",
-    "is_readable"                               => "inasomeka, lakini ruhusa zimewekwa vibaya. Tafadhali weka 640 au 660 na upakie upya.",
-    "is_writable"                               => "inaandikika, lakini ruhusa zimewekwa vibaya. Tafadhali weka 750 na upakie upya.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Tahadhari: Kipengele hiki kitafanya kazi tu ikiwa una kiendelezi cha FireFox jsPrintSetup kimewekwa. Hifadhi hata hivyo?",
-    "language"                                  => "Lugha",
-    "last_used_invoice_number"                  => "Nambari ya mwisho ya Ankara iliyotumika",
-    "last_used_quote_number"                    => "Nambari ya mwisho ya Nukuu iliyotumika",
-    "last_used_work_order_number"               => "Nambari ya mwisho ya Agizo la Kazi iliyotumika",
-    "left"                                      => "Kushoto",
-    "license"                                   => "Leseni",
-    "license_configuration"                     => "Taarifa ya Leseni",
-    "line_sequence"                             => "Mpangilio wa Mistari",
-    "lines_per_page"                            => "Mistari kwa Kila Ukurasa",
-    "lines_per_page_number"                     => "Mistari kwa Kila Ukurasa lazima iwe nambari.",
-    "lines_per_page_required"                   => "Mistari kwa Kila Ukurasa ni kiashiria kinachohitajika.",
-    "locale"                                    => "Ujanibishaji",
-    "locale_configuration"                      => "Mpangilio wa Ujanibishaji",
-    "locale_info"                               => "Taarifa za Mpangilio wa Ujanibishaji",
-    "location"                                  => "Stoo",
-    "location_configuration"                    => "Maeneo ya Stoo",
-    "location_info"                             => "Taarifa za Mpangilio wa Stoo",
-    "login_form"                                => "Aina ya Fomu ya Ingia",
-    "logout"                                    => "Unataka kufanya hifadhi nakala kabla ya kutoka? Bonyeza [Sawa] kuhifadhi au [Ghairi] kutoka.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "Funguo ya API ya MailChimp",
-    "mailchimp_configuration"                   => "Mpangilio wa MailChimp",
-    "mailchimp_key_successfully"                => "Funguo ya API ni sahihi.",
-    "mailchimp_key_unsuccessfully"              => "Funguo ya API si sahihi.",
-    "mailchimp_lists"                           => "Orodha za MailChimp",
-    "mailchimp_tooltip"                         => "Bonyeza ikoni kupata Funguo ya API.",
-    "message"                                   => "Ujumbe",
-    "message_configuration"                     => "Mpangilio wa Ujumbe",
-    "msg_msg"                                   => "Ujumbe wa SMS uliohifadhiwa",
-    "msg_msg_placeholder"                       => "Ikiwa unataka kutumia kiolezo cha SMS hifadhi ujumbe wako hapa, vinginevyo acha kisanduku wazi.",
-    "msg_pwd"                                   => "Nenosiri la SMS-API",
-    "msg_pwd_required"                          => "Nenosiri la SMS-API ni kiashiria kinachohitajika",
-    "msg_src"                                   => "ID ya Mtumaji wa SMS-API",
-    "msg_src_required"                          => "ID ya Mtumaji wa SMS-API ni kiashiria kinachohitajika",
-    "msg_uid"                                   => "Jina la Mtumiaji la SMS-API",
-    "msg_uid_required"                          => "Jina la Mtumiaji la SMS-API ni kiashiria kinachohitajika",
-    "multi_pack_enabled"                        => "Vifurushi Vingi kwa Kila Bidhaa",
-    "no_risk"                                   => "Hakuna hatari za usalama/udhaifu.",
-    "none"                                      => "hakuna",
-    "notify_alignment"                          => "Nafasi ya Taarifa Ibukizi",
-    "number_format"                             => "Muundo wa Nambari",
-    "number_locale"                             => "Ujanibishaji",
-    "number_locale_invalid"                     => "Ujanibishaji uliyoingiza si sahihi. Angalia kiungo kwenye kidokezo kupata Ujanibishaji sahihi.",
-    "number_locale_required"                    => "Ujanibishaji ya Nambari ni kiashiria kinachohitajika.",
-    "number_locale_tooltip"                     => "Tafuta Ujanibishaji inayofaa kupitia kiungo hiki.",
-    "os_timezone"                               => "Saa ya OSPOS:",
-    "ospos_info"                                => "Taarifa za Usakinishaji wa OSPOS",
-    "payment_options_order"                     => "Mpangilio wa Chaguo za Malipo",
-    "perm_risk"                                 => "Ruhusa zisizo sahihi zinaacha programu hii kwenye hatari.",
-    "phone"                                     => "Namba ya simu ya Kampuni",
-    "phone_required"                            => "Namba ya simu ya Kampuni ni kiashiria kinachohitajika.",
-    "print_bottom_margin"                       => "Pembe ya Chini",
-    "print_bottom_margin_number"                => "Pembe ya Chini lazima iwe nambari.",
-    "print_bottom_margin_required"              => "Pembe ya Chini ni kiashiria kinachohitajika.",
-    "print_delay_autoreturn"                    => "Muda wa Kurudi Moja kwa Moja kwenye Mauzo",
-    "print_delay_autoreturn_number"             => "Muda wa Kurudi Moja kwa Moja kwenye Mauzo ni kiashiria kinachohitajika.",
-    "print_delay_autoreturn_required"           => "Muda wa Kurudi Moja kwa Moja kwenye Mauzo lazima uwe nambari.",
-    "print_footer"                              => "Chapisha Kijachini cha Kivinjari",
-    "print_header"                              => "Chapisha Kijuu cha Kivinjari",
-    "print_left_margin"                         => "Pembe ya Kushoto",
-    "print_left_margin_number"                  => "Pembe ya Kushoto lazima iwe nambari.",
-    "print_left_margin_required"                => "Pembe ya Kushoto ni kiashiria kinachohitajika.",
-    "print_receipt_check_behaviour"             => "Kisanduku cha Risiti ya Kuchapisha",
-    "print_receipt_check_behaviour_always"      => "Daima imechaguliwa",
-    "print_receipt_check_behaviour_last"        => "Kumbuka chaguo la mwisho",
-    "print_receipt_check_behaviour_never"       => "Daima haijachaguliwa",
-    "print_right_margin"                        => "Pembe ya Kulia",
-    "print_right_margin_number"                 => "Pembe ya Kulia lazima iwe nambari.",
-    "print_right_margin_required"               => "Pembe ya Kulia ni kiashiria kinachohitajika.",
-    "print_silently"                            => "Onyesha Dirisha la Kuchapisha",
-    "print_top_margin"                          => "Pembe ya Juu",
-    "print_top_margin_number"                   => "Pembe ya Juu lazima iwe nambari.",
-    "print_top_margin_required"                 => "Pembe ya Juu ni kiashiria kinachohitajika.",
-    "quantity_decimals"                         => "Desimali za Kiasi",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Maoni ya Chaguo-msingi la Nukuu",
-    "receipt"                                   => "Risiti",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Mpangilio wa Uchapishaji wa Risiti",
-    "receipt_default"                           => "Chaguo-msingi",
-    "receipt_font_size"                         => "Ukubwa wa Herufi",
-    "receipt_font_size_number"                  => "Ukubwa wa Herufi lazima uwe nambari.",
-    "receipt_font_size_required"                => "Ukubwa wa Herufi ni kiashiria kinachohitajika.",
-    "receipt_info"                              => "Taarifa za Mpangilio wa Risiti",
-    "receipt_printer"                           => "Kichapishi cha Tiketi",
-    "receipt_short"                             => "Fupi",
-    "receipt_show_company_name"                 => "Onyesha Jina la Kampuni",
-    "receipt_show_description"                  => "Onyesha Maelezo",
-    "receipt_show_serialnumber"                 => "Onyesha Serial Number",
-    "receipt_show_tax_ind"                      => "Onyesha Kiashiria cha Kodi",
-    "receipt_show_taxes"                        => "Onyesha Kodi",
-    "receipt_show_total_discount"               => "Onyesha Jumla ya Punguzo",
-    "receipt_template"                          => "Kiolezo cha Risiti",
-    "receiving_calculate_average_price"         => "Hesabu Bei ya wastani (Manunuzi)",
-    "recv_invoice_format"                       => "Muundo wa Ankara ya Manunuzi",
-    "register_mode_default"                     => "Hali ya Usajili kwa Chaguo-msingi",
-    "report_an_issue"                           => "Ripoti tatizo",
-    "return_policy_required"                    => "Return Policy ni kiashiria kinachohitajika.",
-    "reward"                                    => "Zawadi",
-    "reward_configuration"                      => "Mpangilio wa Zawadi",
-    "right"                                     => "Kulia",
-    "sales_invoice_format"                      => "Muundo wa Ankara ya Mauzo",
-    "sales_quote_format"                        => "Muundo wa Nukuu ya Mauzo",
-    "saved_successfully"                        => "Mpangilio umehifadhiwa kwa mafanikio.",
-    "saved_unsuccessfully"                      => "Mpangilio umeshindwa kuhifadhiwa.",
-    "security_issue"                            => "Onyo la Udhaifu wa Usalama",
-    "server_notice"                             => "Tafadhali tumia taarifa zilizo hapa chini kuripoti tatizo.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Onyesha ikoni ya ofisi",
-    "statistics"                                => "Tuma Takwimu",
-    "statistics_tooltip"                        => "Tuma takwimu kwa madhumuni ya maendeleo na uboreshaji wa vipengele.",
-    "stock_location"                            => "Stoo",
-    "stock_location_duplicate"                  => "Stoo lazima iwe ya kipekee.",
-    "stock_location_invalid_chars"              => "Stoo haiwezi kuwa na '_'.",
-    "stock_location_required"                   => "Stoo ni kiashiria kinachohitajika.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Safu wima 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Mpangilio wa Mapendekezo ya Utafutaji",
-    "suggestions_second_column"                 => "Safu wima 2",
-    "suggestions_third_column"                  => "Safu wima 3",
-    "system_conf"                               => "Usanidi & Mpangilio",
-    "system_info"                               => "Taarifa za Mfumo",
-    "table"                                     => "Jedwali",
-    "table_configuration"                       => "Jedwali la Mpangilio",
-    "takings_printer"                           => "Kichapishi cha Risiti",
-    "tax"                                       => "Kodi",
-    "tax_category"                              => "Aina ya Kodi",
-    "tax_category_duplicate"                    => "Aina ya kodi uliyoingiza tayari ipo.",
-    "tax_category_invalid_chars"                => "Aina ya kodi uliyoingiza si sahihi.",
-    "tax_category_required"                     => "Aina ya kodi ni lazima.",
-    "tax_category_used"                         => "Aina ya kodi haiwezi kufutwa kwa sababu inatumika.",
-    "tax_configuration"                         => "Mpangilio wa Kodi",
-    "tax_decimals"                              => "Desimali za Kodi",
-    "tax_id"                                    => "Nambari ya Kodi",
-    "tax_included"                              => "Kodi Imejumuishwa",
-    "theme"                                     => "Mandhari",
-    "theme_preview"                             => "Onyesha Mandhari:",
-    "thousands_separator"                       => "Kitenganishi cha Maelfu",
-    "timezone"                                  => "Saa za Eneo",
-    "timezone_error"                            => "Saa za OSPOS ni tofauti na Saa za Eneo lako.",
-    "top"                                       => "Juu",
-    "use_destination_based_tax"                 => "Tumia Kodi ya Kulingana na Eneo",
-    "user_timezone"                             => "Saa za Eneo lako:",
-    "website"                                   => "Tovuti",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Msaada wa Agizo la Kazi",
-    "work_order_format"                         => "Muundo wa Agizo la Kazi",
-];
\ No newline at end of file
+    'address'                                   => 'Anwani ya Kampuni',
+    'address_required'                          => 'Anwani ya kampuni ni kiashiria kinachohitajika.',
+    'all_set'                                   => 'Ruhusa zote za faili zimewekwa vizuri!',
+    'allow_duplicate_barcodes'                  => 'Ruhusu Misimbomstari iliyorudiwa',
+    'apostrophe'                                => 'apostrofi',
+    'backup_button'                             => 'Hifadhi Nakala',
+    'backup_database'                           => 'Hifadhi Nakala ya Hifadhidata',
+    'barcode'                                   => 'Msimbo wa Mstari',
+    'barcode_company'                           => 'Jina la Kampuni',
+    'barcode_configuration'                     => 'Mpangilio wa Msimbomstari',
+    'barcode_content'                           => 'Yaliyomo kwenye Msimbomstari',
+    'barcode_first_row'                         => 'Safu 1',
+    'barcode_font'                              => 'Aina ya Herufi',
+    'barcode_formats'                           => 'Aina za Uingizaji',
+    'barcode_generate_if_empty'                 => 'Tengeneza ikiwa tupu.',
+    'barcode_height'                            => 'Urefu (px)',
+    'barcode_id'                                => 'Id ya Bidhaa/Jina',
+    'barcode_info'                              => 'Taarifa za Mpangilio wa Msimbomstari',
+    'barcode_layout'                            => 'Mpangilio wa Msimbomstari',
+    'barcode_name'                              => 'Jina',
+    'barcode_number'                            => 'Msimbomstari',
+    'barcode_number_in_row'                     => 'Idadi kwenye safu',
+    'barcode_page_cellspacing'                  => 'Onyesha nafasi kati ya seli za ukurasa.',
+    'barcode_page_width'                        => 'Onyesha upana wa ukurasa',
+    'barcode_price'                             => 'Bei',
+    'barcode_second_row'                        => 'Safu 2',
+    'barcode_third_row'                         => 'Safu 3',
+    'barcode_tooltip'                           => 'Tahadhari: Kipengele hiki kinaweza kusababisha kurudiwa kwa bidhaa zilizoingizwa au kuundwa. Usitumie ikiwa hutaki Msimbomstari(Barcode) zilizorudiwa.',
+    'barcode_type'                              => 'Aina ya Msimbomstari',
+    'barcode_width'                             => 'Upana (px)',
+    'bottom'                                    => 'Chini',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Desimali za Fedha Taslimu',
+    'cash_decimals_tooltip'                     => 'Ikiwa Desimali za Fedha Taslimu na Desimali za Sarafu ni sawa basi hakuna mzunguko wa fedha taslimu utakaofanyika, isipokuwa Mzunguko wa Fedha Taslimu umewekwa kwenye Nusu Tano.',
+    'cash_rounding'                             => 'Mzunguko wa Fedha Taslimu',
+    'category_dropdown'                         => 'Onyesha Kategoria kama orodha ya kushuka',
+    'center'                                    => 'Katikati',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'koma',
+    'company'                                   => 'Jina la Kampuni',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Badilisha Picha',
+    'company_logo'                              => 'Nembo ya Kampuni',
+    'company_remove_image'                      => 'Ondoa Picha',
+    'company_required'                          => 'Jina la kampuni ni kiashiria kinachohitajika',
+    'company_select_image'                      => 'Chagua Picha',
+    'company_website_url'                       => 'Tovuti ya kampuni si URL halali (http://...).',
+    'country_codes'                             => 'Msimbo wa Nchi',
+    'country_codes_tooltip'                     => 'Orodha ya misimbo ya nchi zilizotenganishwa kwa koma kwa utafutaji wa anwani wa uteuzi.',
+    'currency_code'                             => 'Nambari ya Sarafu',
+    'currency_decimals'                         => 'Desimali za Sarafu',
+    'currency_symbol'                           => 'Alama ya Sarafu',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Zawadi',
+    'customer_reward_duplicate'                 => 'Zawadi lazima iwe ya kipekee.',
+    'customer_reward_enable'                    => 'Washa Zawadi kwa Wateja',
+    'customer_reward_invalid_chars'             => "Zawadi haiwezi kuwa na '_'",
+    'customer_reward_required'                  => 'Zawadi ni kiashiria kinachohitajika',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Kichujio cha Tarehe na Muda',
+    'datetimeformat'                            => 'Muundo wa Tarehe na Muda',
+    'decimal_point'                             => 'Nukta ya Desimali',
+    'default_barcode_font_size_number'          => 'Ukubwa wa herufi wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_font_size_required'        => 'Ukubwa wa herufi wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_height_number'             => 'Urefu wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_height_required'           => 'Urefu wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_num_in_row_number'         => 'Idadi ya Msimbomstari kwenye safu lazima iwe nambari.',
+    'default_barcode_num_in_row_required'       => 'Idadi ya Msimbomstari kwenye safu ni kiashiria kinachohitajika.',
+    'default_barcode_page_cellspacing_number'   => 'Nafasi kati ya chumba cha ukurasa wa Msimbomstari lazima iwe nambari.',
+    'default_barcode_page_cellspacing_required' => 'Nafasi kati ya chumba cha ukurasa wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_page_width_number'         => 'Upana wa ukurasa wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_page_width_required'       => 'Upana wa ukurasa wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_width_number'              => 'Upana wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_width_required'            => 'Upana wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_item_columns'                      => 'Safu wima za Bidhaa Zinazoonekana Kwa Chaguo-msingi',
+    'default_origin_tax_code'                   => 'Nambari ya Kodi ya Asili kwa Chaguo-msingi',
+    'default_receivings_discount'               => 'Punguzo la Manunuzi kwa Chaguo-msingi',
+    'default_receivings_discount_number'        => 'Punguzo la Manunuzi kwa Chaguo-msingi lazima liwe nambari.',
+    'default_receivings_discount_required'      => 'Punguzo la Manunuzi kwa Chaguo-msingi ni kiashiria kinachohitajika.',
+    'default_sales_discount'                    => 'Punguzo la Mauzo kwa Chaguo-msingi',
+    'default_sales_discount_number'             => 'Punguzo la Mauzo kwa Chaguo-msingi lazima liwe nambari.',
+    'default_sales_discount_required'           => 'Punguzo la Mauzo kwa Chaguo-msingi ni kiashiria kinachohitajika.',
+    'default_tax_category'                      => 'Aina ya Kodi kwa Chaguo-msingi',
+    'default_tax_code'                          => 'Nambari ya Kodi kwa Chaguo-msingi',
+    'default_tax_jurisdiction'                  => 'Eneo la Kodi kwa Chaguo-msingi',
+    'default_tax_name_number'                   => 'Jina la Kodi lazima liwe maandishi.',
+    'default_tax_name_required'                 => 'Jina la Kodi ni kiashiria kinachohitajika.',
+    'default_tax_rate'                          => 'Kiwango cha Kodi kwa Chaguo-msingi %',
+    'default_tax_rate_1'                        => 'Kiwango cha Kodi 1',
+    'default_tax_rate_2'                        => 'Kiwango cha Kodi 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Kiwango cha Kodi kwa Chaguo-msingi lazima kiwe nambari.',
+    'default_tax_rate_required'                 => 'Kiwango cha Kodi kwa Chaguo-msingi ni kiashiria kinachohitajika.',
+    'derive_sale_quantity'                      => 'Ruhusu Kiasi cha Mauzo Kilichotokana',
+    'derive_sale_quantity_tooltip'              => 'Ikiwa imechaguliwa basi aina mpya ya bidhaa itatolewa kwa bidhaa zilizoagizwa kwa kiasi kilichoongezwa',
+    'dinner_table'                              => 'Jedwali',
+    'dinner_table_duplicate'                    => 'Jedwali lazima iwe ya kipekee.',
+    'dinner_table_enable'                       => 'Washa Jedwali za Chakula',
+    'dinner_table_invalid_chars'                => "Jina la Jedwali haliwezi kuwa na '_'.",
+    'dinner_table_required'                     => 'Jedwali ni kiashiria kinachohitajika.',
+    'dot'                                       => 'nukta',
+    'email'                                     => 'Barua Pepe',
+    'email_configuration'                       => 'Mpangilio wa Barua Pepe',
+    'email_mailpath'                            => 'Njia ya Sendmail',
+    'email_protocol'                            => 'Itifaki',
+    'email_receipt_check_behaviour'             => 'Kisanduku cha Risiti ya Barua Pepe',
+    'email_receipt_check_behaviour_always'      => 'Daima imechaguliwa',
+    'email_receipt_check_behaviour_last'        => 'Kumbuka chaguo la mwisho',
+    'email_receipt_check_behaviour_never'       => 'Daima haijachaguliwa',
+    'email_smtp_crypto'                         => 'Usimbaji wa SMTP',
+    'email_smtp_host'                           => 'Seva ya SMTP',
+    'email_smtp_pass'                           => 'Nenosiri la SMTP',
+    'email_smtp_port'                           => 'Lango la SMTP',
+    'email_smtp_timeout'                        => 'Muda wa SMTP kuisha',
+    'email_smtp_user'                           => 'Jina la Mtumiaji la SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Lazimisha Faragha',
+    'enforce_privacy_tooltip'                   => 'Linda faragha ya Wateja kwa kulazimisha kuchanganya data endapo data zao zitafutwa',
+    'fax'                                       => 'Faksi',
+    'file_perm'                                 => 'Kuna matatizo na ruhusa za faili. Tafadhali rekebisha na upakie upya ukurasa huu.',
+    'financial_year'                            => 'Mwanzo wa Mwaka wa Fedha',
+    'financial_year_apr'                        => '1 Aprili',
+    'financial_year_aug'                        => '1 Agosti',
+    'financial_year_dec'                        => '1 Desemba',
+    'financial_year_feb'                        => '1 Februari',
+    'financial_year_jan'                        => '1 Januari',
+    'financial_year_jul'                        => '1 Julai',
+    'financial_year_jun'                        => '1 Juni',
+    'financial_year_mar'                        => '1 Machi',
+    'financial_year_may'                        => '1 Mei',
+    'financial_year_nov'                        => '1 Novemba',
+    'financial_year_oct'                        => '1 Oktoba',
+    'financial_year_sep'                        => '1 Septemba',
+    'floating_labels'                           => 'Lebo Zinazoelea',
+    'gcaptcha_enable'                           => 'Ukurasa wa Ingia reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'Funguo ya Siri ya reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'Funguo ya Siri ya reCAPTCHA ni kiashiria kinachohitajika',
+    'gcaptcha_site_key'                         => 'Funguo ya Tovuti ya reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'Funguo ya Tovuti ya reCAPTCHA ni kiashiria kinachohitajika',
+    'gcaptcha_tooltip'                          => 'Linda ukurasa wa Ingia kwa Google reCAPTCHA, bonyeza ikoni kupata jozi ya funguo za API.',
+    'general'                                   => 'Jumla',
+    'general_configuration'                     => 'Mpangilio wa Jumla',
+    'giftcard_number'                           => 'Nambari ya Kadi ya Zawadi',
+    'giftcard_random'                           => 'Tengeneza kwa Nasibu',
+    'giftcard_series'                           => 'Tengeneza kwa Mfululizo',
+    'image_allowed_file_types'                  => 'Aina za faili zinazoruhusiwa',
+    'image_max_height_tooltip'                  => 'Urefu wa juu wa picha zinazopakiwa kwa pikseli (px).',
+    'image_max_size_tooltip'                    => 'Ukubwa wa juu wa faili za picha zinazopakiwa kwa kilobaiti (kb).',
+    'image_max_width_tooltip'                   => 'Upana wa juu wa picha zinazopakiwa kwa pikseli (px).',
+    'image_restrictions'                        => 'Vizuizi vya Upakiaji wa Picha',
+    'include_hsn'                               => 'Jumuisha Msaada wa Nambari za HSN',
+    'info'                                      => 'Taarifa',
+    'info_configuration'                        => 'Taarifa za Duka',
+    'input_groups'                              => 'Makundi ya Uingizaji',
+    'integrations'                              => 'Muunganiko',
+    'integrations_configuration'                => 'Muunganiko wa Watu wengine',
+    'invoice'                                   => 'Ankara',
+    'invoice_configuration'                     => 'Mpangilio wa Uchapishaji wa Ankara',
+    'invoice_default_comments'                  => 'Maoni ya Chaguo-msingi ya Ankara',
+    'invoice_email_message'                     => 'Kiolezo cha Barua Pepe ya Ankara',
+    'invoice_enable'                            => 'Washa Utoaji wa Ankara',
+    'invoice_printer'                           => 'Kichapishi cha Ankara',
+    'invoice_type'                              => 'Aina ya Ankara',
+    'is_readable'                               => 'inasomeka, lakini ruhusa zimewekwa vibaya. Tafadhali weka 640 au 660 na upakie upya.',
+    'is_writable'                               => 'inaandikika, lakini ruhusa zimewekwa vibaya. Tafadhali weka 750 na upakie upya.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Tahadhari: Kipengele hiki kitafanya kazi tu ikiwa una kiendelezi cha FireFox jsPrintSetup kimewekwa. Hifadhi hata hivyo?',
+    'language'                                  => 'Lugha',
+    'last_used_invoice_number'                  => 'Nambari ya mwisho ya Ankara iliyotumika',
+    'last_used_quote_number'                    => 'Nambari ya mwisho ya Nukuu iliyotumika',
+    'last_used_work_order_number'               => 'Nambari ya mwisho ya Agizo la Kazi iliyotumika',
+    'left'                                      => 'Kushoto',
+    'license'                                   => 'Leseni',
+    'license_configuration'                     => 'Taarifa ya Leseni',
+    'line_sequence'                             => 'Mpangilio wa Mistari',
+    'lines_per_page'                            => 'Mistari kwa Kila Ukurasa',
+    'lines_per_page_number'                     => 'Mistari kwa Kila Ukurasa lazima iwe nambari.',
+    'lines_per_page_required'                   => 'Mistari kwa Kila Ukurasa ni kiashiria kinachohitajika.',
+    'locale'                                    => 'Ujanibishaji',
+    'locale_configuration'                      => 'Mpangilio wa Ujanibishaji',
+    'locale_info'                               => 'Taarifa za Mpangilio wa Ujanibishaji',
+    'location'                                  => 'Stoo',
+    'location_configuration'                    => 'Maeneo ya Stoo',
+    'location_info'                             => 'Taarifa za Mpangilio wa Stoo',
+    'login_form'                                => 'Aina ya Fomu ya Ingia',
+    'logout'                                    => 'Unataka kufanya hifadhi nakala kabla ya kutoka? Bonyeza [Sawa] kuhifadhi au [Ghairi] kutoka.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'Funguo ya API ya MailChimp',
+    'mailchimp_configuration'                   => 'Mpangilio wa MailChimp',
+    'mailchimp_key_successfully'                => 'Funguo ya API ni sahihi.',
+    'mailchimp_key_unsuccessfully'              => 'Funguo ya API si sahihi.',
+    'mailchimp_lists'                           => 'Orodha za MailChimp',
+    'mailchimp_tooltip'                         => 'Bonyeza ikoni kupata Funguo ya API.',
+    'message'                                   => 'Ujumbe',
+    'message_configuration'                     => 'Mpangilio wa Ujumbe',
+    'msg_msg'                                   => 'Ujumbe wa SMS uliohifadhiwa',
+    'msg_msg_placeholder'                       => 'Ikiwa unataka kutumia kiolezo cha SMS hifadhi ujumbe wako hapa, vinginevyo acha kisanduku wazi.',
+    'msg_pwd'                                   => 'Nenosiri la SMS-API',
+    'msg_src'                                   => 'ID ya Mtumaji wa SMS-API',
+    'msg_src_required'                          => 'ID ya Mtumaji wa SMS-API ni kiashiria kinachohitajika',
+    'msg_uid'                                   => 'Jina la Mtumiaji la SMS-API',
+    'msg_uid_required'                          => 'Jina la Mtumiaji la SMS-API ni kiashiria kinachohitajika',
+    'multi_pack_enabled'                        => 'Vifurushi Vingi kwa Kila Bidhaa',
+    'no_risk'                                   => 'Hakuna hatari za usalama/udhaifu.',
+    'none'                                      => 'hakuna',
+    'notify_alignment'                          => 'Nafasi ya Taarifa Ibukizi',
+    'number_format'                             => 'Muundo wa Nambari',
+    'number_locale'                             => 'Ujanibishaji',
+    'number_locale_invalid'                     => 'Ujanibishaji uliyoingiza si sahihi. Angalia kiungo kwenye kidokezo kupata Ujanibishaji sahihi.',
+    'number_locale_required'                    => 'Ujanibishaji ya Nambari ni kiashiria kinachohitajika.',
+    'number_locale_tooltip'                     => 'Tafuta Ujanibishaji inayofaa kupitia kiungo hiki.',
+    'os_timezone'                               => 'Saa ya OSPOS:',
+    'ospos_info'                                => 'Taarifa za Usakinishaji wa OSPOS',
+    'payment_options_order'                     => 'Mpangilio wa Chaguo za Malipo',
+    'payment_reference_code_length_limits'      => 'Nambari ya Kumbukumbu ya Malipo<br>Mipaka ya Urefu',
+    'payment_reference_code_length_max_label'   => 'Kiwango cha juu',
+    'payment_reference_code_length_min_label'   => 'Kiwango cha chini',
+    'perm_risk'                                 => 'Ruhusa zisizo sahihi zinaacha programu hii kwenye hatari.',
+    'phone'                                     => 'Namba ya simu ya Kampuni',
+    'phone_required'                            => 'Namba ya simu ya Kampuni ni kiashiria kinachohitajika.',
+    'print_bottom_margin'                       => 'Pembe ya Chini',
+    'print_bottom_margin_number'                => 'Pembe ya Chini lazima iwe nambari.',
+    'print_bottom_margin_required'              => 'Pembe ya Chini ni kiashiria kinachohitajika.',
+    'print_delay_autoreturn'                    => 'Muda wa Kurudi Moja kwa Moja kwenye Mauzo',
+    'print_delay_autoreturn_number'             => 'Muda wa Kurudi Moja kwa Moja kwenye Mauzo ni kiashiria kinachohitajika.',
+    'print_delay_autoreturn_required'           => 'Muda wa Kurudi Moja kwa Moja kwenye Mauzo lazima uwe nambari.',
+    'print_footer'                              => 'Chapisha Kijachini cha Kivinjari',
+    'print_header'                              => 'Chapisha Kijuu cha Kivinjari',
+    'print_left_margin'                         => 'Pembe ya Kushoto',
+    'print_left_margin_number'                  => 'Pembe ya Kushoto lazima iwe nambari.',
+    'print_left_margin_required'                => 'Pembe ya Kushoto ni kiashiria kinachohitajika.',
+    'print_receipt_check_behaviour'             => 'Kisanduku cha Risiti ya Kuchapisha',
+    'print_receipt_check_behaviour_always'      => 'Daima imechaguliwa',
+    'print_receipt_check_behaviour_last'        => 'Kumbuka chaguo la mwisho',
+    'print_receipt_check_behaviour_never'       => 'Daima haijachaguliwa',
+    'print_right_margin'                        => 'Pembe ya Kulia',
+    'print_right_margin_number'                 => 'Pembe ya Kulia lazima iwe nambari.',
+    'print_right_margin_required'               => 'Pembe ya Kulia ni kiashiria kinachohitajika.',
+    'print_silently'                            => 'Onyesha Dirisha la Kuchapisha',
+    'print_top_margin'                          => 'Pembe ya Juu',
+    'print_top_margin_number'                   => 'Pembe ya Juu lazima iwe nambari.',
+    'print_top_margin_required'                 => 'Pembe ya Juu ni kiashiria kinachohitajika.',
+    'quantity_decimals'                         => 'Desimali za Kiasi',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Maoni ya Chaguo-msingi la Nukuu',
+    'receipt'                                   => 'Risiti',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Mpangilio wa Uchapishaji wa Risiti',
+    'receipt_default'                           => 'Chaguo-msingi',
+    'receipt_font_size'                         => 'Ukubwa wa Herufi',
+    'receipt_font_size_number'                  => 'Ukubwa wa Herufi lazima uwe nambari.',
+    'receipt_font_size_required'                => 'Ukubwa wa Herufi ni kiashiria kinachohitajika.',
+    'receipt_info'                              => 'Taarifa za Mpangilio wa Risiti',
+    'receipt_printer'                           => 'Kichapishi cha Tiketi',
+    'receipt_short'                             => 'Fupi',
+    'receipt_show_company_name'                 => 'Onyesha Jina la Kampuni',
+    'receipt_show_description'                  => 'Onyesha Maelezo',
+    'receipt_show_serialnumber'                 => 'Onyesha Serial Number',
+    'receipt_show_tax_ind'                      => 'Onyesha Kiashiria cha Kodi',
+    'receipt_show_taxes'                        => 'Onyesha Kodi',
+    'receipt_show_total_discount'               => 'Onyesha Jumla ya Punguzo',
+    'receipt_template'                          => 'Kiolezo cha Risiti',
+    'receiving_calculate_average_price'         => 'Hesabu Bei ya wastani (Manunuzi)',
+    'recv_invoice_format'                       => 'Muundo wa Ankara ya Manunuzi',
+    'register_mode_default'                     => 'Hali ya Usajili kwa Chaguo-msingi',
+    'report_an_issue'                           => 'Ripoti tatizo',
+    'return_policy_required'                    => 'Return Policy ni kiashiria kinachohitajika.',
+    'reward'                                    => 'Zawadi',
+    'reward_configuration'                      => 'Mpangilio wa Zawadi',
+    'right'                                     => 'Kulia',
+    'sales_invoice_format'                      => 'Muundo wa Ankara ya Mauzo',
+    'sales_quote_format'                        => 'Muundo wa Nukuu ya Mauzo',
+    'mailpath_invalid'                          => 'Njia ya sendmail si sahihi. Herufi, nambari, mistari mifupi, mistari chini, mikwaju, mikwaju ya kinyume, koloni, nafasi na vitone pekee ndivyo vinaruhusiwa.',
+    'saved_successfully'                        => 'Mpangilio umehifadhiwa kwa mafanikio.',
+    'saved_unsuccessfully'                      => 'Mpangilio umeshindwa kuhifadhiwa.',
+    'security_issue'                            => 'Onyo la Udhaifu wa Usalama',
+    'server_notice'                             => 'Tafadhali tumia taarifa zilizo hapa chini kuripoti tatizo.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Onyesha ikoni ya ofisi',
+    'statistics'                                => 'Tuma Takwimu',
+    'statistics_tooltip'                        => 'Tuma takwimu kwa madhumuni ya maendeleo na uboreshaji wa vipengele.',
+    'stock_location'                            => 'Stoo',
+    'stock_location_duplicate'                  => 'Stoo lazima iwe ya kipekee.',
+    'stock_location_invalid_chars'              => "Stoo haiwezi kuwa na '_'.",
+    'stock_location_required'                   => 'Stoo ni kiashiria kinachohitajika.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Safu wima 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Mpangilio wa Mapendekezo ya Utafutaji',
+    'suggestions_second_column'                 => 'Safu wima 2',
+    'suggestions_third_column'                  => 'Safu wima 3',
+    'system_conf'                               => 'Usanidi & Mpangilio',
+    'system_info'                               => 'Taarifa za Mfumo',
+    'table'                                     => 'Jedwali',
+    'table_configuration'                       => 'Jedwali la Mpangilio',
+    'takings_printer'                           => 'Kichapishi cha Risiti',
+    'tax'                                       => 'Kodi',
+    'tax_category'                              => 'Aina ya Kodi',
+    'tax_category_duplicate'                    => 'Aina ya kodi uliyoingiza tayari ipo.',
+    'tax_category_invalid_chars'                => 'Aina ya kodi uliyoingiza si sahihi.',
+    'tax_category_required'                     => 'Aina ya kodi ni lazima.',
+    'tax_category_used'                         => 'Aina ya kodi haiwezi kufutwa kwa sababu inatumika.',
+    'tax_configuration'                         => 'Mpangilio wa Kodi',
+    'tax_decimals'                              => 'Desimali za Kodi',
+    'tax_id'                                    => 'Nambari ya Kodi',
+    'tax_included'                              => 'Kodi Imejumuishwa',
+    'theme'                                     => 'Mandhari',
+    'theme_preview'                             => 'Onyesha Mandhari:',
+    'thousands_separator'                       => 'Kitenganishi cha Maelfu',
+    'timezone'                                  => 'Saa za Eneo',
+    'timezone_error'                            => 'Saa za OSPOS ni tofauti na Saa za Eneo lako.',
+    'top'                                       => 'Juu',
+    'use_destination_based_tax'                 => 'Tumia Kodi ya Kulingana na Eneo',
+    'user_timezone'                             => 'Saa za Eneo lako:',
+    'website'                                   => 'Tovuti',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Msaada wa Agizo la Kazi',
+    'work_order_format'                         => 'Muundo wa Agizo la Kazi',
+];
diff --git a/app/Language/sw-KE/Employees.php b/app/Language/sw-KE/Employees.php
index 2ccb46fcd..02bf38e2a 100644
--- a/app/Language/sw-KE/Employees.php
+++ b/app/Language/sw-KE/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Taarifa za Msingi",
-    "cannot_be_deleted"            => "Haiwezekani kufuta M/Wafanyakazi aliyechaguliwa, mmoja au zaidi ameshashughulikia mauzo au unajaribu kufuta akaunti yako.",
-    "change_employee"              => "",
-    "change_password"              => "Badilisha Nenosiri",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Una uhakika unataka kufuta mfanyakazi aliyechaguliwa?",
-    "confirm_restore"              => "Una uhakika unataka kurejesha Mfanyakazi/Wafanyakazi aliyechaguliwa?",
-    "current_password"             => "Nenosiri la Sasa",
-    "current_password_invalid"     => "Nenosiri la sasa si sahihi.",
-    "employee"                     => "Mfanyakazi",
-    "error_adding_updating"        => "Kuongeza au kusasisha mfanyakazi kumeshindikana.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Huwezi kufuta mtumiaji wa admin wa majaribio.",
-    "error_updating_demo_admin"    => "Huwezi kubadilisha mtumiaji wa admin wa majaribio.",
-    "language"                     => "Lugha",
-    "login_info"                   => "Ingia",
-    "manager"                      => "",
-    "new"                          => "Mfanyakazi Mpya",
-    "none_selected"                => "Hujachagua Mfanyakazi/Wafanyakazi yeyote wa kufuta.",
-    "one_or_multiple"              => "Mfanyakazi/Wafanyakazi",
-    "password"                     => "Nenosiri",
-    "password_minlength"           => "Nenosiri lazima liwe na angalau herufi 8.",
-    "password_must_match"          => "Manenosiri hayafanani.",
-    "password_not_must_match"      => "Nenosiri la sasa na jipya lazima liwe tofauti.",
-    "password_required"            => "Nenosiri linahitajika.",
-    "permission_desc"              => "Chagua visanduku hapa chini kutoa ruhusa kwa moduli.",
-    "permission_info"              => "Ruhusa",
-    "repeat_password"              => "Rudia Nenosiri",
-    "subpermission_required"       => "Ongeza angalau ruhusa moja kwa kila moduli.",
-    "successful_adding"            => "Umefanikiwa kuongeza mfanyakazi.",
-    "successful_change_password"   => "Umefanikiwa kubadili nenosiri.",
-    "successful_deleted"           => "Umefanikiwa kufuta",
-    "successful_updating"          => "Umefanikiwa kusasisha mfanyakazi",
-    "system_language"              => "Lugha ya Mfumo",
-    "unsuccessful_change_password" => "Imeshindikana kubadili Nenosiri.",
-    "update"                       => "Sasisha Mfanyakazi",
-    "username"                     => "Jina la Mtumiaji",
-    "username_duplicate"           => "Jina la mtumiaji tayari linatumika. Tafadhali chagua lingine.",
-    "username_minlength"           => "Jina la mtumiaji lazima liwe na angalau herufi 5.",
-    "username_required"            => "Jina la mtumiaji ni lazima.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Taarifa za Msingi',
+    'cannot_be_deleted'                      => 'Haiwezekani kufuta M/Wafanyakazi aliyechaguliwa, mmoja au zaidi ameshashughulikia mauzo au unajaribu kufuta akaunti yako.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Badilisha Nenosiri',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Una uhakika unataka kufuta mfanyakazi aliyechaguliwa?',
+    'confirm_restore'                        => 'Una uhakika unataka kurejesha Mfanyakazi/Wafanyakazi aliyechaguliwa?',
+    'current_password'                       => 'Nenosiri la Sasa',
+    'current_password_invalid'               => 'Nenosiri la sasa si sahihi.',
+    'employee'                               => 'Mfanyakazi',
+    'error_adding_updating'                  => 'Kuongeza au kusasisha mfanyakazi kumeshindikana.',
+    'error_cannot_remove_own_minimum_grant'  => 'Huwezi kuondoa ruhusa zako za chini kabisa za ufikiaji wa moduli.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Huwezi kufuta mtumiaji wa admin wa majaribio.',
+    'error_grant_change_disallowed'          => 'Mabadiliko ya ruhusa yamezimwa katika demo hii.',
+    'error_password_change_disallowed'       => 'Mabadiliko ya neno la siri yamezimwa katika demo hii.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Huwezi kubadilisha mtumiaji wa admin wa majaribio.',
+    'language'                               => 'Lugha',
+    'login_info'                             => 'Ingia',
+    'manager'                                => '',
+    'new'                                    => 'Mfanyakazi Mpya',
+    'none_selected'                          => 'Hujachagua Mfanyakazi/Wafanyakazi yeyote wa kufuta.',
+    'one_or_multiple'                        => 'Mfanyakazi/Wafanyakazi',
+    'password'                               => 'Nenosiri',
+    'password_minlength'                     => 'Nenosiri lazima liwe na angalau herufi 8.',
+    'password_must_match'                    => 'Manenosiri hayafanani.',
+    'password_not_must_match'                => 'Nenosiri la sasa na jipya lazima liwe tofauti.',
+    'password_required'                      => 'Nenosiri linahitajika.',
+    'permission_desc'                        => 'Chagua visanduku hapa chini kutoa ruhusa kwa moduli.',
+    'permission_info'                        => 'Ruhusa',
+    'repeat_password'                        => 'Rudia Nenosiri',
+    'subpermission_required'                 => 'Ongeza angalau ruhusa moja kwa kila moduli.',
+    'successful_adding'                      => 'Umefanikiwa kuongeza mfanyakazi.',
+    'successful_change_password'             => 'Umefanikiwa kubadili nenosiri.',
+    'successful_deleted'                     => 'Umefanikiwa kufuta',
+    'successful_updating'                    => 'Umefanikiwa kusasisha mfanyakazi',
+    'system_language'                        => 'Lugha ya Mfumo',
+    'unsuccessful_change_password'           => 'Imeshindikana kubadili Nenosiri.',
+    'update'                                 => 'Sasisha Mfanyakazi',
+    'username'                               => 'Jina la Mtumiaji',
+    'username_duplicate'                     => 'Jina la mtumiaji tayari linatumika. Tafadhali chagua lingine.',
+    'username_minlength'                     => 'Jina la mtumiaji lazima liwe na angalau herufi 5.',
+    'username_required'                      => 'Jina la mtumiaji ni lazima.',
 ];
diff --git a/app/Language/sw-KE/Error.php b/app/Language/sw-KE/Error.php
index 46b3d5d83..40e039a9b 100644
--- a/app/Language/sw-KE/Error.php
+++ b/app/Language/sw-KE/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Huna ruhusa ya kufikia moduli iliyoitwa",
-    "unknown"              => "Hitilafu isiyotarajiwa",
-];
\ No newline at end of file
+    'no_permission_module'           => 'Huna ruhusa ya kufikia moduli iliyoitwa',
+    'unable_to_create_env_file'      => 'Imeshindwa kuunda {filePath} kutayarisha throttle.key',
+    'unable_to_lock_file'            => 'Imeshindwa kufunga {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Imeshindwa kufungua {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Imeshindwa kuhifadhi throttle.key katika {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Imeshindwa kusoma {filePath} kutayarisha throttle.key',
+    'unknown'                        => 'Hitilafu isiyotarajiwa',
+];
diff --git a/app/Language/sw-KE/Items.php b/app/Language/sw-KE/Items.php
index ffda9e746..03ab94ca9 100644
--- a/app/Language/sw-KE/Items.php
+++ b/app/Language/sw-KE/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Hisa ya kuongeza au kutoa.",
-    "allow_alt_description"              => "Ruhusu Maelezo Mbadala",
-    "amount_entry"                       => "Uingizaji wa Kiasi",
-    "bulk_edit"                          => "Hariri kwa Wingi",
-    "buy_price_required"                 => "Bei ya Ununuzi ni kiashiria kinachohitajika.",
-    "cannot_be_deleted"                  => "Haiwezekani kufuta Bidhaa ulizochagua, moja au zaidi tayari ina mauzo.",
-    "cannot_find_item"                   => "Bidhaa haijapatikana.",
-    "categories"                         => "",
-    "category"                           => "Kategoria",
-    "category_new"                       => "",
-    "category_required"                  => "Kategoria ni kiashiria kinachohitajika.",
-    "change_all_to_allow_alt_desc"       => "Ruhusu Maelezo Mbadala kwa zote.",
-    "change_all_to_not_allow_allow_desc" => "Usiruhusu Maelezo Mbadala kwa zote.",
-    "change_all_to_serialized"           => "Badilisha zote kuwa na Serialized",
-    "change_all_to_unserialized"         => "Badilisha zote kuwa bila Unserialized",
-    "change_image"                       => "Badilisha Picha",
-    "confirm_bulk_edit"                  => "Una uhakika unataka kuhariri Bidhaa ulizochagua?",
-    "confirm_bulk_edit_wipe_taxes"       => "Taarifa zote za Kodi ya Bidhaa zitabadilishwa.",
-    "confirm_delete"                     => "Una uhakika unataka kufuta Bidhaa ulizochagua?",
-    "confirm_restore"                    => "Una uhakika unataka kurejesha Bidhaa ulizochagua?",
-    "cost_price"                         => "Bei ya Jumla",
-    "cost_price_number"                  => "Bei ya Jumla lazima iwe namba.",
-    "cost_price_required"                => "Bei ya Jumla ni kiashiria kinachohitajika.",
-    "count"                              => "Sasisha Hisa",
-    "csv_import_failed"                  => "Uingizaji wa CSV umeshindikana",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Faili ya CSV iliyopakiwa haina data au imepangwa vibaya.",
-    "csv_import_partially_failed"        => "Kumekuwa na makosa {0} ya uingizaji wa bidhaa kwenye mstari: {1}. Hakuna safu zilizoingizwa.",
-    "csv_import_success"                 => "Uingizaji wa Bidhaa kutoka CSV umefanikiwa.",
-    "current_quantity"                   => "Kiasi Kilichopo",
-    "default_pack_name"                  => "Kila",
-    "description"                        => "Maelezo",
-    "details_count"                      => "Maelezo ya Hesabu ya Hisa",
-    "do_nothing"                         => "Usifanye chochote",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Hariri sehemu unazotaka kwa Bidhaa ulizochagua.",
-    "edit_multiple_items"                => "Hariri Bidhaa Nyingi",
-    "empty_upc_items"                    => "Bidhaa zisizo na Msimbo wa Mstari",
-    "error_adding_updating"              => "Hitilafu katika kuongeza/kusasisha Bidhaa",
-    "error_updating_multiple"            => "Hitilafu katika kusasisha Bidhaa",
-    "generate_barcodes"                  => "Tengeneza Misimbomstari",
-    "hsn_code"                           => "Harmonized System Nomenclature",
-    "image"                              => "Picha",
-    "import_items_csv"                   => "Ingiza Bidhaa kutoka CSV",
-    "info_provided_by"                   => "Taarifa imetolewa na",
-    "inventory"                          => "Hisa",
-    "inventory_CSV_import_quantity"      => "Kiasi kilichoingizwa kutoka CSV",
-    "inventory_comments"                 => "Maoni",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Tarehe",
-    "inventory_employee"                 => "Mfanyakazi",
-    "inventory_in_out_quantity"          => "Kiasi Ndani/Nje",
-    "inventory_remarks"                  => "Maelezo",
-    "is_deleted"                         => "Imefutwa",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Bidhaa ina Serial Number",
-    "item"                               => "Bidhaa",
-    "item_id"                            => "",
-    "item_number"                        => "Msimbo wa Mstari",
-    "item_number_duplicate"              => "namba ya Bidhaa tayari ipo kwenye Kanzidata.",
-    "kit"                                => "Kifurushi",
-    "location"                           => "Mahali",
-    "low_inventory_items"                => "Bidhaa Zilizokwisha Stoo",
-    "low_sell_item"                      => "Bidhaa yenye mauzo kidogo",
-    "manually_editing_of_quantity"       => "Hariri Kiasi kwa kuandika",
-    "markup"                             => "",
-    "name"                               => "Jina la Bidhaa",
-    "name_required"                      => "Jina la Bidhaa ni kiashiria kinachohitajika.",
-    "new"                                => "Bidhaa Mpya",
-    "no_description_items"               => "Bidhaa zisizo na Maelezo",
-    "no_items_to_display"                => "Hakuna Bidhaa za kuonyesha.",
-    "none"                               => "Hakuna",
-    "none_selected"                      => "Hujachagua Bidhaa yoyote kuhariri",
-    "nonstock"                           => "Isiyo na Akiba",
-    "number_information"                 => "Namba ya Bidhaa",
-    "number_required"                    => "Msimbo wa Mstari ni kiashiria kinachohitajika.",
-    "one_or_multiple"                    => "bidhaa",
-    "pack_name"                          => "Jina la Pakiti",
-    "qty_per_pack"                       => "Kiasi kwa kila pakiti",
-    "quantity"                           => "Kiasi",
-    "quantity_number"                    => "Kiasi lazima kiwe namba.",
-    "quantity_required"                  => "Kiasi ni kiashiria kinachohitajika.",
-    "receiving_quantity"                 => "Kiasi Kinachopokelewa",
-    "remove_image"                       => "Ondoa Picha",
-    "reorder_level"                      => "Kiwango cha Kuagiza Tena",
-    "reorder_level_number"               => "Kiwango cha Kuagiza Tena lazima kiwe namba.",
-    "reorder_level_required"             => "Kiwango cha Kuagiza Tena ni kiashiria kinachohitajika.",
-    "retrive_item_info"                  => "Pata Taarifa ya Bidhaa",
-    "sales_tax_1"                        => "Kodi ya Mauzo",
-    "sales_tax_2"                        => "Kodi ya Mauzo 2",
-    "search_attributes"                  => "Tafuta Sifa",
-    "select_image"                       => "Chagua Picha",
-    "serialized_items"                   => "Bidhaa katika Mfululizo",
-    "standard"                           => "Kawaida",
-    "stock"                              => "Hisa",
-    "stock_location"                     => "Stoo",
-    "stock_type"                         => "Aina ya Hisa",
-    "successful_adding"                  => "Umefanikiwa kuongeza Bidhaa",
-    "successful_bulk_edit"               => "Umefanikiwa kusasisha Bidhaa ulizochagua",
-    "successful_deleted"                 => "Umefanikiwa kufuta",
-    "successful_updating"                => "Umefanikiwa kusasisha Bidhaa",
-    "supplier"                           => "Msambazaji",
-    "tax_1"                              => "Kodi 1",
-    "tax_2"                              => "Kodi 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Aina ya Kodi",
-    "tax_percent"                        => "Asilimia ya Kodi",
-    "tax_percent_number"                 => "Asilimia ya Kodi lazima iwe namba",
-    "tax_percent_required"               => "Asilimia ya Kodi ni kiashiria kinachohitajika.",
-    "tax_percents"                       => "Asilimia za Kodi",
-    "temp"                               => "isiyodumu",
-    "type"                               => "Aina ya Bidhaa",
-    "unit_price"                         => "Bei ya Rejareja",
-    "unit_price_number"                  => "Bei ya Rejareja lazima iwe namba.",
-    "unit_price_required"                => "Bei ya Rejareja ni kiashiria kinachohitajika.",
-    "upc_database"                       => "Kanzidata ya Misimbomstari",
-    "update"                             => "Sasisha Bidhaa",
-    "use_inventory_menu"                 => "Tumia Menyu ya Hisa",
+    'add_minus'                          => 'Hisa ya kuongeza au kutoa.',
+    'allow_alt_description'              => 'Ruhusu Maelezo Mbadala',
+    'amount_entry'                       => 'Uingizaji wa Kiasi',
+    'bulk_edit'                          => 'Hariri kwa Wingi',
+    'buy_price_required'                 => 'Bei ya Ununuzi ni kiashiria kinachohitajika.',
+    'cannot_be_deleted'                  => 'Haiwezekani kufuta Bidhaa ulizochagua, moja au zaidi tayari ina mauzo.',
+    'cannot_find_item'                   => 'Bidhaa haijapatikana.',
+    'categories'                         => '',
+    'category'                           => 'Kategoria',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategoria ni kiashiria kinachohitajika.',
+    'change_all_to_allow_alt_desc'       => 'Ruhusu Maelezo Mbadala kwa zote.',
+    'change_all_to_not_allow_allow_desc' => 'Usiruhusu Maelezo Mbadala kwa zote.',
+    'change_all_to_serialized'           => 'Badilisha zote kuwa na Serialized',
+    'change_all_to_unserialized'         => 'Badilisha zote kuwa bila Unserialized',
+    'change_image'                       => 'Badilisha Picha',
+    'confirm_bulk_edit'                  => 'Una uhakika unataka kuhariri Bidhaa ulizochagua?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Taarifa zote za Kodi ya Bidhaa zitabadilishwa.',
+    'confirm_delete'                     => 'Una uhakika unataka kufuta Bidhaa ulizochagua?',
+    'confirm_restore'                    => 'Una uhakika unataka kurejesha Bidhaa ulizochagua?',
+    'cost_price'                         => 'Bei ya Jumla',
+    'cost_price_number'                  => 'Bei ya Jumla lazima iwe namba.',
+    'cost_price_required'                => 'Bei ya Jumla ni kiashiria kinachohitajika.',
+    'count'                              => 'Sasisha Hisa',
+    'csv_import_failed'                  => 'Uingizaji wa CSV umeshindikana',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Faili ya CSV iliyopakiwa haina data au imepangwa vibaya.',
+    'csv_import_partially_failed'        => 'Kumekuwa na makosa {0} ya uingizaji wa bidhaa kwenye mstari: {1}. Hakuna safu zilizoingizwa.',
+    'csv_import_success'                 => 'Uingizaji wa Bidhaa kutoka CSV umefanikiwa.',
+    'current_quantity'                   => 'Kiasi Kilichopo',
+    'default_pack_name'                  => 'Kila',
+    'description'                        => 'Maelezo',
+    'details_count'                      => 'Maelezo ya Hesabu ya Hisa',
+    'do_nothing'                         => 'Usifanye chochote',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Hariri sehemu unazotaka kwa Bidhaa ulizochagua.',
+    'edit_multiple_items'                => 'Hariri Bidhaa Nyingi',
+    'empty_upc_items'                    => 'Bidhaa zisizo na Msimbo wa Mstari',
+    'error_adding_updating'              => 'Hitilafu katika kuongeza/kusasisha Bidhaa',
+    'error_updating_multiple'            => 'Hitilafu katika kusasisha Bidhaa',
+    'generate_barcodes'                  => 'Tengeneza Misimbomstari',
+    'hsn_code'                           => 'Harmonized System Nomenclature',
+    'image'                              => 'Picha',
+    'import_items_csv'                   => 'Ingiza Bidhaa kutoka CSV',
+    'info_provided_by'                   => 'Taarifa imetolewa na',
+    'inventory'                          => 'Hisa',
+    'inventory_CSV_import_quantity'      => 'Kiasi kilichoingizwa kutoka CSV',
+    'inventory_comments'                 => 'Maoni',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Tarehe',
+    'inventory_employee'                 => 'Mfanyakazi',
+    'inventory_in_out_quantity'          => 'Kiasi Ndani/Nje',
+    'inventory_remarks'                  => 'Maelezo',
+    'is_deleted'                         => 'Imefutwa',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Bidhaa ina Serial Number',
+    'item'                               => 'Bidhaa',
+    'item_id'                            => '',
+    'item_number'                        => 'Msimbo wa Mstari',
+    'item_number_duplicate'              => 'namba ya Bidhaa tayari ipo kwenye Kanzidata.',
+    'item_number_invalid'                => 'Namba ya Bidhaa ina herufi ambazo hairuhusiwi.',
+    'kit'                                => 'Kifurushi',
+    'location'                           => 'Mahali',
+    'low_inventory_items'                => 'Bidhaa Zilizokwisha Stoo',
+    'low_sell_item'                      => 'Bidhaa yenye mauzo kidogo',
+    'manually_editing_of_quantity'       => 'Hariri Kiasi kwa kuandika',
+    'markup'                             => '',
+    'name'                               => 'Jina la Bidhaa',
+    'name_required'                      => 'Jina la Bidhaa ni kiashiria kinachohitajika.',
+    'new'                                => 'Bidhaa Mpya',
+    'no_description_items'               => 'Bidhaa zisizo na Maelezo',
+    'no_items_to_display'                => 'Hakuna Bidhaa za kuonyesha.',
+    'none'                               => 'Hakuna',
+    'none_selected'                      => 'Hujachagua Bidhaa yoyote kuhariri',
+    'nonstock'                           => 'Isiyo na Akiba',
+    'number_information'                 => 'Namba ya Bidhaa',
+    'number_required'                    => 'Msimbo wa Mstari ni kiashiria kinachohitajika.',
+    'one_or_multiple'                    => 'bidhaa',
+    'pack_name'                          => 'Jina la Pakiti',
+    'qty_per_pack'                       => 'Kiasi kwa kila pakiti',
+    'quantity'                           => 'Kiasi',
+    'quantity_number'                    => 'Kiasi lazima kiwe namba.',
+    'quantity_required'                  => 'Kiasi ni kiashiria kinachohitajika.',
+    'receiving_quantity'                 => 'Kiasi Kinachopokelewa',
+    'remove_image'                       => 'Ondoa Picha',
+    'reorder_level'                      => 'Kiwango cha Kuagiza Tena',
+    'reorder_level_number'               => 'Kiwango cha Kuagiza Tena lazima kiwe namba.',
+    'reorder_level_required'             => 'Kiwango cha Kuagiza Tena ni kiashiria kinachohitajika.',
+    'retrive_item_info'                  => 'Pata Taarifa ya Bidhaa',
+    'sales_tax_1'                        => 'Kodi ya Mauzo',
+    'sales_tax_2'                        => 'Kodi ya Mauzo 2',
+    'search_attributes'                  => 'Tafuta Sifa',
+    'select_image'                       => 'Chagua Picha',
+    'serialized_items'                   => 'Bidhaa katika Mfululizo',
+    'standard'                           => 'Kawaida',
+    'stock'                              => 'Hisa',
+    'stock_location'                     => 'Stoo',
+    'stock_type'                         => 'Aina ya Hisa',
+    'successful_adding'                  => 'Umefanikiwa kuongeza Bidhaa',
+    'successful_bulk_edit'               => 'Umefanikiwa kusasisha Bidhaa ulizochagua',
+    'successful_deleted'                 => 'Umefanikiwa kufuta',
+    'successful_updating'                => 'Umefanikiwa kusasisha Bidhaa',
+    'supplier'                           => 'Msambazaji',
+    'tax_1'                              => 'Kodi 1',
+    'tax_2'                              => 'Kodi 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Aina ya Kodi',
+    'tax_name_invalid'                   => 'Jina la kodi lina herufi zisizoruhusiwa.',
+    'tax_percent'                        => 'Asilimia ya Kodi',
+    'tax_percent_number'                 => 'Asilimia ya Kodi lazima iwe namba',
+    'tax_percent_required'               => 'Asilimia ya Kodi ni kiashiria kinachohitajika.',
+    'tax_percents'                       => 'Asilimia za Kodi',
+    'temp'                               => 'isiyodumu',
+    'type'                               => 'Aina ya Bidhaa',
+    'unit_price'                         => 'Bei ya Rejareja',
+    'unit_price_number'                  => 'Bei ya Rejareja lazima iwe namba.',
+    'unit_price_required'                => 'Bei ya Rejareja ni kiashiria kinachohitajika.',
+    'upc_database'                       => 'Kanzidata ya Misimbomstari',
+    'update'                             => 'Sasisha Bidhaa',
+    'use_inventory_menu'                 => 'Tumia Menyu ya Hisa',
 ];
\ No newline at end of file
diff --git a/app/Language/sw-KE/Login.php b/app/Language/sw-KE/Login.php
index 4ec8895af..0e811d89a 100644
--- a/app/Language/sw-KE/Login.php
+++ b/app/Language/sw-KE/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Mimi si roboti.",
-    "go"                            => "Nenda",
-    "invalid_gcaptcha"              => "Tafadhali thibitisha kuwa wewe si roboti.",
-    "invalid_installation"          => "Usakinishaji si sahihi, angalia faili yako ya php.ini.",
-    "invalid_username_and_password" => "Jina la mtumiaji na/au nenosiri si sahihi.",
-    "login"                         => "Ingia",
-    "logout"                        => "Toka",
-    "migration_needed"              => "Uhamishaji wa kanzidata hadi {0} utaanza baada ya kuingia.",
-    "password"                      => "Nenosiri",
-    "required_username"             => "Jina la mtumiaji ni lazima.",
-    "username"                      => "Jina la Mtumiaji",
-    "welcome"                       => "Karibu kwenye {0}!",
-];
\ No newline at end of file
+    "gcaptcha"                            => "Mimi si roboti.",
+    "go"                                  => "Nenda",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Tafadhali thibitisha kuwa wewe si roboti.",
+    "invalid_installation"                => "Usakinishaji si sahihi, angalia faili yako ya php.ini.",
+    "invalid_username_and_password"       => "Jina la mtumiaji na/au nenosiri si sahihi.",
+    "login"                               => "Ingia",
+    "logout"                              => "Toka",
+    "migrating_database"                  => "Inahama hifadhidata",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Hifadhidata imehama!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "Uhamishaji wa kanzidata hadi {0} utaanza baada ya kuingia.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Nenosiri",
+    "required_username"                   => "Jina la mtumiaji ni lazima.",
+    'too_many_attempts'                   => 'Majaribio mengi mno. Tafadhali subiri kidogo kisha ujaribu tena.',
+    "username"                            => "Jina la Mtumiaji",
+    "welcome"                             => "Karibu kwenye {0}!"
+];
diff --git a/app/Language/sw-KE/Sales.php b/app/Language/sw-KE/Sales.php
index 2dc789bda..db4dbd115 100644
--- a/app/Language/sw-KE/Sales.php
+++ b/app/Language/sw-KE/Sales.php
@@ -1,227 +1,240 @@
 <?php
 
 return [
-    "customers_available_points"       => "Pointi Zinazopatikana",
-    "rewards_package"                  => "Zawadi",
-    "rewards_remaining_balance"        => "Thamani ya pointi za zawadi zilizobaki ni ",
-    "account_number"                   => "Nambari ya Akaunti",
-    "add_payment"                      => "Ongeza Malipo",
-    "amount_due"                       => "Kiasi Kinachodaiwa",
-    "amount_tendered"                  => "Kiasi Kilicholipwa",
-    "authorized_signature"             => "Sahihi Iliyothibitishwa",
-    "cancel_sale"                      => "Ghairi",
-    "cash"                             => "Fedha Taslimu",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Marekebisho ya Fedha",
-    "cash_deposit"                     => "Amana ya Fedha",
-    "cash_filter"                      => "Fedha Taslimu",
-    "change_due"                       => "Chenji Inayodaiwa",
-    "change_price"                     => "Badilisha Bei ya Uuzaji",
-    "check"                            => "Hundi",
-    "check_balance"                    => "Salio la Hundi",
-    "check_filter"                     => "Hundi",
-    "close"                            => "",
-    "comment"                          => "Maoni",
-    "comments"                         => "Maoni",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Kamilisha",
-    "confirm_cancel_sale"              => "Una uhakika unataka kufuta mauzo haya? Bidhaa zote zitaondolewa.",
-    "confirm_delete"                   => "Una uhakika unataka kufuta mauzo uliyoyachagua?",
-    "confirm_restore"                  => "Una uhakika unataka kurejesha mauzo uliyoyachagua?",
-    "credit"                           => "Kadi ya Mkopo",
-    "credit_deposit"                   => "Amana ya Mkopo",
-    "credit_filter"                    => "Kadi ya Mkopo",
-    "current_table"                    => "",
-    "customer"                         => "Mteja",
-    "customer_address"                 => "Anwani",
-    "customer_discount"                => "Punguzo",
-    "customer_email"                   => "Barua Pepe",
-    "customer_location"                => "Mahali",
-    "customer_mailchimp_status"        => "Hali ya MailChimp",
-    "customer_optional"                => "(Inahitajika kwa Malipo ya Madeni)",
-    "customer_required"                => "(Inahitajika)",
-    "customer_total"                   => "Jumla",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Tarehe ya Mauzo",
-    "date_range"                       => "Wigo wa Tarehe",
-    "date_required"                    => "Tafadhali ingiza tarehe sahihi.",
-    "date_type"                        => "Tarehe ni kiashiria kinachohitajika.",
-    "debit"                            => "Kadi ya Debit",
-    "debit_filter"                     => "",
-    "delete"                           => "Ruhusu Kufuta",
-    "delete_confirmation"              => "Una uhakika unataka kufuta mauzo haya? Hatua hii haiwezi kubatilishwa.",
-    "delete_entire_sale"               => "Futa Mauzo Yote",
-    "delete_successful"                => "Mauzo yamefutwa kwa mafanikio.",
-    "delete_unsuccessful"              => "Kufuta mauzo kimeshindikana.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Ondoa", //Tupa
-    "discard_quote"                    => "",
-    "discount"                         => "Punguzo",
-    "discount_included"                => "% Punguzo",
-    "discount_short"                   => "%",
-    "due"                              => "Deni",
-    "due_filter"                       => "",
-    "edit"                             => "Hariri",
-    "edit_item"                        => "Hariri Bidhaa",
-    "edit_sale"                        => "Hariri Mauzo",
-    "email_receipt"                    => "Tuma Risiti kwa Barua Pepe",
-    "employee"                         => "Mfanyakazi",
-    "entry"                            => "Ingizo",
-    "error_editing_item"               => "Hitilafu katika kuhariri bidhaa",
-    "find_or_scan_item"                => "Tafuta au Changanua Bidhaa",
-    "find_or_scan_item_or_receipt"     => "Tafuta au Changanua Bidhaa au Risiti",
-    "giftcard"                         => "Kadi ya Zawadi",
-    "giftcard_balance"                 => "Salio la Kadi ya Zawadi",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Namba ya Kadi ya Zawadi",
-    "group_by_category"                => "Panga kwa Kategoria",
-    "group_by_type"                    => "Panga kwa Aina",
-    "hsn"                              => "HSN",
-    "id"                               => "Namba ya Mauzo",
-    "include_prices"                   => "Jumuisha Bei?",
-    "invoice"                          => "Ankara",
-    "invoice_confirm"                  => "Ankara hii itatumwa kwa",
-    "invoice_enable"                   => "Namba ya Ankara",
-    "invoice_filter"                   => "Ankara",
-    "invoice_no_email"                 => "Mteja huyu hana anwani halali ya barua pepe.",
-    "invoice_number"                   => "Namba ya Ankara",
-    "invoice_number_duplicate"         => "Namba ya Ankara {0} lazima iwe ya kipekee.",
-    "invoice_sent"                     => "Ankara imetumwa kwa",
-    "invoice_total"                    => "Jumla ya Ankara",
-    "invoice_type_custom_invoice"      => "Ankara Maalum (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Ankara ya Kodi Maalum (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Ankara (invoice.php)",
-    "invoice_type_tax_invoice"         => "Ankara ya Kodi (tax_invoice.php)",
-    "invoice_unsent"                   => "Imeshindikana kutuma ankara kwa",
-    "invoice_update"                   => "Hesabu upya",
-    "item_insufficient_of_stock"       => "Bidhaa haina hisa ya kutosha.",
-    "item_name"                        => "Jina la Bidhaa",
-    "item_number"                      => "Namba ya Bidhaa",
-    "item_out_of_stock"                => "Bidhaa haina hisa.",
-    "key_browser"                      => "Vifupisho vya Msaada",
-    "key_cancel"                       => "Ghairi Nukuu/Ankara/Mauzo ya Sasa",
-    "key_customer_search"              => "Tafuta Mteja",
-    "key_finish_quote"                 => "Kamilisha Nukuu/Ankara bila malipo",
-    "key_finish_sale"                  => "Ongeza Malipo na Kamilisha Ankara/Mauzo",
-    "key_full"                         => "Fungua kwa Skrini Nzima",
-    "key_function"                     => "Function",
-    "key_help"                         => "Vifupisho",
-    "key_help_modal"                   => "Fungua Dirisha la Vifupisho",
-    "key_in"                           => "Kuza",
-    "key_item_search"                  => "Tafuta Bidhaa",
-    "key_out"                          => "Punguza",
-    "key_payment"                      => "Ongeza Malipo",
-    "key_print"                        => "Chapisha Ukurasa wa Sasa",
-    "key_restore"                      => "Rejesha Mwonekano wa Awali/Zoom",
-    "key_search"                       => "Tafuta Jedwali la Ripoti",
-    "key_suspend"                      => "Sitisha Mauzo ya Sasa",
-    "key_suspended"                    => "Onyesha Mauzo Yaliyositishwa",
-    "key_system"                       => "Vifupisho vya Mfumo",
-    "key_tendered"                     => "Hariri Kiasi Kilicholipwa",
-    "key_title"                        => "Vifupisho vya Kibodi (Keyboard) vya Mauzo",
-    "mc"                               => "",
-    "mode"                             => "Hali ya Usajili",
-    "must_enter_numeric"               => "Kiasi Kilicholipwa lazima kiwe Namba.",
-    "must_enter_numeric_giftcard"      => "Namba ya Kadi ya Zawadi lazima iwe Namba.",
-    "new_customer"                     => "Mteja Mpya",
-    "new_item"                         => "Bidhaa Mpya",
-    "no_description"                   => "Hakuna maelezo",
-    "no_filter"                        => "Zote",
-    "no_items_in_cart"                 => "Hakuna bidhaa kwenye Kikapu cha Ununuzi.",
-    "no_sales_to_display"              => "Hakuna mauzo ya kuonyesha.",
-    "none_selected"                    => "Hujachagua mauzo yoyote ya kufuta.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "Hatua hii haijaruhusiwa.",
-    "one_or_multiple"                  => "Mauzo",
-    "payment"                          => "Aina ya Malipo",
-    "payment_amount"                   => "Kiasi",
-    "payment_not_cover_total"          => "Kiasi cha malipo lazima kiwe sawa au zaidi ya jumla kuu.",
-    "payment_type"                     => "Aina",
-    "payments"                         => "",
-    "payments_total"                   => "Jumla ya Malipo",
-    "price"                            => "Bei",
-    "print_after_sale"                 => "Chapisha baada ya Mauzo",
-    "quantity"                         => "Kiasi",
-    "quantity_less_than_reorder_level" => "Onyo: Kiasi kilichotakiwa kiko chini ya kiwango cha kuagiza tena kwa bidhaa hiyo.",
-    "quantity_less_than_zero"          => "Onyo: Kiasi kilichotakiwa hakitoshi. Unaweza kuendelea na mauzo, lakini hakiki hesabu yako.",
-    "quantity_of_items"                => "Kiasi cha bidhaa {0}",
-    "quote"                            => "Nukuu (Quote)",
-    "quote_number"                     => "Nambari ya Nukuu",
-    "quote_number_duplicate"           => "Nambari ya Nukuu lazima iwe ya kipekee.",
-    "quote_sent"                       => "Nukuu imetumwa kwa",
-    "quote_unsent"                     => "Imeshindikana kutuma nukuu kwa",
-    "receipt"                          => "Risiti ya Mauzo",
-    "receipt_no_email"                 => "Mteja huyu hana anwani halali ya barua pepe.",
-    "receipt_number"                   => "Namba ya Mauzo",
-    "receipt_sent"                     => "Risiti imetumwa kwa",
-    "receipt_unsent"                   => "Imeshindikana kutuma risiti kwa",
-    "refund"                           => "Aina ya Marejesho",
-    "register"                         => "Usajili wa Mauzo",
-    "remove_customer"                  => "Ondoa Mteja",
-    "remove_discount"                  => "Ondoa Punguzo",
-    "return"                           => "Rudisha",
-    "rewards"                          => "Pointi za Zawadi",
-    "rewards_balance"                  => "Salio la Pointi za Zawadi",
-    "sale"                             => "Mauzo",
-    "sale_by_invoice"                  => "Mauzo kwa Ankara",
-    "sale_for_customer"                => "Mteja:",
-    "sale_time"                        => "Muda",
-    "sales_tax"                        => "Kodi ya Mauzo",
-    "sales_total"                      => "",
-    "select_customer"                  => "Chagua Mteja",
-    "selected_customer"                => "Mteja Uliyemchagua",
-    "send_invoice"                     => "Tuma Ankara",
-    "send_quote"                       => "Tuma Nukuu",
-    "send_receipt"                     => "Tuma Risiti",
-    "send_work_order"                  => "Tuma Agizo la Kazi",
-    "serial"                           => "Nambari ya Seriali",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Onyesha Ankara",
-    "show_receipt"                     => "Onyesha Risiti",
-    "start_typing_customer_name"       => "Anza kuandika taarifa za mteja...",
-    "start_typing_item_name"           => "Anza kuandika jina la bidhaa au changanua msimbo wa mstari (Scan Barcode)...",
-    "stock"                            => "Hisa",
-    "stock_location"                   => "Eneo la Hisa",
-    "sub_total"                        => "Jumla Ndogo",
-    "successfully_deleted"             => "Umefanikiwa kufuta",
-    "successfully_restored"            => "Umefanikiwa kurejesha",
-    "successfully_suspended_sale"      => "Kusitisha mauzo kumewezekana.",
-    "successfully_updated"             => "Kusasisha mauzo kumewezekana.",
-    "suspend_sale"                     => "Sitisha",
-    "suspended_doc_id"                 => "Nyaraka",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Yaliyositishwa",
-    "table"                            => "Jedwali",
-    "takings"                          => "Mauzo ya Kila Siku",
-    "tax"                              => "Kodi",
-    "tax_id"                           => "Kitambulisho cha Kodi",
-    "tax_invoice"                      => "Ankara ya Kodi",
-    "tax_percent"                      => "Kodi %",
-    "taxed_ind"                        => "K",
-    "total"                            => "Jumla",
-    "total_tax_exclusive"              => "Kodi haijajumuishwa",
-    "transaction_failed"               => "Muamala wa Mauzo umeshindikana.",
-    "unable_to_add_item"               => "Imeshindikana kuongeza bidhaa kwenye Mauzo",
-    "unsuccessfully_deleted"           => "Imeshindikana kufuta Mauzo.",
-    "unsuccessfully_restored"          => "Imeshindikana kurejesha Mauzo.",
-    "unsuccessfully_suspended_sale"    => "Imeshindikana kusitisha Mauzo.",
-    "unsuccessfully_updated"           => "Kusasisha mauzo kimeshindikana.",
-    "unsuspend"                        => "Ondoa Kusitishwa",
-    // "unsuspend_and_delete"             => "Hatua (Action)",
-    "unsuspend_and_delete"             => "Hatua",
-    "update"                           => "Sasisha",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Agizo la Kazi (Work Order)",
-    "work_order_number"                => "Nambari ya Agizo la Kazi",
-    "work_order_number_duplicate"      => "Nambari ya Agizo la Kazi lazima iwe ya kipekee.",
-    "work_order_sent"                  => "Agizo la Kazi limetumwa kwa",
-    "work_order_unsent"                => "Imeshindikana kutuma Agizo la Kazi kwa",
-];
\ No newline at end of file
+    'account_number'                    => 'Nambari ya Akaunti',
+    'add_payment'                       => 'Ongeza Malipo',
+    'amount_due'                        => 'Kiasi Kinachodaiwa',
+    'amount_due_not_covered'            => 'Malipo hayafikii kiwango kinachodaiwa.',
+    'amount_tendered'                   => 'Kiasi Kilicholipwa',
+    'authorized_signature'              => 'Sahihi Iliyothibitishwa',
+    'cancel_sale'                       => 'Ghairi',
+    'cash'                              => 'Fedha Taslimu',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Marekebisho ya Fedha',
+    'cash_deposit'                      => 'Amana ya Fedha',
+    'cash_filter'                       => 'Fedha Taslimu',
+    'change_due'                        => 'Chenji Inayodaiwa',
+    'change_price'                      => 'Badilisha Bei ya Uuzaji',
+    'check'                             => 'Hundi',
+    'check_balance'                     => 'Salio la Hundi',
+    'check_filter'                      => 'Hundi',
+    'close'                             => '',
+    'comment'                           => 'Maoni',
+    'comments'                          => 'Maoni',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Kamilisha',
+    'confirm_cancel_sale'               => 'Una uhakika unataka kufuta mauzo haya? Bidhaa zote zitaondolewa.',
+    'confirm_delete'                    => 'Una uhakika unataka kufuta mauzo uliyoyachagua?',
+    'confirm_restore'                   => 'Una uhakika unataka kurejesha mauzo uliyoyachagua?',
+    'credit'                            => 'Kadi ya Mkopo',
+    'credit_deposit'                    => 'Amana ya Mkopo',
+    'credit_filter'                     => 'Kadi ya Mkopo',
+    'current_table'                     => '',
+    'customer'                          => 'Mteja',
+    'customer_address'                  => 'Anwani',
+    'customer_discount'                 => 'Punguzo',
+    'customer_email'                    => 'Barua Pepe',
+    'customer_location'                 => 'Mahali',
+    'customer_mailchimp_status'         => 'Hali ya MailChimp',
+    'customer_optional'                 => '(Inahitajika kwa Malipo ya Madeni)',
+    'customer_required'                 => '(Inahitajika)',
+    'customer_total'                    => 'Jumla',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Pointi Zinazopatikana',
+    'daily_sales'                       => '',
+    'date'                              => 'Tarehe ya Mauzo',
+    'date_range'                        => 'Wigo wa Tarehe',
+    'date_required'                     => 'Tafadhali ingiza tarehe sahihi.',
+    'date_type'                         => 'Tarehe ni kiashiria kinachohitajika.',
+    'debit'                             => 'Kadi ya Debit',
+    'debit_filter'                      => '',
+    'delete'                            => 'Ruhusu Kufuta',
+    'delete_confirmation'               => 'Una uhakika unataka kufuta mauzo haya? Hatua hii haiwezi kubatilishwa.',
+    'delete_entire_sale'                => 'Futa Mauzo Yote',
+    'delete_successful'                 => 'Mauzo yamefutwa kwa mafanikio.',
+    'delete_unsuccessful'               => 'Kufuta mauzo kimeshindikana.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Ondoa', // Tupa
+    'discard_quote'                     => '',
+    'discount'                          => 'Punguzo',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Punguzo',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Deni',
+    'due_filter'                        => '',
+    'edit'                              => 'Hariri',
+    'edit_item'                         => 'Hariri Bidhaa',
+    'edit_sale'                         => 'Hariri Mauzo',
+    'email_receipt'                     => 'Tuma Risiti kwa Barua Pepe',
+    'employee'                          => 'Mfanyakazi',
+    'entry'                             => 'Ingizo',
+    'error_editing_item'                => 'Hitilafu katika kuhariri bidhaa',
+    'find_or_scan_item'                 => 'Tafuta au Changanua Bidhaa',
+    'find_or_scan_item_or_receipt'      => 'Tafuta au Changanua Bidhaa au Risiti',
+    'giftcard'                          => 'Kadi ya Zawadi',
+    'giftcard_balance'                  => 'Salio la Kadi ya Zawadi',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Namba ya Kadi ya Zawadi',
+    'group_by_category'                 => 'Panga kwa Kategoria',
+    'group_by_type'                     => 'Panga kwa Aina',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Namba ya Mauzo',
+    'include_prices'                    => 'Jumuisha Bei?',
+    'insufficient_giftcard_balance'     => 'Salio la kadi ya zawadi haitoshi kwa malipo haya.',
+    'insufficient_reward_points'        => 'Pointi za gantimpilo hazitoshi kwa malipo haya.',
+    'invoice'                           => 'Ankara',
+    'invoice_confirm'                   => 'Ankara hii itatumwa kwa',
+    'invoice_enable'                    => 'Namba ya Ankara',
+    'invoice_filter'                    => 'Ankara',
+    'invoice_no_email'                  => 'Mteja huyu hana anwani halali ya barua pepe.',
+    'invoice_number'                    => 'Namba ya Ankara',
+    'invoice_number_duplicate'          => 'Namba ya Ankara {0} lazima iwe ya kipekee.',
+    'invoice_sent'                      => 'Ankara imetumwa kwa',
+    'invoice_total'                     => 'Jumla ya Ankara',
+    'invoice_type_custom_invoice'       => 'Ankara Maalum (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Ankara ya Kodi Maalum (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Ankara (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Ankara ya Kodi (tax_invoice.php)',
+    'invoice_unsent'                    => 'Imeshindikana kutuma ankara kwa',
+    'invoice_update'                    => 'Hesabu upya',
+    'item_insufficient_of_stock'        => 'Bidhaa haina hisa ya kutosha.',
+    'item_name'                         => 'Jina la Bidhaa',
+    'item_number'                       => 'Namba ya Bidhaa',
+    'item_out_of_stock'                 => 'Bidhaa haina hisa.',
+    'key_browser'                       => 'Vifupisho vya Msaada',
+    'key_cancel'                        => 'Ghairi Nukuu/Ankara/Mauzo ya Sasa',
+    'key_customer_search'               => 'Tafuta Mteja',
+    'key_finish_quote'                  => 'Kamilisha Nukuu/Ankara bila malipo',
+    'key_finish_sale'                   => 'Ongeza Malipo na Kamilisha Ankara/Mauzo',
+    'key_full'                          => 'Fungua kwa Skrini Nzima',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Vifupisho',
+    'key_help_modal'                    => 'Fungua Dirisha la Vifupisho',
+    'key_in'                            => 'Kuza',
+    'key_item_search'                   => 'Tafuta Bidhaa',
+    'key_out'                           => 'Punguza',
+    'key_payment'                       => 'Ongeza Malipo',
+    'key_print'                         => 'Chapisha Ukurasa wa Sasa',
+    'key_restore'                       => 'Rejesha Mwonekano wa Awali/Zoom',
+    'key_search'                        => 'Tafuta Jedwali la Ripoti',
+    'key_suspend'                       => 'Sitisha Mauzo ya Sasa',
+    'key_suspended'                     => 'Onyesha Mauzo Yaliyositishwa',
+    'key_system'                        => 'Vifupisho vya Mfumo',
+    'key_tendered'                      => 'Hariri Kiasi Kilicholipwa',
+    'key_title'                         => 'Vifupisho vya Kibodi (Keyboard) vya Mauzo',
+    'mc'                                => '',
+    'mode'                              => 'Hali ya Usajili',
+    'must_enter_numeric'                => 'Kiasi Kilicholipwa lazima kiwe Namba.',
+    'must_enter_numeric_giftcard'       => 'Namba ya Kadi ya Zawadi lazima iwe Namba.',
+    'must_enter_reference_code'         => 'Nambari ya Kumbukumbu/Upatikanaji lazima iingizwe.',
+    'negative_amount_tendered'          => 'Kiasi kilicholipwa hakiwezi kuwa hasi.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Mteja Mpya',
+    'new_item'                          => 'Bidhaa Mpya',
+    'no_description'                    => 'Hakuna maelezo',
+    'no_filter'                         => 'Zote',
+    'no_items_in_cart'                  => 'Hakuna bidhaa kwenye Kikapu cha Ununuzi.',
+    'no_sales_to_display'               => 'Hakuna mauzo ya kuonyesha.',
+    'none_selected'                     => 'Hujachagua mauzo yoyote ya kufuta.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'Hatua hii haijaruhusiwa.',
+    'one_or_multiple'                   => 'Mauzo',
+    'payment'                           => 'Aina ya Malipo',
+    'payment_amount'                    => 'Kiasi',
+    'payment_not_cover_total'           => 'Kiasi cha malipo lazima kiwe sawa au zaidi ya jumla kuu.',
+    'payment_type'                      => 'Aina',
+    'payments'                          => '',
+    'payments_total'                    => 'Jumla ya Malipo',
+    'price'                             => 'Bei',
+    'print_after_sale'                  => 'Chapisha baada ya Mauzo',
+    'quantity'                          => 'Kiasi',
+    'quantity_less_than_reorder_level'  => 'Onyo: Kiasi kilichotakiwa kiko chini ya kiwango cha kuagiza tena kwa bidhaa hiyo.',
+    'quantity_less_than_zero'           => 'Onyo: Kiasi kilichotakiwa hakitoshi. Unaweza kuendelea na mauzo, lakini hakiki hesabu yako.',
+    'quantity_of_items'                 => 'Kiasi cha bidhaa {0}',
+    'quote'                             => 'Nukuu (Quote)',
+    'quote_number'                      => 'Nambari ya Nukuu',
+    'quote_number_duplicate'            => 'Nambari ya Nukuu lazima iwe ya kipekee.',
+    'quote_sent'                        => 'Nukuu imetumwa kwa',
+    'quote_unsent'                      => 'Imeshindikana kutuma nukuu kwa',
+    'receipt'                           => 'Risiti ya Mauzo',
+    'receipt_no_email'                  => 'Mteja huyu hana anwani halali ya barua pepe.',
+    'receipt_number'                    => 'Namba ya Mauzo',
+    'receipt_sent'                      => 'Risiti imetumwa kwa',
+    'receipt_unsent'                    => 'Imeshindikana kutuma risiti kwa',
+    'reference_code'                    => 'Nambari ya Kumbukumbu ya Malipo',
+    'reference_code_invalid_characters' => 'Nambari ya kumbukumbu lazima iwe na herufi na nambari peke yake.',
+    'reference_code_length_error'       => 'Urefu wa nambari ya kumbukumbu si sahihi.',
+    'refund'                            => 'Aina ya Marejesho',
+    'register'                          => 'Usajili wa Mauzo',
+    'remove_customer'                   => 'Ondoa Mteja',
+    'remove_discount'                   => 'Ondoa Punguzo',
+    'return'                            => 'Rudisha',
+    'rewards'                           => 'Pointi za Zawadi',
+    'rewards_balance'                   => 'Salio la Pointi za Zawadi',
+    'rewards_package'                   => 'Zawadi',
+    'rewards_remaining_balance'         => 'Thamani ya pointi za zawadi zilizobaki ni ',
+    'sale'                              => 'Mauzo',
+    'sale_by_invoice'                   => 'Mauzo kwa Ankara',
+    'sale_for_customer'                 => 'Mteja:',
+    'sale_time'                         => 'Muda',
+    'sales_tax'                         => 'Kodi ya Mauzo',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Chagua Mteja',
+    'selected_customer'                 => 'Mteja Uliyemchagua',
+    'send_invoice'                      => 'Tuma Ankara',
+    'send_quote'                        => 'Tuma Nukuu',
+    'send_receipt'                      => 'Tuma Risiti',
+    'send_work_order'                   => 'Tuma Agizo la Kazi',
+    'serial'                            => 'Nambari ya Seriali',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Onyesha Ankara',
+    'show_receipt'                      => 'Onyesha Risiti',
+    'start_typing_customer_name'        => 'Anza kuandika taarifa za mteja...',
+    'start_typing_item_name'            => 'Anza kuandika jina la bidhaa au changanua msimbo wa mstari (Scan Barcode)...',
+    'stock'                             => 'Hisa',
+    'stock_location'                    => 'Eneo la Hisa',
+    'sub_total'                         => 'Jumla Ndogo',
+    'successfully_deleted'              => 'Umefanikiwa kufuta',
+    'successfully_restored'             => 'Umefanikiwa kurejesha',
+    'successfully_suspended_sale'       => 'Kusitisha mauzo kumewezekana.',
+    'successfully_updated'              => 'Kusasisha mauzo kumewezekana.',
+    'suspend_sale'                      => 'Sitisha',
+    'suspended_doc_id'                  => 'Nyaraka',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Yaliyositishwa',
+    'table'                             => 'Jedwali',
+    'takings'                           => 'Mauzo ya Kila Siku',
+    'tax'                               => 'Kodi',
+    'tax_id'                            => 'Kitambulisho cha Kodi',
+    'tax_invoice'                       => 'Ankara ya Kodi',
+    'tax_percent'                       => 'Kodi %',
+    'taxed_ind'                         => 'K',
+    'total'                             => 'Jumla',
+    'total_tax_exclusive'               => 'Kodi haijajumuishwa',
+    'transaction_failed'                => 'Muamala wa Mauzo umeshindikana.',
+    'unable_to_add_item'                => 'Imeshindikana kuongeza bidhaa kwenye Mauzo',
+    'unsuccessfully_deleted'            => 'Imeshindikana kufuta Mauzo.',
+    'unsuccessfully_restored'           => 'Imeshindikana kurejesha Mauzo.',
+    'unsuccessfully_suspended_sale'     => 'Imeshindikana kusitisha Mauzo.',
+    'unsuccessfully_updated'            => 'Kusasisha mauzo kimeshindikana.',
+    'unsuspend'                         => 'Ondoa Kusitishwa',
+    'unsuspend_and_delete'              => 'Hatua',
+    'update'                            => 'Sasisha',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Agizo la Kazi (Work Order)',
+    'work_order_number'                 => 'Nambari ya Agizo la Kazi',
+    'work_order_number_duplicate'       => 'Nambari ya Agizo la Kazi lazima iwe ya kipekee.',
+    'work_order_sent'                   => 'Agizo la Kazi limetumwa kwa',
+    'work_order_unsent'                 => 'Imeshindikana kutuma Agizo la Kazi kwa',
+];
diff --git a/app/Language/sw-TZ/Attributes.php b/app/Language/sw-TZ/Attributes.php
index 9953939c0..07927944d 100644
--- a/app/Language/sw-TZ/Attributes.php
+++ b/app/Language/sw-TZ/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Thamani ya sifa haiwezi kuwa na '_' au '|'",
-    "confirm_delete"                   => "Una uhakika unataka kufuta sifa iliyochaguliwa/zilizochaguliwa?",
-    "confirm_restore"                  => "Una uhakika unataka kurejesha sifa iliyochaguliwa/zilizochaguliwa?",
-    "definition_cannot_be_deleted"     => "Haiwezekani kufuta sifa iliyochaguliwa/zilizochaguliwa",
-    "definition_error_adding_updating" => "Sifa {0} haiwezekani kuongezwa au kusasishwa. Tafadhali angalia logi ya makosa.",
-    "definition_flags"                 => "Uonekano wa Sifa",
-    "definition_group"                 => "Kundi",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Ongeza Sifa",
-    "definition_name_required"         => "Jina la sifa ni kiashiria kinachohitajika",
-    "definition_one_or_multiple"       => "Sifa",
-    "definition_successful_adding"     => "Umefanikiwa kuongeza kipengee(Item)",
-    "definition_successful_deleted"    => "Umefanikiwa kufuta",
-    "definition_successful_updating"   => "Umefanikiwa kusasisha sifa",
-    "definition_type"                  => "Aina ya Sifa",
-    "definition_type_required"         => "Aina ya sifa ni kiashiria kinachohitajika",
-    "definition_unit"                  => "Kipimo",
-    "definition_values"                => "Thamani za Sifa",
-    "new"                              => "Sifa Mpya",
-    "no_attributes_to_display"         => "Hakuna Sifa za kuonyesha",
-    "receipt_visibility"               => "Risiti",
-    "show_in_items"                    => "Onyesha kwenye bidhaa",
-    "show_in_items_visibility"         => "Bidhaa",
-    "show_in_receipt"                  => "Onyesha kwenye risiti",
-    "show_in_receivings"               => "Onyesha kwenye Manunuzi",
-    "show_in_receivings_visibility"    => "Manunuzi",
-    "show_in_sales"                    => "Onyesha kwenye Mauzo",
-    "show_in_sales_visibility"         => "Mauzo",
-    "update"                           => "Sasisha Sifa",
-];
\ No newline at end of file
+    'attribute_value_invalid_chars'    => 'Thamani ya sifa haiwezi kuwa na \'_\' au \'|\'',
+    'confirm_delete'                   => 'Una uhakika unataka kufuta sifa iliyochaguliwa/zilizochaguliwa?',
+    'confirm_restore'                  => 'Una uhakika unataka kurejesha sifa iliyochaguliwa/zilizochaguliwa?',
+    'definition_cannot_be_deleted'     => 'Haiwezekani kufuta sifa iliyochaguliwa/zilizochaguliwa',
+    'definition_invalid_group' => 'Kikundi ulichochagua hakipo au hakitoshi.',
+    'definition_error_adding_updating' => 'Sifa {0} haiwezekani kuongezwa au kusasishwa. Tafadhali angalia logi ya makosa.',
+    'definition_flags'                 => 'Uonekano wa Sifa',
+    'definition_group'                 => 'Kundi',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Ongeza Sifa',
+    'definition_name_required'         => 'Jina la sifa ni kiashiria kinachohitajika',
+    'definition_one_or_multiple'       => 'Sifa',
+    'definition_successful_adding'     => 'Umefanikiwa kuongeza kipengee(Item)',
+    'definition_successful_deleted'    => 'Umefanikiwa kufuta',
+    'definition_successful_updating'   => 'Umefanikiwa kusasisha sifa',
+    'definition_type'                  => 'Aina ya Sifa',
+    'definition_type_required'         => 'Aina ya sifa ni kiashiria kinachohitajika',
+    'definition_unit'                  => 'Kipimo',
+    'definition_values'                => 'Thamani za Sifa',
+    'new'                              => 'Sifa Mpya',
+    'no_attributes_to_display'         => 'Hakuna Sifa za kuonyesha',
+    'receipt_visibility'               => 'Risiti',
+    'show_in_items'                    => 'Onyesha kwenye bidhaa',
+    'show_in_items_visibility'         => 'Bidhaa',
+    'show_in_receipt'                  => 'Onyesha kwenye risiti',
+    'show_in_receivings'               => 'Onyesha kwenye Manunuzi',
+    'show_in_receivings_visibility'    => 'Manunuzi',
+    'show_in_sales'                    => 'Onyesha kwenye Mauzo',
+    'show_in_sales_visibility'         => 'Mauzo',
+    'show_in_search'                   => 'Onyesha kwenye Utafutaji',
+    'show_in_search_visibility'        => 'Utafutaji',
+    'update'                           => 'Sasisha Sifa',
+];
diff --git a/app/Language/sw-TZ/Bootstrap_tables.php b/app/Language/sw-TZ/Bootstrap_tables.php
index a991b6233..abeeed2cd 100644
--- a/app/Language/sw-TZ/Bootstrap_tables.php
+++ b/app/Language/sw-TZ/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Zote",
-    "columns"              => "Safu wima",
-    "hide_show_pagination" => "Ficha/Onyesha upangaji kurasa",
-    "loading"              => "Inapakia, tafadhali subiri...",
-    "page_from_to"         => "Inaonyesha {0} hadi {1} kati ya Mistari {2}",
-    "refresh"              => "Sasisha",
-    "rows_per_page"        => "Mistari {0} kwa kila ukurasa",
-    "toggle"               => "Badilisha",
-];
\ No newline at end of file
+    'all' => "Zote",
+    'columns' => "Safu wima",
+    'hide_show_pagination' => "Ficha/Onyesha upangaji kurasa",
+    'loading' => "Inapakia, tafadhali subiri",
+    'page_from_to' => "Inaonyesha {0} hadi {1} kati ya Mistari {2}",
+    'refresh' => "Sasisha",
+    'rows_per_page' => "Mistari {0} kwa kila ukurasa",
+    'toggle' => "Badilisha",
+];
diff --git a/app/Language/sw-TZ/Config.php b/app/Language/sw-TZ/Config.php
index 4a89635a7..5e2692474 100644
--- a/app/Language/sw-TZ/Config.php
+++ b/app/Language/sw-TZ/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Anwani ya Kampuni",
-    "address_required"                          => "Anwani ya kampuni ni kiashiria kinachohitajika.",
-    "all_set"                                   => "Ruhusa zote za faili zimewekwa vizuri!",
-    "allow_duplicate_barcodes"                  => "Ruhusu Misimbomstari iliyorudiwa",
-    "apostrophe"                                => "apostrofi",
-    "backup_button"                             => "Hifadhi Nakala",
-    "backup_database"                           => "Hifadhi Nakala ya Hifadhidata",
-    "barcode"                                   => "Msimbo wa Mstari",
-    "barcode_company"                           => "Jina la Kampuni",
-    "barcode_configuration"                     => "Mpangilio wa Msimbomstari",
-    "barcode_content"                           => "Yaliyomo kwenye Msimbomstari",
-    "barcode_first_row"                         => "Safu 1",
-    "barcode_font"                              => "Aina ya Herufi",
-    "barcode_formats"                           => "Aina za Uingizaji",
-    "barcode_generate_if_empty"                 => "Tengeneza ikiwa tupu.",
-    "barcode_height"                            => "Urefu (px)",
-    "barcode_id"                                => "Id ya Bidhaa/Jina",
-    "barcode_info"                              => "Taarifa za Mpangilio wa Msimbomstari",
-    "barcode_layout"                            => "Mpangilio wa Msimbomstari",
-    "barcode_name"                              => "Jina",
-    "barcode_number"                            => "Msimbomstari",
-    "barcode_number_in_row"                     => "Idadi kwenye safu",
-    "barcode_page_cellspacing"                  => "Onyesha nafasi kati ya seli za ukurasa.",
-    "barcode_page_width"                        => "Onyesha upana wa ukurasa",
-    "barcode_price"                             => "Bei",
-    "barcode_second_row"                        => "Safu 2",
-    "barcode_third_row"                         => "Safu 3",
-    "barcode_tooltip"                           => "Tahadhari: Kipengele hiki kinaweza kusababisha kurudiwa kwa bidhaa zilizoingizwa au kuundwa. Usitumie ikiwa hutaki Msimbomstari(Barcode) zilizorudiwa.",
-    "barcode_type"                              => "Aina ya Msimbomstari",
-    "barcode_width"                             => "Upana (px)",
-    "bottom"                                    => "Chini",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Desimali za Fedha Taslimu",
-    "cash_decimals_tooltip"                     => "Ikiwa Desimali za Fedha Taslimu na Desimali za Sarafu ni sawa basi hakuna mzunguko wa fedha taslimu utakaofanyika, isipokuwa Mzunguko wa Fedha Taslimu umewekwa kwenye Nusu Tano.",
-    "cash_rounding"                             => "Mzunguko wa Fedha Taslimu",
-    "category_dropdown"                         => "Onyesha Kategoria kama orodha ya kushuka",
-    "center"                                    => "Katikati",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "koma",
-    "company"                                   => "Jina la Kampuni",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Badilisha Picha",
-    "company_logo"                              => "Nembo ya Kampuni",
-    "company_remove_image"                      => "Ondoa Picha",
-    "company_required"                          => "Jina la kampuni ni kiashiria kinachohitajika",
-    "company_select_image"                      => "Chagua Picha",
-    "company_website_url"                       => "Tovuti ya kampuni si URL halali (http://...).",
-    "country_codes"                             => "Msimbo wa Nchi",
-    "country_codes_tooltip"                     => "Orodha ya misimbo ya nchi zilizotenganishwa kwa koma kwa utafutaji wa anwani wa uteuzi.",
-    "currency_code"                             => "Nambari ya Sarafu",
-    "currency_decimals"                         => "Desimali za Sarafu",
-    "currency_symbol"                           => "Alama ya Sarafu",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Zawadi",
-    "customer_reward_duplicate"                 => "Zawadi lazima iwe ya kipekee.",
-    "customer_reward_enable"                    => "Washa Zawadi kwa Wateja",
-    "customer_reward_invalid_chars"             => "Zawadi haiwezi kuwa na '_'",
-    "customer_reward_required"                  => "Zawadi ni kiashiria kinachohitajika",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Kichujio cha Tarehe na Muda",
-    "datetimeformat"                            => "Muundo wa Tarehe na Muda",
-    "decimal_point"                             => "Nukta ya Desimali",
-    "default_barcode_font_size_number"          => "Ukubwa wa herufi wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_font_size_required"        => "Ukubwa wa herufi wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_height_number"             => "Urefu wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_height_required"           => "Urefu wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_num_in_row_number"         => "Idadi ya Msimbomstari kwenye safu lazima iwe nambari.",
-    "default_barcode_num_in_row_required"       => "Idadi ya Msimbomstari kwenye safu ni kiashiria kinachohitajika.",
-    "default_barcode_page_cellspacing_number"   => "Nafasi kati ya chumba cha ukurasa wa Msimbomstari lazima iwe nambari.",
-    "default_barcode_page_cellspacing_required" => "Nafasi kati ya chumba cha ukurasa wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_page_width_number"         => "Upana wa ukurasa wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_page_width_required"       => "Upana wa ukurasa wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_barcode_width_number"              => "Upana wa Msimbomstari lazima uwe nambari.",
-    "default_barcode_width_required"            => "Upana wa Msimbomstari ni kiashiria kinachohitajika.",
-    "default_item_columns"                      => "Safu wima za Bidhaa Zinazoonekana Kwa Chaguo-msingi",
-    "default_origin_tax_code"                   => "Nambari ya Kodi ya Asili kwa Chaguo-msingi",
-    "default_receivings_discount"               => "Punguzo la Manunuzi kwa Chaguo-msingi",
-    "default_receivings_discount_number"        => "Punguzo la Manunuzi kwa Chaguo-msingi lazima liwe nambari.",
-    "default_receivings_discount_required"      => "Punguzo la Manunuzi kwa Chaguo-msingi ni kiashiria kinachohitajika.",
-    "default_sales_discount"                    => "Punguzo la Mauzo kwa Chaguo-msingi",
-    "default_sales_discount_number"             => "Punguzo la Mauzo kwa Chaguo-msingi lazima liwe nambari.",
-    "default_sales_discount_required"           => "Punguzo la Mauzo kwa Chaguo-msingi ni kiashiria kinachohitajika.",
-    "default_tax_category"                      => "Aina ya Kodi kwa Chaguo-msingi",
-    "default_tax_code"                          => "Nambari ya Kodi kwa Chaguo-msingi",
-    "default_tax_jurisdiction"                  => "Eneo la Kodi kwa Chaguo-msingi",
-    "default_tax_name_number"                   => "Jina la Kodi lazima liwe maandishi.",
-    "default_tax_name_required"                 => "Jina la Kodi ni kiashiria kinachohitajika.",
-    "default_tax_rate"                          => "Kiwango cha Kodi kwa Chaguo-msingi %",
-    "default_tax_rate_1"                        => "Kiwango cha Kodi 1",
-    "default_tax_rate_2"                        => "Kiwango cha Kodi 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Kiwango cha Kodi kwa Chaguo-msingi lazima kiwe nambari.",
-    "default_tax_rate_required"                 => "Kiwango cha Kodi kwa Chaguo-msingi ni kiashiria kinachohitajika.",
-    "derive_sale_quantity"                      => "Ruhusu Kiasi cha Mauzo Kilichotokana",
-    "derive_sale_quantity_tooltip"              => "Ikiwa imechaguliwa basi aina mpya ya bidhaa itatolewa kwa bidhaa zilizoagizwa kwa kiasi kilichoongezwa",
-    "dinner_table"                              => "Jedwali",
-    "dinner_table_duplicate"                    => "Jedwali lazima iwe ya kipekee.",
-    "dinner_table_enable"                       => "Washa Jedwali za Chakula",
-    "dinner_table_invalid_chars"                => "Jina la Jedwali haliwezi kuwa na '_'.",
-    "dinner_table_required"                     => "Jedwali ni kiashiria kinachohitajika.",
-    "dot"                                       => "nukta",
-    "email"                                     => "Barua Pepe",
-    "email_configuration"                       => "Mpangilio wa Barua Pepe",
-    "email_mailpath"                            => "Njia ya Sendmail",
-    "email_protocol"                            => "Itifaki",
-    "email_receipt_check_behaviour"             => "Kisanduku cha Risiti ya Barua Pepe",
-    "email_receipt_check_behaviour_always"      => "Daima imechaguliwa",
-    "email_receipt_check_behaviour_last"        => "Kumbuka chaguo la mwisho",
-    "email_receipt_check_behaviour_never"       => "Daima haijachaguliwa",
-    "email_smtp_crypto"                         => "Usimbaji wa SMTP",
-    "email_smtp_host"                           => "Seva ya SMTP",
-    "email_smtp_pass"                           => "Nenosiri la SMTP",
-    "email_smtp_port"                           => "Lango la SMTP",
-    "email_smtp_timeout"                        => "Muda wa SMTP kuisha",
-    "email_smtp_user"                           => "Jina la Mtumiaji la SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Lazimisha Faragha",
-    "enforce_privacy_tooltip"                   => "Linda faragha ya Wateja kwa kulazimisha kuchanganya data endapo data zao zitafutwa",
-    "fax"                                       => "Faksi",
-    "file_perm"                                 => "Kuna matatizo na ruhusa za faili. Tafadhali rekebisha na upakie upya ukurasa huu.",
-    "financial_year"                            => "Mwanzo wa Mwaka wa Fedha",
-    "financial_year_apr"                        => "1 Aprili",
-    "financial_year_aug"                        => "1 Agosti",
-    "financial_year_dec"                        => "1 Desemba",
-    "financial_year_feb"                        => "1 Februari",
-    "financial_year_jan"                        => "1 Januari",
-    "financial_year_jul"                        => "1 Julai",
-    "financial_year_jun"                        => "1 Juni",
-    "financial_year_mar"                        => "1 Machi",
-    "financial_year_may"                        => "1 Mei",
-    "financial_year_nov"                        => "1 Novemba",
-    "financial_year_oct"                        => "1 Oktoba",
-    "financial_year_sep"                        => "1 Septemba",
-    "floating_labels"                           => "Lebo Zinazoelea",
-    "gcaptcha_enable"                           => "Ukurasa wa Ingia reCAPTCHA",
-    "gcaptcha_secret_key"                       => "Funguo ya Siri ya reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "Funguo ya Siri ya reCAPTCHA ni kiashiria kinachohitajika",
-    "gcaptcha_site_key"                         => "Funguo ya Tovuti ya reCAPTCHA",
-    "gcaptcha_site_key_required"                => "Funguo ya Tovuti ya reCAPTCHA ni kiashiria kinachohitajika",
-    "gcaptcha_tooltip"                          => "Linda ukurasa wa Ingia kwa Google reCAPTCHA, bonyeza ikoni kupata jozi ya funguo za API.",
-    "general"                                   => "Jumla",
-    "general_configuration"                     => "Mpangilio wa Jumla",
-    "giftcard_number"                           => "Nambari ya Kadi ya Zawadi",
-    "giftcard_random"                           => "Tengeneza kwa Nasibu",
-    "giftcard_series"                           => "Tengeneza kwa Mfululizo",
-    "image_allowed_file_types"                  => "Aina za faili zinazoruhusiwa",
-    "image_max_height_tooltip"                  => "Urefu wa juu wa picha zinazopakiwa kwa pikseli (px).",
-    "image_max_size_tooltip"                    => "Ukubwa wa juu wa faili za picha zinazopakiwa kwa kilobaiti (kb).",
-    "image_max_width_tooltip"                   => "Upana wa juu wa picha zinazopakiwa kwa pikseli (px).",
-    "image_restrictions"                        => "Vizuizi vya Upakiaji wa Picha",
-    "include_hsn"                               => "Jumuisha Msaada wa Nambari za HSN",
-    "info"                                      => "Taarifa",
-    "info_configuration"                        => "Taarifa za Duka",
-    "input_groups"                              => "Makundi ya Uingizaji",
-    "integrations"                              => "Muunganiko",
-    "integrations_configuration"                => "Muunganiko wa Watu wengine",
-    "invoice"                                   => "Ankara",
-    "invoice_configuration"                     => "Mpangilio wa Uchapishaji wa Ankara",
-    "invoice_default_comments"                  => "Maoni ya Chaguo-msingi ya Ankara",
-    "invoice_email_message"                     => "Kiolezo cha Barua Pepe ya Ankara",
-    "invoice_enable"                            => "Washa Utoaji wa Ankara",
-    "invoice_printer"                           => "Kichapishi cha Ankara",
-    "invoice_type"                              => "Aina ya Ankara",
-    "is_readable"                               => "inasomeka, lakini ruhusa zimewekwa vibaya. Tafadhali weka 640 au 660 na upakie upya.",
-    "is_writable"                               => "inaandikika, lakini ruhusa zimewekwa vibaya. Tafadhali weka 750 na upakie upya.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Tahadhari: Kipengele hiki kitafanya kazi tu ikiwa una kiendelezi cha FireFox jsPrintSetup kimewekwa. Hifadhi hata hivyo?",
-    "language"                                  => "Lugha",
-    "last_used_invoice_number"                  => "Nambari ya mwisho ya Ankara iliyotumika",
-    "last_used_quote_number"                    => "Nambari ya mwisho ya Nukuu iliyotumika",
-    "last_used_work_order_number"               => "Nambari ya mwisho ya Agizo la Kazi iliyotumika",
-    "left"                                      => "Kushoto",
-    "license"                                   => "Leseni",
-    "license_configuration"                     => "Taarifa ya Leseni",
-    "line_sequence"                             => "Mpangilio wa Mistari",
-    "lines_per_page"                            => "Mistari kwa Kila Ukurasa",
-    "lines_per_page_number"                     => "Mistari kwa Kila Ukurasa lazima iwe nambari.",
-    "lines_per_page_required"                   => "Mistari kwa Kila Ukurasa ni kiashiria kinachohitajika.",
-    "locale"                                    => "Ujanibishaji",
-    "locale_configuration"                      => "Mpangilio wa Ujanibishaji",
-    "locale_info"                               => "Taarifa za Mpangilio wa Ujanibishaji",
-    "location"                                  => "Stoo",
-    "location_configuration"                    => "Maeneo ya Stoo",
-    "location_info"                             => "Taarifa za Mpangilio wa Stoo",
-    "login_form"                                => "Aina ya Fomu ya Ingia",
-    "logout"                                    => "Unataka kufanya hifadhi nakala kabla ya kutoka? Bonyeza [Sawa] kuhifadhi au [Ghairi] kutoka.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "Funguo ya API ya MailChimp",
-    "mailchimp_configuration"                   => "Mpangilio wa MailChimp",
-    "mailchimp_key_successfully"                => "Funguo ya API ni sahihi.",
-    "mailchimp_key_unsuccessfully"              => "Funguo ya API si sahihi.",
-    "mailchimp_lists"                           => "Orodha za MailChimp",
-    "mailchimp_tooltip"                         => "Bonyeza ikoni kupata Funguo ya API.",
-    "message"                                   => "Ujumbe",
-    "message_configuration"                     => "Mpangilio wa Ujumbe",
-    "msg_msg"                                   => "Ujumbe wa SMS uliohifadhiwa",
-    "msg_msg_placeholder"                       => "Ikiwa unataka kutumia kiolezo cha SMS hifadhi ujumbe wako hapa, vinginevyo acha kisanduku wazi.",
-    "msg_pwd"                                   => "Nenosiri la SMS-API",
-    "msg_pwd_required"                          => "Nenosiri la SMS-API ni kiashiria kinachohitajika",
-    "msg_src"                                   => "ID ya Mtumaji wa SMS-API",
-    "msg_src_required"                          => "ID ya Mtumaji wa SMS-API ni kiashiria kinachohitajika",
-    "msg_uid"                                   => "Jina la Mtumiaji la SMS-API",
-    "msg_uid_required"                          => "Jina la Mtumiaji la SMS-API ni kiashiria kinachohitajika",
-    "multi_pack_enabled"                        => "Vifurushi Vingi kwa Kila Bidhaa",
-    "no_risk"                                   => "Hakuna hatari za usalama/udhaifu.",
-    "none"                                      => "hakuna",
-    "notify_alignment"                          => "Nafasi ya Taarifa Ibukizi",
-    "number_format"                             => "Muundo wa Nambari",
-    "number_locale"                             => "Ujanibishaji",
-    "number_locale_invalid"                     => "Ujanibishaji uliyoingiza si sahihi. Angalia kiungo kwenye kidokezo kupata Ujanibishaji sahihi.",
-    "number_locale_required"                    => "Ujanibishaji ya Nambari ni kiashiria kinachohitajika.",
-    "number_locale_tooltip"                     => "Tafuta Ujanibishaji inayofaa kupitia kiungo hiki.",
-    "os_timezone"                               => "Saa ya OSPOS:",
-    "ospos_info"                                => "Taarifa za Usakinishaji wa OSPOS",
-    "payment_options_order"                     => "Mpangilio wa Chaguo za Malipo",
-    "perm_risk"                                 => "Ruhusa zisizo sahihi zinaacha programu hii kwenye hatari.",
-    "phone"                                     => "Namba ya simu ya Kampuni",
-    "phone_required"                            => "Namba ya simu ya Kampuni ni kiashiria kinachohitajika.",
-    "print_bottom_margin"                       => "Pembe ya Chini",
-    "print_bottom_margin_number"                => "Pembe ya Chini lazima iwe nambari.",
-    "print_bottom_margin_required"              => "Pembe ya Chini ni kiashiria kinachohitajika.",
-    "print_delay_autoreturn"                    => "Muda wa Kurudi Moja kwa Moja kwenye Mauzo",
-    "print_delay_autoreturn_number"             => "Muda wa Kurudi Moja kwa Moja kwenye Mauzo ni kiashiria kinachohitajika.",
-    "print_delay_autoreturn_required"           => "Muda wa Kurudi Moja kwa Moja kwenye Mauzo lazima uwe nambari.",
-    "print_footer"                              => "Chapisha Kijachini cha Kivinjari",
-    "print_header"                              => "Chapisha Kijuu cha Kivinjari",
-    "print_left_margin"                         => "Pembe ya Kushoto",
-    "print_left_margin_number"                  => "Pembe ya Kushoto lazima iwe nambari.",
-    "print_left_margin_required"                => "Pembe ya Kushoto ni kiashiria kinachohitajika.",
-    "print_receipt_check_behaviour"             => "Kisanduku cha Risiti ya Kuchapisha",
-    "print_receipt_check_behaviour_always"      => "Daima imechaguliwa",
-    "print_receipt_check_behaviour_last"        => "Kumbuka chaguo la mwisho",
-    "print_receipt_check_behaviour_never"       => "Daima haijachaguliwa",
-    "print_right_margin"                        => "Pembe ya Kulia",
-    "print_right_margin_number"                 => "Pembe ya Kulia lazima iwe nambari.",
-    "print_right_margin_required"               => "Pembe ya Kulia ni kiashiria kinachohitajika.",
-    "print_silently"                            => "Onyesha Dirisha la Kuchapisha",
-    "print_top_margin"                          => "Pembe ya Juu",
-    "print_top_margin_number"                   => "Pembe ya Juu lazima iwe nambari.",
-    "print_top_margin_required"                 => "Pembe ya Juu ni kiashiria kinachohitajika.",
-    "quantity_decimals"                         => "Desimali za Kiasi",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Maoni ya Chaguo-msingi la Nukuu",
-    "receipt"                                   => "Risiti",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Mpangilio wa Uchapishaji wa Risiti",
-    "receipt_default"                           => "Chaguo-msingi",
-    "receipt_font_size"                         => "Ukubwa wa Herufi",
-    "receipt_font_size_number"                  => "Ukubwa wa Herufi lazima uwe nambari.",
-    "receipt_font_size_required"                => "Ukubwa wa Herufi ni kiashiria kinachohitajika.",
-    "receipt_info"                              => "Taarifa za Mpangilio wa Risiti",
-    "receipt_printer"                           => "Kichapishi cha Tiketi",
-    "receipt_short"                             => "Fupi",
-    "receipt_show_company_name"                 => "Onyesha Jina la Kampuni",
-    "receipt_show_description"                  => "Onyesha Maelezo",
-    "receipt_show_serialnumber"                 => "Onyesha Serial Number",
-    "receipt_show_tax_ind"                      => "Onyesha Kiashiria cha Kodi",
-    "receipt_show_taxes"                        => "Onyesha Kodi",
-    "receipt_show_total_discount"               => "Onyesha Jumla ya Punguzo",
-    "receipt_template"                          => "Kiolezo cha Risiti",
-    "receiving_calculate_average_price"         => "Hesabu Bei ya wastani (Manunuzi)",
-    "recv_invoice_format"                       => "Muundo wa Ankara ya Manunuzi",
-    "register_mode_default"                     => "Hali ya Usajili kwa Chaguo-msingi",
-    "report_an_issue"                           => "Ripoti tatizo",
-    "return_policy_required"                    => "Return Policy ni kiashiria kinachohitajika.",
-    "reward"                                    => "Zawadi",
-    "reward_configuration"                      => "Mpangilio wa Zawadi",
-    "right"                                     => "Kulia",
-    "sales_invoice_format"                      => "Muundo wa Ankara ya Mauzo",
-    "sales_quote_format"                        => "Muundo wa Nukuu ya Mauzo",
-    "saved_successfully"                        => "Mpangilio umehifadhiwa kwa mafanikio.",
-    "saved_unsuccessfully"                      => "Mpangilio umeshindwa kuhifadhiwa.",
-    "security_issue"                            => "Onyo la Udhaifu wa Usalama",
-    "server_notice"                             => "Tafadhali tumia taarifa zilizo hapa chini kuripoti tatizo.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Onyesha ikoni ya ofisi",
-    "statistics"                                => "Tuma Takwimu",
-    "statistics_tooltip"                        => "Tuma takwimu kwa madhumuni ya maendeleo na uboreshaji wa vipengele.",
-    "stock_location"                            => "Stoo",
-    "stock_location_duplicate"                  => "Stoo lazima iwe ya kipekee.",
-    "stock_location_invalid_chars"              => "Stoo haiwezi kuwa na '_'.",
-    "stock_location_required"                   => "Stoo ni kiashiria kinachohitajika.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Safu wima 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Mpangilio wa Mapendekezo ya Utafutaji",
-    "suggestions_second_column"                 => "Safu wima 2",
-    "suggestions_third_column"                  => "Safu wima 3",
-    "system_conf"                               => "Usanidi & Mpangilio",
-    "system_info"                               => "Taarifa za Mfumo",
-    "table"                                     => "Jedwali",
-    "table_configuration"                       => "Jedwali la Mpangilio",
-    "takings_printer"                           => "Kichapishi cha Risiti",
-    "tax"                                       => "Kodi",
-    "tax_category"                              => "Aina ya Kodi",
-    "tax_category_duplicate"                    => "Aina ya kodi uliyoingiza tayari ipo.",
-    "tax_category_invalid_chars"                => "Aina ya kodi uliyoingiza si sahihi.",
-    "tax_category_required"                     => "Aina ya kodi ni lazima.",
-    "tax_category_used"                         => "Aina ya kodi haiwezi kufutwa kwa sababu inatumika.",
-    "tax_configuration"                         => "Mpangilio wa Kodi",
-    "tax_decimals"                              => "Desimali za Kodi",
-    "tax_id"                                    => "Nambari ya Kodi",
-    "tax_included"                              => "Kodi Imejumuishwa",
-    "theme"                                     => "Mandhari",
-    "theme_preview"                             => "Onyesha Mandhari:",
-    "thousands_separator"                       => "Kitenganishi cha Maelfu",
-    "timezone"                                  => "Saa za Eneo",
-    "timezone_error"                            => "Saa za OSPOS ni tofauti na Saa za Eneo lako.",
-    "top"                                       => "Juu",
-    "use_destination_based_tax"                 => "Tumia Kodi ya Kulingana na Eneo",
-    "user_timezone"                             => "Saa za Eneo lako:",
-    "website"                                   => "Tovuti",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Msaada wa Agizo la Kazi",
-    "work_order_format"                         => "Muundo wa Agizo la Kazi",
-];
\ No newline at end of file
+    'address'                                   => 'Anwani ya Kampuni',
+    'address_required'                          => 'Anwani ya kampuni ni kiashiria kinachohitajika.',
+    'all_set'                                   => 'Ruhusa zote za faili zimewekwa vizuri!',
+    'allow_duplicate_barcodes'                  => 'Ruhusu Misimbomstari iliyorudiwa',
+    'apostrophe'                                => 'apostrofi',
+    'backup_button'                             => 'Hifadhi Nakala',
+    'backup_database'                           => 'Hifadhi Nakala ya Hifadhidata',
+    'barcode'                                   => 'Msimbo wa Mstari',
+    'barcode_company'                           => 'Jina la Kampuni',
+    'barcode_configuration'                     => 'Mpangilio wa Msimbomstari',
+    'barcode_content'                           => 'Yaliyomo kwenye Msimbomstari',
+    'barcode_first_row'                         => 'Safu 1',
+    'barcode_font'                              => 'Aina ya Herufi',
+    'barcode_formats'                           => 'Aina za Uingizaji',
+    'barcode_generate_if_empty'                 => 'Tengeneza ikiwa tupu.',
+    'barcode_height'                            => 'Urefu (px)',
+    'barcode_id'                                => 'Id ya Bidhaa/Jina',
+    'barcode_info'                              => 'Taarifa za Mpangilio wa Msimbomstari',
+    'barcode_layout'                            => 'Mpangilio wa Msimbomstari',
+    'barcode_name'                              => 'Jina',
+    'barcode_number'                            => 'Msimbomstari',
+    'barcode_number_in_row'                     => 'Idadi kwenye safu',
+    'barcode_page_cellspacing'                  => 'Onyesha nafasi kati ya seli za ukurasa.',
+    'barcode_page_width'                        => 'Onyesha upana wa ukurasa',
+    'barcode_price'                             => 'Bei',
+    'barcode_second_row'                        => 'Safu 2',
+    'barcode_third_row'                         => 'Safu 3',
+    'barcode_tooltip'                           => 'Tahadhari: Kipengele hiki kinaweza kusababisha kurudiwa kwa bidhaa zilizoingizwa au kuundwa. Usitumie ikiwa hutaki Msimbomstari(Barcode) zilizorudiwa.',
+    'barcode_type'                              => 'Aina ya Msimbomstari',
+    'barcode_width'                             => 'Upana (px)',
+    'bottom'                                    => 'Chini',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Desimali za Fedha Taslimu',
+    'cash_decimals_tooltip'                     => 'Ikiwa Desimali za Fedha Taslimu na Desimali za Sarafu ni sawa basi hakuna mzunguko wa fedha taslimu utakaofanyika, isipokuwa Mzunguko wa Fedha Taslimu umewekwa kwenye Nusu Tano.',
+    'cash_rounding'                             => 'Mzunguko wa Fedha Taslimu',
+    'category_dropdown'                         => 'Onyesha Kategoria kama orodha ya kushuka',
+    'center'                                    => 'Katikati',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'koma',
+    'company'                                   => 'Jina la Kampuni',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Badilisha Picha',
+    'company_logo'                              => 'Nembo ya Kampuni',
+    'company_remove_image'                      => 'Ondoa Picha',
+    'company_required'                          => 'Jina la kampuni ni kiashiria kinachohitajika',
+    'company_select_image'                      => 'Chagua Picha',
+    'company_website_url'                       => 'Tovuti ya kampuni si URL halali (http://...).',
+    'country_codes'                             => 'Msimbo wa Nchi',
+    'country_codes_tooltip'                     => 'Orodha ya misimbo ya nchi zilizotenganishwa kwa koma kwa utafutaji wa anwani wa uteuzi.',
+    'currency_code'                             => 'Nambari ya Sarafu',
+    'currency_decimals'                         => 'Desimali za Sarafu',
+    'currency_symbol'                           => 'Alama ya Sarafu',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Zawadi',
+    'customer_reward_duplicate'                 => 'Zawadi lazima iwe ya kipekee.',
+    'customer_reward_enable'                    => 'Washa Zawadi kwa Wateja',
+    'customer_reward_invalid_chars'             => "Zawadi haiwezi kuwa na '_'",
+    'customer_reward_required'                  => 'Zawadi ni kiashiria kinachohitajika',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Kichujio cha Tarehe na Muda',
+    'datetimeformat'                            => 'Muundo wa Tarehe na Muda',
+    'decimal_point'                             => 'Nukta ya Desimali',
+    'default_barcode_font_size_number'          => 'Ukubwa wa herufi wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_font_size_required'        => 'Ukubwa wa herufi wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_height_number'             => 'Urefu wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_height_required'           => 'Urefu wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_num_in_row_number'         => 'Idadi ya Msimbomstari kwenye safu lazima iwe nambari.',
+    'default_barcode_num_in_row_required'       => 'Idadi ya Msimbomstari kwenye safu ni kiashiria kinachohitajika.',
+    'default_barcode_page_cellspacing_number'   => 'Nafasi kati ya chumba cha ukurasa wa Msimbomstari lazima iwe nambari.',
+    'default_barcode_page_cellspacing_required' => 'Nafasi kati ya chumba cha ukurasa wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_page_width_number'         => 'Upana wa ukurasa wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_page_width_required'       => 'Upana wa ukurasa wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_barcode_width_number'              => 'Upana wa Msimbomstari lazima uwe nambari.',
+    'default_barcode_width_required'            => 'Upana wa Msimbomstari ni kiashiria kinachohitajika.',
+    'default_item_columns'                      => 'Safu wima za Bidhaa Zinazoonekana Kwa Chaguo-msingi',
+    'default_origin_tax_code'                   => 'Nambari ya Kodi ya Asili kwa Chaguo-msingi',
+    'default_receivings_discount'               => 'Punguzo la Manunuzi kwa Chaguo-msingi',
+    'default_receivings_discount_number'        => 'Punguzo la Manunuzi kwa Chaguo-msingi lazima liwe nambari.',
+    'default_receivings_discount_required'      => 'Punguzo la Manunuzi kwa Chaguo-msingi ni kiashiria kinachohitajika.',
+    'default_sales_discount'                    => 'Punguzo la Mauzo kwa Chaguo-msingi',
+    'default_sales_discount_number'             => 'Punguzo la Mauzo kwa Chaguo-msingi lazima liwe nambari.',
+    'default_sales_discount_required'           => 'Punguzo la Mauzo kwa Chaguo-msingi ni kiashiria kinachohitajika.',
+    'default_tax_category'                      => 'Aina ya Kodi kwa Chaguo-msingi',
+    'default_tax_code'                          => 'Nambari ya Kodi kwa Chaguo-msingi',
+    'default_tax_jurisdiction'                  => 'Eneo la Kodi kwa Chaguo-msingi',
+    'default_tax_name_number'                   => 'Jina la Kodi lazima liwe maandishi.',
+    'default_tax_name_required'                 => 'Jina la Kodi ni kiashiria kinachohitajika.',
+    'default_tax_rate'                          => 'Kiwango cha Kodi kwa Chaguo-msingi %',
+    'default_tax_rate_1'                        => 'Kiwango cha Kodi 1',
+    'default_tax_rate_2'                        => 'Kiwango cha Kodi 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Kiwango cha Kodi kwa Chaguo-msingi lazima kiwe nambari.',
+    'default_tax_rate_required'                 => 'Kiwango cha Kodi kwa Chaguo-msingi ni kiashiria kinachohitajika.',
+    'derive_sale_quantity'                      => 'Ruhusu Kiasi cha Mauzo Kilichotokana',
+    'derive_sale_quantity_tooltip'              => 'Ikiwa imechaguliwa basi aina mpya ya bidhaa itatolewa kwa bidhaa zilizoagizwa kwa kiasi kilichoongezwa',
+    'dinner_table'                              => 'Jedwali',
+    'dinner_table_duplicate'                    => 'Jedwali lazima iwe ya kipekee.',
+    'dinner_table_enable'                       => 'Washa Jedwali za Chakula',
+    'dinner_table_invalid_chars'                => "Jina la Jedwali haliwezi kuwa na '_'.",
+    'dinner_table_required'                     => 'Jedwali ni kiashiria kinachohitajika.',
+    'dot'                                       => 'nukta',
+    'email'                                     => 'Barua Pepe',
+    'email_configuration'                       => 'Mpangilio wa Barua Pepe',
+    'email_mailpath'                            => 'Njia ya Sendmail',
+    'email_protocol'                            => 'Itifaki',
+    'email_receipt_check_behaviour'             => 'Kisanduku cha Risiti ya Barua Pepe',
+    'email_receipt_check_behaviour_always'      => 'Daima imechaguliwa',
+    'email_receipt_check_behaviour_last'        => 'Kumbuka chaguo la mwisho',
+    'email_receipt_check_behaviour_never'       => 'Daima haijachaguliwa',
+    'email_smtp_crypto'                         => 'Usimbaji wa SMTP',
+    'email_smtp_host'                           => 'Seva ya SMTP',
+    'email_smtp_pass'                           => 'Nenosiri la SMTP',
+    'email_smtp_port'                           => 'Lango la SMTP',
+    'email_smtp_timeout'                        => 'Muda wa SMTP kuisha',
+    'email_smtp_user'                           => 'Jina la Mtumiaji la SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Lazimisha Faragha',
+    'enforce_privacy_tooltip'                   => 'Linda faragha ya Wateja kwa kulazimisha kuchanganya data endapo data zao zitafutwa',
+    'fax'                                       => 'Faksi',
+    'file_perm'                                 => 'Kuna matatizo na ruhusa za faili. Tafadhali rekebisha na upakie upya ukurasa huu.',
+    'financial_year'                            => 'Mwanzo wa Mwaka wa Fedha',
+    'financial_year_apr'                        => '1 Aprili',
+    'financial_year_aug'                        => '1 Agosti',
+    'financial_year_dec'                        => '1 Desemba',
+    'financial_year_feb'                        => '1 Februari',
+    'financial_year_jan'                        => '1 Januari',
+    'financial_year_jul'                        => '1 Julai',
+    'financial_year_jun'                        => '1 Juni',
+    'financial_year_mar'                        => '1 Machi',
+    'financial_year_may'                        => '1 Mei',
+    'financial_year_nov'                        => '1 Novemba',
+    'financial_year_oct'                        => '1 Oktoba',
+    'financial_year_sep'                        => '1 Septemba',
+    'floating_labels'                           => 'Lebo Zinazoelea',
+    'gcaptcha_enable'                           => 'Ukurasa wa Ingia reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'Funguo ya Siri ya reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'Funguo ya Siri ya reCAPTCHA ni kiashiria kinachohitajika',
+    'gcaptcha_site_key'                         => 'Funguo ya Tovuti ya reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'Funguo ya Tovuti ya reCAPTCHA ni kiashiria kinachohitajika',
+    'gcaptcha_tooltip'                          => 'Linda ukurasa wa Ingia kwa Google reCAPTCHA, bonyeza ikoni kupata jozi ya funguo za API.',
+    'general'                                   => 'Jumla',
+    'general_configuration'                     => 'Mpangilio wa Jumla',
+    'giftcard_number'                           => 'Nambari ya Kadi ya Zawadi',
+    'giftcard_random'                           => 'Tengeneza kwa Nasibu',
+    'giftcard_series'                           => 'Tengeneza kwa Mfululizo',
+    'image_allowed_file_types'                  => 'Aina za faili zinazoruhusiwa',
+    'image_max_height_tooltip'                  => 'Urefu wa juu wa picha zinazopakiwa kwa pikseli (px).',
+    'image_max_size_tooltip'                    => 'Ukubwa wa juu wa faili za picha zinazopakiwa kwa kilobaiti (kb).',
+    'image_max_width_tooltip'                   => 'Upana wa juu wa picha zinazopakiwa kwa pikseli (px).',
+    'image_restrictions'                        => 'Vizuizi vya Upakiaji wa Picha',
+    'include_hsn'                               => 'Jumuisha Msaada wa Nambari za HSN',
+    'info'                                      => 'Taarifa',
+    'info_configuration'                        => 'Taarifa za Duka',
+    'input_groups'                              => 'Makundi ya Uingizaji',
+    'integrations'                              => 'Muunganiko',
+    'integrations_configuration'                => 'Muunganiko wa Watu wengine',
+    'invoice'                                   => 'Ankara',
+    'invoice_configuration'                     => 'Mpangilio wa Uchapishaji wa Ankara',
+    'invoice_default_comments'                  => 'Maoni ya Chaguo-msingi ya Ankara',
+    'invoice_email_message'                     => 'Kiolezo cha Barua Pepe ya Ankara',
+    'invoice_enable'                            => 'Washa Utoaji wa Ankara',
+    'invoice_printer'                           => 'Kichapishi cha Ankara',
+    'invoice_type'                              => 'Aina ya Ankara',
+    'is_readable'                               => 'inasomeka, lakini ruhusa zimewekwa vibaya. Tafadhali weka 640 au 660 na upakie upya.',
+    'is_writable'                               => 'inaandikika, lakini ruhusa zimewekwa vibaya. Tafadhali weka 750 na upakie upya.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Tahadhari: Kipengele hiki kitafanya kazi tu ikiwa una kiendelezi cha FireFox jsPrintSetup kimewekwa. Hifadhi hata hivyo?',
+    'language'                                  => 'Lugha',
+    'last_used_invoice_number'                  => 'Nambari ya mwisho ya Ankara iliyotumika',
+    'last_used_quote_number'                    => 'Nambari ya mwisho ya Nukuu iliyotumika',
+    'last_used_work_order_number'               => 'Nambari ya mwisho ya Agizo la Kazi iliyotumika',
+    'left'                                      => 'Kushoto',
+    'license'                                   => 'Leseni',
+    'license_configuration'                     => 'Taarifa ya Leseni',
+    'line_sequence'                             => 'Mpangilio wa Mistari',
+    'lines_per_page'                            => 'Mistari kwa Kila Ukurasa',
+    'lines_per_page_number'                     => 'Mistari kwa Kila Ukurasa lazima iwe nambari.',
+    'lines_per_page_required'                   => 'Mistari kwa Kila Ukurasa ni kiashiria kinachohitajika.',
+    'locale'                                    => 'Ujanibishaji',
+    'locale_configuration'                      => 'Mpangilio wa Ujanibishaji',
+    'locale_info'                               => 'Taarifa za Mpangilio wa Ujanibishaji',
+    'location'                                  => 'Stoo',
+    'location_configuration'                    => 'Maeneo ya Stoo',
+    'location_info'                             => 'Taarifa za Mpangilio wa Stoo',
+    'login_form'                                => 'Aina ya Fomu ya Ingia',
+    'logout'                                    => 'Unataka kufanya hifadhi nakala kabla ya kutoka? Bonyeza [Sawa] kuhifadhi au [Ghairi] kutoka.',
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'Funguo ya API ya MailChimp',
+    'mailchimp_configuration'                   => 'Mpangilio wa MailChimp',
+    'mailchimp_key_successfully'                => 'Funguo ya API ni sahihi.',
+    'mailchimp_key_unsuccessfully'              => 'Funguo ya API si sahihi.',
+    'mailchimp_lists'                           => 'Orodha za MailChimp',
+    'mailchimp_tooltip'                         => 'Bonyeza ikoni kupata Funguo ya API.',
+    'message'                                   => 'Ujumbe',
+    'message_configuration'                     => 'Mpangilio wa Ujumbe',
+    'msg_msg'                                   => 'Ujumbe wa SMS uliohifadhiwa',
+    'msg_msg_placeholder'                       => 'Ikiwa unataka kutumia kiolezo cha SMS hifadhi ujumbe wako hapa, vinginevyo acha kisanduku wazi.',
+    'msg_pwd'                                   => 'Nenosiri la SMS-API',
+    'msg_src'                                   => 'ID ya Mtumaji wa SMS-API',
+    'msg_src_required'                          => 'ID ya Mtumaji wa SMS-API ni kiashiria kinachohitajika',
+    'msg_uid'                                   => 'Jina la Mtumiaji la SMS-API',
+    'msg_uid_required'                          => 'Jina la Mtumiaji la SMS-API ni kiashiria kinachohitajika',
+    'multi_pack_enabled'                        => 'Vifurushi Vingi kwa Kila Bidhaa',
+    'no_risk'                                   => 'Hakuna hatari za usalama/udhaifu.',
+    'none'                                      => 'hakuna',
+    'notify_alignment'                          => 'Nafasi ya Taarifa Ibukizi',
+    'number_format'                             => 'Muundo wa Nambari',
+    'number_locale'                             => 'Ujanibishaji',
+    'number_locale_invalid'                     => 'Ujanibishaji uliyoingiza si sahihi. Angalia kiungo kwenye kidokezo kupata Ujanibishaji sahihi.',
+    'number_locale_required'                    => 'Ujanibishaji ya Nambari ni kiashiria kinachohitajika.',
+    'number_locale_tooltip'                     => 'Tafuta Ujanibishaji inayofaa kupitia kiungo hiki.',
+    'os_timezone'                               => 'Saa ya OSPOS:',
+    'ospos_info'                                => 'Taarifa za Usakinishaji wa OSPOS',
+    'payment_options_order'                     => 'Mpangilio wa Chaguo za Malipo',
+    'payment_reference_code_length_limits'      => 'Nambari ya Kumbukumbu ya Malipo<br>Mipaka ya Urefu',
+    'payment_reference_code_length_max_label'   => 'Kiwango cha juu',
+    'payment_reference_code_length_min_label'   => 'Kiwango cha chini',
+    'perm_risk'                                 => 'Ruhusa zisizo sahihi zinaacha programu hii kwenye hatari.',
+    'phone'                                     => 'Namba ya simu ya Kampuni',
+    'phone_required'                            => 'Namba ya simu ya Kampuni ni kiashiria kinachohitajika.',
+    'print_bottom_margin'                       => 'Pembe ya Chini',
+    'print_bottom_margin_number'                => 'Pembe ya Chini lazima iwe nambari.',
+    'print_bottom_margin_required'              => 'Pembe ya Chini ni kiashiria kinachohitajika.',
+    'print_delay_autoreturn'                    => 'Muda wa Kurudi Moja kwa Moja kwenye Mauzo',
+    'print_delay_autoreturn_number'             => 'Muda wa Kurudi Moja kwa Moja kwenye Mauzo ni kiashiria kinachohitajika.',
+    'print_delay_autoreturn_required'           => 'Muda wa Kurudi Moja kwa Moja kwenye Mauzo lazima uwe nambari.',
+    'print_footer'                              => 'Chapisha Kijachini cha Kivinjari',
+    'print_header'                              => 'Chapisha Kijuu cha Kivinjari',
+    'print_left_margin'                         => 'Pembe ya Kushoto',
+    'print_left_margin_number'                  => 'Pembe ya Kushoto lazima iwe nambari.',
+    'print_left_margin_required'                => 'Pembe ya Kushoto ni kiashiria kinachohitajika.',
+    'print_receipt_check_behaviour'             => 'Kisanduku cha Risiti ya Kuchapisha',
+    'print_receipt_check_behaviour_always'      => 'Daima imechaguliwa',
+    'print_receipt_check_behaviour_last'        => 'Kumbuka chaguo la mwisho',
+    'print_receipt_check_behaviour_never'       => 'Daima haijachaguliwa',
+    'print_right_margin'                        => 'Pembe ya Kulia',
+    'print_right_margin_number'                 => 'Pembe ya Kulia lazima iwe nambari.',
+    'print_right_margin_required'               => 'Pembe ya Kulia ni kiashiria kinachohitajika.',
+    'print_silently'                            => 'Onyesha Dirisha la Kuchapisha',
+    'print_top_margin'                          => 'Pembe ya Juu',
+    'print_top_margin_number'                   => 'Pembe ya Juu lazima iwe nambari.',
+    'print_top_margin_required'                 => 'Pembe ya Juu ni kiashiria kinachohitajika.',
+    'quantity_decimals'                         => 'Desimali za Kiasi',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Maoni ya Chaguo-msingi la Nukuu',
+    'receipt'                                   => 'Risiti',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Mpangilio wa Uchapishaji wa Risiti',
+    'receipt_default'                           => 'Chaguo-msingi',
+    'receipt_font_size'                         => 'Ukubwa wa Herufi',
+    'receipt_font_size_number'                  => 'Ukubwa wa Herufi lazima uwe nambari.',
+    'receipt_font_size_required'                => 'Ukubwa wa Herufi ni kiashiria kinachohitajika.',
+    'receipt_info'                              => 'Taarifa za Mpangilio wa Risiti',
+    'receipt_printer'                           => 'Kichapishi cha Tiketi',
+    'receipt_short'                             => 'Fupi',
+    'receipt_show_company_name'                 => 'Onyesha Jina la Kampuni',
+    'receipt_show_description'                  => 'Onyesha Maelezo',
+    'receipt_show_serialnumber'                 => 'Onyesha Serial Number',
+    'receipt_show_tax_ind'                      => 'Onyesha Kiashiria cha Kodi',
+    'receipt_show_taxes'                        => 'Onyesha Kodi',
+    'receipt_show_total_discount'               => 'Onyesha Jumla ya Punguzo',
+    'receipt_template'                          => 'Kiolezo cha Risiti',
+    'receiving_calculate_average_price'         => 'Hesabu Bei ya wastani (Manunuzi)',
+    'recv_invoice_format'                       => 'Muundo wa Ankara ya Manunuzi',
+    'register_mode_default'                     => 'Hali ya Usajili kwa Chaguo-msingi',
+    'report_an_issue'                           => 'Ripoti tatizo',
+    'return_policy_required'                    => 'Return Policy ni kiashiria kinachohitajika.',
+    'reward'                                    => 'Zawadi',
+    'reward_configuration'                      => 'Mpangilio wa Zawadi',
+    'right'                                     => 'Kulia',
+    'sales_invoice_format'                      => 'Muundo wa Ankara ya Mauzo',
+    'sales_quote_format'                        => 'Muundo wa Nukuu ya Mauzo',
+    'mailpath_invalid'                          => 'Njia ya sendmail si sahihi. Herufi, tarakimu, mistari mifupi, mistari ya chini, mikwaju, mikwaju ya kinyume, koloni, nafasi na vitone tu ndivyo vinaruhusiwa.',
+    'saved_successfully'                        => 'Mpangilio umehifadhiwa kwa mafanikio.',
+    'saved_unsuccessfully'                      => 'Mpangilio umeshindwa kuhifadhiwa.',
+    'security_issue'                            => 'Onyo la Udhaifu wa Usalama',
+    'server_notice'                             => 'Tafadhali tumia taarifa zilizo hapa chini kuripoti tatizo.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Onyesha ikoni ya ofisi',
+    'statistics'                                => 'Tuma Takwimu',
+    'statistics_tooltip'                        => 'Tuma takwimu kwa madhumuni ya maendeleo na uboreshaji wa vipengele.',
+    'stock_location'                            => 'Stoo',
+    'stock_location_duplicate'                  => 'Stoo lazima iwe ya kipekee.',
+    'stock_location_invalid_chars'              => "Stoo haiwezi kuwa na '_'.",
+    'stock_location_required'                   => 'Stoo ni kiashiria kinachohitajika.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Safu wima 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Mpangilio wa Mapendekezo ya Utafutaji',
+    'suggestions_second_column'                 => 'Safu wima 2',
+    'suggestions_third_column'                  => 'Safu wima 3',
+    'system_conf'                               => 'Usanidi & Mpangilio',
+    'system_info'                               => 'Taarifa za Mfumo',
+    'table'                                     => 'Jedwali',
+    'table_configuration'                       => 'Jedwali la Mpangilio',
+    'takings_printer'                           => 'Kichapishi cha Risiti',
+    'tax'                                       => 'Kodi',
+    'tax_category'                              => 'Aina ya Kodi',
+    'tax_category_duplicate'                    => 'Aina ya kodi uliyoingiza tayari ipo.',
+    'tax_category_invalid_chars'                => 'Aina ya kodi uliyoingiza si sahihi.',
+    'tax_category_required'                     => 'Aina ya kodi ni lazima.',
+    'tax_category_used'                         => 'Aina ya kodi haiwezi kufutwa kwa sababu inatumika.',
+    'tax_configuration'                         => 'Mpangilio wa Kodi',
+    'tax_decimals'                              => 'Desimali za Kodi',
+    'tax_id'                                    => 'Nambari ya Kodi',
+    'tax_included'                              => 'Kodi Imejumuishwa',
+    'theme'                                     => 'Mandhari',
+    'theme_preview'                             => 'Onyesha Mandhari:',
+    'thousands_separator'                       => 'Kitenganishi cha Maelfu',
+    'timezone'                                  => 'Saa za Eneo',
+    'timezone_error'                            => 'Saa za OSPOS ni tofauti na Saa za Eneo lako.',
+    'top'                                       => 'Juu',
+    'use_destination_based_tax'                 => 'Tumia Kodi ya Kulingana na Eneo',
+    'user_timezone'                             => 'Saa za Eneo lako:',
+    'website'                                   => 'Tovuti',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Msaada wa Agizo la Kazi',
+    'work_order_format'                         => 'Muundo wa Agizo la Kazi',
+];
diff --git a/app/Language/sw-TZ/Employees.php b/app/Language/sw-TZ/Employees.php
index 2ccb46fcd..02bf38e2a 100644
--- a/app/Language/sw-TZ/Employees.php
+++ b/app/Language/sw-TZ/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Taarifa za Msingi",
-    "cannot_be_deleted"            => "Haiwezekani kufuta M/Wafanyakazi aliyechaguliwa, mmoja au zaidi ameshashughulikia mauzo au unajaribu kufuta akaunti yako.",
-    "change_employee"              => "",
-    "change_password"              => "Badilisha Nenosiri",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Una uhakika unataka kufuta mfanyakazi aliyechaguliwa?",
-    "confirm_restore"              => "Una uhakika unataka kurejesha Mfanyakazi/Wafanyakazi aliyechaguliwa?",
-    "current_password"             => "Nenosiri la Sasa",
-    "current_password_invalid"     => "Nenosiri la sasa si sahihi.",
-    "employee"                     => "Mfanyakazi",
-    "error_adding_updating"        => "Kuongeza au kusasisha mfanyakazi kumeshindikana.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Huwezi kufuta mtumiaji wa admin wa majaribio.",
-    "error_updating_demo_admin"    => "Huwezi kubadilisha mtumiaji wa admin wa majaribio.",
-    "language"                     => "Lugha",
-    "login_info"                   => "Ingia",
-    "manager"                      => "",
-    "new"                          => "Mfanyakazi Mpya",
-    "none_selected"                => "Hujachagua Mfanyakazi/Wafanyakazi yeyote wa kufuta.",
-    "one_or_multiple"              => "Mfanyakazi/Wafanyakazi",
-    "password"                     => "Nenosiri",
-    "password_minlength"           => "Nenosiri lazima liwe na angalau herufi 8.",
-    "password_must_match"          => "Manenosiri hayafanani.",
-    "password_not_must_match"      => "Nenosiri la sasa na jipya lazima liwe tofauti.",
-    "password_required"            => "Nenosiri linahitajika.",
-    "permission_desc"              => "Chagua visanduku hapa chini kutoa ruhusa kwa moduli.",
-    "permission_info"              => "Ruhusa",
-    "repeat_password"              => "Rudia Nenosiri",
-    "subpermission_required"       => "Ongeza angalau ruhusa moja kwa kila moduli.",
-    "successful_adding"            => "Umefanikiwa kuongeza mfanyakazi.",
-    "successful_change_password"   => "Umefanikiwa kubadili nenosiri.",
-    "successful_deleted"           => "Umefanikiwa kufuta",
-    "successful_updating"          => "Umefanikiwa kusasisha mfanyakazi",
-    "system_language"              => "Lugha ya Mfumo",
-    "unsuccessful_change_password" => "Imeshindikana kubadili Nenosiri.",
-    "update"                       => "Sasisha Mfanyakazi",
-    "username"                     => "Jina la Mtumiaji",
-    "username_duplicate"           => "Jina la mtumiaji tayari linatumika. Tafadhali chagua lingine.",
-    "username_minlength"           => "Jina la mtumiaji lazima liwe na angalau herufi 5.",
-    "username_required"            => "Jina la mtumiaji ni lazima.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Taarifa za Msingi',
+    'cannot_be_deleted'                      => 'Haiwezekani kufuta M/Wafanyakazi aliyechaguliwa, mmoja au zaidi ameshashughulikia mauzo au unajaribu kufuta akaunti yako.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Badilisha Nenosiri',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Una uhakika unataka kufuta mfanyakazi aliyechaguliwa?',
+    'confirm_restore'                        => 'Una uhakika unataka kurejesha Mfanyakazi/Wafanyakazi aliyechaguliwa?',
+    'current_password'                       => 'Nenosiri la Sasa',
+    'current_password_invalid'               => 'Nenosiri la sasa si sahihi.',
+    'employee'                               => 'Mfanyakazi',
+    'error_adding_updating'                  => 'Kuongeza au kusasisha mfanyakazi kumeshindikana.',
+    'error_cannot_remove_own_minimum_grant'  => 'Huwezi kuondoa ruhusa zako za chini kabisa za ufikiaji wa moduli.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Huwezi kufuta mtumiaji wa admin wa majaribio.',
+    'error_grant_change_disallowed'          => 'Mabadiliko ya ruhusa yamezimwa katika demo hii.',
+    'error_password_change_disallowed'       => 'Mabadiliko ya neno la siri yamezimwa katika demo hii.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Huwezi kubadilisha mtumiaji wa admin wa majaribio.',
+    'language'                               => 'Lugha',
+    'login_info'                             => 'Ingia',
+    'manager'                                => '',
+    'new'                                    => 'Mfanyakazi Mpya',
+    'none_selected'                          => 'Hujachagua Mfanyakazi/Wafanyakazi yeyote wa kufuta.',
+    'one_or_multiple'                        => 'Mfanyakazi/Wafanyakazi',
+    'password'                               => 'Nenosiri',
+    'password_minlength'                     => 'Nenosiri lazima liwe na angalau herufi 8.',
+    'password_must_match'                    => 'Manenosiri hayafanani.',
+    'password_not_must_match'                => 'Nenosiri la sasa na jipya lazima liwe tofauti.',
+    'password_required'                      => 'Nenosiri linahitajika.',
+    'permission_desc'                        => 'Chagua visanduku hapa chini kutoa ruhusa kwa moduli.',
+    'permission_info'                        => 'Ruhusa',
+    'repeat_password'                        => 'Rudia Nenosiri',
+    'subpermission_required'                 => 'Ongeza angalau ruhusa moja kwa kila moduli.',
+    'successful_adding'                      => 'Umefanikiwa kuongeza mfanyakazi.',
+    'successful_change_password'             => 'Umefanikiwa kubadili nenosiri.',
+    'successful_deleted'                     => 'Umefanikiwa kufuta',
+    'successful_updating'                    => 'Umefanikiwa kusasisha mfanyakazi',
+    'system_language'                        => 'Lugha ya Mfumo',
+    'unsuccessful_change_password'           => 'Imeshindikana kubadili Nenosiri.',
+    'update'                                 => 'Sasisha Mfanyakazi',
+    'username'                               => 'Jina la Mtumiaji',
+    'username_duplicate'                     => 'Jina la mtumiaji tayari linatumika. Tafadhali chagua lingine.',
+    'username_minlength'                     => 'Jina la mtumiaji lazima liwe na angalau herufi 5.',
+    'username_required'                      => 'Jina la mtumiaji ni lazima.',
 ];
diff --git a/app/Language/sw-TZ/Error.php b/app/Language/sw-TZ/Error.php
index 46b3d5d83..40e039a9b 100644
--- a/app/Language/sw-TZ/Error.php
+++ b/app/Language/sw-TZ/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Huna ruhusa ya kufikia moduli iliyoitwa",
-    "unknown"              => "Hitilafu isiyotarajiwa",
-];
\ No newline at end of file
+    'no_permission_module'           => 'Huna ruhusa ya kufikia moduli iliyoitwa',
+    'unable_to_create_env_file'      => 'Imeshindwa kuunda {filePath} kutayarisha throttle.key',
+    'unable_to_lock_file'            => 'Imeshindwa kufunga {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Imeshindwa kufungua {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Imeshindwa kuhifadhi throttle.key katika {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Imeshindwa kusoma {filePath} kutayarisha throttle.key',
+    'unknown'                        => 'Hitilafu isiyotarajiwa',
+];
diff --git a/app/Language/sw-TZ/Items.php b/app/Language/sw-TZ/Items.php
index ffda9e746..03ab94ca9 100644
--- a/app/Language/sw-TZ/Items.php
+++ b/app/Language/sw-TZ/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Hisa ya kuongeza au kutoa.",
-    "allow_alt_description"              => "Ruhusu Maelezo Mbadala",
-    "amount_entry"                       => "Uingizaji wa Kiasi",
-    "bulk_edit"                          => "Hariri kwa Wingi",
-    "buy_price_required"                 => "Bei ya Ununuzi ni kiashiria kinachohitajika.",
-    "cannot_be_deleted"                  => "Haiwezekani kufuta Bidhaa ulizochagua, moja au zaidi tayari ina mauzo.",
-    "cannot_find_item"                   => "Bidhaa haijapatikana.",
-    "categories"                         => "",
-    "category"                           => "Kategoria",
-    "category_new"                       => "",
-    "category_required"                  => "Kategoria ni kiashiria kinachohitajika.",
-    "change_all_to_allow_alt_desc"       => "Ruhusu Maelezo Mbadala kwa zote.",
-    "change_all_to_not_allow_allow_desc" => "Usiruhusu Maelezo Mbadala kwa zote.",
-    "change_all_to_serialized"           => "Badilisha zote kuwa na Serialized",
-    "change_all_to_unserialized"         => "Badilisha zote kuwa bila Unserialized",
-    "change_image"                       => "Badilisha Picha",
-    "confirm_bulk_edit"                  => "Una uhakika unataka kuhariri Bidhaa ulizochagua?",
-    "confirm_bulk_edit_wipe_taxes"       => "Taarifa zote za Kodi ya Bidhaa zitabadilishwa.",
-    "confirm_delete"                     => "Una uhakika unataka kufuta Bidhaa ulizochagua?",
-    "confirm_restore"                    => "Una uhakika unataka kurejesha Bidhaa ulizochagua?",
-    "cost_price"                         => "Bei ya Jumla",
-    "cost_price_number"                  => "Bei ya Jumla lazima iwe namba.",
-    "cost_price_required"                => "Bei ya Jumla ni kiashiria kinachohitajika.",
-    "count"                              => "Sasisha Hisa",
-    "csv_import_failed"                  => "Uingizaji wa CSV umeshindikana",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Faili ya CSV iliyopakiwa haina data au imepangwa vibaya.",
-    "csv_import_partially_failed"        => "Kumekuwa na makosa {0} ya uingizaji wa bidhaa kwenye mstari: {1}. Hakuna safu zilizoingizwa.",
-    "csv_import_success"                 => "Uingizaji wa Bidhaa kutoka CSV umefanikiwa.",
-    "current_quantity"                   => "Kiasi Kilichopo",
-    "default_pack_name"                  => "Kila",
-    "description"                        => "Maelezo",
-    "details_count"                      => "Maelezo ya Hesabu ya Hisa",
-    "do_nothing"                         => "Usifanye chochote",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Hariri sehemu unazotaka kwa Bidhaa ulizochagua.",
-    "edit_multiple_items"                => "Hariri Bidhaa Nyingi",
-    "empty_upc_items"                    => "Bidhaa zisizo na Msimbo wa Mstari",
-    "error_adding_updating"              => "Hitilafu katika kuongeza/kusasisha Bidhaa",
-    "error_updating_multiple"            => "Hitilafu katika kusasisha Bidhaa",
-    "generate_barcodes"                  => "Tengeneza Misimbomstari",
-    "hsn_code"                           => "Harmonized System Nomenclature",
-    "image"                              => "Picha",
-    "import_items_csv"                   => "Ingiza Bidhaa kutoka CSV",
-    "info_provided_by"                   => "Taarifa imetolewa na",
-    "inventory"                          => "Hisa",
-    "inventory_CSV_import_quantity"      => "Kiasi kilichoingizwa kutoka CSV",
-    "inventory_comments"                 => "Maoni",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Tarehe",
-    "inventory_employee"                 => "Mfanyakazi",
-    "inventory_in_out_quantity"          => "Kiasi Ndani/Nje",
-    "inventory_remarks"                  => "Maelezo",
-    "is_deleted"                         => "Imefutwa",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Bidhaa ina Serial Number",
-    "item"                               => "Bidhaa",
-    "item_id"                            => "",
-    "item_number"                        => "Msimbo wa Mstari",
-    "item_number_duplicate"              => "namba ya Bidhaa tayari ipo kwenye Kanzidata.",
-    "kit"                                => "Kifurushi",
-    "location"                           => "Mahali",
-    "low_inventory_items"                => "Bidhaa Zilizokwisha Stoo",
-    "low_sell_item"                      => "Bidhaa yenye mauzo kidogo",
-    "manually_editing_of_quantity"       => "Hariri Kiasi kwa kuandika",
-    "markup"                             => "",
-    "name"                               => "Jina la Bidhaa",
-    "name_required"                      => "Jina la Bidhaa ni kiashiria kinachohitajika.",
-    "new"                                => "Bidhaa Mpya",
-    "no_description_items"               => "Bidhaa zisizo na Maelezo",
-    "no_items_to_display"                => "Hakuna Bidhaa za kuonyesha.",
-    "none"                               => "Hakuna",
-    "none_selected"                      => "Hujachagua Bidhaa yoyote kuhariri",
-    "nonstock"                           => "Isiyo na Akiba",
-    "number_information"                 => "Namba ya Bidhaa",
-    "number_required"                    => "Msimbo wa Mstari ni kiashiria kinachohitajika.",
-    "one_or_multiple"                    => "bidhaa",
-    "pack_name"                          => "Jina la Pakiti",
-    "qty_per_pack"                       => "Kiasi kwa kila pakiti",
-    "quantity"                           => "Kiasi",
-    "quantity_number"                    => "Kiasi lazima kiwe namba.",
-    "quantity_required"                  => "Kiasi ni kiashiria kinachohitajika.",
-    "receiving_quantity"                 => "Kiasi Kinachopokelewa",
-    "remove_image"                       => "Ondoa Picha",
-    "reorder_level"                      => "Kiwango cha Kuagiza Tena",
-    "reorder_level_number"               => "Kiwango cha Kuagiza Tena lazima kiwe namba.",
-    "reorder_level_required"             => "Kiwango cha Kuagiza Tena ni kiashiria kinachohitajika.",
-    "retrive_item_info"                  => "Pata Taarifa ya Bidhaa",
-    "sales_tax_1"                        => "Kodi ya Mauzo",
-    "sales_tax_2"                        => "Kodi ya Mauzo 2",
-    "search_attributes"                  => "Tafuta Sifa",
-    "select_image"                       => "Chagua Picha",
-    "serialized_items"                   => "Bidhaa katika Mfululizo",
-    "standard"                           => "Kawaida",
-    "stock"                              => "Hisa",
-    "stock_location"                     => "Stoo",
-    "stock_type"                         => "Aina ya Hisa",
-    "successful_adding"                  => "Umefanikiwa kuongeza Bidhaa",
-    "successful_bulk_edit"               => "Umefanikiwa kusasisha Bidhaa ulizochagua",
-    "successful_deleted"                 => "Umefanikiwa kufuta",
-    "successful_updating"                => "Umefanikiwa kusasisha Bidhaa",
-    "supplier"                           => "Msambazaji",
-    "tax_1"                              => "Kodi 1",
-    "tax_2"                              => "Kodi 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Aina ya Kodi",
-    "tax_percent"                        => "Asilimia ya Kodi",
-    "tax_percent_number"                 => "Asilimia ya Kodi lazima iwe namba",
-    "tax_percent_required"               => "Asilimia ya Kodi ni kiashiria kinachohitajika.",
-    "tax_percents"                       => "Asilimia za Kodi",
-    "temp"                               => "isiyodumu",
-    "type"                               => "Aina ya Bidhaa",
-    "unit_price"                         => "Bei ya Rejareja",
-    "unit_price_number"                  => "Bei ya Rejareja lazima iwe namba.",
-    "unit_price_required"                => "Bei ya Rejareja ni kiashiria kinachohitajika.",
-    "upc_database"                       => "Kanzidata ya Misimbomstari",
-    "update"                             => "Sasisha Bidhaa",
-    "use_inventory_menu"                 => "Tumia Menyu ya Hisa",
+    'add_minus'                          => 'Hisa ya kuongeza au kutoa.',
+    'allow_alt_description'              => 'Ruhusu Maelezo Mbadala',
+    'amount_entry'                       => 'Uingizaji wa Kiasi',
+    'bulk_edit'                          => 'Hariri kwa Wingi',
+    'buy_price_required'                 => 'Bei ya Ununuzi ni kiashiria kinachohitajika.',
+    'cannot_be_deleted'                  => 'Haiwezekani kufuta Bidhaa ulizochagua, moja au zaidi tayari ina mauzo.',
+    'cannot_find_item'                   => 'Bidhaa haijapatikana.',
+    'categories'                         => '',
+    'category'                           => 'Kategoria',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategoria ni kiashiria kinachohitajika.',
+    'change_all_to_allow_alt_desc'       => 'Ruhusu Maelezo Mbadala kwa zote.',
+    'change_all_to_not_allow_allow_desc' => 'Usiruhusu Maelezo Mbadala kwa zote.',
+    'change_all_to_serialized'           => 'Badilisha zote kuwa na Serialized',
+    'change_all_to_unserialized'         => 'Badilisha zote kuwa bila Unserialized',
+    'change_image'                       => 'Badilisha Picha',
+    'confirm_bulk_edit'                  => 'Una uhakika unataka kuhariri Bidhaa ulizochagua?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Taarifa zote za Kodi ya Bidhaa zitabadilishwa.',
+    'confirm_delete'                     => 'Una uhakika unataka kufuta Bidhaa ulizochagua?',
+    'confirm_restore'                    => 'Una uhakika unataka kurejesha Bidhaa ulizochagua?',
+    'cost_price'                         => 'Bei ya Jumla',
+    'cost_price_number'                  => 'Bei ya Jumla lazima iwe namba.',
+    'cost_price_required'                => 'Bei ya Jumla ni kiashiria kinachohitajika.',
+    'count'                              => 'Sasisha Hisa',
+    'csv_import_failed'                  => 'Uingizaji wa CSV umeshindikana',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Faili ya CSV iliyopakiwa haina data au imepangwa vibaya.',
+    'csv_import_partially_failed'        => 'Kumekuwa na makosa {0} ya uingizaji wa bidhaa kwenye mstari: {1}. Hakuna safu zilizoingizwa.',
+    'csv_import_success'                 => 'Uingizaji wa Bidhaa kutoka CSV umefanikiwa.',
+    'current_quantity'                   => 'Kiasi Kilichopo',
+    'default_pack_name'                  => 'Kila',
+    'description'                        => 'Maelezo',
+    'details_count'                      => 'Maelezo ya Hesabu ya Hisa',
+    'do_nothing'                         => 'Usifanye chochote',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Hariri sehemu unazotaka kwa Bidhaa ulizochagua.',
+    'edit_multiple_items'                => 'Hariri Bidhaa Nyingi',
+    'empty_upc_items'                    => 'Bidhaa zisizo na Msimbo wa Mstari',
+    'error_adding_updating'              => 'Hitilafu katika kuongeza/kusasisha Bidhaa',
+    'error_updating_multiple'            => 'Hitilafu katika kusasisha Bidhaa',
+    'generate_barcodes'                  => 'Tengeneza Misimbomstari',
+    'hsn_code'                           => 'Harmonized System Nomenclature',
+    'image'                              => 'Picha',
+    'import_items_csv'                   => 'Ingiza Bidhaa kutoka CSV',
+    'info_provided_by'                   => 'Taarifa imetolewa na',
+    'inventory'                          => 'Hisa',
+    'inventory_CSV_import_quantity'      => 'Kiasi kilichoingizwa kutoka CSV',
+    'inventory_comments'                 => 'Maoni',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Tarehe',
+    'inventory_employee'                 => 'Mfanyakazi',
+    'inventory_in_out_quantity'          => 'Kiasi Ndani/Nje',
+    'inventory_remarks'                  => 'Maelezo',
+    'is_deleted'                         => 'Imefutwa',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Bidhaa ina Serial Number',
+    'item'                               => 'Bidhaa',
+    'item_id'                            => '',
+    'item_number'                        => 'Msimbo wa Mstari',
+    'item_number_duplicate'              => 'namba ya Bidhaa tayari ipo kwenye Kanzidata.',
+    'item_number_invalid'                => 'Namba ya Bidhaa ina herufi ambazo hairuhusiwi.',
+    'kit'                                => 'Kifurushi',
+    'location'                           => 'Mahali',
+    'low_inventory_items'                => 'Bidhaa Zilizokwisha Stoo',
+    'low_sell_item'                      => 'Bidhaa yenye mauzo kidogo',
+    'manually_editing_of_quantity'       => 'Hariri Kiasi kwa kuandika',
+    'markup'                             => '',
+    'name'                               => 'Jina la Bidhaa',
+    'name_required'                      => 'Jina la Bidhaa ni kiashiria kinachohitajika.',
+    'new'                                => 'Bidhaa Mpya',
+    'no_description_items'               => 'Bidhaa zisizo na Maelezo',
+    'no_items_to_display'                => 'Hakuna Bidhaa za kuonyesha.',
+    'none'                               => 'Hakuna',
+    'none_selected'                      => 'Hujachagua Bidhaa yoyote kuhariri',
+    'nonstock'                           => 'Isiyo na Akiba',
+    'number_information'                 => 'Namba ya Bidhaa',
+    'number_required'                    => 'Msimbo wa Mstari ni kiashiria kinachohitajika.',
+    'one_or_multiple'                    => 'bidhaa',
+    'pack_name'                          => 'Jina la Pakiti',
+    'qty_per_pack'                       => 'Kiasi kwa kila pakiti',
+    'quantity'                           => 'Kiasi',
+    'quantity_number'                    => 'Kiasi lazima kiwe namba.',
+    'quantity_required'                  => 'Kiasi ni kiashiria kinachohitajika.',
+    'receiving_quantity'                 => 'Kiasi Kinachopokelewa',
+    'remove_image'                       => 'Ondoa Picha',
+    'reorder_level'                      => 'Kiwango cha Kuagiza Tena',
+    'reorder_level_number'               => 'Kiwango cha Kuagiza Tena lazima kiwe namba.',
+    'reorder_level_required'             => 'Kiwango cha Kuagiza Tena ni kiashiria kinachohitajika.',
+    'retrive_item_info'                  => 'Pata Taarifa ya Bidhaa',
+    'sales_tax_1'                        => 'Kodi ya Mauzo',
+    'sales_tax_2'                        => 'Kodi ya Mauzo 2',
+    'search_attributes'                  => 'Tafuta Sifa',
+    'select_image'                       => 'Chagua Picha',
+    'serialized_items'                   => 'Bidhaa katika Mfululizo',
+    'standard'                           => 'Kawaida',
+    'stock'                              => 'Hisa',
+    'stock_location'                     => 'Stoo',
+    'stock_type'                         => 'Aina ya Hisa',
+    'successful_adding'                  => 'Umefanikiwa kuongeza Bidhaa',
+    'successful_bulk_edit'               => 'Umefanikiwa kusasisha Bidhaa ulizochagua',
+    'successful_deleted'                 => 'Umefanikiwa kufuta',
+    'successful_updating'                => 'Umefanikiwa kusasisha Bidhaa',
+    'supplier'                           => 'Msambazaji',
+    'tax_1'                              => 'Kodi 1',
+    'tax_2'                              => 'Kodi 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Aina ya Kodi',
+    'tax_name_invalid'                   => 'Jina la kodi lina herufi zisizoruhusiwa.',
+    'tax_percent'                        => 'Asilimia ya Kodi',
+    'tax_percent_number'                 => 'Asilimia ya Kodi lazima iwe namba',
+    'tax_percent_required'               => 'Asilimia ya Kodi ni kiashiria kinachohitajika.',
+    'tax_percents'                       => 'Asilimia za Kodi',
+    'temp'                               => 'isiyodumu',
+    'type'                               => 'Aina ya Bidhaa',
+    'unit_price'                         => 'Bei ya Rejareja',
+    'unit_price_number'                  => 'Bei ya Rejareja lazima iwe namba.',
+    'unit_price_required'                => 'Bei ya Rejareja ni kiashiria kinachohitajika.',
+    'upc_database'                       => 'Kanzidata ya Misimbomstari',
+    'update'                             => 'Sasisha Bidhaa',
+    'use_inventory_menu'                 => 'Tumia Menyu ya Hisa',
 ];
\ No newline at end of file
diff --git a/app/Language/sw-TZ/Login.php b/app/Language/sw-TZ/Login.php
index 4ec8895af..0e811d89a 100644
--- a/app/Language/sw-TZ/Login.php
+++ b/app/Language/sw-TZ/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Mimi si roboti.",
-    "go"                            => "Nenda",
-    "invalid_gcaptcha"              => "Tafadhali thibitisha kuwa wewe si roboti.",
-    "invalid_installation"          => "Usakinishaji si sahihi, angalia faili yako ya php.ini.",
-    "invalid_username_and_password" => "Jina la mtumiaji na/au nenosiri si sahihi.",
-    "login"                         => "Ingia",
-    "logout"                        => "Toka",
-    "migration_needed"              => "Uhamishaji wa kanzidata hadi {0} utaanza baada ya kuingia.",
-    "password"                      => "Nenosiri",
-    "required_username"             => "Jina la mtumiaji ni lazima.",
-    "username"                      => "Jina la Mtumiaji",
-    "welcome"                       => "Karibu kwenye {0}!",
-];
\ No newline at end of file
+    "gcaptcha"                            => "Mimi si roboti.",
+    "go"                                  => "Nenda",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Tafadhali thibitisha kuwa wewe si roboti.",
+    "invalid_installation"                => "Usakinishaji si sahihi, angalia faili yako ya php.ini.",
+    "invalid_username_and_password"       => "Jina la mtumiaji na/au nenosiri si sahihi.",
+    "login"                               => "Ingia",
+    "logout"                              => "Toka",
+    "migrating_database"                  => "Inahama hifadhidata",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Hifadhidata imehama!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "Uhamishaji wa kanzidata hadi {0} utaanza baada ya kuingia.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Nenosiri",
+    "required_username"                   => "Jina la mtumiaji ni lazima.",
+    'too_many_attempts'                   => 'Majaribio mengi mno. Tafadhali subiri kidogo kisha ujaribu tena.',
+    "username"                            => "Jina la Mtumiaji",
+    "welcome"                             => "Karibu kwenye {0}!"
+];
diff --git a/app/Language/sw-TZ/Sales.php b/app/Language/sw-TZ/Sales.php
index 2dc789bda..db4dbd115 100644
--- a/app/Language/sw-TZ/Sales.php
+++ b/app/Language/sw-TZ/Sales.php
@@ -1,227 +1,240 @@
 <?php
 
 return [
-    "customers_available_points"       => "Pointi Zinazopatikana",
-    "rewards_package"                  => "Zawadi",
-    "rewards_remaining_balance"        => "Thamani ya pointi za zawadi zilizobaki ni ",
-    "account_number"                   => "Nambari ya Akaunti",
-    "add_payment"                      => "Ongeza Malipo",
-    "amount_due"                       => "Kiasi Kinachodaiwa",
-    "amount_tendered"                  => "Kiasi Kilicholipwa",
-    "authorized_signature"             => "Sahihi Iliyothibitishwa",
-    "cancel_sale"                      => "Ghairi",
-    "cash"                             => "Fedha Taslimu",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Marekebisho ya Fedha",
-    "cash_deposit"                     => "Amana ya Fedha",
-    "cash_filter"                      => "Fedha Taslimu",
-    "change_due"                       => "Chenji Inayodaiwa",
-    "change_price"                     => "Badilisha Bei ya Uuzaji",
-    "check"                            => "Hundi",
-    "check_balance"                    => "Salio la Hundi",
-    "check_filter"                     => "Hundi",
-    "close"                            => "",
-    "comment"                          => "Maoni",
-    "comments"                         => "Maoni",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Kamilisha",
-    "confirm_cancel_sale"              => "Una uhakika unataka kufuta mauzo haya? Bidhaa zote zitaondolewa.",
-    "confirm_delete"                   => "Una uhakika unataka kufuta mauzo uliyoyachagua?",
-    "confirm_restore"                  => "Una uhakika unataka kurejesha mauzo uliyoyachagua?",
-    "credit"                           => "Kadi ya Mkopo",
-    "credit_deposit"                   => "Amana ya Mkopo",
-    "credit_filter"                    => "Kadi ya Mkopo",
-    "current_table"                    => "",
-    "customer"                         => "Mteja",
-    "customer_address"                 => "Anwani",
-    "customer_discount"                => "Punguzo",
-    "customer_email"                   => "Barua Pepe",
-    "customer_location"                => "Mahali",
-    "customer_mailchimp_status"        => "Hali ya MailChimp",
-    "customer_optional"                => "(Inahitajika kwa Malipo ya Madeni)",
-    "customer_required"                => "(Inahitajika)",
-    "customer_total"                   => "Jumla",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Tarehe ya Mauzo",
-    "date_range"                       => "Wigo wa Tarehe",
-    "date_required"                    => "Tafadhali ingiza tarehe sahihi.",
-    "date_type"                        => "Tarehe ni kiashiria kinachohitajika.",
-    "debit"                            => "Kadi ya Debit",
-    "debit_filter"                     => "",
-    "delete"                           => "Ruhusu Kufuta",
-    "delete_confirmation"              => "Una uhakika unataka kufuta mauzo haya? Hatua hii haiwezi kubatilishwa.",
-    "delete_entire_sale"               => "Futa Mauzo Yote",
-    "delete_successful"                => "Mauzo yamefutwa kwa mafanikio.",
-    "delete_unsuccessful"              => "Kufuta mauzo kimeshindikana.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Ondoa", //Tupa
-    "discard_quote"                    => "",
-    "discount"                         => "Punguzo",
-    "discount_included"                => "% Punguzo",
-    "discount_short"                   => "%",
-    "due"                              => "Deni",
-    "due_filter"                       => "",
-    "edit"                             => "Hariri",
-    "edit_item"                        => "Hariri Bidhaa",
-    "edit_sale"                        => "Hariri Mauzo",
-    "email_receipt"                    => "Tuma Risiti kwa Barua Pepe",
-    "employee"                         => "Mfanyakazi",
-    "entry"                            => "Ingizo",
-    "error_editing_item"               => "Hitilafu katika kuhariri bidhaa",
-    "find_or_scan_item"                => "Tafuta au Changanua Bidhaa",
-    "find_or_scan_item_or_receipt"     => "Tafuta au Changanua Bidhaa au Risiti",
-    "giftcard"                         => "Kadi ya Zawadi",
-    "giftcard_balance"                 => "Salio la Kadi ya Zawadi",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Namba ya Kadi ya Zawadi",
-    "group_by_category"                => "Panga kwa Kategoria",
-    "group_by_type"                    => "Panga kwa Aina",
-    "hsn"                              => "HSN",
-    "id"                               => "Namba ya Mauzo",
-    "include_prices"                   => "Jumuisha Bei?",
-    "invoice"                          => "Ankara",
-    "invoice_confirm"                  => "Ankara hii itatumwa kwa",
-    "invoice_enable"                   => "Namba ya Ankara",
-    "invoice_filter"                   => "Ankara",
-    "invoice_no_email"                 => "Mteja huyu hana anwani halali ya barua pepe.",
-    "invoice_number"                   => "Namba ya Ankara",
-    "invoice_number_duplicate"         => "Namba ya Ankara {0} lazima iwe ya kipekee.",
-    "invoice_sent"                     => "Ankara imetumwa kwa",
-    "invoice_total"                    => "Jumla ya Ankara",
-    "invoice_type_custom_invoice"      => "Ankara Maalum (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Ankara ya Kodi Maalum (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Ankara (invoice.php)",
-    "invoice_type_tax_invoice"         => "Ankara ya Kodi (tax_invoice.php)",
-    "invoice_unsent"                   => "Imeshindikana kutuma ankara kwa",
-    "invoice_update"                   => "Hesabu upya",
-    "item_insufficient_of_stock"       => "Bidhaa haina hisa ya kutosha.",
-    "item_name"                        => "Jina la Bidhaa",
-    "item_number"                      => "Namba ya Bidhaa",
-    "item_out_of_stock"                => "Bidhaa haina hisa.",
-    "key_browser"                      => "Vifupisho vya Msaada",
-    "key_cancel"                       => "Ghairi Nukuu/Ankara/Mauzo ya Sasa",
-    "key_customer_search"              => "Tafuta Mteja",
-    "key_finish_quote"                 => "Kamilisha Nukuu/Ankara bila malipo",
-    "key_finish_sale"                  => "Ongeza Malipo na Kamilisha Ankara/Mauzo",
-    "key_full"                         => "Fungua kwa Skrini Nzima",
-    "key_function"                     => "Function",
-    "key_help"                         => "Vifupisho",
-    "key_help_modal"                   => "Fungua Dirisha la Vifupisho",
-    "key_in"                           => "Kuza",
-    "key_item_search"                  => "Tafuta Bidhaa",
-    "key_out"                          => "Punguza",
-    "key_payment"                      => "Ongeza Malipo",
-    "key_print"                        => "Chapisha Ukurasa wa Sasa",
-    "key_restore"                      => "Rejesha Mwonekano wa Awali/Zoom",
-    "key_search"                       => "Tafuta Jedwali la Ripoti",
-    "key_suspend"                      => "Sitisha Mauzo ya Sasa",
-    "key_suspended"                    => "Onyesha Mauzo Yaliyositishwa",
-    "key_system"                       => "Vifupisho vya Mfumo",
-    "key_tendered"                     => "Hariri Kiasi Kilicholipwa",
-    "key_title"                        => "Vifupisho vya Kibodi (Keyboard) vya Mauzo",
-    "mc"                               => "",
-    "mode"                             => "Hali ya Usajili",
-    "must_enter_numeric"               => "Kiasi Kilicholipwa lazima kiwe Namba.",
-    "must_enter_numeric_giftcard"      => "Namba ya Kadi ya Zawadi lazima iwe Namba.",
-    "new_customer"                     => "Mteja Mpya",
-    "new_item"                         => "Bidhaa Mpya",
-    "no_description"                   => "Hakuna maelezo",
-    "no_filter"                        => "Zote",
-    "no_items_in_cart"                 => "Hakuna bidhaa kwenye Kikapu cha Ununuzi.",
-    "no_sales_to_display"              => "Hakuna mauzo ya kuonyesha.",
-    "none_selected"                    => "Hujachagua mauzo yoyote ya kufuta.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "Hatua hii haijaruhusiwa.",
-    "one_or_multiple"                  => "Mauzo",
-    "payment"                          => "Aina ya Malipo",
-    "payment_amount"                   => "Kiasi",
-    "payment_not_cover_total"          => "Kiasi cha malipo lazima kiwe sawa au zaidi ya jumla kuu.",
-    "payment_type"                     => "Aina",
-    "payments"                         => "",
-    "payments_total"                   => "Jumla ya Malipo",
-    "price"                            => "Bei",
-    "print_after_sale"                 => "Chapisha baada ya Mauzo",
-    "quantity"                         => "Kiasi",
-    "quantity_less_than_reorder_level" => "Onyo: Kiasi kilichotakiwa kiko chini ya kiwango cha kuagiza tena kwa bidhaa hiyo.",
-    "quantity_less_than_zero"          => "Onyo: Kiasi kilichotakiwa hakitoshi. Unaweza kuendelea na mauzo, lakini hakiki hesabu yako.",
-    "quantity_of_items"                => "Kiasi cha bidhaa {0}",
-    "quote"                            => "Nukuu (Quote)",
-    "quote_number"                     => "Nambari ya Nukuu",
-    "quote_number_duplicate"           => "Nambari ya Nukuu lazima iwe ya kipekee.",
-    "quote_sent"                       => "Nukuu imetumwa kwa",
-    "quote_unsent"                     => "Imeshindikana kutuma nukuu kwa",
-    "receipt"                          => "Risiti ya Mauzo",
-    "receipt_no_email"                 => "Mteja huyu hana anwani halali ya barua pepe.",
-    "receipt_number"                   => "Namba ya Mauzo",
-    "receipt_sent"                     => "Risiti imetumwa kwa",
-    "receipt_unsent"                   => "Imeshindikana kutuma risiti kwa",
-    "refund"                           => "Aina ya Marejesho",
-    "register"                         => "Usajili wa Mauzo",
-    "remove_customer"                  => "Ondoa Mteja",
-    "remove_discount"                  => "Ondoa Punguzo",
-    "return"                           => "Rudisha",
-    "rewards"                          => "Pointi za Zawadi",
-    "rewards_balance"                  => "Salio la Pointi za Zawadi",
-    "sale"                             => "Mauzo",
-    "sale_by_invoice"                  => "Mauzo kwa Ankara",
-    "sale_for_customer"                => "Mteja:",
-    "sale_time"                        => "Muda",
-    "sales_tax"                        => "Kodi ya Mauzo",
-    "sales_total"                      => "",
-    "select_customer"                  => "Chagua Mteja",
-    "selected_customer"                => "Mteja Uliyemchagua",
-    "send_invoice"                     => "Tuma Ankara",
-    "send_quote"                       => "Tuma Nukuu",
-    "send_receipt"                     => "Tuma Risiti",
-    "send_work_order"                  => "Tuma Agizo la Kazi",
-    "serial"                           => "Nambari ya Seriali",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Onyesha Ankara",
-    "show_receipt"                     => "Onyesha Risiti",
-    "start_typing_customer_name"       => "Anza kuandika taarifa za mteja...",
-    "start_typing_item_name"           => "Anza kuandika jina la bidhaa au changanua msimbo wa mstari (Scan Barcode)...",
-    "stock"                            => "Hisa",
-    "stock_location"                   => "Eneo la Hisa",
-    "sub_total"                        => "Jumla Ndogo",
-    "successfully_deleted"             => "Umefanikiwa kufuta",
-    "successfully_restored"            => "Umefanikiwa kurejesha",
-    "successfully_suspended_sale"      => "Kusitisha mauzo kumewezekana.",
-    "successfully_updated"             => "Kusasisha mauzo kumewezekana.",
-    "suspend_sale"                     => "Sitisha",
-    "suspended_doc_id"                 => "Nyaraka",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Yaliyositishwa",
-    "table"                            => "Jedwali",
-    "takings"                          => "Mauzo ya Kila Siku",
-    "tax"                              => "Kodi",
-    "tax_id"                           => "Kitambulisho cha Kodi",
-    "tax_invoice"                      => "Ankara ya Kodi",
-    "tax_percent"                      => "Kodi %",
-    "taxed_ind"                        => "K",
-    "total"                            => "Jumla",
-    "total_tax_exclusive"              => "Kodi haijajumuishwa",
-    "transaction_failed"               => "Muamala wa Mauzo umeshindikana.",
-    "unable_to_add_item"               => "Imeshindikana kuongeza bidhaa kwenye Mauzo",
-    "unsuccessfully_deleted"           => "Imeshindikana kufuta Mauzo.",
-    "unsuccessfully_restored"          => "Imeshindikana kurejesha Mauzo.",
-    "unsuccessfully_suspended_sale"    => "Imeshindikana kusitisha Mauzo.",
-    "unsuccessfully_updated"           => "Kusasisha mauzo kimeshindikana.",
-    "unsuspend"                        => "Ondoa Kusitishwa",
-    // "unsuspend_and_delete"             => "Hatua (Action)",
-    "unsuspend_and_delete"             => "Hatua",
-    "update"                           => "Sasisha",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Agizo la Kazi (Work Order)",
-    "work_order_number"                => "Nambari ya Agizo la Kazi",
-    "work_order_number_duplicate"      => "Nambari ya Agizo la Kazi lazima iwe ya kipekee.",
-    "work_order_sent"                  => "Agizo la Kazi limetumwa kwa",
-    "work_order_unsent"                => "Imeshindikana kutuma Agizo la Kazi kwa",
-];
\ No newline at end of file
+    'account_number'                    => 'Nambari ya Akaunti',
+    'add_payment'                       => 'Ongeza Malipo',
+    'amount_due'                        => 'Kiasi Kinachodaiwa',
+    'amount_due_not_covered'            => 'Malipo hayafikii kiwango kinachodaiwa.',
+    'amount_tendered'                   => 'Kiasi Kilicholipwa',
+    'authorized_signature'              => 'Sahihi Iliyothibitishwa',
+    'cancel_sale'                       => 'Ghairi',
+    'cash'                              => 'Fedha Taslimu',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Marekebisho ya Fedha',
+    'cash_deposit'                      => 'Amana ya Fedha',
+    'cash_filter'                       => 'Fedha Taslimu',
+    'change_due'                        => 'Chenji Inayodaiwa',
+    'change_price'                      => 'Badilisha Bei ya Uuzaji',
+    'check'                             => 'Hundi',
+    'check_balance'                     => 'Salio la Hundi',
+    'check_filter'                      => 'Hundi',
+    'close'                             => '',
+    'comment'                           => 'Maoni',
+    'comments'                          => 'Maoni',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Kamilisha',
+    'confirm_cancel_sale'               => 'Una uhakika unataka kufuta mauzo haya? Bidhaa zote zitaondolewa.',
+    'confirm_delete'                    => 'Una uhakika unataka kufuta mauzo uliyoyachagua?',
+    'confirm_restore'                   => 'Una uhakika unataka kurejesha mauzo uliyoyachagua?',
+    'credit'                            => 'Kadi ya Mkopo',
+    'credit_deposit'                    => 'Amana ya Mkopo',
+    'credit_filter'                     => 'Kadi ya Mkopo',
+    'current_table'                     => '',
+    'customer'                          => 'Mteja',
+    'customer_address'                  => 'Anwani',
+    'customer_discount'                 => 'Punguzo',
+    'customer_email'                    => 'Barua Pepe',
+    'customer_location'                 => 'Mahali',
+    'customer_mailchimp_status'         => 'Hali ya MailChimp',
+    'customer_optional'                 => '(Inahitajika kwa Malipo ya Madeni)',
+    'customer_required'                 => '(Inahitajika)',
+    'customer_total'                    => 'Jumla',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Pointi Zinazopatikana',
+    'daily_sales'                       => '',
+    'date'                              => 'Tarehe ya Mauzo',
+    'date_range'                        => 'Wigo wa Tarehe',
+    'date_required'                     => 'Tafadhali ingiza tarehe sahihi.',
+    'date_type'                         => 'Tarehe ni kiashiria kinachohitajika.',
+    'debit'                             => 'Kadi ya Debit',
+    'debit_filter'                      => '',
+    'delete'                            => 'Ruhusu Kufuta',
+    'delete_confirmation'               => 'Una uhakika unataka kufuta mauzo haya? Hatua hii haiwezi kubatilishwa.',
+    'delete_entire_sale'                => 'Futa Mauzo Yote',
+    'delete_successful'                 => 'Mauzo yamefutwa kwa mafanikio.',
+    'delete_unsuccessful'               => 'Kufuta mauzo kimeshindikana.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Ondoa', // Tupa
+    'discard_quote'                     => '',
+    'discount'                          => 'Punguzo',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Punguzo',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Deni',
+    'due_filter'                        => '',
+    'edit'                              => 'Hariri',
+    'edit_item'                         => 'Hariri Bidhaa',
+    'edit_sale'                         => 'Hariri Mauzo',
+    'email_receipt'                     => 'Tuma Risiti kwa Barua Pepe',
+    'employee'                          => 'Mfanyakazi',
+    'entry'                             => 'Ingizo',
+    'error_editing_item'                => 'Hitilafu katika kuhariri bidhaa',
+    'find_or_scan_item'                 => 'Tafuta au Changanua Bidhaa',
+    'find_or_scan_item_or_receipt'      => 'Tafuta au Changanua Bidhaa au Risiti',
+    'giftcard'                          => 'Kadi ya Zawadi',
+    'giftcard_balance'                  => 'Salio la Kadi ya Zawadi',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Namba ya Kadi ya Zawadi',
+    'group_by_category'                 => 'Panga kwa Kategoria',
+    'group_by_type'                     => 'Panga kwa Aina',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Namba ya Mauzo',
+    'include_prices'                    => 'Jumuisha Bei?',
+    'insufficient_giftcard_balance'     => 'Salio la kadi ya zawadi haitoshi kwa malipo haya.',
+    'insufficient_reward_points'        => 'Pointi za gantimpilo hazitoshi kwa malipo haya.',
+    'invoice'                           => 'Ankara',
+    'invoice_confirm'                   => 'Ankara hii itatumwa kwa',
+    'invoice_enable'                    => 'Namba ya Ankara',
+    'invoice_filter'                    => 'Ankara',
+    'invoice_no_email'                  => 'Mteja huyu hana anwani halali ya barua pepe.',
+    'invoice_number'                    => 'Namba ya Ankara',
+    'invoice_number_duplicate'          => 'Namba ya Ankara {0} lazima iwe ya kipekee.',
+    'invoice_sent'                      => 'Ankara imetumwa kwa',
+    'invoice_total'                     => 'Jumla ya Ankara',
+    'invoice_type_custom_invoice'       => 'Ankara Maalum (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Ankara ya Kodi Maalum (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Ankara (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Ankara ya Kodi (tax_invoice.php)',
+    'invoice_unsent'                    => 'Imeshindikana kutuma ankara kwa',
+    'invoice_update'                    => 'Hesabu upya',
+    'item_insufficient_of_stock'        => 'Bidhaa haina hisa ya kutosha.',
+    'item_name'                         => 'Jina la Bidhaa',
+    'item_number'                       => 'Namba ya Bidhaa',
+    'item_out_of_stock'                 => 'Bidhaa haina hisa.',
+    'key_browser'                       => 'Vifupisho vya Msaada',
+    'key_cancel'                        => 'Ghairi Nukuu/Ankara/Mauzo ya Sasa',
+    'key_customer_search'               => 'Tafuta Mteja',
+    'key_finish_quote'                  => 'Kamilisha Nukuu/Ankara bila malipo',
+    'key_finish_sale'                   => 'Ongeza Malipo na Kamilisha Ankara/Mauzo',
+    'key_full'                          => 'Fungua kwa Skrini Nzima',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Vifupisho',
+    'key_help_modal'                    => 'Fungua Dirisha la Vifupisho',
+    'key_in'                            => 'Kuza',
+    'key_item_search'                   => 'Tafuta Bidhaa',
+    'key_out'                           => 'Punguza',
+    'key_payment'                       => 'Ongeza Malipo',
+    'key_print'                         => 'Chapisha Ukurasa wa Sasa',
+    'key_restore'                       => 'Rejesha Mwonekano wa Awali/Zoom',
+    'key_search'                        => 'Tafuta Jedwali la Ripoti',
+    'key_suspend'                       => 'Sitisha Mauzo ya Sasa',
+    'key_suspended'                     => 'Onyesha Mauzo Yaliyositishwa',
+    'key_system'                        => 'Vifupisho vya Mfumo',
+    'key_tendered'                      => 'Hariri Kiasi Kilicholipwa',
+    'key_title'                         => 'Vifupisho vya Kibodi (Keyboard) vya Mauzo',
+    'mc'                                => '',
+    'mode'                              => 'Hali ya Usajili',
+    'must_enter_numeric'                => 'Kiasi Kilicholipwa lazima kiwe Namba.',
+    'must_enter_numeric_giftcard'       => 'Namba ya Kadi ya Zawadi lazima iwe Namba.',
+    'must_enter_reference_code'         => 'Nambari ya Kumbukumbu/Upatikanaji lazima iingizwe.',
+    'negative_amount_tendered'          => 'Kiasi kilicholipwa hakiwezi kuwa hasi.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Mteja Mpya',
+    'new_item'                          => 'Bidhaa Mpya',
+    'no_description'                    => 'Hakuna maelezo',
+    'no_filter'                         => 'Zote',
+    'no_items_in_cart'                  => 'Hakuna bidhaa kwenye Kikapu cha Ununuzi.',
+    'no_sales_to_display'               => 'Hakuna mauzo ya kuonyesha.',
+    'none_selected'                     => 'Hujachagua mauzo yoyote ya kufuta.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'Hatua hii haijaruhusiwa.',
+    'one_or_multiple'                   => 'Mauzo',
+    'payment'                           => 'Aina ya Malipo',
+    'payment_amount'                    => 'Kiasi',
+    'payment_not_cover_total'           => 'Kiasi cha malipo lazima kiwe sawa au zaidi ya jumla kuu.',
+    'payment_type'                      => 'Aina',
+    'payments'                          => '',
+    'payments_total'                    => 'Jumla ya Malipo',
+    'price'                             => 'Bei',
+    'print_after_sale'                  => 'Chapisha baada ya Mauzo',
+    'quantity'                          => 'Kiasi',
+    'quantity_less_than_reorder_level'  => 'Onyo: Kiasi kilichotakiwa kiko chini ya kiwango cha kuagiza tena kwa bidhaa hiyo.',
+    'quantity_less_than_zero'           => 'Onyo: Kiasi kilichotakiwa hakitoshi. Unaweza kuendelea na mauzo, lakini hakiki hesabu yako.',
+    'quantity_of_items'                 => 'Kiasi cha bidhaa {0}',
+    'quote'                             => 'Nukuu (Quote)',
+    'quote_number'                      => 'Nambari ya Nukuu',
+    'quote_number_duplicate'            => 'Nambari ya Nukuu lazima iwe ya kipekee.',
+    'quote_sent'                        => 'Nukuu imetumwa kwa',
+    'quote_unsent'                      => 'Imeshindikana kutuma nukuu kwa',
+    'receipt'                           => 'Risiti ya Mauzo',
+    'receipt_no_email'                  => 'Mteja huyu hana anwani halali ya barua pepe.',
+    'receipt_number'                    => 'Namba ya Mauzo',
+    'receipt_sent'                      => 'Risiti imetumwa kwa',
+    'receipt_unsent'                    => 'Imeshindikana kutuma risiti kwa',
+    'reference_code'                    => 'Nambari ya Kumbukumbu ya Malipo',
+    'reference_code_invalid_characters' => 'Nambari ya kumbukumbu lazima iwe na herufi na nambari peke yake.',
+    'reference_code_length_error'       => 'Urefu wa nambari ya kumbukumbu si sahihi.',
+    'refund'                            => 'Aina ya Marejesho',
+    'register'                          => 'Usajili wa Mauzo',
+    'remove_customer'                   => 'Ondoa Mteja',
+    'remove_discount'                   => 'Ondoa Punguzo',
+    'return'                            => 'Rudisha',
+    'rewards'                           => 'Pointi za Zawadi',
+    'rewards_balance'                   => 'Salio la Pointi za Zawadi',
+    'rewards_package'                   => 'Zawadi',
+    'rewards_remaining_balance'         => 'Thamani ya pointi za zawadi zilizobaki ni ',
+    'sale'                              => 'Mauzo',
+    'sale_by_invoice'                   => 'Mauzo kwa Ankara',
+    'sale_for_customer'                 => 'Mteja:',
+    'sale_time'                         => 'Muda',
+    'sales_tax'                         => 'Kodi ya Mauzo',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Chagua Mteja',
+    'selected_customer'                 => 'Mteja Uliyemchagua',
+    'send_invoice'                      => 'Tuma Ankara',
+    'send_quote'                        => 'Tuma Nukuu',
+    'send_receipt'                      => 'Tuma Risiti',
+    'send_work_order'                   => 'Tuma Agizo la Kazi',
+    'serial'                            => 'Nambari ya Seriali',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Onyesha Ankara',
+    'show_receipt'                      => 'Onyesha Risiti',
+    'start_typing_customer_name'        => 'Anza kuandika taarifa za mteja...',
+    'start_typing_item_name'            => 'Anza kuandika jina la bidhaa au changanua msimbo wa mstari (Scan Barcode)...',
+    'stock'                             => 'Hisa',
+    'stock_location'                    => 'Eneo la Hisa',
+    'sub_total'                         => 'Jumla Ndogo',
+    'successfully_deleted'              => 'Umefanikiwa kufuta',
+    'successfully_restored'             => 'Umefanikiwa kurejesha',
+    'successfully_suspended_sale'       => 'Kusitisha mauzo kumewezekana.',
+    'successfully_updated'              => 'Kusasisha mauzo kumewezekana.',
+    'suspend_sale'                      => 'Sitisha',
+    'suspended_doc_id'                  => 'Nyaraka',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Yaliyositishwa',
+    'table'                             => 'Jedwali',
+    'takings'                           => 'Mauzo ya Kila Siku',
+    'tax'                               => 'Kodi',
+    'tax_id'                            => 'Kitambulisho cha Kodi',
+    'tax_invoice'                       => 'Ankara ya Kodi',
+    'tax_percent'                       => 'Kodi %',
+    'taxed_ind'                         => 'K',
+    'total'                             => 'Jumla',
+    'total_tax_exclusive'               => 'Kodi haijajumuishwa',
+    'transaction_failed'                => 'Muamala wa Mauzo umeshindikana.',
+    'unable_to_add_item'                => 'Imeshindikana kuongeza bidhaa kwenye Mauzo',
+    'unsuccessfully_deleted'            => 'Imeshindikana kufuta Mauzo.',
+    'unsuccessfully_restored'           => 'Imeshindikana kurejesha Mauzo.',
+    'unsuccessfully_suspended_sale'     => 'Imeshindikana kusitisha Mauzo.',
+    'unsuccessfully_updated'            => 'Kusasisha mauzo kimeshindikana.',
+    'unsuspend'                         => 'Ondoa Kusitishwa',
+    'unsuspend_and_delete'              => 'Hatua',
+    'update'                            => 'Sasisha',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Agizo la Kazi (Work Order)',
+    'work_order_number'                 => 'Nambari ya Agizo la Kazi',
+    'work_order_number_duplicate'       => 'Nambari ya Agizo la Kazi lazima iwe ya kipekee.',
+    'work_order_sent'                   => 'Agizo la Kazi limetumwa kwa',
+    'work_order_unsent'                 => 'Imeshindikana kutuma Agizo la Kazi kwa',
+];
diff --git a/app/Language/ta/Attributes.php b/app/Language/ta/Attributes.php
index 7c7d53525..c944cc3ea 100644
--- a/app/Language/ta/Attributes.php
+++ b/app/Language/ta/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "பண்புக்கூறு மதிப்பு '_' அல்லது '|' கொண்டிருக்கக்கூடாது",
-    "confirm_delete"                   => "தேர்ந்தெடுக்கப்பட்ட பண்புக்கூறு (களை) நீக்க விரும்புகிறீர்களா?",
-    "confirm_restore"                  => "தேர்ந்தெடுக்கப்பட்ட பண்புக்கூறுகளை (களை) மீட்டெடுக்க விரும்புகிறீர்களா?",
-    "definition_cannot_be_deleted"     => "Could not delete selected attribute(s)",
-    "definition_error_adding_updating" => "Attribute {0} could not be added or updated. Please check the error log.",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Add Attribute",
-    "definition_name_required"         => "Attribute name is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated attribute",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute type is a required field",
-    "definition_unit"                  => "Measurement Unit",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Items to display",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'பண்புக்கூறு மதிப்பு \'_\' அல்லது \'|\' கொண்டிருக்கக்கூடாது',
+    'confirm_delete'                   => 'தேர்ந்தெடுக்கப்பட்ட பண்புக்கூறு (களை) நீக்க விரும்புகிறீர்களா?',
+    'confirm_restore'                  => 'தேர்ந்தெடுக்கப்பட்ட பண்புக்கூறுகளை (களை) மீட்டெடுக்க விரும்புகிறீர்களா?',
+    'definition_cannot_be_deleted'     => 'Could not delete selected attribute(s)',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute name is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated attribute',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute type is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Items to display',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'தேடலில் காட்டு',
+    'show_in_search_visibility'        => 'தேடல்',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/ta/Bootstrap_tables.php b/app/Language/ta/Bootstrap_tables.php
index 3f802523f..6187284cc 100644
--- a/app/Language/ta/Bootstrap_tables.php
+++ b/app/Language/ta/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "அனைத்தும்",
-    "columns"              => "நெடுவரிசை",
-    "hide_show_pagination" => "பக்கமாக்கலை காண்பி / மறை",
-    "loading"              => "பதிவேறுகிறது, காத்திருக்கவும்...",
-    "page_from_to"         => "{2} வரிசைகளில் {0} முதல் {1} வரை காட்டுகிறது",
-    "refresh"              => "புதுப்பிக்கவும்",
-    "rows_per_page"        => "ஒரு பக்கத்திற்கு {0} வரிசைகள்",
-    "toggle"               => "நிலைமாற்று",
+    'all' => "அனைத்தும்",
+    'columns' => "நெடுவரிசை",
+    'hide_show_pagination' => "பக்கமாக்கலை காண்பி / மறை",
+    'loading' => "பதிவேறுகிறது, காத்திருக்கவும்",
+    'page_from_to' => "{2} வரிசைகளில் {0} முதல் {1} வரை காட்டுகிறது",
+    'refresh' => "புதுப்பிக்கவும்",
+    'rows_per_page' => "ஒரு பக்கத்திற்கு {0} வரிசைகள்",
+    'toggle' => "நிலைமாற்று",
 ];
diff --git a/app/Language/ta/Config.php b/app/Language/ta/Config.php
index c9be79fd7..c06a4d27e 100644
--- a/app/Language/ta/Config.php
+++ b/app/Language/ta/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Company Address",
-    "address_required"                          => "Company address is a required field.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Allow Duplicate Barcodes",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "Barcode",
-    "barcode_company"                           => "Company Name",
-    "barcode_configuration"                     => "Barcode Configuration",
-    "barcode_content"                           => "Barcode Content",
-    "barcode_first_row"                         => "Row 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Input Formats",
-    "barcode_generate_if_empty"                 => "Generate if empty.",
-    "barcode_height"                            => "Height (px)",
-    "barcode_id"                                => "Item Id/Name",
-    "barcode_info"                              => "Barcode Configuration Information",
-    "barcode_layout"                            => "Barcode Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "Barcode",
-    "barcode_number_in_row"                     => "Number in row",
-    "barcode_page_cellspacing"                  => "Display page cellspacing.",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "Price",
-    "barcode_second_row"                        => "Row 2",
-    "barcode_third_row"                         => "Row 3",
-    "barcode_tooltip"                           => "எச்சரிக்கை: இந்த அம்சம் நகல் உருப்படிகளை இறக்குமதி செய்ய அல்லது உருவாக்க காரணமாக இருக்கலாம். நீங்கள் நகல் பட்டைக்குறியீடுகளை விரும்பவில்லை என்றால் பயன்படுத்த வேண்டாம்.",
-    "barcode_type"                              => "Barcode Type",
-    "barcode_width"                             => "Width (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Cash Decimals",
-    "cash_decimals_tooltip"                     => "If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.",
-    "cash_rounding"                             => "Cash Rounding",
-    "category_dropdown"                         => "Show Category as a dropdown",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Company Name",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Company Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "Company name is a required field",
-    "company_select_image"                      => "Select Image",
-    "company_website_url"                       => "Company website is not a valid URL (http://...).",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "Currency Code",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Currency Symbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Reward",
-    "customer_reward_duplicate"                 => "Reward must be unique.",
-    "customer_reward_enable"                    => "Enable Customer Rewards",
-    "customer_reward_invalid_chars"             => "Reward can not contain '_'",
-    "customer_reward_required"                  => "Reward is a required field",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Date and Time Filter",
-    "datetimeformat"                            => "Date and Time Format",
-    "decimal_point"                             => "Decimal Point",
-    "default_barcode_font_size_number"          => "Default Barcode Font Size must be a number.",
-    "default_barcode_font_size_required"        => "Default Barcode Font Size is a required field.",
-    "default_barcode_height_number"             => "Default Barcode Height must be a number.",
-    "default_barcode_height_required"           => "Default Barcode Height is a required field.",
-    "default_barcode_num_in_row_number"         => "Default Barcode Number in Row must be a number.",
-    "default_barcode_num_in_row_required"       => "Default Barcode Number in Row is a required field.",
-    "default_barcode_page_cellspacing_number"   => "Default Barcode Page Cellspacing must be a number.",
-    "default_barcode_page_cellspacing_required" => "Default Barcode Page Cellspacing is a required field.",
-    "default_barcode_page_width_number"         => "Default Barcode Page Width must be a number.",
-    "default_barcode_page_width_required"       => "Default Barcode Page Width is a required field.",
-    "default_barcode_width_number"              => "Default Barcode Width must be a number.",
-    "default_barcode_width_required"            => "Default Barcode Width is a required field.",
-    "default_item_columns"                      => "Default Visible Item Columns",
-    "default_origin_tax_code"                   => "Default Origin Tax Code",
-    "default_receivings_discount"               => "Default Receivings Discount",
-    "default_receivings_discount_number"        => "Default Receivings Discount must be a number.",
-    "default_receivings_discount_required"      => "Default Receivings Discount is a required field.",
-    "default_sales_discount"                    => "Default Sales Discount",
-    "default_sales_discount_number"             => "Default Sales Discount must be a number.",
-    "default_sales_discount_required"           => "Default Sales Discount is a required field.",
-    "default_tax_category"                      => "Default Tax Category",
-    "default_tax_code"                          => "Default Tax Code",
-    "default_tax_jurisdiction"                  => "Default Tax Jurisdiction",
-    "default_tax_name_number"                   => "Default Tax Name must be a string.",
-    "default_tax_name_required"                 => "Default Tax Name is a required field.",
-    "default_tax_rate"                          => "Default Tax Rate %",
-    "default_tax_rate_1"                        => "Tax 1 Rate",
-    "default_tax_rate_2"                        => "Tax 2 Rate",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Default Tax Rate must be a number.",
-    "default_tax_rate_required"                 => "Default Tax Rate is a required field.",
-    "derive_sale_quantity"                      => "Allow Derived Sale Quantity",
-    "derive_sale_quantity_tooltip"              => "If checked then a new item type will provided for items ordered by extended amount",
-    "dinner_table"                              => "Table",
-    "dinner_table_duplicate"                    => "Table must be unique.",
-    "dinner_table_enable"                       => "Enable Dinner Tables",
-    "dinner_table_invalid_chars"                => "Table Name can not contain '_'.",
-    "dinner_table_required"                     => "Table is a required field.",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Email Receipt checkbox",
-    "email_receipt_check_behaviour_always"      => "Always checked",
-    "email_receipt_check_behaviour_last"        => "Remember last selection",
-    "email_receipt_check_behaviour_never"       => "Always unchecked",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Enforce privacy",
-    "enforce_privacy_tooltip"                   => "Protect Customers privacy enforcing data scrambling in case of their data being deleted",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Fiscal Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "Allowed file types",
-    "image_max_height_tooltip"                  => "Maximum allowed height of image uploads in pixels (px).",
-    "image_max_size_tooltip"                    => "Maximum allowed file size of image uploads in kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Maximum allowed width of image uploads in pixels (px).",
-    "image_restrictions"                        => "Image Upload Restrictions",
-    "include_hsn"                               => "Include Support for HSN Codes",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "",
-    "integrations"                              => "Integrations",
-    "integrations_configuration"                => "Third Party Integrations",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "Invoice Type",
-    "is_readable"                               => "is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.",
-    "is_writable"                               => "is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "Lines per Page must be a number.",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Localization Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "மெயில்சிம்ப்",
-    "mailchimp_api_key"                         => "மெயில்சிம்ப் API விசை",
-    "mailchimp_configuration"                   => "மெயில்சிம்ப் அமைப்பு",
-    "mailchimp_key_successfully"                => "API Key is valid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
-    "mailchimp_lists"                           => "மெயில்சிம்ப் பட்டியல்(கள்)",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "Multiple Packages per Item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "OSPOS Timezone:",
-    "ospos_info"                                => "OSPOS Installation Info",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Incorrect permissions leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
-    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
-    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
-    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Left must be a number.",
-    "print_left_margin_required"                => "Margin Left is a required field.",
-    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
-    "print_receipt_check_behaviour_always"      => "Always checked",
-    "print_receipt_check_behaviour_last"        => "Remember last selection",
-    "print_receipt_check_behaviour_never"       => "Always unchecked",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Right must be a number.",
-    "print_right_margin_required"               => "Margin Right is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Top must be a number.",
-    "print_top_margin_required"                 => "Margin Top is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Default Quote Comments",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "Show Tax Indicator",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "Report an issue",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "The entered tax category already exists.",
-    "tax_category_invalid_chars"                => "The entered tax category is invalid.",
-    "tax_category_required"                     => "The tax category is required.",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "Tax Id",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "OSPOS Timezone is Different from your Local Timezone.",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Use Destination Based Tax",
-    "user_timezone"                             => "Local Timezone:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'Company Address',
+    'address_required'                          => 'Company address is a required field.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Allow Duplicate Barcodes',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => 'Barcode',
+    'barcode_company'                           => 'Company Name',
+    'barcode_configuration'                     => 'Barcode Configuration',
+    'barcode_content'                           => 'Barcode Content',
+    'barcode_first_row'                         => 'Row 1',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Input Formats',
+    'barcode_generate_if_empty'                 => 'Generate if empty.',
+    'barcode_height'                            => 'Height (px)',
+    'barcode_id'                                => 'Item Id/Name',
+    'barcode_info'                              => 'Barcode Configuration Information',
+    'barcode_layout'                            => 'Barcode Layout',
+    'barcode_name'                              => 'Name',
+    'barcode_number'                            => 'Barcode',
+    'barcode_number_in_row'                     => 'Number in row',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing.',
+    'barcode_page_width'                        => 'Display page width',
+    'barcode_price'                             => 'Price',
+    'barcode_second_row'                        => 'Row 2',
+    'barcode_third_row'                         => 'Row 3',
+    'barcode_tooltip'                           => 'எச்சரிக்கை: இந்த அம்சம் நகல் உருப்படிகளை இறக்குமதி செய்ய அல்லது உருவாக்க காரணமாக இருக்கலாம். நீங்கள் நகல் பட்டைக்குறியீடுகளை விரும்பவில்லை என்றால் பயன்படுத்த வேண்டாம்.',
+    'barcode_type'                              => 'Barcode Type',
+    'barcode_width'                             => 'Width (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Cash Decimals',
+    'cash_decimals_tooltip'                     => 'If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.',
+    'cash_rounding'                             => 'Cash Rounding',
+    'category_dropdown'                         => 'Show Category as a dropdown',
+    'center'                                    => 'Center',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => 'Company Name',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Change Image',
+    'company_logo'                              => 'Company Logo',
+    'company_remove_image'                      => 'Remove Image',
+    'company_required'                          => 'Company name is a required field',
+    'company_select_image'                      => 'Select Image',
+    'company_website_url'                       => 'Company website is not a valid URL (http://...).',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => 'Currency Code',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => 'Currency Symbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Reward',
+    'customer_reward_duplicate'                 => 'Reward must be unique.',
+    'customer_reward_enable'                    => 'Enable Customer Rewards',
+    'customer_reward_invalid_chars'             => "Reward can not contain '_'",
+    'customer_reward_required'                  => 'Reward is a required field',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Date and Time Filter',
+    'datetimeformat'                            => 'Date and Time Format',
+    'decimal_point'                             => 'Decimal Point',
+    'default_barcode_font_size_number'          => 'Default Barcode Font Size must be a number.',
+    'default_barcode_font_size_required'        => 'Default Barcode Font Size is a required field.',
+    'default_barcode_height_number'             => 'Default Barcode Height must be a number.',
+    'default_barcode_height_required'           => 'Default Barcode Height is a required field.',
+    'default_barcode_num_in_row_number'         => 'Default Barcode Number in Row must be a number.',
+    'default_barcode_num_in_row_required'       => 'Default Barcode Number in Row is a required field.',
+    'default_barcode_page_cellspacing_number'   => 'Default Barcode Page Cellspacing must be a number.',
+    'default_barcode_page_cellspacing_required' => 'Default Barcode Page Cellspacing is a required field.',
+    'default_barcode_page_width_number'         => 'Default Barcode Page Width must be a number.',
+    'default_barcode_page_width_required'       => 'Default Barcode Page Width is a required field.',
+    'default_barcode_width_number'              => 'Default Barcode Width must be a number.',
+    'default_barcode_width_required'            => 'Default Barcode Width is a required field.',
+    'default_item_columns'                      => 'Default Visible Item Columns',
+    'default_origin_tax_code'                   => 'Default Origin Tax Code',
+    'default_receivings_discount'               => 'Default Receivings Discount',
+    'default_receivings_discount_number'        => 'Default Receivings Discount must be a number.',
+    'default_receivings_discount_required'      => 'Default Receivings Discount is a required field.',
+    'default_sales_discount'                    => 'Default Sales Discount',
+    'default_sales_discount_number'             => 'Default Sales Discount must be a number.',
+    'default_sales_discount_required'           => 'Default Sales Discount is a required field.',
+    'default_tax_category'                      => 'Default Tax Category',
+    'default_tax_code'                          => 'Default Tax Code',
+    'default_tax_jurisdiction'                  => 'Default Tax Jurisdiction',
+    'default_tax_name_number'                   => 'Default Tax Name must be a string.',
+    'default_tax_name_required'                 => 'Default Tax Name is a required field.',
+    'default_tax_rate'                          => 'Default Tax Rate %',
+    'default_tax_rate_1'                        => 'Tax 1 Rate',
+    'default_tax_rate_2'                        => 'Tax 2 Rate',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Default Tax Rate must be a number.',
+    'default_tax_rate_required'                 => 'Default Tax Rate is a required field.',
+    'derive_sale_quantity'                      => 'Allow Derived Sale Quantity',
+    'derive_sale_quantity_tooltip'              => 'If checked then a new item type will provided for items ordered by extended amount',
+    'dinner_table'                              => 'Table',
+    'dinner_table_duplicate'                    => 'Table must be unique.',
+    'dinner_table_enable'                       => 'Enable Dinner Tables',
+    'dinner_table_invalid_chars'                => "Table Name can not contain '_'.",
+    'dinner_table_required'                     => 'Table is a required field.',
+    'dot'                                       => 'dot',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Email Receipt checkbox',
+    'email_receipt_check_behaviour_always'      => 'Always checked',
+    'email_receipt_check_behaviour_last'        => 'Remember last selection',
+    'email_receipt_check_behaviour_never'       => 'Always unchecked',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Enforce privacy',
+    'enforce_privacy_tooltip'                   => 'Protect Customers privacy enforcing data scrambling in case of their data being deleted',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Fiscal Year Start',
+    'financial_year_apr'                        => '1st of April',
+    'financial_year_aug'                        => '1st of August',
+    'financial_year_dec'                        => '1st of December',
+    'financial_year_feb'                        => '1st of February',
+    'financial_year_jan'                        => '1st of January',
+    'financial_year_jul'                        => '1st of July',
+    'financial_year_jun'                        => '1st of June',
+    'financial_year_mar'                        => '1st of March',
+    'financial_year_may'                        => '1st of May',
+    'financial_year_nov'                        => '1st of November',
+    'financial_year_oct'                        => '1st of October',
+    'financial_year_sep'                        => '1st of September',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Secret Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Secret Key is a required field',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Site Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => 'Allowed file types',
+    'image_max_height_tooltip'                  => 'Maximum allowed height of image uploads in pixels (px).',
+    'image_max_size_tooltip'                    => 'Maximum allowed file size of image uploads in kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Maximum allowed width of image uploads in pixels (px).',
+    'image_restrictions'                        => 'Image Upload Restrictions',
+    'include_hsn'                               => 'Include Support for HSN Codes',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Store Information',
+    'input_groups'                              => '',
+    'integrations'                              => 'Integrations',
+    'integrations_configuration'                => 'Third Party Integrations',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => 'Invoice Type',
+    'is_readable'                               => 'is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.',
+    'is_writable'                               => 'is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines per Page',
+    'lines_per_page_number'                     => 'Lines per Page must be a number.',
+    'lines_per_page_required'                   => 'Lines per Page is a required field.',
+    'locale'                                    => 'Localization',
+    'locale_configuration'                      => 'Localization Configuration',
+    'locale_info'                               => 'Localization Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => '',
+    'logout'                                    => 'Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.',
+    'mailchimp'                                 => 'மெயில்சிம்ப்',
+    'mailchimp_api_key'                         => 'மெயில்சிம்ப் API விசை',
+    'mailchimp_configuration'                   => 'மெயில்சிம்ப் அமைப்பு',
+    'mailchimp_key_successfully'                => 'API Key is valid.',
+    'mailchimp_key_unsuccessfully'              => 'API Key is invalid.',
+    'mailchimp_lists'                           => 'மெயில்சிம்ப் பட்டியல்(கள்)',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here, otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => 'Multiple Packages per Item',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localization',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a valid locale.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => 'OSPOS Timezone:',
+    'ospos_info'                                => 'OSPOS Installation Info',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'கட்டண குறிப்பு குறியீடு<br>நீள வரம்புகள்',
+    'payment_reference_code_length_max_label'   => 'அதிகபட்சம்',
+    'payment_reference_code_length_min_label'   => 'குறைந்தபட்சம்',
+    'perm_risk'                                 => 'Incorrect permissions leaves this software at risk.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Phone is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Margin Bottom must be a number.',
+    'print_bottom_margin_required'              => 'Margin Bottom is a required field.',
+    'print_delay_autoreturn'                    => 'Autoreturn to Sale delay',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Margin Left must be a number.',
+    'print_left_margin_required'                => 'Margin Left is a required field.',
+    'print_receipt_check_behaviour'             => 'Print Receipt checkbox',
+    'print_receipt_check_behaviour_always'      => 'Always checked',
+    'print_receipt_check_behaviour_last'        => 'Remember last selection',
+    'print_receipt_check_behaviour_never'       => 'Always unchecked',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Margin Right must be a number.',
+    'print_right_margin_required'               => 'Margin Right is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Margin Top must be a number.',
+    'print_top_margin_required'                 => 'Margin Top is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Default Quote Comments',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => 'Show Tax Indicator',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Calc avg. Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => 'Report an issue',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'தவறான sendmail பாதை. எழுத்துகள், எண்கள், கோடுகள், அடிக்கோடுகள், சாய்வுக்கோடுகள், பின்சாய்வுக்கோடுகள், முக்காற்புள்ளிகள், இடைவெளிகள் மற்றும் புள்ளிகள் மட்டுமே அனுமதிக்கப்படும்.',
+    'saved_successfully'                        => 'Configuration save successful.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Stock location',
+    'stock_location_duplicate'                  => 'Stock Location must be unique.',
+    'stock_location_invalid_chars'              => "Stock Location can not contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 2',
+    'suggestions_third_column'                  => 'Column 3',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Receipt Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => 'The entered tax category already exists.',
+    'tax_category_invalid_chars'                => 'The entered tax category is invalid.',
+    'tax_category_required'                     => 'The tax category is required.',
+    'tax_category_used'                         => 'Tax category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Tax Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => 'Tax Id',
+    'tax_included'                              => 'Tax Included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => 'OSPOS Timezone is Different from your Local Timezone.',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => 'Use Destination Based Tax',
+    'user_timezone'                             => 'Local Timezone:',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/ta/Employees.php b/app/Language/ta/Employees.php
index 59828d128..3d72ab43e 100644
--- a/app/Language/ta/Employees.php
+++ b/app/Language/ta/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Information",
-    "cannot_be_deleted"            => "Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account.",
-    "change_employee"              => "",
-    "change_password"              => "Change Password",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Are you sure you want to delete the selected employee(s)?",
-    "confirm_restore"              => "Are you sure you want to restore selected employee(s)?",
-    "current_password"             => "Current Password",
-    "current_password_invalid"     => "Current Password is invalid.",
-    "employee"                     => "Employee",
-    "error_adding_updating"        => "Employee add or update failed.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "You can not delete the demo admin user.",
-    "error_updating_demo_admin"    => "You can not change the demo admin user.",
-    "language"                     => "Language",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "New Employee",
-    "none_selected"                => "You have not selected any employee(s) to delete.",
-    "one_or_multiple"              => "employee(s)",
-    "password"                     => "Password",
-    "password_minlength"           => "Password must be at least 8 characters in length.",
-    "password_must_match"          => "Passwords do not match.",
-    "password_not_must_match"      => "Current password and new password must be unique.",
-    "password_required"            => "Password is required.",
-    "permission_desc"              => "Check the boxes below to grant access to modules.",
-    "permission_info"              => "Permissions",
-    "repeat_password"              => "Password Again",
-    "subpermission_required"       => "Add at least one grant for each module.",
-    "successful_adding"            => "Employee add successful.",
-    "successful_change_password"   => "Password change successful.",
-    "successful_deleted"           => "You have successfully deleted",
-    "successful_updating"          => "You have successfully updated employee",
-    "system_language"              => "System Language",
-    "unsuccessful_change_password" => "Password change failed.",
-    "update"                       => "Update Employee",
-    "username"                     => "Username",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Username must be at least 5 characters in length.",
-    "username_required"            => "Username is a required field.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Information',
+    'cannot_be_deleted'                      => 'தேர்ந்தெடுக்கப்பட்ட ஊழியர்(களை) நீக்க முடியவில்லை, ஒன்று அல்லது அதற்கு மேற்பட்டவை விற்பனையை செயலாக்கியுள்ளன அல்லது நீங்கள் உங்கள் கணக்கை நீக்க முயற்சிக்கிறீர்கள்.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Change Password',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Are you sure you want to delete the selected employee(s)?',
+    'confirm_restore'                        => 'Are you sure you want to restore selected employee(s)?',
+    'current_password'                       => 'Current Password',
+    'current_password_invalid'               => 'Current Password is invalid.',
+    'employee'                               => 'Employee',
+    'error_adding_updating'                  => 'Employee add or update failed.',
+    'error_cannot_remove_own_minimum_grant'  => 'உங்கள் சொந்த குறைந்தபட்ச தொகுதி அணுகல் அனுமதிகளை நீக்க முடியாது.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'You can not delete the demo admin user.',
+    'error_grant_change_disallowed'          => 'அனுமதி மாற்றங்கள் இந்த டெமோவில் முடக்கப்பட்டுள்ளன.',
+    'error_password_change_disallowed'       => 'கடவுச்சொல் மாற்றங்கள் இந்த டெமோவில் முடக்கப்பட்டுள்ளன.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'You can not change the demo admin user.',
+    'language'                               => 'Language',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'New Employee',
+    'none_selected'                          => 'You have not selected any employee(s) to delete.',
+    'one_or_multiple'                        => 'employee(s)',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'Password must be at least 8 characters in length.',
+    'password_must_match'                    => 'Passwords do not match.',
+    'password_not_must_match'                => 'Current password and new password must be unique.',
+    'password_required'                      => 'Password is required.',
+    'permission_desc'                        => 'Check the boxes below to grant access to modules.',
+    'permission_info'                        => 'Permissions',
+    'repeat_password'                        => 'Password Again',
+    'subpermission_required'                 => 'Add at least one grant for each module.',
+    'successful_adding'                      => 'Employee add successful.',
+    'successful_change_password'             => 'Password change successful.',
+    'successful_deleted'                     => 'You have successfully deleted',
+    'successful_updating'                    => 'You have successfully updated employee',
+    'system_language'                        => 'System Language',
+    'unsuccessful_change_password'           => 'Password change failed.',
+    'update'                                 => 'Update Employee',
+    'username'                               => 'Username',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Username must be at least 5 characters in length.',
+    'username_required'                      => 'Username is a required field.',
 ];
diff --git a/app/Language/ta/Error.php b/app/Language/ta/Error.php
index 7e7b2189c..41838b567 100644
--- a/app/Language/ta/Error.php
+++ b/app/Language/ta/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "பெயரிடப்பட்ட தொகுதியை பயன்படுத்த உங்களுக்கு அனுமதி இல்லை",
-    "unknown"              => "எதிர்பாராத பிழை",
+    'no_permission_module'           => 'பெயரிடப்பட்ட தொகுதியை பயன்படுத்த உங்களுக்கு அனுமதி இல்லை',
+    'unable_to_create_env_file'      => 'throttle.key ஐ ஏற்பாடு செய்ய {filePath} ஐ உருவாக்க முடியவில்லை',
+    'unable_to_lock_file'            => '{filePath} ஐ பூட்ட முடியவில்லை: {reason}',
+    'unable_to_open_lock_file'       => '{filePath} ஐ திறக்க முடியவில்லை: {reason}',
+    'unable_to_persist_throttle_key' => 'throttle.key ஐ {filePath} இல் நிலைநிறுத்த முடியவில்லை',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'throttle.key ஐ ஏற்பாடு செய்ய {filePath} ஐ படிக்க முடியவில்லை',
+    'unknown'                        => 'எதிர்பாராத பிழை',
 ];
diff --git a/app/Language/ta/Items.php b/app/Language/ta/Items.php
index c4668ee34..456b474fa 100644
--- a/app/Language/ta/Items.php
+++ b/app/Language/ta/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "கையிருப்பு பொருட்களை கூட்டு அல்லது கழி",
-    "allow_alt_description"              => "மாற்று விளக்கத்தை அனுமதி",
-    "amount_entry"                       => "தொகை உள்ளிடு",
-    "bulk_edit"                          => "மொத்த திருத்தம்",
-    "buy_price_required"                 => "கொள்முதல் விலை அவசியம்.",
-    "cannot_be_deleted"                  => "தேர்ந்தெடுக்கப்பட்ட உருப்படி (களை) நீக்க முடியவில்லை, தேர்ந்தெடுக்கப்பட்ட ஒன்று அல்லது அதற்கு மேற்பட்ட உருப்படிகள் விற்பனையைக் கொண்டுள்ளன.",
-    "cannot_find_item"                   => "பொருள் கிடைக்கவில்லை.",
-    "categories"                         => "",
-    "category"                           => "வகை",
-    "category_new"                       => "",
-    "category_required"                  => "வகை என்பது தேவையான புலம்.",
-    "change_all_to_allow_alt_desc"       => "அனைவரும் மாற்று விளக்கத்தை அனுமதிக்கவும்.",
-    "change_all_to_not_allow_allow_desc" => "அனைவருக்கும் மாற்று விளக்கத்தை அனுமதிக்க வேண்டாம்.",
-    "change_all_to_serialized"           => "அனைத்தையும் தொடர்களாக மாற்றவும்",
-    "change_all_to_unserialized"         => "அனைத்தையும் தொடர்களாக மாற்றவும்",
-    "change_image"                       => "படத்தை மாற்று",
-    "confirm_bulk_edit"                  => "Are you sure you want to edit selected Item(s)?",
-    "confirm_bulk_edit_wipe_taxes"       => "All Item Tax information will be replaced.",
-    "confirm_delete"                     => "Are you sure you want to delete selected item(s)?",
-    "confirm_restore"                    => "Are you sure you want to restore selected item(s)?",
-    "cost_price"                         => "Wholesale Price",
-    "cost_price_number"                  => "Wholesale Price must be a number.",
-    "cost_price_required"                => "Wholesale Price is a required field.",
-    "count"                              => "Update Inventory",
-    "csv_import_failed"                  => "CSV import failed",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "The uploaded CSV file has no data or is formatted incorrectly.",
-    "csv_import_partially_failed"        => "There were {0} item import failure(s) on line(s): {1}. No rows were imported.",
-    "csv_import_success"                 => "Item CSV import successful.",
-    "current_quantity"                   => "Current Quantity",
-    "default_pack_name"                  => "Each",
-    "description"                        => "Description",
-    "details_count"                      => "Inventory Count Details",
-    "do_nothing"                         => "Do Nothing",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit the desired fields for selected item(s).",
-    "edit_multiple_items"                => "Editing Multiple Items",
-    "empty_upc_items"                    => "Empty Barcode Items",
-    "error_adding_updating"              => "Error adding/updating item",
-    "error_updating_multiple"            => "Error updating items",
-    "generate_barcodes"                  => "Generate Barcodes",
-    "hsn_code"                           => "Harmonized System Nomenclature",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Item Import from CSV",
-    "info_provided_by"                   => "Information provided by",
-    "inventory"                          => "Inventory",
-    "inventory_CSV_import_quantity"      => "Quantity Imported from CSV",
-    "inventory_comments"                 => "Comments",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Date",
-    "inventory_employee"                 => "Employee",
-    "inventory_in_out_quantity"          => "In/Out Quantity",
-    "inventory_remarks"                  => "Remarks",
-    "is_deleted"                         => "Deleted",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item has Serial Number",
-    "item"                               => "Item",
-    "item_id"                            => "",
-    "item_number"                        => "Barcode",
-    "item_number_duplicate"              => "Item Number is already present in the database.",
-    "kit"                                => "Kit",
-    "location"                           => "Location",
-    "low_inventory_items"                => "Out Of Stock Items",
-    "low_sell_item"                      => "Low sell item",
-    "manually_editing_of_quantity"       => "Manual Edit of Quantity",
-    "markup"                             => "",
-    "name"                               => "Item Name",
-    "name_required"                      => "Item Name is a required field.",
-    "new"                                => "New Item",
-    "no_description_items"               => "No Description Items",
-    "no_items_to_display"                => "No Items to display.",
-    "none"                               => "None",
-    "none_selected"                      => "You have not selected any Item(s) to edit",
-    "nonstock"                           => "Non-stocked",
-    "number_information"                 => "Item Number",
-    "number_required"                    => "Barcode is a required field.",
-    "one_or_multiple"                    => "item(s)",
-    "pack_name"                          => "Pack Name",
-    "qty_per_pack"                       => "Quantity per pack",
-    "quantity"                           => "Quantity",
-    "quantity_number"                    => "Quantity must be a number.",
-    "quantity_required"                  => "Quantity is a required field.",
-    "receiving_quantity"                 => "Receiving Quantity",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "Reorder Level",
-    "reorder_level_number"               => "Reorder Level must be a number.",
-    "reorder_level_required"             => "Reorder Level is a required field.",
-    "retrive_item_info"                  => "உருப்படி தகவலை மீட்டெடுக்கவும்",
-    "sales_tax_1"                        => "Sales Tax",
-    "sales_tax_2"                        => "Sales Tax 2",
-    "search_attributes"                  => "Search Attributes",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "Serialized Items",
-    "standard"                           => "Standard",
-    "stock"                              => "Stock",
-    "stock_location"                     => "Stock location",
-    "stock_type"                         => "Stock Type",
-    "successful_adding"                  => "You have successfully added item",
-    "successful_bulk_edit"               => "You have successfully updated the selected item(s)",
-    "successful_deleted"                 => "You have successfully deleted",
-    "successful_updating"                => "You have successfully updated item",
-    "supplier"                           => "Supplier",
-    "tax_1"                              => "Tax 1",
-    "tax_2"                              => "Tax 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Tax Category",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "Tax Percent must be a numeric value",
-    "tax_percent_required"               => "Tax Percent is a required field.",
-    "tax_percents"                       => "Tax Percent(s)",
-    "temp"                               => "Temporary",
-    "type"                               => "Item Type",
-    "unit_price"                         => "Retail Price",
-    "unit_price_number"                  => "Unit price must be a number.",
-    "unit_price_required"                => "Retail Price is a required field.",
-    "upc_database"                       => "Barcode Database",
-    "update"                             => "Update Item",
-    "use_inventory_menu"                 => "Use Inventory Menu",
+    'add_minus'                          => 'கையிருப்பு பொருட்களை கூட்டு அல்லது கழி',
+    'allow_alt_description'              => 'மாற்று விளக்கத்தை அனுமதி',
+    'amount_entry'                       => 'தொகை உள்ளிடு',
+    'bulk_edit'                          => 'மொத்த திருத்தம்',
+    'buy_price_required'                 => 'கொள்முதல் விலை அவசியம்.',
+    'cannot_be_deleted'                  => 'தேர்ந்தெடுக்கப்பட்ட உருப்படி (களை) நீக்க முடியவில்லை, தேர்ந்தெடுக்கப்பட்ட ஒன்று அல்லது அதற்கு மேற்பட்ட உருப்படிகள் விற்பனையைக் கொண்டுள்ளன.',
+    'cannot_find_item'                   => 'பொருள் கிடைக்கவில்லை.',
+    'categories'                         => '',
+    'category'                           => 'வகை',
+    'category_new'                       => '',
+    'category_required'                  => 'வகை என்பது தேவையான புலம்.',
+    'change_all_to_allow_alt_desc'       => 'அனைவரும் மாற்று விளக்கத்தை அனுமதிக்கவும்.',
+    'change_all_to_not_allow_allow_desc' => 'அனைவருக்கும் மாற்று விளக்கத்தை அனுமதிக்க வேண்டாம்.',
+    'change_all_to_serialized'           => 'அனைத்தையும் தொடர்களாக மாற்றவும்',
+    'change_all_to_unserialized'         => 'அனைத்தையும் தொடர்களாக மாற்றவும்',
+    'change_image'                       => 'படத்தை மாற்று',
+    'confirm_bulk_edit'                  => 'Are you sure you want to edit selected Item(s)?',
+    'confirm_bulk_edit_wipe_taxes'       => 'All Item Tax information will be replaced.',
+    'confirm_delete'                     => 'Are you sure you want to delete selected item(s)?',
+    'confirm_restore'                    => 'Are you sure you want to restore selected item(s)?',
+    'cost_price'                         => 'Wholesale Price',
+    'cost_price_number'                  => 'Wholesale Price must be a number.',
+    'cost_price_required'                => 'Wholesale Price is a required field.',
+    'count'                              => 'Update Inventory',
+    'csv_import_failed'                  => 'CSV import failed',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'The uploaded CSV file has no data or is formatted incorrectly.',
+    'csv_import_partially_failed'        => 'There were {0} item import failure(s) on line(s): {1}. No rows were imported.',
+    'csv_import_success'                 => 'Item CSV import successful.',
+    'current_quantity'                   => 'Current Quantity',
+    'default_pack_name'                  => 'Each',
+    'description'                        => 'Description',
+    'details_count'                      => 'Inventory Count Details',
+    'do_nothing'                         => 'Do Nothing',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit the desired fields for selected item(s).',
+    'edit_multiple_items'                => 'Editing Multiple Items',
+    'empty_upc_items'                    => 'Empty Barcode Items',
+    'error_adding_updating'              => 'Error adding/updating item',
+    'error_updating_multiple'            => 'Error updating items',
+    'generate_barcodes'                  => 'Generate Barcodes',
+    'hsn_code'                           => 'Harmonized System Nomenclature',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Item Import from CSV',
+    'info_provided_by'                   => 'Information provided by',
+    'inventory'                          => 'Inventory',
+    'inventory_CSV_import_quantity'      => 'Quantity Imported from CSV',
+    'inventory_comments'                 => 'Comments',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Date',
+    'inventory_employee'                 => 'Employee',
+    'inventory_in_out_quantity'          => 'In/Out Quantity',
+    'inventory_remarks'                  => 'Remarks',
+    'is_deleted'                         => 'Deleted',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item has Serial Number',
+    'item'                               => 'Item',
+    'item_id'                            => '',
+    'item_number'                        => 'Barcode',
+    'item_number_duplicate'              => 'Item Number is already present in the database.',
+    'item_number_invalid'                => 'பொருள் எண் அனுமதிக்கப்படாத எழுத்துக்களைக் கொண்டுள்ளது.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Location',
+    'low_inventory_items'                => 'Out Of Stock Items',
+    'low_sell_item'                      => 'Low sell item',
+    'manually_editing_of_quantity'       => 'Manual Edit of Quantity',
+    'markup'                             => '',
+    'name'                               => 'Item Name',
+    'name_required'                      => 'Item Name is a required field.',
+    'new'                                => 'New Item',
+    'no_description_items'               => 'No Description Items',
+    'no_items_to_display'                => 'No Items to display.',
+    'none'                               => 'None',
+    'none_selected'                      => 'You have not selected any Item(s) to edit',
+    'nonstock'                           => 'Non-stocked',
+    'number_information'                 => 'Item Number',
+    'number_required'                    => 'Barcode is a required field.',
+    'one_or_multiple'                    => 'item(s)',
+    'pack_name'                          => 'Pack Name',
+    'qty_per_pack'                       => 'Quantity per pack',
+    'quantity'                           => 'Quantity',
+    'quantity_number'                    => 'Quantity must be a number.',
+    'quantity_required'                  => 'Quantity is a required field.',
+    'receiving_quantity'                 => 'Receiving Quantity',
+    'remove_image'                       => 'Remove Image',
+    'reorder_level'                      => 'Reorder Level',
+    'reorder_level_number'               => 'Reorder Level must be a number.',
+    'reorder_level_required'             => 'Reorder Level is a required field.',
+    'retrive_item_info'                  => 'உருப்படி தகவலை மீட்டெடுக்கவும்',
+    'sales_tax_1'                        => 'Sales Tax',
+    'sales_tax_2'                        => 'Sales Tax 2',
+    'search_attributes'                  => 'Search Attributes',
+    'select_image'                       => 'Select Image',
+    'serialized_items'                   => 'Serialized Items',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Stock',
+    'stock_location'                     => 'Stock location',
+    'stock_type'                         => 'Stock Type',
+    'successful_adding'                  => 'You have successfully added item',
+    'successful_bulk_edit'               => 'You have successfully updated the selected item(s)',
+    'successful_deleted'                 => 'You have successfully deleted',
+    'successful_updating'                => 'You have successfully updated item',
+    'supplier'                           => 'Supplier',
+    'tax_1'                              => 'Tax 1',
+    'tax_2'                              => 'Tax 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Tax Category',
+    'tax_name_invalid'                   => 'வரி பெயரில் அனுமதிக்கப்படாத எழுத்துக்கள் உள்ளன.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => 'Tax Percent must be a numeric value',
+    'tax_percent_required'               => 'Tax Percent is a required field.',
+    'tax_percents'                       => 'Tax Percent(s)',
+    'temp'                               => 'Temporary',
+    'type'                               => 'Item Type',
+    'unit_price'                         => 'Retail Price',
+    'unit_price_number'                  => 'Unit price must be a number.',
+    'unit_price_required'                => 'Retail Price is a required field.',
+    'upc_database'                       => 'Barcode Database',
+    'update'                             => 'Update Item',
+    'use_inventory_menu'                 => 'Use Inventory Menu',
 ];
diff --git a/app/Language/ta/Login.php b/app/Language/ta/Login.php
index 549b3baa1..bbeb19390 100644
--- a/app/Language/ta/Login.php
+++ b/app/Language/ta/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "ரோபோ ஸ்கிரிப்ட்கள் அல்ல.",
-    "go"                            => "செல்",
-    "invalid_gcaptcha"              => "நீங்கள் தானியங்கி அல்ல என்பதை உறுதி செய்யவும்.",
-    "invalid_installation"          => "நிறுவியத்தில் தவறு , php.ini கோப்பை சரி பார்க்கவும் .",
-    "invalid_username_and_password" => "பயனர்பெயர் அல்லது கடவுச்சொல் தவறு.",
-    "login"                         => "உள்நுழைய",
-    "logout"                        => "விடுபதிகை",
-    "migration_needed"              => "{0} க்கு தரவுத்தள இடம்பெயர்வு உள்நுழைந்த பிறகு தொடங்கும்.",
-    "password"                      => "கடவுச்சொல்",
-    "required_username"             => "",
-    "username"                      => "பயனர்பெயர்",
-    "welcome"                       => "{0} க்கு வருக!",
+    "gcaptcha"                            => "ரோபோ ஸ்கிரிப்ட்கள் அல்ல.",
+    "go"                                  => "செல்",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "நீங்கள் தானியங்கி அல்ல என்பதை உறுதி செய்யவும்.",
+    "invalid_installation"                => "நிறுவியத்தில் தவறு , php.ini கோப்பை சரி பார்க்கவும் .",
+    "invalid_username_and_password"       => "பயனர்பெயர் அல்லது கடவுச்சொல் தவறு.",
+    "login"                               => "உள்நுழைய",
+    "logout"                              => "விடுபதிகை",
+    "migrating_database"                  => "தரவுத்தளம் இடம்பெயர்கிறது",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "தரவுத்தளம் வெற்றிகரமாக இடம்பெயர்ந்தது!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "{0} க்கு தரவுத்தள இடம்பெயர்வு உள்நுழைந்த பிறகு தொடங்கும்.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "கடவுச்சொல்",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'பல முறை முயற்சி செய்யப்பட்டது. தயவுசெய்து சிறிது நேரம் காத்திருந்து மீண்டும் முயற்சிக்கவும்.',
+    "username"                            => "பயனர்பெயர்",
+    "welcome"                             => "{0} க்கு வருக!"
 ];
diff --git a/app/Language/ta/Reports.php b/app/Language/ta/Reports.php
index 1a4614bf2..826ffc417 100644
--- a/app/Language/ta/Reports.php
+++ b/app/Language/ta/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Tax Rate",
     "taxes"                                   => "Taxes",
     "taxes_summary_report"                    => "Taxes Summary Report",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Total Inventory Value",
     "total_low_sell_quantity"                 => "Total Low Sell Quantity",
diff --git a/app/Language/ta/Sales.php b/app/Language/ta/Sales.php
index 64591c078..fe6dd744d 100644
--- a/app/Language/ta/Sales.php
+++ b/app/Language/ta/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "இருப்பு புள்ளிகள்",
-    "rewards_package"                  => "வெகுமதிகள்",
-    "rewards_remaining_balance"        => "வெகுமதி புள்ளிகள் மீதமுள்ள மதிப்பு ",
-    "account_number"                   => "கணக்கு #",
-    "add_payment"                      => "கட்டணத்தைச் சேர்க்கவும்",
-    "amount_due"                       => "செலுத்த வேண்டிய தொகை",
-    "amount_tendered"                  => "கொடுத்த தொகை",
-    "authorized_signature"             => "அங்கீகரிக்கப்பட்ட கையெழுத்து",
-    "cancel_sale"                      => "ரத்துசெய்",
-    "cash"                             => "பணம்",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "பண சரிசெய்தல்",
-    "cash_deposit"                     => "பண வைப்பு",
-    "cash_filter"                      => "பணம்",
-    "change_due"                       => "நிலுவை",
-    "change_price"                     => "விற்பனை விலையை மாற்றவும்",
-    "check"                            => "சோதி",
-    "check_balance"                    => "மீதமுள்ளதை சோதி",
-    "check_filter"                     => "சோதி",
-    "close"                            => "",
-    "comment"                          => "குறிப்புரை",
-    "comments"                         => "குறிப்புரைகள்",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "நிறைவுறு",
-    "confirm_cancel_sale"              => "இந்த விற்பனையை அழிக்க விரும்புகிறீர்களா? அனைத்து பொருட்களும் அழிக்கப்படும்.",
-    "confirm_delete"                   => "தேர்ந்தெடுக்கப்பட்ட விற்பனை (களை) நீக்க விரும்புகிறீர்களா?",
-    "confirm_restore"                  => "தேர்ந்தெடுக்கப்பட்ட விற்பனை (களை) மீட்டமைக்க விரும்புகிறீர்களா?",
-    "credit"                           => "கடன் அட்டை",
-    "credit_deposit"                   => "கடன் வைப்பு",
-    "credit_filter"                    => "கடன் அட்டை",
-    "current_table"                    => "",
-    "customer"                         => "வாடிக்கையாளர்",
-    "customer_address"                 => "முகவரி",
-    "customer_discount"                => "தள்ளுபடி",
-    "customer_email"                   => "மின்னஞ்சல்",
-    "customer_location"                => "இடம்",
-    "customer_mailchimp_status"        => "மெயில்சிம்ப் நிலை",
-    "customer_optional"                => "(நிலுவை தொகை வைக்க அவசியம்)",
-    "customer_required"                => "(தேவை)",
-    "customer_total"                   => "மொத்தம்",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "விற்பனை தேதி",
-    "date_range"                       => "தேதி வரம்பு",
-    "date_required"                    => "சரியான தேதியை உள்ளிட வேண்டும்.",
-    "date_type"                        => "தேதி தேவையான உள்ளீடு.",
-    "debit"                            => "பற்று அட்டை",
-    "debit_filter"                     => "",
-    "delete"                           => "நீக்க அனுமதிக்கவும்",
-    "delete_confirmation"              => "இந்த விற்பனையை நீக்க விரும்புகிறீர்களா? இந்த செயலை திரும்ப பெற முடியாது.",
-    "delete_entire_sale"               => "முழு விற்பனையையும் நீக்கு",
-    "delete_successful"                => "விற்பனை நீக்கப்பட்டது.",
-    "delete_unsuccessful"              => "விற்பனை நீக்கப்படவில்லை.",
-    "description_abbrv"                => "பொருள்.",
-    "discard"                          => "கைவிடு",
-    "discard_quote"                    => "",
-    "discount"                         => "தள்ளு",
-    "discount_included"                => "% தள்ளுபடி",
-    "discount_short"                   => "%",
-    "due"                              => "நிலுவை",
-    "due_filter"                       => "நிலுவை",
-    "edit"                             => "திருத்து",
-    "edit_item"                        => "பொருளை திருத்து",
-    "edit_sale"                        => "விற்பனையை திருத்து",
-    "email_receipt"                    => "மின்னஞ்சல் ரசீது",
-    "employee"                         => "ஊழியர்",
-    "entry"                            => "உள்ளீடு",
-    "error_editing_item"               => "பொருளை திருத்துவதில் பிழை",
-    "find_or_scan_item"                => "பொருளைக் தேடு அல்லது ஸ்கேன் செய்யுங்கள்",
-    "find_or_scan_item_or_receipt"     => "தேடு அல்லது பொருளை வருடு அல்லது ரசீது",
-    "giftcard"                         => "பரிசு அட்டை",
-    "giftcard_balance"                 => "பரிசு அட்டை இருப்பு",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "பரிசு அட்டை எண்",
-    "group_by_category"                => "வகை வாரியாக",
-    "group_by_type"                    => "வகை வாரியாக",
-    "hsn"                              => "HSN",
-    "id"                               => "விற்பனை எண்",
-    "include_prices"                   => "விலைகளைச் சேர்க்கவா?",
-    "invoice"                          => "விற்பனைச்சிட்டை",
-    "invoice_confirm"                  => "இந்த விற்பனைச்சிட்டை அனுப்பப்படும்",
-    "invoice_enable"                   => "விற்பனைச்சிட்டை எண்",
-    "invoice_filter"                   => "விற்பனைச்சிட்டைகள்",
-    "invoice_no_email"                 => "இந்த வாடிக்கையாளருக்கு சரியான மின்னஞ்சல் முகவரி இல்லை.",
-    "invoice_number"                   => "விற்பனைச்சிட்டை #",
-    "invoice_number_duplicate"         => "விற்பனைச்சிட்டை எண் {0} தனித்துவமாக இருக்க வேண்டும்.",
-    "invoice_sent"                     => "விற்பனைச்சிட்டை அனுப்பப்பட்டது",
-    "invoice_total"                    => "விற்பனைச்சிட்டை மொத்தம்",
-    "invoice_type_custom_invoice"      => "தனிப்பயன் விலைப்பட்டியல் (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "தனிப்பயன் வரி விலைப்பட்டியல் (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "விலைப்பட்டியல் (விலைப்பட்டியல். Php)",
-    "invoice_type_tax_invoice"         => "வரி விலைப்பட்டியல் (tax_invoice.php)",
-    "invoice_unsent"                   => "விற்பனைச்சிட்டை அனுப்பப்படவில்லை",
-    "invoice_update"                   => "மறுபரிசீலனை",
-    "item_insufficient_of_stock"       => "உருப்படிக்கு போதுமான பங்கு இல்லை.",
-    "item_name"                        => "பொருளின் பெயர்",
-    "item_number"                      => "பொருள் #",
-    "item_out_of_stock"                => "பொருள் கையிருப்பில் இல்லை.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "சில்லரை வணிகம்",
-    "must_enter_numeric"               => "தொகை ஒரு எண்ணாக இருக்க வேண்டும்.",
-    "must_enter_numeric_giftcard"      => "பரிசு அட்டை எண் ஒரு எண்ணாக இருக்க வேண்டும்.",
-    "new_customer"                     => "புது வாடிக்கையாளர்",
-    "new_item"                         => "புதிய பொருள்",
-    "no_description"                   => "No description",
-    "no_filter"                        => "அனைத்தும்",
-    "no_items_in_cart"                 => "வண்டியில் எந்த பொருட்களும் இல்லை.",
-    "no_sales_to_display"              => "காண்பிக்க எந்த விற்பனையும் இல்லை.",
-    "none_selected"                    => "விற்பனை(களை) நீக்க நீங்கள் எந்தப் பொருட்களையும் தேர்ந்தெடுக்கவில்லை.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "இந்த செயலுக்கு அங்கீகாரம் இல்லை.",
-    "one_or_multiple"                  => "விற்பனை(கள்)",
-    "payment"                          => "கட்டண வகை",
-    "payment_amount"                   => "தொகை",
-    "payment_not_cover_total"          => "கட்டண தொகை மொத்தத்தை விட அதிகமாகவோ அல்லது சமமாகவோ இருக்க வேண்டும்.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "மொத்தக் கட்டணம்",
-    "price"                            => "விலை",
-    "print_after_sale"                 => "விற்பனைக்குப் பிறகு அச்சிடு",
-    "quantity"                         => "அளவு",
-    "quantity_less_than_reorder_level" => "எச்சரிக்கை: விரும்பிய அளவு அந்த உருப்படிக்கான மறுவரிசை நிலைக்கு கீழே உள்ளது.",
-    "quantity_less_than_zero"          => "எச்சரிக்கை: விரும்பிய அளவு போதுமானதாக இல்லை. இருப்பினும் நீங்கள் விற்பனையைச் செயல்படுத்தலாம், ஆனால் உங்கள் சரக்குகளைத் தணிக்கை செய்யுங்கள்.",
-    "quantity_of_items"                => "{0} பொருட்களின் அளவு",
-    "quote"                            => "விலைப்புள்ளி",
-    "quote_number"                     => "விலைப்புள்ளி எண்",
-    "quote_number_duplicate"           => "விலைப்புள்ளி எண் தனித்துவமாக இருக்க வேண்டும்.",
-    "quote_sent"                       => "விலைப்புள்ளி அனுப்பப்பட்டது",
-    "quote_unsent"                     => "விலைப்புள்ளியை அனுப்ப இயலவில்லை",
-    "receipt"                          => "விற்பனை ரசீது",
-    "receipt_no_email"                 => "இந்த வாடிக்கையாளருக்கு சரியான மின்னஞ்சல் முகவரி இல்லை.",
-    "receipt_number"                   => "விற்பனை #",
-    "receipt_sent"                     => "ரசீது அனுப்பப்பட்டது",
-    "receipt_unsent"                   => "ரசீதை அனுப்ப இயலவில்லை",
-    "refund"                           => "பணத்தைத் திரும்பப்பெறுதல் வகை",
-    "register"                         => "விற்பனை பதிவு",
-    "remove_customer"                  => "வாடிக்கையாளரை அகற்று",
-    "remove_discount"                  => "",
-    "return"                           => "Return",
-    "rewards"                          => "வெகுமதி புள்ளிகள்",
-    "rewards_balance"                  => "வெகுமதி புள்ளிகள் இருப்பு",
-    "sale"                             => "விற்பனை",
-    "sale_by_invoice"                  => "விலைப்பட்டியல் மூலம் விற்பனை",
-    "sale_for_customer"                => "வாடிக்கையாளர்:",
-    "sale_time"                        => "நேரம்",
-    "sales_tax"                        => "விற்பனை வரி",
-    "sales_total"                      => "",
-    "select_customer"                  => "வாடிக்கையாளரைத் தேர்ந்தெடு",
-    "send_invoice"                     => "விலைப்பட்டியல் அனுப்பு",
-    "send_quote"                       => "விலைப்புள்ளியை அனுப்பு",
-    "send_receipt"                     => "ரசீதை அனுப்பு",
-    "send_work_order"                  => "பணி ஆணையை அனுப்பவும்",
-    "serial"                           => "வரிசை",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "விலைப்பட்டியலைக் காட்டு",
-    "show_receipt"                     => "ரசீதைக் காட்டு",
-    "start_typing_customer_name"       => "வாடிக்கையாளர் விவரங்களைத் தட்டச்சு செய்யத் தொடங்கு...",
-    "start_typing_item_name"           => "Start typing Item Name or scan Barcode...",
-    "stock"                            => "Stock",
-    "stock_location"                   => "Stock Location",
-    "sub_total"                        => "Subtotal",
-    "successfully_deleted"             => "You have successfully deleted",
-    "successfully_restored"            => "You have successfully restored",
-    "successfully_suspended_sale"      => "Sale suspend successful.",
-    "successfully_updated"             => "Sale update successful.",
-    "suspend_sale"                     => "Suspend",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspended",
-    "table"                            => "Table",
-    "takings"                          => "Daily Sales",
-    "tax"                              => "Tax",
-    "tax_id"                           => "Tax Id",
-    "tax_invoice"                      => "Tax Invoice",
-    "tax_percent"                      => "Tax %",
-    "taxed_ind"                        => "வ",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Tax excluded",
-    "transaction_failed"               => "Sales Transaction failed.",
-    "unable_to_add_item"               => "Item add to Sale failed",
-    "unsuccessfully_deleted"           => "Sale(s) delete failed.",
-    "unsuccessfully_restored"          => "Sale(s) restore failed.",
-    "unsuccessfully_suspended_sale"    => "Sale suspend failed.",
-    "unsuccessfully_updated"           => "Sale update failed.",
-    "unsuspend"                        => "Unsuspend",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Update",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Work Order",
-    "work_order_number"                => "Work Order Number",
-    "work_order_number_duplicate"      => "Work Order Number must be unique.",
-    "work_order_sent"                  => "Work Order sent to",
-    "work_order_unsent"                => "Work Order failed to be sent to",
+    'account_number'                    => 'கணக்கு #',
+    'add_payment'                       => 'கட்டணத்தைச் சேர்க்கவும்',
+    'amount_due'                        => 'செலுத்த வேண்டிய தொகை',
+    'amount_due_not_covered'            => 'செலுத்தப்பட்ட தொகை நிலுவைத் தொகையை ஈடுசெய்யவில்லை.',
+    'amount_tendered'                   => 'கொடுத்த தொகை',
+    'authorized_signature'              => 'அங்கீகரிக்கப்பட்ட கையெழுத்து',
+    'cancel_sale'                       => 'ரத்துசெய்',
+    'cash'                              => 'பணம்',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'பண சரிசெய்தல்',
+    'cash_deposit'                      => 'பண வைப்பு',
+    'cash_filter'                       => 'பணம்',
+    'change_due'                        => 'நிலுவை',
+    'change_price'                      => 'விற்பனை விலையை மாற்றவும்',
+    'check'                             => 'சோதி',
+    'check_balance'                     => 'மீதமுள்ளதை சோதி',
+    'check_filter'                      => 'சோதி',
+    'close'                             => '',
+    'comment'                           => 'குறிப்புரை',
+    'comments'                          => 'குறிப்புரைகள்',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'நிறைவுறு',
+    'confirm_cancel_sale'               => 'இந்த விற்பனையை அழிக்க விரும்புகிறீர்களா? அனைத்து பொருட்களும் அழிக்கப்படும்.',
+    'confirm_delete'                    => 'தேர்ந்தெடுக்கப்பட்ட விற்பனை (களை) நீக்க விரும்புகிறீர்களா?',
+    'confirm_restore'                   => 'தேர்ந்தெடுக்கப்பட்ட விற்பனை (களை) மீட்டமைக்க விரும்புகிறீர்களா?',
+    'credit'                            => 'கடன் அட்டை',
+    'credit_deposit'                    => 'கடன் வைப்பு',
+    'credit_filter'                     => 'கடன் அட்டை',
+    'current_table'                     => '',
+    'customer'                          => 'வாடிக்கையாளர்',
+    'customer_address'                  => 'முகவரி',
+    'customer_discount'                 => 'தள்ளுபடி',
+    'customer_email'                    => 'மின்னஞ்சல்',
+    'customer_location'                 => 'இடம்',
+    'customer_mailchimp_status'         => 'மெயில்சிம்ப் நிலை',
+    'customer_optional'                 => '(நிலுவை தொகை வைக்க அவசியம்)',
+    'customer_required'                 => '(தேவை)',
+    'customer_total'                    => 'மொத்தம்',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'இருப்பு புள்ளிகள்',
+    'daily_sales'                       => '',
+    'date'                              => 'விற்பனை தேதி',
+    'date_range'                        => 'தேதி வரம்பு',
+    'date_required'                     => 'சரியான தேதியை உள்ளிட வேண்டும்.',
+    'date_type'                         => 'தேதி தேவையான உள்ளீடு.',
+    'debit'                             => 'பற்று அட்டை',
+    'debit_filter'                      => '',
+    'delete'                            => 'நீக்க அனுமதிக்கவும்',
+    'delete_confirmation'               => 'இந்த விற்பனையை நீக்க விரும்புகிறீர்களா? இந்த செயலை திரும்ப பெற முடியாது.',
+    'delete_entire_sale'                => 'முழு விற்பனையையும் நீக்கு',
+    'delete_successful'                 => 'விற்பனை நீக்கப்பட்டது.',
+    'delete_unsuccessful'               => 'விற்பனை நீக்கப்படவில்லை.',
+    'description_abbrv'                 => 'பொருள்.',
+    'discard'                           => 'கைவிடு',
+    'discard_quote'                     => '',
+    'discount'                          => 'தள்ளு',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% தள்ளுபடி',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'நிலுவை',
+    'due_filter'                        => 'நிலுவை',
+    'edit'                              => 'திருத்து',
+    'edit_item'                         => 'பொருளை திருத்து',
+    'edit_sale'                         => 'விற்பனையை திருத்து',
+    'email_receipt'                     => 'மின்னஞ்சல் ரசீது',
+    'employee'                          => 'ஊழியர்',
+    'entry'                             => 'உள்ளீடு',
+    'error_editing_item'                => 'பொருளை திருத்துவதில் பிழை',
+    'find_or_scan_item'                 => 'பொருளைக் தேடு அல்லது ஸ்கேன் செய்யுங்கள்',
+    'find_or_scan_item_or_receipt'      => 'தேடு அல்லது பொருளை வருடு அல்லது ரசீது',
+    'giftcard'                          => 'பரிசு அட்டை',
+    'giftcard_balance'                  => 'பரிசு அட்டை இருப்பு',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'பரிசு அட்டை எண்',
+    'group_by_category'                 => 'வகை வாரியாக',
+    'group_by_type'                     => 'வகை வாரியாக',
+    'hsn'                               => 'HSN',
+    'id'                                => 'விற்பனை எண்',
+    'include_prices'                    => 'விலைகளைச் சேர்க்கவா?',
+    'insufficient_giftcard_balance'     => 'இந்தக் கட்டணத்திற்கு போதிய பரிசு அட்டை சமநிலை இல்லை.',
+    'insufficient_reward_points'        => 'இந்தக் கட்டணத்திற்கு போதிய வெகுமதி புள்ளிகள் இல்லை.',
+    'invoice'                           => 'விற்பனைச்சிட்டை',
+    'invoice_confirm'                   => 'இந்த விற்பனைச்சிட்டை அனுப்பப்படும்',
+    'invoice_enable'                    => 'விற்பனைச்சிட்டை எண்',
+    'invoice_filter'                    => 'விற்பனைச்சிட்டைகள்',
+    'invoice_no_email'                  => 'இந்த வாடிக்கையாளருக்கு சரியான மின்னஞ்சல் முகவரி இல்லை.',
+    'invoice_number'                    => 'விற்பனைச்சிட்டை #',
+    'invoice_number_duplicate'          => 'விற்பனைச்சிட்டை எண் {0} தனித்துவமாக இருக்க வேண்டும்.',
+    'invoice_sent'                      => 'விற்பனைச்சிட்டை அனுப்பப்பட்டது',
+    'invoice_total'                     => 'விற்பனைச்சிட்டை மொத்தம்',
+    'invoice_type_custom_invoice'       => 'தனிப்பயன் விலைப்பட்டியல் (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'தனிப்பயன் வரி விலைப்பட்டியல் (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'விலைப்பட்டியல் (விலைப்பட்டியல். Php)',
+    'invoice_type_tax_invoice'          => 'வரி விலைப்பட்டியல் (tax_invoice.php)',
+    'invoice_unsent'                    => 'விற்பனைச்சிட்டை அனுப்பப்படவில்லை',
+    'invoice_update'                    => 'மறுபரிசீலனை',
+    'item_insufficient_of_stock'        => 'உருப்படிக்கு போதுமான பங்கு இல்லை.',
+    'item_name'                         => 'பொருளின் பெயர்',
+    'item_number'                       => 'பொருள் #',
+    'item_out_of_stock'                 => 'பொருள் கையிருப்பில் இல்லை.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'சில்லரை வணிகம்',
+    'must_enter_numeric'                => 'தொகை ஒரு எண்ணாக இருக்க வேண்டும்.',
+    'must_enter_numeric_giftcard'       => 'பரிசு அட்டை எண் ஒரு எண்ணாக இருக்க வேண்டும்.',
+    'must_enter_reference_code'         => 'குறிப்பு/மீட்டெடுப்பு எண் உள்ளிட வேண்டும்.',
+    'negative_amount_tendered'          => 'கொடுத்த தொகை எதிர்மறையாக இருக்கக்கூடாது.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'புது வாடிக்கையாளர்',
+    'new_item'                          => 'புதிய பொருள்',
+    'no_description'                    => 'No description',
+    'no_filter'                         => 'அனைத்தும்',
+    'no_items_in_cart'                  => 'வண்டியில் எந்த பொருட்களும் இல்லை.',
+    'no_sales_to_display'               => 'காண்பிக்க எந்த விற்பனையும் இல்லை.',
+    'none_selected'                     => 'விற்பனை(களை) நீக்க நீங்கள் எந்தப் பொருட்களையும் தேர்ந்தெடுக்கவில்லை.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'இந்த செயலுக்கு அங்கீகாரம் இல்லை.',
+    'one_or_multiple'                   => 'விற்பனை(கள்)',
+    'payment'                           => 'கட்டண வகை',
+    'payment_amount'                    => 'தொகை',
+    'payment_not_cover_total'           => 'கட்டண தொகை மொத்தத்தை விட அதிகமாகவோ அல்லது சமமாகவோ இருக்க வேண்டும்.',
+    'payment_type'                      => 'Type',
+    'payments'                          => '',
+    'payments_total'                    => 'மொத்தக் கட்டணம்',
+    'price'                             => 'விலை',
+    'print_after_sale'                  => 'விற்பனைக்குப் பிறகு அச்சிடு',
+    'quantity'                          => 'அளவு',
+    'quantity_less_than_reorder_level'  => 'எச்சரிக்கை: விரும்பிய அளவு அந்த உருப்படிக்கான மறுவரிசை நிலைக்கு கீழே உள்ளது.',
+    'quantity_less_than_zero'           => 'எச்சரிக்கை: விரும்பிய அளவு போதுமானதாக இல்லை. இருப்பினும் நீங்கள் விற்பனையைச் செயல்படுத்தலாம், ஆனால் உங்கள் சரக்குகளைத் தணிக்கை செய்யுங்கள்.',
+    'quantity_of_items'                 => '{0} பொருட்களின் அளவு',
+    'quote'                             => 'விலைப்புள்ளி',
+    'quote_number'                      => 'விலைப்புள்ளி எண்',
+    'quote_number_duplicate'            => 'விலைப்புள்ளி எண் தனித்துவமாக இருக்க வேண்டும்.',
+    'quote_sent'                        => 'விலைப்புள்ளி அனுப்பப்பட்டது',
+    'quote_unsent'                      => 'விலைப்புள்ளியை அனுப்ப இயலவில்லை',
+    'receipt'                           => 'விற்பனை ரசீது',
+    'receipt_no_email'                  => 'இந்த வாடிக்கையாளருக்கு சரியான மின்னஞ்சல் முகவரி இல்லை.',
+    'receipt_number'                    => 'விற்பனை #',
+    'receipt_sent'                      => 'ரசீது அனுப்பப்பட்டது',
+    'receipt_unsent'                    => 'ரசீதை அனுப்ப இயலவில்லை',
+    'reference_code'                    => 'கட்டண குறிப்பு குறியீடு',
+    'reference_code_invalid_characters' => 'குறிப்பு குறியீடு எழுத்துக்கள் மற்றும் எண்கள் மட்டுமே கொண்டிருக்க வேண்டும்.',
+    'reference_code_length_error'       => 'குறிப்பு குறியீட்டின் நீளம் தவறானது.',
+    'refund'                            => 'பணத்தைத் திரும்பப்பெறுதல் வகை',
+    'register'                          => 'விற்பனை பதிவு',
+    'remove_customer'                   => 'வாடிக்கையாளரை அகற்று',
+    'remove_discount'                   => '',
+    'return'                            => 'Return',
+    'rewards'                           => 'வெகுமதி புள்ளிகள்',
+    'rewards_balance'                   => 'வெகுமதி புள்ளிகள் இருப்பு',
+    'rewards_package'                   => 'வெகுமதிகள்',
+    'rewards_remaining_balance'         => 'வெகுமதி புள்ளிகள் மீதமுள்ள மதிப்பு ',
+    'sale'                              => 'விற்பனை',
+    'sale_by_invoice'                   => 'விலைப்பட்டியல் மூலம் விற்பனை',
+    'sale_for_customer'                 => 'வாடிக்கையாளர்:',
+    'sale_time'                         => 'நேரம்',
+    'sales_tax'                         => 'விற்பனை வரி',
+    'sales_total'                       => '',
+    'select_customer'                   => 'வாடிக்கையாளரைத் தேர்ந்தெடு',
+    'send_invoice'                      => 'விலைப்பட்டியல் அனுப்பு',
+    'send_quote'                        => 'விலைப்புள்ளியை அனுப்பு',
+    'send_receipt'                      => 'ரசீதை அனுப்பு',
+    'send_work_order'                   => 'பணி ஆணையை அனுப்பவும்',
+    'serial'                            => 'வரிசை',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'விலைப்பட்டியலைக் காட்டு',
+    'show_receipt'                      => 'ரசீதைக் காட்டு',
+    'start_typing_customer_name'        => 'வாடிக்கையாளர் விவரங்களைத் தட்டச்சு செய்யத் தொடங்கு...',
+    'start_typing_item_name'            => 'Start typing Item Name or scan Barcode...',
+    'stock'                             => 'Stock',
+    'stock_location'                    => 'Stock Location',
+    'sub_total'                         => 'Subtotal',
+    'successfully_deleted'              => 'You have successfully deleted',
+    'successfully_restored'             => 'You have successfully restored',
+    'successfully_suspended_sale'       => 'Sale suspend successful.',
+    'successfully_updated'              => 'Sale update successful.',
+    'suspend_sale'                      => 'Suspend',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspended',
+    'table'                             => 'Table',
+    'takings'                           => 'Daily Sales',
+    'tax'                               => 'Tax',
+    'tax_id'                            => 'Tax Id',
+    'tax_invoice'                       => 'Tax Invoice',
+    'tax_percent'                       => 'Tax %',
+    'taxed_ind'                         => 'வ',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Tax excluded',
+    'transaction_failed'                => 'Sales Transaction failed.',
+    'unable_to_add_item'                => 'Item add to Sale failed',
+    'unsuccessfully_deleted'            => 'Sale(s) delete failed.',
+    'unsuccessfully_restored'           => 'Sale(s) restore failed.',
+    'unsuccessfully_suspended_sale'     => 'Sale suspend failed.',
+    'unsuccessfully_updated'            => 'Sale update failed.',
+    'unsuspend'                         => 'Unsuspend',
+    'unsuspend_and_delete'              => 'Action',
+    'update'                            => 'Update',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Work Order',
+    'work_order_number'                 => 'Work Order Number',
+    'work_order_number_duplicate'       => 'Work Order Number must be unique.',
+    'work_order_sent'                   => 'Work Order sent to',
+    'work_order_unsent'                 => 'Work Order failed to be sent to',
 ];
diff --git a/app/Language/th/Attributes.php b/app/Language/th/Attributes.php
index 4b5d5b65e..3d10767f0 100644
--- a/app/Language/th/Attributes.php
+++ b/app/Language/th/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "คุณลักษณะไม่สามารถมีเครื่องหมาย ':' หรือเครื่องหมาย '|' ได้",
-    "confirm_delete"                   => "ต้องการลบคุณลักษณะที่เลือกหรือไม่ ?",
-    "confirm_restore"                  => "ต้องการคืนค่าคุณลักษณะที่เลือกหรือไม่ ?",
-    "definition_cannot_be_deleted"     => "ไม่สามารถลบคุณลักษณะที่เลือก",
-    "definition_error_adding_updating" => "ไม่สามารถเพิ่มหรือแก้ไขคุณลักษณะ {0}, โปรดตรวจสอบความผิดพลาดในบันทึก",
-    "definition_flags"                 => "การมองเห็นคุณลักษณะ",
-    "definition_group"                 => "กลุ่ม",
-    "definition_id"                    => "ID",
-    "definition_name"                  => "เพิ่มแอตทริบิวต์",
-    "definition_name_required"         => "ชื่อแอตทริบิวต์ จำเป็นต้องป้อน",
-    "definition_one_or_multiple"       => "แอตทริบิวต์",
-    "definition_successful_adding"     => "เพิ่มรายการสำเร็จแล้ว",
-    "definition_successful_deleted"    => "ลบรายการสำเร็จแล้ว",
-    "definition_successful_updating"   => "อัปเดตแอตทริบิวต์สำเร็จแล้ว",
-    "definition_type"                  => "ประเภทแอตทริบิวต์",
-    "definition_type_required"         => "ประเภทแอตทริบิวต์ จำเป็นต้องป้อน",
-    "definition_unit"                  => "หน่วยวัด",
-    "definition_values"                => "ค่าแอตทริบิวต์",
-    "new"                              => "สร้าง แอตทริบิวต์",
-    "no_attributes_to_display"         => "ไม่มีรายการที่จะแสดง",
-    "receipt_visibility"               => "ใบเสร็จ",
-    "show_in_items"                    => "แสดงใน รายการสินค้า",
-    "show_in_items_visibility"         => "รายการสินค้า",
-    "show_in_receipt"                  => "แสดงใน ใบเสร็จ",
-    "show_in_receivings"               => "แสดงใน สินค้าขาเข้า",
-    "show_in_receivings_visibility"    => "สินค้าขาเข้า",
-    "show_in_sales"                    => "แสดงใน การขาย",
-    "show_in_sales_visibility"         => "การขาย",
-    "update"                           => "ปรับปรุงแอตทริบิวต์",
+    'attribute_value_invalid_chars'    => 'คุณลักษณะไม่สามารถมีเครื่องหมาย \':\' หรือเครื่องหมาย \'|\' ได้',
+    'confirm_delete'                   => 'ต้องการลบคุณลักษณะที่เลือกหรือไม่ ?',
+    'confirm_restore'                  => 'ต้องการคืนค่าคุณลักษณะที่เลือกหรือไม่ ?',
+    'definition_cannot_be_deleted'     => 'ไม่สามารถลบคุณลักษณะที่เลือก',
+    'definition_invalid_group' => 'กลุ่มที่เลือกไม่มีอยู่หรือไม่ถูกต้อง',
+    'definition_error_adding_updating' => 'ไม่สามารถเพิ่มหรือแก้ไขคุณลักษณะ {0}, โปรดตรวจสอบความผิดพลาดในบันทึก',
+    'definition_flags'                 => 'การมองเห็นคุณลักษณะ',
+    'definition_group'                 => 'กลุ่ม',
+    'definition_id'                    => 'ID',
+    'definition_name'                  => 'เพิ่มแอตทริบิวต์',
+    'definition_name_required'         => 'ชื่อแอตทริบิวต์ จำเป็นต้องป้อน',
+    'definition_one_or_multiple'       => 'แอตทริบิวต์',
+    'definition_successful_adding'     => 'เพิ่มรายการสำเร็จแล้ว',
+    'definition_successful_deleted'    => 'ลบรายการสำเร็จแล้ว',
+    'definition_successful_updating'   => 'อัปเดตแอตทริบิวต์สำเร็จแล้ว',
+    'definition_type'                  => 'ประเภทแอตทริบิวต์',
+    'definition_type_required'         => 'ประเภทแอตทริบิวต์ จำเป็นต้องป้อน',
+    'definition_unit'                  => 'หน่วยวัด',
+    'definition_values'                => 'ค่าแอตทริบิวต์',
+    'new'                              => 'สร้าง แอตทริบิวต์',
+    'no_attributes_to_display'         => 'ไม่มีรายการที่จะแสดง',
+    'receipt_visibility'               => 'ใบเสร็จ',
+    'show_in_items'                    => 'แสดงใน รายการสินค้า',
+    'show_in_items_visibility'         => 'รายการสินค้า',
+    'show_in_receipt'                  => 'แสดงใน ใบเสร็จ',
+    'show_in_receivings'               => 'แสดงใน สินค้าขาเข้า',
+    'show_in_receivings_visibility'    => 'สินค้าขาเข้า',
+    'show_in_sales'                    => 'แสดงใน การขาย',
+    'show_in_sales_visibility'         => 'การขาย',
+    'show_in_search'                   => 'แสดงใน การค้นหา',
+    'show_in_search_visibility'        => 'การค้นหา',
+    'update'                           => 'ปรับปรุงแอตทริบิวต์',
 ];
diff --git a/app/Language/th/Bootstrap_tables.php b/app/Language/th/Bootstrap_tables.php
index c384db69a..76c2f2574 100644
--- a/app/Language/th/Bootstrap_tables.php
+++ b/app/Language/th/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "ทั้งหมด",
-    "columns"              => "คอลัมน์",
-    "hide_show_pagination" => "ซ่อน/แสดง รายการหน้า",
-    "loading"              => "กำลังดำเนินการ รอสักครู่",
-    "page_from_to"         => "แสดง {0} ถึง {1} จาก {2} รายการ",
-    "refresh"              => "Refresh ข้อมูล",
-    "rows_per_page"        => "{0} รายการ/หน้า",
-    "toggle"               => "ซ่อน/แสดง",
+    'all' => "ทั้งหมด",
+    'columns' => "คอลัมน์",
+    'hide_show_pagination' => "ซ่อน/แสดง รายการหน้า",
+    'loading' => "กำลังดำเนินการ รอสักครู่ ...",
+    'page_from_to' => "แสดง {0} ถึง {1} จาก {2} รายการ",
+    'refresh' => "Refresh ข้อมูล",
+    'rows_per_page' => "{0} รายการ/หน้า",
+    'toggle' => "ซ่อน/แสดง",
 ];
diff --git a/app/Language/th/Config.php b/app/Language/th/Config.php
index 0b67a5b96..7cc25761e 100644
--- a/app/Language/th/Config.php
+++ b/app/Language/th/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "ที่อยู่",
-    "address_required"                          => "ที่อยู่ต้องกรอก",
-    "all_set"                                   => "การตั้งค่าอนุญาตไฟล์ทั้งหมดถูกต้อง!",
-    "allow_duplicate_barcodes"                  => "อนุญาตบาร์โค้ดที่ซ้ำกัน",
-    "apostrophe"                                => "อัญประกาศเดี่ยว '",
-    "backup_button"                             => "สำรองข้อมูล",
-    "backup_database"                           => "สำรองฐานข้อมูล",
-    "barcode"                                   => "ตั้งค่าระบบบาร์โค้ด",
-    "barcode_company"                           => "ชื่อร้านค้า",
-    "barcode_configuration"                     => "ตั้งค่าระบบบาร์โค้ด",
-    "barcode_content"                           => "รหัสที่พิมพ์",
-    "barcode_first_row"                         => "แถว 1",
-    "barcode_font"                              => "แบบอักษร",
-    "barcode_formats"                           => "รูปแบบอินพุต",
-    "barcode_generate_if_empty"                 => "Generate if empty",
-    "barcode_height"                            => "สูง (px)",
-    "barcode_id"                                => "รหัสสินค้า/ชื่อสินค้า",
-    "barcode_info"                              => "ตั้งค่าบาร์โค้ด",
-    "barcode_layout"                            => "โครงร่างการพิมพ์",
-    "barcode_name"                              => "สินค้า",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "จำนวนดวงใน 1 แถว",
-    "barcode_page_cellspacing"                  => "ระยะห่างต่อดวง",
-    "barcode_page_width"                        => "ความกว้างในหน้า",
-    "barcode_price"                             => "ราคา",
-    "barcode_second_row"                        => "แถว 2",
-    "barcode_third_row"                         => "แถว 3",
-    "barcode_tooltip"                           => "คำเตือน: คุณสมบัตินี้สามารถทำให้เกิดรายการที่ซ้ำกันที่จะนำเข้าหรือสร้าง ห้ามใช้หากคุณไม่ต้องการบาร์โค้ดที่ซ้ำกัน",
-    "barcode_type"                              => "ประเภทบาร์โค้ด",
-    "barcode_width"                             => "กว้าง (px)",
-    "bottom"                                    => "ด้านล่าง",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "ทศนิยมแบบการเงินสด",
-    "cash_decimals_tooltip"                     => "ถ้าทศนิยมแบบเงินสดและทศนิยมแบบสกุลเงินเหมือนกันจะไม่มีการปัดเศษเงินสด",
-    "cash_rounding"                             => "การปัดเศษทางการเงิน",
-    "category_dropdown"                         => "แสดงกลุ่มเป็นแบบดรอปดาวน์",
-    "center"                                    => "กึ่งกลาง",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "จุลภาค",
-    "company"                                   => "ชื่อร้านค้า",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "เปลี่ยนรูป",
-    "company_logo"                              => "ภาพโลโก้",
-    "company_remove_image"                      => "ลบรูป",
-    "company_required"                          => "ชื่อร้านค้าต้องกรอก",
-    "company_select_image"                      => "เลือกรูป",
-    "company_website_url"                       => "ที่อยู่เว็บไซต์ร้านค้าไม่ถูกต้อง (เช่น http://...)",
-    "country_codes"                             => "รหัสประเทศ",
-    "country_codes_tooltip"                     => "รายการรหัสประเทศที่คั่นด้วยคอมม่าสำหรับการค้นหาโดยชื่อที่อยู่",
-    "currency_code"                             => "รหัสสกุลเงิน",
-    "currency_decimals"                         => "ทศนิยมแบบการเงิน",
-    "currency_symbol"                           => "สัญลักษณ์ค่าเงิน",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "รางวัล",
-    "customer_reward_duplicate"                 => "รางวัลต้องไม่ซ้ำกัน",
-    "customer_reward_enable"                    => "เปิดใช้งานรางวัลของลูกค้า",
-    "customer_reward_invalid_chars"             => "รางวัลไม่สามารถมี '_' ได้",
-    "customer_reward_required"                  => "รางวัลเป็นฟิลด์บังคับ",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "ตัวกรองวันที่และเวลา",
-    "datetimeformat"                            => "รูปแบบวันและเวลา",
-    "decimal_point"                             => "จุดทศนิยม",
-    "default_barcode_font_size_number"          => "ค่าบาร์โค้ดจะต้องเป็นตัวเลข",
-    "default_barcode_font_size_required"        => "ต้องระบุขนาดตัวบาร์โค้ดเริ่มต้น",
-    "default_barcode_height_number"             => "ความสูงของบาร์โค้ดต้องเป็นตัวเลข",
-    "default_barcode_height_required"           => "ต้องระบุความสูงของบาร์โค้ด",
-    "default_barcode_num_in_row_number"         => "บาร์โค้ดในแถวจะต้องเป็นตัวเลข",
-    "default_barcode_num_in_row_required"       => "ต้องระบุค่าบาร์โค้ด",
-    "default_barcode_page_cellspacing_number"   => "The default barcode page cellspacing must be a number",
-    "default_barcode_page_cellspacing_required" => "The default barcode page cellspacing is a required field",
-    "default_barcode_page_width_number"         => "The default barcode page width must be a number",
-    "default_barcode_page_width_required"       => "The default barcode page width is a required field",
-    "default_barcode_width_number"              => "The default barcode width must be a number",
-    "default_barcode_width_required"            => "The default barcode width is a required field",
-    "default_item_columns"                      => "คอลัมน์รายการที่แสดงเป็นค่าเริ่มต้น",
-    "default_origin_tax_code"                   => "รหัสภาษีที่เป็นค่าเริ่มต้น",
-    "default_receivings_discount"               => "ส่วนลดที่เป็นค่าเริ่มต้นที่จะได้รับ",
-    "default_receivings_discount_number"        => "การรับส่วนลดที่เป็นค่าเริ่มต้นต้องเป็นตัวเลข",
-    "default_receivings_discount_required"      => "การรับส่วนลดที่เป็นค่าเริ่มต้นจำเป็นต้องระบุ",
-    "default_sales_discount"                    => "ส่วนลดการขายที่เป็นค่าเริ่มต้น",
-    "default_sales_discount_number"             => "ส่วนลดการขายเริ่มต้นจะต้องเป็นตัวเลข",
-    "default_sales_discount_required"           => "ส่วนลดการขายเริ่มต้นเป็นจำเป็นต้องมีข้อมูล",
-    "default_tax_category"                      => "หมวดหมู่ภาษีที่เป็นค่าเริ่มต้น",
-    "default_tax_code"                          => "รหัสภาษีที่เป็นค่าเริ่มต้น",
-    "default_tax_jurisdiction"                  => "เขตพื้นที่กฎหมายภาษีที่เป็นค่าเริ่มต้น",
-    "default_tax_name_number"                   => "ชื่อภาษีที่เป็นค่าเริ่มต้นจะต้องเป็นตัวอักษร",
-    "default_tax_name_required"                 => "ชื่อภาษีเริ่มต้นจำเป็นต้องมีข้อมูล",
-    "default_tax_rate"                          => "อัตราภาษีเริ่มต้น %",
-    "default_tax_rate_1"                        => "อัตราภาษีลำดับที่ 1",
-    "default_tax_rate_2"                        => "อัตราภาษีลำดับที่ 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "อัตราภาษีเริ่มต้นต้องเป็นตัวเลข",
-    "default_tax_rate_required"                 => "อัตราภาษีเริ่มต้นต้องกรอก",
-    "derive_sale_quantity"                      => "จำนวนปริมาณการขายที่ได้รับ",
-    "derive_sale_quantity_tooltip"              => "หากทำเครื่องหมาย ระบบจะระบุประเภทรายการใหม่สำหรับรายการตามจำนวนที่เพิ่มขึ้น",
-    "dinner_table"                              => "โต๊ะ",
-    "dinner_table_duplicate"                    => "โต๊ะจะต้องไม่ซ้ำกัน",
-    "dinner_table_enable"                       => "เปิดใช้งานบริการโต๊ะนั่งทาน",
-    "dinner_table_invalid_chars"                => "ชื่อโต๊ะจะต้องไม่มีเครื่องหมาย '_' อยู่",
-    "dinner_table_required"                     => "โต๊ะจำเป็นต้องระบุค่า",
-    "dot"                                       => "จุด",
-    "email"                                     => "อีเมล์",
-    "email_configuration"                       => "ตั้งค่าอีเมล์",
-    "email_mailpath"                            => "ที่อยู่ส่งเมล์",
-    "email_protocol"                            => "โปรโตคอล",
-    "email_receipt_check_behaviour"             => "ทำเครื่องหมายรับอีเมล",
-    "email_receipt_check_behaviour_always"      => "ตรวจสอบอยู่เสมอ",
-    "email_receipt_check_behaviour_last"        => "จำการเลือกสุดท้าย",
-    "email_receipt_check_behaviour_never"       => "ไม่ถูกตรวจสอบเสมอ",
-    "email_smtp_crypto"                         => "การเข้ารหัสของเอสเอ็มทีพี",
-    "email_smtp_host"                           => "เซอร์เวอร์เอสเอ็มทีพี",
-    "email_smtp_pass"                           => "รหัสผ่านเอสเอ็มทีพี",
-    "email_smtp_port"                           => "เอสเอ็มทีพีพอร์ต",
-    "email_smtp_timeout"                        => "ระยะเวลารอคอยของเอสเอ็มทีพี",
-    "email_smtp_user"                           => "ชื่อผู้ใช้งานของเอสเอ็มทีพี",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "บังคับความเป็นส่วนตัว",
-    "enforce_privacy_tooltip"                   => "ปกป้องความเป็นส่วนตัวของลูกค้าที่บังคับใช้การตรวจข้อมูลในกรณีที่ข้อมูลถูกลบ",
-    "fax"                                       => "แฟ็กซ์",
-    "file_perm"                                 => "มีปัญหาเกี่ยวกับการอนุญาตของไฟล์ โปรดแก้ไขและโหลดหน้านี้ใหม่อีกครั้ง",
-    "financial_year"                            => "เริ่มปีงบประมาณ",
-    "financial_year_apr"                        => "วันที่ 1 เมษายน",
-    "financial_year_aug"                        => "วันที่ 1 สิงหาคม",
-    "financial_year_dec"                        => "วันที่ 1 ธันวาคม",
-    "financial_year_feb"                        => "วันที่ 1 กุมภาพันธ์",
-    "financial_year_jan"                        => "วันที่ 1 มกราคม",
-    "financial_year_jul"                        => "วันที่ 1 กรกฏาคม",
-    "financial_year_jun"                        => "วันที่ 1 มิถุนายน",
-    "financial_year_mar"                        => "วันที่ 1 มีนาคม",
-    "financial_year_may"                        => "วันที่ 1 พฤษภาคม",
-    "financial_year_nov"                        => "วันที่ 1 พฤศจิกายน",
-    "financial_year_oct"                        => "วันที่ 1 ตุลาคม",
-    "financial_year_sep"                        => "วันที่ 1 กันยายน",
-    "floating_labels"                           => "แสดงตัวเลข",
-    "gcaptcha_enable"                           => "ขอรหัสยืนยันใหม่ เพื่อเข้าระบบ",
-    "gcaptcha_secret_key"                       => "รหัสลับ สำหรับรหัสยืนยัน",
-    "gcaptcha_secret_key_required"              => "จำเป็นต้องระบุ รหัสลับ สำหรับรหัสยืนยัน",
-    "gcaptcha_site_key"                         => "รหัสของเว็บเพจ สำหรับรหัสยืนยัน",
-    "gcaptcha_site_key_required"                => "จำเป็นต้องระบุ รหัสของเว็บเพจ สำหรับรหัสยืนยัน",
-    "gcaptcha_tooltip"                          => "ปกป้องการเข้าสู่ระบบด้วย reCAPTCHA โปรดคลิกที่ไอคอนเพื่อรับ API key pair",
-    "general"                                   => "การตั้งค่า",
-    "general_configuration"                     => "ตั้งค่าทั่วไป",
-    "giftcard_number"                           => "เลขที่บัตรของขวัญ",
-    "giftcard_random"                           => "สร้างหมายเลขแบบสุ่ม",
-    "giftcard_series"                           => "สร้างหมายเลขตามลำดับ",
-    "image_allowed_file_types"                  => "ประเภทไฟล์ที่ยอมรับ",
-    "image_max_height_tooltip"                  => "ค่าพิกเซลความสูงของรูปที่ยอมให้แนบไฟล์ได้",
-    "image_max_size_tooltip"                    => "ขนาดของไฟล์รูปที่ยอมให้แนบไฟล์ได้ในขนาดกิโลไบต์(kb.)",
-    "image_max_width_tooltip"                   => "ค่าพิกเซลความยาวของรูปที่ยอมให้แนบไฟล์ได้",
-    "image_restrictions"                        => "ข้อจำกัดของไฟล์รูปที่แนบ",
-    "include_hsn"                               => "เพิ่มการรองรับ HSN Codes",
-    "info"                                      => "ข้อมูลร้านค้า",
-    "info_configuration"                        => "ข้อมูลร้านค้า",
-    "input_groups"                              => "นำเข้าแบบกลุ่ม",
-    "integrations"                              => "การเข้าร่วม",
-    "integrations_configuration"                => "การเข้าร่วมกับบุคคลภายนอก",
-    "invoice"                                   => "ใบแจ้งหนี้",
-    "invoice_configuration"                     => "ตั้งค่าการพิมพ์ใบแจ้งหนี้",
-    "invoice_default_comments"                  => "ค่าเริ่มต้นหมายเหตุในใบแจ้งหนี้",
-    "invoice_email_message"                     => "ต้นแบบใบแจ้งหนี้ (Email)",
-    "invoice_enable"                            => "เปิดการออกใบแจ้งหนี้",
-    "invoice_printer"                           => "เครื่องพิมพ์สำหรับการออกใบแจ้งหนี้",
-    "invoice_type"                              => "ชนิดของใบแจ้งหนี้",
-    "is_readable"                               => "สามารถอ่านได้ แต่สิทธิ์ไม่ถูกต้อง กรุณาตั้งค่าเป็น 640 หรือ 660 แล้วโหลดใหม่อีกครั้ง",
-    "is_writable"                               => "สามารถเขียนข้อมูลได้ แต่สิทธิ์ไม่ถูกต้อง ต้องสูงกว่าค่า 750 กรุณาตั้งค่าเป็น 750 แล้วโหลดใหม่อีกครั้ง",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "คำเตือน! ฟังก์ชันการทำงานที่ถูกปิดอยู่ จะสามารถใช้งานได้เมื่อติดตั้ง FireFox jsPrintSetup แล้วเท่านั้น, จะบันทึกข้อมูลหรือไม่?",
-    "language"                                  => "ภาษา",
-    "last_used_invoice_number"                  => "หมายเลขใบแจ้งหนี้ฉบับล่าสุด",
-    "last_used_quote_number"                    => "หมายเลขใบเสนอราคาฉบับล่าสุด",
-    "last_used_work_order_number"               => "หมายเลข W/O ฉบับล่าสุด",
-    "left"                                      => "ซ้าย",
-    "license"                                   => "ใบอนุญาต",
-    "license_configuration"                     => "รายละเอียดใบอนุญาต",
-    "line_sequence"                             => "เลขที่บรรทัด",
-    "lines_per_page"                            => "จำนวนบรรทัด/หน้า",
-    "lines_per_page_number"                     => "จำนวนบรรทัด/หน้า จะต้องเป็นตัวเลข",
-    "lines_per_page_required"                   => "จำเป็นต้องป้อน จำนวนบรรทัด/หน้า",
-    "locale"                                    => "เขตพื้นที่",
-    "locale_configuration"                      => "ตั้งค่าเขตพื้นที่",
-    "locale_info"                               => "ข้อมูลเขตพื้นที่",
-    "location"                                  => "สินค้าคงคลัง",
-    "location_configuration"                    => "ตำแหน่งสินค้าคงคลัง",
-    "location_info"                             => "ข้อมูลตำแหน่งสินค้าคงคลัง",
-    "login_form"                                => "รูปแบบแบบฟอร์มการเข้าระบบ",
-    "logout"                                    => "ต้องการสำรองข้อมูลก่อนออกจากระบบหรือไม่? [OK] สำรองข้อมูล / [Cancel] ออกจากระบบ",
-    "mailchimp"                                 => "ระบบส่งอีเมล์เมล์ชิม",
-    "mailchimp_api_key"                         => "API Key สำหรับระบบส่งอีเมล์เมล์ชิม",
-    "mailchimp_configuration"                   => "ตั้งค่าระบบส่งอีเมล์เมล์ชิม",
-    "mailchimp_key_successfully"                => "API Key ถูกต้อง",
-    "mailchimp_key_unsuccessfully"              => "API Key ไม่ถูกต้อง",
-    "mailchimp_lists"                           => "รายการระบบส่งอีเมล์เมล์ชิม",
-    "mailchimp_tooltip"                         => "คลิกที่ไอคอนเพื่อรับ API Key",
-    "message"                                   => "ข้อความ",
-    "message_configuration"                     => "ตั้งค่าข้อความ",
-    "msg_msg"                                   => "ข้อความที่ถูกบักทึกไว้",
-    "msg_msg_placeholder"                       => "สร้างข้อความ SMS template ที่นี่",
-    "msg_pwd"                                   => "รหัสผ่านของ SMS-API",
-    "msg_pwd_required"                          => "จำเป็นต้องป้อน รหัสผ่านของ SMS-API",
-    "msg_src"                                   => "ID ผู้ส่ง (SMS-API)",
-    "msg_src_required"                          => "จำเป็นต้องป้อน ID ผู้ส่ง",
-    "msg_uid"                                   => "ชื่อผู้ใช้งานระบบ SMS-API",
-    "msg_uid_required"                          => "จำเป็นต้องป้อน ชื่อผู้ใช้งานระบบ SMS-API",
-    "multi_pack_enabled"                        => "หนึ่งรายการมีหลายชิ้น",
-    "no_risk"                                   => "ไม่มีความเสี่ยงด้านความปลอดภัย / ความเสี่ยง",
-    "none"                                      => "none",
-    "notify_alignment"                          => "แจ้งตำแหน่งแสดงการแจ้งเตือน",
-    "number_format"                             => "รูปแบบตัวเลข",
-    "number_locale"                             => "Localisation",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a sensible value",
-    "number_locale_required"                    => "Number Locale is a required field",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link",
-    "os_timezone"                               => "เขตเวลาของระบบ OSPOS:",
-    "ospos_info"                                => "ข้อมูลการติดตั้งระบบ OSPOS",
-    "payment_options_order"                     => "ตัวเลือกการชำระเงิน",
-    "perm_risk"                                 => "การอนุญาตที่ไม่ถูกต้องทำให้ซอฟต์แวร์นี้ตกอยู่ในความเสี่ยง",
-    "phone"                                     => "เบอร์โทรศัพท์",
-    "phone_required"                            => "เบอร์โทรต้องกรอก",
-    "print_bottom_margin"                       => "ขอบล่าง",
-    "print_bottom_margin_number"                => "The default bottom margin must be a number",
-    "print_bottom_margin_required"              => "The default bottom margin is a required field",
-    "print_delay_autoreturn"                    => "การส่งกลับอัตโนมัติของการขายที่ล่าช้า",
-    "print_delay_autoreturn_number"             => "การส่งกลับอัตโนมัติของการขายที่ล่าช้าจำเป็นต้องระบุ",
-    "print_delay_autoreturn_required"           => "การส่งกลับอัตโนมัติของการขายที่ล่าช้าต้องระบุเป็นตัวเลข",
-    "print_footer"                              => "พิมพ์ส่วนท้ายของเบราว์เซอร์",
-    "print_header"                              => "พิมพ์ส่วนหัวของเบราว์เซอร์",
-    "print_left_margin"                         => "ขอบด้านซ้าย",
-    "print_left_margin_number"                  => "ขอบด้านซ้ายค่าเริ่มต้นต้องเป็นตัวเลข",
-    "print_left_margin_required"                => "จำเป็นต้องระบุขอบด้านซ้าย",
-    "print_receipt_check_behaviour"             => "กล่องพิมพ์ใบเสร็จรับเงิน",
-    "print_receipt_check_behaviour_always"      => "เลือกไว้ตลอด",
-    "print_receipt_check_behaviour_last"        => "จดจำการเลือกสุดท้ายไว้",
-    "print_receipt_check_behaviour_never"       => "ไม่เลือกไว้ตลอด",
-    "print_right_margin"                        => "ขอบด้านขวา",
-    "print_right_margin_number"                 => "ขอบด้านขวาค่าเริ่มต้นต้องเป็นตัวเลข",
-    "print_right_margin_required"               => "ต้องระบุขอบด้านขวา",
-    "print_silently"                            => "แสดงกล่องโต้ตอบการพิมพ์",
-    "print_top_margin"                          => "ขอบด้านบน",
-    "print_top_margin_number"                   => "ขอบด้านบนค่าเริ่มต้นจะต้องเป็นตัวเลข",
-    "print_top_margin_required"                 => "ต้องระบุขอบด้านบน",
-    "quantity_decimals"                         => "ทศนิยมจำนวน",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "ค่าปริยายของความคิดเห็น",
-    "receipt"                                   => "ใบเสร็จ",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "ตั้งค่าใบเสร็จ",
-    "receipt_default"                           => "ค่าเริ่มต้น",
-    "receipt_font_size"                         => "ขนาดของตัวอักษร",
-    "receipt_font_size_number"                  => "ขนาดตัวอักษรต้องเป็นตัวเลข",
-    "receipt_font_size_required"                => "จำเป็นต้องระบุขนาดตัวอักษร",
-    "receipt_info"                              => "ข้อมูลการตั้งค่าใบเสร็จ",
-    "receipt_printer"                           => "เครื่องพิมพ์ตั๋ว",
-    "receipt_short"                             => "สั้น",
-    "receipt_show_company_name"                 => "แสดงชื่อบริษัท",
-    "receipt_show_description"                  => "แสดงรายละเอียด",
-    "receipt_show_serialnumber"                 => "แสดงหมายเลขซีเรียล",
-    "receipt_show_tax_ind"                      => "แสดงอัตราภาษี",
-    "receipt_show_taxes"                        => "แสดงภาษี",
-    "receipt_show_total_discount"               => "แสดงส่วนลดทั้งหมด",
-    "receipt_template"                          => "ต้นแบบใบเสร็จ",
-    "receiving_calculate_average_price"         => "คำนวณราคาเฉลี่ย (ได้รับมา)",
-    "recv_invoice_format"                       => "ใบส่งของ",
-    "register_mode_default"                     => "ค่าปริยายรูปแบบการลงทะเบียน",
-    "report_an_issue"                           => "รายงานปัญหา",
-    "return_policy_required"                    => "ต้องกรอกเงื่อนไขการคืนสินค้า",
-    "reward"                                    => "คะแนนสะสม",
-    "reward_configuration"                      => "การตั้งค่าคะแนนสะสม",
-    "right"                                     => "ถูกต้อง",
-    "sales_invoice_format"                      => "รหัสใบเสร็จ",
-    "sales_quote_format"                        => "รูปแบบใบเสนอราคาขาย",
-    "saved_successfully"                        => "บันทึกข้อมูลร้านค้าเรียบร้อยแล้ว",
-    "saved_unsuccessfully"                      => "บันทึกข้อมูลร้านค้าไม่สำเร็จ",
-    "security_issue"                            => "คำเตือนช่องโหว่ด้านความปลอดภัย",
-    "server_notice"                             => "โปรดใช้ข้อมูลด้านล่างสำหรับการรายงานปัญหา",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "แสดงไอคอนสำนักงาน",
-    "statistics"                                => "ส่งยอดสถิติ",
-    "statistics_tooltip"                        => "ส่งข้อมูลสถิติเพื่อการพัฒนาและปรับปรุงความสามารถ",
-    "stock_location"                            => "สถานที่เก็บ",
-    "stock_location_duplicate"                  => "ที่ตั้งคลังสินค้าต้องไม่ซ้ำกัน",
-    "stock_location_invalid_chars"              => "ชื่อสต๊อกสถานที่เก็บสินค้าต้องไม่มีอักษรพิเศษ '_'",
-    "stock_location_required"                   => "จำเป็นต้องระบุสถานที่เก็บ",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "คอลัมน์ 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "รูปแบบข้อแนะนำในการค้นหา",
-    "suggestions_second_column"                 => "คอลัมน์ 2",
-    "suggestions_third_column"                  => "คอลัมน์ 3",
-    "system_conf"                               => "การตั้งค่าและกำหนดค่า",
-    "system_info"                               => "System Info",
-    "table"                                     => "โต๊ะนั่งทาน",
-    "table_configuration"                       => "ตั้งค่าโต๊ะนั่งทาน",
-    "takings_printer"                           => "เลือกเครื่องพิมพ์",
-    "tax"                                       => "ภาษี",
-    "tax_category"                              => "หมวดหมู่ภาษี",
-    "tax_category_duplicate"                    => "หมวดหมู่ภาษีที่ป้อน ซ้ำกับข้อมูลที่มีอยู่",
-    "tax_category_invalid_chars"                => "หมวดหมู่ภาษีที่ป้อน ไม่ถูกต้อง",
-    "tax_category_required"                     => "หมวดหมู่ภาษี จำเป็นต้องป้อน",
-    "tax_category_used"                         => "ไม่สามารถลบ หมวดหมู่ภาษี ที่กำลังมีการใช้งานอยู่",
-    "tax_configuration"                         => "ตั้งค่าระบบภาษี",
-    "tax_decimals"                              => "จำนวนทศนิยมภาษี",
-    "tax_id"                                    => "เลขประจำตัวผู้เสียภาษี",
-    "tax_included"                              => "รวมภาษีแล้ว",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "ดูตัวอย่างธีม:",
-    "thousands_separator"                       => "ตัวคั่นหลักพัน",
-    "timezone"                                  => "โซนเวลา",
-    "timezone_error"                            => "เขตเวลาของระบบ OSPOS แตกต่างกับเขตเวลาปัจจุบันของคุณ",
-    "top"                                       => "ด้านบน",
-    "use_destination_based_tax"                 => "เปิดใช้ Destination-Based Tax",
-    "user_timezone"                             => "เขตเวลาปัจจุบัน:",
-    "website"                                   => "เว็บไซต์",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "เปิดใช้ ใบสั่งงาน (WO)",
-    "work_order_format"                         => "รูปแบบ ใบสั่งงาน (WO)",
+    'address'                                   => 'ที่อยู่',
+    'address_required'                          => 'ที่อยู่ต้องกรอก',
+    'all_set'                                   => 'การตั้งค่าอนุญาตไฟล์ทั้งหมดถูกต้อง!',
+    'allow_duplicate_barcodes'                  => 'อนุญาตบาร์โค้ดที่ซ้ำกัน',
+    'apostrophe'                                => "อัญประกาศเดี่ยว '",
+    'backup_button'                             => 'สำรองข้อมูล',
+    'backup_database'                           => 'สำรองฐานข้อมูล',
+    'barcode'                                   => 'ตั้งค่าระบบบาร์โค้ด',
+    'barcode_company'                           => 'ชื่อร้านค้า',
+    'barcode_configuration'                     => 'ตั้งค่าระบบบาร์โค้ด',
+    'barcode_content'                           => 'รหัสที่พิมพ์',
+    'barcode_first_row'                         => 'แถว 1',
+    'barcode_font'                              => 'แบบอักษร',
+    'barcode_formats'                           => 'รูปแบบอินพุต',
+    'barcode_generate_if_empty'                 => 'Generate if empty',
+    'barcode_height'                            => 'สูง (px)',
+    'barcode_id'                                => 'รหัสสินค้า/ชื่อสินค้า',
+    'barcode_info'                              => 'ตั้งค่าบาร์โค้ด',
+    'barcode_layout'                            => 'โครงร่างการพิมพ์',
+    'barcode_name'                              => 'สินค้า',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'จำนวนดวงใน 1 แถว',
+    'barcode_page_cellspacing'                  => 'ระยะห่างต่อดวง',
+    'barcode_page_width'                        => 'ความกว้างในหน้า',
+    'barcode_price'                             => 'ราคา',
+    'barcode_second_row'                        => 'แถว 2',
+    'barcode_third_row'                         => 'แถว 3',
+    'barcode_tooltip'                           => 'คำเตือน: คุณสมบัตินี้สามารถทำให้เกิดรายการที่ซ้ำกันที่จะนำเข้าหรือสร้าง ห้ามใช้หากคุณไม่ต้องการบาร์โค้ดที่ซ้ำกัน',
+    'barcode_type'                              => 'ประเภทบาร์โค้ด',
+    'barcode_width'                             => 'กว้าง (px)',
+    'bottom'                                    => 'ด้านล่าง',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'ทศนิยมแบบการเงินสด',
+    'cash_decimals_tooltip'                     => 'ถ้าทศนิยมแบบเงินสดและทศนิยมแบบสกุลเงินเหมือนกันจะไม่มีการปัดเศษเงินสด',
+    'cash_rounding'                             => 'การปัดเศษทางการเงิน',
+    'category_dropdown'                         => 'แสดงกลุ่มเป็นแบบดรอปดาวน์',
+    'center'                                    => 'กึ่งกลาง',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'จุลภาค',
+    'company'                                   => 'ชื่อร้านค้า',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'เปลี่ยนรูป',
+    'company_logo'                              => 'ภาพโลโก้',
+    'company_remove_image'                      => 'ลบรูป',
+    'company_required'                          => 'ชื่อร้านค้าต้องกรอก',
+    'company_select_image'                      => 'เลือกรูป',
+    'company_website_url'                       => 'ที่อยู่เว็บไซต์ร้านค้าไม่ถูกต้อง (เช่น http://...)',
+    'country_codes'                             => 'รหัสประเทศ',
+    'country_codes_tooltip'                     => 'รายการรหัสประเทศที่คั่นด้วยคอมม่าสำหรับการค้นหาโดยชื่อที่อยู่',
+    'currency_code'                             => 'รหัสสกุลเงิน',
+    'currency_decimals'                         => 'ทศนิยมแบบการเงิน',
+    'currency_symbol'                           => 'สัญลักษณ์ค่าเงิน',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'รางวัล',
+    'customer_reward_duplicate'                 => 'รางวัลต้องไม่ซ้ำกัน',
+    'customer_reward_enable'                    => 'เปิดใช้งานรางวัลของลูกค้า',
+    'customer_reward_invalid_chars'             => "รางวัลไม่สามารถมี '_' ได้",
+    'customer_reward_required'                  => 'รางวัลเป็นฟิลด์บังคับ',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'ตัวกรองวันที่และเวลา',
+    'datetimeformat'                            => 'รูปแบบวันและเวลา',
+    'decimal_point'                             => 'จุดทศนิยม',
+    'default_barcode_font_size_number'          => 'ค่าบาร์โค้ดจะต้องเป็นตัวเลข',
+    'default_barcode_font_size_required'        => 'ต้องระบุขนาดตัวบาร์โค้ดเริ่มต้น',
+    'default_barcode_height_number'             => 'ความสูงของบาร์โค้ดต้องเป็นตัวเลข',
+    'default_barcode_height_required'           => 'ต้องระบุความสูงของบาร์โค้ด',
+    'default_barcode_num_in_row_number'         => 'บาร์โค้ดในแถวจะต้องเป็นตัวเลข',
+    'default_barcode_num_in_row_required'       => 'ต้องระบุค่าบาร์โค้ด',
+    'default_barcode_page_cellspacing_number'   => 'The default barcode page cellspacing must be a number',
+    'default_barcode_page_cellspacing_required' => 'The default barcode page cellspacing is a required field',
+    'default_barcode_page_width_number'         => 'The default barcode page width must be a number',
+    'default_barcode_page_width_required'       => 'The default barcode page width is a required field',
+    'default_barcode_width_number'              => 'The default barcode width must be a number',
+    'default_barcode_width_required'            => 'The default barcode width is a required field',
+    'default_item_columns'                      => 'คอลัมน์รายการที่แสดงเป็นค่าเริ่มต้น',
+    'default_origin_tax_code'                   => 'รหัสภาษีที่เป็นค่าเริ่มต้น',
+    'default_receivings_discount'               => 'ส่วนลดที่เป็นค่าเริ่มต้นที่จะได้รับ',
+    'default_receivings_discount_number'        => 'การรับส่วนลดที่เป็นค่าเริ่มต้นต้องเป็นตัวเลข',
+    'default_receivings_discount_required'      => 'การรับส่วนลดที่เป็นค่าเริ่มต้นจำเป็นต้องระบุ',
+    'default_sales_discount'                    => 'ส่วนลดการขายที่เป็นค่าเริ่มต้น',
+    'default_sales_discount_number'             => 'ส่วนลดการขายเริ่มต้นจะต้องเป็นตัวเลข',
+    'default_sales_discount_required'           => 'ส่วนลดการขายเริ่มต้นเป็นจำเป็นต้องมีข้อมูล',
+    'default_tax_category'                      => 'หมวดหมู่ภาษีที่เป็นค่าเริ่มต้น',
+    'default_tax_code'                          => 'รหัสภาษีที่เป็นค่าเริ่มต้น',
+    'default_tax_jurisdiction'                  => 'เขตพื้นที่กฎหมายภาษีที่เป็นค่าเริ่มต้น',
+    'default_tax_name_number'                   => 'ชื่อภาษีที่เป็นค่าเริ่มต้นจะต้องเป็นตัวอักษร',
+    'default_tax_name_required'                 => 'ชื่อภาษีเริ่มต้นจำเป็นต้องมีข้อมูล',
+    'default_tax_rate'                          => 'อัตราภาษีเริ่มต้น %',
+    'default_tax_rate_1'                        => 'อัตราภาษีลำดับที่ 1',
+    'default_tax_rate_2'                        => 'อัตราภาษีลำดับที่ 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'อัตราภาษีเริ่มต้นต้องเป็นตัวเลข',
+    'default_tax_rate_required'                 => 'อัตราภาษีเริ่มต้นต้องกรอก',
+    'derive_sale_quantity'                      => 'จำนวนปริมาณการขายที่ได้รับ',
+    'derive_sale_quantity_tooltip'              => 'หากทำเครื่องหมาย ระบบจะระบุประเภทรายการใหม่สำหรับรายการตามจำนวนที่เพิ่มขึ้น',
+    'dinner_table'                              => 'โต๊ะ',
+    'dinner_table_duplicate'                    => 'โต๊ะจะต้องไม่ซ้ำกัน',
+    'dinner_table_enable'                       => 'เปิดใช้งานบริการโต๊ะนั่งทาน',
+    'dinner_table_invalid_chars'                => "ชื่อโต๊ะจะต้องไม่มีเครื่องหมาย '_' อยู่",
+    'dinner_table_required'                     => 'โต๊ะจำเป็นต้องระบุค่า',
+    'dot'                                       => 'จุด',
+    'email'                                     => 'อีเมล์',
+    'email_configuration'                       => 'ตั้งค่าอีเมล์',
+    'email_mailpath'                            => 'ที่อยู่ส่งเมล์',
+    'email_protocol'                            => 'โปรโตคอล',
+    'email_receipt_check_behaviour'             => 'ทำเครื่องหมายรับอีเมล',
+    'email_receipt_check_behaviour_always'      => 'ตรวจสอบอยู่เสมอ',
+    'email_receipt_check_behaviour_last'        => 'จำการเลือกสุดท้าย',
+    'email_receipt_check_behaviour_never'       => 'ไม่ถูกตรวจสอบเสมอ',
+    'email_smtp_crypto'                         => 'การเข้ารหัสของเอสเอ็มทีพี',
+    'email_smtp_host'                           => 'เซอร์เวอร์เอสเอ็มทีพี',
+    'email_smtp_pass'                           => 'รหัสผ่านเอสเอ็มทีพี',
+    'email_smtp_port'                           => 'เอสเอ็มทีพีพอร์ต',
+    'email_smtp_timeout'                        => 'ระยะเวลารอคอยของเอสเอ็มทีพี',
+    'email_smtp_user'                           => 'ชื่อผู้ใช้งานของเอสเอ็มทีพี',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'บังคับความเป็นส่วนตัว',
+    'enforce_privacy_tooltip'                   => 'ปกป้องความเป็นส่วนตัวของลูกค้าที่บังคับใช้การตรวจข้อมูลในกรณีที่ข้อมูลถูกลบ',
+    'fax'                                       => 'แฟ็กซ์',
+    'file_perm'                                 => 'มีปัญหาเกี่ยวกับการอนุญาตของไฟล์ โปรดแก้ไขและโหลดหน้านี้ใหม่อีกครั้ง',
+    'financial_year'                            => 'เริ่มปีงบประมาณ',
+    'financial_year_apr'                        => 'วันที่ 1 เมษายน',
+    'financial_year_aug'                        => 'วันที่ 1 สิงหาคม',
+    'financial_year_dec'                        => 'วันที่ 1 ธันวาคม',
+    'financial_year_feb'                        => 'วันที่ 1 กุมภาพันธ์',
+    'financial_year_jan'                        => 'วันที่ 1 มกราคม',
+    'financial_year_jul'                        => 'วันที่ 1 กรกฏาคม',
+    'financial_year_jun'                        => 'วันที่ 1 มิถุนายน',
+    'financial_year_mar'                        => 'วันที่ 1 มีนาคม',
+    'financial_year_may'                        => 'วันที่ 1 พฤษภาคม',
+    'financial_year_nov'                        => 'วันที่ 1 พฤศจิกายน',
+    'financial_year_oct'                        => 'วันที่ 1 ตุลาคม',
+    'financial_year_sep'                        => 'วันที่ 1 กันยายน',
+    'floating_labels'                           => 'แสดงตัวเลข',
+    'gcaptcha_enable'                           => 'ขอรหัสยืนยันใหม่ เพื่อเข้าระบบ',
+    'gcaptcha_secret_key'                       => 'รหัสลับ สำหรับรหัสยืนยัน',
+    'gcaptcha_secret_key_required'              => 'จำเป็นต้องระบุ รหัสลับ สำหรับรหัสยืนยัน',
+    'gcaptcha_site_key'                         => 'รหัสของเว็บเพจ สำหรับรหัสยืนยัน',
+    'gcaptcha_site_key_required'                => 'จำเป็นต้องระบุ รหัสของเว็บเพจ สำหรับรหัสยืนยัน',
+    'gcaptcha_tooltip'                          => 'ปกป้องการเข้าสู่ระบบด้วย reCAPTCHA โปรดคลิกที่ไอคอนเพื่อรับ API key pair',
+    'general'                                   => 'การตั้งค่า',
+    'general_configuration'                     => 'ตั้งค่าทั่วไป',
+    'giftcard_number'                           => 'เลขที่บัตรของขวัญ',
+    'giftcard_random'                           => 'สร้างหมายเลขแบบสุ่ม',
+    'giftcard_series'                           => 'สร้างหมายเลขตามลำดับ',
+    'image_allowed_file_types'                  => 'ประเภทไฟล์ที่ยอมรับ',
+    'image_max_height_tooltip'                  => 'ค่าพิกเซลความสูงของรูปที่ยอมให้แนบไฟล์ได้',
+    'image_max_size_tooltip'                    => 'ขนาดของไฟล์รูปที่ยอมให้แนบไฟล์ได้ในขนาดกิโลไบต์(kb.)',
+    'image_max_width_tooltip'                   => 'ค่าพิกเซลความยาวของรูปที่ยอมให้แนบไฟล์ได้',
+    'image_restrictions'                        => 'ข้อจำกัดของไฟล์รูปที่แนบ',
+    'include_hsn'                               => 'เพิ่มการรองรับ HSN Codes',
+    'info'                                      => 'ข้อมูลร้านค้า',
+    'info_configuration'                        => 'ข้อมูลร้านค้า',
+    'input_groups'                              => 'นำเข้าแบบกลุ่ม',
+    'integrations'                              => 'การเข้าร่วม',
+    'integrations_configuration'                => 'การเข้าร่วมกับบุคคลภายนอก',
+    'invoice'                                   => 'ใบแจ้งหนี้',
+    'invoice_configuration'                     => 'ตั้งค่าการพิมพ์ใบแจ้งหนี้',
+    'invoice_default_comments'                  => 'ค่าเริ่มต้นหมายเหตุในใบแจ้งหนี้',
+    'invoice_email_message'                     => 'ต้นแบบใบแจ้งหนี้ (Email)',
+    'invoice_enable'                            => 'เปิดการออกใบแจ้งหนี้',
+    'invoice_printer'                           => 'เครื่องพิมพ์สำหรับการออกใบแจ้งหนี้',
+    'invoice_type'                              => 'ชนิดของใบแจ้งหนี้',
+    'is_readable'                               => 'สามารถอ่านได้ แต่สิทธิ์ไม่ถูกต้อง กรุณาตั้งค่าเป็น 640 หรือ 660 แล้วโหลดใหม่อีกครั้ง',
+    'is_writable'                               => 'สามารถเขียนข้อมูลได้ แต่สิทธิ์ไม่ถูกต้อง ต้องสูงกว่าค่า 750 กรุณาตั้งค่าเป็น 750 แล้วโหลดใหม่อีกครั้ง',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'คำเตือน! ฟังก์ชันการทำงานที่ถูกปิดอยู่ จะสามารถใช้งานได้เมื่อติดตั้ง FireFox jsPrintSetup แล้วเท่านั้น, จะบันทึกข้อมูลหรือไม่?',
+    'language'                                  => 'ภาษา',
+    'last_used_invoice_number'                  => 'หมายเลขใบแจ้งหนี้ฉบับล่าสุด',
+    'last_used_quote_number'                    => 'หมายเลขใบเสนอราคาฉบับล่าสุด',
+    'last_used_work_order_number'               => 'หมายเลข W/O ฉบับล่าสุด',
+    'left'                                      => 'ซ้าย',
+    'license'                                   => 'ใบอนุญาต',
+    'license_configuration'                     => 'รายละเอียดใบอนุญาต',
+    'line_sequence'                             => 'เลขที่บรรทัด',
+    'lines_per_page'                            => 'จำนวนบรรทัด/หน้า',
+    'lines_per_page_number'                     => 'จำนวนบรรทัด/หน้า จะต้องเป็นตัวเลข',
+    'lines_per_page_required'                   => 'จำเป็นต้องป้อน จำนวนบรรทัด/หน้า',
+    'locale'                                    => 'เขตพื้นที่',
+    'locale_configuration'                      => 'ตั้งค่าเขตพื้นที่',
+    'locale_info'                               => 'ข้อมูลเขตพื้นที่',
+    'location'                                  => 'สินค้าคงคลัง',
+    'location_configuration'                    => 'ตำแหน่งสินค้าคงคลัง',
+    'location_info'                             => 'ข้อมูลตำแหน่งสินค้าคงคลัง',
+    'login_form'                                => 'รูปแบบแบบฟอร์มการเข้าระบบ',
+    'logout'                                    => 'ต้องการสำรองข้อมูลก่อนออกจากระบบหรือไม่? [OK] สำรองข้อมูล / [Cancel] ออกจากระบบ',
+    'mailchimp'                                 => 'ระบบส่งอีเมล์เมล์ชิม',
+    'mailchimp_api_key'                         => 'API Key สำหรับระบบส่งอีเมล์เมล์ชิม',
+    'mailchimp_configuration'                   => 'ตั้งค่าระบบส่งอีเมล์เมล์ชิม',
+    'mailchimp_key_successfully'                => 'API Key ถูกต้อง',
+    'mailchimp_key_unsuccessfully'              => 'API Key ไม่ถูกต้อง',
+    'mailchimp_lists'                           => 'รายการระบบส่งอีเมล์เมล์ชิม',
+    'mailchimp_tooltip'                         => 'คลิกที่ไอคอนเพื่อรับ API Key',
+    'message'                                   => 'ข้อความ',
+    'message_configuration'                     => 'ตั้งค่าข้อความ',
+    'msg_msg'                                   => 'ข้อความที่ถูกบักทึกไว้',
+    'msg_msg_placeholder'                       => 'สร้างข้อความ SMS template ที่นี่',
+    'msg_pwd'                                   => 'รหัสผ่านของ SMS-API',
+    'msg_src'                                   => 'ID ผู้ส่ง (SMS-API)',
+    'msg_src_required'                          => 'จำเป็นต้องป้อน ID ผู้ส่ง',
+    'msg_uid'                                   => 'ชื่อผู้ใช้งานระบบ SMS-API',
+    'msg_uid_required'                          => 'จำเป็นต้องป้อน ชื่อผู้ใช้งานระบบ SMS-API',
+    'multi_pack_enabled'                        => 'หนึ่งรายการมีหลายชิ้น',
+    'no_risk'                                   => 'ไม่มีความเสี่ยงด้านความปลอดภัย / ความเสี่ยง',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'แจ้งตำแหน่งแสดงการแจ้งเตือน',
+    'number_format'                             => 'รูปแบบตัวเลข',
+    'number_locale'                             => 'Localisation',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a sensible value',
+    'number_locale_required'                    => 'Number Locale is a required field',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link',
+    'os_timezone'                               => 'เขตเวลาของระบบ OSPOS:',
+    'ospos_info'                                => 'ข้อมูลการติดตั้งระบบ OSPOS',
+    'payment_options_order'                     => 'ตัวเลือกการชำระเงิน',
+    'payment_reference_code_length_limits'      => 'รหัสอ้างอิงการชำระเงิน<br>ขีดจำกัดความยาว',
+    'payment_reference_code_length_max_label'   => 'สูงสุด',
+    'payment_reference_code_length_min_label'   => 'ต่ำสุด',
+    'perm_risk'                                 => 'การอนุญาตที่ไม่ถูกต้องทำให้ซอฟต์แวร์นี้ตกอยู่ในความเสี่ยง',
+    'phone'                                     => 'เบอร์โทรศัพท์',
+    'phone_required'                            => 'เบอร์โทรต้องกรอก',
+    'print_bottom_margin'                       => 'ขอบล่าง',
+    'print_bottom_margin_number'                => 'The default bottom margin must be a number',
+    'print_bottom_margin_required'              => 'The default bottom margin is a required field',
+    'print_delay_autoreturn'                    => 'การส่งกลับอัตโนมัติของการขายที่ล่าช้า',
+    'print_delay_autoreturn_number'             => 'การส่งกลับอัตโนมัติของการขายที่ล่าช้าจำเป็นต้องระบุ',
+    'print_delay_autoreturn_required'           => 'การส่งกลับอัตโนมัติของการขายที่ล่าช้าต้องระบุเป็นตัวเลข',
+    'print_footer'                              => 'พิมพ์ส่วนท้ายของเบราว์เซอร์',
+    'print_header'                              => 'พิมพ์ส่วนหัวของเบราว์เซอร์',
+    'print_left_margin'                         => 'ขอบด้านซ้าย',
+    'print_left_margin_number'                  => 'ขอบด้านซ้ายค่าเริ่มต้นต้องเป็นตัวเลข',
+    'print_left_margin_required'                => 'จำเป็นต้องระบุขอบด้านซ้าย',
+    'print_receipt_check_behaviour'             => 'กล่องพิมพ์ใบเสร็จรับเงิน',
+    'print_receipt_check_behaviour_always'      => 'เลือกไว้ตลอด',
+    'print_receipt_check_behaviour_last'        => 'จดจำการเลือกสุดท้ายไว้',
+    'print_receipt_check_behaviour_never'       => 'ไม่เลือกไว้ตลอด',
+    'print_right_margin'                        => 'ขอบด้านขวา',
+    'print_right_margin_number'                 => 'ขอบด้านขวาค่าเริ่มต้นต้องเป็นตัวเลข',
+    'print_right_margin_required'               => 'ต้องระบุขอบด้านขวา',
+    'print_silently'                            => 'แสดงกล่องโต้ตอบการพิมพ์',
+    'print_top_margin'                          => 'ขอบด้านบน',
+    'print_top_margin_number'                   => 'ขอบด้านบนค่าเริ่มต้นจะต้องเป็นตัวเลข',
+    'print_top_margin_required'                 => 'ต้องระบุขอบด้านบน',
+    'quantity_decimals'                         => 'ทศนิยมจำนวน',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'ค่าปริยายของความคิดเห็น',
+    'receipt'                                   => 'ใบเสร็จ',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'ตั้งค่าใบเสร็จ',
+    'receipt_default'                           => 'ค่าเริ่มต้น',
+    'receipt_font_size'                         => 'ขนาดของตัวอักษร',
+    'receipt_font_size_number'                  => 'ขนาดตัวอักษรต้องเป็นตัวเลข',
+    'receipt_font_size_required'                => 'จำเป็นต้องระบุขนาดตัวอักษร',
+    'receipt_info'                              => 'ข้อมูลการตั้งค่าใบเสร็จ',
+    'receipt_printer'                           => 'เครื่องพิมพ์ตั๋ว',
+    'receipt_short'                             => 'สั้น',
+    'receipt_show_company_name'                 => 'แสดงชื่อบริษัท',
+    'receipt_show_description'                  => 'แสดงรายละเอียด',
+    'receipt_show_serialnumber'                 => 'แสดงหมายเลขซีเรียล',
+    'receipt_show_tax_ind'                      => 'แสดงอัตราภาษี',
+    'receipt_show_taxes'                        => 'แสดงภาษี',
+    'receipt_show_total_discount'               => 'แสดงส่วนลดทั้งหมด',
+    'receipt_template'                          => 'ต้นแบบใบเสร็จ',
+    'receiving_calculate_average_price'         => 'คำนวณราคาเฉลี่ย (ได้รับมา)',
+    'recv_invoice_format'                       => 'ใบส่งของ',
+    'register_mode_default'                     => 'ค่าปริยายรูปแบบการลงทะเบียน',
+    'report_an_issue'                           => 'รายงานปัญหา',
+    'return_policy_required'                    => 'ต้องกรอกเงื่อนไขการคืนสินค้า',
+    'reward'                                    => 'คะแนนสะสม',
+    'reward_configuration'                      => 'การตั้งค่าคะแนนสะสม',
+    'right'                                     => 'ถูกต้อง',
+    'sales_invoice_format'                      => 'รหัสใบเสร็จ',
+    'sales_quote_format'                        => 'รูปแบบใบเสนอราคาขาย',
+    'mailpath_invalid'                          => 'เส้นทาง sendmail ไม่ถูกต้อง อนุญาตเฉพาะตัวอักษร ตัวเลข ขีดกลาง ขีดล่าง เครื่องหมายทับ เครื่องหมายทับกลับ โคลอน ช่องว่าง และจุดเท่านั้น',
+    'saved_successfully'                        => 'บันทึกข้อมูลร้านค้าเรียบร้อยแล้ว',
+    'saved_unsuccessfully'                      => 'บันทึกข้อมูลร้านค้าไม่สำเร็จ',
+    'security_issue'                            => 'คำเตือนช่องโหว่ด้านความปลอดภัย',
+    'server_notice'                             => 'โปรดใช้ข้อมูลด้านล่างสำหรับการรายงานปัญหา',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'แสดงไอคอนสำนักงาน',
+    'statistics'                                => 'ส่งยอดสถิติ',
+    'statistics_tooltip'                        => 'ส่งข้อมูลสถิติเพื่อการพัฒนาและปรับปรุงความสามารถ',
+    'stock_location'                            => 'สถานที่เก็บ',
+    'stock_location_duplicate'                  => 'ที่ตั้งคลังสินค้าต้องไม่ซ้ำกัน',
+    'stock_location_invalid_chars'              => "ชื่อสต๊อกสถานที่เก็บสินค้าต้องไม่มีอักษรพิเศษ '_'",
+    'stock_location_required'                   => 'จำเป็นต้องระบุสถานที่เก็บ',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'คอลัมน์ 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'รูปแบบข้อแนะนำในการค้นหา',
+    'suggestions_second_column'                 => 'คอลัมน์ 2',
+    'suggestions_third_column'                  => 'คอลัมน์ 3',
+    'system_conf'                               => 'การตั้งค่าและกำหนดค่า',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'โต๊ะนั่งทาน',
+    'table_configuration'                       => 'ตั้งค่าโต๊ะนั่งทาน',
+    'takings_printer'                           => 'เลือกเครื่องพิมพ์',
+    'tax'                                       => 'ภาษี',
+    'tax_category'                              => 'หมวดหมู่ภาษี',
+    'tax_category_duplicate'                    => 'หมวดหมู่ภาษีที่ป้อน ซ้ำกับข้อมูลที่มีอยู่',
+    'tax_category_invalid_chars'                => 'หมวดหมู่ภาษีที่ป้อน ไม่ถูกต้อง',
+    'tax_category_required'                     => 'หมวดหมู่ภาษี จำเป็นต้องป้อน',
+    'tax_category_used'                         => 'ไม่สามารถลบ หมวดหมู่ภาษี ที่กำลังมีการใช้งานอยู่',
+    'tax_configuration'                         => 'ตั้งค่าระบบภาษี',
+    'tax_decimals'                              => 'จำนวนทศนิยมภาษี',
+    'tax_id'                                    => 'เลขประจำตัวผู้เสียภาษี',
+    'tax_included'                              => 'รวมภาษีแล้ว',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => 'ดูตัวอย่างธีม:',
+    'thousands_separator'                       => 'ตัวคั่นหลักพัน',
+    'timezone'                                  => 'โซนเวลา',
+    'timezone_error'                            => 'เขตเวลาของระบบ OSPOS แตกต่างกับเขตเวลาปัจจุบันของคุณ',
+    'top'                                       => 'ด้านบน',
+    'use_destination_based_tax'                 => 'เปิดใช้ Destination-Based Tax',
+    'user_timezone'                             => 'เขตเวลาปัจจุบัน:',
+    'website'                                   => 'เว็บไซต์',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'เปิดใช้ ใบสั่งงาน (WO)',
+    'work_order_format'                         => 'รูปแบบ ใบสั่งงาน (WO)',
 ];
diff --git a/app/Language/th/Employees.php b/app/Language/th/Employees.php
index d586c714f..60854ba45 100644
--- a/app/Language/th/Employees.php
+++ b/app/Language/th/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "ข้อมูลพื้นฐานของพนักงาน",
-    "cannot_be_deleted"            => "ไม่สามารถลบพนักงานที่เลือกไว้ได้ เนื่องจากมีการทำรายการขายหรือคุณกำลังพยายามที่จะลบบัญชีของคุณเอง",
-    "change_employee"              => "",
-    "change_password"              => "เปลี่ยนรหัสผ่าน",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "คุณยืนยันการลบข้อมูลพนักงานที่เลือกไว้?",
-    "confirm_restore"              => "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนพนักงานที่เลือกไว้?",
-    "current_password"             => "รหัสผ่านปัจจุบัน",
-    "current_password_invalid"     => "รหัสผ่านปัจจุบันไม่ถูกต้อง",
-    "employee"                     => "พนักงาน",
-    "error_adding_updating"        => "การเพิ่มหรือปรับปรุงข้อมูลพนักงานผิดพลาด",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "คุณไม่สามารถลบผู้ใช้งานสำหรับการเดโม้ได้",
-    "error_updating_demo_admin"    => "คุณไม่สามารถทำการเปลี่ยนข้อมูลผู้ใช้งานเดโม้ได้",
-    "language"                     => "ภาษา",
-    "login_info"                   => "รหัสเข้าระบบ",
-    "manager"                      => "",
-    "new"                          => "เพิ่มพนักงาน",
-    "none_selected"                => "โปรดเลือกพนักงานที่จะลบ",
-    "one_or_multiple"              => "พนักงาน",
-    "password"                     => "รหัสผ่าน",
-    "password_minlength"           => "รหัสผ่านต้องยาวอย่างน้อย 8 อักษร",
-    "password_must_match"          => "รหัสผ่านไม่ตรงกัน",
-    "password_not_must_match"      => "รหัสผ่านปัจจุบันและรหัสผ่านใหม่จะต้องไม่ซ้ำกัน",
-    "password_required"            => "ต้องระบุรหัสผ่าน",
-    "permission_desc"              => "ทำเครื่องหมายในช่องด้านล่างเพื่อให้สิทธิ์การเข้าถึงโมดูลต่างๆ",
-    "permission_info"              => "สิทธิ์",
-    "repeat_password"              => "ระบุรหัสผ่านอีกครั้ง",
-    "subpermission_required"       => "เพิ่มการอนุญาตอย่างน้อยหนึ่งรายการสำหรับแต่ละโมดูล",
-    "successful_adding"            => "เพิ่มข้อมูลพนักงานเรียบร้อยแล้ว",
-    "successful_change_password"   => "ทำการเปลี่ยนรหัสผ่านเรียบร้อยแล้ว",
-    "successful_deleted"           => "ลบข้อมูลสำเร็จ",
-    "successful_updating"          => "ปรับปรุงข้อมูลพนักงานเรียบร้อยแล้ว",
-    "system_language"              => "ภาษาของระบบ",
-    "unsuccessful_change_password" => "เปลี่ยนรหัสผ่านไม่สำเร็จ",
-    "update"                       => "แก้ไขข้อมูลพนักงาน",
-    "username"                     => "ชื่อผู้ใช้งาน",
-    "username_duplicate"           => "ชื่อผู้ใช้งานพนักงานถูกใช้งานแล้ว กรุณาเลือกใช้งานชื่ออื่น",
-    "username_minlength"           => "ชื่อผู้ใช้งานต้องยาวอย่างน้อย 5 อักษร",
-    "username_required"            => "จำเป็นต้องระบุชื่อผู้ใช้งาน",
+    'administrator'                          => '',
+    'basic_information'                      => 'ข้อมูลพื้นฐานของพนักงาน',
+    'cannot_be_deleted'                      => 'ไม่สามารถลบพนักงานที่เลือกไว้ได้ เนื่องจากมีการทำรายการขายหรือคุณกำลังพยายามที่จะลบบัญชีของคุณเอง',
+    'change_employee'                        => '',
+    'change_password'                        => 'เปลี่ยนรหัสผ่าน',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'คุณยืนยันการลบข้อมูลพนักงานที่เลือกไว้?',
+    'confirm_restore'                        => 'คุณแน่ใจหรือไม่ว่าต้องการกู้คืนพนักงานที่เลือกไว้?',
+    'current_password'                       => 'รหัสผ่านปัจจุบัน',
+    'current_password_invalid'               => 'รหัสผ่านปัจจุบันไม่ถูกต้อง',
+    'employee'                               => 'พนักงาน',
+    'error_adding_updating'                  => 'การเพิ่มหรือปรับปรุงข้อมูลพนักงานผิดพลาด',
+    'error_cannot_remove_own_minimum_grant'  => 'คุณไม่สามารถลบสิทธิ์การเข้าถึงโมดูลขั้นต่ำของคุณเองได้',
+    'error_deleting_admin'                   => 'คุณไม่สามารถลบบัญชีแอดมินได้',
+    'error_deleting_demo_admin'              => 'คุณไม่สามารถลบผู้ใช้งานสำหรับการเดโม้ได้',
+    'error_grant_change_disallowed'          => 'การเปลี่ยนแปลงการอนุญาตถูกปิดใช้งานในการสาธิตนี้',
+    'error_password_change_disallowed'       => 'การเปลี่ยนแปลงรหัสผ่านถูกปิดใช้งานในการสาธิตนี้',
+    'error_updating_admin'                   => 'คุณไม่สามารถแก้ไขบัญชีแอดมินได้',
+    'error_updating_demo_admin'              => 'คุณไม่สามารถทำการเปลี่ยนข้อมูลผู้ใช้งานเดโม้ได้',
+    'language'                               => 'ภาษา',
+    'login_info'                             => 'รหัสเข้าระบบ',
+    'manager'                                => '',
+    'new'                                    => 'เพิ่มพนักงาน',
+    'none_selected'                          => 'โปรดเลือกพนักงานที่จะลบ',
+    'one_or_multiple'                        => 'พนักงาน',
+    'password'                               => 'รหัสผ่าน',
+    'password_minlength'                     => 'รหัสผ่านต้องยาวอย่างน้อย 8 อักษร',
+    'password_must_match'                    => 'รหัสผ่านไม่ตรงกัน',
+    'password_not_must_match'                => 'รหัสผ่านปัจจุบันและรหัสผ่านใหม่จะต้องไม่ซ้ำกัน',
+    'password_required'                      => 'ต้องระบุรหัสผ่าน',
+    'permission_desc'                        => 'ทำเครื่องหมายในช่องด้านล่างเพื่อให้สิทธิ์การเข้าถึงโมดูลต่างๆ',
+    'permission_info'                        => 'สิทธิ์',
+    'repeat_password'                        => 'ระบุรหัสผ่านอีกครั้ง',
+    'subpermission_required'                 => 'เพิ่มการอนุญาตอย่างน้อยหนึ่งรายการสำหรับแต่ละโมดูล',
+    'successful_adding'                      => 'เพิ่มข้อมูลพนักงานเรียบร้อยแล้ว',
+    'successful_change_password'             => 'ทำการเปลี่ยนรหัสผ่านเรียบร้อยแล้ว',
+    'successful_deleted'                     => 'ลบข้อมูลสำเร็จ',
+    'successful_updating'                    => 'ปรับปรุงข้อมูลพนักงานเรียบร้อยแล้ว',
+    'system_language'                        => 'ภาษาของระบบ',
+    'unsuccessful_change_password'           => 'เปลี่ยนรหัสผ่านไม่สำเร็จ',
+    'update'                                 => 'แก้ไขข้อมูลพนักงาน',
+    'username'                               => 'ชื่อผู้ใช้งาน',
+    'username_duplicate'                     => 'ชื่อผู้ใช้งานพนักงานถูกใช้งานแล้ว กรุณาเลือกใช้งานชื่ออื่น',
+    'username_minlength'                     => 'ชื่อผู้ใช้งานต้องยาวอย่างน้อย 5 อักษร',
+    'username_required'                      => 'จำเป็นต้องระบุชื่อผู้ใช้งาน',
 ];
diff --git a/app/Language/th/Error.php b/app/Language/th/Error.php
index 70a2c033b..0944e4427 100644
--- a/app/Language/th/Error.php
+++ b/app/Language/th/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "คุณไม่ได้รับสิทธิ์การเข้าถึงข้อมูลในส่วนนี้",
-    "unknown"              => "ไม่ทราบ",
+    'no_permission_module'           => 'คุณไม่ได้รับสิทธิ์การเข้าถึงข้อมูลในส่วนนี้',
+    'unable_to_create_env_file'      => 'ไม่สามารถสร้าง {filePath} เพื่อกำหนดค่า throttle.key ได้',
+    'unable_to_lock_file'            => 'ไม่สามารถล็อกไฟล์ {filePath} ได้: {reason}',
+    'unable_to_open_lock_file'       => 'ไม่สามารถเปิดไฟล์ {filePath} ได้: {reason}',
+    'unable_to_persist_throttle_key' => 'ไม่สามารถบันทึก throttle.key ลงใน {filePath} ได้',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'ไม่สามารถอ่าน {filePath} เพื่อกำหนดค่า throttle.key ได้',
+    'unknown'                        => 'ไม่ทราบ',
 ];
diff --git a/app/Language/th/Expenses.php b/app/Language/th/Expenses.php
index cea3f47fb..d7e8cd142 100644
--- a/app/Language/th/Expenses.php
+++ b/app/Language/th/Expenses.php
@@ -1,51 +1,51 @@
 <?php
 
 return [
-    "add_item"                   => "เพิ่มรายจ่าย",
-    "amount"                     => "จำนวน",
-    "amount_number"              => "ยอดจำนวนต้องเป็นตัวเลข",
-    "amount_required"            => "จำเป็นต้องระบุยอดค่าใช้จ่าย",
-    "by_category"                => "หมวดหมู่",
-    "cannot_be_deleted"          => "ไม่สามารถลบหมวดหมู่ค่าใช้จ่าย",
-    "cash"                       => "เงินสด",
-    "cash_filter"                => "เงินสด",
-    "categories_name"            => "หมวดหมู่",
-    "category_required"          => "จำเป็นต้องระบุหมวดหมู่",
-    "check"                      => "ตรวจสอบ",
-    "check_filter"               => "เช็ค",
-    "confirm_delete"             => "คุณแน่ใจหรือว่าต้องการลบค่าใช้จ่ายที่เลือกทั้งหมด?",
-    "confirm_restore"            => "คุณแน่ใจหรือไม่ว่าต้องการคืนค่าใช้จ่ายที่เลือกทั้งหมด?",
-    "credit"                     => "บัตรเครดิต",
-    "credit_filter"              => "บัตรเครติด",
-    "date"                       => "วันที่",
-    "date_number"                => "วันที่ต้องเป็นตัวเลข",
-    "date_required"              => "จำเป็นต้องระบุวันที่",
-    "debit"                      => "บัตรเดบิต",
-    "debit_filter"               => "บัตรเดบิต",
-    "description"                => "คำอธิบาย",
-    "due"                        => "ครบกำหนด",
-    "due_filter"                 => "ครบกำหนด",
-    "employee"                   => "สร้างโดย",
-    "error_adding_updating"      => "ผิดพลาดขณะเพิ่ม/ปรับปรุงค่าใช้จ่าย",
-    "expense_id"                 => "รหัส",
-    "expenses_employee"          => "ลูกจ้าง",
-    "info"                       => "ข้อมูลค่าใช้จ่าย",
-    "ip_address"                 => "",
-    "is_deleted"                 => "ถูกลบ",
-    "name_required"              => "ต้องระบุชื่อรายจ่าย",
-    "new"                        => "เพิ่มรายจ่าย",
-    "new_supplier"               => "",
-    "no_expenses_to_display"     => "ไม่มีรายจ่ายต้องแสดง",
-    "none_selected"              => "ท่านยังไม่ได้เลือกรายจ่าย",
-    "one_or_multiple"            => "รายจ่าย",
-    "payment"                    => "ประเภทการชำระ",
-    "start_typing_supplier_name" => "เริ่มต้นพิมพ์ชื่อผู้ผลิต...",
-    "successful_adding"          => "เพิ่มรายจ่ายสำเร็จ",
-    "successful_deleted"         => "ลบรายจ่ายสำเร็จ",
-    "successful_updating"        => "ปรับปรุงรายจ่ายสำเร็จ",
-    "supplier_name"              => "ผู้ผลิต",
-    "supplier_tax_code"          => "รหัสภาษี",
-    "tax_amount"                 => "ภาษี",
-    "tax_amount_number"          => "",
-    "update"                     => "ปรับปรุงค่าใช้จ่าย",
+    'add_item' => "เพิ่มค่าใช้จ่าย",
+    'amount' => "จำนวน",
+    'amount_number' => "ยอดจำนวนต้องเป็นตัวเลข",
+    'amount_required' => "จำเป็นต้องระบุยอดค่าใช้จ่าย",
+    'by_category' => "หมวดหมู่",
+    'cannot_be_deleted' => "ไม่สามารถลบหมวดหมู่ค่าใช้จ่าย",
+    'cash' => "เงินสด",
+    'cash_filter' => "เงินสด",
+    'categories_name' => "หมวดหมู่",
+    'category_required' => "จำเป็นต้องระบุหมวดหมู่",
+    'check' => "ตรวจสอบ",
+    'check_filter' => "เช็ค",
+    'confirm_delete' => "คุณแน่ใจหรือว่าต้องการลบค่าใช้จ่ายที่เลือกทั้งหมด?",
+    'confirm_restore' => "คุณแน่ใจหรือไม่ว่าต้องการคืนค่าใช้จ่ายที่เลือกทั้งหมด?",
+    'credit' => "บัตรเครดิต",
+    'credit_filter' => "บัตรเครติด",
+    'date' => "วันที่",
+    'date_number' => "วันที่ต้องเป็นตัวเลข",
+    'date_required' => "จำเป็นต้องระบุวันที่",
+    'debit' => "บัตรเดบิต",
+    'debit_filter' => "บัตรเดบิต",
+    'description' => "คำอธิบาย",
+    'due' => "ครบกำหนด",
+    'due_filter' => "ครบกำหนด",
+    'employee' => "สร้างโดย",
+    'error_adding_updating' => "ผิดพลาดขณะเพิ่ม/ปรับปรุงค่าใช้จ่าย",
+    'expense_id' => "รหัส",
+    'expenses_employee' => "ลูกจ้าง",
+    'info' => "ข้อมูลค่าใช้จ่าย",
+    'ip_address' => "",
+    'is_deleted' => "ถูกลบ",
+    'name_required' => "ต้องระบุชื่อค่าใช้จ่าย",
+    'new' => "เพิ่มค่าใช้จ่ายใหม่",
+    'new_supplier' => "",
+    'no_expenses_to_display' => "ไม่มีค่าใช้จ่ายต้องแสดง",
+    'none_selected' => "ท่านยังไม่ได้เลือกค่าใช้จ่าย",
+    'one_or_multiple' => "ค่าใช้จ่าย",
+    'payment' => "ประเภทการชำระ",
+    'start_typing_supplier_name' => "เริ่มต้นพิมพ์ชื่อผู้ผลิต...",
+    'successful_adding' => "เพิ่มค่าใช้จ่ายสำเร็จ",
+    'successful_deleted' => "ลบค่าใช้จ่ายสำเร็จ",
+    'successful_updating' => "ปรับปรุงค่าใช้จ่ายสำเร็จ",
+    'supplier_name' => "ผู้ผลิต",
+    'supplier_tax_code' => "รหัสภาษี",
+    'tax_amount' => "ภาษี",
+    'tax_amount_number' => "",
+    'update' => "ปรับปรุงค่าใช้จ่าย",
 ];
diff --git a/app/Language/th/Giftcards.php b/app/Language/th/Giftcards.php
index f1a860dcb..07ff26cdd 100644
--- a/app/Language/th/Giftcards.php
+++ b/app/Language/th/Giftcards.php
@@ -1,72 +1,72 @@
 <?php
 
 return [
-    "add_minus"                          => "สินค้าคงคลัง เพิ่ม/ลด",
-    "allow_alt_description"              => "คำอธิบายสำรอง",
-    "bulk_edit"                          => "แก้ไขเป็นกลุ่ม",
-    "cannot_be_deleted"                  => "ไม่สามารถลบข้อมูลบัตรของขวัญที่เลือก, หรือบัตรของขวัญได้มีการใช้ไปแล้ว",
-    "cannot_find_giftcard"               => "ไม่พบข้อมูลเกี่ยวกับบัตรของขวัญนี้",
-    "cannot_use"                         => "บัตรของขวัญ {0} ไม่สามารถใช้งานกับรายการขายนี้ได้ เนื่องจากรายการลูกค้าไม่ถูกต้อง",
-    "card_value"                         => "มูลค่า",
-    "category"                           => "ประเภท",
-    "change_all_to_allow_alt_desc"       => "คำอธิบายสำรองสำหรับทั้งหมด",
-    "change_all_to_not_allow_allow_desc" => "ไม่อนุญาตให้เปลี่ยนคำอธิบายทั้งหมด",
-    "change_all_to_serialized"           => "เปลี่ยนแปลงทั้งหมด",
-    "change_all_to_unserialized"         => "เปลี่ยนทั้งหมดเป็นแบบไม่ต่อเนื่องกัน",
-    "confirm_bulk_edit"                  => "คุณแน่ใจหรือไม่ว่าต้องการแก้ไขบัตรของขวัญที่เลือก?",
-    "confirm_delete"                     => "คุณแน่ใจหรือไม่ว่าต้องการลบบัตรของขวัญที่เลือก?",
-    "confirm_restore"                    => "คุณแน่ใจหรือไม่ว่าต้องการยกเลิกบัตรของขวัญที่เลือก?",
-    "cost_price"                         => "ต้นทุน",
-    "count"                              => "ปรับปรุงสินค้าคงคลัง",
-    "csv_import_failed"                  => "การส่งออกในรูปแบบไฟล์เอ็กเซล ไม่สำเร็จ",
-    "current_quantity"                   => "จำนวน ณ. ปัจจุบัน",
-    "description"                        => "รายละเอียด",
-    "details_count"                      => "รายละเอียดการตรวจนับในสินค้าคงคลัง",
-    "do_nothing"                         => "ไม่ทำอะไร",
-    "edit_fields_you_want_to_update"     => "แก้ไขฟิลด์ที่ต้องการสำหรับบัตรของขวัญที่เลือก",
-    "edit_multiple_giftcards"            => "แก้ไขบัตรกำนัลหลายใบ",
-    "error_adding_updating"              => "มีข้อผิดพลาดในการ เพิ่ม/ปรับปรุง บัตรกำนัล",
-    "error_updating_multiple"            => "มีข้อผิดพลาดในการปรับปรุง บัตรกำนัล",
-    "generate_barcodes"                  => "สร้างบาร์โค้ด",
-    "giftcard"                           => "บัตรกำนัล",
-    "giftcard_number"                    => "เลขบัตรกำนัล",
-    "info_provided_by"                   => "ข้อมูลที่จัดทำโดย",
-    "inventory_comments"                 => "คำแนะนำ",
-    "is_serialized"                      => "Giftcard has Serial Number",
-    "low_inventory_giftcards"            => "Low Inventory Giftcards",
-    "manually_editing_of_quantity"       => "แก้ไขจำนวนปริมาณเอง",
-    "must_select_giftcard_for_barcode"   => "กรุณาเลือกบัตรกำนัลอย่างน้อย 1 รายการ เพื่อสร้างบาร์โค๊ด",
-    "new"                                => "เพิ่มบัตรกำนัล",
-    "no_description_giftcards"           => "No Description Giftcards",
-    "no_giftcards_to_display"            => "No Giftcards to display",
-    "none"                               => "ไม่มี",
-    "none_selected"                      => "กรุณาเลือกบัตรกำนัลที่ต้องการแก้ไข",
-    "number"                             => "เลขบัตรกำนัลต้องเป็นตัวเลขเท่านั้น",
-    "number_information"                 => "หมายเลขบัตรของขวัญ",
-    "number_required"                    => "ต้องกรอกเลขบัตรกำนัล",
-    "one_or_multiple"                    => "giftcard(s)",
-    "person_id"                          => "เจ้าของบัตร",
-    "quantity"                           => "ปริมาณ",
-    "quantity_required"                  => "ช่องข้อมูลปริมาณ จำเป็นต้องกรอก. คลิกที่เครื่องหมาย ( X ) เพื่อยกเลิก",
-    "remaining_balance"                  => "บัตรของขวัญ {0} มีมูลค่า {1}!",
-    "reorder_level"                      => "ยอดขั้นต่ำ",
-    "retrive_giftcard_info"              => "Retrieve Giftcard Info",
-    "sales_tax_1"                        => "ภาษีการขาย",
-    "sales_tax_2"                        => "ภาษีขาย 2",
-    "serialized_giftcards"               => "Serialized Giftcards",
-    "successful_adding"                  => "You have successfully added giftcard",
-    "successful_bulk_edit"               => "You have successfully updated the selected giftcards",
-    "successful_deleted"                 => "คุณทำการลบสำเร็จแล้ว",
-    "successful_updating"                => "You have successfully updated giftcard",
-    "supplier"                           => "ผู้ผลิต",
-    "tax_1"                              => "ภาษี 1",
-    "tax_2"                              => "ภาษี 2",
-    "tax_percent"                        => "เปอร์เซ็นต์ภาษี",
-    "tax_percents"                       => "อัตราภาษีแบบเปอร์เซ็นต์",
-    "unit_price"                         => "ราคาปลีก",
-    "upc_database"                       => "ฐานข้อมุลบาร์โค๊ด",
-    "update"                             => "ปรับข้อมูลบัตรกำนัล",
-    "use_inventory_menu"                 => "ใช้เมนูสินค้าคงคลัง",
-    "value"                              => "มูลค่าบัตรกำนัลต้องเป็นตัวเลขเท่านั้น",
-    "value_required"                     => "ต้องกรอกมูลค่าบัตรกำนัล",
+    'add_minus' => "สินค้าคงคลัง เพิ่ม/ลด",
+    'allow_alt_description' => "คำอธิบายสำรอง",
+    'bulk_edit' => "แก้ไขเป็นกลุ่ม",
+    'cannot_be_deleted' => "ไม่สามารถลบข้อมูลบัตรของขวัญที่เลือก, หรือบัตรของขวัญได้มีการใช้ไปแล้ว",
+    'cannot_find_giftcard' => "ไม่พบข้อมูลเกี่ยวกับบัตรของขวัญนี้",
+    'cannot_use' => "บัตรของขวัญ {0} ไม่สามารถใช้งานกับรายการขายนี้ได้ เนื่องจากรายการลูกค้าไม่ถูกต้อง",
+    'card_value' => "มูลค่า",
+    'category' => "ประเภท",
+    'change_all_to_allow_alt_desc' => "คำอธิบายสำรองสำหรับทั้งหมด",
+    'change_all_to_not_allow_allow_desc' => "ไม่อนุญาตให้เปลี่ยนคำอธิบายทั้งหมด",
+    'change_all_to_serialized' => "เปลี่ยนแปลงทั้งหมด",
+    'change_all_to_unserialized' => "เปลี่ยนทั้งหมดเป็นแบบไม่ต่อเนื่องกัน",
+    'confirm_bulk_edit' => "คุณแน่ใจหรือไม่ว่าต้องการแก้ไขบัตรของขวัญที่เลือก?",
+    'confirm_delete' => "คุณแน่ใจหรือไม่ว่าต้องการลบบัตรของขวัญที่เลือก?",
+    'confirm_restore' => "คุณแน่ใจหรือไม่ว่าต้องการยกเลิกบัตรของขวัญที่เลือก?",
+    'cost_price' => "ราคาขายส่ง",
+    'count' => "ปรับปรุงสินค้าคงคลัง",
+    'csv_import_failed' => "การส่งออกในรูปแบบไฟล์เอ็กเซล ไม่สำเร็จ",
+    'current_quantity' => "จำนวน ณ. ปัจจุบัน",
+    'description' => "รายละเอียด",
+    'details_count' => "รายละเอียดการตรวจนับในสินค้าคงคลัง",
+    'do_nothing' => "ไม่ทำอะไร",
+    'edit_fields_you_want_to_update' => "แก้ไขฟิลด์ที่ต้องการสำหรับบัตรของขวัญที่เลือก",
+    'edit_multiple_giftcards' => "แก้ไขบัตรกำนัลหลายใบ",
+    'error_adding_updating' => "มีข้อผิดพลาดในการ เพิ่ม/ปรับปรุง บัตรกำนัล",
+    'error_updating_multiple' => "มีข้อผิดพลาดในการปรับปรุง บัตรกำนัล",
+    'generate_barcodes' => "สร้างบาร์โค้ด",
+    'giftcard' => "บัตรกำนัล",
+    'giftcard_number' => "เลขบัตรกำนัล",
+    'info_provided_by' => "ข้อมูลที่จัดทำโดย",
+    'inventory_comments' => "คำแนะนำ",
+    'is_serialized' => "Giftcard has Serial Number",
+    'low_inventory_giftcards' => "Low Inventory Giftcards",
+    'manually_editing_of_quantity' => "แก้ไขจำนวนปริมาณเอง",
+    'must_select_giftcard_for_barcode' => "กรุณาเลือกบัตรกำนัลอย่างน้อย 1 รายการ เพื่อสร้างบาร์โค๊ด",
+    'new' => "เพิ่มบัตรกำนัล",
+    'no_description_giftcards' => "No Description Giftcards",
+    'no_giftcards_to_display' => "No Giftcards to display",
+    'none' => "ไม่มี",
+    'none_selected' => "กรุณาเลือกบัตรกำนัลที่ต้องการแก้ไข",
+    'number' => "เลขบัตรกำนัลต้องเป็นตัวเลขเท่านั้น",
+    'number_information' => "หมายเลขบัตรของขวัญ",
+    'number_required' => "ต้องกรอกเลขบัตรกำนัล",
+    'one_or_multiple' => "giftcard(s)",
+    'person_id' => "เจ้าของบัตร",
+    'quantity' => "ปริมาณ",
+    'quantity_required' => "ช่องข้อมูลปริมาณ จำเป็นต้องกรอก. คลิกที่เครื่องหมาย ( X ) เพื่อยกเลิก",
+    'remaining_balance' => "บัตรของขวัญ {0} มีมูลค่า {1}!",
+    'reorder_level' => "ยอดขั้นต่ำ",
+    'retrive_giftcard_info' => "Retrieve Giftcard Info",
+    'sales_tax_1' => "ภาษีการขาย",
+    'sales_tax_2' => "ภาษีขาย 2",
+    'serialized_giftcards' => "Serialized Giftcards",
+    'successful_adding' => "You have successfully added giftcard",
+    'successful_bulk_edit' => "You have successfully updated the selected giftcards",
+    'successful_deleted' => "คุณทำการลบสำเร็จแล้ว",
+    'successful_updating' => "You have successfully updated giftcard",
+    'supplier' => "ผู้ผลิต",
+    'tax_1' => "ภาษี 1",
+    'tax_2' => "ภาษี 2",
+    'tax_percent' => "เปอร์เซ็นต์ภาษี",
+    'tax_percents' => "อัตราภาษีแบบเปอร์เซ็นต์",
+    'unit_price' => "ราคาปลีก",
+    'upc_database' => "ฐานข้อมุลบาร์โค๊ด",
+    'update' => "ปรับข้อมูลบัตรกำนัล",
+    'use_inventory_menu' => "ใช้เมนูสินค้าคงคลัง",
+    'value' => "มูลค่าบัตรกำนัลต้องเป็นตัวเลขเท่านั้น",
+    'value_required' => "ต้องกรอกมูลค่าบัตรกำนัล",
 ];
diff --git a/app/Language/th/Items.php b/app/Language/th/Items.php
index ca0f0d3a7..ac31a8fad 100644
--- a/app/Language/th/Items.php
+++ b/app/Language/th/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "เพิ่ม/ลบ จำนวนสินค้าคงคลัง",
-    "allow_alt_description"              => "แสดงข้อมูลเพิ่มเติม",
-    "amount_entry"                       => "จำนวนเงิน",
-    "bulk_edit"                          => "แก้ไขความจุ",
-    "buy_price_required"                 => "ราคาซื้อขายต้องกรอก",
-    "cannot_be_deleted"                  => "ไม่สามารถลบสินค้าที่เลือก, สินค้าที่เลือกถูกขายไปแล้ว.",
-    "cannot_find_item"                   => "ไม่พบข้อมูลของสินค้า",
-    "categories"                         => "",
-    "category"                           => "หมวดหมู่",
-    "category_new"                       => "",
-    "category_required"                  => "หมวดหมู่สินค้าต้องกรอก",
-    "change_all_to_allow_alt_desc"       => "อนุญาตให้รายละเอียดสำรองทั้งหมด",
-    "change_all_to_not_allow_allow_desc" => "ไม่อนุญาตให้จัดเรียงลำดับ",
-    "change_all_to_serialized"           => "เปลี่ยนแปลงรหัสสินค้าทั้งหมด",
-    "change_all_to_unserialized"         => "ลบรหัสสินค้าทั้งหมด",
-    "change_image"                       => "เปลี่ยนรูปภาพ",
-    "confirm_bulk_edit"                  => "แน่ใจหรือไม่ที่จะแก้ใขสินค้าทั้งหมดที่คุณเลือก?",
-    "confirm_bulk_edit_wipe_taxes"       => "ข้อมูลภาษีทั้งหมดจะถูกแทนที่",
-    "confirm_delete"                     => "โปรดยืนยันการลบสินค้าที่ถูกเลือก?",
-    "confirm_restore"                    => "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนรายการที่เลือก?",
-    "cost_price"                         => "ราคาขายส่ง",
-    "cost_price_number"                  => "ราคาขายส่งต้องเป็นตัวเลข",
-    "cost_price_required"                => "ต้องกรอกราคาขายส่ง",
-    "count"                              => "แก้ไขจำนวนสินค้าคงคลัง",
-    "csv_import_failed"                  => "นำเข้าข้อมูล CSV ล้มเหลว",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Your uploaded file has no data or wrong format",
-    "csv_import_partially_failed"        => "มีรายการ {0} รายการที่นำเข้าล้มเหลว : {1} รายการที่ยังไม่ได้นำเข้า",
-    "csv_import_success"                 => "Import of Items successful",
-    "current_quantity"                   => "ปริมาณสินค้าคงคลัง",
-    "default_pack_name"                  => "ชิ้นละ",
-    "description"                        => "รายละเอียด",
-    "details_count"                      => "รายละเอียดจำนวนสินค้าคงคลัง",
-    "do_nothing"                         => "ไม่ต้องทำอะไร",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "แก้ไขสินค้าทุกชนิดที่คุณเลือก",
-    "edit_multiple_items"                => "แก้ใขสินค้าต่างๆ",
-    "empty_upc_items"                    => "Empty UPC Items",
-    "error_adding_updating"              => "เพิ่ม/ปรับแต่ง สินค้าล้มเหลว",
-    "error_updating_multiple"            => "ปรับแต่งสินค้าล้มเหลว",
-    "generate_barcodes"                  => "พิมพ์บาร์โค๊ด",
-    "hsn_code"                           => "ระบบการตั้งชื่อที่กลมกลืนกัน",
-    "image"                              => "รูป",
-    "import_items_csv"                   => "รายการที่นำเข้าจาก CSV",
-    "info_provided_by"                   => "จัดเตรียมข้อมูลโดย",
-    "inventory"                          => "สินค้าคงเหลือ",
-    "inventory_CSV_import_quantity"      => "จำนวนที่นำเข้าจาก CSV",
-    "inventory_comments"                 => "คำอธิบาย",
-    "inventory_data_tracking"            => "การติดตามข้อมูลสินค้าคงคลัง",
-    "inventory_date"                     => "วันที่",
-    "inventory_employee"                 => "พนักงาน",
-    "inventory_in_out_quantity"          => "ปริมาณเข้า / ออก",
-    "inventory_remarks"                  => "หมายเหตุ",
-    "is_deleted"                         => "ถูกลบแล้ว",
-    "is_printed"                         => "",
-    "is_serialized"                      => "สินค้ามีซีเรียลนัมเบอร์",
-    "item"                               => "สินค้า",
-    "item_id"                            => "",
-    "item_number"                        => "โค๊ด",
-    "item_number_duplicate"              => "The item number is already present in the database",
-    "kit"                                => "ชุด",
-    "location"                           => "ที่ตั้ง",
-    "low_inventory_items"                => "สินค้าคงเหลือน้อย",
-    "low_sell_item"                      => "รายการขายต่ำ",
-    "manually_editing_of_quantity"       => "แก้ไขจำนวน",
-    "markup"                             => "",
-    "name"                               => "ชื่อสินค้า",
-    "name_required"                      => "ชื่อสินค้าต้องกรอก",
-    "new"                                => "เพิ่มรายการสินค้า",
-    "no_description_items"               => "สินค้าที่ไม่มีคำอธิบายหรือวิธีการใช้",
-    "no_items_to_display"                => "ไม่มีสินค้าแสดง",
-    "none"                               => "ว่างเปล่า",
-    "none_selected"                      => "กรุณาเลือสินค้าที่ต้องการแก้ไข",
-    "nonstock"                           => "ไม่นับสต็อก",
-    "number_information"                 => "หมายเลขสินค้า",
-    "number_required"                    => "จำเป็นต้องระบุบาร์โค้ด",
-    "one_or_multiple"                    => "สินค้า(s)",
-    "pack_name"                          => "ชื่อแพ็ค",
-    "qty_per_pack"                       => "ปริมาณต่อแพ็ค",
-    "quantity"                           => "จำนวน",
-    "quantity_number"                    => "จำนวนต้องเป็นตัวเลข",
-    "quantity_required"                  => "จำนวนต้องกรอก",
-    "receiving_quantity"                 => "ยอดรับมา",
-    "remove_image"                       => "นำภาพออก",
-    "reorder_level"                      => "ระดับการสั่งใหม่",
-    "reorder_level_number"               => "ระดับการสั่งใหม่ต้องเป็นตัวเลข",
-    "reorder_level_required"             => "ระดับการสั่งไหม่ต้องกรอก",
-    "retrive_item_info"                  => "ดึงข้อมูลรายการ",
-    "sales_tax_1"                        => "ถาษีขาย",
-    "sales_tax_2"                        => "ภาษีขาย 2",
-    "search_attributes"                  => "ค้นหาตามคุณสมบัติ",
-    "select_image"                       => "เลือกรูปภาพ",
-    "serialized_items"                   => "รหัสสินค้า",
-    "standard"                           => "มาตรฐาน",
-    "stock"                              => "คลังสินค้า",
-    "stock_location"                     => "ที่เก็บ",
-    "stock_type"                         => "ประเภทคลัง",
-    "successful_adding"                  => "เพิ่มสินค้าสำเร็จ",
-    "successful_bulk_edit"               => "ปรับแต่งสินค้าสำเร็จ",
-    "successful_deleted"                 => "ลบสินค้าสำเร็จ",
-    "successful_updating"                => "ปรับแต่งสินค้าสำเร็จ",
-    "supplier"                           => "ผู้ผลิต",
-    "tax_1"                              => "ภาษี 1",
-    "tax_2"                              => "ภาษี 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "ประเภทภาษี",
-    "tax_percent"                        => "ภาษี(%)",
-    "tax_percent_number"                 => "เปอร์เซ็นต์ภาษีต้องเป็นค่าตัวเลข",
-    "tax_percent_required"               => "เปอร์เซ็นต์ต้องกรอก",
-    "tax_percents"                       => "ภาษี(%)",
-    "temp"                               => "ชั่วคราว",
-    "type"                               => "ประเภทรายการ",
-    "unit_price"                         => "ราคาขาย",
-    "unit_price_number"                  => "ราคาต่อหน่วยต้องเป็นตัวเลข",
-    "unit_price_required"                => "ราคาต่อหน่วยต้องกรอก",
-    "upc_database"                       => "UPC ฐานข้อมูล",
-    "update"                             => "ปรับแต่งสินค้า",
-    "use_inventory_menu"                 => "ใช้เมนูสินค้าคงเหลือ",
+    'add_minus' => 'เพิ่ม/ลบ จำนวนสินค้าคงคลัง',
+    'allow_alt_description' => 'แสดงข้อมูลเพิ่มเติม',
+    'amount_entry' => 'จำนวนเงิน',
+    'bulk_edit' => 'แก้ไขความจุ',
+    'buy_price_required' => 'ราคาซื้อขายต้องกรอก',
+    'cannot_be_deleted' => 'ไม่สามารถลบสินค้าที่เลือก, สินค้าที่เลือกถูกขายไปแล้ว.',
+    'cannot_find_item' => 'ไม่พบข้อมูลของสินค้า',
+    'categories' => '',
+    'category' => 'หมวดหมู่',
+    'category_new' => '',
+    'category_required' => 'หมวดหมู่สินค้าต้องกรอก',
+    'change_all_to_allow_alt_desc' => 'อนุญาตให้รายละเอียดสำรองทั้งหมด',
+    'change_all_to_not_allow_allow_desc' => 'ไม่อนุญาตให้จัดเรียงลำดับ',
+    'change_all_to_serialized' => 'เปลี่ยนแปลงรหัสสินค้าทั้งหมด',
+    'change_all_to_unserialized' => 'ลบรหัสสินค้าทั้งหมด',
+    'change_image' => 'เปลี่ยนรูปภาพ',
+    'confirm_bulk_edit' => 'แน่ใจหรือไม่ที่จะแก้ใขสินค้าทั้งหมดที่คุณเลือก?',
+    'confirm_bulk_edit_wipe_taxes' => 'ข้อมูลภาษีทั้งหมดจะถูกแทนที่',
+    'confirm_delete' => 'โปรดยืนยันการลบสินค้าที่ถูกเลือก?',
+    'confirm_restore' => 'คุณแน่ใจหรือไม่ว่าต้องการกู้คืนรายการที่เลือก?',
+    'cost_price' => 'ราคาขายส่ง',
+    'cost_price_number' => 'ราคาขายส่งต้องเป็นตัวเลข',
+    'cost_price_required' => 'ต้องกรอกราคาขายส่ง',
+    'count' => 'แก้ไขจำนวนสินค้าคงคลัง',
+    'csv_import_failed' => 'นำเข้าข้อมูล CSV ล้มเหลว',
+    'csv_import_invalid_location' => 'คลังสินค้าไม่ถูกต้องหรือไม่พบ: {0} อนุญาตเฉพาะคลังสินค้าที่มีเท่านั้น',
+    'csv_import_nodata_wrongformat' => 'Your uploaded file has no data or wrong format',
+    'csv_import_partially_failed' => 'มีรายการ {0} รายการที่นำเข้าล้มเหลว : {1} รายการที่ยังไม่ได้นำเข้า',
+    'csv_import_success' => 'Import of Items successful',
+    'current_quantity' => 'ปริมาณสินค้าคงคลัง',
+    'default_pack_name' => 'ชิ้นละ',
+    'description' => 'รายละเอียด',
+    'details_count' => 'รายละเอียดจำนวนสินค้าคงคลัง',
+    'do_nothing' => 'ไม่ต้องทำอะไร',
+    'edit' => '',
+    'edit_fields_you_want_to_update' => 'แก้ไขสินค้าทุกชนิดที่คุณเลือก',
+    'edit_multiple_items' => 'แก้ใขสินค้าต่างๆ',
+    'empty_upc_items' => 'Empty UPC Items',
+    'error_adding_updating' => 'เพิ่ม/ปรับแต่ง สินค้าล้มเหลว',
+    'error_updating_multiple' => 'ปรับแต่งสินค้าล้มเหลว',
+    'generate_barcodes' => 'พิมพ์บาร์โค๊ด',
+    'hsn_code' => 'ระบบการตั้งชื่อที่กลมกลืนกัน',
+    'image' => 'รูป',
+    'import_items_csv' => 'รายการที่นำเข้าจาก CSV',
+    'info_provided_by' => 'จัดเตรียมข้อมูลโดย',
+    'inventory' => 'สินค้าคงเหลือ',
+    'inventory_CSV_import_quantity' => 'จำนวนที่นำเข้าจาก CSV',
+    'inventory_comments' => 'คำอธิบาย',
+    'inventory_data_tracking' => 'การติดตามข้อมูลสินค้าคงคลัง',
+    'inventory_date' => 'วันที่',
+    'inventory_employee' => 'พนักงาน',
+    'inventory_in_out_quantity' => 'ปริมาณเข้า / ออก',
+    'inventory_remarks' => 'หมายเหตุ',
+    'is_deleted' => 'ถูกลบแล้ว',
+    'is_printed' => '',
+    'is_serialized' => 'สินค้ามีซีเรียลนัมเบอร์',
+    'item' => 'สินค้า',
+    'item_id' => '',
+    'item_number' => 'โค๊ด',
+    'item_number_duplicate' => 'The item number is already present in the database',
+    'item_number_invalid' => 'หมายเลขสินค้าประกอบด้วยอักขระที่ไม่อนุญาต',
+    'kit' => 'ชุด',
+    'location' => 'ที่ตั้ง',
+    'low_inventory_items' => 'สินค้าคงเหลือน้อย',
+    'low_sell_item' => 'รายการขายต่ำ',
+    'manually_editing_of_quantity' => 'แก้ไขจำนวน',
+    'markup' => '',
+    'name' => 'ชื่อสินค้า',
+    'name_required' => 'ชื่อสินค้าต้องกรอก',
+    'new' => 'เพิ่มรายการสินค้า',
+    'no_description_items' => 'สินค้าที่ไม่มีคำอธิบายหรือวิธีการใช้',
+    'no_items_to_display' => 'ไม่มีสินค้าแสดง',
+    'none' => 'ว่างเปล่า',
+    'none_selected' => 'กรุณาเลือสินค้าที่ต้องการแก้ไข',
+    'nonstock' => 'ไม่นับสต็อก',
+    'number_information' => 'หมายเลขสินค้า',
+    'number_required' => 'จำเป็นต้องระบุบาร์โค้ด',
+    'one_or_multiple' => 'สินค้า(s)',
+    'pack_name' => 'ชื่อแพ็ค',
+    'qty_per_pack' => 'ปริมาณต่อแพ็ค',
+    'quantity' => 'จำนวน',
+    'quantity_number' => 'จำนวนต้องเป็นตัวเลข',
+    'quantity_required' => 'จำนวนต้องกรอก',
+    'receiving_quantity' => 'ยอดรับมา',
+    'remove_image' => 'นำภาพออก',
+    'reorder_level' => 'ระดับการสั่งใหม่',
+    'reorder_level_number' => 'ระดับการสั่งใหม่ต้องเป็นตัวเลข',
+    'reorder_level_required' => 'ระดับการสั่งไหม่ต้องกรอก',
+    'retrive_item_info' => 'ดึงข้อมูลรายการ',
+    'sales_tax_1' => 'ถาษีขาย',
+    'sales_tax_2' => 'ภาษีขาย 2',
+    'search_attributes' => 'ค้นหาตามคุณสมบัติ',
+    'select_image' => 'เลือกรูปภาพ',
+    'serialized_items' => 'รหัสสินค้า',
+    'standard' => 'มาตรฐาน',
+    'stock' => 'คลังสินค้า',
+    'stock_location' => 'ที่เก็บ',
+    'stock_type' => 'ประเภทคลัง',
+    'successful_adding' => 'เพิ่มสินค้าสำเร็จ',
+    'successful_bulk_edit' => 'ปรับแต่งสินค้าสำเร็จ',
+    'successful_deleted' => 'ลบสินค้าสำเร็จ',
+    'successful_updating' => 'ปรับแต่งสินค้าสำเร็จ',
+    'supplier' => 'ผู้ผลิต',
+    'tax_1' => 'ภาษี 1',
+    'tax_2' => 'ภาษี 2',
+    'tax_3' => '',
+    'tax_category' => 'ประเภทภาษี',
+    'tax_name_invalid' => 'ชื่อภาษีมีอักขระที่ไม่อนุญาต.',
+    'tax_percent' => 'ภาษี(%)',
+    'tax_percent_number' => 'เปอร์เซ็นต์ภาษีต้องเป็นค่าตัวเลข',
+    'tax_percent_required' => 'เปอร์เซ็นต์ต้องกรอก',
+    'tax_percents' => 'ภาษี(%)',
+    'temp' => 'ชั่วคราว',
+    'type' => 'ประเภทรายการ',
+    'unit_price' => 'ราคาขาย',
+    'unit_price_number' => 'ราคาต่อหน่วยต้องเป็นตัวเลข',
+    'unit_price_required' => 'ราคาต่อหน่วยต้องกรอก',
+    'upc_database' => 'UPC ฐานข้อมูล',
+    'update' => 'ปรับแต่งสินค้า',
+    'use_inventory_menu' => 'ใช้เมนูสินค้าคงเหลือ',
 ];
diff --git a/app/Language/th/Login.php b/app/Language/th/Login.php
index 484045b1e..40ef82cae 100644
--- a/app/Language/th/Login.php
+++ b/app/Language/th/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "ฉันไม่ใช่หุ่นยนต์นะ",
-    "go"                            => "เข้าสู่ระบบ",
-    "invalid_gcaptcha"              => "กรุณาแสดงตัวตนว่าคุณไม่ใช่หุ่นยนต์",
-    "invalid_installation"          => "การติดตั้งไม่ถูกต้องตรวจสอบการตั้งค่าที่ไฟล์ php.ini ของคุณ",
-    "invalid_username_and_password" => "ชื่อผู้ใช้งานและ/หรือรหัสผ่านเข้าระบบไม่ถูกต้อง",
-    "login"                         => "ลงชื่อเข้าใช้",
-    "logout"                        => "ออกจากระบบ",
-    "migration_needed"              => "การย้ายฐานข้อมูลไปยัง {0} จะเริ่มต้นหลังจากเข้าสู่ระบบ",
-    "password"                      => "รหัสผ่าน",
-    "required_username"             => "จำเป็นต้องระบุชื่อผู้ใช้งาน",
-    "username"                      => "ชื่อผู้ใช้",
-    "welcome"                       => "ยินดีต้อนรับสู่ {0}!",
+    "gcaptcha"                            => "ฉันไม่ใช่หุ่นยนต์นะ",
+    "go"                                  => "เข้าสู่ระบบ",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "กรุณาแสดงตัวตนว่าคุณไม่ใช่หุ่นยนต์",
+    "invalid_installation"                => "การติดตั้งไม่ถูกต้องตรวจสอบการตั้งค่าที่ไฟล์ php.ini ของคุณ",
+    "invalid_username_and_password"       => "ชื่อผู้ใช้งานและ/หรือรหัสผ่านเข้าระบบไม่ถูกต้อง",
+    "login"                               => "ลงชื่อเข้าใช้",
+    "logout"                              => "ออกจากระบบ",
+    "migrating_database"                  => "กำลังย้ายฐานข้อมูล",
+    "migration_auth_message"              => "ผู้ดูแลระบบจำเป็นต้องมีสิทธิ์ในการปรับปรุงฐานข้อมูลเวอร์ชั่น {0} กรุณาเข้าระบบเพื่อดำเนินการต่อ",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "ย้ายฐานข้อมูลสำเร็จแล้ว!",
+    "migration_complete_redirect"         => "ทำการปรับปรุงฐานข้อมูลเรียบร้อย กำลังดำเนินการไปหน้าเข้าสู่ระบบ ...",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "การย้ายฐานข้อมูลไปยัง {0} จะเริ่มต้นหลังจากเข้าสู่ระบบ",
+    "migration_required"                  => "จําเป็นต้องมีการปรับปรุงฐานข้อมูล",
+    "migration_running"                   => "",
+    "password"                            => "รหัสผ่าน",
+    "required_username"                   => "จำเป็นต้องระบุชื่อผู้ใช้งาน",
+    'too_many_attempts'                   => 'พยายามมากเกินไป กรุณารอสักครู่แล้วลองใหม่อีกครั้ง',
+    "username"                            => "ชื่อผู้ใช้",
+    "welcome"                             => "ยินดีต้อนรับสู่ {0}!"
 ];
diff --git a/app/Language/th/Reports.php b/app/Language/th/Reports.php
index cc0bdbca2..013abd1ad 100644
--- a/app/Language/th/Reports.php
+++ b/app/Language/th/Reports.php
@@ -1,149 +1,150 @@
 <?php
 
 return [
-    "all"                                     => "ทั้งหมด",
-    "authority"                               => "ผู้ได้รับอนุญาติ",
-    "canceled"                                => "ถูกยกเลิก",
-    "categories"                              => "หมวดหมู่",
-    "categories_summary_report"               => "รายงานสรุปหมวดหมู่",
-    "category"                                => "หมวดหมู่",
-    "code_canceled"                           => "รหัสยกเลิก",
-    "code_invoice"                            => "รหัสใบแจ้งหนี้",
-    "code_pos"                                => "รหัส POS",
-    "code_quote"                              => "อ้างอิง",
-    "code_return"                             => "รหัสส่งคืน",
-    "code_type"                               => "ประเภท",
-    "code_work_order"                         => "รหัสสั่งงาน",
-    "comments"                                => "หมายเหตุ",
-    "commission"                              => "",
-    "complete"                                => "การขายและรับคืนที่สมบูรณ์",
-    "completed_sales"                         => "การขายที่สมบูรณ์",
-    "confirm_delete"                          => "คุณแน่ใจหรือว่าต้องการลบรายการที่เลือก ?",
-    "confirm_restore"                         => "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนรายการที่เลือก?",
-    "cost"                                    => "ราคาขายส่ง",
-    "cost_price"                              => "ราคาขายส่ง",
-    "count"                                   => "นับ",
-    "customer"                                => "ลูกค้า",
-    "customers"                               => "ลูกค้า",
-    "customers_summary_report"                => "รายงานสรุปลูกค้า",
-    "date"                                    => "วันที่",
-    "date_range"                              => "ระหว่างวันที่",
-    "description"                             => "คำอธิบาย",
-    "detailed_receivings_report"              => "รายงานรายละเอียกการรับของ",
-    "detailed_receivings_report_input"        => "",
-    "detailed_reports"                        => "รายละเอียดรายงาน",
-    "detailed_requisition_report"             => "รายงานรายละเอียดการเบิกของ",
-    "detailed_sales_report"                   => "รายงายงานขาย",
-    "discount"                                => "ส่วนลด",
-    "discount_fixed"                          => "ส่วนลดคงที่",
-    "discount_percent"                        => "เปอร์เซ็นต์ส่วนลด",
-    "discount_type"                           => "ประเภทส่วนลด",
-    "discounts"                               => "ส่วนลด",
-    "discounts_summary_report"                => "รายงานสรุปส่วนลด",
-    "earned"                                  => "คะแนนที่ได้รับ",
-    "employee"                                => "พนักงาน",
-    "employees"                               => "พนักงาน",
-    "employees_summary_report"                => "รายงานสรุปพนักงาน",
-    "expenses"                                => "รายจ่าย",
-    "expenses_amount"                         => "ยอดรวม",
-    "expenses_categories"                     => "สรุปค่าใช้จ่าย",
-    "expenses_categories_summary_report"      => "รายงานสรุปหมวดหมู่ค่าใช้จ่าย",
-    "expenses_category"                       => "หมวดหมู่",
-    "expenses_payment_amount"                 => "",
-    "expenses_tax_amount"                     => "ภาษี",
-    "expenses_total_amount"                   => "ยอดรวมทั้งหมด",
-    "expenses_total_tax_amount"               => "ภาษีทั้งหมด",
-    "graphical_reports"                       => "รายงายแบบกราฟ",
-    "inventory"                               => "สินค้าคงคลัง",
-    "inventory_low"                           => "สินค้าเหลือน้อย",
-    "inventory_low_report"                    => "รายงานสินค้าที่เหลือน้อย",
-    "inventory_reports"                       => "รายงานสินค้าคงเหลือ",
-    "inventory_summary"                       => "รายงานสินค้าคงเหลือ",
-    "inventory_summary_report"                => "รายงานสรุปสินค้าคงเหลือ",
-    "item"                                    => "สินค้า",
-    "item_count"                              => "ตัวกรองรายการตามการนับ",
-    "item_name"                               => "ชื่อสินค้า",
-    "item_number"                             => "เลขสินค้า",
-    "items"                                   => "สินค้า",
-    "items_purchased"                         => "สินค้าที่ถูกซื้อ",
-    "items_received"                          => "สินค้าเข้า",
-    "items_summary_report"                    => "รายงานสรุปสินค้า",
-    "jurisdiction"                            => "การควบคุม",
-    "low_inventory"                           => "",
-    "low_inventory_report"                    => "",
-    "low_sell_quantity"                       => "จำนวนขายน้อย",
-    "more_than_zero"                          => "มากกว่าศูนย์",
-    "name"                                    => "ชื่อ",
-    "no_reports_to_display"                   => "ไม่มีสินค้าแสดง",
-    "payment_type"                            => "ชนิดของการจ่าย",
-    "payments"                                => "รายจ่าย",
-    "payments_summary_report"                 => "รายงานสรุปการจ่าย",
-    "profit"                                  => "กำไร",
-    "quantity"                                => "จำนวน",
-    "quantity_purchased"                      => "จำนวนการช์้อ",
-    "quotes"                                  => "อ้างอิง",
-    "received_by"                             => "รับโดย",
-    "receiving_id"                            => "เลขที่การรับ",
-    "receiving_type"                          => "รูปแบบการรับสินค้า",
-    "receivings"                              => "รับสินค้า",
-    "reorder_level"                           => "ระดับการสั่งใหม่",
-    "report"                                  => "รายงาน",
-    "report_input"                            => "ข้อมูลรายงาน",
-    "reports"                                 => "รายงาน",
-    "requisition"                             => "เบิกสินค้า",
-    "requisition_by"                          => "ผู้เบิกสินค้า",
-    "requisition_id"                          => "IDเบิกสินค้า",
-    "requisition_item"                        => "ชื่อสินค้า",
-    "requisition_item_quantity"               => "จำนวนเบิก",
-    "requisition_related_item"                => "สินค้าย่อย",
-    "requisition_related_item_total_quantity" => "จำนวนรวมสินค้าย่อย",
-    "requisition_related_item_unit_quantity"  => "จำนวนสินค้าย่ิอย",
-    "requisitions"                            => "ใบเบิกของ",
-    "returns"                                 => "คืน",
-    "revenue"                                 => "รายรับ",
-    "sale_id"                                 => "เลขที่รายการ",
-    "sale_type"                               => "ชนิดของการขาย",
-    "sales"                                   => "ขาย",
-    "sales_amount"                            => "จำนวนขาย",
-    "sales_summary_report"                    => "รายงานสรุปการขาย",
-    "sales_taxes"                             => "ภาษีขาย",
-    "sales_taxes_summary_report"              => "รายงานสรุปภาษีขาย",
-    "serial_number"                           => "หมายเลขซีเรียล",
-    "service_charge"                          => "",
-    "sold_by"                                 => "ขายโดย",
-    "sold_items"                              => "",
-    "sold_to"                                 => "ขายไปที่",
-    "stock_location"                          => "ที่ตั้งคลังสินค้า",
-    "sub_total_value"                         => "ยอดรวมหักภาษี",
-    "subtotal"                                => "ยอดรวมรอง",
-    "summary_reports"                         => "สรุปรายงาน",
-    "supplied_by"                             => "ผบิตโดย",
-    "supplier"                                => "ผู้ผลิต",
-    "suppliers"                               => "ผู้ผลิต",
-    "suppliers_summary_report"                => "รายงานสรุปผู้ผลิต",
-    "tax"                                     => "ภาษี",
-    "tax_category"                            => "หมวดหมู่ภาษี",
-    "tax_name"                                => "ชื่อผู้เสียภาษี",
-    "tax_percent"                             => "เปอร์เซ็นภาษี",
-    "tax_rate"                                => "อัตราภาษี",
-    "taxes"                                   => "ภาษี",
-    "taxes_summary_report"                    => "รายงานสรุปภาษี",
-    "total"                                   => "ยอดรวม",
-    "total_inventory_value"                   => "มูลค่าสินค้าคงคลังรวม",
-    "total_low_sell_quantity"                 => "จำนวนการขายต่ำ",
-    "total_quantity"                          => "ปริมาณรวม",
-    "total_retail"                            => "มูลค่ารวมใบแจ้งหนี้ค้าปลีก",
-    "trans_amount"                            => "จำนวนรายการ",
-    "trans_due"                               => "วันนัดหมาย",
-    "trans_group"                             => "กลุ่มธุรกรรม",
-    "trans_nopay_sales"                       => "การขายโดยไม่มีการชำระเงิน",
-    "trans_payments"                          => "การชำระเงิน",
-    "trans_refunded"                          => "คืนเงิน",
-    "trans_sales"                             => "การขาย",
-    "trans_type"                              => "ประเภทธุรกรรม",
-    "type"                                    => "ชนิด",
-    "unit_price"                              => "ราคาขาย",
-    "used"                                    => "คะแนนที่ใช้",
-    "work_orders"                             => "การสั่งงาน",
-    "zero_and_less"                           => "เท่ากับศูนย์และน้อยกว่า",
+    'all' => "ทั้งหมด",
+    'authority' => "ผู้ได้รับอนุญาติ",
+    'canceled' => "ถูกยกเลิก",
+    'categories' => "หมวดหมู่",
+    'categories_summary_report' => "รายงานสรุปหมวดหมู่",
+    'category' => "หมวดหมู่",
+    'code_canceled' => "รหัสยกเลิก",
+    'code_invoice' => "รหัสใบแจ้งหนี้",
+    'code_pos' => "รหัส POS",
+    'code_quote' => "อ้างอิง",
+    'code_return' => "รหัสส่งคืน",
+    'code_type' => "ประเภท",
+    'code_work_order' => "รหัสสั่งงาน",
+    'comments' => "หมายเหตุ",
+    'commission' => "",
+    'complete' => "การขายและรับคืนที่สมบูรณ์",
+    'completed_sales' => "การขายที่สมบูรณ์",
+    'confirm_delete' => "คุณแน่ใจหรือว่าต้องการลบรายการที่เลือก ?",
+    'confirm_restore' => "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนรายการที่เลือก?",
+    'cost' => "ราคาขายส่ง",
+    'cost_price' => "ราคาขายส่ง",
+    'count' => "นับ",
+    'customer' => "ลูกค้า",
+    'customers' => "ลูกค้า",
+    'customers_summary_report' => "รายงานสรุปลูกค้า",
+    'date' => "วันที่",
+    'date_range' => "ระหว่างวันที่",
+    'description' => "คำอธิบาย",
+    'detailed_receivings_report' => "รายงานรายละเอียกการรับของ",
+    'detailed_receivings_report_input' => "",
+    'detailed_reports' => "รายละเอียดรายงาน",
+    'detailed_requisition_report' => "รายงานรายละเอียดการเบิกของ",
+    'detailed_sales_report' => "รายงายงานขาย",
+    'discount' => "ส่วนลด",
+    'discount_fixed' => "ส่วนลดคงที่",
+    'discount_percent' => "เปอร์เซ็นต์ส่วนลด",
+    'discount_type' => "ประเภทส่วนลด",
+    'discounts' => "ส่วนลด",
+    'discounts_summary_report' => "รายงานสรุปส่วนลด",
+    'earned' => "คะแนนที่ได้รับ",
+    'employee' => "พนักงาน",
+    'employees' => "พนักงาน",
+    'employees_summary_report' => "รายงานสรุปพนักงาน",
+    'expenses' => "ค่าใช้จ่าย",
+    'expenses_amount' => "ยอดรวม",
+    'expenses_categories' => "สรุปค่าใช้จ่าย",
+    'expenses_categories_summary_report' => "รายงานสรุปหมวดหมู่ค่าใช้จ่าย",
+    'expenses_category' => "หมวดหมู่",
+    'expenses_payment_amount' => "",
+    'expenses_tax_amount' => "ภาษี",
+    'expenses_total_amount' => "ยอดรวมทั้งหมด",
+    'expenses_total_tax_amount' => "ภาษีทั้งหมด",
+    'graphical_reports' => "รายงายแบบกราฟ",
+    'inventory' => "สินค้าคงคลัง",
+    'inventory_low' => "สินค้าเหลือน้อย",
+    'inventory_low_report' => "รายงานสินค้าที่เหลือน้อย",
+    'inventory_reports' => "รายงานสินค้าคงเหลือ",
+    'inventory_summary' => "รายงานสินค้าคงเหลือ",
+    'inventory_summary_report' => "รายงานสรุปสินค้าคงเหลือ",
+    'item' => "สินค้า",
+    'item_count' => "ตัวกรองรายการตามการนับ",
+    'item_name' => "ชื่อสินค้า",
+    'item_number' => "เลขสินค้า",
+    'items' => "สินค้า",
+    'items_purchased' => "สินค้าที่ถูกซื้อ",
+    'items_received' => "สินค้าเข้า",
+    'items_summary_report' => "รายงานสรุปสินค้า",
+    'jurisdiction' => "การควบคุม",
+    'low_inventory' => "",
+    'low_inventory_report' => "",
+    'low_sell_quantity' => "จำนวนขายน้อย",
+    'more_than_zero' => "มากกว่าศูนย์",
+    'name' => "ชื่อ",
+    'no_reports_to_display' => "ไม่มีสินค้าแสดง",
+    'payment_type' => "ชนิดของการจ่าย",
+    'payments' => "รายจ่าย",
+    'payments_summary_report' => "รายงานสรุปการจ่าย",
+    'profit' => "กำไร",
+    'quantity' => "จำนวน",
+    'quantity_purchased' => "จำนวนการช์้อ",
+    'quotes' => "อ้างอิง",
+    'received_by' => "รับโดย",
+    'receiving_id' => "เลขที่การรับ",
+    'receiving_type' => "รูปแบบการรับสินค้า",
+    'receivings' => "รับสินค้า",
+    'reorder_level' => "ระดับการสั่งใหม่",
+    'report' => "รายงาน",
+    'report_input' => "ข้อมูลรายงาน",
+    'reports' => "รายงาน",
+    'requisition' => "เบิกสินค้า",
+    'requisition_by' => "ผู้เบิกสินค้า",
+    'requisition_id' => "IDเบิกสินค้า",
+    'requisition_item' => "ชื่อสินค้า",
+    'requisition_item_quantity' => "จำนวนเบิก",
+    'requisition_related_item' => "สินค้าย่อย",
+    'requisition_related_item_total_quantity' => "จำนวนรวมสินค้าย่อย",
+    'requisition_related_item_unit_quantity' => "จำนวนสินค้าย่ิอย",
+    'requisitions' => "ใบเบิกของ",
+    'returns' => "คืน",
+    'revenue' => "รายรับ",
+    'sale_id' => "เลขที่รายการ",
+    'sale_type' => "ชนิดของการขาย",
+    'sales' => "ขาย",
+    'sales_amount' => "จำนวนขาย",
+    'sales_summary_report' => "รายงานสรุปการขาย",
+    'sales_taxes' => "ภาษีขาย",
+    'sales_taxes_summary_report' => "รายงานสรุปภาษีขาย",
+    'serial_number' => "หมายเลขซีเรียล",
+    'service_charge' => "",
+    'sold_by' => "ขายโดย",
+    'sold_items' => "",
+    'sold_to' => "ขายไปที่",
+    'stock_location' => "ที่ตั้งคลังสินค้า",
+    'sub_total_value' => "ยอดรวมหักภาษี",
+    'subtotal' => "ยอดรวมรอง",
+    'summary_reports' => "สรุปรายงาน",
+    'supplied_by' => "ผบิตโดย",
+    'supplier' => "ผู้ผลิต",
+    'suppliers' => "ผู้ผลิต",
+    'suppliers_summary_report' => "รายงานสรุปผู้ผลิต",
+    'tax' => "ภาษี",
+    'tax_category' => "หมวดหมู่ภาษี",
+    'tax_name' => "ชื่อผู้เสียภาษี",
+    'tax_percent' => "เปอร์เซ็นภาษี",
+    'tax_rate' => "อัตราภาษี",
+    'taxes' => "ภาษี",
+    'taxes_summary_report' => "รายงานสรุปภาษี",
+    'total' => "ยอดรวม",
+    'total_inventory_value' => "มูลค่าสินค้าคงคลังรวม",
+    'total_low_sell_quantity' => "จำนวนการขายต่ำ",
+    'total_quantity' => "ปริมาณรวม",
+    'total_retail' => "มูลค่ารวมใบแจ้งหนี้ค้าปลีก",
+    'trans_amount' => "จำนวนรายการ",
+    'trans_due' => "วันนัดหมาย",
+    'trans_group' => "กลุ่มธุรกรรม",
+    'trans_nopay_sales' => "การขายโดยไม่มีการชำระเงิน",
+    'trans_payments' => "การชำระเงิน",
+    'trans_refunded' => "คืนเงิน",
+    'trans_sales' => "การขาย",
+    'trans_type' => "ประเภทธุรกรรม",
+    'type' => "ชนิด",
+    'unit_price' => "ราคาขาย",
+    'used' => "คะแนนที่ใช้",
+    'work_orders' => "การสั่งงาน",
+    'zero_and_less' => "เท่ากับศูนย์และน้อยกว่า",
+    'toggle_cost_and_profit' => "เปลี่ยนระหว่างต้นทุนและกำไร",
 ];
diff --git a/app/Language/th/Sales.php b/app/Language/th/Sales.php
index 0a8ec17b1..01e740577 100644
--- a/app/Language/th/Sales.php
+++ b/app/Language/th/Sales.php
@@ -1,226 +1,240 @@
 <?php
 
 return [
-    "customers_available_points"       => "คะแนนที่มี",
-    "rewards_package"                  => "คะแนนสะสม",
-    "rewards_remaining_balance"        => "คะแนนสะสมคงเหลือ ",
-    "account_number"                   => "บัญชี #",
-    "add_payment"                      => "เพิ่มบิล",
-    "amount_due"                       => "ยอดค้างชำระ",
-    "amount_tendered"                  => "ชำระเข้ามา",
-    "authorized_signature"             => "ลายเซ็นผู้มีอำนาจ",
-    "cancel_sale"                      => "ยกเลิกการขาย",
-    "cash"                             => "เงินสด",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "การปรับเงินสดขาย",
-    "cash_deposit"                     => "ฝากเงินสด",
-    "cash_filter"                      => "เงินสด",
-    "change_due"                       => "เงินทอน",
-    "change_price"                     => "เปลี่ยนราคาขาย",
-    "check"                            => "โอนเงิน/พร้อมเพย์/เช็ค",
-    "check_balance"                    => "เช็คยอดคงเหลือ",
-    "check_filter"                     => "ตรวจสอบ",
-    "close"                            => "",
-    "comment"                          => "หมายเหตุ",
-    "comments"                         => "หมายเหตุ",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "จบการขาย",
-    "confirm_cancel_sale"              => "แน่ใจหรือไม่ที่จะล้างการขายนี้? ทุกรายการจะถูกลบทั้งหมด",
-    "confirm_delete"                   => "โปรดยืนยันการลบรายการขายที่เลือกไว้ ?",
-    "confirm_restore"                  => "คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการขายที่เลือกไว้?",
-    "credit"                           => "เครดิตการ์ด",
-    "credit_deposit"                   => "เงินฝากเครดิต",
-    "credit_filter"                    => "บัตรเครติด",
-    "current_table"                    => "",
-    "customer"                         => "ลูกค้า",
-    "customer_address"                 => "Customer Address",
-    "customer_discount"                => "ส่วนลด",
-    "customer_email"                   => "Customer Email",
-    "customer_location"                => "Customer Location",
-    "customer_mailchimp_status"        => "สถานะของระบบส่งเมล์เมล์ชิม",
-    "customer_optional"                => "(ต้องระบุวันที่ชำระเงิน)",
-    "customer_required"                => "(ต้องระบุ)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "วันที่ขาย",
-    "date_range"                       => "ระหว่างวันที่",
-    "date_required"                    => "กรุณากรอกวันที่ให้ถูกต้อง",
-    "date_type"                        => "กรุณากรอกข้อมูลในช่องวันที่",
-    "debit"                            => "บัตรประชารัฐ/เดบิตการ์ด",
-    "debit_filter"                     => "",
-    "delete"                           => "อนุญาตให้ลบ",
-    "delete_confirmation"              => "แน่ใจหรือไม่ที่จะลบรายการขายนี้, ลบแล้วไม่สามารถเรียกกลับคืนใด้",
-    "delete_entire_sale"               => "ลบการขายทั้งหมด",
-    "delete_successful"                => "คุณลบการขายสำเร็จ",
-    "delete_unsuccessful"              => "คุณลบการขายไม่สำเร็จ",
-    "description_abbrv"                => "รายละเอียด",
-    "discard"                          => "ยกเลิก",
-    "discard_quote"                    => "",
-    "discount"                         => "ส่วนลด %",
-    "discount_included"                => "% ส่วนลด",
-    "discount_short"                   => "%",
-    "due"                              => "วันครบกำหนด",
-    "due_filter"                       => "วันที่ครบกำหนด",
-    "edit"                             => "แก้ไข",
-    "edit_item"                        => "แก้ไขสินค้า",
-    "edit_sale"                        => "แก้ไขการขาย",
-    "email_receipt"                    => "อีเมลบิล",
-    "employee"                         => "พนักงาน",
-    "entry"                            => "การนำเข้า",
-    "error_editing_item"               => "แก้ไขสินค้าล้มเหลว",
-    "find_or_scan_item"                => "ค้นหาสินค้า",
-    "find_or_scan_item_or_receipt"     => "ค้นหา หรือ แสกนรายการ หรือ ใบเสร็จ",
-    "giftcard"                         => "บัตรของขวัญ",
-    "giftcard_balance"                 => "ยอดคงเหลือบัตรของขวัญ",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "เลขที่บัตรของขวัญ",
-    "group_by_category"                => "กลุ่มตามหมวดหมู่",
-    "group_by_type"                    => "กลุ่มตามประเภท",
-    "hsn"                              => "HSN",
-    "id"                               => "เลขที่ขาย",
-    "include_prices"                   => "รวมในราคา?",
-    "invoice"                          => "ใบแจ้งหนี้",
-    "invoice_confirm"                  => "ใบแจ้งหนี้นี้จะถูกส่งไปที่",
-    "invoice_enable"                   => "เลขที่ใบแจ้งหนี้",
-    "invoice_filter"                   => "ใบแจ้งหนี้",
-    "invoice_no_email"                 => "ลูกค้ารายนี้ไม่มีที่อยู่อีเมล",
-    "invoice_number"                   => "เลขใบแจ้งหนี้ #",
-    "invoice_number_duplicate"         => "ใบแจ้งหนี้หมายเลข {0} จะต้องไม่ซ้ำกัน",
-    "invoice_sent"                     => "ส่งใบแจ้งหนี้ไปที่",
-    "invoice_total"                    => "ยอดรวมในใบแจ้งหนี้",
-    "invoice_type_custom_invoice"      => "ใบแจ้งหนี้ที่กำหนดเอง (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "ใบกำกับภาษีที่กำหนดเอง (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "ใบแจ้งหนี้ (invoice.php)",
-    "invoice_type_tax_invoice"         => "ใบกำกับภาษี (tax_invoice.php)",
-    "invoice_unsent"                   => "ไม่สามารถส่งใบแจ้งหนี้ถึง",
-    "invoice_update"                   => "คำนวณใหม่",
-    "item_insufficient_of_stock"       => "จำนวนสินค้าไม่เพียงพอ",
-    "item_name"                        => "ชื่อสินค้า",
-    "item_number"                      => "สินค้า #",
-    "item_out_of_stock"                => "สินค้าจำหน่ายหมด",
-    "key_browser"                      => "ความช่วยเหลือ",
-    "key_cancel"                       => "ยกเลิกใบเสนอราคา/ใบแจ้งหนี้ /ใบการขาย นี้",
-    "key_customer_search"              => "ค้นหาลูกค้า",
-    "key_finish_quote"                 => "จบใบเสนอราคา/ใบแจ้งหนี้โดยไม่ต้องชำระเงิน",
-    "key_finish_sale"                  => "เพิ่มการชำระเงินและใบแจ้งหนี้ /ใบรายการขาย",
-    "key_full"                         => "เปิดแบบเต็มหน้าจอ",
-    "key_function"                     => "ฟังก์ชั่น",
-    "key_help"                         => "คำสั่งลัดงานขาย",
-    "key_help_modal"                   => "เปิดหน้าต่างคำสั่งลัดงานขาย",
-    "key_in"                           => "ขยายเข้า",
-    "key_item_search"                  => "ค้นหารายการขาย",
-    "key_out"                          => "ขยายออก",
-    "key_payment"                      => "เพิ่มการชำระเงิน",
-    "key_print"                        => "พิมพ์หน้านี้",
-    "key_restore"                      => "คืนการแสดงผลแบบดั้งเดิม/ขยาย",
-    "key_search"                       => "ค้นหาตารางรายงาน",
-    "key_suspend"                      => "พักรายการขายปัจจุบัน",
-    "key_suspended"                    => "แสดงรายการขายที่พักไว้",
-    "key_system"                       => "ทางลัดระบบ",
-    "key_tendered"                     => "แก้ไขจำนวนเงินรับมา",
-    "key_title"                        => "ทางลัดคียบอร์ดงานขาย",
-    "mc"                               => "",
-    "mode"                             => "รูปแบบการลงทะเบียน",
-    "must_enter_numeric"               => "จำนวนที่ถุกประมูลต้องใส่ข้อมุลที่เปนตัวเลข",
-    "must_enter_numeric_giftcard"      => "เลขที่บัตรของขวัญ ต้องใส่ตัวเลขเท่านั้น",
-    "new_customer"                     => "ลูกค้าใหม่",
-    "new_item"                         => "สินค้าใหม่",
-    "no_description"                   => "ไม่ระบุรายละเอียด",
-    "no_filter"                        => "ทั้งหมด",
-    "no_items_in_cart"                 => "ไม่พบสินค้าในตระกร้า",
-    "no_sales_to_display"              => "ไม่มีการขายที่จะแสดง",
-    "none_selected"                    => "คุณยังไม่ได้เลือกการขายที่จะลบ",
-    "nontaxed_ind"                     => " . ",
-    "not_authorized"                   => "การกระทำนี้ไม่ได้รับอนุญาต",
-    "one_or_multiple"                  => "การขาย",
-    "payment"                          => "รูปแบบชำระเงิน",
-    "payment_amount"                   => "จำนวน",
-    "payment_not_cover_total"          => "จำนวนเงินที่ชำระต้องมากกว่าหรือเท่ากับยอดรวม",
-    "payment_type"                     => "ชำระโดย",
-    "payments"                         => "",
-    "payments_total"                   => "ยอดชำระแล้ว",
-    "price"                            => "ราคา",
-    "print_after_sale"                 => "พิมพ์บิลหลังการขาย",
-    "quantity"                         => "จำนวน",
-    "quantity_less_than_reorder_level" => "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง",
-    "quantity_less_than_zero"          => "คำเตือน: ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบัญชี ก็สามารถทำการขายได้ แต่ต้องตรวจสอบปริมาญสินค้าคงคลังก่อน",
-    "quantity_of_items"                => "ปริมาณของ {0} รายการ",
-    "quote"                            => "ใบเสนอราคา",
-    "quote_number"                     => "หมายเลขอ้างอิง",
-    "quote_number_duplicate"           => "หมายเลขอ้างอิงต้องไม่ซ้ำกัน",
-    "quote_sent"                       => "ส่งการอ้างอิงถึง",
-    "quote_unsent"                     => "ส่งการอ้างอิงถึงผิดพลาด",
-    "receipt"                          => "บิลขาย",
-    "receipt_no_email"                 => "ลูกค้านี้ไม่มีที่อยู่อีเมล์",
-    "receipt_number"                   => "จุดขาย#",
-    "receipt_sent"                     => "ส่งใบเสร็จไปที่",
-    "receipt_unsent"                   => "ไม่สามารถส่งใบเสร็จไปที่",
-    "refund"                           => "ประเภทการยกเลิกการขาย",
-    "register"                         => "ลงทะเบียนขาย",
-    "remove_customer"                  => "ลบลูกค้า",
-    "remove_discount"                  => "",
-    "return"                           => "คืน",
-    "rewards"                          => "คะแนนสะสม",
-    "rewards_balance"                  => "คะแนนสะสมคงเหลือ",
-    "sale"                             => "ขาย",
-    "sale_by_invoice"                  => "การขายโดยใบแจ้งหนี้",
-    "sale_for_customer"                => "ลูกค้า:",
-    "sale_time"                        => "เวลา",
-    "sales_tax"                        => "ภาษีการขาย",
-    "sales_total"                      => "",
-    "select_customer"                  => "เลือกลูกค้า (Optional)",
-    "send_invoice"                     => "ส่งใบแจ้งหนี้",
-    "send_quote"                       => "ส่งใบเสนอราคา",
-    "send_receipt"                     => "ส่งใบเสร็จ",
-    "send_work_order"                  => "ส่งคำสั่งงาน",
-    "serial"                           => "หมายเลขซีเรียล",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "ใบแจ้งหนี้",
-    "show_receipt"                     => "ใบเสร็จ",
-    "start_typing_customer_name"       => "เริ่มต้นพิมพ์ชื่อลูกค้า...",
-    "start_typing_item_name"           => "เริ่มต้นพิมพ์ชื่อสินค้า หรือ สแกนบาร์โค๊ด...",
-    "stock"                            => "คลังสินค้า",
-    "stock_location"                   => "ที่เก็บ",
-    "sub_total"                        => "ยอดรวมย่อย",
-    "successfully_deleted"             => "ลบการขายสมยูรณ์",
-    "successfully_restored"            => "คุณกู้คืนสำเร็จแล้ว",
-    "successfully_suspended_sale"      => "การขายของคุณถูกระงับเรียบร้อย",
-    "successfully_updated"             => "อัพเดทการขายสมบูรณ์",
-    "suspend_sale"                     => "พักรายการ",
-    "suspended_doc_id"                 => "รหัสเอกสาร",
-    "suspended_sale_id"                => "รหัสการขายที่ถูกพัก",
-    "suspended_sales"                  => "การขายที่พักไว้",
-    "table"                            => "โต๊ะ",
-    "takings"                          => "การขายประจำวัน",
-    "tax"                              => "ภาษี",
-    "tax_id"                           => "รหัสภาษี",
-    "tax_invoice"                      => "ใบกำกับภาษี",
-    "tax_percent"                      => "ภาษี %",
-    "taxed_ind"                        => "ภ",
-    "total"                            => "ยอดรวม",
-    "total_tax_exclusive"              => "ยอดไม่รวมภาษี",
-    "transaction_failed"               => "การดำเนินการขายล้มเหลว",
-    "unable_to_add_item"               => "เพิ่มรายการไปยังการขายล้มเหลว",
-    "unsuccessfully_deleted"           => "ลบการขายไม่สำเร็จ",
-    "unsuccessfully_restored"          => "การคืนค่ารายการขายล้มเหลว",
-    "unsuccessfully_suspended_sale"    => "การขายของคุณถูกระงับเรียบร้อย",
-    "unsuccessfully_updated"           => "อัพเดทการขายไม่สมบูรณ์",
-    "unsuspend"                        => "ยกเลิกการระงับ",
-    "unsuspend_and_delete"             => "ยกเลิกการระงับ และ ลบ",
-    "update"                           => "แก้ไข",
-    "upi"                              => "ยูพีไอ",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "คำสั่งงาน",
-    "work_order_number"                => "หมายเลขคำสั่งงาน",
-    "work_order_number_duplicate"      => "หมายเลขคำสั่งงานต้องไม่ซ้ำกัน",
-    "work_order_sent"                  => "คำสั่งงานส่งถึง",
-    "work_order_unsent"                => "ส่งคำสั่งงานล้มเหลว",
-    "selected_customer"                => "ลูกค้าที่เลือก",
+    'account_number'                    => 'บัญชี #',
+    'add_payment'                       => 'เพิ่มบิล',
+    'amount_due'                        => 'ยอดค้างชำระ',
+    'amount_due_not_covered'            => 'การชำระเงินไม่ครอบคลุมจำนวนที่ต้องชำระ',
+    'amount_tendered'                   => 'ชำระเข้ามา',
+    'authorized_signature'              => 'ลายเซ็นผู้มีอำนาจ',
+    'cancel_sale'                       => 'ยกเลิกการขาย',
+    'cash'                              => 'เงินสด',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'การปรับเงินสดขาย',
+    'cash_deposit'                      => 'ฝากเงินสด',
+    'cash_filter'                       => 'เงินสด',
+    'change_due'                        => 'เงินทอน',
+    'change_price'                      => 'เปลี่ยนราคาขาย',
+    'check'                             => 'โอนเงิน/พร้อมเพย์/เช็ค',
+    'check_balance'                     => 'เช็คยอดคงเหลือ',
+    'check_filter'                      => 'ตรวจสอบ',
+    'close'                             => '',
+    'comment'                           => 'หมายเหตุ',
+    'comments'                          => 'หมายเหตุ',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'จบการขาย',
+    'confirm_cancel_sale'               => 'แน่ใจหรือไม่ที่จะล้างการขายนี้? ทุกรายการจะถูกลบทั้งหมด',
+    'confirm_delete'                    => 'โปรดยืนยันการลบรายการขายที่เลือกไว้ ?',
+    'confirm_restore'                   => 'คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการขายที่เลือกไว้?',
+    'credit'                            => 'เครดิตการ์ด',
+    'credit_deposit'                    => 'เงินฝากเครดิต',
+    'credit_filter'                     => 'บัตรเครติด',
+    'current_table'                     => '',
+    'customer'                          => 'ลูกค้า',
+    'customer_address'                  => 'Customer Address',
+    'customer_discount'                 => 'ส่วนลด',
+    'customer_email'                    => 'Customer Email',
+    'customer_location'                 => 'Customer Location',
+    'customer_mailchimp_status'         => 'สถานะของระบบส่งเมล์เมล์ชิม',
+    'customer_optional'                 => '(ต้องระบุวันที่ชำระเงิน)',
+    'customer_required'                 => '(ต้องระบุ)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'คะแนนที่มี',
+    'daily_sales'                       => '',
+    'date'                              => 'วันที่ขาย',
+    'date_range'                        => 'ระหว่างวันที่',
+    'date_required'                     => 'กรุณากรอกวันที่ให้ถูกต้อง',
+    'date_type'                         => 'กรุณากรอกข้อมูลในช่องวันที่',
+    'debit'                             => 'บัตรประชารัฐ/เดบิตการ์ด',
+    'debit_filter'                      => '',
+    'delete'                            => 'อนุญาตให้ลบ',
+    'delete_confirmation'               => 'แน่ใจหรือไม่ที่จะลบรายการขายนี้, ลบแล้วไม่สามารถเรียกกลับคืนใด้',
+    'delete_entire_sale'                => 'ลบการขายทั้งหมด',
+    'delete_successful'                 => 'คุณลบการขายสำเร็จ',
+    'delete_unsuccessful'               => 'คุณลบการขายไม่สำเร็จ',
+    'description_abbrv'                 => 'รายละเอียด',
+    'discard'                           => 'ยกเลิก',
+    'discard_quote'                     => '',
+    'discount'                          => 'ส่วนลด %',
+    'discount_exceeds_item_total'       => 'ส่วนลดต้องไม่เกินจำนวนรายการขายทั้งหมด',
+    'discount_included'                 => '% ส่วนลด',
+    'discount_percent_exceeds_100'      => 'ส่วนลดเปอร์เซ็นต์มีค่าได้ไม่เกิน 100%',
+    'discount_short'                    => '%',
+    'due'                               => 'วันครบกำหนด',
+    'due_filter'                        => 'วันที่ครบกำหนด',
+    'edit'                              => 'แก้ไข',
+    'edit_item'                         => 'แก้ไขสินค้า',
+    'edit_sale'                         => 'แก้ไขการขาย',
+    'email_receipt'                     => 'อีเมลบิล',
+    'employee'                          => 'พนักงาน',
+    'entry'                             => 'การนำเข้า',
+    'error_editing_item'                => 'แก้ไขสินค้าล้มเหลว',
+    'find_or_scan_item'                 => 'ค้นหาสินค้า',
+    'find_or_scan_item_or_receipt'      => 'ค้นหา หรือ แสกนรายการ หรือ ใบเสร็จ',
+    'giftcard'                          => 'บัตรของขวัญ',
+    'giftcard_balance'                  => 'ยอดคงเหลือบัตรของขวัญ',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'เลขที่บัตรของขวัญ',
+    'group_by_category'                 => 'กลุ่มตามหมวดหมู่',
+    'group_by_type'                     => 'กลุ่มตามประเภท',
+    'hsn'                               => 'HSN',
+    'id'                                => 'เลขที่ขาย',
+    'include_prices'                    => 'รวมในราคา?',
+    'insufficient_giftcard_balance'     => 'ยอดเงินบัตรของขวัญไม่พอสำหรับการชำระเงินนี้.',
+    'insufficient_reward_points'        => 'คะแนนรางวัลไม่พอสำหรับการชำระเงินนี้.',
+    'invoice'                           => 'ใบแจ้งหนี้',
+    'invoice_confirm'                   => 'ใบแจ้งหนี้นี้จะถูกส่งไปที่',
+    'invoice_enable'                    => 'เลขที่ใบแจ้งหนี้',
+    'invoice_filter'                    => 'ใบแจ้งหนี้',
+    'invoice_no_email'                  => 'ลูกค้ารายนี้ไม่มีที่อยู่อีเมล',
+    'invoice_number'                    => 'เลขใบแจ้งหนี้ #',
+    'invoice_number_duplicate'          => 'ใบแจ้งหนี้หมายเลข {0} จะต้องไม่ซ้ำกัน',
+    'invoice_sent'                      => 'ส่งใบแจ้งหนี้ไปที่',
+    'invoice_total'                     => 'ยอดรวมในใบแจ้งหนี้',
+    'invoice_type_custom_invoice'       => 'ใบแจ้งหนี้ที่กำหนดเอง (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'ใบกำกับภาษีที่กำหนดเอง (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'ใบแจ้งหนี้ (invoice.php)',
+    'invoice_type_tax_invoice'          => 'ใบกำกับภาษี (tax_invoice.php)',
+    'invoice_unsent'                    => 'ไม่สามารถส่งใบแจ้งหนี้ถึง',
+    'invoice_update'                    => 'คำนวณใหม่',
+    'item_insufficient_of_stock'        => 'จำนวนสินค้าไม่เพียงพอ',
+    'item_name'                         => 'ชื่อสินค้า',
+    'item_number'                       => 'สินค้า #',
+    'item_out_of_stock'                 => 'สินค้าจำหน่ายหมด',
+    'key_browser'                       => 'ความช่วยเหลือ',
+    'key_cancel'                        => 'ยกเลิกใบเสนอราคา/ใบแจ้งหนี้ /ใบการขาย นี้',
+    'key_customer_search'               => 'ค้นหาลูกค้า',
+    'key_finish_quote'                  => 'จบใบเสนอราคา/ใบแจ้งหนี้โดยไม่ต้องชำระเงิน',
+    'key_finish_sale'                   => 'เพิ่มการชำระเงินและใบแจ้งหนี้ /ใบรายการขาย',
+    'key_full'                          => 'เปิดแบบเต็มหน้าจอ',
+    'key_function'                      => 'ฟังก์ชั่น',
+    'key_help'                          => 'คำสั่งลัดงานขาย',
+    'key_help_modal'                    => 'เปิดหน้าต่างคำสั่งลัดงานขาย',
+    'key_in'                            => 'ขยายเข้า',
+    'key_item_search'                   => 'ค้นหารายการขาย',
+    'key_out'                           => 'ขยายออก',
+    'key_payment'                       => 'เพิ่มการชำระเงิน',
+    'key_print'                         => 'พิมพ์หน้านี้',
+    'key_restore'                       => 'คืนการแสดงผลแบบดั้งเดิม/ขยาย',
+    'key_search'                        => 'ค้นหาตารางรายงาน',
+    'key_suspend'                       => 'พักรายการขายปัจจุบัน',
+    'key_suspended'                     => 'แสดงรายการขายที่พักไว้',
+    'key_system'                        => 'ทางลัดระบบ',
+    'key_tendered'                      => 'แก้ไขจำนวนเงินรับมา',
+    'key_title'                         => 'ทางลัดคียบอร์ดงานขาย',
+    'mc'                                => '',
+    'mode'                              => 'รูปแบบการลงทะเบียน',
+    'must_enter_numeric'                => 'จำนวนที่ถุกประมูลต้องใส่ข้อมุลที่เปนตัวเลข',
+    'must_enter_numeric_giftcard'       => 'เลขที่บัตรของขวัญ ต้องใส่ตัวเลขเท่านั้น',
+    'must_enter_reference_code'         => 'ต้องระบุหมายเลขอ้างอิง/การดึงข้อมูล',
+    'negative_amount_tendered'          => 'ชำระเข้ามาไม่สามารถเป็นค่าติดลบได้',
+    'negative_discount_invalid'         => 'ส่วนลดไม่สามารถเป็นค่าติดลบได้',
+    'negative_price_invalid'            => 'ราคาไม่สามารถเป็นค่าติดลบได้',
+    'negative_quantity_invalid'         => 'จำนวนไม่สามารถเป็นค่าติดลบได้',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'ลูกค้าใหม่',
+    'new_item'                          => 'สินค้าใหม่',
+    'no_description'                    => 'ไม่ระบุรายละเอียด',
+    'no_filter'                         => 'ทั้งหมด',
+    'no_items_in_cart'                  => 'ไม่พบสินค้าในตระกร้า',
+    'no_sales_to_display'               => 'ไม่มีการขายที่จะแสดง',
+    'none_selected'                     => 'คุณยังไม่ได้เลือกการขายที่จะลบ',
+    'nontaxed_ind'                      => ' . ',
+    'not_authorized'                    => 'การกระทำนี้ไม่ได้รับอนุญาต',
+    'one_or_multiple'                   => 'การขาย',
+    'payment'                           => 'รูปแบบชำระเงิน',
+    'payment_amount'                    => 'จำนวน',
+    'payment_not_cover_total'           => 'จำนวนเงินที่ชำระต้องมากกว่าหรือเท่ากับยอดรวม',
+    'payment_type'                      => 'ชำระโดย',
+    'payments'                          => '',
+    'payments_total'                    => 'ยอดชำระแล้ว',
+    'price'                             => 'ราคา',
+    'print_after_sale'                  => 'พิมพ์บิลหลังการขาย',
+    'quantity'                          => 'จำนวน',
+    'quantity_less_than_reorder_level'  => 'คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง',
+    'quantity_less_than_zero'           => 'คำเตือน: ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบัญชี ก็สามารถทำการขายได้ แต่ต้องตรวจสอบปริมาญสินค้าคงคลังก่อน',
+    'quantity_of_items'                 => 'ปริมาณของ {0} รายการ',
+    'quote'                             => 'ใบเสนอราคา',
+    'quote_number'                      => 'หมายเลขอ้างอิง',
+    'quote_number_duplicate'            => 'หมายเลขอ้างอิงต้องไม่ซ้ำกัน',
+    'quote_sent'                        => 'ส่งการอ้างอิงถึง',
+    'quote_unsent'                      => 'ส่งการอ้างอิงถึงผิดพลาด',
+    'receipt'                           => 'บิลขาย',
+    'receipt_no_email'                  => 'ลูกค้านี้ไม่มีที่อยู่อีเมล์',
+    'receipt_number'                    => 'จุดขาย#',
+    'receipt_sent'                      => 'ส่งใบเสร็จไปที่',
+    'receipt_unsent'                    => 'ไม่สามารถส่งใบเสร็จไปที่',
+    'reference_code'                    => 'รหัสอ้างอิงการชำระเงิน',
+    'reference_code_invalid_characters' => 'รหัสอ้างอิงต้องประกอบด้วยตัวอักษรและตัวเลขเท่านั้น',
+    'reference_code_length_error'       => 'ความยาวของรหัสอ้างอิงไม่ถูกต้อง',
+    'refund'                            => 'ประเภทการยกเลิกการขาย',
+    'register'                          => 'ลงทะเบียนขาย',
+    'remove_customer'                   => 'ลบลูกค้า',
+    'remove_discount'                   => '',
+    'return'                            => 'คืน',
+    'rewards'                           => 'คะแนนสะสม',
+    'rewards_balance'                   => 'คะแนนสะสมคงเหลือ',
+    'rewards_package'                   => 'คะแนนสะสม',
+    'rewards_remaining_balance'         => 'คะแนนสะสมคงเหลือ ',
+    'sale'                              => 'ขาย',
+    'sale_by_invoice'                   => 'การขายโดยใบแจ้งหนี้',
+    'sale_for_customer'                 => 'ลูกค้า:',
+    'sale_time'                         => 'เวลา',
+    'sales_tax'                         => 'ภาษีการขาย',
+    'sales_total'                       => '',
+    'select_customer'                   => 'เลือกลูกค้า (Optional)',
+    'selected_customer'                 => 'ลูกค้าที่เลือก',
+    'send_invoice'                      => 'ส่งใบแจ้งหนี้',
+    'send_quote'                        => 'ส่งใบเสนอราคา',
+    'send_receipt'                      => 'ส่งใบเสร็จ',
+    'send_work_order'                   => 'ส่งคำสั่งงาน',
+    'serial'                            => 'หมายเลขซีเรียล',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'ใบแจ้งหนี้',
+    'show_receipt'                      => 'ใบเสร็จ',
+    'start_typing_customer_name'        => 'เริ่มต้นพิมพ์ชื่อลูกค้า...',
+    'start_typing_item_name'            => 'เริ่มต้นพิมพ์ชื่อสินค้า หรือ สแกนบาร์โค๊ด...',
+    'stock'                             => 'คลังสินค้า',
+    'stock_location'                    => 'ที่เก็บ',
+    'sub_total'                         => 'ยอดรวมย่อย',
+    'successfully_deleted'              => 'ลบการขายสมยูรณ์',
+    'successfully_restored'             => 'คุณกู้คืนสำเร็จแล้ว',
+    'successfully_suspended_sale'       => 'การขายของคุณถูกระงับเรียบร้อย',
+    'successfully_updated'              => 'อัพเดทการขายสมบูรณ์',
+    'suspend_sale'                      => 'พักรายการ',
+    'suspended_doc_id'                  => 'รหัสเอกสาร',
+    'suspended_sale_id'                 => 'รหัสการขายที่ถูกพัก',
+    'suspended_sales'                   => 'การขายที่พักไว้',
+    'table'                             => 'โต๊ะ',
+    'takings'                           => 'การขายประจำวัน',
+    'tax'                               => 'ภาษี',
+    'tax_id'                            => 'รหัสภาษี',
+    'tax_invoice'                       => 'ใบกำกับภาษี',
+    'tax_percent'                       => 'ภาษี %',
+    'taxed_ind'                         => 'ภ',
+    'total'                             => 'ยอดรวม',
+    'total_tax_exclusive'               => 'ยอดไม่รวมภาษี',
+    'transaction_failed'                => 'การดำเนินการขายล้มเหลว',
+    'unable_to_add_item'                => 'เพิ่มรายการไปยังการขายล้มเหลว',
+    'unsuccessfully_deleted'            => 'ลบการขายไม่สำเร็จ',
+    'unsuccessfully_restored'           => 'การคืนค่ารายการขายล้มเหลว',
+    'unsuccessfully_suspended_sale'     => 'การขายของคุณถูกระงับเรียบร้อย',
+    'unsuccessfully_updated'            => 'อัพเดทการขายไม่สมบูรณ์',
+    'unsuspend'                         => 'ยกเลิกการระงับ',
+    'unsuspend_and_delete'              => 'ยกเลิกการระงับ และ ลบ',
+    'update'                            => 'แก้ไข',
+    'upi'                               => 'ยูพีไอ',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'คำสั่งงาน',
+    'work_order_number'                 => 'หมายเลขคำสั่งงาน',
+    'work_order_number_duplicate'       => 'หมายเลขคำสั่งงานต้องไม่ซ้ำกัน',
+    'work_order_sent'                   => 'คำสั่งงานส่งถึง',
+    'work_order_unsent'                 => 'ส่งคำสั่งงานล้มเหลว',
 ];
diff --git a/app/Language/tl/Attributes.php b/app/Language/tl/Attributes.php
index 809a1978b..cfa63c1d0 100644
--- a/app/Language/tl/Attributes.php
+++ b/app/Language/tl/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Attribute value cannot contain ':' or '|'",
-    "confirm_delete"                   => "Are you sure you want to restore the selected attribute(s)?",
-    "confirm_restore"                  => "Are you sure you want to delete the selected attribute(s)?",
-    "definition_cannot_be_deleted"     => "Could not delete selected attribute(s)",
-    "definition_error_adding_updating" => "Attribute {0} could not be added or updated. Please check the error log.",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Add Attribute",
-    "definition_name_required"         => "Attribute type is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated Item Kit",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute name is a required field",
-    "definition_unit"                  => "Measurement Unit",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Items to display.",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'Attribute value cannot contain \':\' or \'|\'',
+    'confirm_delete'                   => 'Are you sure you want to restore the selected attribute(s)?',
+    'confirm_restore'                  => 'Are you sure you want to delete the selected attribute(s)?',
+    'definition_cannot_be_deleted'     => 'Could not delete selected attribute(s)',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute type is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated Item Kit',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute name is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Items to display.',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'Ipakita sa paghahanap',
+    'show_in_search_visibility'        => 'Paghahanap',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/tl/Bootstrap_tables.php b/app/Language/tl/Bootstrap_tables.php
index 305a80a5e..8c1f957cb 100644
--- a/app/Language/tl/Bootstrap_tables.php
+++ b/app/Language/tl/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "All",
-    "columns"              => "Columns",
-    "hide_show_pagination" => "Hide/Show pagination",
-    "loading"              => "Loading, please wait...",
-    "page_from_to"         => "Showing {0} to {1} of {2} rows",
-    "refresh"              => "Refresh",
-    "rows_per_page"        => "{0} rows per page",
-    "toggle"               => "Toggle",
+    'all' => "All",
+    'columns' => "Columns",
+    'hide_show_pagination' => "Hide/Show pagination",
+    'loading' => "Loading, please wait",
+    'page_from_to' => "Showing {0} to {1} of {2} rows",
+    'refresh' => "Refresh",
+    'rows_per_page' => "{0} rows per page",
+    'toggle' => "Toggle",
 ];
diff --git a/app/Language/tl/Calendar.php b/app/Language/tl/Calendar.php
new file mode 100644
index 000000000..c73063d2d
--- /dev/null
+++ b/app/Language/tl/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "ఆ",
+    "mo"        => "సో",
+    "tu"        => "మం",
+    "we"        => "బు",
+    "th"        => "గు",
+    "fr"        => "శు",
+    "sa"        => "శ",
+    "sun"       => "ఆది",
+    "mon"       => "సోమ",
+    "tue"       => "మంగళ",
+    "wed"       => "బుధ",
+    "thu"       => "గురు",
+    "fri"       => "శుక్ర",
+    "sat"       => "శని",
+    "sunday"    => "ఆదివారం",
+    "monday"    => "సోమవారం",
+    "tuesday"   => "మంగళవారం",
+    "wednesday" => "బుధవారం",
+    "thursday"  => "గురువారం",
+    "friday"    => "శుక్రవారం",
+    "saturday"  => "శనివారం",
+    "jan"       => "జన",
+    "feb"       => "ఫిబ్ర",
+    "mar"       => "మార్",
+    "apr"       => "ఏప్రి",
+    "may"       => "మే",
+    "jun"       => "జూన్",
+    "jul"       => "జూలై",
+    "aug"       => "ఆగ",
+    "sep"       => "సెప్టెం",
+    "oct"       => "అక్టో",
+    "nov"       => "నవం",
+    "dec"       => "డిసెం",
+    "january"   => "జనవరి",
+    "february"  => "ఫిబ్రవరి",
+    "march"     => "మార్చి",
+    "april"     => "ఏప్రిల్",
+    "mayl"      => "మే",
+    "june"      => "జూన్",
+    "july"      => "జూలై",
+    "august"    => "ఆగస్టు",
+    "september" => "సెప్టెంబర్",
+    "october"   => "అక్టోబర్",
+    "november"  => "నవంబర్",
+    "december"  => "డిసెంబర్",
+];
\ No newline at end of file
diff --git a/app/Language/tl/Config.php b/app/Language/tl/Config.php
index b6e929be9..fd5d75f7f 100644
--- a/app/Language/tl/Config.php
+++ b/app/Language/tl/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Company Address",
-    "address_required"                          => "Company Phone is a required field.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Allow Duplicate Barcodes",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "Barcode",
-    "barcode_company"                           => "Company Name",
-    "barcode_configuration"                     => "Barcode Configuration",
-    "barcode_content"                           => "Barcode Content",
-    "barcode_first_row"                         => "Row 3",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Input Formats",
-    "barcode_generate_if_empty"                 => "Generate if empty.",
-    "barcode_height"                            => "Height (px)",
-    "barcode_id"                                => "Item Id/Name",
-    "barcode_info"                              => "Barcode Configuration Information",
-    "barcode_layout"                            => "Barcode Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "Barcode",
-    "barcode_number_in_row"                     => "Number in row",
-    "barcode_page_cellspacing"                  => "Display page cellspacing.",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "Price",
-    "barcode_second_row"                        => "Row 3",
-    "barcode_third_row"                         => "Row 2",
-    "barcode_tooltip"                           => "Warning: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.",
-    "barcode_type"                              => "Barcode Type",
-    "barcode_width"                             => "Width (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Cash Decimals",
-    "cash_decimals_tooltip"                     => "If Cash Decimals and Currency Decimals are the same then no cash rounding will take place.",
-    "cash_rounding"                             => "Cash Rounding",
-    "category_dropdown"                         => "",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Company Name",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Company Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "Company Name is a required field.",
-    "company_select_image"                      => "Select Image",
-    "company_website_url"                       => "Company website is not a valid URL (http://...).",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "Currency Code",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Currency Symbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Reward",
-    "customer_reward_duplicate"                 => "Reward must be unique.",
-    "customer_reward_enable"                    => "Enable Customer Rewards",
-    "customer_reward_invalid_chars"             => "Reward can not contain '_'",
-    "customer_reward_required"                  => "Reward is a required field",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Date and Time Filter",
-    "datetimeformat"                            => "Date and Time Format",
-    "decimal_point"                             => "Decimal Point",
-    "default_barcode_font_size_number"          => "Default Barcode Width must be a number.",
-    "default_barcode_font_size_required"        => "Default Barcode Width is a required field.",
-    "default_barcode_height_number"             => "Default Barcode Width must be a number.",
-    "default_barcode_height_required"           => "Default Barcode Width is a required field.",
-    "default_barcode_num_in_row_number"         => "Default Barcode Number in Row must be a number.",
-    "default_barcode_num_in_row_required"       => "Default Barcode Number in Row is a required field.",
-    "default_barcode_page_cellspacing_number"   => "Default Barcode Page Cellspacing must be a number.",
-    "default_barcode_page_cellspacing_required" => "Default Barcode Page Cellspacing is a required field.",
-    "default_barcode_page_width_number"         => "Default Barcode Width must be a number.",
-    "default_barcode_page_width_required"       => "Default Barcode Width is a required field.",
-    "default_barcode_width_number"              => "Default Barcode Height must be a number.",
-    "default_barcode_width_required"            => "Default Barcode Height is a required field.",
-    "default_item_columns"                      => "Default Visible Item Columns",
-    "default_origin_tax_code"                   => "Default Origin Tax Code",
-    "default_receivings_discount"               => "Default Receivings Discount",
-    "default_receivings_discount_number"        => "Default Sales Discount must be a number.",
-    "default_receivings_discount_required"      => "Default Sales Discount is a required field.",
-    "default_sales_discount"                    => "Default Sales Discount",
-    "default_sales_discount_number"             => "Default Receivings Discount must be a number.",
-    "default_sales_discount_required"           => "Default Receivings Discount is a required field.",
-    "default_tax_category"                      => "Default Tax Category",
-    "default_tax_code"                          => "Default Tax Rate",
-    "default_tax_jurisdiction"                  => "Default Tax Jurisdiction",
-    "default_tax_name_number"                   => "Default Tax Name must be a string.",
-    "default_tax_name_required"                 => "Default Tax Rate is a required field.",
-    "default_tax_rate"                          => "Default Tax Rate",
-    "default_tax_rate_1"                        => "Tax 2 Rate",
-    "default_tax_rate_2"                        => "Tax 1 Rate",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Default Tax Rate must be a number.",
-    "default_tax_rate_required"                 => "Default Tax Name is a required field.",
-    "derive_sale_quantity"                      => "Allow Derived Sale Quantity",
-    "derive_sale_quantity_tooltip"              => "If checked then a new item type will provided for items ordered by extended amount",
-    "dinner_table"                              => "Table",
-    "dinner_table_duplicate"                    => "Table must be unique.",
-    "dinner_table_enable"                       => "Enable Dinner Tables",
-    "dinner_table_invalid_chars"                => "Table Name can not contain '_'.",
-    "dinner_table_required"                     => "Table is a required field.",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Email Receipt checkbox",
-    "email_receipt_check_behaviour_always"      => "Always checked",
-    "email_receipt_check_behaviour_last"        => "Remember last selection",
-    "email_receipt_check_behaviour_never"       => "Always unchecked",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Enforce privacy",
-    "enforce_privacy_tooltip"                   => "Protect Customers privacy enforcing data scrambling in case of their data being deleted",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "Fiscal Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Site Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Secret Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "Include Support for HSN Codes",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "",
-    "integrations"                              => "Integrations",
-    "integrations_configuration"                => "Third Party Integrations",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "Invoice Type",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "Lines per Page must be a number.",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Location Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Localization Configuration Information",
-    "login_form"                                => "",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Mailchimp API Key",
-    "mailchimp_configuration"                   => "Mailchimp Configuration",
-    "mailchimp_key_successfully"                => "API Key is invalid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is valid.",
-    "mailchimp_lists"                           => "Mailchimp List(s)",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "Multiple Packages per Item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "OSPOS Installation Info",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Name is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Left must be a number.",
-    "print_bottom_margin_required"              => "Margin Left is a required field.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
-    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
-    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
-    "print_footer"                              => "Print Browser Header",
-    "print_header"                              => "Print Browser Footer",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Top must be a number.",
-    "print_left_margin_required"                => "Margin Right is a required field.",
-    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
-    "print_receipt_check_behaviour_always"      => "Always checked",
-    "print_receipt_check_behaviour_last"        => "Remember last selection",
-    "print_receipt_check_behaviour_never"       => "Always unchecked",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Left must be a number.",
-    "print_right_margin_required"               => "Margin Left is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Left must be a number.",
-    "print_top_margin_required"                 => "Margin Left is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Default Quote Comments",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Location Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "Show Company Name",
-    "receipt_show_description"                  => "Show Description",
-    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "Show Taxes",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "Receipt Template",
-    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 3",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 1",
-    "suggestions_third_column"                  => "Column 1",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "The entered tax category already exists.",
-    "tax_category_invalid_chars"                => "The entered tax category is invalid.",
-    "tax_category_required"                     => "Tax category is required",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Table Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "Tax Id",
-    "tax_included"                              => "Tax included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Use Destination Based Tax",
-    "user_timezone"                             => "",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
+    'address'                                   => 'Company Address',
+    'address_required'                          => 'Company Phone is a required field.',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => 'Allow Duplicate Barcodes',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => 'Barcode',
+    'barcode_company'                           => 'Company Name',
+    'barcode_configuration'                     => 'Barcode Configuration',
+    'barcode_content'                           => 'Barcode Content',
+    'barcode_first_row'                         => 'Row 3',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => 'Input Formats',
+    'barcode_generate_if_empty'                 => 'Generate if empty.',
+    'barcode_height'                            => 'Height (px)',
+    'barcode_id'                                => 'Item Id/Name',
+    'barcode_info'                              => 'Barcode Configuration Information',
+    'barcode_layout'                            => 'Barcode Layout',
+    'barcode_name'                              => 'Name',
+    'barcode_number'                            => 'Barcode',
+    'barcode_number_in_row'                     => 'Number in row',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing.',
+    'barcode_page_width'                        => 'Display page width',
+    'barcode_price'                             => 'Price',
+    'barcode_second_row'                        => 'Row 3',
+    'barcode_third_row'                         => 'Row 2',
+    'barcode_tooltip'                           => 'Warning: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.',
+    'barcode_type'                              => 'Barcode Type',
+    'barcode_width'                             => 'Width (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Cash Decimals',
+    'cash_decimals_tooltip'                     => 'If Cash Decimals and Currency Decimals are the same then no cash rounding will take place.',
+    'cash_rounding'                             => 'Cash Rounding',
+    'category_dropdown'                         => '',
+    'center'                                    => 'Center',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => 'Company Name',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Change Image',
+    'company_logo'                              => 'Company Logo',
+    'company_remove_image'                      => 'Remove Image',
+    'company_required'                          => 'Company Name is a required field.',
+    'company_select_image'                      => 'Select Image',
+    'company_website_url'                       => 'Company website is not a valid URL (http://...).',
+    'country_codes'                             => 'Country Codes',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => 'Currency Code',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => 'Currency Symbol',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Reward',
+    'customer_reward_duplicate'                 => 'Reward must be unique.',
+    'customer_reward_enable'                    => 'Enable Customer Rewards',
+    'customer_reward_invalid_chars'             => "Reward can not contain '_'",
+    'customer_reward_required'                  => 'Reward is a required field',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => 'Date and Time Filter',
+    'datetimeformat'                            => 'Date and Time Format',
+    'decimal_point'                             => 'Decimal Point',
+    'default_barcode_font_size_number'          => 'Default Barcode Width must be a number.',
+    'default_barcode_font_size_required'        => 'Default Barcode Width is a required field.',
+    'default_barcode_height_number'             => 'Default Barcode Width must be a number.',
+    'default_barcode_height_required'           => 'Default Barcode Width is a required field.',
+    'default_barcode_num_in_row_number'         => 'Default Barcode Number in Row must be a number.',
+    'default_barcode_num_in_row_required'       => 'Default Barcode Number in Row is a required field.',
+    'default_barcode_page_cellspacing_number'   => 'Default Barcode Page Cellspacing must be a number.',
+    'default_barcode_page_cellspacing_required' => 'Default Barcode Page Cellspacing is a required field.',
+    'default_barcode_page_width_number'         => 'Default Barcode Width must be a number.',
+    'default_barcode_page_width_required'       => 'Default Barcode Width is a required field.',
+    'default_barcode_width_number'              => 'Default Barcode Height must be a number.',
+    'default_barcode_width_required'            => 'Default Barcode Height is a required field.',
+    'default_item_columns'                      => 'Default Visible Item Columns',
+    'default_origin_tax_code'                   => 'Default Origin Tax Code',
+    'default_receivings_discount'               => 'Default Receivings Discount',
+    'default_receivings_discount_number'        => 'Default Sales Discount must be a number.',
+    'default_receivings_discount_required'      => 'Default Sales Discount is a required field.',
+    'default_sales_discount'                    => 'Default Sales Discount',
+    'default_sales_discount_number'             => 'Default Receivings Discount must be a number.',
+    'default_sales_discount_required'           => 'Default Receivings Discount is a required field.',
+    'default_tax_category'                      => 'Default Tax Category',
+    'default_tax_code'                          => 'Default Tax Rate',
+    'default_tax_jurisdiction'                  => 'Default Tax Jurisdiction',
+    'default_tax_name_number'                   => 'Default Tax Name must be a string.',
+    'default_tax_name_required'                 => 'Default Tax Rate is a required field.',
+    'default_tax_rate'                          => 'Default Tax Rate',
+    'default_tax_rate_1'                        => 'Tax 2 Rate',
+    'default_tax_rate_2'                        => 'Tax 1 Rate',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Default Tax Rate must be a number.',
+    'default_tax_rate_required'                 => 'Default Tax Name is a required field.',
+    'derive_sale_quantity'                      => 'Allow Derived Sale Quantity',
+    'derive_sale_quantity_tooltip'              => 'If checked then a new item type will provided for items ordered by extended amount',
+    'dinner_table'                              => 'Table',
+    'dinner_table_duplicate'                    => 'Table must be unique.',
+    'dinner_table_enable'                       => 'Enable Dinner Tables',
+    'dinner_table_invalid_chars'                => "Table Name can not contain '_'.",
+    'dinner_table_required'                     => 'Table is a required field.',
+    'dot'                                       => 'dot',
+    'email'                                     => 'Email',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => 'Email Receipt checkbox',
+    'email_receipt_check_behaviour_always'      => 'Always checked',
+    'email_receipt_check_behaviour_last'        => 'Remember last selection',
+    'email_receipt_check_behaviour_never'       => 'Always unchecked',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Enforce privacy',
+    'enforce_privacy_tooltip'                   => 'Protect Customers privacy enforcing data scrambling in case of their data being deleted',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => 'Fiscal Year Start',
+    'financial_year_apr'                        => '1st of April',
+    'financial_year_aug'                        => '1st of August',
+    'financial_year_dec'                        => '1st of December',
+    'financial_year_feb'                        => '1st of February',
+    'financial_year_jan'                        => '1st of January',
+    'financial_year_jul'                        => '1st of July',
+    'financial_year_jun'                        => '1st of June',
+    'financial_year_mar'                        => '1st of March',
+    'financial_year_may'                        => '1st of May',
+    'financial_year_nov'                        => '1st of November',
+    'financial_year_oct'                        => '1st of October',
+    'financial_year_sep'                        => '1st of September',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Login Page reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA Site Key',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA Site Key is a required field',
+    'gcaptcha_site_key'                         => 'reCAPTCHA Secret Key',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA Secret Key is a required field',
+    'gcaptcha_tooltip'                          => 'Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => 'Gift Card Number',
+    'giftcard_random'                           => 'Generate Random',
+    'giftcard_series'                           => 'Generate in Series',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => 'Include Support for HSN Codes',
+    'info'                                      => 'Information',
+    'info_configuration'                        => 'Store Information',
+    'input_groups'                              => '',
+    'integrations'                              => 'Integrations',
+    'integrations_configuration'                => 'Third Party Integrations',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => 'Invoice Type',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => 'Language',
+    'last_used_invoice_number'                  => 'Last used Invoice Number',
+    'last_used_quote_number'                    => 'Last used Quote Number',
+    'last_used_work_order_number'               => 'Last used W/O Number',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => 'Line Sequence',
+    'lines_per_page'                            => 'Lines per Page',
+    'lines_per_page_number'                     => 'Lines per Page must be a number.',
+    'lines_per_page_required'                   => 'Lines per Page is a required field.',
+    'locale'                                    => 'Localization',
+    'locale_configuration'                      => 'Localization Configuration',
+    'locale_info'                               => 'Location Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Localization Configuration Information',
+    'login_form'                                => '',
+    'logout'                                    => 'Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Mailchimp API Key',
+    'mailchimp_configuration'                   => 'Mailchimp Configuration',
+    'mailchimp_key_successfully'                => 'API Key is invalid.',
+    'mailchimp_key_unsuccessfully'              => 'API Key is valid.',
+    'mailchimp_lists'                           => 'Mailchimp List(s)',
+    'mailchimp_tooltip'                         => 'Click the icon for an API Key.',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here, otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => 'Multiple Packages per Item',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localization',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a valid locale.',
+    'number_locale_required'                    => 'Number Locale is a required field.',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link.',
+    'os_timezone'                               => '',
+    'ospos_info'                                => 'OSPOS Installation Info',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => 'Code ng Sanggunian sa Pagbabayad<br>Mga Limitasyon sa Haba',
+    'payment_reference_code_length_max_label'   => 'Max',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => 'Company Phone',
+    'phone_required'                            => 'Company Name is a required field.',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'Margin Left must be a number.',
+    'print_bottom_margin_required'              => 'Margin Left is a required field.',
+    'print_delay_autoreturn'                    => 'Autoreturn to Sale delay',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Header',
+    'print_header'                              => 'Print Browser Footer',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'Margin Top must be a number.',
+    'print_left_margin_required'                => 'Margin Right is a required field.',
+    'print_receipt_check_behaviour'             => 'Print Receipt checkbox',
+    'print_receipt_check_behaviour_always'      => 'Always checked',
+    'print_receipt_check_behaviour_last'        => 'Remember last selection',
+    'print_receipt_check_behaviour_never'       => 'Always unchecked',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'Margin Left must be a number.',
+    'print_right_margin_required'               => 'Margin Left is a required field.',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'Margin Left must be a number.',
+    'print_top_margin_required'                 => 'Margin Left is a required field.',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Default Quote Comments',
+    'receipt'                                   => 'Receipt',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Receipt Print Settings',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => 'Font Size',
+    'receipt_font_size_number'                  => 'Font Size must be a number.',
+    'receipt_font_size_required'                => 'Font Size is a required field.',
+    'receipt_info'                              => 'Location Configuration Information',
+    'receipt_printer'                           => 'Ticket Printer',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => 'Show Company Name',
+    'receipt_show_description'                  => 'Show Description',
+    'receipt_show_serialnumber'                 => 'Show Serial Number',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => 'Show Taxes',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => 'Receipt Template',
+    'receiving_calculate_average_price'         => 'Calc avg. Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => 'Default Register Mode',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => 'Return policy is a required field.',
+    'reward'                                    => 'Reward',
+    'reward_configuration'                      => 'Reward Configuration',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => 'Sales Quote Format',
+    'mailpath_invalid'                          => 'Hindi wastong landas ng sendmail. Mga titik, numero, gitling, underscore, slash, backslash, kolon, espasyo, at tuldok lamang ang pinapayagan.',
+    'saved_successfully'                        => 'Configuration save successful.',
+    'saved_unsuccessfully'                      => 'Configuration save failed.',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Show office icon',
+    'statistics'                                => 'Send Statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes.',
+    'stock_location'                            => 'Stock location',
+    'stock_location_duplicate'                  => 'Stock Location must be unique.',
+    'stock_location_invalid_chars'              => "Stock Location can not contain '_'.",
+    'stock_location_required'                   => 'Stock location is a required field.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Column 3',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Search Suggestions Layout',
+    'suggestions_second_column'                 => 'Column 1',
+    'suggestions_third_column'                  => 'Column 1',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Table',
+    'table_configuration'                       => 'Table Configuration',
+    'takings_printer'                           => 'Receipt Printer',
+    'tax'                                       => 'Tax',
+    'tax_category'                              => 'Tax Category',
+    'tax_category_duplicate'                    => 'The entered tax category already exists.',
+    'tax_category_invalid_chars'                => 'The entered tax category is invalid.',
+    'tax_category_required'                     => 'Tax category is required',
+    'tax_category_used'                         => 'Tax category cannot be deleted because it is being used.',
+    'tax_configuration'                         => 'Table Configuration',
+    'tax_decimals'                              => 'Tax Decimals',
+    'tax_id'                                    => 'Tax Id',
+    'tax_included'                              => 'Tax included',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Thousands Separator',
+    'timezone'                                  => 'Timezone',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => 'Use Destination Based Tax',
+    'user_timezone'                             => '',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Work Order Support',
+    'work_order_format'                         => 'Work Order Format',
 ];
diff --git a/app/Language/tl/Employees.php b/app/Language/tl/Employees.php
index eb51dbe8f..eeddd51b2 100644
--- a/app/Language/tl/Employees.php
+++ b/app/Language/tl/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Information",
-    "cannot_be_deleted"            => "Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account.",
-    "change_employee"              => "",
-    "change_password"              => "Change Password",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Are you sure you want to delete the selected Supplier(s)?",
-    "confirm_restore"              => "Are you sure you want to restore selected entry(s)?",
-    "current_password"             => "Current Password",
-    "current_password_invalid"     => "Current Password is invalid.",
-    "employee"                     => "Employee",
-    "error_adding_updating"        => "Employee add or update failed.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "You can not change the demo admin user.",
-    "error_updating_demo_admin"    => "You can not delete the demo admin user.",
-    "language"                     => "Language",
-    "login_info"                   => "Login",
-    "manager"                      => "",
-    "new"                          => "New Employee",
-    "none_selected"                => "You have not selected any employee(s) to delete.",
-    "one_or_multiple"              => "employee(s)",
-    "password"                     => "Password",
-    "password_minlength"           => "Username must be at least 5 characters in length.",
-    "password_must_match"          => "Passwords do not match.",
-    "password_not_must_match"      => "Current password and new password must be unique.",
-    "password_required"            => "Password is required.",
-    "permission_desc"              => "Check the boxes below to grant access to modules.",
-    "permission_info"              => "Permissions",
-    "repeat_password"              => "Password Again",
-    "subpermission_required"       => "Add at least one grant for each module.",
-    "successful_adding"            => "Employee add successful.",
-    "successful_change_password"   => "Password change successful.",
-    "successful_deleted"           => "You have successfully deleted",
-    "successful_updating"          => "You have successfully added customer",
-    "system_language"              => "System Language",
-    "unsuccessful_change_password" => "Password change failed.",
-    "update"                       => "Update Employee",
-    "username"                     => "Username",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Password must be at least 8 characters in length.",
-    "username_required"            => "Username is a required field.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Information',
+    'cannot_be_deleted'                      => 'Hindi maaaring tanggalin ang mga napiling empleyado, isa o higit pa sa kanila ang may naiprosesong benta o sinusubukan mong tanggalin ang iyong sariling account.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Change Password',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Are you sure you want to delete the selected Supplier(s)?',
+    'confirm_restore'                        => 'Are you sure you want to restore selected entry(s)?',
+    'current_password'                       => 'Current Password',
+    'current_password_invalid'               => 'Current Password is invalid.',
+    'employee'                               => 'Employee',
+    'error_adding_updating'                  => 'Employee add or update failed.',
+    'error_cannot_remove_own_minimum_grant'  => 'Hindi mo maaaring tanggalin ang iyong sariling pinakamababang pahintulot sa access ng module.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'You can not delete the demo admin user.',
+    'error_grant_change_disallowed'          => 'Ang mga pagbabago sa pahintulot ay hindi pinagana sa demo na ito.',
+    'error_password_change_disallowed'       => 'Ang mga pagbabago ng password ay hindi pinagana sa demo na ito.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'You can not change the demo admin user.',
+    'language'                               => 'Language',
+    'login_info'                             => 'Login',
+    'manager'                                => '',
+    'new'                                    => 'New Employee',
+    'none_selected'                          => 'You have not selected any employee(s) to delete.',
+    'one_or_multiple'                        => 'employee(s)',
+    'password'                               => 'Password',
+    'password_minlength'                     => 'Username must be at least 5 characters in length.',
+    'password_must_match'                    => 'Passwords do not match.',
+    'password_not_must_match'                => 'Current password and new password must be unique.',
+    'password_required'                      => 'Password is required.',
+    'permission_desc'                        => 'Check the boxes below to grant access to modules.',
+    'permission_info'                        => 'Permissions',
+    'repeat_password'                        => 'Password Again',
+    'subpermission_required'                 => 'Add at least one grant for each module.',
+    'successful_adding'                      => 'Employee add successful.',
+    'successful_change_password'             => 'Password change successful.',
+    'successful_deleted'                     => 'You have successfully deleted',
+    'successful_updating'                    => 'You have successfully added customer',
+    'system_language'                        => 'System Language',
+    'unsuccessful_change_password'           => 'Password change failed.',
+    'update'                                 => 'Update Employee',
+    'username'                               => 'Username',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Password must be at least 8 characters in length.',
+    'username_required'                      => 'Username is a required field.',
 ];
diff --git a/app/Language/tl/Error.php b/app/Language/tl/Error.php
index ace67fbb1..b594b05db 100644
--- a/app/Language/tl/Error.php
+++ b/app/Language/tl/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "You do not have permission to access the module named",
-    "unknown"              => "Unexpected error",
+    'no_permission_module'           => 'Wala kang pahintulot na gamitin ang module na pinangalanang',
+    'unable_to_create_env_file'      => 'Hindi magawa ang {filePath} para itakda ang throttle.key',
+    'unable_to_lock_file'            => 'Hindi ma-lock ang {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Hindi mabuksan ang {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Hindi ma-save ang throttle.key sa {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Hindi mabasa ang {filePath} para itakda ang throttle.key',
+    'unknown'                        => 'Hindi inaasahang error',
 ];
diff --git a/app/Language/tl/Items.php b/app/Language/tl/Items.php
index dbe09ba63..47951f5fb 100644
--- a/app/Language/tl/Items.php
+++ b/app/Language/tl/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Inventory to add or subtract.",
-    "allow_alt_description"              => "Allow Alternate Description",
-    "amount_entry"                       => "Amount Entry",
-    "bulk_edit"                          => "Bulk Edit",
-    "buy_price_required"                 => "Purchase Price is a required field.",
-    "cannot_be_deleted"                  => "Could not delete selected customers, one or more of the selected customers has sales.",
-    "cannot_find_item"                   => "Item not found.",
-    "categories"                         => "",
-    "category"                           => "Category",
-    "category_new"                       => "",
-    "category_required"                  => "category is a required field",
-    "change_all_to_allow_alt_desc"       => "Allow alternate description for all.",
-    "change_all_to_not_allow_allow_desc" => "Do not allow alternate description for all.",
-    "change_all_to_serialized"           => "Change All To Serialized",
-    "change_all_to_unserialized"         => "Change All To Unserialized",
-    "change_image"                       => "Change Image",
-    "confirm_bulk_edit"                  => "Are you sure you want to delete selected entry(s)?",
-    "confirm_bulk_edit_wipe_taxes"       => "All Item Tax information will be replaced.",
-    "confirm_delete"                     => "Are you sure you want to delete selected entry(s)?",
-    "confirm_restore"                    => "Are you sure you want to restore selected entry(s)?",
-    "cost_price"                         => "Wholesale Price",
-    "cost_price_number"                  => "Wholesale Price must be a number.",
-    "cost_price_required"                => "Purchase Price is a required field.",
-    "count"                              => "Update Inventory",
-    "csv_import_failed"                  => "CSV import failed",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "The uploaded file has no data or is formatted incorrectly.",
-    "csv_import_partially_failed"        => "Customer import successful with some failures:",
-    "csv_import_success"                 => "Item import successful.",
-    "current_quantity"                   => "Current Quantity",
-    "default_pack_name"                  => "Each",
-    "description"                        => "Description",
-    "details_count"                      => "Inventory Count Details",
-    "do_nothing"                         => "Do Nothing",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Edit the desired fields for selected item(s).",
-    "edit_multiple_items"                => "Editing Multiple Items",
-    "empty_upc_items"                    => "Empty Barcode Items",
-    "error_adding_updating"              => "Error adding/updating item",
-    "error_updating_multiple"            => "Error updating items",
-    "generate_barcodes"                  => "Generate Barcodes",
-    "hsn_code"                           => "Harmonized System Nomenclature",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Item Import from CSV",
-    "info_provided_by"                   => "Information provided by",
-    "inventory"                          => "Inventory",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "Comments",
-    "inventory_data_tracking"            => "Inventory Data Tracking",
-    "inventory_date"                     => "Date",
-    "inventory_employee"                 => "Employee",
-    "inventory_in_out_quantity"          => "In/Out Quantity",
-    "inventory_remarks"                  => "Remarks",
-    "is_deleted"                         => "Deleted",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Item has Serial Number",
-    "item"                               => "Item",
-    "item_id"                            => "",
-    "item_number"                        => "Barcode",
-    "item_number_duplicate"              => "Account Number is already present in the database.",
-    "kit"                                => "Kit",
-    "location"                           => "Location",
-    "low_inventory_items"                => "Out Of Stock Items",
-    "low_sell_item"                      => "Low sell item",
-    "manually_editing_of_quantity"       => "Manual Edit of Quantity",
-    "markup"                             => "",
-    "name"                               => "Item Name",
-    "name_required"                      => "First Name is a required field.",
-    "new"                                => "New Item",
-    "no_description_items"               => "No Description Items",
-    "no_items_to_display"                => "No Items to display.",
-    "none"                               => "None",
-    "none_selected"                      => "You have not selected any Item(s) to edit",
-    "nonstock"                           => "Non-stocked",
-    "number_information"                 => "Item Number",
-    "number_required"                    => "Table is a required field.",
-    "one_or_multiple"                    => "item(s)",
-    "pack_name"                          => "Pack Name",
-    "qty_per_pack"                       => "Quantity per pack",
-    "quantity"                           => "Quantity",
-    "quantity_number"                    => "Quantity must be a number.",
-    "quantity_required"                  => "Quantity is a required field.",
-    "receiving_quantity"                 => "Receiving Quantity",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "Reorder Level",
-    "reorder_level_number"               => "Reorder Level must be a number.",
-    "reorder_level_required"             => "Reorder Level is a required field.",
-    "retrive_item_info"                  => "Retrive Item Info",
-    "sales_tax_1"                        => "Sales Tax",
-    "sales_tax_2"                        => "Sales Tax 2",
-    "search_attributes"                  => "Search Attributes",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "Serialized Items",
-    "standard"                           => "Standard",
-    "stock"                              => "Stock",
-    "stock_location"                     => "Stock location",
-    "stock_type"                         => "Stock Type",
-    "successful_adding"                  => "You have successfully added item",
-    "successful_bulk_edit"               => "You have successfully updated the selected Gift Card(s)",
-    "successful_deleted"                 => "You have successfully deleted",
-    "successful_updating"                => "You have successfully added item",
-    "supplier"                           => "Supplier",
-    "tax_1"                              => "Tax 1",
-    "tax_2"                              => "Tax 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Tax Category",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "Tax Percent must be a numeric value",
-    "tax_percent_required"               => "Tax Percent is a required field.",
-    "tax_percents"                       => "Tax Percent(s)",
-    "temp"                               => "Temporary",
-    "type"                               => "Item Type",
-    "unit_price"                         => "Retail Price",
-    "unit_price_number"                  => "Unit price must be a number.",
-    "unit_price_required"                => "Purchase Price is a required field.",
-    "upc_database"                       => "Barcode Database",
-    "update"                             => "Update Item",
-    "use_inventory_menu"                 => "Use Inventory Menu",
+    'add_minus'                          => 'Inventory to add or subtract.',
+    'allow_alt_description'              => 'Allow Alternate Description',
+    'amount_entry'                       => 'Amount Entry',
+    'bulk_edit'                          => 'Bulk Edit',
+    'buy_price_required'                 => 'Purchase Price is a required field.',
+    'cannot_be_deleted'                  => 'Could not delete selected customers, one or more of the selected customers has sales.',
+    'cannot_find_item'                   => 'Item not found.',
+    'categories'                         => '',
+    'category'                           => 'Category',
+    'category_new'                       => '',
+    'category_required'                  => 'category is a required field',
+    'change_all_to_allow_alt_desc'       => 'Allow alternate description for all.',
+    'change_all_to_not_allow_allow_desc' => 'Do not allow alternate description for all.',
+    'change_all_to_serialized'           => 'Change All To Serialized',
+    'change_all_to_unserialized'         => 'Change All To Unserialized',
+    'change_image'                       => 'Change Image',
+    'confirm_bulk_edit'                  => 'Are you sure you want to delete selected entry(s)?',
+    'confirm_bulk_edit_wipe_taxes'       => 'All Item Tax information will be replaced.',
+    'confirm_delete'                     => 'Are you sure you want to delete selected entry(s)?',
+    'confirm_restore'                    => 'Are you sure you want to restore selected entry(s)?',
+    'cost_price'                         => 'Wholesale Price',
+    'cost_price_number'                  => 'Wholesale Price must be a number.',
+    'cost_price_required'                => 'Purchase Price is a required field.',
+    'count'                              => 'Update Inventory',
+    'csv_import_failed'                  => 'CSV import failed',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'The uploaded file has no data or is formatted incorrectly.',
+    'csv_import_partially_failed'        => 'Customer import successful with some failures:',
+    'csv_import_success'                 => 'Item import successful.',
+    'current_quantity'                   => 'Current Quantity',
+    'default_pack_name'                  => 'Each',
+    'description'                        => 'Description',
+    'details_count'                      => 'Inventory Count Details',
+    'do_nothing'                         => 'Do Nothing',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Edit the desired fields for selected item(s).',
+    'edit_multiple_items'                => 'Editing Multiple Items',
+    'empty_upc_items'                    => 'Empty Barcode Items',
+    'error_adding_updating'              => 'Error adding/updating item',
+    'error_updating_multiple'            => 'Error updating items',
+    'generate_barcodes'                  => 'Generate Barcodes',
+    'hsn_code'                           => 'Harmonized System Nomenclature',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Item Import from CSV',
+    'info_provided_by'                   => 'Information provided by',
+    'inventory'                          => 'Inventory',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => 'Comments',
+    'inventory_data_tracking'            => 'Inventory Data Tracking',
+    'inventory_date'                     => 'Date',
+    'inventory_employee'                 => 'Employee',
+    'inventory_in_out_quantity'          => 'In/Out Quantity',
+    'inventory_remarks'                  => 'Remarks',
+    'is_deleted'                         => 'Deleted',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Item has Serial Number',
+    'item'                               => 'Item',
+    'item_id'                            => '',
+    'item_number'                        => 'Barcode',
+    'item_number_duplicate'              => 'Account Number is already present in the database.',
+    'item_number_invalid'                => 'Ang numero ng item ay naglalaman ng hindi pinapayagang mga character.',
+    'kit'                                => 'Kit',
+    'location'                           => 'Location',
+    'low_inventory_items'                => 'Out Of Stock Items',
+    'low_sell_item'                      => 'Low sell item',
+    'manually_editing_of_quantity'       => 'Manual Edit of Quantity',
+    'markup'                             => '',
+    'name'                               => 'Item Name',
+    'name_required'                      => 'First Name is a required field.',
+    'new'                                => 'New Item',
+    'no_description_items'               => 'No Description Items',
+    'no_items_to_display'                => 'No Items to display.',
+    'none'                               => 'None',
+    'none_selected'                      => 'You have not selected any Item(s) to edit',
+    'nonstock'                           => 'Non-stocked',
+    'number_information'                 => 'Item Number',
+    'number_required'                    => 'Table is a required field.',
+    'one_or_multiple'                    => 'item(s)',
+    'pack_name'                          => 'Pack Name',
+    'qty_per_pack'                       => 'Quantity per pack',
+    'quantity'                           => 'Quantity',
+    'quantity_number'                    => 'Quantity must be a number.',
+    'quantity_required'                  => 'Quantity is a required field.',
+    'receiving_quantity'                 => 'Receiving Quantity',
+    'remove_image'                       => 'Remove Image',
+    'reorder_level'                      => 'Reorder Level',
+    'reorder_level_number'               => 'Reorder Level must be a number.',
+    'reorder_level_required'             => 'Reorder Level is a required field.',
+    'retrive_item_info'                  => 'Retrive Item Info',
+    'sales_tax_1'                        => 'Sales Tax',
+    'sales_tax_2'                        => 'Sales Tax 2',
+    'search_attributes'                  => 'Search Attributes',
+    'select_image'                       => 'Select Image',
+    'serialized_items'                   => 'Serialized Items',
+    'standard'                           => 'Standard',
+    'stock'                              => 'Stock',
+    'stock_location'                     => 'Stock location',
+    'stock_type'                         => 'Stock Type',
+    'successful_adding'                  => 'You have successfully added item',
+    'successful_bulk_edit'               => 'You have successfully updated the selected Gift Card(s)',
+    'successful_deleted'                 => 'You have successfully deleted',
+    'successful_updating'                => 'You have successfully added item',
+    'supplier'                           => 'Supplier',
+    'tax_1'                              => 'Tax 1',
+    'tax_2'                              => 'Tax 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Tax Category',
+    'tax_name_invalid'                   => 'Ang pangalan ng buwis ay may mga hindi pinapayagang karakter.',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => 'Tax Percent must be a numeric value',
+    'tax_percent_required'               => 'Tax Percent is a required field.',
+    'tax_percents'                       => 'Tax Percent(s)',
+    'temp'                               => 'Temporary',
+    'type'                               => 'Item Type',
+    'unit_price'                         => 'Retail Price',
+    'unit_price_number'                  => 'Unit price must be a number.',
+    'unit_price_required'                => 'Purchase Price is a required field.',
+    'upc_database'                       => 'Barcode Database',
+    'update'                             => 'Update Item',
+    'use_inventory_menu'                 => 'Use Inventory Menu',
 ];
diff --git a/app/Language/tl/Login.php b/app/Language/tl/Login.php
index b8436ee75..390b3506f 100644
--- a/app/Language/tl/Login.php
+++ b/app/Language/tl/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "I'm not a robot.",
-    "go"                            => "Go",
-    "invalid_gcaptcha"              => "Invalid I'm not a robot.",
-    "invalid_installation"          => "The installation is not correct, check your php.ini file.",
-    "invalid_username_and_password" => "Invalid Username or Password.",
-    "login"                         => "Login",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Password",
-    "required_username"             => "",
-    "username"                      => "Username",
-    "welcome"                       => "",
+    "gcaptcha"                            => "I'm not a robot.",
+    "go"                                  => "Go",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Invalid I'm not a robot.",
+    "invalid_installation"                => "The installation is not correct, check your php.ini file.",
+    "invalid_username_and_password"       => "Invalid Username or Password.",
+    "login"                               => "Login",
+    "logout"                              => "",
+    "migrating_database"                  => "Inililipat ang Database",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Matagumpay na nalipat ang database!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Password",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Masyadong maraming pagtatangka. Mangyaring maghintay sandali at subukang muli.',
+    "username"                            => "Username",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/tl/Reports.php b/app/Language/tl/Reports.php
index b62356a06..06cea79e7 100644
--- a/app/Language/tl/Reports.php
+++ b/app/Language/tl/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Tax Rate",
     "taxes"                                   => "Taxes",
     "taxes_summary_report"                    => "Taxes Summary Report",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Total",
     "total_inventory_value"                   => "Total Inventory Value",
     "total_low_sell_quantity"                 => "Total Low Sell Quantity",
diff --git a/app/Language/tl/Sales.php b/app/Language/tl/Sales.php
index 3cb4d1653..cdfe28c58 100644
--- a/app/Language/tl/Sales.php
+++ b/app/Language/tl/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Available Points",
-    "rewards_package"                  => "Rewards",
-    "rewards_remaining_balance"        => "Reward Points remaining value is ",
-    "account_number"                   => "Account #",
-    "add_payment"                      => "Add Payment",
-    "amount_due"                       => "Amount Due",
-    "amount_tendered"                  => "Amount Tendered",
-    "authorized_signature"             => "Authorized Signature",
-    "cancel_sale"                      => "Cancel",
-    "cash"                             => "Cash",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "Cash Deposit",
-    "cash_filter"                      => "Cash",
-    "change_due"                       => "Change Due",
-    "change_price"                     => "",
-    "check"                            => "Check",
-    "check_balance"                    => "Check remainder",
-    "check_filter"                     => "Check",
-    "close"                            => "",
-    "comment"                          => "Comment",
-    "comments"                         => "Comments",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Complete",
-    "confirm_cancel_sale"              => "Are you sure you want to clear this sale? All items will cleared.",
-    "confirm_delete"                   => "Are you sure you want to delete the selected Sale(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected Sale(s)?",
-    "credit"                           => "Credit Card",
-    "credit_deposit"                   => "Credit Deposit",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "Name",
-    "customer_address"                 => "Address",
-    "customer_discount"                => "Discount",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Location",
-    "customer_mailchimp_status"        => "Mailchimp status",
-    "customer_optional"                => "(Required for Due Payments)",
-    "customer_required"                => "(Required)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Sale Date",
-    "date_range"                       => "Date Range",
-    "date_required"                    => "A correct date must be entered.",
-    "date_type"                        => "Date is a required field.",
-    "debit"                            => "Debit Card",
-    "debit_filter"                     => "",
-    "delete"                           => "Allow Delete",
-    "delete_confirmation"              => "Are you sure you want to delete this sale? This action cannot be undone.",
-    "delete_entire_sale"               => "Delete Entire Sale",
-    "delete_successful"                => "Sale delete successful.",
-    "delete_unsuccessful"              => "Sale delete failed.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Discard",
-    "discard_quote"                    => "",
-    "discount"                         => "Disc",
-    "discount_included"                => "% Discount",
-    "discount_short"                   => "%",
-    "due"                              => "Due",
-    "due_filter"                       => "Due",
-    "edit"                             => "Edit",
-    "edit_item"                        => "Edit Item",
-    "edit_sale"                        => "Edit Sale",
-    "email_receipt"                    => "Email Receipt",
-    "employee"                         => "Employee",
-    "entry"                            => "Entry",
-    "error_editing_item"               => "Error editing item",
-    "find_or_scan_item"                => "Find or Scan Item",
-    "find_or_scan_item_or_receipt"     => "Find or Scan Item or Receipt",
-    "giftcard"                         => "Gift Card",
-    "giftcard_balance"                 => "Gift Card Balance",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gift Card Number",
-    "group_by_category"                => "Group by Category",
-    "group_by_type"                    => "Group by Type",
-    "hsn"                              => "HSN",
-    "id"                               => "Sale ID",
-    "include_prices"                   => "Include Prices?",
-    "invoice"                          => "Invoice",
-    "invoice_confirm"                  => "This invoice will be sent to",
-    "invoice_enable"                   => "Create Invoice",
-    "invoice_filter"                   => "Invoices",
-    "invoice_no_email"                 => "This customer does not have a valid email address.",
-    "invoice_number"                   => "Invoice #",
-    "invoice_number_duplicate"         => "Invoice Number must be unique.",
-    "invoice_sent"                     => "Invoice sent to",
-    "invoice_total"                    => "Invoice Total",
-    "invoice_type_custom_invoice"      => "Custom Invoice (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Custom Tax Invoice (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Invoice (invoice.php)",
-    "invoice_type_tax_invoice"         => "Tax Invoice (tax_invoice.php)",
-    "invoice_unsent"                   => "Invoice failed to be sent to",
-    "invoice_update"                   => "Recount",
-    "item_insufficient_of_stock"       => "Item has insufficient stock.",
-    "item_name"                        => "Item Name",
-    "item_number"                      => "Item #",
-    "item_out_of_stock"                => "Item is out of stock.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Register Mode",
-    "must_enter_numeric"               => "Amount Tendered must be a number.",
-    "must_enter_numeric_giftcard"      => "Gift Card Number must be a number.",
-    "new_customer"                     => "New Customer",
-    "new_item"                         => "New Item",
-    "no_description"                   => "No description",
-    "no_filter"                        => "All",
-    "no_items_in_cart"                 => "There are no Items in the cart.",
-    "no_sales_to_display"              => "No Sales to display.",
-    "none_selected"                    => "You have not selected any Sale(s) to delete.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "This action is not authorized.",
-    "one_or_multiple"                  => "Sale(s)",
-    "payment"                          => "Payment Type",
-    "payment_amount"                   => "Amount",
-    "payment_not_cover_total"          => "Payment Amount must be greater than or equal to Total.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Payments Total",
-    "price"                            => "Price",
-    "print_after_sale"                 => "Print after Sale",
-    "quantity"                         => "Quantity",
-    "quantity_less_than_reorder_level" => "Warning: Desired Quantity is below Reorder Level for that Item.",
-    "quantity_less_than_zero"          => "Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.",
-    "quantity_of_items"                => "Quantity of {0} Items",
-    "quote"                            => "Quote",
-    "quote_number"                     => "Quote Number",
-    "quote_number_duplicate"           => "Quote Number must be unique.",
-    "quote_sent"                       => "Quote sent to",
-    "quote_unsent"                     => "Quote failed to be sent to",
-    "receipt"                          => "Sales Receipt",
-    "receipt_no_email"                 => "This customer does not have a valid email address.",
-    "receipt_number"                   => "Sale #",
-    "receipt_sent"                     => "Receipt sent to",
-    "receipt_unsent"                   => "Receipt failed to be sent to",
-    "refund"                           => "",
-    "register"                         => "Sales Register",
-    "remove_customer"                  => "Remove Customer",
-    "remove_discount"                  => "",
-    "return"                           => "Return",
-    "rewards"                          => "Reward Points",
-    "rewards_balance"                  => "Reward Points Balance",
-    "sale"                             => "Sale",
-    "sale_by_invoice"                  => "Sale by Invoice",
-    "sale_for_customer"                => "Customer:",
-    "sale_time"                        => "Time",
-    "sales_tax"                        => "Sales Tax",
-    "sales_total"                      => "",
-    "select_customer"                  => "Select Customer",
-    "send_invoice"                     => "Send Invoice",
-    "send_quote"                       => "Send Quote",
-    "send_receipt"                     => "Send Receipt",
-    "send_work_order"                  => "Send Work Order",
-    "serial"                           => "Serial",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Show Invoice",
-    "show_receipt"                     => "Show Receipt",
-    "start_typing_customer_name"       => "Start typing customer details...",
-    "start_typing_item_name"           => "Start typing Item Name or scan Barcode...",
-    "stock"                            => "Stock",
-    "stock_location"                   => "Stock Location",
-    "sub_total"                        => "Subtotal",
-    "successfully_deleted"             => "You have successfully deleted",
-    "successfully_restored"            => "You have successfully restored",
-    "successfully_suspended_sale"      => "Sale suspend successful.",
-    "successfully_updated"             => "Sale update successful.",
-    "suspend_sale"                     => "Suspend",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspended",
-    "table"                            => "Table",
-    "takings"                          => "Daily Sales",
-    "tax"                              => "Tax",
-    "tax_id"                           => "Tax Id",
-    "tax_invoice"                      => "Tax Invoice",
-    "tax_percent"                      => "Tax %",
-    "taxed_ind"                        => "",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Tax excluded",
-    "transaction_failed"               => "Sales Transaction failed.",
-    "unable_to_add_item"               => "Item add to Sale failed",
-    "unsuccessfully_deleted"           => "Sale(s) delete failed.",
-    "unsuccessfully_restored"          => "Sale(s) restore failed.",
-    "unsuccessfully_suspended_sale"    => "Sale suspend failed.",
-    "unsuccessfully_updated"           => "Sale update failed.",
-    "unsuspend"                        => "Unsuspend",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Update",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Work Order",
-    "work_order_number"                => "Work Order Number",
-    "work_order_number_duplicate"      => "Work Order Number must be unique.",
-    "work_order_sent"                  => "Work Order sent to",
-    "work_order_unsent"                => "Work Order failed to be sent to",
+    'account_number'                    => 'Account #',
+    'add_payment'                       => 'Add Payment',
+    'amount_due'                        => 'Amount Due',
+    'amount_due_not_covered'            => 'Hindi sapat ang mga bayad para sa kabuuang dapat bayaran.',
+    'amount_tendered'                   => 'Amount Tendered',
+    'authorized_signature'              => 'Authorized Signature',
+    'cancel_sale'                       => 'Cancel',
+    'cash'                              => 'Cash',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => 'Cash Deposit',
+    'cash_filter'                       => 'Cash',
+    'change_due'                        => 'Change Due',
+    'change_price'                      => '',
+    'check'                             => 'Check',
+    'check_balance'                     => 'Check remainder',
+    'check_filter'                      => 'Check',
+    'close'                             => '',
+    'comment'                           => 'Comment',
+    'comments'                          => 'Comments',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Complete',
+    'confirm_cancel_sale'               => 'Are you sure you want to clear this sale? All items will cleared.',
+    'confirm_delete'                    => 'Are you sure you want to delete the selected Sale(s)?',
+    'confirm_restore'                   => 'Are you sure you want to restore the selected Sale(s)?',
+    'credit'                            => 'Credit Card',
+    'credit_deposit'                    => 'Credit Deposit',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => 'Name',
+    'customer_address'                  => 'Address',
+    'customer_discount'                 => 'Discount',
+    'customer_email'                    => 'Email',
+    'customer_location'                 => 'Location',
+    'customer_mailchimp_status'         => 'Mailchimp status',
+    'customer_optional'                 => '(Required for Due Payments)',
+    'customer_required'                 => '(Required)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Available Points',
+    'daily_sales'                       => '',
+    'date'                              => 'Sale Date',
+    'date_range'                        => 'Date Range',
+    'date_required'                     => 'A correct date must be entered.',
+    'date_type'                         => 'Date is a required field.',
+    'debit'                             => 'Debit Card',
+    'debit_filter'                      => '',
+    'delete'                            => 'Allow Delete',
+    'delete_confirmation'               => 'Are you sure you want to delete this sale? This action cannot be undone.',
+    'delete_entire_sale'                => 'Delete Entire Sale',
+    'delete_successful'                 => 'Sale delete successful.',
+    'delete_unsuccessful'               => 'Sale delete failed.',
+    'description_abbrv'                 => 'Desc.',
+    'discard'                           => 'Discard',
+    'discard_quote'                     => '',
+    'discount'                          => 'Disc',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Discount',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Due',
+    'due_filter'                        => 'Due',
+    'edit'                              => 'Edit',
+    'edit_item'                         => 'Edit Item',
+    'edit_sale'                         => 'Edit Sale',
+    'email_receipt'                     => 'Email Receipt',
+    'employee'                          => 'Employee',
+    'entry'                             => 'Entry',
+    'error_editing_item'                => 'Error editing item',
+    'find_or_scan_item'                 => 'Find or Scan Item',
+    'find_or_scan_item_or_receipt'      => 'Find or Scan Item or Receipt',
+    'giftcard'                          => 'Gift Card',
+    'giftcard_balance'                  => 'Gift Card Balance',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Gift Card Number',
+    'group_by_category'                 => 'Group by Category',
+    'group_by_type'                     => 'Group by Type',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Sale ID',
+    'include_prices'                    => 'Include Prices?',
+    'insufficient_giftcard_balance'     => 'Walang sapat na balanse ng gift card para sa pagbabayad na ito.',
+    'insufficient_reward_points'        => 'Walang sapat na reward points para sa pagbabayad na ito.',
+    'invoice'                           => 'Invoice',
+    'invoice_confirm'                   => 'This invoice will be sent to',
+    'invoice_enable'                    => 'Create Invoice',
+    'invoice_filter'                    => 'Invoices',
+    'invoice_no_email'                  => 'This customer does not have a valid email address.',
+    'invoice_number'                    => 'Invoice #',
+    'invoice_number_duplicate'          => 'Invoice Number must be unique.',
+    'invoice_sent'                      => 'Invoice sent to',
+    'invoice_total'                     => 'Invoice Total',
+    'invoice_type_custom_invoice'       => 'Custom Invoice (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Custom Tax Invoice (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Invoice (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Tax Invoice (tax_invoice.php)',
+    'invoice_unsent'                    => 'Invoice failed to be sent to',
+    'invoice_update'                    => 'Recount',
+    'item_insufficient_of_stock'        => 'Item has insufficient stock.',
+    'item_name'                         => 'Item Name',
+    'item_number'                       => 'Item #',
+    'item_out_of_stock'                 => 'Item is out of stock.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Register Mode',
+    'must_enter_numeric'                => 'Amount Tendered must be a number.',
+    'must_enter_numeric_giftcard'       => 'Gift Card Number must be a number.',
+    'must_enter_reference_code'         => 'Ang Numero ng Sanggunian/Pagkuha ay dapat ipasok.',
+    'negative_amount_tendered'          => 'Hindi maaaring negatibo ang halagang ibinayad.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'New Customer',
+    'new_item'                          => 'New Item',
+    'no_description'                    => 'No description',
+    'no_filter'                         => 'All',
+    'no_items_in_cart'                  => 'There are no Items in the cart.',
+    'no_sales_to_display'               => 'No Sales to display.',
+    'none_selected'                     => 'You have not selected any Sale(s) to delete.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'This action is not authorized.',
+    'one_or_multiple'                   => 'Sale(s)',
+    'payment'                           => 'Payment Type',
+    'payment_amount'                    => 'Amount',
+    'payment_not_cover_total'           => 'Payment Amount must be greater than or equal to Total.',
+    'payment_type'                      => 'Type',
+    'payments'                          => '',
+    'payments_total'                    => 'Payments Total',
+    'price'                             => 'Price',
+    'print_after_sale'                  => 'Print after Sale',
+    'quantity'                          => 'Quantity',
+    'quantity_less_than_reorder_level'  => 'Warning: Desired Quantity is below Reorder Level for that Item.',
+    'quantity_less_than_zero'           => 'Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.',
+    'quantity_of_items'                 => 'Quantity of {0} Items',
+    'quote'                             => 'Quote',
+    'quote_number'                      => 'Quote Number',
+    'quote_number_duplicate'            => 'Quote Number must be unique.',
+    'quote_sent'                        => 'Quote sent to',
+    'quote_unsent'                      => 'Quote failed to be sent to',
+    'receipt'                           => 'Sales Receipt',
+    'receipt_no_email'                  => 'This customer does not have a valid email address.',
+    'receipt_number'                    => 'Sale #',
+    'receipt_sent'                      => 'Receipt sent to',
+    'receipt_unsent'                    => 'Receipt failed to be sent to',
+    'reference_code'                    => 'Code ng Sanggunian sa Pagbabayad',
+    'reference_code_invalid_characters' => 'Ang code ng sanggunian ay dapat naglalaman lamang ng mga titik at numero.',
+    'reference_code_length_error'       => 'Ang haba ng code ng sanggunian ay hindi wasto.',
+    'refund'                            => '',
+    'register'                          => 'Sales Register',
+    'remove_customer'                   => 'Remove Customer',
+    'remove_discount'                   => '',
+    'return'                            => 'Return',
+    'rewards'                           => 'Reward Points',
+    'rewards_balance'                   => 'Reward Points Balance',
+    'rewards_package'                   => 'Rewards',
+    'rewards_remaining_balance'         => 'Reward Points remaining value is ',
+    'sale'                              => 'Sale',
+    'sale_by_invoice'                   => 'Sale by Invoice',
+    'sale_for_customer'                 => 'Customer:',
+    'sale_time'                         => 'Time',
+    'sales_tax'                         => 'Sales Tax',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Select Customer',
+    'send_invoice'                      => 'Send Invoice',
+    'send_quote'                        => 'Send Quote',
+    'send_receipt'                      => 'Send Receipt',
+    'send_work_order'                   => 'Send Work Order',
+    'serial'                            => 'Serial',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Show Invoice',
+    'show_receipt'                      => 'Show Receipt',
+    'start_typing_customer_name'        => 'Start typing customer details...',
+    'start_typing_item_name'            => 'Start typing Item Name or scan Barcode...',
+    'stock'                             => 'Stock',
+    'stock_location'                    => 'Stock Location',
+    'sub_total'                         => 'Subtotal',
+    'successfully_deleted'              => 'You have successfully deleted',
+    'successfully_restored'             => 'You have successfully restored',
+    'successfully_suspended_sale'       => 'Sale suspend successful.',
+    'successfully_updated'              => 'Sale update successful.',
+    'suspend_sale'                      => 'Suspend',
+    'suspended_doc_id'                  => 'Document',
+    'suspended_sale_id'                 => 'ID',
+    'suspended_sales'                   => 'Suspended',
+    'table'                             => 'Table',
+    'takings'                           => 'Daily Sales',
+    'tax'                               => 'Tax',
+    'tax_id'                            => 'Tax Id',
+    'tax_invoice'                       => 'Tax Invoice',
+    'tax_percent'                       => 'Tax %',
+    'taxed_ind'                         => '',
+    'total'                             => 'Total',
+    'total_tax_exclusive'               => 'Tax excluded',
+    'transaction_failed'                => 'Sales Transaction failed.',
+    'unable_to_add_item'                => 'Item add to Sale failed',
+    'unsuccessfully_deleted'            => 'Sale(s) delete failed.',
+    'unsuccessfully_restored'           => 'Sale(s) restore failed.',
+    'unsuccessfully_suspended_sale'     => 'Sale suspend failed.',
+    'unsuccessfully_updated'            => 'Sale update failed.',
+    'unsuspend'                         => 'Unsuspend',
+    'unsuspend_and_delete'              => 'Action',
+    'update'                            => 'Update',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Work Order',
+    'work_order_number'                 => 'Work Order Number',
+    'work_order_number_duplicate'       => 'Work Order Number must be unique.',
+    'work_order_sent'                   => 'Work Order sent to',
+    'work_order_unsent'                 => 'Work Order failed to be sent to',
 ];
diff --git a/app/Language/tr/Attributes.php b/app/Language/tr/Attributes.php
index 73bedab9c..570426e32 100644
--- a/app/Language/tr/Attributes.php
+++ b/app/Language/tr/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Nitelik değeri ':' ve ya '|' karakterlerini bulunduramaz",
-    "confirm_delete"                   => "Seçili niteliği ya da nitelikleri silmek istediğinize emin misiniz?",
-    "confirm_restore"                  => "Seçili nitelik ya da nitelikleri kurtarmak istediğinize emin misiniz?",
-    "definition_cannot_be_deleted"     => "Seçili nitelik ya da nitelikler silinemedi",
-    "definition_error_adding_updating" => "Nitelik {0} eklenemedi ya da güncellenemedi. Lütfen hata kaydını gözden geçirin.",
-    "definition_flags"                 => "Nitelik Görünebilirliği",
-    "definition_group"                 => "Küme",
-    "definition_id"                    => "Kimlik",
-    "definition_name"                  => "Nitelik Ekle",
-    "definition_name_required"         => "Nitelik adı girilmesi gerekli alandır",
-    "definition_one_or_multiple"       => "Nitelik/Nitelikler",
-    "definition_successful_adding"     => "Başarıyla öge eklediniz",
-    "definition_successful_deleted"    => "Başarıyla sildiniz",
-    "definition_successful_updating"   => "Başarılı biçimde niteliği güncellediniz",
-    "definition_type"                  => "Nitelik Türü",
-    "definition_type_required"         => "Nitelik türü alanı gereklidir",
-    "definition_unit"                  => "Ölçü Birimi",
-    "definition_values"                => "Nitelik Değerleri",
-    "new"                              => "Yeni Nitelik",
-    "no_attributes_to_display"         => "Gösterecek ürün yok",
-    "receipt_visibility"               => "Fiş",
-    "show_in_items"                    => "Ürünlerde göster",
-    "show_in_items_visibility"         => "Ürünler",
-    "show_in_receipt"                  => "Fişlerde göster",
-    "show_in_receivings"               => "Alacaklarda göster",
-    "show_in_receivings_visibility"    => "Alacaklar",
-    "show_in_sales"                    => "Satışlarda göster",
-    "show_in_sales_visibility"         => "Satışlar",
-    "update"                           => "Nitelik Güncelle",
+    'attribute_value_invalid_chars'    => 'Nitelik değeri \':\' ve ya \'|\' karakterlerini bulunduramaz',
+    'confirm_delete'                   => 'Seçili niteliği ya da nitelikleri silmek istediğinize emin misiniz?',
+    'confirm_restore'                  => 'Seçili nitelik ya da nitelikleri kurtarmak istediğinize emin misiniz?',
+    'definition_cannot_be_deleted'     => 'Seçili nitelik ya da nitelikler silinemedi',
+    'definition_invalid_group' => 'Seçilen grup mevcut değil veya geçersiz.',
+    'definition_error_adding_updating' => 'Nitelik {0} eklenemedi ya da güncellenemedi. Lütfen hata kaydını gözden geçirin.',
+    'definition_flags'                 => 'Nitelik Görünebilirliği',
+    'definition_group'                 => 'Küme',
+    'definition_id'                    => 'Kimlik',
+    'definition_name'                  => 'Nitelik Ekle',
+    'definition_name_required'         => 'Nitelik adı girilmesi gerekli alandır',
+    'definition_one_or_multiple'       => 'Nitelik/Nitelikler',
+    'definition_successful_adding'     => 'Başarıyla öge eklediniz',
+    'definition_successful_deleted'    => 'Başarıyla sildiniz',
+    'definition_successful_updating'   => 'Başarılı biçimde niteliği güncellediniz',
+    'definition_type'                  => 'Nitelik Türü',
+    'definition_type_required'         => 'Nitelik türü alanı gereklidir',
+    'definition_unit'                  => 'Ölçü Birimi',
+    'definition_values'                => 'Nitelik Değerleri',
+    'new'                              => 'Yeni Nitelik',
+    'no_attributes_to_display'         => 'Gösterecek ürün yok',
+    'receipt_visibility'               => 'Fiş',
+    'show_in_items'                    => 'Ürünlerde göster',
+    'show_in_items_visibility'         => 'Ürünler',
+    'show_in_receipt'                  => 'Fişlerde göster',
+    'show_in_receivings'               => 'Alacaklarda göster',
+    'show_in_receivings_visibility'    => 'Alacaklar',
+    'show_in_sales'                    => 'Satışlarda göster',
+    'show_in_sales_visibility'         => 'Satışlar',
+    'show_in_search'                   => 'Aramada göster',
+    'show_in_search_visibility'        => 'Arama',
+    'update'                           => 'Nitelik Güncelle',
 ];
diff --git a/app/Language/tr/Bootstrap_tables.php b/app/Language/tr/Bootstrap_tables.php
index c39c0df3e..e33b48fc9 100644
--- a/app/Language/tr/Bootstrap_tables.php
+++ b/app/Language/tr/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "tüm",
-    "columns"              => "Sütun",
-    "hide_show_pagination" => "Sayfalandırmayı Gizle/Göster",
-    "loading"              => "Yükleniyor, lütfen bekleyin...",
-    "page_from_to"         => "{2} kayıttan {0} - {1} görüntüleniyor",
-    "refresh"              => "Yenile",
-    "rows_per_page"        => "Sayfa başına {0} satır",
-    "toggle"               => "Değiştir",
+    'all' => "tüm",
+    'columns' => "Sütun",
+    'hide_show_pagination' => "Sayfalandırmayı Gizle/Göster",
+    'loading' => "Yükleniyor, lütfen bekleyin",
+    'page_from_to' => "{2} kayıttan {0} - {1} görüntüleniyor",
+    'refresh' => "Yenile",
+    'rows_per_page' => "Sayfa başına {0} satır",
+    'toggle' => "Değiştir",
 ];
diff --git a/app/Language/tr/Config.php b/app/Language/tr/Config.php
index 89fdd7245..7619448c2 100644
--- a/app/Language/tr/Config.php
+++ b/app/Language/tr/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Şirket Adresi",
-    "address_required"                          => "Şirket Adresi zorunlu alandır.",
-    "all_set"                                   => "Tüm dosya izinleri düzgün belirlendi!",
-    "allow_duplicate_barcodes"                  => "Aynı barkod numarasının birden fazla kaydedilmesine izin ver",
-    "apostrophe"                                => "kesme imi",
-    "backup_button"                             => "Yedekle",
-    "backup_database"                           => "Veri Tabanını Yedekle",
-    "barcode"                                   => "Barkod",
-    "barcode_company"                           => "Şirket Adı",
-    "barcode_configuration"                     => "Barkod Yapılandırması",
-    "barcode_content"                           => "Barkod İçeriği",
-    "barcode_first_row"                         => "Satır 1",
-    "barcode_font"                              => "Yazı Tipi",
-    "barcode_formats"                           => "Giriş Biçimleri",
-    "barcode_generate_if_empty"                 => "Boş ise oluştur.",
-    "barcode_height"                            => "Yükseklik (pk)",
-    "barcode_id"                                => "Ürün Id/Adı",
-    "barcode_info"                              => "Barkod Yapılandırma Bilgisi",
-    "barcode_layout"                            => "Barkod Yerleşimi",
-    "barcode_name"                              => "Ad",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Satırdaki sayı",
-    "barcode_page_cellspacing"                  => "Sayfadaki hücre boşluğunu göster.",
-    "barcode_page_width"                        => "Sayfa genişliğini göster",
-    "barcode_price"                             => "Fiyat",
-    "barcode_second_row"                        => "Satır 2",
-    "barcode_third_row"                         => "Satır 3",
-    "barcode_tooltip"                           => "Uyarı: Bu özellik, yinelenen ögelerin içe aktarılmasına veya oluşturulmasına neden olabilir. Yinelenen barkod istemiyorsanız kullanmayın.",
-    "barcode_type"                              => "Barkod Türü",
-    "barcode_width"                             => "Genişlik (pk)",
-    "bottom"                                    => "Alt",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Nakit Ondalık",
-    "cash_decimals_tooltip"                     => "Nakit Ondalık ve Para Birimi Ondaması aynıysa, nakit yuvarlama yapılmayacaktır.",
-    "cash_rounding"                             => "Nakit Yuvarlama",
-    "category_dropdown"                         => "Kategoriyi açılır liste olarak göster",
-    "center"                                    => "Orta",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "virgül",
-    "company"                                   => "Şirket Adı",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Görüntüyü Değiştir",
-    "company_logo"                              => "Şirket Logosu",
-    "company_remove_image"                      => "Görüntüyü Kaldır",
-    "company_required"                          => "Şirket Adı zorunlu alandır",
-    "company_select_image"                      => "Görüntü Seç",
-    "company_website_url"                       => "Şirket web sitesi geçerli bir URL değil (http: // ...).",
-    "country_codes"                             => "Ülke Kodları",
-    "country_codes_tooltip"                     => "Nominatim adres araması için ülke kodlarının virgülle ayrılmış listesi.",
-    "currency_code"                             => "Para Birimi Kodu",
-    "currency_decimals"                         => "Para Birimi Ondalık",
-    "currency_symbol"                           => "Para Birimi",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Ödül",
-    "customer_reward_duplicate"                 => "Ödül eşsiz olmalı.",
-    "customer_reward_enable"                    => "Müşteri Ödüllerini etkinleştir",
-    "customer_reward_invalid_chars"             => "Ödül '_' içeremez",
-    "customer_reward_required"                  => "Ödül gerekli bir alandır",
-    "customer_sales_tax_support"                => "Müşteri Satış Vergisi Desteği",
-    "date_or_time_format"                       => "Tarih ve Saat Filtresi",
-    "datetimeformat"                            => "Tarih ve Zaman biçimi",
-    "decimal_point"                             => "Ondalık nokta",
-    "default_barcode_font_size_number"          => "Öntanımlı Barkod Yazı Tipi Boyutu bir sayı olmalıdır.",
-    "default_barcode_font_size_required"        => "Ön tanımlı barkod yazı tipi boyutu alanı gereklidir.",
-    "default_barcode_height_number"             => "Ön tanımlı barkod yüksekliği bir sayı olmalıdır.",
-    "default_barcode_height_required"           => "Ön tanımlı barkod yüksekliği zorunlu bir alandır.",
-    "default_barcode_num_in_row_number"         => "Satırdaki Öntanımlı Barkod Numarası bir sayı olmalıdır.",
-    "default_barcode_num_in_row_required"       => "Standart Barkod Numarası gerekli bir alandır.",
-    "default_barcode_page_cellspacing_number"   => "Standart Barkod Sayfa cellspacing bir sayı olmalıdır.",
-    "default_barcode_page_cellspacing_required" => "Standart Barkod Sayfa cellspacing gerekli bir alandır.",
-    "default_barcode_page_width_number"         => "Ön tanımlı barkod sayfası genişliği bir sayı olmalıdır.",
-    "default_barcode_page_width_required"       => "Ön tanımlı barkod sayfası genişliği zorunlu bir alandır.",
-    "default_barcode_width_number"              => "Ön tanımlı barkod genişliği bir sayı olmalıdır.",
-    "default_barcode_width_required"            => "Ön tanımlı barkod genişliği zorunlu bir alandır.",
-    "default_item_columns"                      => "Öntanımlı Görünür Öge Sütunları",
-    "default_origin_tax_code"                   => "Ön Tanımlı Vergi Kodu",
-    "default_receivings_discount"               => "Öntanımlı Alım İndirimi",
-    "default_receivings_discount_number"        => "Öntanımlı Alım İndirimi sayı olmalıdır.",
-    "default_receivings_discount_required"      => "Öntanımlı Alım İndirimi zorunlu bir alandır.",
-    "default_sales_discount"                    => "Ön Tanımlı Satış İskontosu %",
-    "default_sales_discount_number"             => "Ön tanımlı satış iskontosu bir sayı olmalıdır.",
-    "default_sales_discount_required"           => "Ön tanımlı satış iskontosu zorunlu bir alandır.",
-    "default_tax_category"                      => "Öntanımlı Vergi Kategorisi",
-    "default_tax_code"                          => "Öntanımlı Vergi Kodu",
-    "default_tax_jurisdiction"                  => "Öntanımlı Vergi Yargı Mercii",
-    "default_tax_name_number"                   => "Ön Tanımlı Vergi Adı bir dize olmalıdır.",
-    "default_tax_name_required"                 => "Ön tanımlı vergi adı zorunlu bir alandır.",
-    "default_tax_rate"                          => "Öntanımlı Vergi Oranı %",
-    "default_tax_rate_1"                        => "Vergi Oranı 1",
-    "default_tax_rate_2"                        => "Vergi Oranı 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Öntanımlı Vergi Oranı sayı olmalıdır.",
-    "default_tax_rate_required"                 => "Öntanımlı Vergi Oranı zorunlu alandır.",
-    "derive_sale_quantity"                      => "Otomatik Satış Sayısı oluşturmasına izin ver",
-    "derive_sale_quantity_tooltip"              => "Seçili ise sipariş edilen ürünler için arttırılan miktarda yeni ürün türü sağlanacak",
-    "dinner_table"                              => "Masa",
-    "dinner_table_duplicate"                    => "Aynı masa ikinci kez tanımlanamaz.",
-    "dinner_table_enable"                       => "Masalarını etkinleştir",
-    "dinner_table_invalid_chars"                => "Masa Adı '_' içeremez.",
-    "dinner_table_required"                     => "Masa gerekli bir alandır.",
-    "dot"                                       => "nokta",
-    "email"                                     => "E-posta",
-    "email_configuration"                       => "E-posta Yapılandırması",
-    "email_mailpath"                            => "Sendmail yolu",
-    "email_protocol"                            => "İletişim Kuralı",
-    "email_receipt_check_behaviour"             => "Fişi E-postala denetim kutusu",
-    "email_receipt_check_behaviour_always"      => "Her zaman işaretli",
-    "email_receipt_check_behaviour_last"        => "Son seçimimi hatırla",
-    "email_receipt_check_behaviour_never"       => "Her zaman işaretsiz",
-    "email_smtp_crypto"                         => "SMTP Şifreleme",
-    "email_smtp_host"                           => "SMTP Sunucusu",
-    "email_smtp_pass"                           => "SMTP Parola",
-    "email_smtp_port"                           => "SMTP Bağlantı Noktası",
-    "email_smtp_timeout"                        => "SMTP Zaman Aşım(lar)ı",
-    "email_smtp_user"                           => "SMTP Kullanıcı Adı",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Gizlilik uygula",
-    "enforce_privacy_tooltip"                   => "Müşteriler bilgilerini gizliliğini korunur",
-    "fax"                                       => "Faks",
-    "file_perm"                                 => "Dosya izinleriyle ilgili sorunlar var, lütfen giderin ve bu sayfayı yeniden yükleyin.",
-    "financial_year"                            => "Mali Yıl Başlat",
-    "financial_year_apr"                        => "1 Nisan",
-    "financial_year_aug"                        => "1 Ağustos",
-    "financial_year_dec"                        => "1 Aralık",
-    "financial_year_feb"                        => "1 Şubat",
-    "financial_year_jan"                        => "1 Ocak",
-    "financial_year_jul"                        => "1 Temmuz",
-    "financial_year_jun"                        => "1 Haziran",
-    "financial_year_mar"                        => "1 Mart",
-    "financial_year_may"                        => "1 Mayıs",
-    "financial_year_nov"                        => "1 Kasım",
-    "financial_year_oct"                        => "1 Ekim",
-    "financial_year_sep"                        => "1 Eylül",
-    "floating_labels"                           => "Yüzen Etiketler",
-    "gcaptcha_enable"                           => "Giriş Sayfası reCAPTCHA",
-    "gcaptcha_secret_key"                       => "ReCAPTCHA Gizli Anahtar",
-    "gcaptcha_secret_key_required"              => "ReCAPTCHA Gizli Anahtar zorunlu bir alandır",
-    "gcaptcha_site_key"                         => "ReCAPTCHA Site Anahtarı",
-    "gcaptcha_site_key_required"                => "ReCAPTCHA Site Anahtarı zorunlu bir alandır",
-    "gcaptcha_tooltip"                          => "Giriş sayfasını Google reCAPTCHA ile koruyun, API anahtar çifti için simgeye tıklayın.",
-    "general"                                   => "Genel",
-    "general_configuration"                     => "Genel Yapılandırma",
-    "giftcard_number"                           => "Hediye Kartı Numarası",
-    "giftcard_random"                           => "Rastgele Oluştur",
-    "giftcard_series"                           => "Seri Oluştur",
-    "image_allowed_file_types"                  => "İzin verilen dosya türleri",
-    "image_max_height_tooltip"                  => "Görüntü yüklemelerinde piksel (px) türünde izin verilen azami yükseklik.",
-    "image_max_size_tooltip"                    => "Görüntü yüklemelerinde kilobayt (kb) türünde izin verilen azami dosya boyutu.",
-    "image_max_width_tooltip"                   => "Görüntü yüklemelerinde piksel (px) türünde izin verilen azami genişlik.",
-    "image_restrictions"                        => "Görsel Yükleme Kısıtları",
-    "include_hsn"                               => "HSN Kodları Desteğini İçer",
-    "info"                                      => "Bilgi",
-    "info_configuration"                        => "Mağaza Bilgisi",
-    "input_groups"                              => "Girdi Kümeleri",
-    "integrations"                              => "Tümleşimler",
-    "integrations_configuration"                => "Üçüncü Taraf Tümleşimler",
-    "invoice"                                   => "Fatura",
-    "invoice_configuration"                     => "Fatura Yazdırma Ayarları",
-    "invoice_default_comments"                  => "Ön Tanımlı Fatura Yorumları",
-    "invoice_email_message"                     => "Fatura E-Posta Şablonu",
-    "invoice_enable"                            => "Faturalandırmayı Etkinleştir",
-    "invoice_printer"                           => "Fatura Yazıcısı",
-    "invoice_type"                              => "Fatura Türü",
-    "is_readable"                               => "okunabilirdir ama izinleri yanlış belirlenmiştir. Lütfen 640'a veya 660'a ayarlayın ve tazeleyin.",
-    "is_writable"                               => "yazılabilirdir ama izinleri yanlış belirlenmiştir. Lütfen 750'ye ayarlayın ve tazeleyin.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Uyarı: Bu işlev yalnızca FireFox jsPrintSetup eklentisi kuruluysa çalışacaktır. Yine de kaydedilsin mi?",
-    "language"                                  => "Dil",
-    "last_used_invoice_number"                  => "Son kullanılan Fatura Numarası",
-    "last_used_quote_number"                    => "Son kullanılan Teknif Numarası",
-    "last_used_work_order_number"               => "Son kullanılan İş Emri Numarası",
-    "left"                                      => "Sol",
-    "license"                                   => "Lisans",
-    "license_configuration"                     => "Lisans Beyanı",
-    "line_sequence"                             => "Satır Sırası",
-    "lines_per_page"                            => "Sayfa Başı Satır",
-    "lines_per_page_number"                     => "The lines per page must be a number.",
-    "lines_per_page_required"                   => "Sayfa başı satır zorunlu bir alandır.",
-    "locale"                                    => "Yerelleştirme",
-    "locale_configuration"                      => "Yerelleştirme Yapılandırması",
-    "locale_info"                               => "Yerelleştirme Yapılandırması Bilgisi",
-    "location"                                  => "Stok",
-    "location_configuration"                    => "Stok Konumları",
-    "location_info"                             => "Konum Yapılandırma Bilgisi",
-    "login_form"                                => "Giriş Form Biçimi",
-    "logout"                                    => "Çıkış yapmadan önce bir yedekleme yapmak ister misiniz? Yedeklemek için [Tamam] 'a veya oturumu kapatmak için [İptal]' e tıklayın.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "MailChimp API Anahtarı",
-    "mailchimp_configuration"                   => "MailChimp Yapılandırması",
-    "mailchimp_key_successfully"                => "API Anahtarı geçerlidir.",
-    "mailchimp_key_unsuccessfully"              => "API Anahtarı geçersiz.",
-    "mailchimp_lists"                           => "MailChimp Listeleri",
-    "mailchimp_tooltip"                         => "API Anahtarı için simgeye tıklayın.",
-    "message"                                   => "Mesaj",
-    "message_configuration"                     => "İleti Yapılandırması",
-    "msg_msg"                                   => "Kaydedilen Metin İletisi",
-    "msg_msg_placeholder"                       => "Eğer bir SMS şablonu kullanmak isterseniz iletinizi buraya kaydediniz. Ya da kutuyu boş bırakınız.",
-    "msg_pwd"                                   => "SMS-API Parolası",
-    "msg_pwd_required"                          => "SMS-API Parola zorunlu bir alandır",
-    "msg_src"                                   => "SMS-API Gönderici Kimliği",
-    "msg_src_required"                          => "SMS-API Gönderici Kimliği zorunlu bir alandır",
-    "msg_uid"                                   => "SMS-API Kullanıcı Adı",
-    "msg_uid_required"                          => "SMS-API Kullanıcı Adı zorunlu bir alandır",
-    "multi_pack_enabled"                        => "Öğe Başına Birden Çok Paket",
-    "no_risk"                                   => "Güvenlik/arıklık riski yok.",
-    "none"                                      => "Hiçbiri",
-    "notify_alignment"                          => "Bildirim Balonu Konumu",
-    "number_format"                             => "Numara Biçimi",
-    "number_locale"                             => "Yerelleştirme",
-    "number_locale_invalid"                     => "Girilen yerel ayar geçersiz. Geçerli bir yerel ayar bulmak için araç ipucundaki bağlantıyı denetleyin.",
-    "number_locale_required"                    => "Numara Yerel Ayarı gerekli bir alandır.",
-    "number_locale_tooltip"                     => "Bu bağlantı üzerinden yerel ayar kodunu bul.",
-    "os_timezone"                               => "OSPOS Saat Dilimi:",
-    "ospos_info"                                => "OSPOS Kurulum Bilgisi",
-    "payment_options_order"                     => "Ödeme Seçenekleri Sırası",
-    "perm_risk"                                 => "Doğru olmayan izinler bu yazılımı riske atar.",
-    "phone"                                     => "Şirket Telefonu",
-    "phone_required"                            => "Şirket Telefonu zorunlu alandır.",
-    "print_bottom_margin"                       => "Alt Kenar",
-    "print_bottom_margin_number"                => "Alt Kenar bir sayı olmalıdır.",
-    "print_bottom_margin_required"              => "Alt Kenar gerekli bir alandır.",
-    "print_delay_autoreturn"                    => "Otomatik Cevap için Satış Gecikmesi",
-    "print_delay_autoreturn_number"             => "Otomatik Cevap için Satış Gecikmesi gerekli bir alandır.",
-    "print_delay_autoreturn_required"           => "Otomatik Cevap için Satış Gecikmesi bir sayı olmalıdır..",
-    "print_footer"                              => "Sayfa Altbilgisini Yazdır",
-    "print_header"                              => "Sayfa Başlığını Yazdır",
-    "print_left_margin"                         => "Sol Kenar",
-    "print_left_margin_number"                  => "Sol Kenar bir sayı olmalıdır.",
-    "print_left_margin_required"                => "Sol Kenar gerekli bir alandır.",
-    "print_receipt_check_behaviour"             => "Fiş Yazdır denetim kutusu",
-    "print_receipt_check_behaviour_always"      => "Her zaman işaretle",
-    "print_receipt_check_behaviour_last"        => "Son seçimimi hatırla",
-    "print_receipt_check_behaviour_never"       => "Her zaman işaretleme",
-    "print_right_margin"                        => "Sağ Kenar",
-    "print_right_margin_number"                 => "Sağ Kenar bir sayı olmalıdır.",
-    "print_right_margin_required"               => "Sağ Kenar gerekli bir alandır.",
-    "print_silently"                            => "Yazdırma Diyaloğunu Göster",
-    "print_top_margin"                          => "Üst Kenar",
-    "print_top_margin_number"                   => "Üst Kenar bir sayı olmalıdır.",
-    "print_top_margin_required"                 => "Üst Kenar gerekli bir alandır.",
-    "quantity_decimals"                         => "Ondalık Basamak Sayısı",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Standart Teklif Yorumları",
-    "receipt"                                   => "Fiş",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Fiş Yazdırma Ayarları",
-    "receipt_default"                           => "Öntanımlı",
-    "receipt_font_size"                         => "Yazı Boyutu",
-    "receipt_font_size_number"                  => "Yazı Tipi Boyutu bir sayı olmalıdır.",
-    "receipt_font_size_required"                => "Yazı Tipi Boyutu gerekli bir alandır.",
-    "receipt_info"                              => "Fiş Yapılandırma Bilgisi",
-    "receipt_printer"                           => "Fiş Yazıcısı",
-    "receipt_short"                             => "Kısa",
-    "receipt_show_company_name"                 => "Şirket Adını Göster",
-    "receipt_show_description"                  => "Açıklamayı Göster",
-    "receipt_show_serialnumber"                 => "Seri Numarasını Göster",
-    "receipt_show_tax_ind"                      => "Vergi Belirtecini Göster",
-    "receipt_show_taxes"                        => "Vergileri Göster",
-    "receipt_show_total_discount"               => "Toplam İskontoyu Göster",
-    "receipt_template"                          => "Fiş Şablonu",
-    "receiving_calculate_average_price"         => "Ortalama Fiyatı Hesapla (Alım)",
-    "recv_invoice_format"                       => "Alım Fatura Biçimi",
-    "register_mode_default"                     => "Standart Kayıt Modu",
-    "report_an_issue"                           => "Sorun bildir",
-    "return_policy_required"                    => "İade Politikası zorunlu alandır.",
-    "reward"                                    => "Ödül",
-    "reward_configuration"                      => "Ödül Ayarları",
-    "right"                                     => "Sağ",
-    "sales_invoice_format"                      => "Satış Fatura Biçimi",
-    "sales_quote_format"                        => "Satış Teklif Biçimi",
-    "saved_successfully"                        => "Yapılandırma kaydedildi.",
-    "saved_unsuccessfully"                      => "Yapılandırma kaydedilemedi.",
-    "security_issue"                            => "Güvenlik Arıklığı Uyarısı",
-    "server_notice"                             => "Lütfen sorun bildirme için aşağıdaki bilgileri kullanın.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Ofis simgesini göster",
-    "statistics"                                => "İstatistik gönder",
-    "statistics_tooltip"                        => "Geliştirme ve özellik iyileştirme amaçları için istatistik gönder.",
-    "stock_location"                            => "Mağaza Yeri",
-    "stock_location_duplicate"                  => "Lütfen benzersiz bir yer adı kullan.",
-    "stock_location_invalid_chars"              => "Mağaza yeri adı '_' içeremez.",
-    "stock_location_required"                   => "Mağaza Yeri numarası zorunlu alandır.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Sütun 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Önerilerde Ara",
-    "suggestions_second_column"                 => "Sütun 2",
-    "suggestions_third_column"                  => "Sütun 3",
-    "system_conf"                               => "Kurulum ve Yapı",
-    "system_info"                               => "System Info",
-    "table"                                     => "Masa",
-    "table_configuration"                       => "Masa Ayarı",
-    "takings_printer"                           => "Fiş Yazıcısı",
-    "tax"                                       => "Vergi",
-    "tax_category"                              => "Vergi Kategorisi",
-    "tax_category_duplicate"                    => "Girilen vergi kategorisi zaten var.",
-    "tax_category_invalid_chars"                => "Girilen vergi kategorisi geçersiz.",
-    "tax_category_required"                     => "Vergi kategori gereklidir.",
-    "tax_category_used"                         => "Vergi kategorisi silinemez. Kullanılmaktadır.",
-    "tax_configuration"                         => "Vergi Ayarları",
-    "tax_decimals"                              => "Vergi Ondalık",
-    "tax_id"                                    => "Vergi numarası",
-    "tax_included"                              => "Vergi Dahil",
-    "theme"                                     => "Gövde",
-    "theme_preview"                             => "Temayı Ön İzle:",
-    "thousands_separator"                       => "Binlik Ayırıcı",
-    "timezone"                                  => "Saat Dilimi",
-    "timezone_error"                            => "OSPOS Saat Dilimi, yerel Saat Diliminizden farklı.",
-    "top"                                       => "Üst",
-    "use_destination_based_tax"                 => "Hedef Bazlı Vergiyi Kullan",
-    "user_timezone"                             => "Yerel Saat Dilimi:",
-    "website"                                   => "Web site",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "İş Emri Aktif",
-    "work_order_format"                         => "İş Emri Biçimi",
+    'address'                                   => 'Şirket Adresi',
+    'address_required'                          => 'Şirket Adresi zorunlu alandır.',
+    'all_set'                                   => 'Tüm dosya izinleri düzgün belirlendi!',
+    'allow_duplicate_barcodes'                  => 'Aynı barkod numarasının birden fazla kaydedilmesine izin ver',
+    'apostrophe'                                => 'kesme imi',
+    'backup_button'                             => 'Yedekle',
+    'backup_database'                           => 'Veri Tabanını Yedekle',
+    'barcode'                                   => 'Barkod',
+    'barcode_company'                           => 'Şirket Adı',
+    'barcode_configuration'                     => 'Barkod Yapılandırması',
+    'barcode_content'                           => 'Barkod İçeriği',
+    'barcode_first_row'                         => 'Satır 1',
+    'barcode_font'                              => 'Yazı Tipi',
+    'barcode_formats'                           => 'Giriş Biçimleri',
+    'barcode_generate_if_empty'                 => 'Boş ise oluştur.',
+    'barcode_height'                            => 'Yükseklik (pk)',
+    'barcode_id'                                => 'Ürün Id/Adı',
+    'barcode_info'                              => 'Barkod Yapılandırma Bilgisi',
+    'barcode_layout'                            => 'Barkod Yerleşimi',
+    'barcode_name'                              => 'Ad',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Satırdaki sayı',
+    'barcode_page_cellspacing'                  => 'Sayfadaki hücre boşluğunu göster.',
+    'barcode_page_width'                        => 'Sayfa genişliğini göster',
+    'barcode_price'                             => 'Fiyat',
+    'barcode_second_row'                        => 'Satır 2',
+    'barcode_third_row'                         => 'Satır 3',
+    'barcode_tooltip'                           => 'Uyarı: Bu özellik, yinelenen ögelerin içe aktarılmasına veya oluşturulmasına neden olabilir. Yinelenen barkod istemiyorsanız kullanmayın.',
+    'barcode_type'                              => 'Barkod Türü',
+    'barcode_width'                             => 'Genişlik (pk)',
+    'bottom'                                    => 'Alt',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Nakit Ondalık',
+    'cash_decimals_tooltip'                     => 'Nakit Ondalık ve Para Birimi Ondaması aynıysa, nakit yuvarlama yapılmayacaktır.',
+    'cash_rounding'                             => 'Nakit Yuvarlama',
+    'category_dropdown'                         => 'Kategoriyi açılır liste olarak göster',
+    'center'                                    => 'Orta',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'virgül',
+    'company'                                   => 'Şirket Adı',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Görüntüyü Değiştir',
+    'company_logo'                              => 'Şirket Logosu',
+    'company_remove_image'                      => 'Görüntüyü Kaldır',
+    'company_required'                          => 'Şirket Adı zorunlu alandır',
+    'company_select_image'                      => 'Görüntü Seç',
+    'company_website_url'                       => 'Şirket web sitesi geçerli bir URL değil (http: // ...).',
+    'country_codes'                             => 'Ülke Kodları',
+    'country_codes_tooltip'                     => 'Nominatim adres araması için ülke kodlarının virgülle ayrılmış listesi.',
+    'currency_code'                             => 'Para Birimi Kodu',
+    'currency_decimals'                         => 'Para Birimi Ondalık',
+    'currency_symbol'                           => 'Para Birimi',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Ödül',
+    'customer_reward_duplicate'                 => 'Ödül eşsiz olmalı.',
+    'customer_reward_enable'                    => 'Müşteri Ödüllerini etkinleştir',
+    'customer_reward_invalid_chars'             => "Ödül '_' içeremez",
+    'customer_reward_required'                  => 'Ödül gerekli bir alandır',
+    'customer_sales_tax_support'                => 'Müşteri Satış Vergisi Desteği',
+    'date_or_time_format'                       => 'Tarih ve Saat Filtresi',
+    'datetimeformat'                            => 'Tarih ve Zaman biçimi',
+    'decimal_point'                             => 'Ondalık nokta',
+    'default_barcode_font_size_number'          => 'Öntanımlı Barkod Yazı Tipi Boyutu bir sayı olmalıdır.',
+    'default_barcode_font_size_required'        => 'Ön tanımlı barkod yazı tipi boyutu alanı gereklidir.',
+    'default_barcode_height_number'             => 'Ön tanımlı barkod yüksekliği bir sayı olmalıdır.',
+    'default_barcode_height_required'           => 'Ön tanımlı barkod yüksekliği zorunlu bir alandır.',
+    'default_barcode_num_in_row_number'         => 'Satırdaki Öntanımlı Barkod Numarası bir sayı olmalıdır.',
+    'default_barcode_num_in_row_required'       => 'Standart Barkod Numarası gerekli bir alandır.',
+    'default_barcode_page_cellspacing_number'   => 'Standart Barkod Sayfa cellspacing bir sayı olmalıdır.',
+    'default_barcode_page_cellspacing_required' => 'Standart Barkod Sayfa cellspacing gerekli bir alandır.',
+    'default_barcode_page_width_number'         => 'Ön tanımlı barkod sayfası genişliği bir sayı olmalıdır.',
+    'default_barcode_page_width_required'       => 'Ön tanımlı barkod sayfası genişliği zorunlu bir alandır.',
+    'default_barcode_width_number'              => 'Ön tanımlı barkod genişliği bir sayı olmalıdır.',
+    'default_barcode_width_required'            => 'Ön tanımlı barkod genişliği zorunlu bir alandır.',
+    'default_item_columns'                      => 'Öntanımlı Görünür Öge Sütunları',
+    'default_origin_tax_code'                   => 'Ön Tanımlı Vergi Kodu',
+    'default_receivings_discount'               => 'Öntanımlı Alım İndirimi',
+    'default_receivings_discount_number'        => 'Öntanımlı Alım İndirimi sayı olmalıdır.',
+    'default_receivings_discount_required'      => 'Öntanımlı Alım İndirimi zorunlu bir alandır.',
+    'default_sales_discount'                    => 'Ön Tanımlı Satış İskontosu %',
+    'default_sales_discount_number'             => 'Ön tanımlı satış iskontosu bir sayı olmalıdır.',
+    'default_sales_discount_required'           => 'Ön tanımlı satış iskontosu zorunlu bir alandır.',
+    'default_tax_category'                      => 'Öntanımlı Vergi Kategorisi',
+    'default_tax_code'                          => 'Öntanımlı Vergi Kodu',
+    'default_tax_jurisdiction'                  => 'Öntanımlı Vergi Yargı Mercii',
+    'default_tax_name_number'                   => 'Ön Tanımlı Vergi Adı bir dize olmalıdır.',
+    'default_tax_name_required'                 => 'Ön tanımlı vergi adı zorunlu bir alandır.',
+    'default_tax_rate'                          => 'Öntanımlı Vergi Oranı %',
+    'default_tax_rate_1'                        => 'Vergi Oranı 1',
+    'default_tax_rate_2'                        => 'Vergi Oranı 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Öntanımlı Vergi Oranı sayı olmalıdır.',
+    'default_tax_rate_required'                 => 'Öntanımlı Vergi Oranı zorunlu alandır.',
+    'derive_sale_quantity'                      => 'Otomatik Satış Sayısı oluşturmasına izin ver',
+    'derive_sale_quantity_tooltip'              => 'Seçili ise sipariş edilen ürünler için arttırılan miktarda yeni ürün türü sağlanacak',
+    'dinner_table'                              => 'Masa',
+    'dinner_table_duplicate'                    => 'Aynı masa ikinci kez tanımlanamaz.',
+    'dinner_table_enable'                       => 'Masalarını etkinleştir',
+    'dinner_table_invalid_chars'                => "Masa Adı '_' içeremez.",
+    'dinner_table_required'                     => 'Masa gerekli bir alandır.',
+    'dot'                                       => 'nokta',
+    'email'                                     => 'E-posta',
+    'email_configuration'                       => 'E-posta Yapılandırması',
+    'email_mailpath'                            => 'Sendmail yolu',
+    'email_protocol'                            => 'İletişim Kuralı',
+    'email_receipt_check_behaviour'             => 'Fişi E-postala denetim kutusu',
+    'email_receipt_check_behaviour_always'      => 'Her zaman işaretli',
+    'email_receipt_check_behaviour_last'        => 'Son seçimimi hatırla',
+    'email_receipt_check_behaviour_never'       => 'Her zaman işaretsiz',
+    'email_smtp_crypto'                         => 'SMTP Şifreleme',
+    'email_smtp_host'                           => 'SMTP Sunucusu',
+    'email_smtp_pass'                           => 'SMTP Parola',
+    'email_smtp_port'                           => 'SMTP Bağlantı Noktası',
+    'email_smtp_timeout'                        => 'SMTP Zaman Aşım(lar)ı',
+    'email_smtp_user'                           => 'SMTP Kullanıcı Adı',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Gizlilik uygula',
+    'enforce_privacy_tooltip'                   => 'Müşteriler bilgilerini gizliliğini korunur',
+    'fax'                                       => 'Faks',
+    'file_perm'                                 => 'Dosya izinleriyle ilgili sorunlar var, lütfen giderin ve bu sayfayı yeniden yükleyin.',
+    'financial_year'                            => 'Mali Yıl Başlat',
+    'financial_year_apr'                        => '1 Nisan',
+    'financial_year_aug'                        => '1 Ağustos',
+    'financial_year_dec'                        => '1 Aralık',
+    'financial_year_feb'                        => '1 Şubat',
+    'financial_year_jan'                        => '1 Ocak',
+    'financial_year_jul'                        => '1 Temmuz',
+    'financial_year_jun'                        => '1 Haziran',
+    'financial_year_mar'                        => '1 Mart',
+    'financial_year_may'                        => '1 Mayıs',
+    'financial_year_nov'                        => '1 Kasım',
+    'financial_year_oct'                        => '1 Ekim',
+    'financial_year_sep'                        => '1 Eylül',
+    'floating_labels'                           => 'Yüzen Etiketler',
+    'gcaptcha_enable'                           => 'Giriş Sayfası reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'ReCAPTCHA Gizli Anahtar',
+    'gcaptcha_secret_key_required'              => 'ReCAPTCHA Gizli Anahtar zorunlu bir alandır',
+    'gcaptcha_site_key'                         => 'ReCAPTCHA Site Anahtarı',
+    'gcaptcha_site_key_required'                => 'ReCAPTCHA Site Anahtarı zorunlu bir alandır',
+    'gcaptcha_tooltip'                          => 'Giriş sayfasını Google reCAPTCHA ile koruyun, API anahtar çifti için simgeye tıklayın.',
+    'general'                                   => 'Genel',
+    'general_configuration'                     => 'Genel Yapılandırma',
+    'giftcard_number'                           => 'Hediye Kartı Numarası',
+    'giftcard_random'                           => 'Rastgele Oluştur',
+    'giftcard_series'                           => 'Seri Oluştur',
+    'image_allowed_file_types'                  => 'İzin verilen dosya türleri',
+    'image_max_height_tooltip'                  => 'Görüntü yüklemelerinde piksel (px) türünde izin verilen azami yükseklik.',
+    'image_max_size_tooltip'                    => 'Görüntü yüklemelerinde kilobayt (kb) türünde izin verilen azami dosya boyutu.',
+    'image_max_width_tooltip'                   => 'Görüntü yüklemelerinde piksel (px) türünde izin verilen azami genişlik.',
+    'image_restrictions'                        => 'Görsel Yükleme Kısıtları',
+    'include_hsn'                               => 'HSN Kodları Desteğini İçer',
+    'info'                                      => 'Bilgi',
+    'info_configuration'                        => 'Mağaza Bilgisi',
+    'input_groups'                              => 'Girdi Kümeleri',
+    'integrations'                              => 'Tümleşimler',
+    'integrations_configuration'                => 'Üçüncü Taraf Tümleşimler',
+    'invoice'                                   => 'Fatura',
+    'invoice_configuration'                     => 'Fatura Yazdırma Ayarları',
+    'invoice_default_comments'                  => 'Ön Tanımlı Fatura Yorumları',
+    'invoice_email_message'                     => 'Fatura E-Posta Şablonu',
+    'invoice_enable'                            => 'Faturalandırmayı Etkinleştir',
+    'invoice_printer'                           => 'Fatura Yazıcısı',
+    'invoice_type'                              => 'Fatura Türü',
+    'is_readable'                               => "okunabilirdir ama izinleri yanlış belirlenmiştir. Lütfen 640'a veya 660'a ayarlayın ve tazeleyin.",
+    'is_writable'                               => "yazılabilirdir ama izinleri yanlış belirlenmiştir. Lütfen 750'ye ayarlayın ve tazeleyin.",
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Uyarı: Bu işlev yalnızca FireFox jsPrintSetup eklentisi kuruluysa çalışacaktır. Yine de kaydedilsin mi?',
+    'language'                                  => 'Dil',
+    'last_used_invoice_number'                  => 'Son kullanılan Fatura Numarası',
+    'last_used_quote_number'                    => 'Son kullanılan Teknif Numarası',
+    'last_used_work_order_number'               => 'Son kullanılan İş Emri Numarası',
+    'left'                                      => 'Sol',
+    'license'                                   => 'Lisans',
+    'license_configuration'                     => 'Lisans Beyanı',
+    'line_sequence'                             => 'Satır Sırası',
+    'lines_per_page'                            => 'Sayfa Başı Satır',
+    'lines_per_page_number'                     => 'The lines per page must be a number.',
+    'lines_per_page_required'                   => 'Sayfa başı satır zorunlu bir alandır.',
+    'locale'                                    => 'Yerelleştirme',
+    'locale_configuration'                      => 'Yerelleştirme Yapılandırması',
+    'locale_info'                               => 'Yerelleştirme Yapılandırması Bilgisi',
+    'location'                                  => 'Stok',
+    'location_configuration'                    => 'Stok Konumları',
+    'location_info'                             => 'Konum Yapılandırma Bilgisi',
+    'login_form'                                => 'Giriş Form Biçimi',
+    'logout'                                    => "Çıkış yapmadan önce bir yedekleme yapmak ister misiniz? Yedeklemek için [Tamam] 'a veya oturumu kapatmak için [İptal]' e tıklayın.",
+    'mailchimp'                                 => 'MailChimp',
+    'mailchimp_api_key'                         => 'MailChimp API Anahtarı',
+    'mailchimp_configuration'                   => 'MailChimp Yapılandırması',
+    'mailchimp_key_successfully'                => 'API Anahtarı geçerlidir.',
+    'mailchimp_key_unsuccessfully'              => 'API Anahtarı geçersiz.',
+    'mailchimp_lists'                           => 'MailChimp Listeleri',
+    'mailchimp_tooltip'                         => 'API Anahtarı için simgeye tıklayın.',
+    'message'                                   => 'Mesaj',
+    'message_configuration'                     => 'İleti Yapılandırması',
+    'msg_msg'                                   => 'Kaydedilen Metin İletisi',
+    'msg_msg_placeholder'                       => 'Eğer bir SMS şablonu kullanmak isterseniz iletinizi buraya kaydediniz. Ya da kutuyu boş bırakınız.',
+    'msg_pwd'                                   => 'SMS-API Parolası',
+    'msg_src'                                   => 'SMS-API Gönderici Kimliği',
+    'msg_src_required'                          => 'SMS-API Gönderici Kimliği zorunlu bir alandır',
+    'msg_uid'                                   => 'SMS-API Kullanıcı Adı',
+    'msg_uid_required'                          => 'SMS-API Kullanıcı Adı zorunlu bir alandır',
+    'multi_pack_enabled'                        => 'Öğe Başına Birden Çok Paket',
+    'no_risk'                                   => 'Güvenlik/arıklık riski yok.',
+    'none'                                      => 'Hiçbiri',
+    'notify_alignment'                          => 'Bildirim Balonu Konumu',
+    'number_format'                             => 'Numara Biçimi',
+    'number_locale'                             => 'Yerelleştirme',
+    'number_locale_invalid'                     => 'Girilen yerel ayar geçersiz. Geçerli bir yerel ayar bulmak için araç ipucundaki bağlantıyı denetleyin.',
+    'number_locale_required'                    => 'Numara Yerel Ayarı gerekli bir alandır.',
+    'number_locale_tooltip'                     => 'Bu bağlantı üzerinden yerel ayar kodunu bul.',
+    'os_timezone'                               => 'OSPOS Saat Dilimi:',
+    'ospos_info'                                => 'OSPOS Kurulum Bilgisi',
+    'payment_options_order'                     => 'Ödeme Seçenekleri Sırası',
+    'payment_reference_code_length_limits'      => 'Ödeme Referans Kodu<br>Uzunluk Sınırları',
+    'payment_reference_code_length_max_label'   => 'Maks',
+    'payment_reference_code_length_min_label'   => 'Min',
+    'perm_risk'                                 => 'Doğru olmayan izinler bu yazılımı riske atar.',
+    'phone'                                     => 'Şirket Telefonu',
+    'phone_required'                            => 'Şirket Telefonu zorunlu alandır.',
+    'print_bottom_margin'                       => 'Alt Kenar',
+    'print_bottom_margin_number'                => 'Alt Kenar bir sayı olmalıdır.',
+    'print_bottom_margin_required'              => 'Alt Kenar gerekli bir alandır.',
+    'print_delay_autoreturn'                    => 'Otomatik Cevap için Satış Gecikmesi',
+    'print_delay_autoreturn_number'             => 'Otomatik Cevap için Satış Gecikmesi gerekli bir alandır.',
+    'print_delay_autoreturn_required'           => 'Otomatik Cevap için Satış Gecikmesi bir sayı olmalıdır..',
+    'print_footer'                              => 'Sayfa Altbilgisini Yazdır',
+    'print_header'                              => 'Sayfa Başlığını Yazdır',
+    'print_left_margin'                         => 'Sol Kenar',
+    'print_left_margin_number'                  => 'Sol Kenar bir sayı olmalıdır.',
+    'print_left_margin_required'                => 'Sol Kenar gerekli bir alandır.',
+    'print_receipt_check_behaviour'             => 'Fiş Yazdır denetim kutusu',
+    'print_receipt_check_behaviour_always'      => 'Her zaman işaretle',
+    'print_receipt_check_behaviour_last'        => 'Son seçimimi hatırla',
+    'print_receipt_check_behaviour_never'       => 'Her zaman işaretleme',
+    'print_right_margin'                        => 'Sağ Kenar',
+    'print_right_margin_number'                 => 'Sağ Kenar bir sayı olmalıdır.',
+    'print_right_margin_required'               => 'Sağ Kenar gerekli bir alandır.',
+    'print_silently'                            => 'Yazdırma Diyaloğunu Göster',
+    'print_top_margin'                          => 'Üst Kenar',
+    'print_top_margin_number'                   => 'Üst Kenar bir sayı olmalıdır.',
+    'print_top_margin_required'                 => 'Üst Kenar gerekli bir alandır.',
+    'quantity_decimals'                         => 'Ondalık Basamak Sayısı',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Standart Teklif Yorumları',
+    'receipt'                                   => 'Fiş',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Fiş Yazdırma Ayarları',
+    'receipt_default'                           => 'Öntanımlı',
+    'receipt_font_size'                         => 'Yazı Boyutu',
+    'receipt_font_size_number'                  => 'Yazı Tipi Boyutu bir sayı olmalıdır.',
+    'receipt_font_size_required'                => 'Yazı Tipi Boyutu gerekli bir alandır.',
+    'receipt_info'                              => 'Fiş Yapılandırma Bilgisi',
+    'receipt_printer'                           => 'Fiş Yazıcısı',
+    'receipt_short'                             => 'Kısa',
+    'receipt_show_company_name'                 => 'Şirket Adını Göster',
+    'receipt_show_description'                  => 'Açıklamayı Göster',
+    'receipt_show_serialnumber'                 => 'Seri Numarasını Göster',
+    'receipt_show_tax_ind'                      => 'Vergi Belirtecini Göster',
+    'receipt_show_taxes'                        => 'Vergileri Göster',
+    'receipt_show_total_discount'               => 'Toplam İskontoyu Göster',
+    'receipt_template'                          => 'Fiş Şablonu',
+    'receiving_calculate_average_price'         => 'Ortalama Fiyatı Hesapla (Alım)',
+    'recv_invoice_format'                       => 'Alım Fatura Biçimi',
+    'register_mode_default'                     => 'Standart Kayıt Modu',
+    'report_an_issue'                           => 'Sorun bildir',
+    'return_policy_required'                    => 'İade Politikası zorunlu alandır.',
+    'reward'                                    => 'Ödül',
+    'reward_configuration'                      => 'Ödül Ayarları',
+    'right'                                     => 'Sağ',
+    'sales_invoice_format'                      => 'Satış Fatura Biçimi',
+    'sales_quote_format'                        => 'Satış Teklif Biçimi',
+    'mailpath_invalid'                          => 'Geçersiz sendmail yolu. Yalnızca harflere, rakamlara, tirelere, alt çizgilere, eğik çizgilere, ters eğik çizgilere, iki noktalara, boşluklara ve noktalara izin verilir.',
+    'saved_successfully'                        => 'Yapılandırma kaydedildi.',
+    'saved_unsuccessfully'                      => 'Yapılandırma kaydedilemedi.',
+    'security_issue'                            => 'Güvenlik Arıklığı Uyarısı',
+    'server_notice'                             => 'Lütfen sorun bildirme için aşağıdaki bilgileri kullanın.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Ofis simgesini göster',
+    'statistics'                                => 'İstatistik gönder',
+    'statistics_tooltip'                        => 'Geliştirme ve özellik iyileştirme amaçları için istatistik gönder.',
+    'stock_location'                            => 'Mağaza Yeri',
+    'stock_location_duplicate'                  => 'Lütfen benzersiz bir yer adı kullan.',
+    'stock_location_invalid_chars'              => "Mağaza yeri adı '_' içeremez.",
+    'stock_location_required'                   => 'Mağaza Yeri numarası zorunlu alandır.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Sütun 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Önerilerde Ara',
+    'suggestions_second_column'                 => 'Sütun 2',
+    'suggestions_third_column'                  => 'Sütun 3',
+    'system_conf'                               => 'Kurulum ve Yapı',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Masa',
+    'table_configuration'                       => 'Masa Ayarı',
+    'takings_printer'                           => 'Fiş Yazıcısı',
+    'tax'                                       => 'Vergi',
+    'tax_category'                              => 'Vergi Kategorisi',
+    'tax_category_duplicate'                    => 'Girilen vergi kategorisi zaten var.',
+    'tax_category_invalid_chars'                => 'Girilen vergi kategorisi geçersiz.',
+    'tax_category_required'                     => 'Vergi kategori gereklidir.',
+    'tax_category_used'                         => 'Vergi kategorisi silinemez. Kullanılmaktadır.',
+    'tax_configuration'                         => 'Vergi Ayarları',
+    'tax_decimals'                              => 'Vergi Ondalık',
+    'tax_id'                                    => 'Vergi numarası',
+    'tax_included'                              => 'Vergi Dahil',
+    'theme'                                     => 'Gövde',
+    'theme_preview'                             => 'Temayı Ön İzle:',
+    'thousands_separator'                       => 'Binlik Ayırıcı',
+    'timezone'                                  => 'Saat Dilimi',
+    'timezone_error'                            => 'OSPOS Saat Dilimi, yerel Saat Diliminizden farklı.',
+    'top'                                       => 'Üst',
+    'use_destination_based_tax'                 => 'Hedef Bazlı Vergiyi Kullan',
+    'user_timezone'                             => 'Yerel Saat Dilimi:',
+    'website'                                   => 'Web site',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'İş Emri Aktif',
+    'work_order_format'                         => 'İş Emri Biçimi',
 ];
diff --git a/app/Language/tr/Employees.php b/app/Language/tr/Employees.php
index 9b9451f9e..1b007f4f7 100644
--- a/app/Language/tr/Employees.php
+++ b/app/Language/tr/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Personel Temel Bilgileri",
-    "cannot_be_deleted"            => "Seçili personel silinemedi, personellerin satışları var yada kendinizi silmeye çalışıyorsunuz.",
-    "change_employee"              => "",
-    "change_password"              => "Parolayı Değiştir",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Seçili personelleri silmek istediğinize emin misiniz?",
-    "confirm_restore"              => "Seçili çalışanları geri yüklemek istediğinizden emin misiniz?",
-    "current_password"             => "Var Olan Parola",
-    "current_password_invalid"     => "Var Olan Parola geçersiz.",
-    "employee"                     => "Personel",
-    "error_adding_updating"        => "Personel ekleme/güncelleme hatası.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Admin güncellenemez.",
-    "error_updating_demo_admin"    => "Admin silinemez.",
-    "language"                     => "Dil",
-    "login_info"                   => "Personel Giriş Bilgileri",
-    "manager"                      => "",
-    "new"                          => "Yeni Personel",
-    "none_selected"                => "Silmek için çalışan seçmediniz.",
-    "one_or_multiple"              => "personel",
-    "password"                     => "Parola",
-    "password_minlength"           => "Parola en az 8 karakter olmalıdır.",
-    "password_must_match"          => "Parolalar uyuşmuyor.",
-    "password_not_must_match"      => "Geçerli parola ve yeni parola benzersiz olmalıdır.",
-    "password_required"            => "Parola zorunludur.",
-    "permission_desc"              => "Modül yetkisi vermek için kutuları işaretleyin.",
-    "permission_info"              => "Personel İzin ve Yetkileri",
-    "repeat_password"              => "Parola Yeniden",
-    "subpermission_required"       => "Her bir birim için en az bir izin ekle.",
-    "successful_adding"            => "Personel eklendi.",
-    "successful_change_password"   => "Parola değişikliği başarılı.",
-    "successful_deleted"           => "Silme başarılı",
-    "successful_updating"          => "Personel güncellendi",
-    "system_language"              => "Sistem dili",
-    "unsuccessful_change_password" => "Parola değişikliği başarısız oldu.",
-    "update"                       => "Personeli Güncelle",
-    "username"                     => "Kullandı Adı",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Kullanıcı Adı en az 5 karakter olmalıdır.",
-    "username_required"            => "Kullanıcı Adı zorunlu alandır.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Personel Temel Bilgileri',
+    'cannot_be_deleted'                      => 'Seçili personel silinemedi, personellerin satışları var ya da kendinizi silmeye çalışıyorsunuz.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Parolayı Değiştir',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Seçili personelleri silmek istediğinize emin misiniz?',
+    'confirm_restore'                        => 'Seçili çalışanları geri yüklemek istediğinizden emin misiniz?',
+    'current_password'                       => 'Var Olan Parola',
+    'current_password_invalid'               => 'Var Olan Parola geçersiz.',
+    'employee'                               => 'Personel',
+    'error_adding_updating'                  => 'Personel ekleme/güncelleme hatası.',
+    'error_cannot_remove_own_minimum_grant'  => 'Kendi asgari modül erişim izinlerinizi kaldıramazsınız.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Admin silinemez.',
+    'error_grant_change_disallowed'          => 'İzin değişiklikleri bu demoda devre dışı bırakılmıştır.',
+    'error_password_change_disallowed'       => 'Şifre değişiklikleri bu demoda devre dışı bırakılmıştır.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Admin güncellenemez.',
+    'language'                               => 'Dil',
+    'login_info'                             => 'Personel Giriş Bilgileri',
+    'manager'                                => '',
+    'new'                                    => 'Yeni Personel',
+    'none_selected'                          => 'Silmek için çalışan seçmediniz.',
+    'one_or_multiple'                        => 'personel',
+    'password'                               => 'Parola',
+    'password_minlength'                     => 'Parola en az 8 karakter olmalıdır.',
+    'password_must_match'                    => 'Parolalar uyuşmuyor.',
+    'password_not_must_match'                => 'Geçerli parola ve yeni parola benzersiz olmalıdır.',
+    'password_required'                      => 'Parola zorunludur.',
+    'permission_desc'                        => 'Modül yetkisi vermek için kutuları işaretleyin.',
+    'permission_info'                        => 'Personel İzin ve Yetkileri',
+    'repeat_password'                        => 'Parola Yeniden',
+    'subpermission_required'                 => 'Her bir birim için en az bir izin ekle.',
+    'successful_adding'                      => 'Personel eklendi.',
+    'successful_change_password'             => 'Parola değişikliği başarılı.',
+    'successful_deleted'                     => 'Silme başarılı',
+    'successful_updating'                    => 'Personel güncellendi',
+    'system_language'                        => 'Sistem dili',
+    'unsuccessful_change_password'           => 'Parola değişikliği başarısız oldu.',
+    'update'                                 => 'Personeli Güncelle',
+    'username'                               => 'Kullanıcı Adı',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Kullanıcı Adı en az 5 karakter olmalıdır.',
+    'username_required'                      => 'Kullanıcı Adı zorunlu alandır.',
 ];
diff --git a/app/Language/tr/Error.php b/app/Language/tr/Error.php
index 28d640714..a4b7ba20b 100644
--- a/app/Language/tr/Error.php
+++ b/app/Language/tr/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Bu modüle erişim yetkiniz yok",
-    "unknown"              => "bilinmeyen",
+    'no_permission_module'           => 'Bu modüle erişim yetkiniz yok',
+    'unable_to_create_env_file'      => 'throttle.key değerini ayarlamak için {filePath} oluşturulamadı',
+    'unable_to_lock_file'            => '{filePath} kilitlenemedi: {reason}',
+    'unable_to_open_lock_file'       => '{filePath} açılamadı: {reason}',
+    'unable_to_persist_throttle_key' => 'throttle.key, {filePath} içine kaydedilemedi',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'throttle.key değerini ayarlamak için {filePath} okunamadı',
+    'unknown'                        => 'bilinmeyen',
 ];
diff --git a/app/Language/tr/Items.php b/app/Language/tr/Items.php
index fd40d83b3..30512be9e 100644
--- a/app/Language/tr/Items.php
+++ b/app/Language/tr/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Eklenen/Çıkarılan Adet.",
-    "allow_alt_description"              => "Dip Nota izin ver",
-    "amount_entry"                       => "Miktar Girişi",
-    "bulk_edit"                          => "Toplu Düzenleme",
-    "buy_price_required"                 => "Alış Fiyatı zorunlu alandır.",
-    "cannot_be_deleted"                  => "Seçili ürünler silinemedi, bazı ürünlerin satışı var.",
-    "cannot_find_item"                   => "Ürün bilgisi bulunamadı.",
-    "categories"                         => "",
-    "category"                           => "Kategori",
-    "category_new"                       => "",
-    "category_required"                  => "Kategori zorunlu alandır.",
-    "change_all_to_allow_alt_desc"       => "Tümünde dip nota izin ver.",
-    "change_all_to_not_allow_allow_desc" => "Tümünde dip nota izin verme.",
-    "change_all_to_serialized"           => "Tümünü seri numaralı yap",
-    "change_all_to_unserialized"         => "Tümünü seri numarasız yap",
-    "change_image"                       => "Resmi değiştir",
-    "confirm_bulk_edit"                  => "Seçili tüm ürünleri düzenlemek istediğinize emin misiniz?",
-    "confirm_bulk_edit_wipe_taxes"       => "Tüm ürün vergi bilgileri değiştirilecektir.",
-    "confirm_delete"                     => "Seçili ürünleri silmek istediğinize emin misiniz?",
-    "confirm_restore"                    => "Seçili ürünleri onarmak istediğinize emin misiniz?",
-    "cost_price"                         => "Toptan Fiyatı",
-    "cost_price_number"                  => "Toptan Fiyatı sayı olmalıdır.",
-    "cost_price_required"                => "Toptan Fiyatı zorunlu alandır.",
-    "count"                              => "Stoğu Güncelle",
-    "csv_import_failed"                  => "CSV aktarım hatası",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Yüklenen dosya herhangi bir veri içermiyor veya hatalı formatta.",
-    "csv_import_partially_failed"        => "Bazı ürünler aktarılamadı. Aktarılamayanlar listesi.",
-    "csv_import_success"                 => "Ürün aktarımı başarılı.",
-    "current_quantity"                   => "Var Olan Adet",
-    "default_pack_name"                  => "Her biri",
-    "description"                        => "Tanım",
-    "details_count"                      => "Stok Hareket Detayları",
-    "do_nothing"                         => "Değiştirme",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Seçili TÜM ürünler için düzenlemek istediğiniz alanları girin.",
-    "edit_multiple_items"                => "Çoklu Ürün Güncelleme",
-    "empty_upc_items"                    => "Ürün kodu olmayan ürünler",
-    "error_adding_updating"              => "Ürün ekleme/düzenleme hatası",
-    "error_updating_multiple"            => "Ürün düzenleme hatası",
-    "generate_barcodes"                  => "Barkod Üret",
-    "hsn_code"                           => "Harmonize Sistem İsimlendirme",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "CSV dosyasından ürün aktar",
-    "info_provided_by"                   => "Bilgi sağlayan",
-    "inventory"                          => "Stok",
-    "inventory_CSV_import_quantity"      => "CSV'den Alınan Miktar",
-    "inventory_comments"                 => "Yorumlar",
-    "inventory_data_tracking"            => "Stok Takibi",
-    "inventory_date"                     => "Tarih",
-    "inventory_employee"                 => "Personel",
-    "inventory_in_out_quantity"          => "Giriş/Çıkış Sayısı",
-    "inventory_remarks"                  => "Notlar",
-    "is_deleted"                         => "Silinmiş",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Seri Numaralı Ürün",
-    "item"                               => "Ürün",
-    "item_id"                            => "",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "Ürün numarası veritabanında zaten var.",
-    "kit"                                => "Set",
-    "location"                           => "Yer",
-    "low_inventory_items"                => "Stokta Olmayan Ürünler",
-    "low_sell_item"                      => "Düşük satış fiyatı",
-    "manually_editing_of_quantity"       => "Elle adet düzeltme",
-    "markup"                             => "",
-    "name"                               => "Ürün Adı",
-    "name_required"                      => "Ürün Adı zorunlu alandır.",
-    "new"                                => "Yeni Ürün",
-    "no_description_items"               => "Tanımı olmayan ürünler",
-    "no_items_to_display"                => "Gösterecek Ürün Yok.",
-    "none"                               => "Hiçbiri",
-    "none_selected"                      => "Düzenlemek için ürün seçmediniz",
-    "nonstock"                           => "Stokta Olmayan",
-    "number_information"                 => "Ürün No",
-    "number_required"                    => "Barkod alanı zorunludur.",
-    "one_or_multiple"                    => "ürün",
-    "pack_name"                          => "Paket adı",
-    "qty_per_pack"                       => "Paket başına miktar",
-    "quantity"                           => "Adet",
-    "quantity_number"                    => "Adet sayı olmalıdır.",
-    "quantity_required"                  => "Adet zorunlu alandır.",
-    "receiving_quantity"                 => "Alım miktarı",
-    "remove_image"                       => "Resmi kaldır",
-    "reorder_level"                      => "Düşük Stok",
-    "reorder_level_number"               => "Düşük stok sayı olmalıdır.",
-    "reorder_level_required"             => "Düşük Stok zorunlu alandır.",
-    "retrive_item_info"                  => "Ürün Bilgisi Getir",
-    "sales_tax_1"                        => "Satış Vergisi",
-    "sales_tax_2"                        => "Satış Vergisi 2",
-    "search_attributes"                  => "Özellikleri Ara",
-    "select_image"                       => "Resim Seç",
-    "serialized_items"                   => "Seri Numaralı Ürünler",
-    "standard"                           => "Standart",
-    "stock"                              => "Stok",
-    "stock_location"                     => "Mağaza Yeri",
-    "stock_type"                         => "Stok Tipi",
-    "successful_adding"                  => "Ürün ekleme başarılı",
-    "successful_bulk_edit"               => "Seçili ürün düzenlendi",
-    "successful_deleted"                 => "Silme başarılı",
-    "successful_updating"                => "Ürün düzenleme başarılı",
-    "supplier"                           => "Sağlayıcı",
-    "tax_1"                              => "Vergi 1",
-    "tax_2"                              => "Vergi 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Vergi Kategorisi",
-    "tax_percent"                        => "Vergi Yüzdesi",
-    "tax_percent_number"                 => "Vergi Yüzdesi ondalıklı sayı olmalı",
-    "tax_percent_required"               => "Vergi Oranı zorunlu alandır.",
-    "tax_percents"                       => "Vergi Yüzdesi",
-    "temp"                               => "Geçici",
-    "type"                               => "Ürün Tipi",
-    "unit_price"                         => "Satış Fiyatı",
-    "unit_price_number"                  => "Fiyat sayı olmalıdır (9.90).",
-    "unit_price_required"                => "Satış Fiyatı zorunlu alandır.",
-    "upc_database"                       => "UPC Veritabanı",
-    "update"                             => "Ürün Güncelle",
-    "use_inventory_menu"                 => "Stok Menüsünü Kullan",
+    'add_minus'                          => 'Eklenen/Çıkarılan Adet.',
+    'allow_alt_description'              => 'Dip Nota izin ver',
+    'amount_entry'                       => 'Miktar Girişi',
+    'bulk_edit'                          => 'Toplu Düzenleme',
+    'buy_price_required'                 => 'Alış Fiyatı zorunlu alandır.',
+    'cannot_be_deleted'                  => 'Seçili ürünler silinemedi, bazı ürünlerin satışı var.',
+    'cannot_find_item'                   => 'Ürün bilgisi bulunamadı.',
+    'categories'                         => '',
+    'category'                           => 'Kategori',
+    'category_new'                       => '',
+    'category_required'                  => 'Kategori zorunlu alandır.',
+    'change_all_to_allow_alt_desc'       => 'Tümünde dip nota izin ver.',
+    'change_all_to_not_allow_allow_desc' => 'Tümünde dip nota izin verme.',
+    'change_all_to_serialized'           => 'Tümünü seri numaralı yap',
+    'change_all_to_unserialized'         => 'Tümünü seri numarasız yap',
+    'change_image'                       => 'Resmi değiştir',
+    'confirm_bulk_edit'                  => 'Seçili tüm ürünleri düzenlemek istediğinize emin misiniz?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Tüm ürün vergi bilgileri değiştirilecektir.',
+    'confirm_delete'                     => 'Seçili ürünleri silmek istediğinize emin misiniz?',
+    'confirm_restore'                    => 'Seçili ürünleri onarmak istediğinize emin misiniz?',
+    'cost_price'                         => 'Toptan Fiyatı',
+    'cost_price_number'                  => 'Toptan Fiyatı sayı olmalıdır.',
+    'cost_price_required'                => 'Toptan Fiyatı zorunlu alandır.',
+    'count'                              => 'Stoğu Güncelle',
+    'csv_import_failed'                  => 'CSV aktarım hatası',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Yüklenen dosya herhangi bir veri içermiyor veya hatalı formatta.',
+    'csv_import_partially_failed'        => 'Bazı ürünler aktarılamadı. Aktarılamayanlar listesi.',
+    'csv_import_success'                 => 'Ürün aktarımı başarılı.',
+    'current_quantity'                   => 'Var Olan Adet',
+    'default_pack_name'                  => 'Her biri',
+    'description'                        => 'Tanım',
+    'details_count'                      => 'Stok Hareket Detayları',
+    'do_nothing'                         => 'Değiştirme',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Seçili TÜM ürünler için düzenlemek istediğiniz alanları girin.',
+    'edit_multiple_items'                => 'Çoklu Ürün Güncelleme',
+    'empty_upc_items'                    => 'Ürün kodu olmayan ürünler',
+    'error_adding_updating'              => 'Ürün ekleme/düzenleme hatası',
+    'error_updating_multiple'            => 'Ürün düzenleme hatası',
+    'generate_barcodes'                  => 'Barkod Üret',
+    'hsn_code'                           => 'Harmonize Sistem İsimlendirme',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'CSV dosyasından ürün aktar',
+    'info_provided_by'                   => 'Bilgi sağlayan',
+    'inventory'                          => 'Stok',
+    'inventory_CSV_import_quantity'      => 'CSV\'den Alınan Miktar',
+    'inventory_comments'                 => 'Yorumlar',
+    'inventory_data_tracking'            => 'Stok Takibi',
+    'inventory_date'                     => 'Tarih',
+    'inventory_employee'                 => 'Personel',
+    'inventory_in_out_quantity'          => 'Giriş/Çıkış Sayısı',
+    'inventory_remarks'                  => 'Notlar',
+    'is_deleted'                         => 'Silinmiş',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Seri Numaralı Ürün',
+    'item'                               => 'Ürün',
+    'item_id'                            => '',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'Ürün numarası veritabanında zaten var.',
+    'item_number_invalid'                => 'Ürün numarası izin verilmeyen karakterler içeriyor.',
+    'kit'                                => 'Set',
+    'location'                           => 'Yer',
+    'low_inventory_items'                => 'Stokta Olmayan Ürünler',
+    'low_sell_item'                      => 'Düşük satış fiyatı',
+    'manually_editing_of_quantity'       => 'Elle adet düzeltme',
+    'markup'                             => '',
+    'name'                               => 'Ürün Adı',
+    'name_required'                      => 'Ürün Adı zorunlu alandır.',
+    'new'                                => 'Yeni Ürün',
+    'no_description_items'               => 'Tanımı olmayan ürünler',
+    'no_items_to_display'                => 'Gösterecek Ürün Yok.',
+    'none'                               => 'Hiçbiri',
+    'none_selected'                      => 'Düzenlemek için ürün seçmediniz',
+    'nonstock'                           => 'Stokta Olmayan',
+    'number_information'                 => 'Ürün No',
+    'number_required'                    => 'Barkod alanı zorunludur.',
+    'one_or_multiple'                    => 'ürün',
+    'pack_name'                          => 'Paket adı',
+    'qty_per_pack'                       => 'Paket başına miktar',
+    'quantity'                           => 'Adet',
+    'quantity_number'                    => 'Adet sayı olmalıdır.',
+    'quantity_required'                  => 'Adet zorunlu alandır.',
+    'receiving_quantity'                 => 'Alım miktarı',
+    'remove_image'                       => 'Resmi kaldır',
+    'reorder_level'                      => 'Düşük Stok',
+    'reorder_level_number'               => 'Düşük stok sayı olmalıdır.',
+    'reorder_level_required'             => 'Düşük Stok zorunlu alandır.',
+    'retrive_item_info'                  => 'Ürün Bilgisi Getir',
+    'sales_tax_1'                        => 'Satış Vergisi',
+    'sales_tax_2'                        => 'Satış Vergisi 2',
+    'search_attributes'                  => 'Özellikleri Ara',
+    'select_image'                       => 'Resim Seç',
+    'serialized_items'                   => 'Seri Numaralı Ürünler',
+    'standard'                           => 'Standart',
+    'stock'                              => 'Stok',
+    'stock_location'                     => 'Mağaza Yeri',
+    'stock_type'                         => 'Stok Tipi',
+    'successful_adding'                  => 'Ürün ekleme başarılı',
+    'successful_bulk_edit'               => 'Seçili ürün düzenlendi',
+    'successful_deleted'                 => 'Silme başarılı',
+    'successful_updating'                => 'Ürün düzenleme başarılı',
+    'supplier'                           => 'Sağlayıcı',
+    'tax_1'                              => 'Vergi 1',
+    'tax_2'                              => 'Vergi 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Vergi Kategorisi',
+    'tax_name_invalid'                   => 'Vergi adı izin verilmeyen karakterler içeriyor.',
+    'tax_percent'                        => 'Vergi Yüzdesi',
+    'tax_percent_number'                 => 'Vergi Yüzdesi ondalıklı sayı olmalı',
+    'tax_percent_required'               => 'Vergi Oranı zorunlu alandır.',
+    'tax_percents'                       => 'Vergi Yüzdesi',
+    'temp'                               => 'Geçici',
+    'type'                               => 'Ürün Tipi',
+    'unit_price'                         => 'Satış Fiyatı',
+    'unit_price_number'                  => 'Fiyat sayı olmalıdır (9.90).',
+    'unit_price_required'                => 'Satış Fiyatı zorunlu alandır.',
+    'upc_database'                       => 'UPC Veritabanı',
+    'update'                             => 'Ürün Güncelle',
+    'use_inventory_menu'                 => 'Stok Menüsünü Kullan',
 ];
diff --git a/app/Language/tr/Login.php b/app/Language/tr/Login.php
index 1174251db..f1119523b 100644
--- a/app/Language/tr/Login.php
+++ b/app/Language/tr/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Ben robot değilim.",
-    "go"                            => "Giriş",
-    "invalid_gcaptcha"              => "Robot olmadığınızı kanıtlayınız.",
-    "invalid_installation"          => "Yükleme doğru değil, php.ini dosyanızı gözden geçirin.",
-    "invalid_username_and_password" => "Geçersiz kullanıcı adı ve/veya parola.",
-    "login"                         => "Giriş",
-    "logout"                        => "Çıkış",
-    "migration_needed"              => "Girişten sonra {0} veri tabanına göç başlayacak.",
-    "password"                      => "Parola",
-    "required_username"             => "",
-    "username"                      => "Kullanıcı Adı",
-    "welcome"                       => "{0}'e Hoş Geldiniz!",
+    "gcaptcha"                            => "Ben robot değilim.",
+    "go"                                  => "Giriş",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Robot olmadığınızı kanıtlayınız.",
+    "invalid_installation"                => "Yükleme doğru değil, php.ini dosyanızı gözden geçirin.",
+    "invalid_username_and_password"       => "Geçersiz kullanıcı adı ve/veya parola.",
+    "login"                               => "Giriş",
+    "logout"                              => "Çıkış",
+    "migrating_database"                  => "Veritabanı Taşınıyor",
+    "migration_auth_message"              => "Veritabanı göçünün {0} versiyonuna yetkilendirilmesi için yönetici kimlik bilgileri gereklidir. Devam etmek için giriş yapın.",
+    "migration_complete"                  => "Veritabanı başarıyla başlatıldı!",
+    "migration_complete_login"            => "Artık giriş yapabilirsiniz.",
+    "migration_complete_migrate"          => "Veritabanı başarıyla taşındı!",
+    "migration_complete_redirect"         => "Göç tamamlandı. Girişe yönlendiriliyor...",
+    "migration_error_connection"          => "Bağlantı hatası. Lütfen tekrar deneyin.",
+    "migration_failed"                    => "Göç başarısız oldu",
+    "migration_initializing"              => "Veritabanı başlatılıyor",
+    "migration_needed"                    => "Girişten sonra {0} veri tabanına göç başlayacak.",
+    "migration_required"                  => "Veritabanı Göçü Gerekli",
+    "migration_running"                   => "Veritabanı göçleri çalışıyor...",
+    "password"                            => "Parola",
+    "required_username"                   => "Kullanıcı adı alanı gereklidir.",
+    'too_many_attempts'                   => 'Çok fazla deneme yapıldı. Lütfen bir süre bekleyip tekrar deneyin.',
+    "username"                            => "Kullanıcı Adı",
+    "welcome"                             => "{0}'e Hoş Geldiniz!"
 ];
diff --git a/app/Language/tr/Reports.php b/app/Language/tr/Reports.php
index 9af63204b..71b4d73e8 100644
--- a/app/Language/tr/Reports.php
+++ b/app/Language/tr/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Vergi oranı",
     "taxes"                                   => "Vergiler",
     "taxes_summary_report"                    => "Vergi Özet Raporu",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Toplam",
     "total_inventory_value"                   => "Toplam Stok Değeri",
     "total_low_sell_quantity"                 => "Toplam Düşük Satış Miktarı",
diff --git a/app/Language/tr/Sales.php b/app/Language/tr/Sales.php
index 8901fa02f..0077b17db 100644
--- a/app/Language/tr/Sales.php
+++ b/app/Language/tr/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Var Olan Puanlar",
-    "rewards_package"                  => "Ödüller",
-    "rewards_remaining_balance"        => "Ödül Puanı kalan değeri ",
-    "account_number"                   => "Hesap Numarası",
-    "add_payment"                      => "Ödeme Ekle",
-    "amount_due"                       => "Kalan Ödeme",
-    "amount_tendered"                  => "Ödenen Tutar",
-    "authorized_signature"             => "Yetkili İmza",
-    "cancel_sale"                      => "İptal Et",
-    "cash"                             => "Nakit",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Nakit Düzeltimi",
-    "cash_deposit"                     => "Nakit Depozito",
-    "cash_filter"                      => "Nakit",
-    "change_due"                       => "Para Üstü",
-    "change_price"                     => "Satış Fiyatını Değiştir",
-    "check"                            => "Çek",
-    "check_balance"                    => "Çek bakiyesi",
-    "check_filter"                     => "Çek",
-    "close"                            => "",
-    "comment"                          => "Yorum",
-    "comments"                         => "Yorumlar",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Satışı Tamamla",
-    "confirm_cancel_sale"              => "Bu satışı temizlemek istiyor musunuz? Tüm ürünler temizlenecek.",
-    "confirm_delete"                   => "Seçilen satışları silmek istediğinize emin misiniz?",
-    "confirm_restore"                  => "Seçilen satışları kurtarmak istediğinize emin misiniz?",
-    "credit"                           => "Kredi Kartı",
-    "credit_deposit"                   => "Kredi Depozito",
-    "credit_filter"                    => "Kredi Kartı",
-    "current_table"                    => "",
-    "customer"                         => "Müşteri",
-    "customer_address"                 => "Customer Address",
-    "customer_discount"                => "İskonto",
-    "customer_email"                   => "E-Posta",
-    "customer_location"                => "Konum",
-    "customer_mailchimp_status"        => "MailChimp durumu",
-    "customer_optional"                => "(Geciken Ödemeler İçin Gerekli)",
-    "customer_required"                => "(Gerekli)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Satış Tarihi",
-    "date_range"                       => "Tarih Aralığı",
-    "date_required"                    => "Doğru tarih girilmelidir.",
-    "date_type"                        => "Tarih alanı zorunludur.",
-    "debit"                            => "Banka Kartı",
-    "debit_filter"                     => "",
-    "delete"                           => "Silmeye izin ver",
-    "delete_confirmation"              => "Satışı silmek istediğinize emin misiniz, bu işlem geri alınamaz.",
-    "delete_entire_sale"               => "Satışın tamamını sil",
-    "delete_successful"                => "Satışı sildiniz.",
-    "delete_unsuccessful"              => "Satışı silemediniz.",
-    "description_abbrv"                => "Tanım.",
-    "discard"                          => "İptal et",
-    "discard_quote"                    => "",
-    "discount"                         => "İsko",
-    "discount_included"                => "% İskonto",
-    "discount_short"                   => "%",
-    "due"                              => "Vade",
-    "due_filter"                       => "Vade",
-    "edit"                             => "Düzenle",
-    "edit_item"                        => "Düzenle",
-    "edit_sale"                        => "Satışı Düzenle",
-    "email_receipt"                    => "Fişi E-Postala",
-    "employee"                         => "Personel",
-    "entry"                            => "Girdi",
-    "error_editing_item"               => "Ürün düzenleme hatası",
-    "find_or_scan_item"                => "Ürün Bul/Oku",
-    "find_or_scan_item_or_receipt"     => "Ürün yada Fiş Bul/Oku",
-    "giftcard"                         => "Hediye Çeki",
-    "giftcard_balance"                 => "Hediye Çeki Bakiyesi",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Hediye Çeki No",
-    "group_by_category"                => "Kategoriye göre gurupla",
-    "group_by_type"                    => "Tipe göre gurupla",
-    "hsn"                              => "HSN",
-    "id"                               => "Satış No",
-    "include_prices"                   => "Fiyat Dahil?",
-    "invoice"                          => "Fatura",
-    "invoice_confirm"                  => "Bu fatura şuna gönderilecek",
-    "invoice_enable"                   => "Fatura Numarası",
-    "invoice_filter"                   => "Faturalar",
-    "invoice_no_email"                 => "Bu müşterinin geçerli e-posta adresi yok.",
-    "invoice_number"                   => "Fatura #",
-    "invoice_number_duplicate"         => "Fatura Numarası {0} eşsiz olmalıdır.",
-    "invoice_sent"                     => "Fatura gönderildi:",
-    "invoice_total"                    => "Fatura Toplamı",
-    "invoice_type_custom_invoice"      => "Özel Fatura (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Özel Vergi Fatura (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Fatura (invoice.php)",
-    "invoice_type_tax_invoice"         => "Vergi Faturası (tax_invoice.php)",
-    "invoice_unsent"                   => "Fatura gönderilemedi",
-    "invoice_update"                   => "Yeniden Say",
-    "item_insufficient_of_stock"       => "Ürün Stoğu Yetersiz.",
-    "item_name"                        => "Ürün Adı",
-    "item_number"                      => "Ürün No",
-    "item_out_of_stock"                => "Ürün stokta yok.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Kayıt Kipi",
-    "must_enter_numeric"               => "Ödenen Tutar sayı olmalıdır.",
-    "must_enter_numeric_giftcard"      => "Hediye Çeki Numarası sayı olmalıdır.",
-    "new_customer"                     => "Yeni Müşteri",
-    "new_item"                         => "Yeni Ürün",
-    "no_description"                   => "Açıklama yok",
-    "no_filter"                        => "Tümü",
-    "no_items_in_cart"                 => "Sepette ürün yok.",
-    "no_sales_to_display"              => "Gösterilecek satış yok.",
-    "none_selected"                    => "Silinecek satış seçmediniz.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "Bu işlem için yetkisiz.",
-    "one_or_multiple"                  => "Satış(lar)",
-    "payment"                          => "Ödeme Türü",
-    "payment_amount"                   => "Tutar",
-    "payment_not_cover_total"          => "Ödemeler toplam tutarı karşılamıyor.",
-    "payment_type"                     => "Tür",
-    "payments"                         => "",
-    "payments_total"                   => "Ödemeler Toplamı",
-    "price"                            => "Fiyat",
-    "print_after_sale"                 => "Satıştan sonra yazdır",
-    "quantity"                         => "Adet",
-    "quantity_less_than_reorder_level" => "Dikkat: İlgili Öge için İstenen Stok, Yeniden Düzenleme Düzeyinin altında.",
-    "quantity_less_than_zero"          => "Dikkat: İstenen Stok yetersiz. Satışı sürdürebilirsiniz ama stoğunuzu gözden geçirin.",
-    "quantity_of_items"                => "{0} Ögenin Miktarı",
-    "quote"                            => "Teklif",
-    "quote_number"                     => "Teklif Sayısı",
-    "quote_number_duplicate"           => "Teklif Sayısı eşsiz olmalıdır.",
-    "quote_sent"                       => "Teklif şuna gönderildi:",
-    "quote_unsent"                     => "Teklif şuna gönderilemedi:",
-    "receipt"                          => "Satış Fişi",
-    "receipt_no_email"                 => "Müşteriye ait geçerli e-posta adresi yok.",
-    "receipt_number"                   => "Fiş #",
-    "receipt_sent"                     => "Fiş gönderildi:",
-    "receipt_unsent"                   => "Fiş gönderilemedi:",
-    "refund"                           => "Geri Ödeme Türü",
-    "register"                         => "Satış Kaydı",
-    "remove_customer"                  => "Müşteriyi Kaldır",
-    "remove_discount"                  => "",
-    "return"                           => "İade",
-    "rewards"                          => "Ödül Puanları",
-    "rewards_balance"                  => "Ödül Puanı Bakiyesi",
-    "sale"                             => "Satış",
-    "sale_by_invoice"                  => "Faturalı Satış",
-    "sale_for_customer"                => "Müşteri:",
-    "sale_time"                        => "Saat",
-    "sales_tax"                        => "Satış Vergisi",
-    "sales_total"                      => "",
-    "select_customer"                  => "Müşteri Seç",
-    "send_invoice"                     => "Fatura Gönder",
-    "send_quote"                       => "Teklif Gönder",
-    "send_receipt"                     => "Fiş Gönder",
-    "send_work_order"                  => "İş Emri Gönder",
-    "serial"                           => "Seri",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Faturayı Göster",
-    "show_receipt"                     => "Fişi Göster",
-    "start_typing_customer_name"       => "Müşteri ayrıntılarını yazın...",
-    "start_typing_item_name"           => "Ürün adı yazın veya barkod taratın...",
-    "stock"                            => "Stok",
-    "stock_location"                   => "Stok yeri",
-    "sub_total"                        => "Ara Toplam",
-    "successfully_deleted"             => "Satış başarıyla silindi",
-    "successfully_restored"            => "Satış başarıyla kurtarıldı",
-    "successfully_suspended_sale"      => "Satış başarıyla askıya alındı.",
-    "successfully_updated"             => "Satış başarıyla güncellendi.",
-    "suspend_sale"                     => "Askıya Al",
-    "suspended_doc_id"                 => "Belge",
-    "suspended_sale_id"                => "Kimlik",
-    "suspended_sales"                  => "Askıdaki Satışlar",
-    "table"                            => "Masa",
-    "takings"                          => "Günlük Satış",
-    "tax"                              => "Vergi",
-    "tax_id"                           => "Vergi Numarası",
-    "tax_invoice"                      => "Vergi Faturası",
-    "tax_percent"                      => "Vergi %",
-    "taxed_ind"                        => "V",
-    "total"                            => "Toplam",
-    "total_tax_exclusive"              => "Vergi hariç",
-    "transaction_failed"               => "Satış işlemi hatası.",
-    "unable_to_add_item"               => "Ürün satışa eklenemedi",
-    "unsuccessfully_deleted"           => "Satış silinemedi.",
-    "unsuccessfully_restored"          => "Satış onarılamadı.",
-    "unsuccessfully_suspended_sale"    => "Satış askıya alınamadı.",
-    "unsuccessfully_updated"           => "Satış düzenlenemedi.",
-    "unsuspend"                        => "Satışa Al",
-    "unsuspend_and_delete"             => "Eylem",
-    "update"                           => "Güncelle",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "İş Emri",
-    "work_order_number"                => "İş Emri Numarası",
-    "work_order_number_duplicate"      => "İş Emri Numarası diğerinden farklı olmalı.",
-    "work_order_sent"                  => "İş Emri gönderildi:",
-    "work_order_unsent"                => "İş Emri gönderilemedi:",
+    'account_number'                    => 'Hesap Numarası',
+    'add_payment'                       => 'Ödeme Ekle',
+    'amount_due'                        => 'Kalan Ödeme',
+    'amount_due_not_covered'            => 'Ödemeler, ödenmesi gereken tutarı karşılamıyor.',
+    'amount_tendered'                   => 'Ödenen Tutar',
+    'authorized_signature'              => 'Yetkili İmza',
+    'cancel_sale'                       => 'İptal Et',
+    'cash'                              => 'Nakit',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Nakit Düzeltimi',
+    'cash_deposit'                      => 'Nakit Depozito',
+    'cash_filter'                       => 'Nakit',
+    'change_due'                        => 'Para Üstü',
+    'change_price'                      => 'Satış Fiyatını Değiştir',
+    'check'                             => 'Çek',
+    'check_balance'                     => 'Çek bakiyesi',
+    'check_filter'                      => 'Çek',
+    'close'                             => '',
+    'comment'                           => 'Yorum',
+    'comments'                          => 'Yorumlar',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Satışı Tamamla',
+    'confirm_cancel_sale'               => 'Bu satışı temizlemek istiyor musunuz? Tüm ürünler temizlenecek.',
+    'confirm_delete'                    => 'Seçilen satışları silmek istediğinize emin misiniz?',
+    'confirm_restore'                   => 'Seçilen satışları kurtarmak istediğinize emin misiniz?',
+    'credit'                            => 'Kredi Kartı',
+    'credit_deposit'                    => 'Kredi Depozito',
+    'credit_filter'                     => 'Kredi Kartı',
+    'current_table'                     => '',
+    'customer'                          => 'Müşteri',
+    'customer_address'                  => 'Customer Address',
+    'customer_discount'                 => 'İskonto',
+    'customer_email'                    => 'E-Posta',
+    'customer_location'                 => 'Konum',
+    'customer_mailchimp_status'         => 'MailChimp durumu',
+    'customer_optional'                 => '(Geciken Ödemeler İçin Gerekli)',
+    'customer_required'                 => '(Gerekli)',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Var Olan Puanlar',
+    'daily_sales'                       => '',
+    'date'                              => 'Satış Tarihi',
+    'date_range'                        => 'Tarih Aralığı',
+    'date_required'                     => 'Doğru tarih girilmelidir.',
+    'date_type'                         => 'Tarih alanı zorunludur.',
+    'debit'                             => 'Banka Kartı',
+    'debit_filter'                      => '',
+    'delete'                            => 'Silmeye izin ver',
+    'delete_confirmation'               => 'Satışı silmek istediğinize emin misiniz, bu işlem geri alınamaz.',
+    'delete_entire_sale'                => 'Satışın tamamını sil',
+    'delete_successful'                 => 'Satışı sildiniz.',
+    'delete_unsuccessful'               => 'Satışı silemediniz.',
+    'description_abbrv'                 => 'Tanım.',
+    'discard'                           => 'İptal et',
+    'discard_quote'                     => '',
+    'discount'                          => 'İsko',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% İskonto',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Vade',
+    'due_filter'                        => 'Vade',
+    'edit'                              => 'Düzenle',
+    'edit_item'                         => 'Düzenle',
+    'edit_sale'                         => 'Satışı Düzenle',
+    'email_receipt'                     => 'Fişi E-Postala',
+    'employee'                          => 'Personel',
+    'entry'                             => 'Girdi',
+    'error_editing_item'                => 'Ürün düzenleme hatası',
+    'find_or_scan_item'                 => 'Ürün Bul/Oku',
+    'find_or_scan_item_or_receipt'      => 'Ürün yada Fiş Bul/Oku',
+    'giftcard'                          => 'Hediye Çeki',
+    'giftcard_balance'                  => 'Hediye Çeki Bakiyesi',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Hediye Çeki No',
+    'group_by_category'                 => 'Kategoriye göre gurupla',
+    'group_by_type'                     => 'Tipe göre gurupla',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Satış No',
+    'include_prices'                    => 'Fiyat Dahil?',
+    'insufficient_giftcard_balance'     => 'Bu ödeme için yetersiz hediye kartı bakiyesi.',
+    'insufficient_reward_points'        => 'Bu ödeme için yetersiz ödül puanları.',
+    'invoice'                           => 'Fatura',
+    'invoice_confirm'                   => 'Bu fatura şuna gönderilecek',
+    'invoice_enable'                    => 'Fatura Numarası',
+    'invoice_filter'                    => 'Faturalar',
+    'invoice_no_email'                  => 'Bu müşterinin geçerli e-posta adresi yok.',
+    'invoice_number'                    => 'Fatura #',
+    'invoice_number_duplicate'          => 'Fatura Numarası {0} eşsiz olmalıdır.',
+    'invoice_sent'                      => 'Fatura gönderildi:',
+    'invoice_total'                     => 'Fatura Toplamı',
+    'invoice_type_custom_invoice'       => 'Özel Fatura (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Özel Vergi Fatura (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Fatura (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Vergi Faturası (tax_invoice.php)',
+    'invoice_unsent'                    => 'Fatura gönderilemedi',
+    'invoice_update'                    => 'Yeniden Say',
+    'item_insufficient_of_stock'        => 'Ürün Stoğu Yetersiz.',
+    'item_name'                         => 'Ürün Adı',
+    'item_number'                       => 'Ürün No',
+    'item_out_of_stock'                 => 'Ürün stokta yok.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Kayıt Kipi',
+    'must_enter_numeric'                => 'Ödenen Tutar sayı olmalıdır.',
+    'must_enter_numeric_giftcard'       => 'Hediye Çeki Numarası sayı olmalıdır.',
+    'must_enter_reference_code'         => 'Referans/Alım numarası girilmelidir.',
+    'negative_amount_tendered'          => 'Ödenen tutar negatif olamaz.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Yeni Müşteri',
+    'new_item'                          => 'Yeni Ürün',
+    'no_description'                    => 'Açıklama yok',
+    'no_filter'                         => 'Tümü',
+    'no_items_in_cart'                  => 'Sepette ürün yok.',
+    'no_sales_to_display'               => 'Gösterilecek satış yok.',
+    'none_selected'                     => 'Silinecek satış seçmediniz.',
+    'nontaxed_ind'                      => ' ',
+    'not_authorized'                    => 'Bu işlem için yetkisiz.',
+    'one_or_multiple'                   => 'Satış(lar)',
+    'payment'                           => 'Ödeme Türü',
+    'payment_amount'                    => 'Tutar',
+    'payment_not_cover_total'           => 'Ödemeler toplam tutarı karşılamıyor.',
+    'payment_type'                      => 'Tür',
+    'payments'                          => '',
+    'payments_total'                    => 'Ödemeler Toplamı',
+    'price'                             => 'Fiyat',
+    'print_after_sale'                  => 'Satıştan sonra yazdır',
+    'quantity'                          => 'Adet',
+    'quantity_less_than_reorder_level'  => 'Dikkat: İlgili Öge için İstenen Stok, Yeniden Düzenleme Düzeyinin altında.',
+    'quantity_less_than_zero'           => 'Dikkat: İstenen Stok yetersiz. Satışı sürdürebilirsiniz ama stoğunuzu gözden geçirin.',
+    'quantity_of_items'                 => '{0} Ögenin Miktarı',
+    'quote'                             => 'Teklif',
+    'quote_number'                      => 'Teklif Sayısı',
+    'quote_number_duplicate'            => 'Teklif Sayısı eşsiz olmalıdır.',
+    'quote_sent'                        => 'Teklif şuna gönderildi:',
+    'quote_unsent'                      => 'Teklif şuna gönderilemedi:',
+    'receipt'                           => 'Satış Fişi',
+    'receipt_no_email'                  => 'Müşteriye ait geçerli e-posta adresi yok.',
+    'receipt_number'                    => 'Fiş #',
+    'receipt_sent'                      => 'Fiş gönderildi:',
+    'receipt_unsent'                    => 'Fiş gönderilemedi:',
+    'reference_code'                    => 'Ödeme Referans Kodu',
+    'reference_code_invalid_characters' => 'Referans kodu yalnızca harf ve rakam içermelidir.',
+    'reference_code_length_error'       => 'Referans kodunun uzunluğu geçersiz.',
+    'refund'                            => 'Geri Ödeme Türü',
+    'register'                          => 'Satış Kaydı',
+    'remove_customer'                   => 'Müşteriyi Kaldır',
+    'remove_discount'                   => '',
+    'return'                            => 'İade',
+    'rewards'                           => 'Ödül Puanları',
+    'rewards_balance'                   => 'Ödül Puanı Bakiyesi',
+    'rewards_package'                   => 'Ödüller',
+    'rewards_remaining_balance'         => 'Ödül Puanı kalan değeri ',
+    'sale'                              => 'Satış',
+    'sale_by_invoice'                   => 'Faturalı Satış',
+    'sale_for_customer'                 => 'Müşteri:',
+    'sale_time'                         => 'Saat',
+    'sales_tax'                         => 'Satış Vergisi',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Müşteri Seç',
+    'send_invoice'                      => 'Fatura Gönder',
+    'send_quote'                        => 'Teklif Gönder',
+    'send_receipt'                      => 'Fiş Gönder',
+    'send_work_order'                   => 'İş Emri Gönder',
+    'serial'                            => 'Seri',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Faturayı Göster',
+    'show_receipt'                      => 'Fişi Göster',
+    'start_typing_customer_name'        => 'Müşteri ayrıntılarını yazın...',
+    'start_typing_item_name'            => 'Ürün adı yazın veya barkod taratın...',
+    'stock'                             => 'Stok',
+    'stock_location'                    => 'Stok yeri',
+    'sub_total'                         => 'Ara Toplam',
+    'successfully_deleted'              => 'Satış başarıyla silindi',
+    'successfully_restored'             => 'Satış başarıyla kurtarıldı',
+    'successfully_suspended_sale'       => 'Satış başarıyla askıya alındı.',
+    'successfully_updated'              => 'Satış başarıyla güncellendi.',
+    'suspend_sale'                      => 'Askıya Al',
+    'suspended_doc_id'                  => 'Belge',
+    'suspended_sale_id'                 => 'Kimlik',
+    'suspended_sales'                   => 'Askıdaki Satışlar',
+    'table'                             => 'Masa',
+    'takings'                           => 'Günlük Satış',
+    'tax'                               => 'Vergi',
+    'tax_id'                            => 'Vergi Numarası',
+    'tax_invoice'                       => 'Vergi Faturası',
+    'tax_percent'                       => 'Vergi %',
+    'taxed_ind'                         => 'V',
+    'total'                             => 'Toplam',
+    'total_tax_exclusive'               => 'Vergi hariç',
+    'transaction_failed'                => 'Satış işlemi hatası.',
+    'unable_to_add_item'                => 'Ürün satışa eklenemedi',
+    'unsuccessfully_deleted'            => 'Satış silinemedi.',
+    'unsuccessfully_restored'           => 'Satış onarılamadı.',
+    'unsuccessfully_suspended_sale'     => 'Satış askıya alınamadı.',
+    'unsuccessfully_updated'            => 'Satış düzenlenemedi.',
+    'unsuspend'                         => 'Satışa Al',
+    'unsuspend_and_delete'              => 'Eylem',
+    'update'                            => 'Güncelle',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'İş Emri',
+    'work_order_number'                 => 'İş Emri Numarası',
+    'work_order_number_duplicate'       => 'İş Emri Numarası diğerinden farklı olmalı.',
+    'work_order_sent'                   => 'İş Emri gönderildi:',
+    'work_order_unsent'                 => 'İş Emri gönderilemedi:',
 ];
diff --git a/app/Language/uk/Attributes.php b/app/Language/uk/Attributes.php
index ea0eb4947..d0fa55e8a 100644
--- a/app/Language/uk/Attributes.php
+++ b/app/Language/uk/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Значення атрибуту не може містити ':' або'|'",
-    "confirm_delete"                   => "Ви впевнені, що хочете видалити вибрані атрибут(и)?",
-    "confirm_restore"                  => "Ви впевнені, що хочете відновити вибрані атрибут(и)?",
-    "definition_cannot_be_deleted"     => "Не вдалося видалити вибрані атрибут(и)",
-    "definition_error_adding_updating" => "Атрибут {0} не може бути доданий або оновлений. Будь ласка, перевірте журнал помилок.",
-    "definition_flags"                 => "Видимість атрибуту",
-    "definition_group"                 => "Група",
-    "definition_id"                    => "№",
-    "definition_name"                  => "Додати атрибут",
-    "definition_name_required"         => "Назва атрибуту - обов'язкове поле",
-    "definition_one_or_multiple"       => "Атрибут(и)",
-    "definition_successful_adding"     => "Ви успішно додали товар",
-    "definition_successful_deleted"    => "Успішно видалено",
-    "definition_successful_updating"   => "Оновлено успішно",
-    "definition_type"                  => "Тип атрибуту",
-    "definition_type_required"         => "Назва атрибуту - обов'язкове поле",
-    "definition_unit"                  => "Одиниця виміру",
-    "definition_values"                => "Значення атрибуту",
-    "new"                              => "Новий атрибут",
-    "no_attributes_to_display"         => "Немає об'єктів для відображення",
-    "receipt_visibility"               => "Чек",
-    "show_in_items"                    => "Показати в товарах",
-    "show_in_items_visibility"         => "Товари",
-    "show_in_receipt"                  => "Показати в квитанції",
-    "show_in_receivings"               => "Показати в надходженнях",
-    "show_in_receivings_visibility"    => "Надходження",
-    "show_in_sales"                    => "Показати в продажах",
-    "show_in_sales_visibility"         => "Продажі",
-    "update"                           => "Оновити атрибут",
+    'attribute_value_invalid_chars'    => 'Значення атрибуту не може містити \':\' або\'|\'',
+    'confirm_delete'                   => 'Ви впевнені, що хочете видалити вибрані атрибут(и)?',
+    'confirm_restore'                  => 'Ви впевнені, що хочете відновити вибрані атрибут(и)?',
+    'definition_cannot_be_deleted'     => 'Не вдалося видалити вибрані атрибут(и)',
+    'definition_invalid_group' => 'Вибрана група не існує або недійсна.',
+    'definition_error_adding_updating' => 'Атрибут {0} не може бути доданий або оновлений. Будь ласка, перевірте журнал помилок.',
+    'definition_flags'                 => 'Видимість атрибуту',
+    'definition_group'                 => 'Група',
+    'definition_id'                    => '№',
+    'definition_name'                  => 'Додати атрибут',
+    'definition_name_required'         => 'Назва атрибуту - обов\'язкове поле',
+    'definition_one_or_multiple'       => 'Атрибут(и)',
+    'definition_successful_adding'     => 'Ви успішно додали товар',
+    'definition_successful_deleted'    => 'Успішно видалено',
+    'definition_successful_updating'   => 'Оновлено успішно',
+    'definition_type'                  => 'Тип атрибуту',
+    'definition_type_required'         => 'Назва атрибуту - обов\'язкове поле',
+    'definition_unit'                  => 'Одиниця виміру',
+    'definition_values'                => 'Значення атрибуту',
+    'new'                              => 'Новий атрибут',
+    'no_attributes_to_display'         => 'Немає об\'єктів для відображення',
+    'receipt_visibility'               => 'Чек',
+    'show_in_items'                    => 'Показати в товарах',
+    'show_in_items_visibility'         => 'Товари',
+    'show_in_receipt'                  => 'Показати в квитанції',
+    'show_in_receivings'               => 'Показати в надходженнях',
+    'show_in_receivings_visibility'    => 'Надходження',
+    'show_in_sales'                    => 'Показати в продажах',
+    'show_in_sales_visibility'         => 'Продажі',
+    'show_in_search'                   => 'Показати в пошуку',
+    'show_in_search_visibility'        => 'Пошук',
+    'update'                           => 'Оновити атрибут',
 ];
diff --git a/app/Language/uk/Bootstrap_tables.php b/app/Language/uk/Bootstrap_tables.php
index 0f047d847..2c19197d3 100644
--- a/app/Language/uk/Bootstrap_tables.php
+++ b/app/Language/uk/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Все",
-    "columns"              => "Розділи",
-    "hide_show_pagination" => "Приховати/Показати нумерацію",
-    "loading"              => "Завантаження, будь ласка, зачекайте...",
-    "page_from_to"         => "Відображено {0} до {1} з {2} рядків",
-    "refresh"              => "Оновити",
-    "rows_per_page"        => "{0} рядків на сторінці",
-    "toggle"               => "Переключити",
+    'all' => "Все",
+    'columns' => "Розділи",
+    'hide_show_pagination' => "Приховати/Показати нумерацію",
+    'loading' => "Завантаження, будь ласка, зачекайте",
+    'page_from_to' => "Відображено {0} до {1} з {2} рядків",
+    'refresh' => "Оновити",
+    'rows_per_page' => "{0} рядків на сторінці",
+    'toggle' => "Переключити",
 ];
diff --git a/app/Language/uk/Config.php b/app/Language/uk/Config.php
index 3965c1db1..6a46a8bd0 100644
--- a/app/Language/uk/Config.php
+++ b/app/Language/uk/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Адреса організації",
-    "address_required"                          => "Адреса організації - обов'язкове поле.",
-    "all_set"                                   => "Усі дозволи на файли встановлені правильно!",
-    "allow_duplicate_barcodes"                  => "Дозволити дублювати штрих-коди",
-    "apostrophe"                                => "Апостроф",
-    "backup_button"                             => "Резервна копія",
-    "backup_database"                           => "База даних резервного копіювання",
-    "barcode"                                   => "Штрих-код",
-    "barcode_company"                           => "Назва організації",
-    "barcode_configuration"                     => "Конфігурація штрих-коду",
-    "barcode_content"                           => "Вміст штрих-коду",
-    "barcode_first_row"                         => "Рядок 1",
-    "barcode_font"                              => "Шрифт",
-    "barcode_formats"                           => "Формат введення",
-    "barcode_generate_if_empty"                 => "Створити, якщо порожньо.",
-    "barcode_height"                            => "Висота (px)",
-    "barcode_id"                                => "Ідентифікатор елементу/Ім'я",
-    "barcode_info"                              => "Інформація про конфігурацію штрих-коду",
-    "barcode_layout"                            => "Макет штрих-коду",
-    "barcode_name"                              => "Ім'я",
-    "barcode_number"                            => "Штрих-код",
-    "barcode_number_in_row"                     => "Номер у рядку",
-    "barcode_page_cellspacing"                  => "Відображення інтервалу клітинок на сторінці.",
-    "barcode_page_width"                        => "Показати ширину сторінки",
-    "barcode_price"                             => "Ціна",
-    "barcode_second_row"                        => "Рядок 2",
-    "barcode_third_row"                         => "Рядок 3",
-    "barcode_tooltip"                           => "Увага! Ця функція може спричинити дублюваня елементів, імпортування або створення . Не використовуйте, якщо не хочете дублювати штрих-коди",
-    "barcode_type"                              => "Тип штрих-коду",
-    "barcode_width"                             => "Ширина",
-    "bottom"                                    => "Кінець",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Десяткові суми готівки",
-    "cash_decimals_tooltip"                     => "Якщо грошові знаки та десяткові знаки валюти однакові, то округлення готівки не відбудеться",
-    "cash_rounding"                             => "Округлення готівки",
-    "category_dropdown"                         => "Показати категорію як випадаюче меню",
-    "center"                                    => "Центр",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "Кома",
-    "company"                                   => "Назва організації",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Змінити зображення",
-    "company_logo"                              => "Логотип компанії",
-    "company_remove_image"                      => "Видалити зображення",
-    "company_required"                          => "Назва організації - обов'язкове поле",
-    "company_select_image"                      => "Вибрати зображення",
-    "company_website_url"                       => "Веб-сайт організації не є дійсною URL-адресою (http: // ...)",
-    "country_codes"                             => "Коди країн",
-    "country_codes_tooltip"                     => "Список кодів, відокремлених комами, для пошуку номінальної адреси",
-    "currency_code"                             => "Валютний код",
-    "currency_decimals"                         => "Десяткові суми валюти",
-    "currency_symbol"                           => "Символ валюти",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Нагорода клієнта",
-    "customer_reward_duplicate"                 => "Нагорода з такою назвою уже існує",
-    "customer_reward_enable"                    => "Увімкнути нагороди клієнта",
-    "customer_reward_invalid_chars"             => "Винагорода не може містити '_'",
-    "customer_reward_required"                  => "Нагорода - обов'язкове поле.",
-    "customer_sales_tax_support"                => "Податкова підтримка з продажу",
-    "date_or_time_format"                       => "Формат дати та часу",
-    "datetimeformat"                            => "Формат дати та часу",
-    "decimal_point"                             => "Десяткова мітка",
-    "default_barcode_font_size_number"          => "Розмір шрифту штрих-коду за замовчуванням повинен бути числом",
-    "default_barcode_font_size_required"        => "Розмір шрифту штрих-коду за замовчуванням - обов'язкове поле",
-    "default_barcode_height_number"             => "Висота штрих-коду за замовчуванням повинна бути числом",
-    "default_barcode_height_required"           => "Стандартна висота штрих-коду - обов'язкове поле",
-    "default_barcode_num_in_row_number"         => "Номер штрих-коду за умовчанням у рядку повинен бути числом",
-    "default_barcode_num_in_row_required"       => "Носер штрих-коду за замовчуванням у рядку - це обов'язкове поле",
-    "default_barcode_page_cellspacing_number"   => "Інтервал клітинок штрих-коду за замовчуванням повинен бути числом",
-    "default_barcode_page_cellspacing_required" => "Інтервал клітинок штрих-коду за замовчуванням - це обов'язкове поле",
-    "default_barcode_page_width_number"         => "Ширина сторінки штрих-коду за замовчуванням повинна бути числом",
-    "default_barcode_page_width_required"       => "Ширина сторінки штрих-коду за замовчуванням - це обов'язкове поле",
-    "default_barcode_width_number"              => "Ширина штрих-коду за замовчуванням повинна бути числом",
-    "default_barcode_width_required"            => "Ширина штрих-коду за замовчуванням - це обов'язкове поле",
-    "default_item_columns"                      => "Стовпці видимих елементів за замовчуванням",
-    "default_origin_tax_code"                   => "Податковий код за замовчуванням",
-    "default_receivings_discount"               => "Знижка на надходження за замовчуванням",
-    "default_receivings_discount_number"        => "Знижка надходжень за замовчуванням повинна бути числом",
-    "default_receivings_discount_required"      => "Знижка надходжень за замовчуванням - це обов'язкове поле",
-    "default_sales_discount"                    => "Знижка на продаж за замовчуванням",
-    "default_sales_discount_number"             => "Знижка на продаж за замовчуванням повинна бути номером",
-    "default_sales_discount_required"           => "Знижка з продаж за замовчуванням - обов'язкове поле для заповнення",
-    "default_tax_category"                      => "Податкова категорія за замовчуванням",
-    "default_tax_code"                          => "Податковий кодекс за замовчуванням",
-    "default_tax_jurisdiction"                  => "Податкова юрисдикція за замовчуванням",
-    "default_tax_name_number"                   => "Назва Податку за Замовчуванням повинно бути рядком",
-    "default_tax_name_required"                 => "Назва податку за замовчуванням - це обов'язкове поле",
-    "default_tax_rate"                          => "Ставка податку за замовчуванням %",
-    "default_tax_rate_1"                        => "Ставка податку 1",
-    "default_tax_rate_2"                        => "Ставка податку 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Ставка податку за замовчуванням повинна бути числом",
-    "default_tax_rate_required"                 => "Ставка податку за замовчуванням - це обов'язкове поле",
-    "derive_sale_quantity"                      => "Дозволити похідну кількість продажів",
-    "derive_sale_quantity_tooltip"              => "Якщо прапорець встановлений, то відносно товарів, замовлених на основі розширеної суми, буде передбачено новий тип товару",
-    "dinner_table"                              => "Обідня перерва",
-    "dinner_table_duplicate"                    => "Така назва уже існує",
-    "dinner_table_enable"                       => "Увімкнути обідні перерви",
-    "dinner_table_invalid_chars"                => "Назва не може містити '_'",
-    "dinner_table_required"                     => "Це поле мусить бути заповнене",
-    "dot"                                       => "Крапка",
-    "email"                                     => "Електронна пошта",
-    "email_configuration"                       => "Конфігурація Електронної Пошти",
-    "email_mailpath"                            => "Доступ до електронної пошта",
-    "email_protocol"                            => "Протокол",
-    "email_receipt_check_behaviour"             => "Селектор «Отримати по пошті»",
-    "email_receipt_check_behaviour_always"      => "Завжди активний",
-    "email_receipt_check_behaviour_last"        => "Запам'ятати останній вибір",
-    "email_receipt_check_behaviour_never"       => "Завжди деактивовано",
-    "email_smtp_crypto"                         => "Шифрування SMTP",
-    "email_smtp_host"                           => "SMTP Сервер",
-    "email_smtp_pass"                           => "SMTP Пароль",
-    "email_smtp_port"                           => "Порт SMTP",
-    "email_smtp_timeout"                        => "Час очікування SMTP",
-    "email_smtp_user"                           => "Ім'я користувача SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Забезпечення конфіденційності",
-    "enforce_privacy_tooltip"                   => "Захист конфіденційності даних клієнта в разі видалення даних",
-    "fax"                                       => "Факс",
-    "file_perm"                                 => "Виникають проблеми з дозволами файлів, виправте та перезавантажте сторінку.",
-    "financial_year"                            => "Початок фінансового року",
-    "financial_year_apr"                        => "1 - е Квітня",
-    "financial_year_aug"                        => "1 - е Серпня",
-    "financial_year_dec"                        => "1 - е Грудня",
-    "financial_year_feb"                        => "1 - е Лютого",
-    "financial_year_jan"                        => "1 - е Січня",
-    "financial_year_jul"                        => "1 - е Липня",
-    "financial_year_jun"                        => "1 - е Червня",
-    "financial_year_mar"                        => "1 - е Березня",
-    "financial_year_may"                        => "1 - е Травня",
-    "financial_year_nov"                        => "1 - е Листопада",
-    "financial_year_oct"                        => "1 - е Жовтня",
-    "financial_year_sep"                        => "1 - е Вересня",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "Сторінка входу reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA секретний ключ",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA секретний ключ - це обов'язкове поле",
-    "gcaptcha_site_key"                         => "ключ сайту reCAPTCHA",
-    "gcaptcha_site_key_required"                => "Ключ сайту reCAPTCHA - це обов'язкове поле",
-    "gcaptcha_tooltip"                          => "Захистіть сторінку входу за допомогою Google reCAPTCHA, натисніть на піктограму для пари ключів API",
-    "general"                                   => "Загальне",
-    "general_configuration"                     => "Загальна Конфігурація",
-    "giftcard_number"                           => "Номер Подарункової Карти",
-    "giftcard_random"                           => "Генерувати випадкові",
-    "giftcard_series"                           => "Генерувати в серії",
-    "image_allowed_file_types"                  => "Дозволені типи файлів",
-    "image_max_height_tooltip"                  => "Максимально дозволена висота завантажуваних зображень у пікселях (px).",
-    "image_max_size_tooltip"                    => "Максимально дозволений розмір файлу для завантаження зображень у кілобайтах.",
-    "image_max_width_tooltip"                   => "Максимально дозволена ширина завантажуваних зображень у пікселях (px).",
-    "image_restrictions"                        => "Обмеження на завантаження зображень",
-    "include_hsn"                               => "Включіть підтримку кодів HSN",
-    "info"                                      => "Інформація",
-    "info_configuration"                        => "Інформація про Магазин",
-    "input_groups"                              => "",
-    "integrations"                              => "Інтеграції",
-    "integrations_configuration"                => "Інтеграція сторонніх організацій",
-    "invoice"                                   => "Рахунок-фактура",
-    "invoice_configuration"                     => "Налаштування друку рахунків-фактур",
-    "invoice_default_comments"                  => "Коментарі до рахунків за замовчуванням",
-    "invoice_email_message"                     => "Шаблони рахунків-фактур на електронну пошту",
-    "invoice_enable"                            => "Увімкнути виставлення рахунків",
-    "invoice_printer"                           => "Друк разунку-фактура",
-    "invoice_type"                              => "Тип рахунку-фактури",
-    "is_readable"                               => "Читається, але дозволи встановлені неправильно. Будь ласка, встановіть доступ до файлу 640 або 660 та оновіть сторінку.",
-    "is_writable"                               => "Можна записати, але дозволи встановлені неправильно. Будь ласка, встановіть доступ до файлу 750 та оновіть сторінку.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Увага! Ця функція працюватиме лише у тому випадку, якщо у вас встановлений додаток FireFox jsPrintSetup. Зберегти все одно?",
-    "language"                                  => "Мова",
-    "last_used_invoice_number"                  => "Останній використаний номер рахунку-фактури",
-    "last_used_quote_number"                    => "Останній використаний номер котирування",
-    "last_used_work_order_number"               => "Останній використаний номер без виводу",
-    "left"                                      => "Залишок",
-    "license"                                   => "Ліцензія",
-    "license_configuration"                     => "Відомості про ліцензію",
-    "line_sequence"                             => "Послідовність рядків",
-    "lines_per_page"                            => "Рядків на сторінці",
-    "lines_per_page_number"                     => "Рядки на сторінці повинні бути числом",
-    "lines_per_page_required"                   => "Рядки на сторінці - обов'язкове поле",
-    "locale"                                    => "Визначення місцезнаходження",
-    "locale_configuration"                      => "Місце знаходження Конфігурації",
-    "locale_info"                               => "Інформація про Місцезнаходження Конфігурації",
-    "location"                                  => "Склад",
-    "location_configuration"                    => "Розташування складу",
-    "location_info"                             => "Інформація про розташування конфігурації",
-    "login_form"                                => "",
-    "logout"                                    => "Ви хочете зробити резервну копію перед виходом із системи? Натисніть [OK] для резервного копіювання або [Скасувати], щоб вийти?",
-    "mailchimp"                                 => "MailСhimp",
-    "mailchimp_api_key"                         => "Ключ API від Mailchimp",
-    "mailchimp_configuration"                   => "Конфігурація Mailchimp",
-    "mailchimp_key_successfully"                => "Ключ API недійсний",
-    "mailchimp_key_unsuccessfully"              => "Ключ API невірний",
-    "mailchimp_lists"                           => "Список(и) Mailchimp",
-    "mailchimp_tooltip"                         => "Натисніть на піктограму для ключа API",
-    "message"                                   => "Повідомлення",
-    "message_configuration"                     => "Конфігурація повідомлень",
-    "msg_msg"                                   => "Збережене текстове повідомлення",
-    "msg_msg_placeholder"                       => "Якщо ви хочете використовувати шаблон SMS, збережіть своє повідомлення тут або залиште поле порожнім",
-    "msg_pwd"                                   => "Пароль SMS-API",
-    "msg_pwd_required"                          => "Пароль  SMS-API - обов'язкове поле",
-    "msg_src"                                   => "Ідентифікатор відправника SMS-API",
-    "msg_src_required"                          => "Ідентифікатор відправника SMS-API - обов'язкове поле",
-    "msg_uid"                                   => "Ім'я користувача SMS-API",
-    "msg_uid_required"                          => "Ім'я користувача SMS-API - обов'язкове поле",
-    "multi_pack_enabled"                        => "Декілька упаковок товару",
-    "no_risk"                                   => "Немає ризиків безпеки/вразливості.",
-    "none"                                      => "Жоден",
-    "notify_alignment"                          => "Спливаюче повідомлення",
-    "number_format"                             => "Формат номера",
-    "number_locale"                             => "Місцезнаходження",
-    "number_locale_invalid"                     => "Введене місцезнаходження є недійсним. Перевірте посилання в підказці, щоб знайти правильне місцезнаходження",
-    "number_locale_required"                    => "Номер місцезнаходження - обов'язкове поле",
-    "number_locale_tooltip"                     => "Знайдіть відповідне місцезнаходження за цим посиланням",
-    "os_timezone"                               => "Часова зона OSPOS:",
-    "ospos_info"                                => "Інформація про встановлення OSPOS",
-    "payment_options_order"                     => "Варіанти оплати замовлення",
-    "perm_risk"                                 => "Неправильні дозволи роблять OSPOS вразливим.",
-    "phone"                                     => "Телефон організації",
-    "phone_required"                            => "Телефон організації - обов'язкове полею",
-    "print_bottom_margin"                       => "Верхнє поле",
-    "print_bottom_margin_number"                => "Верхнє поле за замовчуванням повинно бути числом",
-    "print_bottom_margin_required"              => "Верхнє поле за замовчуванням - обов'язкове поле",
-    "print_delay_autoreturn"                    => "Затримка автоматичного повернення до продажу",
-    "print_delay_autoreturn_number"             => "Затримка автоматичного повернення до продажу - обов'язкове поле",
-    "print_delay_autoreturn_required"           => "Затримка автоматичного повернення до продажу повинна бути числом",
-    "print_footer"                              => "Друк веб-переглядача",
-    "print_header"                              => "Друк заголовка браузера",
-    "print_left_margin"                         => "Ліве поле",
-    "print_left_margin_number"                  => "Ліве поле замовчуванням  повинен бути числом",
-    "print_left_margin_required"                => "Ліве поле за замовчуванням - обов'язкове поле",
-    "print_receipt_check_behaviour"             => "Друк квитанції, яка позначена прапорцем",
-    "print_receipt_check_behaviour_always"      => "Завжди перевіряється",
-    "print_receipt_check_behaviour_last"        => "Запам’ятати останній вибір",
-    "print_receipt_check_behaviour_never"       => "Ніколи не запам'товувати",
-    "print_right_margin"                        => "Праве поле",
-    "print_right_margin_number"                 => "Праве поле замовчуванням за замовчуванням повинно бути числом",
-    "print_right_margin_required"               => "Праве поле за замовчуванням - обов'язкове поле",
-    "print_silently"                            => "Показати діалогове вікно друку",
-    "print_top_margin"                          => "Верхнє поле",
-    "print_top_margin_number"                   => "Верхнє поле за замовчуванням повинно бути числом",
-    "print_top_margin_required"                 => "Верхнє поле за замовчуванням - обов'язкове поле для заповнення",
-    "quantity_decimals"                         => "Кількість десятків",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Кількість десятків за замовчуванням",
-    "receipt"                                   => "Квитанція",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Налаштування друку квитанції",
-    "receipt_default"                           => "За замовчуванням",
-    "receipt_font_size"                         => "Розмір шрифту",
-    "receipt_font_size_number"                  => "Розмір шрифту повинен бути числом",
-    "receipt_font_size_required"                => "Розмір шрифту - обов'язкове поле",
-    "receipt_info"                              => "Отримання інформації про конфігурацію",
-    "receipt_printer"                           => "Принтер для квитків",
-    "receipt_short"                             => "Короткий зміст",
-    "receipt_show_company_name"                 => "Показати назву організації",
-    "receipt_show_description"                  => "Показати опис",
-    "receipt_show_serialnumber"                 => "Показати серійний номер",
-    "receipt_show_tax_ind"                      => "Показати показник податку",
-    "receipt_show_taxes"                        => "Показати податковий показник",
-    "receipt_show_total_discount"               => "Показати загальну знижку",
-    "receipt_template"                          => "Шаблон квитанції",
-    "receiving_calculate_average_price"         => "Сер. Ціна (отримання)",
-    "recv_invoice_format"                       => "Формат отримання рахунків-фактур",
-    "register_mode_default"                     => "Режим реєстрації за замовчуванням",
-    "report_an_issue"                           => "Повідомити про проблему",
-    "return_policy_required"                    => "Політика повернення - обов'язкове поле",
-    "reward"                                    => "Нагорода",
-    "reward_configuration"                      => "Налаштування Нагороди",
-    "right"                                     => "Право",
-    "sales_invoice_format"                      => "Формат рахунків-фактур продажів",
-    "sales_quote_format"                        => "Формат котирування продажів",
-    "saved_successfully"                        => "Конфігурація успішно збережена",
-    "saved_unsuccessfully"                      => "Помилка збереження конфігурації",
-    "security_issue"                            => "Попередження про вразливість системи безпеки",
-    "server_notice"                             => "Будь ласка, використовуйте  інформацію подану нижче для звіту про проблеми",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Показати значок офісу",
-    "statistics"                                => "Надіслати статистику",
-    "statistics_tooltip"                        => "Надсилайте статистику для розробки та вдосконалення функцій",
-    "stock_location"                            => "Місцезнаходження складу",
-    "stock_location_duplicate"                  => "Склад з таким місцезнаходженням вже існує. Будь ласка, використайте інше",
-    "stock_location_invalid_chars"              => "Місцезнаходження не може містити спецсимволів",
-    "stock_location_required"                   => "Місцезнаходження - обов'язкове поле",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Колонка 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Формат пошукових пропозицій",
-    "suggestions_second_column"                 => "Колонка 2",
-    "suggestions_third_column"                  => "Колонка 3",
-    "system_conf"                               => "Налаштування",
-    "system_info"                               => "Інформація про систему",
-    "table"                                     => "Таблиця",
-    "table_configuration"                       => "Налаштування таблиці",
-    "takings_printer"                           => "Підключення принтера",
-    "tax"                                       => "Податок",
-    "tax_category"                              => "Категорія податку",
-    "tax_category_duplicate"                    => "Введена податкова категорія вже існує",
-    "tax_category_invalid_chars"                => "Введена категорія податку недійсна",
-    "tax_category_required"                     => "Податкова категорія - обов'язкове поле",
-    "tax_category_used"                         => "Податкову категорію не можливо видалити, оскільки вона використовується",
-    "tax_configuration"                         => "Налаштування податку.",
-    "tax_decimals"                              => "Податкові десятки",
-    "tax_id"                                    => "Податковий номер",
-    "tax_included"                              => "Податок включений",
-    "theme"                                     => "Тема",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Роздільник тисячних розрядів",
-    "timezone"                                  => "Часовой пояс",
-    "timezone_error"                            => "Часовий пояс OSPOS відрізняється від вашого місцевого часового поясу.",
-    "top"                                       => "Головний",
-    "use_destination_based_tax"                 => "Використовуйте податок на основі призначення",
-    "user_timezone"                             => "Місцевий часовий пояс:",
-    "website"                                   => "Веб-сайт",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Підтримка робочого замовлення",
-    "work_order_format"                         => "Формат робочого замовлення",
+    'address'                                   => 'Адреса організації',
+    'address_required'                          => "Адреса організації - обов'язкове поле.",
+    'all_set'                                   => 'Усі дозволи на файли встановлені правильно!',
+    'allow_duplicate_barcodes'                  => 'Дозволити дублювати штрих-коди',
+    'apostrophe'                                => 'Апостроф',
+    'backup_button'                             => 'Резервна копія',
+    'backup_database'                           => 'База даних резервного копіювання',
+    'barcode'                                   => 'Штрих-код',
+    'barcode_company'                           => 'Назва організації',
+    'barcode_configuration'                     => 'Конфігурація штрих-коду',
+    'barcode_content'                           => 'Вміст штрих-коду',
+    'barcode_first_row'                         => 'Рядок 1',
+    'barcode_font'                              => 'Шрифт',
+    'barcode_formats'                           => 'Формат введення',
+    'barcode_generate_if_empty'                 => 'Створити, якщо порожньо.',
+    'barcode_height'                            => 'Висота (px)',
+    'barcode_id'                                => "Ідентифікатор елементу/Ім'я",
+    'barcode_info'                              => 'Інформація про конфігурацію штрих-коду',
+    'barcode_layout'                            => 'Макет штрих-коду',
+    'barcode_name'                              => "Ім'я",
+    'barcode_number'                            => 'Штрих-код',
+    'barcode_number_in_row'                     => 'Номер у рядку',
+    'barcode_page_cellspacing'                  => 'Відображення інтервалу клітинок на сторінці.',
+    'barcode_page_width'                        => 'Показати ширину сторінки',
+    'barcode_price'                             => 'Ціна',
+    'barcode_second_row'                        => 'Рядок 2',
+    'barcode_third_row'                         => 'Рядок 3',
+    'barcode_tooltip'                           => 'Увага! Ця функція може спричинити дублюваня елементів, імпортування або створення . Не використовуйте, якщо не хочете дублювати штрих-коди',
+    'barcode_type'                              => 'Тип штрих-коду',
+    'barcode_width'                             => 'Ширина',
+    'bottom'                                    => 'Кінець',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Десяткові суми готівки',
+    'cash_decimals_tooltip'                     => 'Якщо грошові знаки та десяткові знаки валюти однакові, то округлення готівки не відбудеться',
+    'cash_rounding'                             => 'Округлення готівки',
+    'category_dropdown'                         => 'Показати категорію як випадаюче меню',
+    'center'                                    => 'Центр',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'Кома',
+    'company'                                   => 'Назва організації',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Змінити зображення',
+    'company_logo'                              => 'Логотип компанії',
+    'company_remove_image'                      => 'Видалити зображення',
+    'company_required'                          => "Назва організації - обов'язкове поле",
+    'company_select_image'                      => 'Вибрати зображення',
+    'company_website_url'                       => 'Веб-сайт організації не є дійсною URL-адресою (http: // ...)',
+    'country_codes'                             => 'Коди країн',
+    'country_codes_tooltip'                     => 'Список кодів, відокремлених комами, для пошуку номінальної адреси',
+    'currency_code'                             => 'Валютний код',
+    'currency_decimals'                         => 'Десяткові суми валюти',
+    'currency_symbol'                           => 'Символ валюти',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Нагорода клієнта',
+    'customer_reward_duplicate'                 => 'Нагорода з такою назвою уже існує',
+    'customer_reward_enable'                    => 'Увімкнути нагороди клієнта',
+    'customer_reward_invalid_chars'             => "Винагорода не може містити '_'",
+    'customer_reward_required'                  => "Нагорода - обов'язкове поле.",
+    'customer_sales_tax_support'                => 'Податкова підтримка з продажу',
+    'date_or_time_format'                       => 'Формат дати та часу',
+    'datetimeformat'                            => 'Формат дати та часу',
+    'decimal_point'                             => 'Десяткова мітка',
+    'default_barcode_font_size_number'          => 'Розмір шрифту штрих-коду за замовчуванням повинен бути числом',
+    'default_barcode_font_size_required'        => "Розмір шрифту штрих-коду за замовчуванням - обов'язкове поле",
+    'default_barcode_height_number'             => 'Висота штрих-коду за замовчуванням повинна бути числом',
+    'default_barcode_height_required'           => "Стандартна висота штрих-коду - обов'язкове поле",
+    'default_barcode_num_in_row_number'         => 'Номер штрих-коду за умовчанням у рядку повинен бути числом',
+    'default_barcode_num_in_row_required'       => "Носер штрих-коду за замовчуванням у рядку - це обов'язкове поле",
+    'default_barcode_page_cellspacing_number'   => 'Інтервал клітинок штрих-коду за замовчуванням повинен бути числом',
+    'default_barcode_page_cellspacing_required' => "Інтервал клітинок штрих-коду за замовчуванням - це обов'язкове поле",
+    'default_barcode_page_width_number'         => 'Ширина сторінки штрих-коду за замовчуванням повинна бути числом',
+    'default_barcode_page_width_required'       => "Ширина сторінки штрих-коду за замовчуванням - це обов'язкове поле",
+    'default_barcode_width_number'              => 'Ширина штрих-коду за замовчуванням повинна бути числом',
+    'default_barcode_width_required'            => "Ширина штрих-коду за замовчуванням - це обов'язкове поле",
+    'default_item_columns'                      => 'Стовпці видимих елементів за замовчуванням',
+    'default_origin_tax_code'                   => 'Податковий код за замовчуванням',
+    'default_receivings_discount'               => 'Знижка на надходження за замовчуванням',
+    'default_receivings_discount_number'        => 'Знижка надходжень за замовчуванням повинна бути числом',
+    'default_receivings_discount_required'      => "Знижка надходжень за замовчуванням - це обов'язкове поле",
+    'default_sales_discount'                    => 'Знижка на продаж за замовчуванням',
+    'default_sales_discount_number'             => 'Знижка на продаж за замовчуванням повинна бути номером',
+    'default_sales_discount_required'           => "Знижка з продаж за замовчуванням - обов'язкове поле для заповнення",
+    'default_tax_category'                      => 'Податкова категорія за замовчуванням',
+    'default_tax_code'                          => 'Податковий кодекс за замовчуванням',
+    'default_tax_jurisdiction'                  => 'Податкова юрисдикція за замовчуванням',
+    'default_tax_name_number'                   => 'Назва Податку за Замовчуванням повинно бути рядком',
+    'default_tax_name_required'                 => "Назва податку за замовчуванням - це обов'язкове поле",
+    'default_tax_rate'                          => 'Ставка податку за замовчуванням %',
+    'default_tax_rate_1'                        => 'Ставка податку 1',
+    'default_tax_rate_2'                        => 'Ставка податку 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Ставка податку за замовчуванням повинна бути числом',
+    'default_tax_rate_required'                 => "Ставка податку за замовчуванням - це обов'язкове поле",
+    'derive_sale_quantity'                      => 'Дозволити похідну кількість продажів',
+    'derive_sale_quantity_tooltip'              => 'Якщо прапорець встановлений, то відносно товарів, замовлених на основі розширеної суми, буде передбачено новий тип товару',
+    'dinner_table'                              => 'Обідня перерва',
+    'dinner_table_duplicate'                    => 'Така назва уже існує',
+    'dinner_table_enable'                       => 'Увімкнути обідні перерви',
+    'dinner_table_invalid_chars'                => "Назва не може містити '_'",
+    'dinner_table_required'                     => 'Це поле мусить бути заповнене',
+    'dot'                                       => 'Крапка',
+    'email'                                     => 'Електронна пошта',
+    'email_configuration'                       => 'Конфігурація Електронної Пошти',
+    'email_mailpath'                            => 'Доступ до електронної пошта',
+    'email_protocol'                            => 'Протокол',
+    'email_receipt_check_behaviour'             => 'Селектор «Отримати по пошті»',
+    'email_receipt_check_behaviour_always'      => 'Завжди активний',
+    'email_receipt_check_behaviour_last'        => "Запам'ятати останній вибір",
+    'email_receipt_check_behaviour_never'       => 'Завжди деактивовано',
+    'email_smtp_crypto'                         => 'Шифрування SMTP',
+    'email_smtp_host'                           => 'SMTP Сервер',
+    'email_smtp_pass'                           => 'SMTP Пароль',
+    'email_smtp_port'                           => 'Порт SMTP',
+    'email_smtp_timeout'                        => 'Час очікування SMTP',
+    'email_smtp_user'                           => "Ім'я користувача SMTP",
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Забезпечення конфіденційності',
+    'enforce_privacy_tooltip'                   => 'Захист конфіденційності даних клієнта в разі видалення даних',
+    'fax'                                       => 'Факс',
+    'file_perm'                                 => 'Виникають проблеми з дозволами файлів, виправте та перезавантажте сторінку.',
+    'financial_year'                            => 'Початок фінансового року',
+    'financial_year_apr'                        => '1 - е Квітня',
+    'financial_year_aug'                        => '1 - е Серпня',
+    'financial_year_dec'                        => '1 - е Грудня',
+    'financial_year_feb'                        => '1 - е Лютого',
+    'financial_year_jan'                        => '1 - е Січня',
+    'financial_year_jul'                        => '1 - е Липня',
+    'financial_year_jun'                        => '1 - е Червня',
+    'financial_year_mar'                        => '1 - е Березня',
+    'financial_year_may'                        => '1 - е Травня',
+    'financial_year_nov'                        => '1 - е Листопада',
+    'financial_year_oct'                        => '1 - е Жовтня',
+    'financial_year_sep'                        => '1 - е Вересня',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'Сторінка входу reCAPTCHA',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA секретний ключ',
+    'gcaptcha_secret_key_required'              => "reCAPTCHA секретний ключ - це обов'язкове поле",
+    'gcaptcha_site_key'                         => 'ключ сайту reCAPTCHA',
+    'gcaptcha_site_key_required'                => "Ключ сайту reCAPTCHA - це обов'язкове поле",
+    'gcaptcha_tooltip'                          => 'Захистіть сторінку входу за допомогою Google reCAPTCHA, натисніть на піктограму для пари ключів API',
+    'general'                                   => 'Загальне',
+    'general_configuration'                     => 'Загальна Конфігурація',
+    'giftcard_number'                           => 'Номер Подарункової Карти',
+    'giftcard_random'                           => 'Генерувати випадкові',
+    'giftcard_series'                           => 'Генерувати в серії',
+    'image_allowed_file_types'                  => 'Дозволені типи файлів',
+    'image_max_height_tooltip'                  => 'Максимально дозволена висота завантажуваних зображень у пікселях (px).',
+    'image_max_size_tooltip'                    => 'Максимально дозволений розмір файлу для завантаження зображень у кілобайтах.',
+    'image_max_width_tooltip'                   => 'Максимально дозволена ширина завантажуваних зображень у пікселях (px).',
+    'image_restrictions'                        => 'Обмеження на завантаження зображень',
+    'include_hsn'                               => 'Включіть підтримку кодів HSN',
+    'info'                                      => 'Інформація',
+    'info_configuration'                        => 'Інформація про Магазин',
+    'input_groups'                              => '',
+    'integrations'                              => 'Інтеграції',
+    'integrations_configuration'                => 'Інтеграція сторонніх організацій',
+    'invoice'                                   => 'Рахунок-фактура',
+    'invoice_configuration'                     => 'Налаштування друку рахунків-фактур',
+    'invoice_default_comments'                  => 'Коментарі до рахунків за замовчуванням',
+    'invoice_email_message'                     => 'Шаблони рахунків-фактур на електронну пошту',
+    'invoice_enable'                            => 'Увімкнути виставлення рахунків',
+    'invoice_printer'                           => 'Друк разунку-фактура',
+    'invoice_type'                              => 'Тип рахунку-фактури',
+    'is_readable'                               => 'Читається, але дозволи встановлені неправильно. Будь ласка, встановіть доступ до файлу 640 або 660 та оновіть сторінку.',
+    'is_writable'                               => 'Можна записати, але дозволи встановлені неправильно. Будь ласка, встановіть доступ до файлу 750 та оновіть сторінку.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Увага! Ця функція працюватиме лише у тому випадку, якщо у вас встановлений додаток FireFox jsPrintSetup. Зберегти все одно?',
+    'language'                                  => 'Мова',
+    'last_used_invoice_number'                  => 'Останній використаний номер рахунку-фактури',
+    'last_used_quote_number'                    => 'Останній використаний номер котирування',
+    'last_used_work_order_number'               => 'Останній використаний номер без виводу',
+    'left'                                      => 'Залишок',
+    'license'                                   => 'Ліцензія',
+    'license_configuration'                     => 'Відомості про ліцензію',
+    'line_sequence'                             => 'Послідовність рядків',
+    'lines_per_page'                            => 'Рядків на сторінці',
+    'lines_per_page_number'                     => 'Рядки на сторінці повинні бути числом',
+    'lines_per_page_required'                   => "Рядки на сторінці - обов'язкове поле",
+    'locale'                                    => 'Визначення місцезнаходження',
+    'locale_configuration'                      => 'Місце знаходження Конфігурації',
+    'locale_info'                               => 'Інформація про Місцезнаходження Конфігурації',
+    'location'                                  => 'Склад',
+    'location_configuration'                    => 'Розташування складу',
+    'location_info'                             => 'Інформація про розташування конфігурації',
+    'login_form'                                => '',
+    'logout'                                    => 'Ви хочете зробити резервну копію перед виходом із системи? Натисніть [OK] для резервного копіювання або [Скасувати], щоб вийти?',
+    'mailchimp'                                 => 'MailСhimp',
+    'mailchimp_api_key'                         => 'Ключ API від Mailchimp',
+    'mailchimp_configuration'                   => 'Конфігурація Mailchimp',
+    'mailchimp_key_successfully'                => 'Ключ API недійсний',
+    'mailchimp_key_unsuccessfully'              => 'Ключ API невірний',
+    'mailchimp_lists'                           => 'Список(и) Mailchimp',
+    'mailchimp_tooltip'                         => 'Натисніть на піктограму для ключа API',
+    'message'                                   => 'Повідомлення',
+    'message_configuration'                     => 'Конфігурація повідомлень',
+    'msg_msg'                                   => 'Збережене текстове повідомлення',
+    'msg_msg_placeholder'                       => 'Якщо ви хочете використовувати шаблон SMS, збережіть своє повідомлення тут або залиште поле порожнім',
+    'msg_pwd'                                   => 'Пароль SMS-API',
+    'msg_src'                                   => 'Ідентифікатор відправника SMS-API',
+    'msg_src_required'                          => "Ідентифікатор відправника SMS-API - обов'язкове поле",
+    'msg_uid'                                   => "Ім'я користувача SMS-API",
+    'msg_uid_required'                          => "Ім'я користувача SMS-API - обов'язкове поле",
+    'multi_pack_enabled'                        => 'Декілька упаковок товару',
+    'no_risk'                                   => 'Немає ризиків безпеки/вразливості.',
+    'none'                                      => 'Жоден',
+    'notify_alignment'                          => 'Спливаюче повідомлення',
+    'number_format'                             => 'Формат номера',
+    'number_locale'                             => 'Місцезнаходження',
+    'number_locale_invalid'                     => 'Введене місцезнаходження є недійсним. Перевірте посилання в підказці, щоб знайти правильне місцезнаходження',
+    'number_locale_required'                    => "Номер місцезнаходження - обов'язкове поле",
+    'number_locale_tooltip'                     => 'Знайдіть відповідне місцезнаходження за цим посиланням',
+    'os_timezone'                               => 'Часова зона OSPOS:',
+    'ospos_info'                                => 'Інформація про встановлення OSPOS',
+    'payment_options_order'                     => 'Варіанти оплати замовлення',
+    'payment_reference_code_length_limits'      => 'Код посилання на платіж<br>Обмеження довжини',
+    'payment_reference_code_length_max_label'   => 'Макс',
+    'payment_reference_code_length_min_label'   => 'Мін',
+    'perm_risk'                                 => 'Неправильні дозволи роблять OSPOS вразливим.',
+    'phone'                                     => 'Телефон організації',
+    'phone_required'                            => "Телефон організації - обов'язкове полею",
+    'print_bottom_margin'                       => 'Верхнє поле',
+    'print_bottom_margin_number'                => 'Верхнє поле за замовчуванням повинно бути числом',
+    'print_bottom_margin_required'              => "Верхнє поле за замовчуванням - обов'язкове поле",
+    'print_delay_autoreturn'                    => 'Затримка автоматичного повернення до продажу',
+    'print_delay_autoreturn_number'             => "Затримка автоматичного повернення до продажу - обов'язкове поле",
+    'print_delay_autoreturn_required'           => 'Затримка автоматичного повернення до продажу повинна бути числом',
+    'print_footer'                              => 'Друк веб-переглядача',
+    'print_header'                              => 'Друк заголовка браузера',
+    'print_left_margin'                         => 'Ліве поле',
+    'print_left_margin_number'                  => 'Ліве поле замовчуванням  повинен бути числом',
+    'print_left_margin_required'                => "Ліве поле за замовчуванням - обов'язкове поле",
+    'print_receipt_check_behaviour'             => 'Друк квитанції, яка позначена прапорцем',
+    'print_receipt_check_behaviour_always'      => 'Завжди перевіряється',
+    'print_receipt_check_behaviour_last'        => 'Запам’ятати останній вибір',
+    'print_receipt_check_behaviour_never'       => "Ніколи не запам'товувати",
+    'print_right_margin'                        => 'Праве поле',
+    'print_right_margin_number'                 => 'Праве поле замовчуванням за замовчуванням повинно бути числом',
+    'print_right_margin_required'               => "Праве поле за замовчуванням - обов'язкове поле",
+    'print_silently'                            => 'Показати діалогове вікно друку',
+    'print_top_margin'                          => 'Верхнє поле',
+    'print_top_margin_number'                   => 'Верхнє поле за замовчуванням повинно бути числом',
+    'print_top_margin_required'                 => "Верхнє поле за замовчуванням - обов'язкове поле для заповнення",
+    'quantity_decimals'                         => 'Кількість десятків',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Кількість десятків за замовчуванням',
+    'receipt'                                   => 'Квитанція',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Налаштування друку квитанції',
+    'receipt_default'                           => 'За замовчуванням',
+    'receipt_font_size'                         => 'Розмір шрифту',
+    'receipt_font_size_number'                  => 'Розмір шрифту повинен бути числом',
+    'receipt_font_size_required'                => "Розмір шрифту - обов'язкове поле",
+    'receipt_info'                              => 'Отримання інформації про конфігурацію',
+    'receipt_printer'                           => 'Принтер для квитків',
+    'receipt_short'                             => 'Короткий зміст',
+    'receipt_show_company_name'                 => 'Показати назву організації',
+    'receipt_show_description'                  => 'Показати опис',
+    'receipt_show_serialnumber'                 => 'Показати серійний номер',
+    'receipt_show_tax_ind'                      => 'Показати показник податку',
+    'receipt_show_taxes'                        => 'Показати податковий показник',
+    'receipt_show_total_discount'               => 'Показати загальну знижку',
+    'receipt_template'                          => 'Шаблон квитанції',
+    'receiving_calculate_average_price'         => 'Сер. Ціна (отримання)',
+    'recv_invoice_format'                       => 'Формат отримання рахунків-фактур',
+    'register_mode_default'                     => 'Режим реєстрації за замовчуванням',
+    'report_an_issue'                           => 'Повідомити про проблему',
+    'return_policy_required'                    => "Політика повернення - обов'язкове поле",
+    'reward'                                    => 'Нагорода',
+    'reward_configuration'                      => 'Налаштування Нагороди',
+    'right'                                     => 'Право',
+    'sales_invoice_format'                      => 'Формат рахунків-фактур продажів',
+    'sales_quote_format'                        => 'Формат котирування продажів',
+    'mailpath_invalid'                          => 'Невірний шлях sendmail. Дозволені лише літери, цифри, дефіси, підкреслення, коси риски, зворотні коси риски, двокрапки, пробіли та крапки.',
+    'saved_successfully'                        => 'Конфігурація успішно збережена',
+    'saved_unsuccessfully'                      => 'Помилка збереження конфігурації',
+    'security_issue'                            => 'Попередження про вразливість системи безпеки',
+    'server_notice'                             => 'Будь ласка, використовуйте  інформацію подану нижче для звіту про проблеми',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Показати значок офісу',
+    'statistics'                                => 'Надіслати статистику',
+    'statistics_tooltip'                        => 'Надсилайте статистику для розробки та вдосконалення функцій',
+    'stock_location'                            => 'Місцезнаходження складу',
+    'stock_location_duplicate'                  => 'Склад з таким місцезнаходженням вже існує. Будь ласка, використайте інше',
+    'stock_location_invalid_chars'              => 'Місцезнаходження не може містити спецсимволів',
+    'stock_location_required'                   => "Місцезнаходження - обов'язкове поле",
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Колонка 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Формат пошукових пропозицій',
+    'suggestions_second_column'                 => 'Колонка 2',
+    'suggestions_third_column'                  => 'Колонка 3',
+    'system_conf'                               => 'Налаштування',
+    'system_info'                               => 'Інформація про систему',
+    'table'                                     => 'Таблиця',
+    'table_configuration'                       => 'Налаштування таблиці',
+    'takings_printer'                           => 'Підключення принтера',
+    'tax'                                       => 'Податок',
+    'tax_category'                              => 'Категорія податку',
+    'tax_category_duplicate'                    => 'Введена податкова категорія вже існує',
+    'tax_category_invalid_chars'                => 'Введена категорія податку недійсна',
+    'tax_category_required'                     => "Податкова категорія - обов'язкове поле",
+    'tax_category_used'                         => 'Податкову категорію не можливо видалити, оскільки вона використовується',
+    'tax_configuration'                         => 'Налаштування податку.',
+    'tax_decimals'                              => 'Податкові десятки',
+    'tax_id'                                    => 'Податковий номер',
+    'tax_included'                              => 'Податок включений',
+    'theme'                                     => 'Тема',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Роздільник тисячних розрядів',
+    'timezone'                                  => 'Часовой пояс',
+    'timezone_error'                            => 'Часовий пояс OSPOS відрізняється від вашого місцевого часового поясу.',
+    'top'                                       => 'Головний',
+    'use_destination_based_tax'                 => 'Використовуйте податок на основі призначення',
+    'user_timezone'                             => 'Місцевий часовий пояс:',
+    'website'                                   => 'Веб-сайт',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Підтримка робочого замовлення',
+    'work_order_format'                         => 'Формат робочого замовлення',
 ];
diff --git a/app/Language/uk/Employees.php b/app/Language/uk/Employees.php
index 7ea5b73ad..a24a4a27c 100644
--- a/app/Language/uk/Employees.php
+++ b/app/Language/uk/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Інформація про працівників",
-    "cannot_be_deleted"            => "Неможливо видалити вибраних працівника(ів), які вже здійснили продажі або ви намагаєтесь видалити свій обліковий запис.",
-    "change_employee"              => "",
-    "change_password"              => "Змінити пароль",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Ви впевнені, що хочете видалити обраного(их) працівника(ів)?",
-    "confirm_restore"              => "Ви впевнені, що хочете відновити обраного(их) працівника(ів)?",
-    "current_password"             => "Поточний пароль",
-    "current_password_invalid"     => "Поточний пароль невірний.",
-    "employee"                     => "Працівник",
-    "error_adding_updating"        => "Помилка при додаванні/оновлені працівника.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Ви не можете видалити аккаунт користувача.",
-    "error_updating_demo_admin"    => "Ви не можете змінити аккаунт користувача.",
-    "language"                     => "Мова",
-    "login_info"                   => "Вхід",
-    "manager"                      => "",
-    "new"                          => "Новий працівник",
-    "none_selected"                => "Ви не вибрали працівника(ів) для видалення.",
-    "one_or_multiple"              => "Працівник(и)",
-    "password"                     => "Пароль",
-    "password_minlength"           => "Пароль повинен містити не менше 8 символів.",
-    "password_must_match"          => "Паролі не співпадають.",
-    "password_not_must_match"      => "Поточний пароль та новий пароль не повинні співпадати.",
-    "password_required"            => "Пароль - обов'язкове поле.",
-    "permission_desc"              => "Поставте прапорці нижче, щоб надати доступ до модулів.",
-    "permission_info"              => "Дозволи",
-    "repeat_password"              => "Повторіть пароль",
-    "subpermission_required"       => "Додайте принаймні один грант для кожного модуля.",
-    "successful_adding"            => "Ви успішно додали працівника.",
-    "successful_change_password"   => "Пароль успішно змінено.",
-    "successful_deleted"           => "Працівника успішно видалено",
-    "successful_updating"          => "Працівника успішно оновлено",
-    "system_language"              => "Мова системи",
-    "unsuccessful_change_password" => "Не вдалось змінити пароль.",
-    "update"                       => "Оновити працівника",
-    "username"                     => "Ім'я користувача",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Ім'я користувача повинно бути не менше 5 символів.",
-    "username_required"            => "Ім'я користувача - обов'язкове поле.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Інформація про працівників',
+    'cannot_be_deleted'                      => 'Неможливо видалити вибраних працівника(ів), які вже здійснили продажі або ви намагаєтесь видалити свій обліковий запис.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Змінити пароль',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Ви впевнені, що хочете видалити обраного(их) працівника(ів)?',
+    'confirm_restore'                        => 'Ви впевнені, що хочете відновити обраного(их) працівника(ів)?',
+    'current_password'                       => 'Поточний пароль',
+    'current_password_invalid'               => 'Поточний пароль невірний.',
+    'employee'                               => 'Працівник',
+    'error_adding_updating'                  => 'Помилка при додаванні/оновлені працівника.',
+    'error_cannot_remove_own_minimum_grant'  => 'Ви не можете видалити власні мінімальні дозволи доступу до модулів.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Ви не можете видалити аккаунт користувача.',
+    'error_grant_change_disallowed'          => 'Зміни дозволів заборонені в цій демонстрації.',
+    'error_password_change_disallowed'       => 'Зміни пароля заборонені в цій демонстрації.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Ви не можете змінити аккаунт користувача.',
+    'language'                               => 'Мова',
+    'login_info'                             => 'Вхід',
+    'manager'                                => '',
+    'new'                                    => 'Новий працівник',
+    'none_selected'                          => 'Ви не вибрали працівника(ів) для видалення.',
+    'one_or_multiple'                        => 'Працівник(и)',
+    'password'                               => 'Пароль',
+    'password_minlength'                     => 'Пароль повинен містити не менше 8 символів.',
+    'password_must_match'                    => 'Паролі не співпадають.',
+    'password_not_must_match'                => 'Поточний пароль та новий пароль не повинні співпадати.',
+    'password_required'                      => 'Пароль - обов\'язкове поле.',
+    'permission_desc'                        => 'Поставте прапорці нижче, щоб надати доступ до модулів.',
+    'permission_info'                        => 'Дозволи',
+    'repeat_password'                        => 'Повторіть пароль',
+    'subpermission_required'                 => 'Додайте принаймні один грант для кожного модуля.',
+    'successful_adding'                      => 'Ви успішно додали працівника.',
+    'successful_change_password'             => 'Пароль успішно змінено.',
+    'successful_deleted'                     => 'Працівника успішно видалено',
+    'successful_updating'                    => 'Працівника успішно оновлено',
+    'system_language'                        => 'Мова системи',
+    'unsuccessful_change_password'           => 'Не вдалось змінити пароль.',
+    'update'                                 => 'Оновити працівника',
+    'username'                               => 'Ім\'я користувача',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Ім\'я користувача повинно бути не менше 5 символів.',
+    'username_required'                      => 'Ім\'я користувача - обов\'язкове поле.',
 ];
diff --git a/app/Language/uk/Error.php b/app/Language/uk/Error.php
index 0729636e8..618494c07 100644
--- a/app/Language/uk/Error.php
+++ b/app/Language/uk/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "У вас немає дозволу на доступ до модуля",
-    "unknown"              => "Невідомий",
+    'no_permission_module'           => 'У вас немає дозволу на доступ до модуля',
+    'unable_to_create_env_file'      => 'Не вдалося створити {filePath} для налаштування throttle.key',
+    'unable_to_lock_file'            => 'Не вдалося заблокувати {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Не вдалося відкрити {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Не вдалося зберегти throttle.key у {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Не вдалося прочитати {filePath} для налаштування throttle.key',
+    'unknown'                        => 'Невідомий',
 ];
diff --git a/app/Language/uk/Items.php b/app/Language/uk/Items.php
index 097053790..e7194a0f8 100644
--- a/app/Language/uk/Items.php
+++ b/app/Language/uk/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Додати/видалити товар.",
-    "allow_alt_description"              => "Дозволити альтернативний опис",
-    "amount_entry"                       => "Введення кількості",
-    "bulk_edit"                          => "Масове редагування",
-    "buy_price_required"                 => "Ціна закупівлі - обов'язкове поле.",
-    "cannot_be_deleted"                  => "Неможливо видалити вибраний товар(и), так як відбувається його (їх) продаж.",
-    "cannot_find_item"                   => "Товар не знайдено.",
-    "categories"                         => "",
-    "category"                           => "Категорія",
-    "category_new"                       => "",
-    "category_required"                  => "Категорія - обов'язкове поле.",
-    "change_all_to_allow_alt_desc"       => "Дозволити альтернативний опис для всіх товарів.",
-    "change_all_to_not_allow_allow_desc" => "Не дозволяти альтернативний опис для всіх товарів.",
-    "change_all_to_serialized"           => "Змінити все в серіалізоване",
-    "change_all_to_unserialized"         => "Змінити все в несеріалізоване",
-    "change_image"                       => "Змінити зображення",
-    "confirm_bulk_edit"                  => "Ви впевнені, що хочете редагувати вибрані товари?",
-    "confirm_bulk_edit_wipe_taxes"       => "Вся податкова інформація про товари буде змінена.",
-    "confirm_delete"                     => "Ви впевнені, що хочете видалити вибрані товари?",
-    "confirm_restore"                    => "Ви впевнені, що хочете відновити вибрані товари?",
-    "cost_price"                         => "Оптова ціна",
-    "cost_price_number"                  => "Оптова ціна повинна бути числом.",
-    "cost_price_required"                => "Оптова ціна - обов'язкове поле.",
-    "count"                              => "Оновити інвентар",
-    "csv_import_failed"                  => "Помилка імпорту CSV",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Завандажений файл порожній або відформатований неправильно.",
-    "csv_import_partially_failed"        => "У рядках виявлено {0} помилки імпортування елементів: {1}. Не було імпортовано жодних рядків.",
-    "csv_import_success"                 => "Імпорт товару CSV успішний.",
-    "current_quantity"                   => "Поточна кількість",
-    "default_pack_name"                  => "Кожен",
-    "description"                        => "Опис",
-    "details_count"                      => "Детальна інвентаризація",
-    "do_nothing"                         => "Нічого не робити",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Відредагуйте потрібні поля вибраних товарів.",
-    "edit_multiple_items"                => "Редагування декількох товарів",
-    "empty_upc_items"                    => "Відсутній штрих-код товарів",
-    "error_adding_updating"              => "Помилка при додаванні/оновленні товару",
-    "error_updating_multiple"            => "Помилка при оновленні товарів",
-    "generate_barcodes"                  => "Згенерувати штрих-коди",
-    "hsn_code"                           => "Узгоджена номенклатура системи",
-    "image"                              => "Зображення",
-    "import_items_csv"                   => "Імпорт товару з CSV",
-    "info_provided_by"                   => "Інформація надана (ким)",
-    "inventory"                          => "Інвентаризація",
-    "inventory_CSV_import_quantity"      => "Кількість, імпортована з CSV",
-    "inventory_comments"                 => "Коментарі",
-    "inventory_data_tracking"            => "Відстеження даних інвентаря",
-    "inventory_date"                     => "Дата",
-    "inventory_employee"                 => "Працівник",
-    "inventory_in_out_quantity"          => "Кількість Входів/Виходів",
-    "inventory_remarks"                  => "Нотатки",
-    "is_deleted"                         => "Видалений",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Товар має серійний номер",
-    "item"                               => "Товар",
-    "item_id"                            => "",
-    "item_number"                        => "Штрих-код",
-    "item_number_duplicate"              => "Такий номер товару вже існує в базі даних.",
-    "kit"                                => "Комплект",
-    "location"                           => "Місцерозташування",
-    "low_inventory_items"                => "Товарів немає в наявності",
-    "low_sell_item"                      => "Товар з низьким продажем",
-    "manually_editing_of_quantity"       => "Редагувати кількість вручну",
-    "markup"                             => "",
-    "name"                               => "Назва товару",
-    "name_required"                      => "Назва товару - обов’язкове поле.",
-    "new"                                => "Новий товар",
-    "no_description_items"               => "Товари без опису",
-    "no_items_to_display"                => "Немає товарів для відображення.",
-    "none"                               => "Нічого",
-    "none_selected"                      => "Ви не обрали жодного товару для редагування",
-    "nonstock"                           => "Немає в наявності",
-    "number_information"                 => "Номер товару",
-    "number_required"                    => "Штрих-код - обов'язкове поле.",
-    "one_or_multiple"                    => "Товар(и)",
-    "pack_name"                          => "Назва пакування",
-    "qty_per_pack"                       => "Кількість в упаковці",
-    "quantity"                           => "Кількість",
-    "quantity_number"                    => "Кількість має бути числом.",
-    "quantity_required"                  => "Кількість - обов’язкове поле.",
-    "receiving_quantity"                 => "Отримана кількість",
-    "remove_image"                       => "Видалити зображення",
-    "reorder_level"                      => "Обсяг перезамовлення",
-    "reorder_level_number"               => "Обсяг перезамовлення має бути число.",
-    "reorder_level_required"             => "Рівень упорядкування - обов'язкове поле.",
-    "retrive_item_info"                  => "Отримати інформацію про товар",
-    "sales_tax_1"                        => "Податок з продажів",
-    "sales_tax_2"                        => "ППодаток з продажів 2",
-    "search_attributes"                  => "Пошук атрибутів",
-    "select_image"                       => "Виберіть зображення",
-    "serialized_items"                   => "Серіалізовані товари",
-    "standard"                           => "Стандартний",
-    "stock"                              => "Склад",
-    "stock_location"                     => "Розташування складу",
-    "stock_type"                         => "Тип складу",
-    "successful_adding"                  => "Товар успішно додано",
-    "successful_bulk_edit"               => "Вибрані товари успішно оновлено",
-    "successful_deleted"                 => "Вибрані товари успішно видалено",
-    "successful_updating"                => "Товар успішно оновлено",
-    "supplier"                           => "Постачальник",
-    "tax_1"                              => "Податок 1",
-    "tax_2"                              => "Податок 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Тип податку",
-    "tax_percent"                        => "Податковий відсоток",
-    "tax_percent_number"                 => "Податковий відсоток має бути числом",
-    "tax_percent_required"               => "Податковий відсоток - обов'язкове поле.",
-    "tax_percents"                       => "Податкові відсотки",
-    "temp"                               => "Тимчасовий",
-    "type"                               => "Тип товару",
-    "unit_price"                         => "Роздрібна ціна",
-    "unit_price_number"                  => "Роздрібна ціна має бути числом.",
-    "unit_price_required"                => "Роздрібна ціна - обов'язкове поле.",
-    "upc_database"                       => "UPC база данх",
-    "update"                             => "Оновити Товар",
-    "use_inventory_menu"                 => "Використайте меню інвентаря",
+    'add_minus'                          => 'Додати/видалити товар.',
+    'allow_alt_description'              => 'Дозволити альтернативний опис',
+    'amount_entry'                       => 'Введення кількості',
+    'bulk_edit'                          => 'Масове редагування',
+    'buy_price_required'                 => 'Ціна закупівлі - обов\'язкове поле.',
+    'cannot_be_deleted'                  => 'Неможливо видалити вибраний товар(и), так як відбувається його (їх) продаж.',
+    'cannot_find_item'                   => 'Товар не знайдено.',
+    'categories'                         => '',
+    'category'                           => 'Категорія',
+    'category_new'                       => '',
+    'category_required'                  => 'Категорія - обов\'язкове поле.',
+    'change_all_to_allow_alt_desc'       => 'Дозволити альтернативний опис для всіх товарів.',
+    'change_all_to_not_allow_allow_desc' => 'Не дозволяти альтернативний опис для всіх товарів.',
+    'change_all_to_serialized'           => 'Змінити все в серіалізоване',
+    'change_all_to_unserialized'         => 'Змінити все в несеріалізоване',
+    'change_image'                       => 'Змінити зображення',
+    'confirm_bulk_edit'                  => 'Ви впевнені, що хочете редагувати вибрані товари?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Вся податкова інформація про товари буде змінена.',
+    'confirm_delete'                     => 'Ви впевнені, що хочете видалити вибрані товари?',
+    'confirm_restore'                    => 'Ви впевнені, що хочете відновити вибрані товари?',
+    'cost_price'                         => 'Оптова ціна',
+    'cost_price_number'                  => 'Оптова ціна повинна бути числом.',
+    'cost_price_required'                => 'Оптова ціна - обов\'язкове поле.',
+    'count'                              => 'Оновити інвентар',
+    'csv_import_failed'                  => 'Помилка імпорту CSV',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Завандажений файл порожній або відформатований неправильно.',
+    'csv_import_partially_failed'        => 'У рядках виявлено {0} помилки імпортування елементів: {1}. Не було імпортовано жодних рядків.',
+    'csv_import_success'                 => 'Імпорт товару CSV успішний.',
+    'current_quantity'                   => 'Поточна кількість',
+    'default_pack_name'                  => 'Кожен',
+    'description'                        => 'Опис',
+    'details_count'                      => 'Детальна інвентаризація',
+    'do_nothing'                         => 'Нічого не робити',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Відредагуйте потрібні поля вибраних товарів.',
+    'edit_multiple_items'                => 'Редагування декількох товарів',
+    'empty_upc_items'                    => 'Відсутній штрих-код товарів',
+    'error_adding_updating'              => 'Помилка при додаванні/оновленні товару',
+    'error_updating_multiple'            => 'Помилка при оновленні товарів',
+    'generate_barcodes'                  => 'Згенерувати штрих-коди',
+    'hsn_code'                           => 'Узгоджена номенклатура системи',
+    'image'                              => 'Зображення',
+    'import_items_csv'                   => 'Імпорт товару з CSV',
+    'info_provided_by'                   => 'Інформація надана (ким)',
+    'inventory'                          => 'Інвентаризація',
+    'inventory_CSV_import_quantity'      => 'Кількість, імпортована з CSV',
+    'inventory_comments'                 => 'Коментарі',
+    'inventory_data_tracking'            => 'Відстеження даних інвентаря',
+    'inventory_date'                     => 'Дата',
+    'inventory_employee'                 => 'Працівник',
+    'inventory_in_out_quantity'          => 'Кількість Входів/Виходів',
+    'inventory_remarks'                  => 'Нотатки',
+    'is_deleted'                         => 'Видалений',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Товар має серійний номер',
+    'item'                               => 'Товар',
+    'item_id'                            => '',
+    'item_number'                        => 'Штрих-код',
+    'item_number_duplicate'              => 'Такий номер товару вже існує в базі даних.',
+    'item_number_invalid'                => 'Номер товару містить недопустимі символи.',
+    'kit'                                => 'Комплект',
+    'location'                           => 'Місцерозташування',
+    'low_inventory_items'                => 'Товарів немає в наявності',
+    'low_sell_item'                      => 'Товар з низьким продажем',
+    'manually_editing_of_quantity'       => 'Редагувати кількість вручну',
+    'markup'                             => '',
+    'name'                               => 'Назва товару',
+    'name_required'                      => 'Назва товару - обов’язкове поле.',
+    'new'                                => 'Новий товар',
+    'no_description_items'               => 'Товари без опису',
+    'no_items_to_display'                => 'Немає товарів для відображення.',
+    'none'                               => 'Нічого',
+    'none_selected'                      => 'Ви не обрали жодного товару для редагування',
+    'nonstock'                           => 'Немає в наявності',
+    'number_information'                 => 'Номер товару',
+    'number_required'                    => 'Штрих-код - обов\'язкове поле.',
+    'one_or_multiple'                    => 'Товар(и)',
+    'pack_name'                          => 'Назва пакування',
+    'qty_per_pack'                       => 'Кількість в упаковці',
+    'quantity'                           => 'Кількість',
+    'quantity_number'                    => 'Кількість має бути числом.',
+    'quantity_required'                  => 'Кількість - обов’язкове поле.',
+    'receiving_quantity'                 => 'Отримана кількість',
+    'remove_image'                       => 'Видалити зображення',
+    'reorder_level'                      => 'Обсяг перезамовлення',
+    'reorder_level_number'               => 'Обсяг перезамовлення має бути число.',
+    'reorder_level_required'             => 'Рівень упорядкування - обов\'язкове поле.',
+    'retrive_item_info'                  => 'Отримати інформацію про товар',
+    'sales_tax_1'                        => 'Податок з продажів',
+    'sales_tax_2'                        => 'ППодаток з продажів 2',
+    'search_attributes'                  => 'Пошук атрибутів',
+    'select_image'                       => 'Виберіть зображення',
+    'serialized_items'                   => 'Серіалізовані товари',
+    'standard'                           => 'Стандартний',
+    'stock'                              => 'Склад',
+    'stock_location'                     => 'Розташування складу',
+    'stock_type'                         => 'Тип складу',
+    'successful_adding'                  => 'Товар успішно додано',
+    'successful_bulk_edit'               => 'Вибрані товари успішно оновлено',
+    'successful_deleted'                 => 'Вибрані товари успішно видалено',
+    'successful_updating'                => 'Товар успішно оновлено',
+    'supplier'                           => 'Постачальник',
+    'tax_1'                              => 'Податок 1',
+    'tax_2'                              => 'Податок 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Тип податку',
+    'tax_name_invalid'                   => 'Назва податку містить недопустимі символи.',
+    'tax_percent'                        => 'Податковий відсоток',
+    'tax_percent_number'                 => 'Податковий відсоток має бути числом',
+    'tax_percent_required'               => 'Податковий відсоток - обов\'язкове поле.',
+    'tax_percents'                       => 'Податкові відсотки',
+    'temp'                               => 'Тимчасовий',
+    'type'                               => 'Тип товару',
+    'unit_price'                         => 'Роздрібна ціна',
+    'unit_price_number'                  => 'Роздрібна ціна має бути числом.',
+    'unit_price_required'                => 'Роздрібна ціна - обов\'язкове поле.',
+    'upc_database'                       => 'UPC база данх',
+    'update'                             => 'Оновити Товар',
+    'use_inventory_menu'                 => 'Використайте меню інвентаря',
 ];
diff --git a/app/Language/uk/Login.php b/app/Language/uk/Login.php
index d63460602..3515d2636 100644
--- a/app/Language/uk/Login.php
+++ b/app/Language/uk/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Я не робот.",
-    "go"                            => "Увійти",
-    "invalid_gcaptcha"              => "Підтвердіть, що ви не робот.",
-    "invalid_installation"          => "Налаштування невірні, перевірте php.ini.",
-    "invalid_username_and_password" => "Невірний логін або пароль.",
-    "login"                         => "Логін",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "Пароль",
-    "required_username"             => "",
-    "username"                      => "Ім'я користувача",
-    "welcome"                       => "",
+    "gcaptcha"                            => "Я не робот.",
+    "go"                                  => "Увійти",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Підтвердіть, що ви не робот.",
+    "invalid_installation"                => "Налаштування невірні, перевірте php.ini.",
+    "invalid_username_and_password"       => "Невірний логін або пароль.",
+    "login"                               => "Логін",
+    "logout"                              => "",
+    "migrating_database"                  => "Міграція бази даних",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "База даних успішно перенесена!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Пароль",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Забагато спроб. Будь ласка, зачекайте трохи і спробуйте знову.',
+    "username"                            => "Ім'я користувача",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/uk/Reports.php b/app/Language/uk/Reports.php
index 88e2fb2f8..0d52ea2cb 100644
--- a/app/Language/uk/Reports.php
+++ b/app/Language/uk/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Ставка податку",
     "taxes"                                   => "Податки",
     "taxes_summary_report"                    => "Підсумковий звіт про податки",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Сума",
     "total_inventory_value"                   => "Загальна вартість товарів",
     "total_low_sell_quantity"                 => "Загальна кількість низького рівня продажу",
diff --git a/app/Language/uk/Sales.php b/app/Language/uk/Sales.php
index 2524d3a3d..a9ad1432e 100644
--- a/app/Language/uk/Sales.php
+++ b/app/Language/uk/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Доступні бали",
-    "rewards_package"                  => "Винагороди",
-    "rewards_remaining_balance"        => "Залишкова цінність бонусних балів становить ",
-    "account_number"                   => "Номер рахунку",
-    "add_payment"                      => "Додати платіж",
-    "amount_due"                       => "Сума заборгованості",
-    "amount_tendered"                  => "Запропонована сума",
-    "authorized_signature"             => "Підпис уповноваженої особи",
-    "cancel_sale"                      => "Відмінити",
-    "cash"                             => "Готівка",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Корегування готівки",
-    "cash_deposit"                     => "Готівковий депозит",
-    "cash_filter"                      => "Готівка",
-    "change_due"                       => "Змінити належне(борг)",
-    "change_price"                     => "Змінити ціну продажу",
-    "check"                            => "Перевірити",
-    "check_balance"                    => "Перевірити залишок",
-    "check_filter"                     => "Перевірити",
-    "close"                            => "",
-    "comment"                          => "Коментувати",
-    "comments"                         => "Коментарі",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Завершити продаж",
-    "confirm_cancel_sale"              => "Ви впевнені, що хочете скасувати цей продаж? Всі товари буде видалено.",
-    "confirm_delete"                   => "Ви впевнені, що хочете видалити вибрані продажі?",
-    "confirm_restore"                  => "Ви впевнені, що хочете відновити вибрані продажі?",
-    "credit"                           => "Кредитна карта",
-    "credit_deposit"                   => "Кредитний депозит",
-    "credit_filter"                    => "Кредитна картка",
-    "current_table"                    => "",
-    "customer"                         => "Клієнт",
-    "customer_address"                 => "Адреса клієнта",
-    "customer_discount"                => "Знижка",
-    "customer_email"                   => "Електронна пошта клієнта",
-    "customer_location"                => "Місцезнаходження клієнта",
-    "customer_mailchimp_status"        => "Статус клієнта mailchimp",
-    "customer_optional"                => "(Потрібно для належних платежів)",
-    "customer_required"                => "(Обов'язково)",
-    "customer_total"                   => "Всього",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Дата продажу",
-    "date_range"                       => "Проміжок часу",
-    "date_required"                    => "Необхідно ввести правильну дату.",
-    "date_type"                        => "Дата мусить бути заповнена.",
-    "debit"                            => "Дебетова карта",
-    "debit_filter"                     => "",
-    "delete"                           => "Дозволити видалення",
-    "delete_confirmation"              => "Ви впевнені, що хочете видалити цей продаж, цю дію не можливо скасувати.",
-    "delete_entire_sale"               => "Видалити всі продажі",
-    "delete_successful"                => "Продаж успішно видалено.",
-    "delete_unsuccessful"              => "Не вдалося видалити продаж.",
-    "description_abbrv"                => "Опис абревіатурою.",
-    "discard"                          => "Скинути",
-    "discard_quote"                    => "Скинути ціну",
-    "discount"                         => "Знижка %",
-    "discount_included"                => "% Знижка включена",
-    "discount_short"                   => "% Мала знижка",
-    "due"                              => "Борг",
-    "due_filter"                       => "Борг",
-    "edit"                             => "Редагувати",
-    "edit_item"                        => "Редагувати товар",
-    "edit_sale"                        => "Редагувати продажі",
-    "email_receipt"                    => "Відправити квитанції електронною поштою",
-    "employee"                         => "Працівник",
-    "entry"                            => "Вхід",
-    "error_editing_item"               => "Помилка редагування товару",
-    "find_or_scan_item"                => "Знайти/Сканувати товар",
-    "find_or_scan_item_or_receipt"     => "Знайти/Сканувати товар або квитанцію",
-    "giftcard"                         => "Подарункова карта",
-    "giftcard_balance"                 => "Баланс подарункової картки",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Номер подарункової карти",
-    "group_by_category"                => "Група за категорією",
-    "group_by_type"                    => "Група за типом",
-    "hsn"                              => "HSN",
-    "id"                               => "Номер продажі",
-    "include_prices"                   => "Включити ціни?",
-    "invoice"                          => "Рахунок-фактура",
-    "invoice_confirm"                  => "Цей рахунок на оплату буде відправленo",
-    "invoice_enable"                   => "Створити рахунок-фактуру",
-    "invoice_filter"                   => "Фільтер рахунку-фактури",
-    "invoice_no_email"                 => "У цього клієнта немає дійсної адреси електронної пошти.",
-    "invoice_number"                   => "Рахунок-фактура #",
-    "invoice_number_duplicate"         => "Рахунок-фактура з таким номером уже існує.",
-    "invoice_sent"                     => "Рахунок-фактуру надіслано",
-    "invoice_total"                    => "Сума рахунків-фактур",
-    "invoice_type_custom_invoice"      => "Рахунок-фактура для клієнта",
-    "invoice_type_custom_tax_invoice"  => "Податковий рахунок-фактура для клієнта",
-    "invoice_type_invoice"             => "Тип рахунку-фактури (invoice.php)",
-    "invoice_type_tax_invoice"         => "Податковий рахунок-фактура",
-    "invoice_unsent"                   => "Не вдалося надіслати рахунок-фактуру",
-    "invoice_update"                   => "Перерахунок",
-    "item_insufficient_of_stock"       => "Недостатньо товару на складі.",
-    "item_name"                        => "Назва товару",
-    "item_number"                      => "Номер товару",
-    "item_out_of_stock"                => "Товар відсутній на складі.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Режим журналу",
-    "must_enter_numeric"               => "Введена сума повинна бути числом.",
-    "must_enter_numeric_giftcard"      => "Номер подарункової картки повинен бути цифровим.",
-    "new_customer"                     => "Новий клієнт",
-    "new_item"                         => "Новий товар",
-    "no_description"                   => "Без опису",
-    "no_filter"                        => "Все",
-    "no_items_in_cart"                 => "В кошику немає товарів.",
-    "no_sales_to_display"              => "Немає продаж для відображення.",
-    "none_selected"                    => "Ви не обрали продажі для видалення.",
-    "nontaxed_ind"                     => " Неоподатковуваний ІД ",
-    "not_authorized"                   => "Ця дія не дозволена.",
-    "one_or_multiple"                  => "Продаж(і)",
-    "payment"                          => "Вид оплати",
-    "payment_amount"                   => "Кількість",
-    "payment_not_cover_total"          => "Оплата не покриває загальну суму.",
-    "payment_type"                     => "Тип",
-    "payments"                         => "",
-    "payments_total"                   => "Суми платежів",
-    "price"                            => "Ціна",
-    "print_after_sale"                 => "Роздрукувати після продажу",
-    "quantity"                         => "Кількість",
-    "quantity_less_than_reorder_level" => "Увага! Бажана кількість нижче рівня замовлення для цього товару.",
-    "quantity_less_than_zero"          => "Увага! Бажана кількість є недоступною. Ви все ще можете обробляти продажі, але перевірте товар.",
-    "quantity_of_items"                => "Кількість {0} товарів",
-    "quote"                            => "Котирування",
-    "quote_number"                     => "Номер котирування",
-    "quote_number_duplicate"           => "Номер котирування повинен бути унікальним.",
-    "quote_sent"                       => "Котирування відправлено",
-    "quote_unsent"                     => "Не вдалося надіслати котирування",
-    "receipt"                          => "Квитанція",
-    "receipt_no_email"                 => "Цей клієнт не має дійсної електронної адреси.",
-    "receipt_number"                   => "Номер квитанції",
-    "receipt_sent"                     => "Квитанція відправлена",
-    "receipt_unsent"                   => "Не вдалося надіслати квитанцію",
-    "refund"                           => "Тип відшкодування",
-    "register"                         => "Журнал продажів",
-    "remove_customer"                  => "Видалити клієнта",
-    "remove_discount"                  => "",
-    "return"                           => "Повернути",
-    "rewards"                          => "Бонусні бали",
-    "rewards_balance"                  => "Баланс бонусних балів",
-    "sale"                             => "Продаж",
-    "sale_by_invoice"                  => "Продаж за рахунком",
-    "sale_for_customer"                => "Клієнт:",
-    "sale_time"                        => "Час продажу",
-    "sales_tax"                        => "Податок з продажів",
-    "sales_total"                      => "",
-    "select_customer"                  => "Оберіть клієнта",
-    "send_invoice"                     => "Відправити рахунок-фактуру",
-    "send_quote"                       => "Надіслати котирвання продажів",
-    "send_receipt"                     => "Відправити квитанцію",
-    "send_work_order"                  => "Надіслати робочий наказ",
-    "serial"                           => "Серійний номер",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Показати рахунок-фактуру",
-    "show_receipt"                     => "Показати квитанцію",
-    "start_typing_customer_name"       => "Почніть вводити ім’я клієнта...",
-    "start_typing_item_name"           => "Почніть вводити назву товару або скористайтесь штрих-кодом ...",
-    "stock"                            => "Склад",
-    "stock_location"                   => "склад",
-    "sub_total"                        => "Проміжний підсумок",
-    "successfully_deleted"             => "Продажі успішно видалено",
-    "successfully_restored"            => "Продажі успішно відновлено",
-    "successfully_suspended_sale"      => "Продажі успішно призупинені.",
-    "successfully_updated"             => "Продажі успішно оновлено.",
-    "suspend_sale"                     => "Призупинені продажі",
-    "suspended_doc_id"                 => "Документ",
-    "suspended_sale_id"                => "ІН",
-    "suspended_sales"                  => "Призупинені",
-    "table"                            => "Таблиця",
-    "takings"                          => "Денний оборот",
-    "tax"                              => "Податок",
-    "tax_id"                           => "ІПН",
-    "tax_invoice"                      => "Податкова накладна",
-    "tax_percent"                      => "Податковий відсоток",
-    "taxed_ind"                        => "П",
-    "total"                            => "Сума",
-    "total_tax_exclusive"              => "Без податку",
-    "transaction_failed"               => "Не вдалося здійснити продажну транзакцію.",
-    "unable_to_add_item"               => "Помилка додавання товару до продажу",
-    "unsuccessfully_deleted"           => "Продажі невдало видалено.",
-    "unsuccessfully_restored"          => "Не вдалось відновити продажі.",
-    "unsuccessfully_suspended_sale"    => "Не вдалося призупинити продаж.",
-    "unsuccessfully_updated"           => "Помилка оновлення продажу.",
-    "unsuspend"                        => "Невитрачені",
-    "unsuspend_and_delete"             => "Вперед",
-    "update"                           => "Редагувати",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Робоче замовлення (наряд на роботу)",
-    "work_order_number"                => "Номер робочого замовлення",
-    "work_order_number_duplicate"      => "Такий номер робочого замовлення уже існує.",
-    "work_order_sent"                  => "Замовлення відправлено",
-    "work_order_unsent"                => "Не вдалось отримати робоче замовлення",
+    'account_number'                    => 'Номер рахунку',
+    'add_payment'                       => 'Додати платіж',
+    'amount_due'                        => 'Сума заборгованості',
+    'amount_due_not_covered'            => 'Платежі не покривають суму до сплати.',
+    'amount_tendered'                   => 'Запропонована сума',
+    'authorized_signature'              => 'Підпис уповноваженої особи',
+    'cancel_sale'                       => 'Відмінити',
+    'cash'                              => 'Готівка',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Корегування готівки',
+    'cash_deposit'                      => 'Готівковий депозит',
+    'cash_filter'                       => 'Готівка',
+    'change_due'                        => 'Змінити належне(борг)',
+    'change_price'                      => 'Змінити ціну продажу',
+    'check'                             => 'Перевірити',
+    'check_balance'                     => 'Перевірити залишок',
+    'check_filter'                      => 'Перевірити',
+    'close'                             => '',
+    'comment'                           => 'Коментувати',
+    'comments'                          => 'Коментарі',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Завершити продаж',
+    'confirm_cancel_sale'               => 'Ви впевнені, що хочете скасувати цей продаж? Всі товари буде видалено.',
+    'confirm_delete'                    => 'Ви впевнені, що хочете видалити вибрані продажі?',
+    'confirm_restore'                   => 'Ви впевнені, що хочете відновити вибрані продажі?',
+    'credit'                            => 'Кредитна карта',
+    'credit_deposit'                    => 'Кредитний депозит',
+    'credit_filter'                     => 'Кредитна картка',
+    'current_table'                     => '',
+    'customer'                          => 'Клієнт',
+    'customer_address'                  => 'Адреса клієнта',
+    'customer_discount'                 => 'Знижка',
+    'customer_email'                    => 'Електронна пошта клієнта',
+    'customer_location'                 => 'Місцезнаходження клієнта',
+    'customer_mailchimp_status'         => 'Статус клієнта mailchimp',
+    'customer_optional'                 => '(Потрібно для належних платежів)',
+    'customer_required'                 => "(Обов'язково)",
+    'customer_total'                    => 'Всього',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Доступні бали',
+    'daily_sales'                       => '',
+    'date'                              => 'Дата продажу',
+    'date_range'                        => 'Проміжок часу',
+    'date_required'                     => 'Необхідно ввести правильну дату.',
+    'date_type'                         => 'Дата мусить бути заповнена.',
+    'debit'                             => 'Дебетова карта',
+    'debit_filter'                      => '',
+    'delete'                            => 'Дозволити видалення',
+    'delete_confirmation'               => 'Ви впевнені, що хочете видалити цей продаж, цю дію не можливо скасувати.',
+    'delete_entire_sale'                => 'Видалити всі продажі',
+    'delete_successful'                 => 'Продаж успішно видалено.',
+    'delete_unsuccessful'               => 'Не вдалося видалити продаж.',
+    'description_abbrv'                 => 'Опис абревіатурою.',
+    'discard'                           => 'Скинути',
+    'discard_quote'                     => 'Скинути ціну',
+    'discount'                          => 'Знижка %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Знижка включена',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '% Мала знижка',
+    'due'                               => 'Борг',
+    'due_filter'                        => 'Борг',
+    'edit'                              => 'Редагувати',
+    'edit_item'                         => 'Редагувати товар',
+    'edit_sale'                         => 'Редагувати продажі',
+    'email_receipt'                     => 'Відправити квитанції електронною поштою',
+    'employee'                          => 'Працівник',
+    'entry'                             => 'Вхід',
+    'error_editing_item'                => 'Помилка редагування товару',
+    'find_or_scan_item'                 => 'Знайти/Сканувати товар',
+    'find_or_scan_item_or_receipt'      => 'Знайти/Сканувати товар або квитанцію',
+    'giftcard'                          => 'Подарункова карта',
+    'giftcard_balance'                  => 'Баланс подарункової картки',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Номер подарункової карти',
+    'group_by_category'                 => 'Група за категорією',
+    'group_by_type'                     => 'Група за типом',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Номер продажі',
+    'include_prices'                    => 'Включити ціни?',
+    'insufficient_giftcard_balance'     => 'Недостатньо коштів на подарунковій карті для цієї платіжи.',
+    'insufficient_reward_points'        => 'Недостатньо бонусних балів для цієї платіжи.',
+    'invoice'                           => 'Рахунок-фактура',
+    'invoice_confirm'                   => 'Цей рахунок на оплату буде відправленo',
+    'invoice_enable'                    => 'Створити рахунок-фактуру',
+    'invoice_filter'                    => 'Фільтер рахунку-фактури',
+    'invoice_no_email'                  => 'У цього клієнта немає дійсної адреси електронної пошти.',
+    'invoice_number'                    => 'Рахунок-фактура #',
+    'invoice_number_duplicate'          => 'Рахунок-фактура з таким номером уже існує.',
+    'invoice_sent'                      => 'Рахунок-фактуру надіслано',
+    'invoice_total'                     => 'Сума рахунків-фактур',
+    'invoice_type_custom_invoice'       => 'Рахунок-фактура для клієнта',
+    'invoice_type_custom_tax_invoice'   => 'Податковий рахунок-фактура для клієнта',
+    'invoice_type_invoice'              => 'Тип рахунку-фактури (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Податковий рахунок-фактура',
+    'invoice_unsent'                    => 'Не вдалося надіслати рахунок-фактуру',
+    'invoice_update'                    => 'Перерахунок',
+    'item_insufficient_of_stock'        => 'Недостатньо товару на складі.',
+    'item_name'                         => 'Назва товару',
+    'item_number'                       => 'Номер товару',
+    'item_out_of_stock'                 => 'Товар відсутній на складі.',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => 'Режим журналу',
+    'must_enter_numeric'                => 'Введена сума повинна бути числом.',
+    'must_enter_numeric_giftcard'       => 'Номер подарункової картки повинен бути цифровим.',
+    'must_enter_reference_code'         => 'Необхідно ввести довідковий/пошуковий номер.',
+    'negative_amount_tendered'          => 'Запропонована сума не може бути від\'ємною.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Новий клієнт',
+    'new_item'                          => 'Новий товар',
+    'no_description'                    => 'Без опису',
+    'no_filter'                         => 'Все',
+    'no_items_in_cart'                  => 'В кошику немає товарів.',
+    'no_sales_to_display'               => 'Немає продаж для відображення.',
+    'none_selected'                     => 'Ви не обрали продажі для видалення.',
+    'nontaxed_ind'                      => ' Неоподатковуваний ІД ',
+    'not_authorized'                    => 'Ця дія не дозволена.',
+    'one_or_multiple'                   => 'Продаж(і)',
+    'payment'                           => 'Вид оплати',
+    'payment_amount'                    => 'Кількість',
+    'payment_not_cover_total'           => 'Оплата не покриває загальну суму.',
+    'payment_type'                      => 'Тип',
+    'payments'                          => '',
+    'payments_total'                    => 'Суми платежів',
+    'price'                             => 'Ціна',
+    'print_after_sale'                  => 'Роздрукувати після продажу',
+    'quantity'                          => 'Кількість',
+    'quantity_less_than_reorder_level'  => 'Увага! Бажана кількість нижче рівня замовлення для цього товару.',
+    'quantity_less_than_zero'           => 'Увага! Бажана кількість є недоступною. Ви все ще можете обробляти продажі, але перевірте товар.',
+    'quantity_of_items'                 => 'Кількість {0} товарів',
+    'quote'                             => 'Котирування',
+    'quote_number'                      => 'Номер котирування',
+    'quote_number_duplicate'            => 'Номер котирування повинен бути унікальним.',
+    'quote_sent'                        => 'Котирування відправлено',
+    'quote_unsent'                      => 'Не вдалося надіслати котирування',
+    'receipt'                           => 'Квитанція',
+    'receipt_no_email'                  => 'Цей клієнт не має дійсної електронної адреси.',
+    'receipt_number'                    => 'Номер квитанції',
+    'receipt_sent'                      => 'Квитанція відправлена',
+    'receipt_unsent'                    => 'Не вдалося надіслати квитанцію',
+    'reference_code'                    => 'Код посилання на платіж',
+    'reference_code_invalid_characters' => 'Код посилання повинен містити лише літери та цифри.',
+    'reference_code_length_error'       => 'Довжина коду посилання недопустима.',
+    'refund'                            => 'Тип відшкодування',
+    'register'                          => 'Журнал продажів',
+    'remove_customer'                   => 'Видалити клієнта',
+    'remove_discount'                   => '',
+    'return'                            => 'Повернути',
+    'rewards'                           => 'Бонусні бали',
+    'rewards_balance'                   => 'Баланс бонусних балів',
+    'rewards_package'                   => 'Винагороди',
+    'rewards_remaining_balance'         => 'Залишкова цінність бонусних балів становить ',
+    'sale'                              => 'Продаж',
+    'sale_by_invoice'                   => 'Продаж за рахунком',
+    'sale_for_customer'                 => 'Клієнт:',
+    'sale_time'                         => 'Час продажу',
+    'sales_tax'                         => 'Податок з продажів',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Оберіть клієнта',
+    'send_invoice'                      => 'Відправити рахунок-фактуру',
+    'send_quote'                        => 'Надіслати котирвання продажів',
+    'send_receipt'                      => 'Відправити квитанцію',
+    'send_work_order'                   => 'Надіслати робочий наказ',
+    'serial'                            => 'Серійний номер',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Показати рахунок-фактуру',
+    'show_receipt'                      => 'Показати квитанцію',
+    'start_typing_customer_name'        => 'Почніть вводити ім’я клієнта...',
+    'start_typing_item_name'            => 'Почніть вводити назву товару або скористайтесь штрих-кодом ...',
+    'stock'                             => 'Склад',
+    'stock_location'                    => 'склад',
+    'sub_total'                         => 'Проміжний підсумок',
+    'successfully_deleted'              => 'Продажі успішно видалено',
+    'successfully_restored'             => 'Продажі успішно відновлено',
+    'successfully_suspended_sale'       => 'Продажі успішно призупинені.',
+    'successfully_updated'              => 'Продажі успішно оновлено.',
+    'suspend_sale'                      => 'Призупинені продажі',
+    'suspended_doc_id'                  => 'Документ',
+    'suspended_sale_id'                 => 'ІН',
+    'suspended_sales'                   => 'Призупинені',
+    'table'                             => 'Таблиця',
+    'takings'                           => 'Денний оборот',
+    'tax'                               => 'Податок',
+    'tax_id'                            => 'ІПН',
+    'tax_invoice'                       => 'Податкова накладна',
+    'tax_percent'                       => 'Податковий відсоток',
+    'taxed_ind'                         => 'П',
+    'total'                             => 'Сума',
+    'total_tax_exclusive'               => 'Без податку',
+    'transaction_failed'                => 'Не вдалося здійснити продажну транзакцію.',
+    'unable_to_add_item'                => 'Помилка додавання товару до продажу',
+    'unsuccessfully_deleted'            => 'Продажі невдало видалено.',
+    'unsuccessfully_restored'           => 'Не вдалось відновити продажі.',
+    'unsuccessfully_suspended_sale'     => 'Не вдалося призупинити продаж.',
+    'unsuccessfully_updated'            => 'Помилка оновлення продажу.',
+    'unsuspend'                         => 'Невитрачені',
+    'unsuspend_and_delete'              => 'Вперед',
+    'update'                            => 'Редагувати',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Робоче замовлення (наряд на роботу)',
+    'work_order_number'                 => 'Номер робочого замовлення',
+    'work_order_number_duplicate'       => 'Такий номер робочого замовлення уже існує.',
+    'work_order_sent'                   => 'Замовлення відправлено',
+    'work_order_unsent'                 => 'Не вдалось отримати робоче замовлення',
 ];
diff --git a/app/Language/ur/Attributes.php b/app/Language/ur/Attributes.php
index 27a2051be..8b46fb4f6 100644
--- a/app/Language/ur/Attributes.php
+++ b/app/Language/ur/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "وصف کے اندراج میں ':' یا '|' ممنوع ہیں",
-    "confirm_delete"                   => "کیا آپ منتخب شدہ کو حذف کرنا چاہتے ہیں ؟",
-    "confirm_restore"                  => "کیا آپ منتخب شدہ کو بحال کرنا چاہتے ہیں ؟",
-    "definition_cannot_be_deleted"     => "منتخب شدہ کو حذف نہیں کیا جا سکتا",
-    "definition_error_adding_updating" => "Attribute {0} could not be added or updated. Please check the error log.",
-    "definition_flags"                 => "Attribute Visibility",
-    "definition_group"                 => "Group",
-    "definition_id"                    => "Id",
-    "definition_name"                  => "Add Attribute",
-    "definition_name_required"         => "Attribute name is a required field",
-    "definition_one_or_multiple"       => "attribute(s)",
-    "definition_successful_adding"     => "You have successfully added item",
-    "definition_successful_deleted"    => "You have successfully deleted",
-    "definition_successful_updating"   => "You have successfully updated attribute",
-    "definition_type"                  => "Attribute Type",
-    "definition_type_required"         => "Attribute type is a required field",
-    "definition_unit"                  => "Measurement Unit",
-    "definition_values"                => "Attribute Values",
-    "new"                              => "New Attribute",
-    "no_attributes_to_display"         => "No Items to display",
-    "receipt_visibility"               => "Receipt",
-    "show_in_items"                    => "Show in items",
-    "show_in_items_visibility"         => "Items",
-    "show_in_receipt"                  => "Show in receipt",
-    "show_in_receivings"               => "Show in receivings",
-    "show_in_receivings_visibility"    => "Receivings",
-    "show_in_sales"                    => "Show in sales",
-    "show_in_sales_visibility"         => "Sales",
-    "update"                           => "Update Attribute",
+    'attribute_value_invalid_chars'    => 'وصف کے اندراج میں \':\' یا \'|\' ممنوع ہیں',
+    'confirm_delete'                   => 'کیا آپ منتخب شدہ کو حذف کرنا چاہتے ہیں ؟',
+    'confirm_restore'                  => 'کیا آپ منتخب شدہ کو بحال کرنا چاہتے ہیں ؟',
+    'definition_cannot_be_deleted'     => 'منتخب شدہ کو حذف نہیں کیا جا سکتا',
+    'definition_invalid_group' => '',
+    'definition_error_adding_updating' => 'Attribute {0} could not be added or updated. Please check the error log.',
+    'definition_flags'                 => 'Attribute Visibility',
+    'definition_group'                 => 'Group',
+    'definition_id'                    => 'Id',
+    'definition_name'                  => 'Add Attribute',
+    'definition_name_required'         => 'Attribute name is a required field',
+    'definition_one_or_multiple'       => 'attribute(s)',
+    'definition_successful_adding'     => 'You have successfully added item',
+    'definition_successful_deleted'    => 'You have successfully deleted',
+    'definition_successful_updating'   => 'You have successfully updated attribute',
+    'definition_type'                  => 'Attribute Type',
+    'definition_type_required'         => 'Attribute type is a required field',
+    'definition_unit'                  => 'Measurement Unit',
+    'definition_values'                => 'Attribute Values',
+    'new'                              => 'New Attribute',
+    'no_attributes_to_display'         => 'No Items to display',
+    'receipt_visibility'               => 'Receipt',
+    'show_in_items'                    => 'Show in items',
+    'show_in_items_visibility'         => 'Items',
+    'show_in_receipt'                  => 'Show in receipt',
+    'show_in_receivings'               => 'Show in receivings',
+    'show_in_receivings_visibility'    => 'Receivings',
+    'show_in_sales'                    => 'Show in sales',
+    'show_in_sales_visibility'         => 'Sales',
+    'show_in_search'                   => 'تلاش میں دکھائیں',
+    'show_in_search_visibility'        => 'تلاش',
+    'update'                           => 'Update Attribute',
 ];
diff --git a/app/Language/ur/Calendar.php b/app/Language/ur/Calendar.php
new file mode 100644
index 000000000..b3c9c5d15
--- /dev/null
+++ b/app/Language/ur/Calendar.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    "su"        => "",
+    "mo"        => "",
+    "tu"        => "",
+    "we"        => "",
+    "th"        => "",
+    "fr"        => "",
+    "sa"        => "",
+    "sun"       => "",
+    "mon"       => "",
+    "tue"       => "",
+    "wed"       => "",
+    "thu"       => "",
+    "fri"       => "",
+    "sat"       => "",
+    "sunday"    => "",
+    "monday"    => "",
+    "tuesday"   => "",
+    "wednesday" => "",
+    "thursday"  => "",
+    "friday"    => "",
+    "saturday"  => "",
+    "jan"       => "",
+    "feb"       => "",
+    "mar"       => "",
+    "apr"       => "",
+    "may"       => "",
+    "jun"       => "",
+    "jul"       => "",
+    "aug"       => "",
+    "sep"       => "",
+    "oct"       => "",
+    "nov"       => "",
+    "dec"       => "",
+    "january"   => "",
+    "february"  => "",
+    "march"     => "",
+    "april"     => "",
+    "mayl"      => "",
+    "june"      => "",
+    "july"      => "",
+    "august"    => "",
+    "september" => "",
+    "october"   => "",
+    "november"  => "",
+    "december"  => "",
+];
\ No newline at end of file
diff --git a/app/Language/ur/Config.php b/app/Language/ur/Config.php
index 057a805e2..3bab550bc 100644
--- a/app/Language/ur/Config.php
+++ b/app/Language/ur/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "",
-    "address_required"                          => "",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "",
-    "apostrophe"                                => "",
-    "backup_button"                             => "",
-    "backup_database"                           => "",
-    "barcode"                                   => "",
-    "barcode_company"                           => "",
-    "barcode_configuration"                     => "",
-    "barcode_content"                           => "",
-    "barcode_first_row"                         => "",
-    "barcode_font"                              => "",
-    "barcode_formats"                           => "",
-    "barcode_generate_if_empty"                 => "",
-    "barcode_height"                            => "",
-    "barcode_id"                                => "",
-    "barcode_info"                              => "",
-    "barcode_layout"                            => "",
-    "barcode_name"                              => "",
-    "barcode_number"                            => "",
-    "barcode_number_in_row"                     => "",
-    "barcode_page_cellspacing"                  => "",
-    "barcode_page_width"                        => "",
-    "barcode_price"                             => "",
-    "barcode_second_row"                        => "",
-    "barcode_third_row"                         => "",
-    "barcode_tooltip"                           => "",
-    "barcode_type"                              => "",
-    "barcode_width"                             => "",
-    "bottom"                                    => "",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "",
-    "center"                                    => "",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "",
-    "company"                                   => "",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "",
-    "company_logo"                              => "",
-    "company_remove_image"                      => "",
-    "company_required"                          => "",
-    "company_select_image"                      => "",
-    "company_website_url"                       => "",
-    "country_codes"                             => "",
-    "country_codes_tooltip"                     => "",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "",
-    "currency_symbol"                           => "",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "",
-    "decimal_point"                             => "",
-    "default_barcode_font_size_number"          => "",
-    "default_barcode_font_size_required"        => "",
-    "default_barcode_height_number"             => "",
-    "default_barcode_height_required"           => "",
-    "default_barcode_num_in_row_number"         => "",
-    "default_barcode_num_in_row_required"       => "",
-    "default_barcode_page_cellspacing_number"   => "",
-    "default_barcode_page_cellspacing_required" => "",
-    "default_barcode_page_width_number"         => "",
-    "default_barcode_page_width_required"       => "",
-    "default_barcode_width_number"              => "",
-    "default_barcode_width_required"            => "",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "",
-    "default_sales_discount_number"             => "",
-    "default_sales_discount_required"           => "",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "",
-    "default_tax_rate"                          => "",
-    "default_tax_rate_1"                        => "",
-    "default_tax_rate_2"                        => "",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "",
-    "default_tax_rate_required"                 => "",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "",
-    "email"                                     => "",
-    "email_configuration"                       => "",
-    "email_mailpath"                            => "",
-    "email_protocol"                            => "",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "",
-    "email_smtp_host"                           => "",
-    "email_smtp_pass"                           => "",
-    "email_smtp_port"                           => "",
-    "email_smtp_timeout"                        => "",
-    "email_smtp_user"                           => "",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "",
-    "general_configuration"                     => "",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "",
-    "info_configuration"                        => "",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "",
-    "invoice_configuration"                     => "",
-    "invoice_default_comments"                  => "",
-    "invoice_email_message"                     => "",
-    "invoice_enable"                            => "",
-    "invoice_printer"                           => "",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "",
-    "language"                                  => "",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "",
-    "license"                                   => "",
-    "license_configuration"                     => "",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "",
-    "lines_per_page_number"                     => "",
-    "lines_per_page_required"                   => "",
-    "locale"                                    => "",
-    "locale_configuration"                      => "",
-    "locale_info"                               => "",
-    "location"                                  => "",
-    "location_configuration"                    => "",
-    "location_info"                             => "",
-    "login_form"                                => "",
-    "logout"                                    => "",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "",
-    "message_configuration"                     => "",
-    "msg_msg"                                   => "",
-    "msg_msg_placeholder"                       => "",
-    "msg_pwd"                                   => "",
-    "msg_pwd_required"                          => "",
-    "msg_src"                                   => "",
-    "msg_src_required"                          => "",
-    "msg_uid"                                   => "",
-    "msg_uid_required"                          => "",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "",
-    "notify_alignment"                          => "",
-    "number_format"                             => "",
-    "number_locale"                             => "",
-    "number_locale_invalid"                     => "",
-    "number_locale_required"                    => "",
-    "number_locale_tooltip"                     => "",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "",
-    "phone_required"                            => "",
-    "print_bottom_margin"                       => "",
-    "print_bottom_margin_number"                => "",
-    "print_bottom_margin_required"              => "",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "",
-    "print_header"                              => "",
-    "print_left_margin"                         => "",
-    "print_left_margin_number"                  => "",
-    "print_left_margin_required"                => "",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "",
-    "print_right_margin_number"                 => "",
-    "print_right_margin_required"               => "",
-    "print_silently"                            => "",
-    "print_top_margin"                          => "",
-    "print_top_margin_number"                   => "",
-    "print_top_margin_required"                 => "",
-    "quantity_decimals"                         => "",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "",
-    "receipt_default"                           => "",
-    "receipt_font_size"                         => "",
-    "receipt_font_size_number"                  => "",
-    "receipt_font_size_required"                => "",
-    "receipt_info"                              => "",
-    "receipt_printer"                           => "",
-    "receipt_short"                             => "",
-    "receipt_show_company_name"                 => "",
-    "receipt_show_description"                  => "",
-    "receipt_show_serialnumber"                 => "",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "",
-    "receipt_show_total_discount"               => "",
-    "receipt_template"                          => "",
-    "receiving_calculate_average_price"         => "",
-    "recv_invoice_format"                       => "",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "",
-    "sales_invoice_format"                      => "",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "",
-    "saved_unsuccessfully"                      => "",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "",
-    "statistics_tooltip"                        => "",
-    "stock_location"                            => "",
-    "stock_location_duplicate"                  => "",
-    "stock_location_invalid_chars"              => "",
-    "stock_location_required"                   => "",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "",
-    "tax"                                       => "",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "",
-    "tax_id"                                    => "",
-    "tax_included"                              => "",
-    "theme"                                     => "",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "",
-    "timezone"                                  => "",
-    "timezone_error"                            => "",
-    "top"                                       => "",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '',
+    'address_required'                          => '',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '',
+    'apostrophe'                                => '',
+    'backup_button'                             => '',
+    'backup_database'                           => '',
+    'barcode'                                   => '',
+    'barcode_company'                           => '',
+    'barcode_configuration'                     => '',
+    'barcode_content'                           => '',
+    'barcode_first_row'                         => '',
+    'barcode_font'                              => '',
+    'barcode_formats'                           => '',
+    'barcode_generate_if_empty'                 => '',
+    'barcode_height'                            => '',
+    'barcode_id'                                => '',
+    'barcode_info'                              => '',
+    'barcode_layout'                            => '',
+    'barcode_name'                              => '',
+    'barcode_number'                            => '',
+    'barcode_number_in_row'                     => '',
+    'barcode_page_cellspacing'                  => '',
+    'barcode_page_width'                        => '',
+    'barcode_price'                             => '',
+    'barcode_second_row'                        => '',
+    'barcode_third_row'                         => '',
+    'barcode_tooltip'                           => '',
+    'barcode_type'                              => '',
+    'barcode_width'                             => '',
+    'bottom'                                    => '',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '',
+    'center'                                    => '',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '',
+    'company'                                   => '',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '',
+    'company_logo'                              => '',
+    'company_remove_image'                      => '',
+    'company_required'                          => '',
+    'company_select_image'                      => '',
+    'company_website_url'                       => '',
+    'country_codes'                             => '',
+    'country_codes_tooltip'                     => '',
+    'currency_code'                             => '',
+    'currency_decimals'                         => '',
+    'currency_symbol'                           => '',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => '',
+    'decimal_point'                             => '',
+    'default_barcode_font_size_number'          => '',
+    'default_barcode_font_size_required'        => '',
+    'default_barcode_height_number'             => '',
+    'default_barcode_height_required'           => '',
+    'default_barcode_num_in_row_number'         => '',
+    'default_barcode_num_in_row_required'       => '',
+    'default_barcode_page_cellspacing_number'   => '',
+    'default_barcode_page_cellspacing_required' => '',
+    'default_barcode_page_width_number'         => '',
+    'default_barcode_page_width_required'       => '',
+    'default_barcode_width_number'              => '',
+    'default_barcode_width_required'            => '',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => '',
+    'default_sales_discount_number'             => '',
+    'default_sales_discount_required'           => '',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => '',
+    'default_tax_rate'                          => '',
+    'default_tax_rate_1'                        => '',
+    'default_tax_rate_2'                        => '',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '',
+    'default_tax_rate_required'                 => '',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => '',
+    'email'                                     => '',
+    'email_configuration'                       => '',
+    'email_mailpath'                            => '',
+    'email_protocol'                            => '',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => '',
+    'email_smtp_host'                           => '',
+    'email_smtp_pass'                           => '',
+    'email_smtp_port'                           => '',
+    'email_smtp_timeout'                        => '',
+    'email_smtp_user'                           => '',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => '',
+    'general_configuration'                     => '',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '',
+    'info_configuration'                        => '',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => '',
+    'invoice_configuration'                     => '',
+    'invoice_default_comments'                  => '',
+    'invoice_email_message'                     => '',
+    'invoice_enable'                            => '',
+    'invoice_printer'                           => '',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => '',
+    'language'                                  => '',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => '',
+    'license'                                   => '',
+    'license_configuration'                     => '',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => '',
+    'lines_per_page_number'                     => '',
+    'lines_per_page_required'                   => '',
+    'locale'                                    => '',
+    'locale_configuration'                      => '',
+    'locale_info'                               => '',
+    'location'                                  => '',
+    'location_configuration'                    => '',
+    'location_info'                             => '',
+    'login_form'                                => '',
+    'logout'                                    => '',
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => '',
+    'message_configuration'                     => '',
+    'msg_msg'                                   => '',
+    'msg_msg_placeholder'                       => '',
+    'msg_pwd'                                   => '',
+    'msg_src'                                   => '',
+    'msg_src_required'                          => '',
+    'msg_uid'                                   => '',
+    'msg_uid_required'                          => '',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => '',
+    'notify_alignment'                          => '',
+    'number_format'                             => '',
+    'number_locale'                             => '',
+    'number_locale_invalid'                     => '',
+    'number_locale_required'                    => '',
+    'number_locale_tooltip'                     => '',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => '',
+    'payment_reference_code_length_limits'      => 'ادائیگی حوالہ کوڈ<br>لمبائی کی حدود',
+    'payment_reference_code_length_max_label'   => 'زیادہ سے زیادہ',
+    'payment_reference_code_length_min_label'   => 'کم سے کم',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '',
+    'phone_required'                            => '',
+    'print_bottom_margin'                       => '',
+    'print_bottom_margin_number'                => '',
+    'print_bottom_margin_required'              => '',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => '',
+    'print_header'                              => '',
+    'print_left_margin'                         => '',
+    'print_left_margin_number'                  => '',
+    'print_left_margin_required'                => '',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => '',
+    'print_right_margin_number'                 => '',
+    'print_right_margin_required'               => '',
+    'print_silently'                            => '',
+    'print_top_margin'                          => '',
+    'print_top_margin_number'                   => '',
+    'print_top_margin_required'                 => '',
+    'quantity_decimals'                         => '',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '',
+    'receipt_default'                           => '',
+    'receipt_font_size'                         => '',
+    'receipt_font_size_number'                  => '',
+    'receipt_font_size_required'                => '',
+    'receipt_info'                              => '',
+    'receipt_printer'                           => '',
+    'receipt_short'                             => '',
+    'receipt_show_company_name'                 => '',
+    'receipt_show_description'                  => '',
+    'receipt_show_serialnumber'                 => '',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '',
+    'receipt_show_total_discount'               => '',
+    'receipt_template'                          => '',
+    'receiving_calculate_average_price'         => '',
+    'recv_invoice_format'                       => '',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => '',
+    'sales_invoice_format'                      => '',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => 'sendmail کا راستہ غلط ہے۔ صرف حروف، ہندسے، ڈیش، انڈر اسکور، سلیش، بیک سلیش، کالن، اسپیس اور نقطے کی اجازت ہے۔',
+    'saved_successfully'                        => '',
+    'saved_unsuccessfully'                      => '',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => '',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => '',
+    'statistics_tooltip'                        => '',
+    'stock_location'                            => '',
+    'stock_location_duplicate'                  => '',
+    'stock_location_invalid_chars'              => '',
+    'stock_location_required'                   => '',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => '',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => '',
+    'tax'                                       => '',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '',
+    'tax_id'                                    => '',
+    'tax_included'                              => '',
+    'theme'                                     => '',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '',
+    'timezone'                                  => '',
+    'timezone_error'                            => '',
+    'top'                                       => '',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/ur/Employees.php b/app/Language/ur/Employees.php
index 34a418062..b574b245c 100644
--- a/app/Language/ur/Employees.php
+++ b/app/Language/ur/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "",
-    "cannot_be_deleted"            => "",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "",
-    "error_adding_updating"        => "",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "",
-    "error_updating_demo_admin"    => "",
-    "language"                     => "",
-    "login_info"                   => "",
-    "manager"                      => "",
-    "new"                          => "",
-    "none_selected"                => "",
-    "one_or_multiple"              => "",
-    "password"                     => "",
-    "password_minlength"           => "",
-    "password_must_match"          => "",
-    "password_not_must_match"      => "",
-    "password_required"            => "",
-    "permission_desc"              => "",
-    "permission_info"              => "",
-    "repeat_password"              => "",
-    "subpermission_required"       => "",
-    "successful_adding"            => "",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "",
-    "successful_updating"          => "",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "",
-    "username"                     => "",
-    "username_duplicate"           => "",
-    "username_minlength"           => "",
-    "username_required"            => "",
+    'administrator'                          => '',
+    'basic_information'                      => '',
+    'cannot_be_deleted'                      => '',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '',
+    'error_adding_updating'                  => '',
+    'error_cannot_remove_own_minimum_grant'  => 'آپ اپنے کم از کم ماڈیول رسائی کے اجازت ناموں کو ہٹا نہیں سکتے۔',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '',
+    'error_grant_change_disallowed'          => 'اس ڈیمو میں اجازت کی تبدیلیاں غیر فعال ہیں۔',
+    'error_password_change_disallowed'       => 'اس ڈیمو میں پاس ورڈ کی تبدیلیاں غیر فعال ہیں۔',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '',
+    'language'                               => '',
+    'login_info'                             => '',
+    'manager'                                => '',
+    'new'                                    => '',
+    'none_selected'                          => '',
+    'one_or_multiple'                        => '',
+    'password'                               => '',
+    'password_minlength'                     => '',
+    'password_must_match'                    => '',
+    'password_not_must_match'                => '',
+    'password_required'                      => '',
+    'permission_desc'                        => '',
+    'permission_info'                        => '',
+    'repeat_password'                        => '',
+    'subpermission_required'                 => '',
+    'successful_adding'                      => '',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '',
+    'successful_updating'                    => '',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '',
+    'username'                               => '',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '',
+    'username_required'                      => '',
 ];
diff --git a/app/Language/ur/Error.php b/app/Language/ur/Error.php
index 54b55d655..98645da40 100644
--- a/app/Language/ur/Error.php
+++ b/app/Language/ur/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "آپ کو اس ماڈیول تک رسائی کی اجازت نہیں ہے",
-    "unknown"              => "غیر متوقع رکاوٹ",
+    'no_permission_module'           => 'آپ کو اس ماڈیول تک رسائی کی اجازت نہیں ہے',
+    'unable_to_create_env_file'      => 'throttle.key ترتیب دینے کے لیے {filePath} نہیں بنائی جا سکی',
+    'unable_to_lock_file'            => '{filePath} کو لاک نہیں کیا جا سکا: {reason}',
+    'unable_to_open_lock_file'       => '{filePath} کو کھولا نہیں جا سکا: {reason}',
+    'unable_to_persist_throttle_key' => 'throttle.key کو {filePath} میں محفوظ نہیں کیا جا سکا',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'throttle.key ترتیب دینے کے لیے {filePath} پڑھی نہیں جا سکی',
+    'unknown'                        => 'غیر متوقع رکاوٹ',
 ];
diff --git a/app/Language/ur/Items.php b/app/Language/ur/Items.php
index 42b2152bb..bd00839a0 100644
--- a/app/Language/ur/Items.php
+++ b/app/Language/ur/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "",
-    "allow_alt_description"              => "",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "",
-    "buy_price_required"                 => "",
-    "cannot_be_deleted"                  => "",
-    "cannot_find_item"                   => "",
-    "categories"                         => "",
-    "category"                           => "",
-    "category_new"                       => "",
-    "category_required"                  => "",
-    "change_all_to_allow_alt_desc"       => "",
-    "change_all_to_not_allow_allow_desc" => "",
-    "change_all_to_serialized"           => "",
-    "change_all_to_unserialized"         => "",
-    "change_image"                       => "",
-    "confirm_bulk_edit"                  => "",
-    "confirm_bulk_edit_wipe_taxes"       => "",
-    "confirm_delete"                     => "",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "",
-    "cost_price_number"                  => "",
-    "cost_price_required"                => "",
-    "count"                              => "",
-    "csv_import_failed"                  => "",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "",
-    "csv_import_partially_failed"        => "",
-    "csv_import_success"                 => "",
-    "current_quantity"                   => "",
-    "default_pack_name"                  => "",
-    "description"                        => "",
-    "details_count"                      => "",
-    "do_nothing"                         => "",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "",
-    "edit_multiple_items"                => "",
-    "empty_upc_items"                    => "",
-    "error_adding_updating"              => "",
-    "error_updating_multiple"            => "",
-    "generate_barcodes"                  => "",
-    "hsn_code"                           => "",
-    "image"                              => "",
-    "import_items_csv"                   => "",
-    "info_provided_by"                   => "",
-    "inventory"                          => "",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "",
-    "is_printed"                         => "",
-    "is_serialized"                      => "",
-    "item"                               => "",
-    "item_id"                            => "",
-    "item_number"                        => "",
-    "item_number_duplicate"              => "",
-    "kit"                                => "",
-    "location"                           => "",
-    "low_inventory_items"                => "",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "",
-    "markup"                             => "",
-    "name"                               => "",
-    "name_required"                      => "",
-    "new"                                => "",
-    "no_description_items"               => "",
-    "no_items_to_display"                => "",
-    "none"                               => "",
-    "none_selected"                      => "",
-    "nonstock"                           => "",
-    "number_information"                 => "",
-    "number_required"                    => "",
-    "one_or_multiple"                    => "",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "",
-    "quantity_number"                    => "",
-    "quantity_required"                  => "",
-    "receiving_quantity"                 => "",
-    "remove_image"                       => "",
-    "reorder_level"                      => "",
-    "reorder_level_number"               => "",
-    "reorder_level_required"             => "",
-    "retrive_item_info"                  => "",
-    "sales_tax_1"                        => "",
-    "sales_tax_2"                        => "",
-    "search_attributes"                  => "",
-    "select_image"                       => "",
-    "serialized_items"                   => "",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "",
-    "stock_type"                         => "",
-    "successful_adding"                  => "",
-    "successful_bulk_edit"               => "",
-    "successful_deleted"                 => "",
-    "successful_updating"                => "",
-    "supplier"                           => "",
-    "tax_1"                              => "",
-    "tax_2"                              => "",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "",
-    "tax_percents"                       => "",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "",
-    "unit_price_number"                  => "",
-    "unit_price_required"                => "",
-    "upc_database"                       => "",
-    "update"                             => "",
-    "use_inventory_menu"                 => "",
+    'add_minus'                          => '',
+    'allow_alt_description'              => '',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '',
+    'buy_price_required'                 => '',
+    'cannot_be_deleted'                  => '',
+    'cannot_find_item'                   => '',
+    'categories'                         => '',
+    'category'                           => '',
+    'category_new'                       => '',
+    'category_required'                  => '',
+    'change_all_to_allow_alt_desc'       => '',
+    'change_all_to_not_allow_allow_desc' => '',
+    'change_all_to_serialized'           => '',
+    'change_all_to_unserialized'         => '',
+    'change_image'                       => '',
+    'confirm_bulk_edit'                  => '',
+    'confirm_bulk_edit_wipe_taxes'       => '',
+    'confirm_delete'                     => '',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '',
+    'cost_price_number'                  => '',
+    'cost_price_required'                => '',
+    'count'                              => '',
+    'csv_import_failed'                  => '',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '',
+    'csv_import_partially_failed'        => '',
+    'csv_import_success'                 => '',
+    'current_quantity'                   => '',
+    'default_pack_name'                  => '',
+    'description'                        => '',
+    'details_count'                      => '',
+    'do_nothing'                         => '',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '',
+    'edit_multiple_items'                => '',
+    'empty_upc_items'                    => '',
+    'error_adding_updating'              => '',
+    'error_updating_multiple'            => '',
+    'generate_barcodes'                  => '',
+    'hsn_code'                           => '',
+    'image'                              => '',
+    'import_items_csv'                   => '',
+    'info_provided_by'                   => '',
+    'inventory'                          => '',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => '',
+    'is_printed'                         => '',
+    'is_serialized'                      => '',
+    'item'                               => '',
+    'item_id'                            => '',
+    'item_number'                        => '',
+    'item_number_duplicate'              => '',
+    'item_number_invalid'                => 'آئٹم نمبر میں غیر مجاز حروف شامل ہیں۔',
+    'kit'                                => '',
+    'location'                           => '',
+    'low_inventory_items'                => '',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '',
+    'markup'                             => '',
+    'name'                               => '',
+    'name_required'                      => '',
+    'new'                                => '',
+    'no_description_items'               => '',
+    'no_items_to_display'                => '',
+    'none'                               => '',
+    'none_selected'                      => '',
+    'nonstock'                           => '',
+    'number_information'                 => '',
+    'number_required'                    => '',
+    'one_or_multiple'                    => '',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '',
+    'quantity_number'                    => '',
+    'quantity_required'                  => '',
+    'receiving_quantity'                 => '',
+    'remove_image'                       => '',
+    'reorder_level'                      => '',
+    'reorder_level_number'               => '',
+    'reorder_level_required'             => '',
+    'retrive_item_info'                  => '',
+    'sales_tax_1'                        => '',
+    'sales_tax_2'                        => '',
+    'search_attributes'                  => '',
+    'select_image'                       => '',
+    'serialized_items'                   => '',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '',
+    'stock_type'                         => '',
+    'successful_adding'                  => '',
+    'successful_bulk_edit'               => '',
+    'successful_deleted'                 => '',
+    'successful_updating'                => '',
+    'supplier'                           => '',
+    'tax_1'                              => '',
+    'tax_2'                              => '',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => 'ٹیکس کے نام میں غیر مجاز حروف شامل ہیں۔',
+    'tax_percent'                        => '',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '',
+    'tax_percents'                       => '',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '',
+    'unit_price_number'                  => '',
+    'unit_price_required'                => '',
+    'upc_database'                       => '',
+    'update'                             => '',
+    'use_inventory_menu'                 => '',
 ];
diff --git a/app/Language/ur/Login.php b/app/Language/ur/Login.php
index d443ab5b5..e75c5180f 100644
--- a/app/Language/ur/Login.php
+++ b/app/Language/ur/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "",
-    "go"                            => "",
-    "invalid_gcaptcha"              => "",
-    "invalid_installation"          => "",
-    "invalid_username_and_password" => "",
-    "login"                         => "",
-    "logout"                        => "",
-    "migration_needed"              => "",
-    "password"                      => "",
-    "required_username"             => "",
-    "username"                      => "",
-    "welcome"                       => "",
+    "gcaptcha"                            => "",
+    "go"                                  => "",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "",
+    "invalid_installation"                => "",
+    "invalid_username_and_password"       => "",
+    "login"                               => "",
+    "logout"                              => "",
+    "migrating_database"                  => "ڈیٹا بیس منتقل ہو رہا ہے",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "ڈیٹا بیس کامیابی سے منتقل ہو گیا!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'بہت زیادہ کوششیں۔ براہ کرم تھوڑی دیر انتظار کریں اور دوبارہ کوشش کریں۔',
+    "username"                            => "",
+    "welcome"                             => ""
 ];
diff --git a/app/Language/ur/Reports.php b/app/Language/ur/Reports.php
index 93316dfd2..15ff6bed9 100644
--- a/app/Language/ur/Reports.php
+++ b/app/Language/ur/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "",
     "taxes_summary_report"                    => "",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "",
     "total_inventory_value"                   => "",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/ur/Sales.php b/app/Language/ur/Sales.php
index 2e6af0951..937c655c6 100644
--- a/app/Language/ur/Sales.php
+++ b/app/Language/ur/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "اکاوٗنٹ",
-    "add_payment"                      => "",
-    "amount_due"                       => "",
-    "amount_tendered"                  => "",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "",
-    "cash"                             => "",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "",
-    "change_due"                       => "",
-    "change_price"                     => "",
-    "check"                            => "",
-    "check_balance"                    => "",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "",
-    "comments"                         => "",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "",
-    "confirm_cancel_sale"              => "",
-    "confirm_delete"                   => "",
-    "confirm_restore"                  => "",
-    "credit"                           => "",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "",
-    "customer_address"                 => "",
-    "customer_discount"                => "",
-    "customer_email"                   => "",
-    "customer_location"                => "",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "",
-    "date_range"                       => "",
-    "date_required"                    => "",
-    "date_type"                        => "",
-    "debit"                            => "",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "",
-    "delete_entire_sale"               => "",
-    "delete_successful"                => "",
-    "delete_unsuccessful"              => "",
-    "description_abbrv"                => "",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "",
-    "discount_included"                => "",
-    "discount_short"                   => "",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "",
-    "edit_item"                        => "",
-    "edit_sale"                        => "",
-    "email_receipt"                    => "",
-    "employee"                         => "",
-    "entry"                            => "",
-    "error_editing_item"               => "",
-    "find_or_scan_item"                => "",
-    "find_or_scan_item_or_receipt"     => "",
-    "giftcard"                         => "",
-    "giftcard_balance"                 => "",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "",
-    "include_prices"                   => "",
-    "invoice"                          => "",
-    "invoice_confirm"                  => "",
-    "invoice_enable"                   => "",
-    "invoice_filter"                   => "",
-    "invoice_no_email"                 => "",
-    "invoice_number"                   => "",
-    "invoice_number_duplicate"         => "",
-    "invoice_sent"                     => "",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "",
-    "invoice_update"                   => "",
-    "item_insufficient_of_stock"       => "",
-    "item_name"                        => "",
-    "item_number"                      => "",
-    "item_out_of_stock"                => "",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "",
-    "must_enter_numeric"               => "",
-    "must_enter_numeric_giftcard"      => "",
-    "new_customer"                     => "",
-    "new_item"                         => "",
-    "no_description"                   => "",
-    "no_filter"                        => "",
-    "no_items_in_cart"                 => "",
-    "no_sales_to_display"              => "",
-    "none_selected"                    => "",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "",
-    "payment_amount"                   => "",
-    "payment_not_cover_total"          => "",
-    "payment_type"                     => "",
-    "payments"                         => "",
-    "payments_total"                   => "",
-    "price"                            => "",
-    "print_after_sale"                 => "",
-    "quantity"                         => "",
-    "quantity_less_than_reorder_level" => "",
-    "quantity_less_than_zero"          => "",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "",
-    "receipt_sent"                     => "",
-    "receipt_unsent"                   => "",
-    "refund"                           => "",
-    "register"                         => "",
-    "remove_customer"                  => "",
-    "remove_discount"                  => "",
-    "return"                           => "",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "",
-    "sale_time"                        => "",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "",
-    "send_invoice"                     => "",
-    "send_quote"                       => "",
-    "send_receipt"                     => "",
-    "send_work_order"                  => "",
-    "serial"                           => "",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "",
-    "show_receipt"                     => "",
-    "start_typing_customer_name"       => "",
-    "start_typing_item_name"           => "",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "",
-    "successfully_deleted"             => "",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "",
-    "successfully_updated"             => "",
-    "suspend_sale"                     => "",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "",
-    "suspended_sales"                  => "",
-    "table"                            => "",
-    "takings"                          => "",
-    "tax"                              => "",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "",
-    "taxed_ind"                        => "",
-    "total"                            => "",
-    "total_tax_exclusive"              => "",
-    "transaction_failed"               => "",
-    "unable_to_add_item"               => "",
-    "unsuccessfully_deleted"           => "",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "",
-    "unsuccessfully_updated"           => "",
-    "unsuspend"                        => "",
-    "unsuspend_and_delete"             => "",
-    "update"                           => "",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => 'اکاوٗنٹ',
+    'add_payment'                       => '',
+    'amount_due'                        => '',
+    'amount_due_not_covered'            => 'ادائیگیاں واجب الادا رقم کو پورا نہیں کرتیں۔',
+    'amount_tendered'                   => '',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => '',
+    'cash'                              => '',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '',
+    'change_due'                        => '',
+    'change_price'                      => '',
+    'check'                             => '',
+    'check_balance'                     => '',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => '',
+    'comments'                          => '',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '',
+    'confirm_cancel_sale'               => '',
+    'confirm_delete'                    => '',
+    'confirm_restore'                   => '',
+    'credit'                            => '',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '',
+    'customer_address'                  => '',
+    'customer_discount'                 => '',
+    'customer_email'                    => '',
+    'customer_location'                 => '',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => '',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '',
+    'daily_sales'                       => '',
+    'date'                              => '',
+    'date_range'                        => '',
+    'date_required'                     => '',
+    'date_type'                         => '',
+    'debit'                             => '',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => '',
+    'delete_entire_sale'                => '',
+    'delete_successful'                 => '',
+    'delete_unsuccessful'               => '',
+    'description_abbrv'                 => '',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '',
+    'edit_item'                         => '',
+    'edit_sale'                         => '',
+    'email_receipt'                     => '',
+    'employee'                          => '',
+    'entry'                             => '',
+    'error_editing_item'                => '',
+    'find_or_scan_item'                 => '',
+    'find_or_scan_item_or_receipt'      => '',
+    'giftcard'                          => '',
+    'giftcard_balance'                  => '',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => 'اس ادائیگی کے لیے تحفہ کارڈ کا ناکافی بیلنس.',
+    'insufficient_reward_points'        => 'اس ادائیگی کے لیے ناکافی انعام پوائنٹس.',
+    'invoice'                           => '',
+    'invoice_confirm'                   => '',
+    'invoice_enable'                    => '',
+    'invoice_filter'                    => '',
+    'invoice_no_email'                  => '',
+    'invoice_number'                    => '',
+    'invoice_number_duplicate'          => '',
+    'invoice_sent'                      => '',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => '',
+    'invoice_update'                    => '',
+    'item_insufficient_of_stock'        => '',
+    'item_name'                         => '',
+    'item_number'                       => '',
+    'item_out_of_stock'                 => '',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '',
+    'must_enter_numeric'                => '',
+    'must_enter_numeric_giftcard'       => '',
+    'must_enter_reference_code'         => 'حوالہ/بازیابی نمبر درج کرنا ضروری ہے۔',
+    'negative_amount_tendered'          => 'ادا کی گئی رقم منفی نہیں ہو سکتی۔',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '',
+    'new_item'                          => '',
+    'no_description'                    => '',
+    'no_filter'                         => '',
+    'no_items_in_cart'                  => '',
+    'no_sales_to_display'               => '',
+    'none_selected'                     => '',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '',
+    'payment_amount'                    => '',
+    'payment_not_cover_total'           => '',
+    'payment_type'                      => '',
+    'payments'                          => '',
+    'payments_total'                    => '',
+    'price'                             => '',
+    'print_after_sale'                  => '',
+    'quantity'                          => '',
+    'quantity_less_than_reorder_level'  => '',
+    'quantity_less_than_zero'           => '',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => '',
+    'receipt_sent'                      => '',
+    'receipt_unsent'                    => '',
+    'reference_code'                    => 'ادائیگی حوالہ کوڈ',
+    'reference_code_invalid_characters' => 'حوالہ کوڈ میں صرف حروف اور اعداد ہونے چاہئیں۔',
+    'reference_code_length_error'       => 'حوالہ کوڈ کی لمبائی غلط ہے۔',
+    'refund'                            => '',
+    'register'                          => '',
+    'remove_customer'                   => '',
+    'remove_discount'                   => '',
+    'return'                            => '',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '',
+    'sale_time'                         => '',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '',
+    'send_invoice'                      => '',
+    'send_quote'                        => '',
+    'send_receipt'                      => '',
+    'send_work_order'                   => '',
+    'serial'                            => '',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '',
+    'show_receipt'                      => '',
+    'start_typing_customer_name'        => '',
+    'start_typing_item_name'            => '',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '',
+    'successfully_deleted'              => '',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '',
+    'successfully_updated'              => '',
+    'suspend_sale'                      => '',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '',
+    'suspended_sales'                   => '',
+    'table'                             => '',
+    'takings'                           => '',
+    'tax'                               => '',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '',
+    'taxed_ind'                         => '',
+    'total'                             => '',
+    'total_tax_exclusive'               => '',
+    'transaction_failed'                => '',
+    'unable_to_add_item'                => '',
+    'unsuccessfully_deleted'            => '',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '',
+    'unsuccessfully_updated'            => '',
+    'unsuspend'                         => '',
+    'unsuspend_and_delete'              => '',
+    'update'                            => '',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/vi/Attributes.php b/app/Language/vi/Attributes.php
index 970597d35..ce35181e7 100644
--- a/app/Language/vi/Attributes.php
+++ b/app/Language/vi/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "Giá trị thuộc tính không thể chứa ':' hay '|'",
-    "confirm_delete"                   => "Bạn có chắc chắn muốn xóa (các) thuộc tính đã chọn không?",
-    "confirm_restore"                  => "Bạn có chắc chắn muốn khôi phục (các) thuộc tính đã chọn không?",
-    "definition_cannot_be_deleted"     => "Không thể xóa (các) thuộc tính được chọn",
-    "definition_error_adding_updating" => "Thuộc tính {0} không thể thêm hoặc cập nhật. Vui lòng kiểm tra nhật ký lỗi.",
-    "definition_flags"                 => "Hiển thị thuộc tính",
-    "definition_group"                 => "Nhóm",
-    "definition_id"                    => "Mã số",
-    "definition_name"                  => "Thêm thuộc tính",
-    "definition_name_required"         => "Tên thuộc tính là trường bắt buộc",
-    "definition_one_or_multiple"       => "thuộc tính",
-    "definition_successful_adding"     => "Bạn vừa mới thêm mục tin thành công",
-    "definition_successful_deleted"    => "Bạn đã xóa thành công",
-    "definition_successful_updating"   => "Bạn đã cập nhật thành công thuộc tính",
-    "definition_type"                  => "Loại thuộc tính",
-    "definition_type_required"         => "Loại thuộc tính là trường bắt buộc",
-    "definition_unit"                  => "Đơn vị đo lường",
-    "definition_values"                => "Giá trị thuộc tính",
-    "new"                              => "Thêm thuộc tính mới",
-    "no_attributes_to_display"         => "Không có mặt hàng nào để hiển thị",
-    "receipt_visibility"               => "Biên lai",
-    "show_in_items"                    => "Hiển thị trong các mặt hàng",
-    "show_in_items_visibility"         => "Hàng hóa",
-    "show_in_receipt"                  => "Hiển thị trong biên lai",
-    "show_in_receivings"               => "Hiển thị trong nhập hàng",
-    "show_in_receivings_visibility"    => "Nhập hàng",
-    "show_in_sales"                    => "Hiển thị trong bán hàng",
-    "show_in_sales_visibility"         => "Bán hàng",
-    "update"                           => "Cập nhật thuộc tính",
+    'attribute_value_invalid_chars'    => 'Giá trị thuộc tính không thể chứa \':\' hay \'|\'',
+    'confirm_delete'                   => 'Bạn có chắc chắn muốn xóa (các) thuộc tính đã chọn không?',
+    'confirm_restore'                  => 'Bạn có chắc chắn muốn khôi phục (các) thuộc tính đã chọn không?',
+    'definition_cannot_be_deleted'     => 'Không thể xóa (các) thuộc tính được chọn',
+    'definition_invalid_group' => 'Nhóm đã chọn không tồn tại hoặc không hợp lệ.',
+    'definition_error_adding_updating' => 'Thuộc tính {0} không thể thêm hoặc cập nhật. Vui lòng kiểm tra nhật ký lỗi.',
+    'definition_flags'                 => 'Hiển thị thuộc tính',
+    'definition_group'                 => 'Nhóm',
+    'definition_id'                    => 'Mã số',
+    'definition_name'                  => 'Thêm thuộc tính',
+    'definition_name_required'         => 'Tên thuộc tính là trường bắt buộc',
+    'definition_one_or_multiple'       => 'thuộc tính',
+    'definition_successful_adding'     => 'Bạn vừa mới thêm mục tin thành công',
+    'definition_successful_deleted'    => 'Bạn đã xóa thành công',
+    'definition_successful_updating'   => 'Bạn đã cập nhật thành công thuộc tính',
+    'definition_type'                  => 'Loại thuộc tính',
+    'definition_type_required'         => 'Loại thuộc tính là trường bắt buộc',
+    'definition_unit'                  => 'Đơn vị đo lường',
+    'definition_values'                => 'Giá trị thuộc tính',
+    'new'                              => 'Thêm thuộc tính mới',
+    'no_attributes_to_display'         => 'Không có mặt hàng nào để hiển thị',
+    'receipt_visibility'               => 'Biên lai',
+    'show_in_items'                    => 'Hiển thị trong các mặt hàng',
+    'show_in_items_visibility'         => 'Hàng hóa',
+    'show_in_receipt'                  => 'Hiển thị trong biên lai',
+    'show_in_receivings'               => 'Hiển thị trong nhập hàng',
+    'show_in_receivings_visibility'    => 'Nhập hàng',
+    'show_in_sales'                    => 'Hiển thị trong bán hàng',
+    'show_in_sales_visibility'         => 'Bán hàng',
+    'show_in_search'                   => 'Hiển thị trong tìm kiếm',
+    'show_in_search_visibility'        => 'Tìm kiếm',
+    'update'                           => 'Cập nhật thuộc tính',
 ];
diff --git a/app/Language/vi/Bootstrap_tables.php b/app/Language/vi/Bootstrap_tables.php
index 46c78976a..0dcf4c795 100644
--- a/app/Language/vi/Bootstrap_tables.php
+++ b/app/Language/vi/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "Tất cả",
-    "columns"              => "Các cột",
-    "hide_show_pagination" => "Ẩn/hiện phân trang",
-    "loading"              => "Đang tải, vui lòng đợi...",
-    "page_from_to"         => "Đang hiển thị {0} đến {1} trên {2} dòng",
-    "refresh"              => "Làm mới lại",
-    "rows_per_page"        => "{0} dòng mỗi trang",
-    "toggle"               => "Bật/Tắt",
+    'all' => "Tất cả",
+    'columns' => "Các cột",
+    'hide_show_pagination' => "Ẩn/hiện phân trang",
+    'loading' => "Đang tải, vui lòng đợi",
+    'page_from_to' => "Đang hiển thị {0} đến {1} trên {2} dòng",
+    'refresh' => "Làm mới lại",
+    'rows_per_page' => "{0} dòng mỗi trang",
+    'toggle' => "Bật/Tắt",
 ];
diff --git a/app/Language/vi/Config.php b/app/Language/vi/Config.php
index facc22674..c890022b3 100644
--- a/app/Language/vi/Config.php
+++ b/app/Language/vi/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "Địa chỉ công ty",
-    "address_required"                          => "Trường địa chỉ công ty là bắt buộc.",
-    "all_set"                                   => "Mọi quyền đều được đặt chính xác!",
-    "allow_duplicate_barcodes"                  => "Cho phép trùng Mã vạch",
-    "apostrophe"                                => "dấu nháy đơn",
-    "backup_button"                             => "Sao lưu",
-    "backup_database"                           => "Sao lưu cơ sở dữ liệu",
-    "barcode"                                   => "Mã vạch",
-    "barcode_company"                           => "Tên công ty",
-    "barcode_configuration"                     => "Cấu hình Mã vạch",
-    "barcode_content"                           => "Nội dung Mã vạch",
-    "barcode_first_row"                         => "Dòng 1",
-    "barcode_font"                              => "Phông chữ",
-    "barcode_formats"                           => "Định dạng đầu vào",
-    "barcode_generate_if_empty"                 => "Tự tạo mới nếu để trống.",
-    "barcode_height"                            => "Cao (px)",
-    "barcode_id"                                => "Tên/Mã hàng hóa",
-    "barcode_info"                              => "Thông tin cấu hình Mã vạch",
-    "barcode_layout"                            => "Bố cục Mã vạch",
-    "barcode_name"                              => "Tên",
-    "barcode_number"                            => "Mã vạch",
-    "barcode_number_in_row"                     => "Số ở dòng",
-    "barcode_page_cellspacing"                  => "Khoảng cách ô trang hiển thị.",
-    "barcode_page_width"                        => "Chiều rộng trang hiển thị",
-    "barcode_price"                             => "Giá",
-    "barcode_second_row"                        => "Dòng 2",
-    "barcode_third_row"                         => "Dòng 3",
-    "barcode_tooltip"                           => "Cảnh báo: Tính năng này có thể là nguyên nhân làm trùng lặp hàng hóa khi nhập hay tạo. Đừng dùng nếu bạn không muốn trùng mã vạch.",
-    "barcode_type"                              => "Kiểu Mã vạch",
-    "barcode_width"                             => "Rộng (px)",
-    "bottom"                                    => "Đáy",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Số chứ số sau dấy phẩy",
-    "cash_decimals_tooltip"                     => "Nếu số lẻ thập phân của tiền mặt và tiền tệ là giống nhau thì sẽ không làm tròn.",
-    "cash_rounding"                             => "Làm tròn số tiền",
-    "category_dropdown"                         => "Hiển thị thể loại dạng hộp thả xuống",
-    "center"                                    => "Giữa",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "dấu phẩy",
-    "company"                                   => "Tên công ty",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Đổi ảnh",
-    "company_logo"                              => "Logo công ty",
-    "company_remove_image"                      => "Gỡ bỏ ảnh",
-    "company_required"                          => "Tên công ty là bắt buộc",
-    "company_select_image"                      => "Chọn ảnh",
-    "company_website_url"                       => "Website của công ty không hợp lệ (http://...).",
-    "country_codes"                             => "Mã Nước",
-    "country_codes_tooltip"                     => "Danh sách ngăn cách bằng dấu phẩy mã các nước cho tìm kiếm địa chỉ đề cử.",
-    "currency_code"                             => "Mã tiền tệ",
-    "currency_decimals"                         => "Số chữ số sau dấy phẩy",
-    "currency_symbol"                           => "Ký hiệu tiền tệ",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Điểm thưởng",
-    "customer_reward_duplicate"                 => "Điểm thưởng phải duy nhất.",
-    "customer_reward_enable"                    => "Cho phép thưởng cho khách hàng",
-    "customer_reward_invalid_chars"             => "Điểm thưởng không thể chứa '_'",
-    "customer_reward_required"                  => "Điểm thưởng là trường bắt buộc",
-    "customer_sales_tax_support"                => "Hỗ trợ thuế bán hàng Khách hàng",
-    "date_or_time_format"                       => "Bộ lọc ngày và giờ",
-    "datetimeformat"                            => "Định dạng ngày và giờ",
-    "decimal_point"                             => "Dấu thập phân",
-    "default_barcode_font_size_number"          => "Cỡ phông chữ Mã vạch mặc định phải là dạng số.",
-    "default_barcode_font_size_required"        => "Cỡ phông chữ Mã vạch mặc định là trường bắt buộc.",
-    "default_barcode_height_number"             => "Chiều cao Mã vạch mặc định phải là dạng số.",
-    "default_barcode_height_required"           => "Chiều cao Mã vạch mặc định là trường mặc định.",
-    "default_barcode_num_in_row_number"         => "Số Mã vạch trên một Hàng mặc định phải là dạng số.",
-    "default_barcode_num_in_row_required"       => "Số Mã vạch mặc định mỗi dòng tính bằng dòng là trường bắt buộc.",
-    "default_barcode_page_cellspacing_number"   => "Khoảng cách ô trang Mã vạch mặc định phải là dạng số.",
-    "default_barcode_page_cellspacing_required" => "Khoảng cách ô trang Mã vạch mặc định là trường bắt buộc.",
-    "default_barcode_page_width_number"         => "Chiều rộng trang Mã vạch mặc định phải là dạng số.",
-    "default_barcode_page_width_required"       => "Chiều rộng trang Mã vạch mặc định là trường bắt buộc.",
-    "default_barcode_width_number"              => "Chiều rộng Mã vạch mặc định phải là dạng số.",
-    "default_barcode_width_required"            => "Chiều rộng Mã vạch mặc định là trường bắt buộc.",
-    "default_item_columns"                      => "Mục hiển thị mặc định",
-    "default_origin_tax_code"                   => "Mã thuế gốc mặc định",
-    "default_receivings_discount"               => "Giảm giá mặc định",
-    "default_receivings_discount_number"        => "Giảm giá mặc định phải là số.",
-    "default_receivings_discount_required"      => "Giảm giá mặc định là trường bắt buộc.",
-    "default_sales_discount"                    => "Giảm giá bán hàng mặc định",
-    "default_sales_discount_number"             => "Giảm giá bán hàng mặc định phải là dạng số.",
-    "default_sales_discount_required"           => "Trường Giảm giá bán hàng mặc định là bắt buộc.",
-    "default_tax_category"                      => "Danh mục thuế mặc định",
-    "default_tax_code"                          => "Mã số thuế mặc định",
-    "default_tax_jurisdiction"                  => "Thẩm quyền thuế mặc định",
-    "default_tax_name_number"                   => "Tên Thuế mặc định phải ở dạng chuỗi văn bản.",
-    "default_tax_name_required"                 => "Trường tên Thuế mặc định là bắt buộc.",
-    "default_tax_rate"                          => "Tỷ lệ thuế mặc định %",
-    "default_tax_rate_1"                        => "Tỷ lệ thuế 1",
-    "default_tax_rate_2"                        => "Tỷ lệ thuế 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Tỷ lệ thuế mặc định phải là dạng số.",
-    "default_tax_rate_required"                 => "Trường Tỷ lệ thuế mặc định là bắt buộc.",
-    "derive_sale_quantity"                      => "Cho phép suy luận số lượng bán hàng",
-    "derive_sale_quantity_tooltip"              => "Nếu chọn thì một kiểu hàng hóa mới sẽ được cung cấp cho đặt hàng hàng hóa theo tổng số mở rộng",
-    "dinner_table"                              => "Bàn ăn",
-    "dinner_table_duplicate"                    => "Bàn phải duy nhất.",
-    "dinner_table_enable"                       => "Sử dụng bàn ăn",
-    "dinner_table_invalid_chars"                => "Tên bàn ăn không được chứa '_'.",
-    "dinner_table_required"                     => "Trường bàn ăn là bắt buộc.",
-    "dot"                                       => "dấu chấm",
-    "email"                                     => "Thư điện tử",
-    "email_configuration"                       => "Cấu hình Thư điện tử",
-    "email_mailpath"                            => "Đường dẫn đến Sendmail",
-    "email_protocol"                            => "Giao thức",
-    "email_receipt_check_behaviour"             => "Dấu kiểm biên lai thư điện tử",
-    "email_receipt_check_behaviour_always"      => "Luôn đánh dấu kiểm",
-    "email_receipt_check_behaviour_last"        => "Nhớ lựa chọn cuối cùng",
-    "email_receipt_check_behaviour_never"       => "Luôn không đánh dấu kiểm",
-    "email_smtp_crypto"                         => "Mã hóa SMTP",
-    "email_smtp_host"                           => "Máy phục vụ SMTP",
-    "email_smtp_pass"                           => "Mật khẩu SMTP",
-    "email_smtp_port"                           => "Cổng SMTP",
-    "email_smtp_timeout"                        => "Chờ tối đa SMTP",
-    "email_smtp_user"                           => "Tài khoản SMTP",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Chính sách bắt buộc",
-    "enforce_privacy_tooltip"                   => "Bảo vệ riêng tư khách hàng bắt buộc xáo trộn dữ liệu trong trường hợp dữ liệu của họ đang bị xóa",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "Có một số vấn đề với phân quyền tập tin vui lòng sửa và tải lại trang này.",
-    "financial_year"                            => "Ngày đầu năm tài chính",
-    "financial_year_apr"                        => "1 tháng tư",
-    "financial_year_aug"                        => "1 tháng tám",
-    "financial_year_dec"                        => "1 tháng mười hai",
-    "financial_year_feb"                        => "1 tháng hai",
-    "financial_year_jan"                        => "1 tháng giêng",
-    "financial_year_jul"                        => "1 tháng bảy",
-    "financial_year_jun"                        => "1 tháng sáu",
-    "financial_year_mar"                        => "1 tháng ba",
-    "financial_year_may"                        => "1 tháng năm",
-    "financial_year_nov"                        => "1 tháng mười một",
-    "financial_year_oct"                        => "1 tháng mười",
-    "financial_year_sep"                        => "1 tháng chín",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "reCAPTCHA cho trang đăng nhập",
-    "gcaptcha_secret_key"                       => "Khóa bí mật reCAPTCHA",
-    "gcaptcha_secret_key_required"              => "Khóa bí mật reCAPTCHA là trường bắt buộc",
-    "gcaptcha_site_key"                         => "Khóa trang reCAPTCHA",
-    "gcaptcha_site_key_required"                => "Khóa trang reCAPTCHA là trường bắt buộc",
-    "gcaptcha_tooltip"                          => "Bảo vệ trang đăng nhập bằng Google reCAPTCHA, bấm vào biểu tượng cho một cặp khóa API.",
-    "general"                                   => "Chung",
-    "general_configuration"                     => "Thông tin chung",
-    "giftcard_number"                           => "Số Thẻ quà tặng",
-    "giftcard_random"                           => "Tạo ngẫu nhiên",
-    "giftcard_series"                           => "Tạo dạng nối tiếp nhau",
-    "image_allowed_file_types"                  => "Các kiểu tập tin được phép",
-    "image_max_height_tooltip"                  => "Chiều cao ảnh tải lên tối đa được phép tính bằng điểm ảnh (px).",
-    "image_max_size_tooltip"                    => "Kích cỡ tập tin ảnh tải lên tối đa được phép tính bằng kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Chiều rộng ảnh tải lên tối đa được phép tính bằng điểm ảnh (px).",
-    "image_restrictions"                        => "Hạn chế tải ảnh lên",
-    "include_hsn"                               => "Bao gồm hỗ trợ cho mã HSN",
-    "info"                                      => "Thông tin",
-    "info_configuration"                        => "Thông tin cửa hàng",
-    "input_groups"                              => "",
-    "integrations"                              => "Tích hợp",
-    "integrations_configuration"                => "Tích hợp bên thứ ba",
-    "invoice"                                   => "Hóa đơn",
-    "invoice_configuration"                     => "Cài đặt in hóa đơn",
-    "invoice_default_comments"                  => "Ghi chú mặc định cho hóa đơn",
-    "invoice_email_message"                     => "Mẫu hóa đơn khi gửi thư",
-    "invoice_enable"                            => "Bật Hóa đơn",
-    "invoice_printer"                           => "Máy in hóa đơn",
-    "invoice_type"                              => "Loại hóa đơn",
-    "is_readable"                               => "là đọc được, nhưng quyền hạn được đặt chưa đúng. Vui lòng đặt nó thành 640 hoặc 660 sau đó tải lại.",
-    "is_writable"                               => "là ghi được, nhưng quyền hạn được đặt chưa đúng. Vui lòng đặt nó thành 750 sau đó tải lại.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Cảnh báo: Tính năng này chỉ làm việc nếu bạn đã cài đặt ứng dụng bổ xung jsPrintSetup cho FireFox. Cứ lưu chứ?",
-    "language"                                  => "Ngôn ngữ",
-    "last_used_invoice_number"                  => "Số hóa đơn dùng lần cuối",
-    "last_used_quote_number"                    => "Số báo giá dùng lần cuối",
-    "last_used_work_order_number"               => "Số W/O dùng lần cuối",
-    "left"                                      => "Trái",
-    "license"                                   => "Giấy phép",
-    "license_configuration"                     => "Điều khoản của giấy phép",
-    "line_sequence"                             => "Xếp dòng theo",
-    "lines_per_page"                            => "Dòng trên mỗi trang",
-    "lines_per_page_number"                     => "Dòng trên mỗi trang phải là dạng số.",
-    "lines_per_page_required"                   => "Dòng trên mỗi trang là trường bắt buộc.",
-    "locale"                                    => "Định dạng",
-    "locale_configuration"                      => "Cấu hình Bản địa hóa",
-    "locale_info"                               => "Thông tin Cấu hình Bản địa hóa",
-    "location"                                  => "Kho",
-    "location_configuration"                    => "Vị trí kho",
-    "location_info"                             => "Thông tin cấu hình vị trí",
-    "login_form"                                => "",
-    "logout"                                    => "Bạn có muốn sao lưu dự phòng trước khi đăng xuất ra không? Bấm chuột vào [OK] để sao lưu hoặc [Cancel] để đăng xuất.",
-    "mailchimp"                                 => "Mailchimp",
-    "mailchimp_api_key"                         => "Khóa API Mailchimp",
-    "mailchimp_configuration"                   => "Cấu hình Mailchimp",
-    "mailchimp_key_successfully"                => "API Key hợp lệ.",
-    "mailchimp_key_unsuccessfully"              => "API Key không hợp lệ.",
-    "mailchimp_lists"                           => "Bó thư Mailchimp",
-    "mailchimp_tooltip"                         => "Bấm vào biểu tượng để lấy khóa API.",
-    "message"                                   => "Nhắn tin",
-    "message_configuration"                     => "Cấu hình nhắn tin",
-    "msg_msg"                                   => "Tin nhắn văn bản đã lưu",
-    "msg_msg_placeholder"                       => "Nếu bạn muốn dùng một mẫu thì lưu lại các tin nhắn SMS ở đây, nếu không thì để trống.",
-    "msg_pwd"                                   => "Mật khẩu SMS-API",
-    "msg_pwd_required"                          => "Mật khẩu SMS-API là trường bắt buộc",
-    "msg_src"                                   => "Mã số bộ gửi SMS-API",
-    "msg_src_required"                          => "Mã số bộ gửi SMS-API là trường bắt buộc",
-    "msg_uid"                                   => "Tài khoản SMS-API",
-    "msg_uid_required"                          => "Tài khoản SMS-API là trường bắt buộc",
-    "multi_pack_enabled"                        => "Nhiều gói cho mỗi mục",
-    "no_risk"                                   => "Không tiềm ẩn rủi ro / bảo mật nào.",
-    "none"                                      => "không",
-    "notify_alignment"                          => "Vị trí của thông báo nổi lên",
-    "number_format"                             => "Định dạng số",
-    "number_locale"                             => "Định dạng số",
-    "number_locale_invalid"                     => "Vị trí đã nhập không hợp lệ. Kiểm tra liên kết trong tooltip để tìm vị trí hợp lệ.",
-    "number_locale_required"                    => "Vị trí số là trường bắt buộc.",
-    "number_locale_tooltip"                     => "Tìm vị trí phù hợp thông qua liên kết này.",
-    "os_timezone"                               => "Múi giờ OSPOS:",
-    "ospos_info"                                => "Thông tin cài đặt OSPOS",
-    "payment_options_order"                     => "Thứ tự tùy chọn thanh toán",
-    "perm_risk"                                 => "Phân quyền không đúng khiến phần mềm tiềm ẩn rủi ro.",
-    "phone"                                     => "Điện thoại công ty",
-    "phone_required"                            => "Trường Điện thoại công ty là bắt buộc.",
-    "print_bottom_margin"                       => "Lề dưới",
-    "print_bottom_margin_number"                => "Lề dưới phải là dạng số.",
-    "print_bottom_margin_required"              => "Trường Lề dưới là bắt buộc.",
-    "print_delay_autoreturn"                    => "Tự động trả về trễ bán hàng",
-    "print_delay_autoreturn_number"             => "Tự động trả về trễ bán hàng là trường bắt buộc.",
-    "print_delay_autoreturn_required"           => "Tự động trả về trễ bán hàng phải là dạng số.",
-    "print_footer"                              => "In phần chân trình duyệt",
-    "print_header"                              => "In phần đầu trình duyệt",
-    "print_left_margin"                         => "Lề trái",
-    "print_left_margin_number"                  => "Lề trái phải ở dạng số.",
-    "print_left_margin_required"                => "Trường Lề trái là bắt buộc.",
-    "print_receipt_check_behaviour"             => "In dấu kiểm biên lai",
-    "print_receipt_check_behaviour_always"      => "Luôn đánh dấu kiểm",
-    "print_receipt_check_behaviour_last"        => "Nhớ lựa chọn cuối cùng",
-    "print_receipt_check_behaviour_never"       => "Luôn không đánh dấu kiểm",
-    "print_right_margin"                        => "Lề phải",
-    "print_right_margin_number"                 => "Lề trên phải ở dạng số.",
-    "print_right_margin_required"               => "Trường Lề trên là bắt buộc.",
-    "print_silently"                            => "Hiển thị hộp thoại In",
-    "print_top_margin"                          => "Lề trên",
-    "print_top_margin_number"                   => "Lề trên phải ở dạng số.",
-    "print_top_margin_required"                 => "Trường Lề trên là bắt buộc.",
-    "quantity_decimals"                         => "Số lượng dấu thập phân",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Ghi chú báo giá mặc định",
-    "receipt"                                   => "Biên lai",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Cài đặt in biên lai",
-    "receipt_default"                           => "Mặc định",
-    "receipt_font_size"                         => "Cỡ chữ",
-    "receipt_font_size_number"                  => "Cỡ chữ phải là dạng số.",
-    "receipt_font_size_required"                => "Trường Cỡ chữ là bắt buộc.",
-    "receipt_info"                              => "Thông tin cấu hình Biên lai",
-    "receipt_printer"                           => "In vé",
-    "receipt_short"                             => "Ngắn",
-    "receipt_show_company_name"                 => "Hiển thị tên công ty",
-    "receipt_show_description"                  => "Hiện mô tả",
-    "receipt_show_serialnumber"                 => "Hiển thị số Sê-ri",
-    "receipt_show_tax_ind"                      => "Hiển thị chỉ thị thuế",
-    "receipt_show_taxes"                        => "Hiển thị Thuế",
-    "receipt_show_total_discount"               => "Hiển thị Giảm giá tổng cộng",
-    "receipt_template"                          => "Mẫu biên lai",
-    "receiving_calculate_average_price"         => "Tính giá tb (Nhập hàng)",
-    "recv_invoice_format"                       => "Định dạng hóa đơn nhận hàng",
-    "register_mode_default"                     => "Chế độ Đăng ký mặc định",
-    "report_an_issue"                           => "Báo cáo trục trặc",
-    "return_policy_required"                    => "Trường Chính sách trả hàng là bắt buộc.",
-    "reward"                                    => "Điểm thưởng",
-    "reward_configuration"                      => "Cấu hình Điểm thưởng",
-    "right"                                     => "Phải",
-    "sales_invoice_format"                      => "Định dạng Hóa đơn bán hàng",
-    "sales_quote_format"                        => "Định dạng Báo giá bán hàng",
-    "saved_successfully"                        => "Cấu hình được lưu thành công.",
-    "saved_unsuccessfully"                      => "Gặp lỗi khi lưu cấu hình.",
-    "security_issue"                            => "Cảnh báo về  lỗ hổng bảo mật",
-    "server_notice"                             => "Vui lòng sử dụng các thông tin phía dưới để báo cáo lỗi.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "Hiển thị biểu tượng Văn phòng",
-    "statistics"                                => "Gửi thống kê",
-    "statistics_tooltip"                        => "Gửi thống kê cho nhà phát triển và mục đích cải tiến tính năng.",
-    "stock_location"                            => "Vị trí kho",
-    "stock_location_duplicate"                  => "Vị trí kho phải là duy nhất.",
-    "stock_location_invalid_chars"              => "Vị trí kho không được chứa '_'.",
-    "stock_location_required"                   => "Trường Vị trí kho là bắt buộc.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Cột 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Bố cục gợi ý tìm kiếm",
-    "suggestions_second_column"                 => "Cột 2",
-    "suggestions_third_column"                  => "Cột 3",
-    "system_conf"                               => "Cài đặt & Cấu hình",
-    "system_info"                               => "System Info",
-    "table"                                     => "Bàn ăn",
-    "table_configuration"                       => "Cấu hình bàn ăn",
-    "takings_printer"                           => "In Biên lai",
-    "tax"                                       => "Thuế",
-    "tax_category"                              => "Thể loại thuế",
-    "tax_category_duplicate"                    => "Thể loại thuế vừa nhập đã sẵn có.",
-    "tax_category_invalid_chars"                => "Thể loại thuế vừa nhập không hợp lệ.",
-    "tax_category_required"                     => "Thể loại thuế là bắt buộc.",
-    "tax_category_used"                         => "Không thể xóa Thể loại thuế bởi vì nó đang được dùng.",
-    "tax_configuration"                         => "Cấu hình Thuế",
-    "tax_decimals"                              => "Phần thập phân Thế",
-    "tax_id"                                    => "Mã số thuế",
-    "tax_included"                              => "Gồm thuế",
-    "theme"                                     => "Giao diện",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "Dấu ngăn cách phần nghìn",
-    "timezone"                                  => "Múi giờ",
-    "timezone_error"                            => "Múi giờ OSPOS khác với múi giờ trên máy của bạn.",
-    "top"                                       => "Đỉnh",
-    "use_destination_based_tax"                 => "Sử dụng thuế dựa trên điểm đến",
-    "user_timezone"                             => "Múi giờ trên máy nội bộ:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Hỗ trợ giao việc",
-    "work_order_format"                         => "Định dạng giấy giao việc",
+    'address'                                   => 'Địa chỉ công ty',
+    'address_required'                          => 'Trường địa chỉ công ty là bắt buộc.',
+    'all_set'                                   => 'Mọi quyền đều được đặt chính xác!',
+    'allow_duplicate_barcodes'                  => 'Cho phép trùng Mã vạch',
+    'apostrophe'                                => 'dấu nháy đơn',
+    'backup_button'                             => 'Sao lưu',
+    'backup_database'                           => 'Sao lưu cơ sở dữ liệu',
+    'barcode'                                   => 'Mã vạch',
+    'barcode_company'                           => 'Tên công ty',
+    'barcode_configuration'                     => 'Cấu hình Mã vạch',
+    'barcode_content'                           => 'Nội dung Mã vạch',
+    'barcode_first_row'                         => 'Dòng 1',
+    'barcode_font'                              => 'Phông chữ',
+    'barcode_formats'                           => 'Định dạng đầu vào',
+    'barcode_generate_if_empty'                 => 'Tự tạo mới nếu để trống.',
+    'barcode_height'                            => 'Cao (px)',
+    'barcode_id'                                => 'Tên/Mã hàng hóa',
+    'barcode_info'                              => 'Thông tin cấu hình Mã vạch',
+    'barcode_layout'                            => 'Bố cục Mã vạch',
+    'barcode_name'                              => 'Tên',
+    'barcode_number'                            => 'Mã vạch',
+    'barcode_number_in_row'                     => 'Số ở dòng',
+    'barcode_page_cellspacing'                  => 'Khoảng cách ô trang hiển thị.',
+    'barcode_page_width'                        => 'Chiều rộng trang hiển thị',
+    'barcode_price'                             => 'Giá',
+    'barcode_second_row'                        => 'Dòng 2',
+    'barcode_third_row'                         => 'Dòng 3',
+    'barcode_tooltip'                           => 'Cảnh báo: Tính năng này có thể là nguyên nhân làm trùng lặp hàng hóa khi nhập hay tạo. Đừng dùng nếu bạn không muốn trùng mã vạch.',
+    'barcode_type'                              => 'Kiểu Mã vạch',
+    'barcode_width'                             => 'Rộng (px)',
+    'bottom'                                    => 'Đáy',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => 'Số chứ số sau dấy phẩy',
+    'cash_decimals_tooltip'                     => 'Nếu số lẻ thập phân của tiền mặt và tiền tệ là giống nhau thì sẽ không làm tròn.',
+    'cash_rounding'                             => 'Làm tròn số tiền',
+    'category_dropdown'                         => 'Hiển thị thể loại dạng hộp thả xuống',
+    'center'                                    => 'Giữa',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'dấu phẩy',
+    'company'                                   => 'Tên công ty',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Đổi ảnh',
+    'company_logo'                              => 'Logo công ty',
+    'company_remove_image'                      => 'Gỡ bỏ ảnh',
+    'company_required'                          => 'Tên công ty là bắt buộc',
+    'company_select_image'                      => 'Chọn ảnh',
+    'company_website_url'                       => 'Website của công ty không hợp lệ (http://...).',
+    'country_codes'                             => 'Mã Nước',
+    'country_codes_tooltip'                     => 'Danh sách ngăn cách bằng dấu phẩy mã các nước cho tìm kiếm địa chỉ đề cử.',
+    'currency_code'                             => 'Mã tiền tệ',
+    'currency_decimals'                         => 'Số chữ số sau dấy phẩy',
+    'currency_symbol'                           => 'Ký hiệu tiền tệ',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => 'Điểm thưởng',
+    'customer_reward_duplicate'                 => 'Điểm thưởng phải duy nhất.',
+    'customer_reward_enable'                    => 'Cho phép thưởng cho khách hàng',
+    'customer_reward_invalid_chars'             => "Điểm thưởng không thể chứa '_'",
+    'customer_reward_required'                  => 'Điểm thưởng là trường bắt buộc',
+    'customer_sales_tax_support'                => 'Hỗ trợ thuế bán hàng Khách hàng',
+    'date_or_time_format'                       => 'Bộ lọc ngày và giờ',
+    'datetimeformat'                            => 'Định dạng ngày và giờ',
+    'decimal_point'                             => 'Dấu thập phân',
+    'default_barcode_font_size_number'          => 'Cỡ phông chữ Mã vạch mặc định phải là dạng số.',
+    'default_barcode_font_size_required'        => 'Cỡ phông chữ Mã vạch mặc định là trường bắt buộc.',
+    'default_barcode_height_number'             => 'Chiều cao Mã vạch mặc định phải là dạng số.',
+    'default_barcode_height_required'           => 'Chiều cao Mã vạch mặc định là trường mặc định.',
+    'default_barcode_num_in_row_number'         => 'Số Mã vạch trên một Hàng mặc định phải là dạng số.',
+    'default_barcode_num_in_row_required'       => 'Số Mã vạch mặc định mỗi dòng tính bằng dòng là trường bắt buộc.',
+    'default_barcode_page_cellspacing_number'   => 'Khoảng cách ô trang Mã vạch mặc định phải là dạng số.',
+    'default_barcode_page_cellspacing_required' => 'Khoảng cách ô trang Mã vạch mặc định là trường bắt buộc.',
+    'default_barcode_page_width_number'         => 'Chiều rộng trang Mã vạch mặc định phải là dạng số.',
+    'default_barcode_page_width_required'       => 'Chiều rộng trang Mã vạch mặc định là trường bắt buộc.',
+    'default_barcode_width_number'              => 'Chiều rộng Mã vạch mặc định phải là dạng số.',
+    'default_barcode_width_required'            => 'Chiều rộng Mã vạch mặc định là trường bắt buộc.',
+    'default_item_columns'                      => 'Mục hiển thị mặc định',
+    'default_origin_tax_code'                   => 'Mã thuế gốc mặc định',
+    'default_receivings_discount'               => 'Giảm giá mặc định',
+    'default_receivings_discount_number'        => 'Giảm giá mặc định phải là số.',
+    'default_receivings_discount_required'      => 'Giảm giá mặc định là trường bắt buộc.',
+    'default_sales_discount'                    => 'Giảm giá bán hàng mặc định',
+    'default_sales_discount_number'             => 'Giảm giá bán hàng mặc định phải là dạng số.',
+    'default_sales_discount_required'           => 'Trường Giảm giá bán hàng mặc định là bắt buộc.',
+    'default_tax_category'                      => 'Danh mục thuế mặc định',
+    'default_tax_code'                          => 'Mã số thuế mặc định',
+    'default_tax_jurisdiction'                  => 'Thẩm quyền thuế mặc định',
+    'default_tax_name_number'                   => 'Tên Thuế mặc định phải ở dạng chuỗi văn bản.',
+    'default_tax_name_required'                 => 'Trường tên Thuế mặc định là bắt buộc.',
+    'default_tax_rate'                          => 'Tỷ lệ thuế mặc định %',
+    'default_tax_rate_1'                        => 'Tỷ lệ thuế 1',
+    'default_tax_rate_2'                        => 'Tỷ lệ thuế 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => 'Tỷ lệ thuế mặc định phải là dạng số.',
+    'default_tax_rate_required'                 => 'Trường Tỷ lệ thuế mặc định là bắt buộc.',
+    'derive_sale_quantity'                      => 'Cho phép suy luận số lượng bán hàng',
+    'derive_sale_quantity_tooltip'              => 'Nếu chọn thì một kiểu hàng hóa mới sẽ được cung cấp cho đặt hàng hàng hóa theo tổng số mở rộng',
+    'dinner_table'                              => 'Bàn ăn',
+    'dinner_table_duplicate'                    => 'Bàn phải duy nhất.',
+    'dinner_table_enable'                       => 'Sử dụng bàn ăn',
+    'dinner_table_invalid_chars'                => "Tên bàn ăn không được chứa '_'.",
+    'dinner_table_required'                     => 'Trường bàn ăn là bắt buộc.',
+    'dot'                                       => 'dấu chấm',
+    'email'                                     => 'Thư điện tử',
+    'email_configuration'                       => 'Cấu hình Thư điện tử',
+    'email_mailpath'                            => 'Đường dẫn đến Sendmail',
+    'email_protocol'                            => 'Giao thức',
+    'email_receipt_check_behaviour'             => 'Dấu kiểm biên lai thư điện tử',
+    'email_receipt_check_behaviour_always'      => 'Luôn đánh dấu kiểm',
+    'email_receipt_check_behaviour_last'        => 'Nhớ lựa chọn cuối cùng',
+    'email_receipt_check_behaviour_never'       => 'Luôn không đánh dấu kiểm',
+    'email_smtp_crypto'                         => 'Mã hóa SMTP',
+    'email_smtp_host'                           => 'Máy phục vụ SMTP',
+    'email_smtp_pass'                           => 'Mật khẩu SMTP',
+    'email_smtp_port'                           => 'Cổng SMTP',
+    'email_smtp_timeout'                        => 'Chờ tối đa SMTP',
+    'email_smtp_user'                           => 'Tài khoản SMTP',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => 'Chính sách bắt buộc',
+    'enforce_privacy_tooltip'                   => 'Bảo vệ riêng tư khách hàng bắt buộc xáo trộn dữ liệu trong trường hợp dữ liệu của họ đang bị xóa',
+    'fax'                                       => 'Fax',
+    'file_perm'                                 => 'Có một số vấn đề với phân quyền tập tin vui lòng sửa và tải lại trang này.',
+    'financial_year'                            => 'Ngày đầu năm tài chính',
+    'financial_year_apr'                        => '1 tháng tư',
+    'financial_year_aug'                        => '1 tháng tám',
+    'financial_year_dec'                        => '1 tháng mười hai',
+    'financial_year_feb'                        => '1 tháng hai',
+    'financial_year_jan'                        => '1 tháng giêng',
+    'financial_year_jul'                        => '1 tháng bảy',
+    'financial_year_jun'                        => '1 tháng sáu',
+    'financial_year_mar'                        => '1 tháng ba',
+    'financial_year_may'                        => '1 tháng năm',
+    'financial_year_nov'                        => '1 tháng mười một',
+    'financial_year_oct'                        => '1 tháng mười',
+    'financial_year_sep'                        => '1 tháng chín',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => 'reCAPTCHA cho trang đăng nhập',
+    'gcaptcha_secret_key'                       => 'Khóa bí mật reCAPTCHA',
+    'gcaptcha_secret_key_required'              => 'Khóa bí mật reCAPTCHA là trường bắt buộc',
+    'gcaptcha_site_key'                         => 'Khóa trang reCAPTCHA',
+    'gcaptcha_site_key_required'                => 'Khóa trang reCAPTCHA là trường bắt buộc',
+    'gcaptcha_tooltip'                          => 'Bảo vệ trang đăng nhập bằng Google reCAPTCHA, bấm vào biểu tượng cho một cặp khóa API.',
+    'general'                                   => 'Chung',
+    'general_configuration'                     => 'Thông tin chung',
+    'giftcard_number'                           => 'Số Thẻ quà tặng',
+    'giftcard_random'                           => 'Tạo ngẫu nhiên',
+    'giftcard_series'                           => 'Tạo dạng nối tiếp nhau',
+    'image_allowed_file_types'                  => 'Các kiểu tập tin được phép',
+    'image_max_height_tooltip'                  => 'Chiều cao ảnh tải lên tối đa được phép tính bằng điểm ảnh (px).',
+    'image_max_size_tooltip'                    => 'Kích cỡ tập tin ảnh tải lên tối đa được phép tính bằng kilobytes (kb).',
+    'image_max_width_tooltip'                   => 'Chiều rộng ảnh tải lên tối đa được phép tính bằng điểm ảnh (px).',
+    'image_restrictions'                        => 'Hạn chế tải ảnh lên',
+    'include_hsn'                               => 'Bao gồm hỗ trợ cho mã HSN',
+    'info'                                      => 'Thông tin',
+    'info_configuration'                        => 'Thông tin cửa hàng',
+    'input_groups'                              => '',
+    'integrations'                              => 'Tích hợp',
+    'integrations_configuration'                => 'Tích hợp bên thứ ba',
+    'invoice'                                   => 'Hóa đơn',
+    'invoice_configuration'                     => 'Cài đặt in hóa đơn',
+    'invoice_default_comments'                  => 'Ghi chú mặc định cho hóa đơn',
+    'invoice_email_message'                     => 'Mẫu hóa đơn khi gửi thư',
+    'invoice_enable'                            => 'Bật Hóa đơn',
+    'invoice_printer'                           => 'Máy in hóa đơn',
+    'invoice_type'                              => 'Loại hóa đơn',
+    'is_readable'                               => 'là đọc được, nhưng quyền hạn được đặt chưa đúng. Vui lòng đặt nó thành 640 hoặc 660 sau đó tải lại.',
+    'is_writable'                               => 'là ghi được, nhưng quyền hạn được đặt chưa đúng. Vui lòng đặt nó thành 750 sau đó tải lại.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Cảnh báo: Tính năng này chỉ làm việc nếu bạn đã cài đặt ứng dụng bổ xung jsPrintSetup cho FireFox. Cứ lưu chứ?',
+    'language'                                  => 'Ngôn ngữ',
+    'last_used_invoice_number'                  => 'Số hóa đơn dùng lần cuối',
+    'last_used_quote_number'                    => 'Số báo giá dùng lần cuối',
+    'last_used_work_order_number'               => 'Số W/O dùng lần cuối',
+    'left'                                      => 'Trái',
+    'license'                                   => 'Giấy phép',
+    'license_configuration'                     => 'Điều khoản của giấy phép',
+    'line_sequence'                             => 'Xếp dòng theo',
+    'lines_per_page'                            => 'Dòng trên mỗi trang',
+    'lines_per_page_number'                     => 'Dòng trên mỗi trang phải là dạng số.',
+    'lines_per_page_required'                   => 'Dòng trên mỗi trang là trường bắt buộc.',
+    'locale'                                    => 'Định dạng',
+    'locale_configuration'                      => 'Cấu hình Bản địa hóa',
+    'locale_info'                               => 'Thông tin Cấu hình Bản địa hóa',
+    'location'                                  => 'Kho',
+    'location_configuration'                    => 'Vị trí kho',
+    'location_info'                             => 'Thông tin cấu hình vị trí',
+    'login_form'                                => '',
+    'logout'                                    => 'Bạn có muốn sao lưu dự phòng trước khi đăng xuất ra không? Bấm chuột vào [OK] để sao lưu hoặc [Cancel] để đăng xuất.',
+    'mailchimp'                                 => 'Mailchimp',
+    'mailchimp_api_key'                         => 'Khóa API Mailchimp',
+    'mailchimp_configuration'                   => 'Cấu hình Mailchimp',
+    'mailchimp_key_successfully'                => 'API Key hợp lệ.',
+    'mailchimp_key_unsuccessfully'              => 'API Key không hợp lệ.',
+    'mailchimp_lists'                           => 'Bó thư Mailchimp',
+    'mailchimp_tooltip'                         => 'Bấm vào biểu tượng để lấy khóa API.',
+    'message'                                   => 'Nhắn tin',
+    'message_configuration'                     => 'Cấu hình nhắn tin',
+    'msg_msg'                                   => 'Tin nhắn văn bản đã lưu',
+    'msg_msg_placeholder'                       => 'Nếu bạn muốn dùng một mẫu thì lưu lại các tin nhắn SMS ở đây, nếu không thì để trống.',
+    'msg_pwd'                                   => 'Mật khẩu SMS-API',
+    'msg_src'                                   => 'Mã số bộ gửi SMS-API',
+    'msg_src_required'                          => 'Mã số bộ gửi SMS-API là trường bắt buộc',
+    'msg_uid'                                   => 'Tài khoản SMS-API',
+    'msg_uid_required'                          => 'Tài khoản SMS-API là trường bắt buộc',
+    'multi_pack_enabled'                        => 'Nhiều gói cho mỗi mục',
+    'no_risk'                                   => 'Không tiềm ẩn rủi ro / bảo mật nào.',
+    'none'                                      => 'không',
+    'notify_alignment'                          => 'Vị trí của thông báo nổi lên',
+    'number_format'                             => 'Định dạng số',
+    'number_locale'                             => 'Định dạng số',
+    'number_locale_invalid'                     => 'Vị trí đã nhập không hợp lệ. Kiểm tra liên kết trong tooltip để tìm vị trí hợp lệ.',
+    'number_locale_required'                    => 'Vị trí số là trường bắt buộc.',
+    'number_locale_tooltip'                     => 'Tìm vị trí phù hợp thông qua liên kết này.',
+    'os_timezone'                               => 'Múi giờ OSPOS:',
+    'ospos_info'                                => 'Thông tin cài đặt OSPOS',
+    'payment_options_order'                     => 'Thứ tự tùy chọn thanh toán',
+    'payment_reference_code_length_limits'      => 'Mã tham chiếu thanh toán<br>Giới hạn độ dài',
+    'payment_reference_code_length_max_label'   => 'Tối đa',
+    'payment_reference_code_length_min_label'   => 'Tối thiểu',
+    'perm_risk'                                 => 'Phân quyền không đúng khiến phần mềm tiềm ẩn rủi ro.',
+    'phone'                                     => 'Điện thoại công ty',
+    'phone_required'                            => 'Trường Điện thoại công ty là bắt buộc.',
+    'print_bottom_margin'                       => 'Lề dưới',
+    'print_bottom_margin_number'                => 'Lề dưới phải là dạng số.',
+    'print_bottom_margin_required'              => 'Trường Lề dưới là bắt buộc.',
+    'print_delay_autoreturn'                    => 'Tự động trả về trễ bán hàng',
+    'print_delay_autoreturn_number'             => 'Tự động trả về trễ bán hàng là trường bắt buộc.',
+    'print_delay_autoreturn_required'           => 'Tự động trả về trễ bán hàng phải là dạng số.',
+    'print_footer'                              => 'In phần chân trình duyệt',
+    'print_header'                              => 'In phần đầu trình duyệt',
+    'print_left_margin'                         => 'Lề trái',
+    'print_left_margin_number'                  => 'Lề trái phải ở dạng số.',
+    'print_left_margin_required'                => 'Trường Lề trái là bắt buộc.',
+    'print_receipt_check_behaviour'             => 'In dấu kiểm biên lai',
+    'print_receipt_check_behaviour_always'      => 'Luôn đánh dấu kiểm',
+    'print_receipt_check_behaviour_last'        => 'Nhớ lựa chọn cuối cùng',
+    'print_receipt_check_behaviour_never'       => 'Luôn không đánh dấu kiểm',
+    'print_right_margin'                        => 'Lề phải',
+    'print_right_margin_number'                 => 'Lề trên phải ở dạng số.',
+    'print_right_margin_required'               => 'Trường Lề trên là bắt buộc.',
+    'print_silently'                            => 'Hiển thị hộp thoại In',
+    'print_top_margin'                          => 'Lề trên',
+    'print_top_margin_number'                   => 'Lề trên phải ở dạng số.',
+    'print_top_margin_required'                 => 'Trường Lề trên là bắt buộc.',
+    'quantity_decimals'                         => 'Số lượng dấu thập phân',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => 'Ghi chú báo giá mặc định',
+    'receipt'                                   => 'Biên lai',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => 'Cài đặt in biên lai',
+    'receipt_default'                           => 'Mặc định',
+    'receipt_font_size'                         => 'Cỡ chữ',
+    'receipt_font_size_number'                  => 'Cỡ chữ phải là dạng số.',
+    'receipt_font_size_required'                => 'Trường Cỡ chữ là bắt buộc.',
+    'receipt_info'                              => 'Thông tin cấu hình Biên lai',
+    'receipt_printer'                           => 'In vé',
+    'receipt_short'                             => 'Ngắn',
+    'receipt_show_company_name'                 => 'Hiển thị tên công ty',
+    'receipt_show_description'                  => 'Hiện mô tả',
+    'receipt_show_serialnumber'                 => 'Hiển thị số Sê-ri',
+    'receipt_show_tax_ind'                      => 'Hiển thị chỉ thị thuế',
+    'receipt_show_taxes'                        => 'Hiển thị Thuế',
+    'receipt_show_total_discount'               => 'Hiển thị Giảm giá tổng cộng',
+    'receipt_template'                          => 'Mẫu biên lai',
+    'receiving_calculate_average_price'         => 'Tính giá tb (Nhập hàng)',
+    'recv_invoice_format'                       => 'Định dạng hóa đơn nhận hàng',
+    'register_mode_default'                     => 'Chế độ Đăng ký mặc định',
+    'report_an_issue'                           => 'Báo cáo trục trặc',
+    'return_policy_required'                    => 'Trường Chính sách trả hàng là bắt buộc.',
+    'reward'                                    => 'Điểm thưởng',
+    'reward_configuration'                      => 'Cấu hình Điểm thưởng',
+    'right'                                     => 'Phải',
+    'sales_invoice_format'                      => 'Định dạng Hóa đơn bán hàng',
+    'sales_quote_format'                        => 'Định dạng Báo giá bán hàng',
+    'mailpath_invalid'                          => 'Đường dẫn sendmail không hợp lệ. Chỉ cho phép chữ cái, số, dấu gạch ngang, dấu gạch dưới, dấu gạch chéo, dấu gạch chéo ngược, dấu hai chấm, dấu cách và dấu chấm.',
+    'saved_successfully'                        => 'Cấu hình được lưu thành công.',
+    'saved_unsuccessfully'                      => 'Gặp lỗi khi lưu cấu hình.',
+    'security_issue'                            => 'Cảnh báo về  lỗ hổng bảo mật',
+    'server_notice'                             => 'Vui lòng sử dụng các thông tin phía dưới để báo cáo lỗi.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => 'Hiển thị biểu tượng Văn phòng',
+    'statistics'                                => 'Gửi thống kê',
+    'statistics_tooltip'                        => 'Gửi thống kê cho nhà phát triển và mục đích cải tiến tính năng.',
+    'stock_location'                            => 'Vị trí kho',
+    'stock_location_duplicate'                  => 'Vị trí kho phải là duy nhất.',
+    'stock_location_invalid_chars'              => "Vị trí kho không được chứa '_'.",
+    'stock_location_required'                   => 'Trường Vị trí kho là bắt buộc.',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => 'Cột 1',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => 'Bố cục gợi ý tìm kiếm',
+    'suggestions_second_column'                 => 'Cột 2',
+    'suggestions_third_column'                  => 'Cột 3',
+    'system_conf'                               => 'Cài đặt & Cấu hình',
+    'system_info'                               => 'System Info',
+    'table'                                     => 'Bàn ăn',
+    'table_configuration'                       => 'Cấu hình bàn ăn',
+    'takings_printer'                           => 'In Biên lai',
+    'tax'                                       => 'Thuế',
+    'tax_category'                              => 'Thể loại thuế',
+    'tax_category_duplicate'                    => 'Thể loại thuế vừa nhập đã sẵn có.',
+    'tax_category_invalid_chars'                => 'Thể loại thuế vừa nhập không hợp lệ.',
+    'tax_category_required'                     => 'Thể loại thuế là bắt buộc.',
+    'tax_category_used'                         => 'Không thể xóa Thể loại thuế bởi vì nó đang được dùng.',
+    'tax_configuration'                         => 'Cấu hình Thuế',
+    'tax_decimals'                              => 'Phần thập phân Thế',
+    'tax_id'                                    => 'Mã số thuế',
+    'tax_included'                              => 'Gồm thuế',
+    'theme'                                     => 'Giao diện',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => 'Dấu ngăn cách phần nghìn',
+    'timezone'                                  => 'Múi giờ',
+    'timezone_error'                            => 'Múi giờ OSPOS khác với múi giờ trên máy của bạn.',
+    'top'                                       => 'Đỉnh',
+    'use_destination_based_tax'                 => 'Sử dụng thuế dựa trên điểm đến',
+    'user_timezone'                             => 'Múi giờ trên máy nội bộ:',
+    'website'                                   => 'Website',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => 'Hỗ trợ giao việc',
+    'work_order_format'                         => 'Định dạng giấy giao việc',
 ];
diff --git a/app/Language/vi/Employees.php b/app/Language/vi/Employees.php
index d262690e2..b6f0dba0c 100644
--- a/app/Language/vi/Employees.php
+++ b/app/Language/vi/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "Thông tin",
-    "cannot_be_deleted"            => "Không thể xóa các nhân viên đã chọn, một hay nhiều nhân viên đã xử lý bán hàng hoặc bạn đang cố xóa tài khoản của mình.",
-    "change_employee"              => "",
-    "change_password"              => "Đổi mật khẩu",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "Bạn chắc chắn muốn xóa các nhân viên được chọn không?",
-    "confirm_restore"              => "Bạn chắc chắn muốn hoàn lại các nhân viên được chọn không?",
-    "current_password"             => "Mật khẩu hiện tại",
-    "current_password_invalid"     => "Mật khẩu hiện tại không hợp lệ.",
-    "employee"                     => "Nhân viên",
-    "error_adding_updating"        => "Gặp lỗi khi cập nhật hay thêm nhân viên.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "Bạn không thể xóa người dùng demo admin.",
-    "error_updating_demo_admin"    => "Bạn không thể thay đổi người dùng demo admin.",
-    "language"                     => "Ngôn ngữ",
-    "login_info"                   => "Đăng nhập",
-    "manager"                      => "",
-    "new"                          => "Nhân viên mới",
-    "none_selected"                => "Bạn chưa chọn bất kỳ một nhân viên nào để mà xóa.",
-    "one_or_multiple"              => "nhân viên",
-    "password"                     => "Mật khẩu",
-    "password_minlength"           => "Mật khẩu phải dài ít nhất 8 ký tự.",
-    "password_must_match"          => "Mật khẩu không khớp nhau.",
-    "password_not_must_match"      => "Mật khẩu hiện tại và mới phải khác nhau.",
-    "password_required"            => "Mật khẩu là bắt buộc.",
-    "permission_desc"              => "Các hộp dấu kiểm phía dưới cấp quyền truy cập cho các mô đun.",
-    "permission_info"              => "Quyền hạn",
-    "repeat_password"              => "Gõ lại mật khẩu lần nữa",
-    "subpermission_required"       => "Thêm ít nhất một quyền cho từng mô đun.",
-    "successful_adding"            => "Đã thêm thành công nhân viên.",
-    "successful_change_password"   => "Đổi mật khẩu thành công.",
-    "successful_deleted"           => "Bạn đã xóa thành công",
-    "successful_updating"          => "Bạn đã cập nhật nhân viên thành công",
-    "system_language"              => "Ngôn ngữ hệ thống",
-    "unsuccessful_change_password" => "Gặp lỗi khi thay đổi mật khẩu.",
-    "update"                       => "Cập nhật Nhân viên",
-    "username"                     => "Tài khoản",
-    "username_duplicate"           => "",
-    "username_minlength"           => "Tài khoản phải dài ít nhất là 5 ký tự.",
-    "username_required"            => "Trường tài khoản là bắt buộc.",
+    'administrator'                          => '',
+    'basic_information'                      => 'Thông tin',
+    'cannot_be_deleted'                      => 'Không thể xóa các nhân viên đã chọn, một hay nhiều nhân viên đã xử lý bán hàng hoặc bạn đang cố xóa tài khoản của mình.',
+    'change_employee'                        => '',
+    'change_password'                        => 'Đổi mật khẩu',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => 'Bạn chắc chắn muốn xóa các nhân viên được chọn không?',
+    'confirm_restore'                        => 'Bạn chắc chắn muốn hoàn lại các nhân viên được chọn không?',
+    'current_password'                       => 'Mật khẩu hiện tại',
+    'current_password_invalid'               => 'Mật khẩu hiện tại không hợp lệ.',
+    'employee'                               => 'Nhân viên',
+    'error_adding_updating'                  => 'Gặp lỗi khi cập nhật hay thêm nhân viên.',
+    'error_cannot_remove_own_minimum_grant'  => 'Bạn không thể gỡ bỏ các quyền truy cập mô đun tối thiểu của chính mình.',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => 'Bạn không thể xóa người dùng demo admin.',
+    'error_grant_change_disallowed'          => 'Thay đổi quyền bị vô hiệu hóa trong bản demo này.',
+    'error_password_change_disallowed'       => 'Thay đổi mật khẩu bị vô hiệu hóa trong bản demo này.',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => 'Bạn không thể thay đổi người dùng demo admin.',
+    'language'                               => 'Ngôn ngữ',
+    'login_info'                             => 'Đăng nhập',
+    'manager'                                => '',
+    'new'                                    => 'Nhân viên mới',
+    'none_selected'                          => 'Bạn chưa chọn bất kỳ một nhân viên nào để mà xóa.',
+    'one_or_multiple'                        => 'nhân viên',
+    'password'                               => 'Mật khẩu',
+    'password_minlength'                     => 'Mật khẩu phải dài ít nhất 8 ký tự.',
+    'password_must_match'                    => 'Mật khẩu không khớp nhau.',
+    'password_not_must_match'                => 'Mật khẩu hiện tại và mới phải khác nhau.',
+    'password_required'                      => 'Mật khẩu là bắt buộc.',
+    'permission_desc'                        => 'Các hộp dấu kiểm phía dưới cấp quyền truy cập cho các mô đun.',
+    'permission_info'                        => 'Quyền hạn',
+    'repeat_password'                        => 'Gõ lại mật khẩu lần nữa',
+    'subpermission_required'                 => 'Thêm ít nhất một quyền cho từng mô đun.',
+    'successful_adding'                      => 'Đã thêm thành công nhân viên.',
+    'successful_change_password'             => 'Đổi mật khẩu thành công.',
+    'successful_deleted'                     => 'Bạn đã xóa thành công',
+    'successful_updating'                    => 'Bạn đã cập nhật nhân viên thành công',
+    'system_language'                        => 'Ngôn ngữ hệ thống',
+    'unsuccessful_change_password'           => 'Gặp lỗi khi thay đổi mật khẩu.',
+    'update'                                 => 'Cập nhật Nhân viên',
+    'username'                               => 'Tài khoản',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => 'Tài khoản phải dài ít nhất là 5 ký tự.',
+    'username_required'                      => 'Trường tài khoản là bắt buộc.',
 ];
diff --git a/app/Language/vi/Error.php b/app/Language/vi/Error.php
index fae35e08c..89a13eb46 100644
--- a/app/Language/vi/Error.php
+++ b/app/Language/vi/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "Bạn không có thẩm quyền truy cập vào mô đun đó",
-    "unknown"              => "Lỗi chưa biết",
+    'no_permission_module'           => 'Bạn không có thẩm quyền truy cập vào mô đun đó',
+    'unable_to_create_env_file'      => 'Không thể tạo {filePath} để thiết lập throttle.key',
+    'unable_to_lock_file'            => 'Không thể khóa {filePath}: {reason}',
+    'unable_to_open_lock_file'       => 'Không thể mở {filePath}: {reason}',
+    'unable_to_persist_throttle_key' => 'Không thể lưu throttle.key vào {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => 'Không thể đọc {filePath} để thiết lập throttle.key',
+    'unknown'                        => 'Lỗi chưa biết',
 ];
diff --git a/app/Language/vi/Items.php b/app/Language/vi/Items.php
index 4f018a326..57da67d3b 100644
--- a/app/Language/vi/Items.php
+++ b/app/Language/vi/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "Hàng tồn kho để thêm hay bớt.",
-    "allow_alt_description"              => "Cho phép Mô tả thay thế",
-    "amount_entry"                       => "Đầu mục tổng số",
-    "bulk_edit"                          => "Sửa hàng loạt",
-    "buy_price_required"                 => "Trường Giá đặt mua là bắt buộc.",
-    "cannot_be_deleted"                  => "Không thể xóa các Hàng hóa đã chọn, một hay nhiều cái đã chọn đã từng được bán.",
-    "cannot_find_item"                   => "Không tìm thấy hàng hóa.",
-    "categories"                         => "",
-    "category"                           => "Thể loại",
-    "category_new"                       => "",
-    "category_required"                  => "Trường thể loại là bắt buộc.",
-    "change_all_to_allow_alt_desc"       => "Cho phép Mô tả thay thế cho tất cả.",
-    "change_all_to_not_allow_allow_desc" => "Không cho phép Mô tả thay thế cho tất cả.",
-    "change_all_to_serialized"           => "Đổi tất cả sang sêri hóa",
-    "change_all_to_unserialized"         => "Đổi tất cả sang không sêri",
-    "change_image"                       => "Đổi ảnh",
-    "confirm_bulk_edit"                  => "Bạn chắc chắn muốn sửa lại các Hàng hóa được chọn không?",
-    "confirm_bulk_edit_wipe_taxes"       => "Mọi thông tin Thuế Hàng hóa sẽ bị thay thế.",
-    "confirm_delete"                     => "Bạn chắc chắn muốn xóa các hàng hóa được chọn không?",
-    "confirm_restore"                    => "Bạn chắc chắn muốn hoàn lại các hàng hóa được chọn không?",
-    "cost_price"                         => "Giá bán buôn",
-    "cost_price_number"                  => "Giá bán buôn phải là dạng số.",
-    "cost_price_required"                => "Trường Giá bán buôn là bắt buộc.",
-    "count"                              => "Cập hàng tồn kho",
-    "csv_import_failed"                  => "Gặp lỗi khi nhập từ CSV",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Tập tin tải lên không có dữ liệu hoặc là nó có định dạng không đúng.",
-    "csv_import_partially_failed"        => "Có {0} mục tin gặp lỗi khi nhập trên dòng: {1}. Không có hàng nào được nhập vào.",
-    "csv_import_success"                 => "Nhập hàng hóa thành công.",
-    "current_quantity"                   => "Số lượng hiện tại",
-    "default_pack_name"                  => "Mỗi",
-    "description"                        => "Mô tả",
-    "details_count"                      => "Chi tiết số lượng tồn kho",
-    "do_nothing"                         => "Không làm gì",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "Sửa các trường mong muốn cho các hàng hóa được chọn.",
-    "edit_multiple_items"                => "Sửa nhiều hàng hóa cùng lúc",
-    "empty_upc_items"                    => "Mã vạch hàng hóa để trống",
-    "error_adding_updating"              => "Lỗi thêm/cập nhật hàng hóa",
-    "error_updating_multiple"            => "Có lỗi khi cập nhật hàng hóa",
-    "generate_barcodes"                  => "Tạo mã vạch",
-    "hsn_code"                           => "Tuân theo hệ thống hài hòa",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Nhập hàng hóa từ CSV",
-    "info_provided_by"                   => "Thông tin được cung cấp bởi",
-    "inventory"                          => "Tồn kho",
-    "inventory_CSV_import_quantity"      => "Số lượng đã được nhập từ CSV",
-    "inventory_comments"                 => "Ghi chú",
-    "inventory_data_tracking"            => "Theo dõi dữ liệu tồn kho",
-    "inventory_date"                     => "Ngày tháng",
-    "inventory_employee"                 => "Nhân viên",
-    "inventory_in_out_quantity"          => "Số lượng Vào/Ra",
-    "inventory_remarks"                  => "Lưu ý",
-    "is_deleted"                         => "Đã xoá",
-    "is_printed"                         => "",
-    "is_serialized"                      => "Hàng hóa có số sêri",
-    "item"                               => "Hàng hóa",
-    "item_id"                            => "",
-    "item_number"                        => "Mã vạch",
-    "item_number_duplicate"              => "Số hàng hóa đã sẵn có trong cơ sở dữ liệu rồi.",
-    "kit"                                => "Kít",
-    "location"                           => "Vị trí",
-    "low_inventory_items"                => "Hàng hóa hết hàng trong kho",
-    "low_sell_item"                      => "Hàng hóa bán kém",
-    "manually_editing_of_quantity"       => "Sửa số lượng bằng tay",
-    "markup"                             => "",
-    "name"                               => "Tên Hàng hóa",
-    "name_required"                      => "Trường Tên Hàng hóa là bắt buộc.",
-    "new"                                => "Hàng hóa mới",
-    "no_description_items"               => "Hàng hóa không có mô tả",
-    "no_items_to_display"                => "Không có hàng hóa để hiển thị.",
-    "none"                               => "Không",
-    "none_selected"                      => "Bạn chưa chọn bất kỳ một Hàng hóa nào để mà sửa",
-    "nonstock"                           => "Hết hàng",
-    "number_information"                 => "Số hàng hóa",
-    "number_required"                    => "Trường Mã vạch là bắt buộc.",
-    "one_or_multiple"                    => "hàng hóa",
-    "pack_name"                          => "Tên gói",
-    "qty_per_pack"                       => "Số lượng mỗi gói",
-    "quantity"                           => "Số lượng",
-    "quantity_number"                    => "Số lượng phải là dạng số.",
-    "quantity_required"                  => "Trường số lượng là bắt buộc.",
-    "receiving_quantity"                 => "Số lượng nhập hàng",
-    "remove_image"                       => "Gỡ bỏ ảnh",
-    "reorder_level"                      => "Mức đặt mua bổ xung",
-    "reorder_level_number"               => "Mức đặt mua bổ xung phải là con số.",
-    "reorder_level_required"             => "Trường Mức đặt mua bổ xung là bắt buộc.",
-    "retrive_item_info"                  => "Thông tin Nhập hàng",
-    "sales_tax_1"                        => "Thuế bán hàng",
-    "sales_tax_2"                        => "Thuế bán hàng 2",
-    "search_attributes"                  => "Tìm kiếm các thuộc tính",
-    "select_image"                       => "Chọn ảnh",
-    "serialized_items"                   => "Các hàng hóa có sêri",
-    "standard"                           => "Tiêu chuẩn",
-    "stock"                              => "Có hàng",
-    "stock_location"                     => "Vị trí kho",
-    "stock_type"                         => "Kiểu kho",
-    "successful_adding"                  => "Bạn đã thêm Hàng hóa thành công",
-    "successful_bulk_edit"               => "Bạn đã cập nhật các hàng hóa đã chọn thành công",
-    "successful_deleted"                 => "Bạn đã xóa thành công",
-    "successful_updating"                => "Bạn đã cập nhật hàng hóa thành công",
-    "supplier"                           => "Nhà cung cấp",
-    "tax_1"                              => "Thuế 1",
-    "tax_2"                              => "Thuế 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "Thể loại thuế",
-    "tax_percent"                        => "Phần trăm Thuế",
-    "tax_percent_number"                 => "Phần trăm Thuế phải dạng số",
-    "tax_percent_required"               => "Trường Phần trăm Thuế là bắt buộc.",
-    "tax_percents"                       => "Phần trăm Thuế",
-    "temp"                               => "Tạm thời",
-    "type"                               => "Kiểu Hàng hóa",
-    "unit_price"                         => "Giá bán lẻ",
-    "unit_price_number"                  => "Giá bán lẻ mỗi đơn vị phải là dạng số.",
-    "unit_price_required"                => "Trường giá bán lẻ là bắt buộc.",
-    "upc_database"                       => "Cơ sở dữ liệu mã vạch",
-    "update"                             => "Cập nhật Hàng hóa",
-    "use_inventory_menu"                 => "Dùng trình đơn Tồn kho",
+    'add_minus'                          => 'Hàng tồn kho để thêm hay bớt.',
+    'allow_alt_description'              => 'Cho phép Mô tả thay thế',
+    'amount_entry'                       => 'Đầu mục tổng số',
+    'bulk_edit'                          => 'Sửa hàng loạt',
+    'buy_price_required'                 => 'Trường Giá đặt mua là bắt buộc.',
+    'cannot_be_deleted'                  => 'Không thể xóa các Hàng hóa đã chọn, một hay nhiều cái đã chọn đã từng được bán.',
+    'cannot_find_item'                   => 'Không tìm thấy hàng hóa.',
+    'categories'                         => '',
+    'category'                           => 'Thể loại',
+    'category_new'                       => '',
+    'category_required'                  => 'Trường thể loại là bắt buộc.',
+    'change_all_to_allow_alt_desc'       => 'Cho phép Mô tả thay thế cho tất cả.',
+    'change_all_to_not_allow_allow_desc' => 'Không cho phép Mô tả thay thế cho tất cả.',
+    'change_all_to_serialized'           => 'Đổi tất cả sang sêri hóa',
+    'change_all_to_unserialized'         => 'Đổi tất cả sang không sêri',
+    'change_image'                       => 'Đổi ảnh',
+    'confirm_bulk_edit'                  => 'Bạn chắc chắn muốn sửa lại các Hàng hóa được chọn không?',
+    'confirm_bulk_edit_wipe_taxes'       => 'Mọi thông tin Thuế Hàng hóa sẽ bị thay thế.',
+    'confirm_delete'                     => 'Bạn chắc chắn muốn xóa các hàng hóa được chọn không?',
+    'confirm_restore'                    => 'Bạn chắc chắn muốn hoàn lại các hàng hóa được chọn không?',
+    'cost_price'                         => 'Giá bán buôn',
+    'cost_price_number'                  => 'Giá bán buôn phải là dạng số.',
+    'cost_price_required'                => 'Trường Giá bán buôn là bắt buộc.',
+    'count'                              => 'Cập hàng tồn kho',
+    'csv_import_failed'                  => 'Gặp lỗi khi nhập từ CSV',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Tập tin tải lên không có dữ liệu hoặc là nó có định dạng không đúng.',
+    'csv_import_partially_failed'        => 'Có {0} mục tin gặp lỗi khi nhập trên dòng: {1}. Không có hàng nào được nhập vào.',
+    'csv_import_success'                 => 'Nhập hàng hóa thành công.',
+    'current_quantity'                   => 'Số lượng hiện tại',
+    'default_pack_name'                  => 'Mỗi',
+    'description'                        => 'Mô tả',
+    'details_count'                      => 'Chi tiết số lượng tồn kho',
+    'do_nothing'                         => 'Không làm gì',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => 'Sửa các trường mong muốn cho các hàng hóa được chọn.',
+    'edit_multiple_items'                => 'Sửa nhiều hàng hóa cùng lúc',
+    'empty_upc_items'                    => 'Mã vạch hàng hóa để trống',
+    'error_adding_updating'              => 'Lỗi thêm/cập nhật hàng hóa',
+    'error_updating_multiple'            => 'Có lỗi khi cập nhật hàng hóa',
+    'generate_barcodes'                  => 'Tạo mã vạch',
+    'hsn_code'                           => 'Tuân theo hệ thống hài hòa',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Nhập hàng hóa từ CSV',
+    'info_provided_by'                   => 'Thông tin được cung cấp bởi',
+    'inventory'                          => 'Tồn kho',
+    'inventory_CSV_import_quantity'      => 'Số lượng đã được nhập từ CSV',
+    'inventory_comments'                 => 'Ghi chú',
+    'inventory_data_tracking'            => 'Theo dõi dữ liệu tồn kho',
+    'inventory_date'                     => 'Ngày tháng',
+    'inventory_employee'                 => 'Nhân viên',
+    'inventory_in_out_quantity'          => 'Số lượng Vào/Ra',
+    'inventory_remarks'                  => 'Lưu ý',
+    'is_deleted'                         => 'Đã xoá',
+    'is_printed'                         => '',
+    'is_serialized'                      => 'Hàng hóa có số sêri',
+    'item'                               => 'Hàng hóa',
+    'item_id'                            => '',
+    'item_number'                        => 'Mã vạch',
+    'item_number_duplicate'              => 'Số hàng hóa đã sẵn có trong cơ sở dữ liệu rồi.',
+    'item_number_invalid'                => 'Số hàng hóa chứa ký tự không được phép.',
+    'kit'                                => 'Kít',
+    'location'                           => 'Vị trí',
+    'low_inventory_items'                => 'Hàng hóa hết hàng trong kho',
+    'low_sell_item'                      => 'Hàng hóa bán kém',
+    'manually_editing_of_quantity'       => 'Sửa số lượng bằng tay',
+    'markup'                             => '',
+    'name'                               => 'Tên Hàng hóa',
+    'name_required'                      => 'Trường Tên Hàng hóa là bắt buộc.',
+    'new'                                => 'Hàng hóa mới',
+    'no_description_items'               => 'Hàng hóa không có mô tả',
+    'no_items_to_display'                => 'Không có hàng hóa để hiển thị.',
+    'none'                               => 'Không',
+    'none_selected'                      => 'Bạn chưa chọn bất kỳ một Hàng hóa nào để mà sửa',
+    'nonstock'                           => 'Hết hàng',
+    'number_information'                 => 'Số hàng hóa',
+    'number_required'                    => 'Trường Mã vạch là bắt buộc.',
+    'one_or_multiple'                    => 'hàng hóa',
+    'pack_name'                          => 'Tên gói',
+    'qty_per_pack'                       => 'Số lượng mỗi gói',
+    'quantity'                           => 'Số lượng',
+    'quantity_number'                    => 'Số lượng phải là dạng số.',
+    'quantity_required'                  => 'Trường số lượng là bắt buộc.',
+    'receiving_quantity'                 => 'Số lượng nhập hàng',
+    'remove_image'                       => 'Gỡ bỏ ảnh',
+    'reorder_level'                      => 'Mức đặt mua bổ xung',
+    'reorder_level_number'               => 'Mức đặt mua bổ xung phải là con số.',
+    'reorder_level_required'             => 'Trường Mức đặt mua bổ xung là bắt buộc.',
+    'retrive_item_info'                  => 'Thông tin Nhập hàng',
+    'sales_tax_1'                        => 'Thuế bán hàng',
+    'sales_tax_2'                        => 'Thuế bán hàng 2',
+    'search_attributes'                  => 'Tìm kiếm các thuộc tính',
+    'select_image'                       => 'Chọn ảnh',
+    'serialized_items'                   => 'Các hàng hóa có sêri',
+    'standard'                           => 'Tiêu chuẩn',
+    'stock'                              => 'Có hàng',
+    'stock_location'                     => 'Vị trí kho',
+    'stock_type'                         => 'Kiểu kho',
+    'successful_adding'                  => 'Bạn đã thêm Hàng hóa thành công',
+    'successful_bulk_edit'               => 'Bạn đã cập nhật các hàng hóa đã chọn thành công',
+    'successful_deleted'                 => 'Bạn đã xóa thành công',
+    'successful_updating'                => 'Bạn đã cập nhật hàng hóa thành công',
+    'supplier'                           => 'Nhà cung cấp',
+    'tax_1'                              => 'Thuế 1',
+    'tax_2'                              => 'Thuế 2',
+    'tax_3'                              => '',
+    'tax_category'                       => 'Thể loại thuế',
+    'tax_name_invalid'                   => 'Tên thuế chứa ký tự không được phép.',
+    'tax_percent'                        => 'Phần trăm Thuế',
+    'tax_percent_number'                 => 'Phần trăm Thuế phải dạng số',
+    'tax_percent_required'               => 'Trường Phần trăm Thuế là bắt buộc.',
+    'tax_percents'                       => 'Phần trăm Thuế',
+    'temp'                               => 'Tạm thời',
+    'type'                               => 'Kiểu Hàng hóa',
+    'unit_price'                         => 'Giá bán lẻ',
+    'unit_price_number'                  => 'Giá bán lẻ mỗi đơn vị phải là dạng số.',
+    'unit_price_required'                => 'Trường giá bán lẻ là bắt buộc.',
+    'upc_database'                       => 'Cơ sở dữ liệu mã vạch',
+    'update'                             => 'Cập nhật Hàng hóa',
+    'use_inventory_menu'                 => 'Dùng trình đơn Tồn kho',
 ];
diff --git a/app/Language/vi/Login.php b/app/Language/vi/Login.php
index 12bedf6a7..e8271f603 100644
--- a/app/Language/vi/Login.php
+++ b/app/Language/vi/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "Tôi không phải là robot.",
-    "go"                            => "Đăng nhập",
-    "invalid_gcaptcha"              => "Xin vui lòng xác nhận bạn không phải là robot.",
-    "invalid_installation"          => "Phần cài đặt chưa đúng, kiểm tra tập tin php.ini của bạn.",
-    "invalid_username_and_password" => "Tài khoản hoặc mật khẩu không hợp lệ.",
-    "login"                         => "Đăng nhập",
-    "logout"                        => "Đăng xuất",
-    "migration_needed"              => "Di chuyển cơ sở dữ liệu sang {0} sẽ được bắt đầu sau khi đăng nhập.",
-    "password"                      => "Mật khẩu",
-    "required_username"             => "",
-    "username"                      => "Tài khoản",
-    "welcome"                       => "Chào mừng đến với {0}!",
+    "gcaptcha"                            => "Tôi không phải là robot.",
+    "go"                                  => "Đăng nhập",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "Xin vui lòng xác nhận bạn không phải là robot.",
+    "invalid_installation"                => "Phần cài đặt chưa đúng, kiểm tra tập tin php.ini của bạn.",
+    "invalid_username_and_password"       => "Tài khoản hoặc mật khẩu không hợp lệ.",
+    "login"                               => "Đăng nhập",
+    "logout"                              => "Đăng xuất",
+    "migrating_database"                  => "Đang di chuyển cơ sở dữ liệu",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "Di chuyển cơ sở dữ liệu thành công!",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "Di chuyển cơ sở dữ liệu sang {0} sẽ được bắt đầu sau khi đăng nhập.",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "Mật khẩu",
+    "required_username"                   => "",
+    'too_many_attempts'                   => 'Quá nhiều lần thử. Vui lòng đợi một chút và thử lại.',
+    "username"                            => "Tài khoản",
+    "welcome"                             => "Chào mừng đến với {0}!"
 ];
diff --git a/app/Language/vi/Reports.php b/app/Language/vi/Reports.php
index 013453f70..fd99ba08e 100644
--- a/app/Language/vi/Reports.php
+++ b/app/Language/vi/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "Tỷ suất thuế",
     "taxes"                                   => "Thuế",
     "taxes_summary_report"                    => "Báo cáo tổng thể Thuế",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "Tổng cộng",
     "total_inventory_value"                   => "Giá trị tồn kho tổng cộng",
     "total_low_sell_quantity"                 => "Tổng số lượng hàng bán ít",
diff --git a/app/Language/vi/Sales.php b/app/Language/vi/Sales.php
index d99083c28..f8e770a76 100644
--- a/app/Language/vi/Sales.php
+++ b/app/Language/vi/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "Các điểm sẵn có",
-    "rewards_package"                  => "Điểm thưởng",
-    "rewards_remaining_balance"        => "Giá trị còn lại của điểm thưởng là ",
-    "account_number"                   => "Tài khoản #",
-    "add_payment"                      => "Thêm thanh toán",
-    "amount_due"                       => "Số còn lại phải thanh toán",
-    "amount_tendered"                  => "Số tiền thanh toán",
-    "authorized_signature"             => "Chữ ký ủy quyền",
-    "cancel_sale"                      => "Thôi",
-    "cash"                             => "Tiền mặt",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Điều chỉnh tiền mặt",
-    "cash_deposit"                     => "Số dư tiền mặt",
-    "cash_filter"                      => "Tiền mặt",
-    "change_due"                       => "Tiền thối lại",
-    "change_price"                     => "Thay đổi giá bán",
-    "check"                            => "Séc",
-    "check_balance"                    => "Phần còn lại séc",
-    "check_filter"                     => "Séc",
-    "close"                            => "",
-    "comment"                          => "Ghi chú",
-    "comments"                         => "Ghi chú",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Hoàn thành",
-    "confirm_cancel_sale"              => "Bạn có chắc muốn xóa trắng lần bán hàng này? Mọi hàng hóa sẽ bị xóa sạch.",
-    "confirm_delete"                   => "Bạn chắc chắn muốn xóa các lần bán hàng được chọn không?",
-    "confirm_restore"                  => "Bạn chắc chắn muốn hoàn lại các lần bán hàng được chọn không?",
-    "credit"                           => "Thẻ tín dụng",
-    "credit_deposit"                   => "Số dư tiền gửi",
-    "credit_filter"                    => "Thẻ tín dụng",
-    "current_table"                    => "",
-    "customer"                         => "Khách hàng",
-    "customer_address"                 => "Địa chỉ",
-    "customer_discount"                => "Giảm giá",
-    "customer_email"                   => "Thư điện tử",
-    "customer_location"                => "Vị trí",
-    "customer_mailchimp_status"        => "Trạng thái tài khoản Mailchimp",
-    "customer_optional"                => "(Tùy chọn)",
-    "customer_required"                => "(Bắt buộc)",
-    "customer_total"                   => "Tổng cộng",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Ngày bán",
-    "date_range"                       => "Phạm vi Ngày",
-    "date_required"                    => "Ngày phải được nhập theo định dạng.",
-    "date_type"                        => "Trường Ngày tháng là bắt buộc.",
-    "debit"                            => "Thẻ ghi nợ",
-    "debit_filter"                     => "",
-    "delete"                           => "Cho phép xóa",
-    "delete_confirmation"              => "Bạn có chắc muốn xóa lần nhập bán hàng? Thao tác này không thể hoàn lại.",
-    "delete_entire_sale"               => "Xóa toàn bộ đơn bán hàng",
-    "delete_successful"                => "Đã xóa thành công lần bán hàng.",
-    "delete_unsuccessful"              => "Gặp lỗi khi xóa đơn bán hàng.",
-    "description_abbrv"                => "Ggiá.",
-    "discard"                          => "Hủy",
-    "discard_quote"                    => "",
-    "discount"                         => "Ggiá %",
-    "discount_included"                => "% Giảm giá",
-    "discount_short"                   => "%",
-    "due"                              => "Trả chậm",
-    "due_filter"                       => "Trả chậm",
-    "edit"                             => "Sửa",
-    "edit_item"                        => "Sửa hàng hóa",
-    "edit_sale"                        => "Sửa bán hàng",
-    "email_receipt"                    => "Biên lai thư",
-    "employee"                         => "Nhân viên",
-    "entry"                            => "Mục nhập",
-    "error_editing_item"               => "Lỗi sửa hàng hóa",
-    "find_or_scan_item"                => "Tìm hay quét Hàng hóa",
-    "find_or_scan_item_or_receipt"     => "Tìm hay quét Hàng hóa hay Biên lai",
-    "giftcard"                         => "Thẻ quà tặng",
-    "giftcard_balance"                 => "Số thẻ quà tặng còn lại",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Số Thẻ quà tặng",
-    "group_by_category"                => "Gộp theo Danh mục",
-    "group_by_type"                    => "Gộp theo kiểu",
-    "hsn"                              => "HSN",
-    "id"                               => "Mã bán hàng",
-    "include_prices"                   => "Bao gồm Giá?",
-    "invoice"                          => "Hóa đơn",
-    "invoice_confirm"                  => "Hóa đơn sẽ được gửi đến",
-    "invoice_enable"                   => "Tạo hóa dơn",
-    "invoice_filter"                   => "Hóa đơn",
-    "invoice_no_email"                 => "Khách hàng này không có địa chỉ thư điện tử hợp lệ.",
-    "invoice_number"                   => "Hóa đơn #",
-    "invoice_number_duplicate"         => "Số Hóa đơn phải duy nhất.",
-    "invoice_sent"                     => "Gửi Hóa đơn đến",
-    "invoice_total"                    => "Tổng hóa đơn",
-    "invoice_type_custom_invoice"      => "Hóa đơn tùy chọn (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Hóa đơn thuế tự chọn (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Hóa đơn (invoice.php)",
-    "invoice_type_tax_invoice"         => "Hóa đơn thuế (tax_invoice.php)",
-    "invoice_unsent"                   => "Gặp lỗi khi gửi Hóa đơn cho",
-    "invoice_update"                   => "Kiểm lại",
-    "item_insufficient_of_stock"       => "Không đủ hàng tồn cho mặt hàng này.",
-    "item_name"                        => "Tên Hàng hóa",
-    "item_number"                      => "Hàng hóa #",
-    "item_out_of_stock"                => "Hết hàng trong kho.",
-    "key_browser"                      => "Phím tắt hữu ích",
-    "key_cancel"                       => "Hủy báo giá/hóa đơn/bán hàng hiện tại",
-    "key_customer_search"              => "Tìm khách hàng",
-    "key_finish_quote"                 => "Kết thúc báo giá/hóa đơn mà không cần thanh toán",
-    "key_finish_sale"                  => "Thanh toán và hoàn thành hóa đơn/bán hàng",
-    "key_full"                         => "Toàn màn hình",
-    "key_function"                     => "Function",
-    "key_help"                         => "Phím tắt",
-    "key_help_modal"                   => "Mở cửa sổ phím tắt",
-    "key_in"                           => "Phòng to",
-    "key_item_search"                  => "Tìm hàng hóa",
-    "key_out"                          => "Thu nhỏ",
-    "key_payment"                      => "Thêm thanh toán",
-    "key_print"                        => "In trang hiện tại",
-    "key_restore"                      => "Khôi phục mức thu/phóng mặc định",
-    "key_search"                       => "Tìm báo cáo",
-    "key_suspend"                      => "Tạm hoãn đơn hàng",
-    "key_suspended"                    => "Xem đơn hàng tạm hoãn",
-    "key_system"                       => "Phím tắt hệ thống",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Phím tắt bán hàng",
-    "mc"                               => "",
-    "mode"                             => "Chế độ đăng ký",
-    "must_enter_numeric"               => "Số tiền thanh toán phải là dạng số.",
-    "must_enter_numeric_giftcard"      => "Số Thẻ quà tặng phải là dạng số.",
-    "new_customer"                     => "Khách hàng mới",
-    "new_item"                         => "Hàng hóa mới",
-    "no_description"                   => "Không",
-    "no_filter"                        => "Tất cả",
-    "no_items_in_cart"                 => "Không có Hàng hóa trong rổ hàng.",
-    "no_sales_to_display"              => "Không có lần bán hàng để hiển thị.",
-    "none_selected"                    => "Bạn chưa chọn bất kỳ một lần bán hàng nào để mà xóa.",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "Thao tác này không được phép.",
-    "one_or_multiple"                  => "Bán hàng",
-    "payment"                          => "Phương thức thanh toán",
-    "payment_amount"                   => "Tổng số",
-    "payment_not_cover_total"          => "Chưa thanh toán đủ đơn hàng.",
-    "payment_type"                     => "Kiểu",
-    "payments"                         => "",
-    "payments_total"                   => "Đã thanh toán",
-    "price"                            => "Giá",
-    "print_after_sale"                 => "In sau khi Bán hàng",
-    "quantity"                         => "Số lượng",
-    "quantity_less_than_reorder_level" => "Cảnh báo: Số lượng mong muốn dưới Mức đặt mua bổ xung cho hàng hóa đó.",
-    "quantity_less_than_zero"          => "Cảnh báo: Số lượng mong muốn không đủ. Bạn vẫn có thể xử lý đơn hàng, nhưng hãy kiểm toán tồn kho của bạn.",
-    "quantity_of_items"                => "Số lượng của Hàng hóa {0}",
-    "quote"                            => "Báo giá",
-    "quote_number"                     => "Số Báo giá",
-    "quote_number_duplicate"           => "Số Báo giá phải là duy nhất.",
-    "quote_sent"                       => "Báo giá gửi đến",
-    "quote_unsent"                     => "Gặp lỗi khi gửi báo giá đến",
-    "receipt"                          => "Biên lai các lần bán hàng",
-    "receipt_no_email"                 => "Khách hàng này có địa chỉ thư điện tử không hợp lệ.",
-    "receipt_number"                   => "Bán hàng #",
-    "receipt_sent"                     => "Biên lai gửi đến",
-    "receipt_unsent"                   => "Gặp lỗi khi gửi biên lai đến",
-    "refund"                           => "Phương thức hoàn tiền",
-    "register"                         => "Nhập đơn bán hàng",
-    "remove_customer"                  => "Xóa bỏ khách hàng",
-    "remove_discount"                  => "",
-    "return"                           => "Trả hàng",
-    "rewards"                          => "Điểm thưởng",
-    "rewards_balance"                  => "Số Điểm thưởng còn lại",
-    "sale"                             => "Bán hàng",
-    "sale_by_invoice"                  => "Bán bằng Hóa đơn",
-    "sale_for_customer"                => "Khách hàng:",
-    "sale_time"                        => "Thời gian",
-    "sales_tax"                        => "Thuế các lần bán hàng",
-    "sales_total"                      => "",
-    "select_customer"                  => "Chọn Khách hàng",
-    "send_invoice"                     => "Gửi hóa đơn",
-    "send_quote"                       => "Gửi báo giá",
-    "send_receipt"                     => "Gửi biên lai",
-    "send_work_order"                  => "Gửi Giấy giao việc",
-    "serial"                           => "Số sê-ri",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Hiển thị hóa đơn",
-    "show_receipt"                     => "Hiển thị biên lai",
-    "start_typing_customer_name"       => "Bắt đầu gõ chi tiết khách hàng...",
-    "start_typing_item_name"           => "Bắt đầu gõ tên hàng hóa hoặc quét mã vạch...",
-    "stock"                            => "Kho",
-    "stock_location"                   => "Vị trí kho",
-    "sub_total"                        => "Tổng trước thuế",
-    "successfully_deleted"             => "Bạn đã xóa thành công",
-    "successfully_restored"            => "Bạn đã khôi phục lại đơn hàng",
-    "successfully_suspended_sale"      => "Đã tạm hoãn thành công lần bán hàng.",
-    "successfully_updated"             => "Đã cập nhật thành công lần bán hàng.",
-    "suspend_sale"                     => "Tạm hoãn",
-    "suspended_doc_id"                 => "Tài liệu",
-    "suspended_sale_id"                => "MÃ SỐ",
-    "suspended_sales"                  => "Đơn hàng tạm hoãn",
-    "table"                            => "Bàn",
-    "takings"                          => "Đơn hàng trong ngày",
-    "tax"                              => "Thuế",
-    "tax_id"                           => "Mã số thuế",
-    "tax_invoice"                      => "Hóa đơn thuế",
-    "tax_percent"                      => "Thuế %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Tổng",
-    "total_tax_exclusive"              => "Gồm thuế",
-    "transaction_failed"               => "Gặp lỗi khi giao dịch bán hàng.",
-    "unable_to_add_item"               => "Gặp lỗi khi thêm hàng hóa vào đơn hàng",
-    "unsuccessfully_deleted"           => "Gặp lỗi khi xóa các lần bán hàng.",
-    "unsuccessfully_restored"          => "Gặp lỗi khi hoàn lại các lần bán hàng.",
-    "unsuccessfully_suspended_sale"    => "Gặp lỗi khi tạm ngừng lần bán hàng.",
-    "unsuccessfully_updated"           => "Gặp lỗi khi cập nhật lần bán hàng.",
-    "unsuspend"                        => "Hủy tạm hoãn",
-    "unsuspend_and_delete"             => "Thao tác",
-    "update"                           => "Cập nhật",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Giấy giao việc",
-    "work_order_number"                => "Số giấy giao việc",
-    "work_order_number_duplicate"      => "Số giấy giao việc phải là duy nhất.",
-    "work_order_sent"                  => "Gửi Giấy giao việc cho",
-    "work_order_unsent"                => "Gặp lỗi khi gửi Giấy giao việc cho",
+    'account_number'                    => 'Tài khoản #',
+    'add_payment'                       => 'Thêm thanh toán',
+    'amount_due'                        => 'Số còn lại phải thanh toán',
+    'amount_due_not_covered'            => 'Các khoản thanh toán không đủ để trang trải số tiền phải trả.',
+    'amount_tendered'                   => 'Số tiền thanh toán',
+    'authorized_signature'              => 'Chữ ký ủy quyền',
+    'cancel_sale'                       => 'Thôi',
+    'cash'                              => 'Tiền mặt',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => 'Điều chỉnh tiền mặt',
+    'cash_deposit'                      => 'Số dư tiền mặt',
+    'cash_filter'                       => 'Tiền mặt',
+    'change_due'                        => 'Tiền thối lại',
+    'change_price'                      => 'Thay đổi giá bán',
+    'check'                             => 'Séc',
+    'check_balance'                     => 'Phần còn lại séc',
+    'check_filter'                      => 'Séc',
+    'close'                             => '',
+    'comment'                           => 'Ghi chú',
+    'comments'                          => 'Ghi chú',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => 'Hoàn thành',
+    'confirm_cancel_sale'               => 'Bạn có chắc muốn xóa trắng lần bán hàng này? Mọi hàng hóa sẽ bị xóa sạch.',
+    'confirm_delete'                    => 'Bạn chắc chắn muốn xóa các lần bán hàng được chọn không?',
+    'confirm_restore'                   => 'Bạn chắc chắn muốn hoàn lại các lần bán hàng được chọn không?',
+    'credit'                            => 'Thẻ tín dụng',
+    'credit_deposit'                    => 'Số dư tiền gửi',
+    'credit_filter'                     => 'Thẻ tín dụng',
+    'current_table'                     => '',
+    'customer'                          => 'Khách hàng',
+    'customer_address'                  => 'Địa chỉ',
+    'customer_discount'                 => 'Giảm giá',
+    'customer_email'                    => 'Thư điện tử',
+    'customer_location'                 => 'Vị trí',
+    'customer_mailchimp_status'         => 'Trạng thái tài khoản Mailchimp',
+    'customer_optional'                 => '(Tùy chọn)',
+    'customer_required'                 => '(Bắt buộc)',
+    'customer_total'                    => 'Tổng cộng',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => 'Các điểm sẵn có',
+    'daily_sales'                       => '',
+    'date'                              => 'Ngày bán',
+    'date_range'                        => 'Phạm vi Ngày',
+    'date_required'                     => 'Ngày phải được nhập theo định dạng.',
+    'date_type'                         => 'Trường Ngày tháng là bắt buộc.',
+    'debit'                             => 'Thẻ ghi nợ',
+    'debit_filter'                      => '',
+    'delete'                            => 'Cho phép xóa',
+    'delete_confirmation'               => 'Bạn có chắc muốn xóa lần nhập bán hàng? Thao tác này không thể hoàn lại.',
+    'delete_entire_sale'                => 'Xóa toàn bộ đơn bán hàng',
+    'delete_successful'                 => 'Đã xóa thành công lần bán hàng.',
+    'delete_unsuccessful'               => 'Gặp lỗi khi xóa đơn bán hàng.',
+    'description_abbrv'                 => 'Ggiá.',
+    'discard'                           => 'Hủy',
+    'discard_quote'                     => '',
+    'discount'                          => 'Ggiá %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Giảm giá',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => 'Trả chậm',
+    'due_filter'                        => 'Trả chậm',
+    'edit'                              => 'Sửa',
+    'edit_item'                         => 'Sửa hàng hóa',
+    'edit_sale'                         => 'Sửa bán hàng',
+    'email_receipt'                     => 'Biên lai thư',
+    'employee'                          => 'Nhân viên',
+    'entry'                             => 'Mục nhập',
+    'error_editing_item'                => 'Lỗi sửa hàng hóa',
+    'find_or_scan_item'                 => 'Tìm hay quét Hàng hóa',
+    'find_or_scan_item_or_receipt'      => 'Tìm hay quét Hàng hóa hay Biên lai',
+    'giftcard'                          => 'Thẻ quà tặng',
+    'giftcard_balance'                  => 'Số thẻ quà tặng còn lại',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => 'Số Thẻ quà tặng',
+    'group_by_category'                 => 'Gộp theo Danh mục',
+    'group_by_type'                     => 'Gộp theo kiểu',
+    'hsn'                               => 'HSN',
+    'id'                                => 'Mã bán hàng',
+    'include_prices'                    => 'Bao gồm Giá?',
+    'insufficient_giftcard_balance'     => 'Số dư thẻ quà tặng không đủ cho khoản thanh toán này.',
+    'insufficient_reward_points'        => 'Điểm thưởng không đủ cho khoản thanh toán này.',
+    'invoice'                           => 'Hóa đơn',
+    'invoice_confirm'                   => 'Hóa đơn sẽ được gửi đến',
+    'invoice_enable'                    => 'Tạo hóa dơn',
+    'invoice_filter'                    => 'Hóa đơn',
+    'invoice_no_email'                  => 'Khách hàng này không có địa chỉ thư điện tử hợp lệ.',
+    'invoice_number'                    => 'Hóa đơn #',
+    'invoice_number_duplicate'          => 'Số Hóa đơn phải duy nhất.',
+    'invoice_sent'                      => 'Gửi Hóa đơn đến',
+    'invoice_total'                     => 'Tổng hóa đơn',
+    'invoice_type_custom_invoice'       => 'Hóa đơn tùy chọn (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'   => 'Hóa đơn thuế tự chọn (custom_tax_invoice.php)',
+    'invoice_type_invoice'              => 'Hóa đơn (invoice.php)',
+    'invoice_type_tax_invoice'          => 'Hóa đơn thuế (tax_invoice.php)',
+    'invoice_unsent'                    => 'Gặp lỗi khi gửi Hóa đơn cho',
+    'invoice_update'                    => 'Kiểm lại',
+    'item_insufficient_of_stock'        => 'Không đủ hàng tồn cho mặt hàng này.',
+    'item_name'                         => 'Tên Hàng hóa',
+    'item_number'                       => 'Hàng hóa #',
+    'item_out_of_stock'                 => 'Hết hàng trong kho.',
+    'key_browser'                       => 'Phím tắt hữu ích',
+    'key_cancel'                        => 'Hủy báo giá/hóa đơn/bán hàng hiện tại',
+    'key_customer_search'               => 'Tìm khách hàng',
+    'key_finish_quote'                  => 'Kết thúc báo giá/hóa đơn mà không cần thanh toán',
+    'key_finish_sale'                   => 'Thanh toán và hoàn thành hóa đơn/bán hàng',
+    'key_full'                          => 'Toàn màn hình',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Phím tắt',
+    'key_help_modal'                    => 'Mở cửa sổ phím tắt',
+    'key_in'                            => 'Phòng to',
+    'key_item_search'                   => 'Tìm hàng hóa',
+    'key_out'                           => 'Thu nhỏ',
+    'key_payment'                       => 'Thêm thanh toán',
+    'key_print'                         => 'In trang hiện tại',
+    'key_restore'                       => 'Khôi phục mức thu/phóng mặc định',
+    'key_search'                        => 'Tìm báo cáo',
+    'key_suspend'                       => 'Tạm hoãn đơn hàng',
+    'key_suspended'                     => 'Xem đơn hàng tạm hoãn',
+    'key_system'                        => 'Phím tắt hệ thống',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Phím tắt bán hàng',
+    'mc'                                => '',
+    'mode'                              => 'Chế độ đăng ký',
+    'must_enter_numeric'                => 'Số tiền thanh toán phải là dạng số.',
+    'must_enter_numeric_giftcard'       => 'Số Thẻ quà tặng phải là dạng số.',
+    'must_enter_reference_code'         => 'Số tham chiếu/truy xuất phải được nhập.',
+    'negative_amount_tendered'          => 'Số tiền thanh toán không được là số âm.',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => 'Khách hàng mới',
+    'new_item'                          => 'Hàng hóa mới',
+    'no_description'                    => 'Không',
+    'no_filter'                         => 'Tất cả',
+    'no_items_in_cart'                  => 'Không có Hàng hóa trong rổ hàng.',
+    'no_sales_to_display'               => 'Không có lần bán hàng để hiển thị.',
+    'none_selected'                     => 'Bạn chưa chọn bất kỳ một lần bán hàng nào để mà xóa.',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => 'Thao tác này không được phép.',
+    'one_or_multiple'                   => 'Bán hàng',
+    'payment'                           => 'Phương thức thanh toán',
+    'payment_amount'                    => 'Tổng số',
+    'payment_not_cover_total'           => 'Chưa thanh toán đủ đơn hàng.',
+    'payment_type'                      => 'Kiểu',
+    'payments'                          => '',
+    'payments_total'                    => 'Đã thanh toán',
+    'price'                             => 'Giá',
+    'print_after_sale'                  => 'In sau khi Bán hàng',
+    'quantity'                          => 'Số lượng',
+    'quantity_less_than_reorder_level'  => 'Cảnh báo: Số lượng mong muốn dưới Mức đặt mua bổ xung cho hàng hóa đó.',
+    'quantity_less_than_zero'           => 'Cảnh báo: Số lượng mong muốn không đủ. Bạn vẫn có thể xử lý đơn hàng, nhưng hãy kiểm toán tồn kho của bạn.',
+    'quantity_of_items'                 => 'Số lượng của Hàng hóa {0}',
+    'quote'                             => 'Báo giá',
+    'quote_number'                      => 'Số Báo giá',
+    'quote_number_duplicate'            => 'Số Báo giá phải là duy nhất.',
+    'quote_sent'                        => 'Báo giá gửi đến',
+    'quote_unsent'                      => 'Gặp lỗi khi gửi báo giá đến',
+    'receipt'                           => 'Biên lai các lần bán hàng',
+    'receipt_no_email'                  => 'Khách hàng này có địa chỉ thư điện tử không hợp lệ.',
+    'receipt_number'                    => 'Bán hàng #',
+    'receipt_sent'                      => 'Biên lai gửi đến',
+    'receipt_unsent'                    => 'Gặp lỗi khi gửi biên lai đến',
+    'reference_code'                    => 'Mã tham chiếu thanh toán',
+    'reference_code_invalid_characters' => 'Mã tham chiếu chỉ được chứa chữ cái và chữ số.',
+    'reference_code_length_error'       => 'Độ dài mã tham chiếu không hợp lệ.',
+    'refund'                            => 'Phương thức hoàn tiền',
+    'register'                          => 'Nhập đơn bán hàng',
+    'remove_customer'                   => 'Xóa bỏ khách hàng',
+    'remove_discount'                   => '',
+    'return'                            => 'Trả hàng',
+    'rewards'                           => 'Điểm thưởng',
+    'rewards_balance'                   => 'Số Điểm thưởng còn lại',
+    'rewards_package'                   => 'Điểm thưởng',
+    'rewards_remaining_balance'         => 'Giá trị còn lại của điểm thưởng là ',
+    'sale'                              => 'Bán hàng',
+    'sale_by_invoice'                   => 'Bán bằng Hóa đơn',
+    'sale_for_customer'                 => 'Khách hàng:',
+    'sale_time'                         => 'Thời gian',
+    'sales_tax'                         => 'Thuế các lần bán hàng',
+    'sales_total'                       => '',
+    'select_customer'                   => 'Chọn Khách hàng',
+    'send_invoice'                      => 'Gửi hóa đơn',
+    'send_quote'                        => 'Gửi báo giá',
+    'send_receipt'                      => 'Gửi biên lai',
+    'send_work_order'                   => 'Gửi Giấy giao việc',
+    'serial'                            => 'Số sê-ri',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Hiển thị hóa đơn',
+    'show_receipt'                      => 'Hiển thị biên lai',
+    'start_typing_customer_name'        => 'Bắt đầu gõ chi tiết khách hàng...',
+    'start_typing_item_name'            => 'Bắt đầu gõ tên hàng hóa hoặc quét mã vạch...',
+    'stock'                             => 'Kho',
+    'stock_location'                    => 'Vị trí kho',
+    'sub_total'                         => 'Tổng trước thuế',
+    'successfully_deleted'              => 'Bạn đã xóa thành công',
+    'successfully_restored'             => 'Bạn đã khôi phục lại đơn hàng',
+    'successfully_suspended_sale'       => 'Đã tạm hoãn thành công lần bán hàng.',
+    'successfully_updated'              => 'Đã cập nhật thành công lần bán hàng.',
+    'suspend_sale'                      => 'Tạm hoãn',
+    'suspended_doc_id'                  => 'Tài liệu',
+    'suspended_sale_id'                 => 'MÃ SỐ',
+    'suspended_sales'                   => 'Đơn hàng tạm hoãn',
+    'table'                             => 'Bàn',
+    'takings'                           => 'Đơn hàng trong ngày',
+    'tax'                               => 'Thuế',
+    'tax_id'                            => 'Mã số thuế',
+    'tax_invoice'                       => 'Hóa đơn thuế',
+    'tax_percent'                       => 'Thuế %',
+    'taxed_ind'                         => 'T',
+    'total'                             => 'Tổng',
+    'total_tax_exclusive'               => 'Gồm thuế',
+    'transaction_failed'                => 'Gặp lỗi khi giao dịch bán hàng.',
+    'unable_to_add_item'                => 'Gặp lỗi khi thêm hàng hóa vào đơn hàng',
+    'unsuccessfully_deleted'            => 'Gặp lỗi khi xóa các lần bán hàng.',
+    'unsuccessfully_restored'           => 'Gặp lỗi khi hoàn lại các lần bán hàng.',
+    'unsuccessfully_suspended_sale'     => 'Gặp lỗi khi tạm ngừng lần bán hàng.',
+    'unsuccessfully_updated'            => 'Gặp lỗi khi cập nhật lần bán hàng.',
+    'unsuspend'                         => 'Hủy tạm hoãn',
+    'unsuspend_and_delete'              => 'Thao tác',
+    'update'                            => 'Cập nhật',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => 'Giấy giao việc',
+    'work_order_number'                 => 'Số giấy giao việc',
+    'work_order_number_duplicate'       => 'Số giấy giao việc phải là duy nhất.',
+    'work_order_sent'                   => 'Gửi Giấy giao việc cho',
+    'work_order_unsent'                 => 'Gặp lỗi khi gửi Giấy giao việc cho',
 ];
diff --git a/app/Language/zh-Hans/Attributes.php b/app/Language/zh-Hans/Attributes.php
index 58f0a67b8..ff971d38c 100644
--- a/app/Language/zh-Hans/Attributes.php
+++ b/app/Language/zh-Hans/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "属性特征不能包含':' or '|'",
-    "confirm_delete"                   => "确定要删除所选属性吗",
-    "confirm_restore"                  => "您确定要还原所选属性吗？",
-    "definition_cannot_be_deleted"     => "不能删除该特征属性",
-    "definition_error_adding_updating" => "无法添加或更新属性{0}。 请检查错误日志。",
-    "definition_flags"                 => "属性可见性",
-    "definition_group"                 => "组",
-    "definition_id"                    => "ID卡",
-    "definition_name"                  => "添加特征属性",
-    "definition_name_required"         => "属性必须填写",
-    "definition_one_or_multiple"       => "属性特征",
-    "definition_successful_adding"     => "你成功添加物品",
-    "definition_successful_deleted"    => "已经成功删除",
-    "definition_successful_updating"   => "更新属性成功",
-    "definition_type"                  => "属性类别",
-    "definition_type_required"         => "属性必填",
-    "definition_unit"                  => "计量单位",
-    "definition_values"                => "属性特征值",
-    "new"                              => "新属性",
-    "no_attributes_to_display"         => "没有物品需要显示",
-    "receipt_visibility"               => "小票",
-    "show_in_items"                    => "在项目中显示",
-    "show_in_items_visibility"         => "物品",
-    "show_in_receipt"                  => "在收据中显示",
-    "show_in_receivings"               => "在收据中显示",
-    "show_in_receivings_visibility"    => "收据",
-    "show_in_sales"                    => "在销售中显示",
-    "show_in_sales_visibility"         => "销售",
-    "update"                           => "更新属性",
+    'attribute_value_invalid_chars'    => '属性特征不能包含\':\' or \'|\'',
+    'confirm_delete'                   => '确定要删除所选属性吗',
+    'confirm_restore'                  => '您确定要还原所选属性吗？',
+    'definition_cannot_be_deleted'     => '不能删除该特征属性',
+    'definition_invalid_group' => '所选组不存在或无效。',
+    'definition_error_adding_updating' => '无法添加或更新属性{0}。 请检查错误日志。',
+    'definition_flags'                 => '属性可见性',
+    'definition_group'                 => '组',
+    'definition_id'                    => 'ID卡',
+    'definition_name'                  => '添加特征属性',
+    'definition_name_required'         => '属性必须填写',
+    'definition_one_or_multiple'       => '属性特征',
+    'definition_successful_adding'     => '你成功添加物品',
+    'definition_successful_deleted'    => '已经成功删除',
+    'definition_successful_updating'   => '更新属性成功',
+    'definition_type'                  => '属性类别',
+    'definition_type_required'         => '属性必填',
+    'definition_unit'                  => '计量单位',
+    'definition_values'                => '属性特征值',
+    'new'                              => '新属性',
+    'no_attributes_to_display'         => '没有物品需要显示',
+    'receipt_visibility'               => '小票',
+    'show_in_items'                    => '在项目中显示',
+    'show_in_items_visibility'         => '物品',
+    'show_in_receipt'                  => '在收据中显示',
+    'show_in_receivings'               => '在收据中显示',
+    'show_in_receivings_visibility'    => '收据',
+    'show_in_sales'                    => '在销售中显示',
+    'show_in_sales_visibility'         => '销售',
+    'show_in_search'                   => '在搜索中显示',
+    'show_in_search_visibility'        => '搜索',
+    'update'                           => '更新属性',
 ];
diff --git a/app/Language/zh-Hans/Bootstrap_tables.php b/app/Language/zh-Hans/Bootstrap_tables.php
index 69f9cdce6..697f20729 100644
--- a/app/Language/zh-Hans/Bootstrap_tables.php
+++ b/app/Language/zh-Hans/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "所有",
-    "columns"              => "列",
-    "hide_show_pagination" => "隐藏/显示分页",
-    "loading"              => "正在努力地加载数据中，请稍候……",
-    "page_from_to"         => "显示第 {0} 到第 {1} 条记录，总共 {2} 条记录",
-    "refresh"              => "刷新",
-    "rows_per_page"        => "每页显示 {0} 条记录",
-    "toggle"               => "切换",
+    'all' => "所有",
+    'columns' => "列",
+    'hide_show_pagination' => "隐藏/显示分页",
+    'loading' => "正在努力地加载数据中，请稍候",
+    'page_from_to' => "显示第 {0} 到第 {1} 条记录，总共 {2} 条记录",
+    'refresh' => "刷新",
+    'rows_per_page' => "每页显示 {0} 条记录",
+    'toggle' => "切换",
 ];
diff --git a/app/Language/zh-Hans/Config.php b/app/Language/zh-Hans/Config.php
index 5d5e6fd88..21c77b8e5 100644
--- a/app/Language/zh-Hans/Config.php
+++ b/app/Language/zh-Hans/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "公司地址",
-    "address_required"                          => "公司地址为必填",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "允许重复条形码",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "条形码",
-    "barcode_company"                           => "公司名称",
-    "barcode_configuration"                     => "设置条形码",
-    "barcode_content"                           => "条形码内容",
-    "barcode_first_row"                         => "条形码第一行",
-    "barcode_font"                              => "条形码字体",
-    "barcode_formats"                           => "输入格式",
-    "barcode_generate_if_empty"                 => "Generate if empty",
-    "barcode_height"                            => "条形码高度 (px)",
-    "barcode_id"                                => "商品 ID/名字",
-    "barcode_info"                              => "条形码设置信息",
-    "barcode_layout"                            => "条形码布局",
-    "barcode_name"                              => "条形码名字",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "Number in row",
-    "barcode_page_cellspacing"                  => "Display page cellspacing",
-    "barcode_page_width"                        => "条形码显示宽度",
-    "barcode_price"                             => "金额",
-    "barcode_second_row"                        => "条形码第二行",
-    "barcode_third_row"                         => "条形码第三行",
-    "barcode_tooltip"                           => "警告：此功能可能导致重复项被导入或创建。 如果您不想重复的条形码，请不要使用。",
-    "barcode_type"                              => "条形码类型",
-    "barcode_width"                             => "条形码宽度 (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "现金小数点",
-    "cash_decimals_tooltip"                     => "",
-    "cash_rounding"                             => "",
-    "category_dropdown"                         => "显示类别为下拉式菜单",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "公司名称",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Company Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "公司名称为必填",
-    "company_select_image"                      => "选择公司图片",
-    "company_website_url"                       => "公司网址格式错误 (http://...)",
-    "country_codes"                             => "国家地区代码",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "货币符号",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "",
-    "customer_reward_duplicate"                 => "",
-    "customer_reward_enable"                    => "",
-    "customer_reward_invalid_chars"             => "",
-    "customer_reward_required"                  => "",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "",
-    "datetimeformat"                            => "Date and Time format",
-    "decimal_point"                             => "Decimal Point",
-    "default_barcode_font_size_number"          => "默认条形码字体大小必须是数字",
-    "default_barcode_font_size_required"        => "The default barcode font size is a required field",
-    "default_barcode_height_number"             => "The default barcode height  must be a number",
-    "default_barcode_height_required"           => "The default barcode height is a required field",
-    "default_barcode_num_in_row_number"         => "The default barcode num in row must be a number",
-    "default_barcode_num_in_row_required"       => "The default barcode num in row is a required field",
-    "default_barcode_page_cellspacing_number"   => "The default barcode page cellspacing must be a number",
-    "default_barcode_page_cellspacing_required" => "The default barcode page cellspacing is a required field",
-    "default_barcode_page_width_number"         => "The default barcode page width must be a number",
-    "default_barcode_page_width_required"       => "The default barcode page width is a required field",
-    "default_barcode_width_number"              => "The default barcode width must be a number",
-    "default_barcode_width_required"            => "The default barcode width is a required field",
-    "default_item_columns"                      => "",
-    "default_origin_tax_code"                   => "",
-    "default_receivings_discount"               => "",
-    "default_receivings_discount_number"        => "",
-    "default_receivings_discount_required"      => "",
-    "default_sales_discount"                    => "Default Sales Discount %",
-    "default_sales_discount_number"             => "The default sales discount must be a number",
-    "default_sales_discount_required"           => "The default sales discount is a required field",
-    "default_tax_category"                      => "",
-    "default_tax_code"                          => "",
-    "default_tax_jurisdiction"                  => "",
-    "default_tax_name_number"                   => "",
-    "default_tax_name_required"                 => "The default tax name is a required field",
-    "default_tax_rate"                          => "預設稅率 %",
-    "default_tax_rate_1"                        => "稅率 1",
-    "default_tax_rate_2"                        => "稅率 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "預設稅率必需為數字",
-    "default_tax_rate_required"                 => "預設稅率為必填",
-    "derive_sale_quantity"                      => "",
-    "derive_sale_quantity_tooltip"              => "",
-    "dinner_table"                              => "",
-    "dinner_table_duplicate"                    => "",
-    "dinner_table_enable"                       => "",
-    "dinner_table_invalid_chars"                => "",
-    "dinner_table_required"                     => "",
-    "dot"                                       => "dot",
-    "email"                                     => "郵箱",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "",
-    "email_receipt_check_behaviour_always"      => "",
-    "email_receipt_check_behaviour_last"        => "",
-    "email_receipt_check_behaviour_never"       => "",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "",
-    "enforce_privacy_tooltip"                   => "",
-    "fax"                                       => "傳真",
-    "file_perm"                                 => "There are problems with file permissions please fix and reload this page.",
-    "financial_year"                            => "",
-    "financial_year_apr"                        => "",
-    "financial_year_aug"                        => "",
-    "financial_year_dec"                        => "",
-    "financial_year_feb"                        => "",
-    "financial_year_jan"                        => "",
-    "financial_year_jul"                        => "",
-    "financial_year_jun"                        => "",
-    "financial_year_mar"                        => "",
-    "financial_year_may"                        => "",
-    "financial_year_nov"                        => "",
-    "financial_year_oct"                        => "",
-    "financial_year_sep"                        => "",
-    "floating_labels"                           => "",
-    "gcaptcha_enable"                           => "",
-    "gcaptcha_secret_key"                       => "",
-    "gcaptcha_secret_key_required"              => "",
-    "gcaptcha_site_key"                         => "",
-    "gcaptcha_site_key_required"                => "",
-    "gcaptcha_tooltip"                          => "",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "",
-    "giftcard_random"                           => "",
-    "giftcard_series"                           => "",
-    "image_allowed_file_types"                  => "",
-    "image_max_height_tooltip"                  => "",
-    "image_max_size_tooltip"                    => "",
-    "image_max_width_tooltip"                   => "",
-    "image_restrictions"                        => "",
-    "include_hsn"                               => "",
-    "info"                                      => "儲存組態",
-    "info_configuration"                        => "儲存組態",
-    "input_groups"                              => "",
-    "integrations"                              => "",
-    "integrations_configuration"                => "",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "",
-    "is_readable"                               => "",
-    "is_writable"                               => "is writable, but the permissions are higher than 750.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "語言",
-    "last_used_invoice_number"                  => "",
-    "last_used_quote_number"                    => "",
-    "last_used_work_order_number"               => "",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "",
-    "lines_per_page"                            => "Lines Per Page",
-    "lines_per_page_number"                     => "The lines per page must be a number",
-    "lines_per_page_required"                   => "The lines per page is a required field",
-    "locale"                                    => "Localisation",
-    "locale_configuration"                      => "Localisation Configuration",
-    "locale_info"                               => "Localisation Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "",
-    "logout"                                    => "Don't you want to make a backup before logging out?",
-    "mailchimp"                                 => "",
-    "mailchimp_api_key"                         => "",
-    "mailchimp_configuration"                   => "",
-    "mailchimp_key_successfully"                => "",
-    "mailchimp_key_unsuccessfully"              => "",
-    "mailchimp_lists"                           => "",
-    "mailchimp_tooltip"                         => "",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here. Otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localisation",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a sensible value",
-    "number_locale_required"                    => "Number Locale is a required field",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link",
-    "os_timezone"                               => "",
-    "ospos_info"                                => "",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Permissions higher than 750 leaves this software at risk.",
-    "phone"                                     => "公司电话",
-    "phone_required"                            => "公司电话为必填",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "The default bottom margin must be a number",
-    "print_bottom_margin_required"              => "The default bottom margin is a required field",
-    "print_delay_autoreturn"                    => "",
-    "print_delay_autoreturn_number"             => "",
-    "print_delay_autoreturn_required"           => "",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "The default left margin must be a number",
-    "print_left_margin_required"                => "The default left margin is a required field",
-    "print_receipt_check_behaviour"             => "",
-    "print_receipt_check_behaviour_always"      => "",
-    "print_receipt_check_behaviour_last"        => "",
-    "print_receipt_check_behaviour_never"       => "",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "The default right margin must be a number",
-    "print_right_margin_required"               => "The default right margin is a required field",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "The default top margin must be a number",
-    "print_top_margin_required"                 => "The default top margin is a required field",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "",
-    "receipt"                                   => "收据",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "收据打印设置",
-    "receipt_default"                           => "默认",
-    "receipt_font_size"                         => "字体大小",
-    "receipt_font_size_number"                  => "字体大小必须是数字",
-    "receipt_font_size_required"                => "字体大小是必填的",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "收据打印机",
-    "receipt_short"                             => "Short",
-    "receipt_show_company_name"                 => "显示公司名称",
-    "receipt_show_description"                  => "显示描述",
-    "receipt_show_serialnumber"                 => "显示序列号",
-    "receipt_show_tax_ind"                      => "",
-    "receipt_show_taxes"                        => "显示税",
-    "receipt_show_total_discount"               => "Show Total Discount",
-    "receipt_template"                          => "收据模板",
-    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "",
-    "report_an_issue"                           => "",
-    "return_policy_required"                    => "退换货政策为必填",
-    "reward"                                    => "",
-    "reward_configuration"                      => "",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "",
-    "saved_successfully"                        => "組態設置儲存成功",
-    "saved_unsuccessfully"                      => "組態設置儲存失敗",
-    "security_issue"                            => "Security Vulnerability Warning",
-    "server_notice"                             => "Please use the below info for issue reporting.",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "",
-    "statistics"                                => "Send statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes",
-    "stock_location"                            => "仓库地址",
-    "stock_location_duplicate"                  => "仓库地址不可重复",
-    "stock_location_invalid_chars"              => "The stock location name can not contain '_'",
-    "stock_location_required"                   => "Stock location number is a required field",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "",
-    "suggestions_second_column"                 => "",
-    "suggestions_third_column"                  => "",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "",
-    "table_configuration"                       => "",
-    "takings_printer"                           => "Takings Printer",
-    "tax"                                       => "税",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "税的小数点",
-    "tax_id"                                    => "税ID",
-    "tax_included"                              => "含税",
-    "theme"                                     => "主题",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "千位分隔符",
-    "timezone"                                  => "时区",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "",
-    "website"                                   => "网站",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '公司地址',
+    'address_required'                          => '公司地址为必填',
+    'all_set'                                   => 'All file permissions are set correctly!',
+    'allow_duplicate_barcodes'                  => '允许重复条形码',
+    'apostrophe'                                => 'apostrophe',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => '条形码',
+    'barcode_company'                           => '公司名称',
+    'barcode_configuration'                     => '设置条形码',
+    'barcode_content'                           => '条形码内容',
+    'barcode_first_row'                         => '条形码第一行',
+    'barcode_font'                              => '条形码字体',
+    'barcode_formats'                           => '输入格式',
+    'barcode_generate_if_empty'                 => 'Generate if empty',
+    'barcode_height'                            => '条形码高度 (px)',
+    'barcode_id'                                => '商品 ID/名字',
+    'barcode_info'                              => '条形码设置信息',
+    'barcode_layout'                            => '条形码布局',
+    'barcode_name'                              => '条形码名字',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => 'Number in row',
+    'barcode_page_cellspacing'                  => 'Display page cellspacing',
+    'barcode_page_width'                        => '条形码显示宽度',
+    'barcode_price'                             => '金额',
+    'barcode_second_row'                        => '条形码第二行',
+    'barcode_third_row'                         => '条形码第三行',
+    'barcode_tooltip'                           => '警告：此功能可能导致重复项被导入或创建。 如果您不想重复的条形码，请不要使用。',
+    'barcode_type'                              => '条形码类型',
+    'barcode_width'                             => '条形码宽度 (px)',
+    'bottom'                                    => 'Bottom',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '现金小数点',
+    'cash_decimals_tooltip'                     => '',
+    'cash_rounding'                             => '',
+    'category_dropdown'                         => '显示类别为下拉式菜单',
+    'center'                                    => 'Center',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => 'comma',
+    'company'                                   => '公司名称',
+    'company_avatar'                            => '',
+    'company_change_image'                      => 'Change Image',
+    'company_logo'                              => 'Company Logo',
+    'company_remove_image'                      => 'Remove Image',
+    'company_required'                          => '公司名称为必填',
+    'company_select_image'                      => '选择公司图片',
+    'company_website_url'                       => '公司网址格式错误 (http://...)',
+    'country_codes'                             => '国家地区代码',
+    'country_codes_tooltip'                     => 'Comma separated list of country codes for nominatim address lookup.',
+    'currency_code'                             => '',
+    'currency_decimals'                         => 'Currency Decimals',
+    'currency_symbol'                           => '货币符号',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '',
+    'customer_reward_duplicate'                 => '',
+    'customer_reward_enable'                    => '',
+    'customer_reward_invalid_chars'             => '',
+    'customer_reward_required'                  => '',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '',
+    'datetimeformat'                            => 'Date and Time format',
+    'decimal_point'                             => 'Decimal Point',
+    'default_barcode_font_size_number'          => '默认条形码字体大小必须是数字',
+    'default_barcode_font_size_required'        => 'The default barcode font size is a required field',
+    'default_barcode_height_number'             => 'The default barcode height  must be a number',
+    'default_barcode_height_required'           => 'The default barcode height is a required field',
+    'default_barcode_num_in_row_number'         => 'The default barcode num in row must be a number',
+    'default_barcode_num_in_row_required'       => 'The default barcode num in row is a required field',
+    'default_barcode_page_cellspacing_number'   => 'The default barcode page cellspacing must be a number',
+    'default_barcode_page_cellspacing_required' => 'The default barcode page cellspacing is a required field',
+    'default_barcode_page_width_number'         => 'The default barcode page width must be a number',
+    'default_barcode_page_width_required'       => 'The default barcode page width is a required field',
+    'default_barcode_width_number'              => 'The default barcode width must be a number',
+    'default_barcode_width_required'            => 'The default barcode width is a required field',
+    'default_item_columns'                      => '',
+    'default_origin_tax_code'                   => '',
+    'default_receivings_discount'               => '',
+    'default_receivings_discount_number'        => '',
+    'default_receivings_discount_required'      => '',
+    'default_sales_discount'                    => 'Default Sales Discount %',
+    'default_sales_discount_number'             => 'The default sales discount must be a number',
+    'default_sales_discount_required'           => 'The default sales discount is a required field',
+    'default_tax_category'                      => '',
+    'default_tax_code'                          => '',
+    'default_tax_jurisdiction'                  => '',
+    'default_tax_name_number'                   => '',
+    'default_tax_name_required'                 => 'The default tax name is a required field',
+    'default_tax_rate'                          => '預設稅率 %',
+    'default_tax_rate_1'                        => '稅率 1',
+    'default_tax_rate_2'                        => '稅率 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '預設稅率必需為數字',
+    'default_tax_rate_required'                 => '預設稅率為必填',
+    'derive_sale_quantity'                      => '',
+    'derive_sale_quantity_tooltip'              => '',
+    'dinner_table'                              => '',
+    'dinner_table_duplicate'                    => '',
+    'dinner_table_enable'                       => '',
+    'dinner_table_invalid_chars'                => '',
+    'dinner_table_required'                     => '',
+    'dot'                                       => 'dot',
+    'email'                                     => '郵箱',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => 'Path to Sendmail',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => '',
+    'email_receipt_check_behaviour_always'      => '',
+    'email_receipt_check_behaviour_last'        => '',
+    'email_receipt_check_behaviour_never'       => '',
+    'email_smtp_crypto'                         => 'SMTP Encryption',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP Timeout (s)',
+    'email_smtp_user'                           => 'SMTP Username',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '',
+    'enforce_privacy_tooltip'                   => '',
+    'fax'                                       => '傳真',
+    'file_perm'                                 => 'There are problems with file permissions please fix and reload this page.',
+    'financial_year'                            => '',
+    'financial_year_apr'                        => '',
+    'financial_year_aug'                        => '',
+    'financial_year_dec'                        => '',
+    'financial_year_feb'                        => '',
+    'financial_year_jan'                        => '',
+    'financial_year_jul'                        => '',
+    'financial_year_jun'                        => '',
+    'financial_year_mar'                        => '',
+    'financial_year_may'                        => '',
+    'financial_year_nov'                        => '',
+    'financial_year_oct'                        => '',
+    'financial_year_sep'                        => '',
+    'floating_labels'                           => '',
+    'gcaptcha_enable'                           => '',
+    'gcaptcha_secret_key'                       => '',
+    'gcaptcha_secret_key_required'              => '',
+    'gcaptcha_site_key'                         => '',
+    'gcaptcha_site_key_required'                => '',
+    'gcaptcha_tooltip'                          => '',
+    'general'                                   => 'General',
+    'general_configuration'                     => 'General Configuration',
+    'giftcard_number'                           => '',
+    'giftcard_random'                           => '',
+    'giftcard_series'                           => '',
+    'image_allowed_file_types'                  => '',
+    'image_max_height_tooltip'                  => '',
+    'image_max_size_tooltip'                    => '',
+    'image_max_width_tooltip'                   => '',
+    'image_restrictions'                        => '',
+    'include_hsn'                               => '',
+    'info'                                      => '儲存組態',
+    'info_configuration'                        => '儲存組態',
+    'input_groups'                              => '',
+    'integrations'                              => '',
+    'integrations_configuration'                => '',
+    'invoice'                                   => 'Invoice',
+    'invoice_configuration'                     => 'Invoice Print Settings',
+    'invoice_default_comments'                  => 'Default Invoice Comments',
+    'invoice_email_message'                     => 'Invoice Email Template',
+    'invoice_enable'                            => 'Enable Invoicing',
+    'invoice_printer'                           => 'Invoice Printer',
+    'invoice_type'                              => '',
+    'is_readable'                               => '',
+    'is_writable'                               => 'is writable, but the permissions are higher than 750.',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => '語言',
+    'last_used_invoice_number'                  => '',
+    'last_used_quote_number'                    => '',
+    'last_used_work_order_number'               => '',
+    'left'                                      => 'Left',
+    'license'                                   => 'License',
+    'license_configuration'                     => 'License Statement',
+    'line_sequence'                             => '',
+    'lines_per_page'                            => 'Lines Per Page',
+    'lines_per_page_number'                     => 'The lines per page must be a number',
+    'lines_per_page_required'                   => 'The lines per page is a required field',
+    'locale'                                    => 'Localisation',
+    'locale_configuration'                      => 'Localisation Configuration',
+    'locale_info'                               => 'Localisation Configuration Information',
+    'location'                                  => 'Stock',
+    'location_configuration'                    => 'Stock Locations',
+    'location_info'                             => 'Location Configuration Information',
+    'login_form'                                => '',
+    'logout'                                    => "Don't you want to make a backup before logging out?",
+    'mailchimp'                                 => '',
+    'mailchimp_api_key'                         => '',
+    'mailchimp_configuration'                   => '',
+    'mailchimp_key_successfully'                => '',
+    'mailchimp_key_unsuccessfully'              => '',
+    'mailchimp_lists'                           => '',
+    'mailchimp_tooltip'                         => '',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => 'Saved Text Message',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here. Otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API Sender ID',
+    'msg_src_required'                          => 'SMS-API Sender ID is a required field',
+    'msg_uid'                                   => 'SMS-API Username',
+    'msg_uid_required'                          => 'SMS-API Username is a required field',
+    'multi_pack_enabled'                        => '',
+    'no_risk'                                   => 'No security/vulnerability risks.',
+    'none'                                      => 'none',
+    'notify_alignment'                          => 'Notification Popup Position',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localisation',
+    'number_locale_invalid'                     => 'The entered locale is invalid. Check the link in the tooltip to find a sensible value',
+    'number_locale_required'                    => 'Number Locale is a required field',
+    'number_locale_tooltip'                     => 'Find a suitable locale through this link',
+    'os_timezone'                               => '',
+    'ospos_info'                                => '',
+    'payment_options_order'                     => 'Payment Options Order',
+    'payment_reference_code_length_limits'      => '付款参考代码<br>长度限制',
+    'payment_reference_code_length_max_label'   => '最大',
+    'payment_reference_code_length_min_label'   => '最小',
+    'perm_risk'                                 => 'Permissions higher than 750 leaves this software at risk.',
+    'phone'                                     => '公司电话',
+    'phone_required'                            => '公司电话为必填',
+    'print_bottom_margin'                       => 'Margin Bottom',
+    'print_bottom_margin_number'                => 'The default bottom margin must be a number',
+    'print_bottom_margin_required'              => 'The default bottom margin is a required field',
+    'print_delay_autoreturn'                    => '',
+    'print_delay_autoreturn_number'             => '',
+    'print_delay_autoreturn_required'           => '',
+    'print_footer'                              => 'Print Browser Footer',
+    'print_header'                              => 'Print Browser Header',
+    'print_left_margin'                         => 'Margin Left',
+    'print_left_margin_number'                  => 'The default left margin must be a number',
+    'print_left_margin_required'                => 'The default left margin is a required field',
+    'print_receipt_check_behaviour'             => '',
+    'print_receipt_check_behaviour_always'      => '',
+    'print_receipt_check_behaviour_last'        => '',
+    'print_receipt_check_behaviour_never'       => '',
+    'print_right_margin'                        => 'Margin Right',
+    'print_right_margin_number'                 => 'The default right margin must be a number',
+    'print_right_margin_required'               => 'The default right margin is a required field',
+    'print_silently'                            => 'Show Print Dialog',
+    'print_top_margin'                          => 'Margin Top',
+    'print_top_margin_number'                   => 'The default top margin must be a number',
+    'print_top_margin_required'                 => 'The default top margin is a required field',
+    'quantity_decimals'                         => 'Quantity Decimals',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '',
+    'receipt'                                   => '收据',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '收据打印设置',
+    'receipt_default'                           => '默认',
+    'receipt_font_size'                         => '字体大小',
+    'receipt_font_size_number'                  => '字体大小必须是数字',
+    'receipt_font_size_required'                => '字体大小是必填的',
+    'receipt_info'                              => 'Receipt Configuration Information',
+    'receipt_printer'                           => '收据打印机',
+    'receipt_short'                             => 'Short',
+    'receipt_show_company_name'                 => '显示公司名称',
+    'receipt_show_description'                  => '显示描述',
+    'receipt_show_serialnumber'                 => '显示序列号',
+    'receipt_show_tax_ind'                      => '',
+    'receipt_show_taxes'                        => '显示税',
+    'receipt_show_total_discount'               => 'Show Total Discount',
+    'receipt_template'                          => '收据模板',
+    'receiving_calculate_average_price'         => 'Calc avg. Price (Receiving)',
+    'recv_invoice_format'                       => 'Receivings Invoice Format',
+    'register_mode_default'                     => '',
+    'report_an_issue'                           => '',
+    'return_policy_required'                    => '退换货政策为必填',
+    'reward'                                    => '',
+    'reward_configuration'                      => '',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => 'Sales Invoice Format',
+    'sales_quote_format'                        => '',
+    'mailpath_invalid'                          => '无效的 sendmail 路径。仅允许字母、数字、连字符、下划线、正斜杠、反斜杠、冒号、空格和点号。',
+    'saved_successfully'                        => '組態設置儲存成功',
+    'saved_unsuccessfully'                      => '組態設置儲存失敗',
+    'security_issue'                            => 'Security Vulnerability Warning',
+    'server_notice'                             => 'Please use the below info for issue reporting.',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '',
+    'statistics'                                => 'Send statistics',
+    'statistics_tooltip'                        => 'Send statistics for development and feature improvement purposes',
+    'stock_location'                            => '仓库地址',
+    'stock_location_duplicate'                  => '仓库地址不可重复',
+    'stock_location_invalid_chars'              => "The stock location name can not contain '_'",
+    'stock_location_required'                   => 'Stock location number is a required field',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '',
+    'suggestions_second_column'                 => '',
+    'suggestions_third_column'                  => '',
+    'system_conf'                               => 'Setup & Conf',
+    'system_info'                               => 'System Info',
+    'table'                                     => '',
+    'table_configuration'                       => '',
+    'takings_printer'                           => 'Takings Printer',
+    'tax'                                       => '税',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '税的小数点',
+    'tax_id'                                    => '税ID',
+    'tax_included'                              => '含税',
+    'theme'                                     => '主题',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '千位分隔符',
+    'timezone'                                  => '时区',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '',
+    'website'                                   => '网站',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/zh-Hans/Employees.php b/app/Language/zh-Hans/Employees.php
index 9f9e786b4..acf16a575 100644
--- a/app/Language/zh-Hans/Employees.php
+++ b/app/Language/zh-Hans/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "員工基本資料",
-    "cannot_be_deleted"            => "無法刪除選定的僱員，選定的員工中已有銷售紀錄或你正在試圖刪除自己 :)",
-    "change_employee"              => "",
-    "change_password"              => "",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "你確定要刪除所選的員工嗎？",
-    "confirm_restore"              => "",
-    "current_password"             => "",
-    "current_password_invalid"     => "",
-    "employee"                     => "員工",
-    "error_adding_updating"        => "添加/更新員工錯誤",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "您不能刪除admin用戶",
-    "error_updating_demo_admin"    => "您不能更改admin用戶",
-    "language"                     => "",
-    "login_info"                   => "員工登錄資料",
-    "manager"                      => "",
-    "new"                          => "新員工",
-    "none_selected"                => "您還沒有選擇任何員工進行刪除",
-    "one_or_multiple"              => "員工",
-    "password"                     => "密碼",
-    "password_minlength"           => "密碼需為八個字元以上",
-    "password_must_match"          => "密碼與確認密碼不一致",
-    "password_not_must_match"      => "",
-    "password_required"            => "請輸入密碼",
-    "permission_desc"              => "勾選後授予使用該模組功能",
-    "permission_info"              => "員工權限",
-    "repeat_password"              => "確認密碼",
-    "subpermission_required"       => "Add at least one grant for each module",
-    "successful_adding"            => "新增員工資料成功",
-    "successful_change_password"   => "",
-    "successful_deleted"           => "成功刪除員工資料",
-    "successful_updating"          => "成功更新員工資料",
-    "system_language"              => "",
-    "unsuccessful_change_password" => "",
-    "update"                       => "更新員工",
-    "username"                     => "帳號",
-    "username_duplicate"           => "",
-    "username_minlength"           => "帳號必需為五個字元以上",
-    "username_required"            => "帳號為必填",
+    'administrator'                          => '',
+    'basic_information'                      => '員工基本資料',
+    'cannot_be_deleted'                      => '無法刪除選定的僱員，選定的員工中已有銷售紀錄或你正在試圖刪除自己 :)',
+    'change_employee'                        => '',
+    'change_password'                        => '',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '你確定要刪除所選的員工嗎？',
+    'confirm_restore'                        => '',
+    'current_password'                       => '',
+    'current_password_invalid'               => '',
+    'employee'                               => '員工',
+    'error_adding_updating'                  => '添加/更新員工錯誤',
+    'error_cannot_remove_own_minimum_grant'  => '您不能移除自己的最低模块访问权限。',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '您不能刪除admin用戶',
+    'error_grant_change_disallowed'          => '演示中禁用了权限更改。',
+    'error_password_change_disallowed'       => '演示中禁用了密码更改。',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '您不能更改admin用戶',
+    'language'                               => '',
+    'login_info'                             => '員工登錄資料',
+    'manager'                                => '',
+    'new'                                    => '新員工',
+    'none_selected'                          => '您還沒有選擇任何員工進行刪除',
+    'one_or_multiple'                        => '員工',
+    'password'                               => '密碼',
+    'password_minlength'                     => '密碼需為八個字元以上',
+    'password_must_match'                    => '密碼與確認密碼不一致',
+    'password_not_must_match'                => '',
+    'password_required'                      => '請輸入密碼',
+    'permission_desc'                        => '勾選後授予使用該模組功能',
+    'permission_info'                        => '員工權限',
+    'repeat_password'                        => '確認密碼',
+    'subpermission_required'                 => 'Add at least one grant for each module',
+    'successful_adding'                      => '新增員工資料成功',
+    'successful_change_password'             => '',
+    'successful_deleted'                     => '成功刪除員工資料',
+    'successful_updating'                    => '成功更新員工資料',
+    'system_language'                        => '',
+    'unsuccessful_change_password'           => '',
+    'update'                                 => '更新員工',
+    'username'                               => '帳號',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '帳號必需為五個字元以上',
+    'username_required'                      => '帳號為必填',
 ];
diff --git a/app/Language/zh-Hans/Error.php b/app/Language/zh-Hans/Error.php
index edea68bc1..c8f2c04f8 100644
--- a/app/Language/zh-Hans/Error.php
+++ b/app/Language/zh-Hans/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "您沒有權限使用模組：",
-    "unknown"              => "未知",
+    'no_permission_module'           => '您没有权限访问名为该模块',
+    'unable_to_create_env_file'      => '无法创建 {filePath} 以配置 throttle.key',
+    'unable_to_lock_file'            => '无法锁定 {filePath}：{reason}',
+    'unable_to_open_lock_file'       => '无法打开 {filePath}：{reason}',
+    'unable_to_persist_throttle_key' => '无法将 throttle.key 保存到 {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => '无法读取 {filePath} 以配置 throttle.key',
+    'unknown'                        => '未知',
 ];
diff --git a/app/Language/zh-Hans/Items.php b/app/Language/zh-Hans/Items.php
index ced421c69..935c7001e 100644
--- a/app/Language/zh-Hans/Items.php
+++ b/app/Language/zh-Hans/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "增/減庫存",
-    "allow_alt_description"              => "允許ALT描述",
-    "amount_entry"                       => "",
-    "bulk_edit"                          => "批次編輯",
-    "buy_price_required"                 => "進貨價為必填欄位",
-    "cannot_be_deleted"                  => "無法刪除選定產品，所選產品中的一個或多個有銷售紀綠。",
-    "cannot_find_item"                   => "無法找到任何有關的產品",
-    "categories"                         => "",
-    "category"                           => "類別",
-    "category_new"                       => "",
-    "category_required"                  => "類別為必填欄位",
-    "change_all_to_allow_alt_desc"       => " 充許全部ALT倒序",
-    "change_all_to_not_allow_allow_desc" => "不允許全部ALT倒序",
-    "change_all_to_serialized"           => "全部更改序號至序列化",
-    "change_all_to_unserialized"         => "全部更改序號至非序列化",
-    "change_image"                       => "Change Image",
-    "confirm_bulk_edit"                  => "您確定您要編輯的所有選定的產品嗎？",
-    "confirm_bulk_edit_wipe_taxes"       => "All item tax information will be replaced!",
-    "confirm_delete"                     => "你確定你要刪除選定的產品嗎？",
-    "confirm_restore"                    => "",
-    "cost_price"                         => "成本價",
-    "cost_price_number"                  => "成本價必需是數值",
-    "cost_price_required"                => "成本價為必填攔位",
-    "count"                              => "更新庫存",
-    "csv_import_failed"                  => "CSV匯入失敗",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "Your uploaded file has no data or wrong format",
-    "csv_import_partially_failed"        => "Most Items imported. But some were not, here is the list",
-    "csv_import_success"                 => "Import of Items successful",
-    "current_quantity"                   => "當前數量",
-    "default_pack_name"                  => "",
-    "description"                        => "描述",
-    "details_count"                      => "庫存盤點詳情",
-    "do_nothing"                         => "沒有執行任何修改",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "編輯您選定產品的所有欄位",
-    "edit_multiple_items"                => "編輯多項產品",
-    "empty_upc_items"                    => "Empty UPC Items",
-    "error_adding_updating"              => "新增/更新產品錯誤",
-    "error_updating_multiple"            => "更新產品錯誤",
-    "generate_barcodes"                  => "產生條碼",
-    "hsn_code"                           => "",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Import items from CSV sheet",
-    "info_provided_by"                   => "訊息提供者",
-    "inventory"                          => "庫存",
-    "inventory_CSV_import_quantity"      => "",
-    "inventory_comments"                 => "評論",
-    "inventory_data_tracking"            => "",
-    "inventory_date"                     => "",
-    "inventory_employee"                 => "",
-    "inventory_in_out_quantity"          => "",
-    "inventory_remarks"                  => "",
-    "is_deleted"                         => "Deleted",
-    "is_printed"                         => "",
-    "is_serialized"                      => "產品有序號",
-    "item"                               => "產品",
-    "item_id"                            => "",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "The item number is already present in the database",
-    "kit"                                => "",
-    "location"                           => "位置",
-    "low_inventory_items"                => "低庫存產品",
-    "low_sell_item"                      => "",
-    "manually_editing_of_quantity"       => "手動編輯數量",
-    "markup"                             => "",
-    "name"                               => "產品名稱",
-    "name_required"                      => "產品名稱為必填",
-    "new"                                => "新增產品",
-    "no_description_items"               => "產品沒有說明",
-    "no_items_to_display"                => "沒有產品可以顯示",
-    "none"                               => "無",
-    "none_selected"                      => "您還沒有選擇任何產品進行編輯",
-    "nonstock"                           => "",
-    "number_information"                 => "產品編號",
-    "number_required"                    => "UPC/EAN/ISBN is a required field",
-    "one_or_multiple"                    => "產品",
-    "pack_name"                          => "",
-    "qty_per_pack"                       => "",
-    "quantity"                           => "數量",
-    "quantity_number"                    => "數量必需是數值",
-    "quantity_required"                  => "數量為必填欄位",
-    "receiving_quantity"                 => "Receiving quantity",
-    "remove_image"                       => "Remove Image",
-    "reorder_level"                      => "補貨點",
-    "reorder_level_number"               => "補貨點必需是數值",
-    "reorder_level_required"             => "補貨點為必填欄位",
-    "retrive_item_info"                  => "檢索產品訊息",
-    "sales_tax_1"                        => "營業稅",
-    "sales_tax_2"                        => "營業稅 2",
-    "search_attributes"                  => "Search Custom Fields",
-    "select_image"                       => "Select Image",
-    "serialized_items"                   => "序列化產品",
-    "standard"                           => "",
-    "stock"                              => "",
-    "stock_location"                     => "倉庫地址",
-    "stock_type"                         => "",
-    "successful_adding"                  => "已成功新增產品",
-    "successful_bulk_edit"               => "您已成功更新所選產品",
-    "successful_deleted"                 => "刪除成功",
-    "successful_updating"                => "已成功更新產品",
-    "supplier"                           => "供貨商",
-    "tax_1"                              => "稅額 1",
-    "tax_2"                              => "稅額 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "",
-    "tax_percent"                        => "稅率",
-    "tax_percent_number"                 => "",
-    "tax_percent_required"               => "稅率為必填欄位",
-    "tax_percents"                       => "稅率 %",
-    "temp"                               => "",
-    "type"                               => "",
-    "unit_price"                         => "單價",
-    "unit_price_number"                  => "單價必需是數值",
-    "unit_price_required"                => "單價為必填欄位",
-    "upc_database"                       => "UPC Database",
-    "update"                             => "更新產品",
-    "use_inventory_menu"                 => "使用庫存清單",
+    'add_minus'                          => '增/減庫存',
+    'allow_alt_description'              => '允許ALT描述',
+    'amount_entry'                       => '',
+    'bulk_edit'                          => '批次編輯',
+    'buy_price_required'                 => '進貨價為必填欄位',
+    'cannot_be_deleted'                  => '無法刪除選定產品，所選產品中的一個或多個有銷售紀綠。',
+    'cannot_find_item'                   => '無法找到任何有關的產品',
+    'categories'                         => '',
+    'category'                           => '類別',
+    'category_new'                       => '',
+    'category_required'                  => '類別為必填欄位',
+    'change_all_to_allow_alt_desc'       => ' 充許全部ALT倒序',
+    'change_all_to_not_allow_allow_desc' => '不允許全部ALT倒序',
+    'change_all_to_serialized'           => '全部更改序號至序列化',
+    'change_all_to_unserialized'         => '全部更改序號至非序列化',
+    'change_image'                       => 'Change Image',
+    'confirm_bulk_edit'                  => '您確定您要編輯的所有選定的產品嗎？',
+    'confirm_bulk_edit_wipe_taxes'       => 'All item tax information will be replaced!',
+    'confirm_delete'                     => '你確定你要刪除選定的產品嗎？',
+    'confirm_restore'                    => '',
+    'cost_price'                         => '成本價',
+    'cost_price_number'                  => '成本價必需是數值',
+    'cost_price_required'                => '成本價為必填攔位',
+    'count'                              => '更新庫存',
+    'csv_import_failed'                  => 'CSV匯入失敗',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => 'Your uploaded file has no data or wrong format',
+    'csv_import_partially_failed'        => 'Most Items imported. But some were not, here is the list',
+    'csv_import_success'                 => 'Import of Items successful',
+    'current_quantity'                   => '當前數量',
+    'default_pack_name'                  => '',
+    'description'                        => '描述',
+    'details_count'                      => '庫存盤點詳情',
+    'do_nothing'                         => '沒有執行任何修改',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '編輯您選定產品的所有欄位',
+    'edit_multiple_items'                => '編輯多項產品',
+    'empty_upc_items'                    => 'Empty UPC Items',
+    'error_adding_updating'              => '新增/更新產品錯誤',
+    'error_updating_multiple'            => '更新產品錯誤',
+    'generate_barcodes'                  => '產生條碼',
+    'hsn_code'                           => '',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Import items from CSV sheet',
+    'info_provided_by'                   => '訊息提供者',
+    'inventory'                          => '庫存',
+    'inventory_CSV_import_quantity'      => '',
+    'inventory_comments'                 => '評論',
+    'inventory_data_tracking'            => '',
+    'inventory_date'                     => '',
+    'inventory_employee'                 => '',
+    'inventory_in_out_quantity'          => '',
+    'inventory_remarks'                  => '',
+    'is_deleted'                         => 'Deleted',
+    'is_printed'                         => '',
+    'is_serialized'                      => '產品有序號',
+    'item'                               => '產品',
+    'item_id'                            => '',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => 'The item number is already present in the database',
+    'item_number_invalid'                => '项目编号包含不允许的字符。',
+    'kit'                                => '',
+    'location'                           => '位置',
+    'low_inventory_items'                => '低庫存產品',
+    'low_sell_item'                      => '',
+    'manually_editing_of_quantity'       => '手動編輯數量',
+    'markup'                             => '',
+    'name'                               => '產品名稱',
+    'name_required'                      => '產品名稱為必填',
+    'new'                                => '新增產品',
+    'no_description_items'               => '產品沒有說明',
+    'no_items_to_display'                => '沒有產品可以顯示',
+    'none'                               => '無',
+    'none_selected'                      => '您還沒有選擇任何產品進行編輯',
+    'nonstock'                           => '',
+    'number_information'                 => '產品編號',
+    'number_required'                    => 'UPC/EAN/ISBN is a required field',
+    'one_or_multiple'                    => '產品',
+    'pack_name'                          => '',
+    'qty_per_pack'                       => '',
+    'quantity'                           => '數量',
+    'quantity_number'                    => '數量必需是數值',
+    'quantity_required'                  => '數量為必填欄位',
+    'receiving_quantity'                 => 'Receiving quantity',
+    'remove_image'                       => 'Remove Image',
+    'reorder_level'                      => '補貨點',
+    'reorder_level_number'               => '補貨點必需是數值',
+    'reorder_level_required'             => '補貨點為必填欄位',
+    'retrive_item_info'                  => '檢索產品訊息',
+    'sales_tax_1'                        => '營業稅',
+    'sales_tax_2'                        => '營業稅 2',
+    'search_attributes'                  => 'Search Custom Fields',
+    'select_image'                       => 'Select Image',
+    'serialized_items'                   => '序列化產品',
+    'standard'                           => '',
+    'stock'                              => '',
+    'stock_location'                     => '倉庫地址',
+    'stock_type'                         => '',
+    'successful_adding'                  => '已成功新增產品',
+    'successful_bulk_edit'               => '您已成功更新所選產品',
+    'successful_deleted'                 => '刪除成功',
+    'successful_updating'                => '已成功更新產品',
+    'supplier'                           => '供貨商',
+    'tax_1'                              => '稅額 1',
+    'tax_2'                              => '稅額 2',
+    'tax_3'                              => '',
+    'tax_category'                       => '',
+    'tax_name_invalid'                   => '税项名称包含不允许的字符。',
+    'tax_percent'                        => '稅率',
+    'tax_percent_number'                 => '',
+    'tax_percent_required'               => '稅率為必填欄位',
+    'tax_percents'                       => '稅率 %',
+    'temp'                               => '',
+    'type'                               => '',
+    'unit_price'                         => '單價',
+    'unit_price_number'                  => '單價必需是數值',
+    'unit_price_required'                => '單價為必填欄位',
+    'upc_database'                       => 'UPC Database',
+    'update'                             => '更新產品',
+    'use_inventory_menu'                 => '使用庫存清單',
 ];
diff --git a/app/Language/zh-Hans/Login.php b/app/Language/zh-Hans/Login.php
index 12d7f538e..5afd6ce89 100644
--- a/app/Language/zh-Hans/Login.php
+++ b/app/Language/zh-Hans/Login.php
@@ -1,15 +1,30 @@
 <?php
 
 return [
-    "gcaptcha"                      => "我不是机器人。",
-    "go"                            => "登入",
-    "invalid_gcaptcha"              => "无效，我不是机器人。",
-    "invalid_installation"          => "安装不正确，请检查您的php.ini文件。",
-    "invalid_username_and_password" => "无效的用户名或密码。",
-    "login"                         => "登入",
-    "logout"                        => "退出",
-    "migration_needed"              => "",
-    "password"                      => "密码",
-    "username"                      => "用户名",
-    "welcome"                       => "欢迎来到 {0}!",
+    "gcaptcha"                            => "我不是机器人。",
+    "go"                                  => "登入",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "无效，我不是机器人。",
+    "invalid_installation"                => "安装不正确，请检查您的php.ini文件。",
+    "invalid_username_and_password"       => "无效的用户名或密码。",
+    "login"                               => "登入",
+    "logout"                              => "退出",
+    "migrating_database"                  => "正在迁移数据库",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "数据库迁移成功！",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "密码",
+    'too_many_attempts'                   => '太多次尝试。请稍等片刻后重试。',
+    "username"                            => "用户名",
+    "welcome"                             => "欢迎来到 {0}!"
 ];
diff --git a/app/Language/zh-Hans/Reports.php b/app/Language/zh-Hans/Reports.php
index f98bda89f..dfd697361 100644
--- a/app/Language/zh-Hans/Reports.php
+++ b/app/Language/zh-Hans/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "",
     "taxes"                                   => "稅額",
     "taxes_summary_report"                    => "稅金摘要報告",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "總計",
     "total_inventory_value"                   => "Total Inventory Value",
     "total_low_sell_quantity"                 => "",
diff --git a/app/Language/zh-Hans/Sales.php b/app/Language/zh-Hans/Sales.php
index 4e04d3d09..c122f3ea5 100644
--- a/app/Language/zh-Hans/Sales.php
+++ b/app/Language/zh-Hans/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "可用积分",
-    "rewards_package"                  => "",
-    "rewards_remaining_balance"        => "",
-    "account_number"                   => "",
-    "add_payment"                      => "新增付款",
-    "amount_due"                       => "商品金額",
-    "amount_tendered"                  => "已收帳款",
-    "authorized_signature"             => "",
-    "cancel_sale"                      => "取消銷售",
-    "cash"                             => "現金",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "",
-    "cash_deposit"                     => "",
-    "cash_filter"                      => "現金",
-    "change_due"                       => "更改到期日",
-    "change_price"                     => "",
-    "check"                            => "支票",
-    "check_balance"                    => "查看餘額",
-    "check_filter"                     => "",
-    "close"                            => "",
-    "comment"                          => "評論",
-    "comments"                         => "評論",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "完成銷售",
-    "confirm_cancel_sale"              => "你確定要清除此筆銷售單？本單內的所有產品將被清除。",
-    "confirm_delete"                   => "你確定要清除此銷售產品？",
-    "confirm_restore"                  => "",
-    "credit"                           => "信用卡",
-    "credit_deposit"                   => "",
-    "credit_filter"                    => "",
-    "current_table"                    => "",
-    "customer"                         => "客戶",
-    "customer_address"                 => "Customer Address",
-    "customer_discount"                => "折扣",
-    "customer_email"                   => "Customer Email",
-    "customer_location"                => "Customer Location",
-    "customer_mailchimp_status"        => "",
-    "customer_optional"                => "",
-    "customer_required"                => "",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "日期",
-    "date_range"                       => "日期範圍",
-    "date_required"                    => "A correct date needs to be filled in",
-    "date_type"                        => "Date field is required",
-    "debit"                            => "簽帳卡",
-    "debit_filter"                     => "",
-    "delete"                           => "",
-    "delete_confirmation"              => "你確定要刪除此銷售資料，這個動作不能撤消",
-    "delete_entire_sale"               => "刪除全部銷售資料",
-    "delete_successful"                => "您已成功刪除銷售資料",
-    "delete_unsuccessful"              => "銷售資料刪除失敗",
-    "description_abbrv"                => "倒序",
-    "discard"                          => "",
-    "discard_quote"                    => "",
-    "discount"                         => "折扣 %",
-    "discount_included"                => "% Discount",
-    "discount_short"                   => "%",
-    "due"                              => "",
-    "due_filter"                       => "",
-    "edit"                             => "編輯",
-    "edit_item"                        => "編輯產品",
-    "edit_sale"                        => "編輯銷售資料",
-    "email_receipt"                    => "Email 銷售單",
-    "employee"                         => "員工",
-    "entry"                            => "",
-    "error_editing_item"               => "編輯產品錯誤",
-    "find_or_scan_item"                => "查找/掃描商品",
-    "find_or_scan_item_or_receipt"     => "查找/掃描產品或收貨單",
-    "giftcard"                         => "禮金券",
-    "giftcard_balance"                 => "Giftcard Balance",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "禮金券編號",
-    "group_by_category"                => "",
-    "group_by_type"                    => "",
-    "hsn"                              => "",
-    "id"                               => "銷售編號",
-    "include_prices"                   => "",
-    "invoice"                          => "Invoice",
-    "invoice_confirm"                  => "This invoice will be sent to",
-    "invoice_enable"                   => "Create Invoice",
-    "invoice_filter"                   => "Invoices",
-    "invoice_no_email"                 => "This customer does not have a valid email address",
-    "invoice_number"                   => "Invoice #",
-    "invoice_number_duplicate"         => "Please enter an unique invoice number",
-    "invoice_sent"                     => "Invoice sent to",
-    "invoice_total"                    => "",
-    "invoice_type_custom_invoice"      => "",
-    "invoice_type_custom_tax_invoice"  => "",
-    "invoice_type_invoice"             => "",
-    "invoice_type_tax_invoice"         => "",
-    "invoice_unsent"                   => "Invoice failed to be sent to",
-    "invoice_update"                   => "Recount",
-    "item_insufficient_of_stock"       => "產品庫存不足",
-    "item_name"                        => "產品名稱",
-    "item_number"                      => "產品 #",
-    "item_out_of_stock"                => "產品缺貨",
-    "key_browser"                      => "",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice witdout payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "登記模式",
-    "must_enter_numeric"               => "已收帳款必須輸入數值",
-    "must_enter_numeric_giftcard"      => "禮金券編號必須輸入數值",
-    "new_customer"                     => "新客戶",
-    "new_item"                         => "新增產品",
-    "no_description"                   => "None",
-    "no_filter"                        => "All",
-    "no_items_in_cart"                 => "購物車中沒有任何產品",
-    "no_sales_to_display"              => "No sales to display",
-    "none_selected"                    => "您還沒有選擇任何產品進行編輯",
-    "nontaxed_ind"                     => "",
-    "not_authorized"                   => "",
-    "one_or_multiple"                  => "",
-    "payment"                          => "付款方式",
-    "payment_amount"                   => "Amount",
-    "payment_not_cover_total"          => "付款金額不足",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Payments Total",
-    "price"                            => "價格",
-    "print_after_sale"                 => "出貨時打印收據",
-    "quantity"                         => "數量.",
-    "quantity_less_than_reorder_level" => "警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存",
-    "quantity_less_than_zero"          => "警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存",
-    "quantity_of_items"                => "",
-    "quote"                            => "",
-    "quote_number"                     => "",
-    "quote_number_duplicate"           => "",
-    "quote_sent"                       => "",
-    "quote_unsent"                     => "",
-    "receipt"                          => "銷貨單",
-    "receipt_no_email"                 => "",
-    "receipt_number"                   => "POS #",
-    "receipt_sent"                     => "Receipt sent to",
-    "receipt_unsent"                   => "Receipt failed to be sent to",
-    "refund"                           => "",
-    "register"                         => "銷售登記",
-    "remove_customer"                  => "移除客戶",
-    "remove_discount"                  => "",
-    "return"                           => "退貨",
-    "rewards"                          => "",
-    "rewards_balance"                  => "",
-    "sale"                             => "銷售",
-    "sale_by_invoice"                  => "",
-    "sale_for_customer"                => "客戶:",
-    "sale_time"                        => "Time",
-    "sales_tax"                        => "",
-    "sales_total"                      => "",
-    "select_customer"                  => "選擇客戶 (Optional)",
-    "send_invoice"                     => "Send Invoice",
-    "send_quote"                       => "",
-    "send_receipt"                     => "Send Receipt",
-    "send_work_order"                  => "",
-    "serial"                           => "序號",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Show Invoice",
-    "show_receipt"                     => "Show Receipt",
-    "start_typing_customer_name"       => "開始輸入客戶的名字",
-    "start_typing_item_name"           => "開始輸入產品名或掃描條碼...",
-    "stock"                            => "",
-    "stock_location"                   => "",
-    "sub_total"                        => "小計",
-    "successfully_deleted"             => "銷售資料成功刪除",
-    "successfully_restored"            => "",
-    "successfully_suspended_sale"      => "本銷售資料已經成功暫停",
-    "successfully_updated"             => "銷售資料成功更新",
-    "suspend_sale"                     => "暫停銷售",
-    "suspended_doc_id"                 => "",
-    "suspended_sale_id"                => "暫停銷售編號",
-    "suspended_sales"                  => "已暫停銷售",
-    "table"                            => "",
-    "takings"                          => "Takings",
-    "tax"                              => "稅額",
-    "tax_id"                           => "",
-    "tax_invoice"                      => "",
-    "tax_percent"                      => "稅率 %",
-    "taxed_ind"                        => "",
-    "total"                            => "總計",
-    "total_tax_exclusive"              => "Tax excluded",
-    "transaction_failed"               => "銷售交易失敗",
-    "unable_to_add_item"               => "無法增加出售產品",
-    "unsuccessfully_deleted"           => "銷售資料刪除失敗",
-    "unsuccessfully_restored"          => "",
-    "unsuccessfully_suspended_sale"    => "本銷售資料已經成功暫停",
-    "unsuccessfully_updated"           => "銷售資料更新失敗",
-    "unsuspend"                        => "取消暫停銷售",
-    "unsuspend_and_delete"             => "取消暫停銷售並刪除",
-    "update"                           => "編輯",
-    "upi"                              => "",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "",
-    "work_order_number"                => "",
-    "work_order_number_duplicate"      => "",
-    "work_order_sent"                  => "",
-    "work_order_unsent"                => "",
+    'account_number'                    => '',
+    'add_payment'                       => '新增付款',
+    'amount_due'                        => '商品金額',
+    'amount_due_not_covered'            => '付款金额未覆盖应付金额。',
+    'amount_tendered'                   => '已收帳款',
+    'authorized_signature'              => '',
+    'cancel_sale'                       => '取消銷售',
+    'cash'                              => '現金',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '',
+    'cash_deposit'                      => '',
+    'cash_filter'                       => '現金',
+    'change_due'                        => '更改到期日',
+    'change_price'                      => '',
+    'check'                             => '支票',
+    'check_balance'                     => '查看餘額',
+    'check_filter'                      => '',
+    'close'                             => '',
+    'comment'                           => '評論',
+    'comments'                          => '評論',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '完成銷售',
+    'confirm_cancel_sale'               => '你確定要清除此筆銷售單？本單內的所有產品將被清除。',
+    'confirm_delete'                    => '你確定要清除此銷售產品？',
+    'confirm_restore'                   => '',
+    'credit'                            => '信用卡',
+    'credit_deposit'                    => '',
+    'credit_filter'                     => '',
+    'current_table'                     => '',
+    'customer'                          => '客戶',
+    'customer_address'                  => 'Customer Address',
+    'customer_discount'                 => '折扣',
+    'customer_email'                    => 'Customer Email',
+    'customer_location'                 => 'Customer Location',
+    'customer_mailchimp_status'         => '',
+    'customer_optional'                 => '',
+    'customer_required'                 => '',
+    'customer_total'                    => 'Total',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '可用积分',
+    'daily_sales'                       => '',
+    'date'                              => '日期',
+    'date_range'                        => '日期範圍',
+    'date_required'                     => 'A correct date needs to be filled in',
+    'date_type'                         => 'Date field is required',
+    'debit'                             => '簽帳卡',
+    'debit_filter'                      => '',
+    'delete'                            => '',
+    'delete_confirmation'               => '你確定要刪除此銷售資料，這個動作不能撤消',
+    'delete_entire_sale'                => '刪除全部銷售資料',
+    'delete_successful'                 => '您已成功刪除銷售資料',
+    'delete_unsuccessful'               => '銷售資料刪除失敗',
+    'description_abbrv'                 => '倒序',
+    'discard'                           => '',
+    'discard_quote'                     => '',
+    'discount'                          => '折扣 %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% Discount',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => '',
+    'due_filter'                        => '',
+    'edit'                              => '編輯',
+    'edit_item'                         => '編輯產品',
+    'edit_sale'                         => '編輯銷售資料',
+    'email_receipt'                     => 'Email 銷售單',
+    'employee'                          => '員工',
+    'entry'                             => '',
+    'error_editing_item'                => '編輯產品錯誤',
+    'find_or_scan_item'                 => '查找/掃描商品',
+    'find_or_scan_item_or_receipt'      => '查找/掃描產品或收貨單',
+    'giftcard'                          => '禮金券',
+    'giftcard_balance'                  => 'Giftcard Balance',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '禮金券編號',
+    'group_by_category'                 => '',
+    'group_by_type'                     => '',
+    'hsn'                               => '',
+    'id'                                => '銷售編號',
+    'include_prices'                    => '',
+    'insufficient_giftcard_balance'     => '此次支付的礼品卡余额不足。',
+    'insufficient_reward_points'        => '此次支付的奖励积分不足。',
+    'invoice'                           => 'Invoice',
+    'invoice_confirm'                   => 'This invoice will be sent to',
+    'invoice_enable'                    => 'Create Invoice',
+    'invoice_filter'                    => 'Invoices',
+    'invoice_no_email'                  => 'This customer does not have a valid email address',
+    'invoice_number'                    => 'Invoice #',
+    'invoice_number_duplicate'          => 'Please enter an unique invoice number',
+    'invoice_sent'                      => 'Invoice sent to',
+    'invoice_total'                     => '',
+    'invoice_type_custom_invoice'       => '',
+    'invoice_type_custom_tax_invoice'   => '',
+    'invoice_type_invoice'              => '',
+    'invoice_type_tax_invoice'          => '',
+    'invoice_unsent'                    => 'Invoice failed to be sent to',
+    'invoice_update'                    => 'Recount',
+    'item_insufficient_of_stock'        => '產品庫存不足',
+    'item_name'                         => '產品名稱',
+    'item_number'                       => '產品 #',
+    'item_out_of_stock'                 => '產品缺貨',
+    'key_browser'                       => '',
+    'key_cancel'                        => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'               => 'Customer Search',
+    'key_finish_quote'                  => 'Finish Quote/Invoice witdout payment',
+    'key_finish_sale'                   => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                          => '',
+    'key_function'                      => 'Function',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '登記模式',
+    'must_enter_numeric'                => '已收帳款必須輸入數值',
+    'must_enter_numeric_giftcard'       => '禮金券編號必須輸入數值',
+    'must_enter_reference_code'         => '必须输入参考/检索编号。',
+    'negative_amount_tendered'          => '已收帐款不能为负数。',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '新客戶',
+    'new_item'                          => '新增產品',
+    'no_description'                    => 'None',
+    'no_filter'                         => 'All',
+    'no_items_in_cart'                  => '購物車中沒有任何產品',
+    'no_sales_to_display'               => 'No sales to display',
+    'none_selected'                     => '您還沒有選擇任何產品進行編輯',
+    'nontaxed_ind'                      => '',
+    'not_authorized'                    => '',
+    'one_or_multiple'                   => '',
+    'payment'                           => '付款方式',
+    'payment_amount'                    => 'Amount',
+    'payment_not_cover_total'           => '付款金額不足',
+    'payment_type'                      => 'Type',
+    'payments'                          => '',
+    'payments_total'                    => 'Payments Total',
+    'price'                             => '價格',
+    'print_after_sale'                  => '出貨時打印收據',
+    'quantity'                          => '數量.',
+    'quantity_less_than_reorder_level'  => '警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存',
+    'quantity_less_than_zero'           => '警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存',
+    'quantity_of_items'                 => '',
+    'quote'                             => '',
+    'quote_number'                      => '',
+    'quote_number_duplicate'            => '',
+    'quote_sent'                        => '',
+    'quote_unsent'                      => '',
+    'receipt'                           => '銷貨單',
+    'receipt_no_email'                  => '',
+    'receipt_number'                    => 'POS #',
+    'receipt_sent'                      => 'Receipt sent to',
+    'receipt_unsent'                    => 'Receipt failed to be sent to',
+    'reference_code'                    => '付款参考代码',
+    'reference_code_invalid_characters' => '参考代码只能包含字母和数字。',
+    'reference_code_length_error'       => '参考代码长度无效。',
+    'refund'                            => '',
+    'register'                          => '銷售登記',
+    'remove_customer'                   => '移除客戶',
+    'remove_discount'                   => '',
+    'return'                            => '退貨',
+    'rewards'                           => '',
+    'rewards_balance'                   => '',
+    'rewards_package'                   => '',
+    'rewards_remaining_balance'         => '',
+    'sale'                              => '銷售',
+    'sale_by_invoice'                   => '',
+    'sale_for_customer'                 => '客戶:',
+    'sale_time'                         => 'Time',
+    'sales_tax'                         => '',
+    'sales_total'                       => '',
+    'select_customer'                   => '選擇客戶 (Optional)',
+    'send_invoice'                      => 'Send Invoice',
+    'send_quote'                        => '',
+    'send_receipt'                      => 'Send Receipt',
+    'send_work_order'                   => '',
+    'serial'                            => '序號',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => 'Show Invoice',
+    'show_receipt'                      => 'Show Receipt',
+    'start_typing_customer_name'        => '開始輸入客戶的名字',
+    'start_typing_item_name'            => '開始輸入產品名或掃描條碼...',
+    'stock'                             => '',
+    'stock_location'                    => '',
+    'sub_total'                         => '小計',
+    'successfully_deleted'              => '銷售資料成功刪除',
+    'successfully_restored'             => '',
+    'successfully_suspended_sale'       => '本銷售資料已經成功暫停',
+    'successfully_updated'              => '銷售資料成功更新',
+    'suspend_sale'                      => '暫停銷售',
+    'suspended_doc_id'                  => '',
+    'suspended_sale_id'                 => '暫停銷售編號',
+    'suspended_sales'                   => '已暫停銷售',
+    'table'                             => '',
+    'takings'                           => 'Takings',
+    'tax'                               => '稅額',
+    'tax_id'                            => '',
+    'tax_invoice'                       => '',
+    'tax_percent'                       => '稅率 %',
+    'taxed_ind'                         => '',
+    'total'                             => '總計',
+    'total_tax_exclusive'               => 'Tax excluded',
+    'transaction_failed'                => '銷售交易失敗',
+    'unable_to_add_item'                => '無法增加出售產品',
+    'unsuccessfully_deleted'            => '銷售資料刪除失敗',
+    'unsuccessfully_restored'           => '',
+    'unsuccessfully_suspended_sale'     => '本銷售資料已經成功暫停',
+    'unsuccessfully_updated'            => '銷售資料更新失敗',
+    'unsuspend'                         => '取消暫停銷售',
+    'unsuspend_and_delete'              => '取消暫停銷售並刪除',
+    'update'                            => '編輯',
+    'upi'                               => '',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '',
+    'work_order_number'                 => '',
+    'work_order_number_duplicate'       => '',
+    'work_order_sent'                   => '',
+    'work_order_unsent'                 => '',
 ];
diff --git a/app/Language/zh-Hant/Attributes.php b/app/Language/zh-Hant/Attributes.php
index 4463cf5a1..723e709ce 100644
--- a/app/Language/zh-Hant/Attributes.php
+++ b/app/Language/zh-Hant/Attributes.php
@@ -1,33 +1,36 @@
 <?php
 
 return [
-    "attribute_value_invalid_chars"    => "屬性設定值中不可含有「_」或「|」",
-    "confirm_delete"                   => "您確定要刪除此屬性?",
-    "confirm_restore"                  => "您確定要還原所選屬性嗎？",
-    "definition_cannot_be_deleted"     => "無法刪除所選屬性",
-    "definition_error_adding_updating" => "無法添加或更新屬性 {0}。 請檢查錯誤日誌。",
-    "definition_flags"                 => "屬性可見性",
-    "definition_group"                 => "群組",
-    "definition_id"                    => "編號",
-    "definition_name"                  => "添加屬性",
-    "definition_name_required"         => "屬性名稱必需填寫",
-    "definition_one_or_multiple"       => "屬性",
-    "definition_successful_adding"     => "您已成功添加項目",
-    "definition_successful_deleted"    => "您已成功刪除",
-    "definition_successful_updating"   => "您已成功更新屬性",
-    "definition_type"                  => "屬性類型",
-    "definition_type_required"         => "屬性類型必需填寫",
-    "definition_unit"                  => "測量單位",
-    "definition_values"                => "屬性值",
-    "new"                              => "新屬性",
-    "no_attributes_to_display"         => "沒有項目可顯示",
-    "receipt_visibility"               => "收據",
-    "show_in_items"                    => "在項目中顯示",
-    "show_in_items_visibility"         => "物品",
-    "show_in_receipt"                  => "在收據中顯示",
-    "show_in_receivings"               => "在收貨中顯示",
-    "show_in_receivings_visibility"    => "收貨",
-    "show_in_sales"                    => "在銷售中顯示",
-    "show_in_sales_visibility"         => "銷售",
-    "update"                           => "更新屬性",
+    'attribute_value_invalid_chars'    => '屬性設定值中不可含有「_」或「|」',
+    'confirm_delete'                   => '您確定要刪除此屬性?',
+    'confirm_restore'                  => '您確定要還原所選屬性嗎？',
+    'definition_cannot_be_deleted'     => '無法刪除所選屬性',
+    'definition_invalid_group' => '所選擇的群組不存在或無效。',
+    'definition_error_adding_updating' => '無法添加或更新屬性 {0}。 請檢查錯誤日誌。',
+    'definition_flags'                 => '屬性可見性',
+    'definition_group'                 => '群組',
+    'definition_id'                    => '編號',
+    'definition_name'                  => '添加屬性',
+    'definition_name_required'         => '屬性名稱必需填寫',
+    'definition_one_or_multiple'       => '屬性',
+    'definition_successful_adding'     => '您已成功添加項目',
+    'definition_successful_deleted'    => '您已成功刪除',
+    'definition_successful_updating'   => '您已成功更新屬性',
+    'definition_type'                  => '屬性類型',
+    'definition_type_required'         => '屬性類型必需填寫',
+    'definition_unit'                  => '測量單位',
+    'definition_values'                => '屬性值',
+    'new'                              => '新屬性',
+    'no_attributes_to_display'         => '沒有項目可顯示',
+    'receipt_visibility'               => '收據',
+    'show_in_items'                    => '在項目中顯示',
+    'show_in_items_visibility'         => '物品',
+    'show_in_receipt'                  => '在收據中顯示',
+    'show_in_receivings'               => '在收貨中顯示',
+    'show_in_receivings_visibility'    => '收貨',
+    'show_in_sales'                    => '在銷售中顯示',
+    'show_in_sales_visibility'         => '銷售',
+    'show_in_search'                   => '在搜尋中顯示',
+    'show_in_search_visibility'        => '搜尋',
+    'update'                           => '更新屬性',
 ];
diff --git a/app/Language/zh-Hant/Bootstrap_tables.php b/app/Language/zh-Hant/Bootstrap_tables.php
index 7a5826ff2..0b2db2ca8 100644
--- a/app/Language/zh-Hant/Bootstrap_tables.php
+++ b/app/Language/zh-Hant/Bootstrap_tables.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "全部",
-    "columns"              => "列",
-    "hide_show_pagination" => "隱藏/顯示分頁",
-    "loading"              => "加載數據中，請稍候……",
-    "page_from_to"         => "顯示第 {0} 至第 {1} 條記錄，總共 {2} 條記錄",
-    "refresh"              => "重新",
-    "rows_per_page"        => "每頁顯示 {0} 條記錄",
-    "toggle"               => "切換",
+    'all' => "全部",
+    'columns' => "列",
+    'hide_show_pagination' => "隱藏/顯示分頁",
+    'loading' => "加載數據中，請稍候",
+    'page_from_to' => "顯示第 {0} 至第 {1} 條記錄，總共 {2} 條記錄",
+    'refresh' => "重新",
+    'rows_per_page' => "每頁顯示 {0} 條記錄",
+    'toggle' => "切換",
 ];
diff --git a/app/Language/zh-Hant/Config.php b/app/Language/zh-Hant/Config.php
index 0c85c9335..7cfce02d3 100644
--- a/app/Language/zh-Hant/Config.php
+++ b/app/Language/zh-Hant/Config.php
@@ -1,331 +1,334 @@
 <?php
 
 return [
-    "address"                                   => "公司地址",
-    "address_required"                          => "公司地址為必填.",
-    "all_set"                                   => "所有文件權限設置正確！",
-    "allow_duplicate_barcodes"                  => "允許重複的條碼",
-    "apostrophe"                                => "撇號",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "條碼",
-    "barcode_company"                           => "公司名稱",
-    "barcode_configuration"                     => "條碼配置",
-    "barcode_content"                           => "條碼內容",
-    "barcode_first_row"                         => "第 1 行",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "輸入格式",
-    "barcode_generate_if_empty"                 => "為空時生成.",
-    "barcode_height"                            => "高度（像素）",
-    "barcode_id"                                => "Item Id/Name",
-    "barcode_info"                              => "條碼配置信息",
-    "barcode_layout"                            => "條碼佈局",
-    "barcode_name"                              => "客戶",
-    "barcode_number"                            => "UPC/EAN/ISBN",
-    "barcode_number_in_row"                     => "行數",
-    "barcode_page_cellspacing"                  => "顯示頁面單元格間距.",
-    "barcode_page_width"                        => "顯示頁面寬度",
-    "barcode_price"                             => "價格",
-    "barcode_second_row"                        => "Row 4",
-    "barcode_third_row"                         => "Row 5",
-    "barcode_tooltip"                           => "警告：此功能可能會導致導入或創建重複項。如果您不想要重複的條形碼，請不要使用。",
-    "barcode_type"                              => "條碼類型",
-    "barcode_width"                             => "寬度（像素）",
-    "bottom"                                    => "底部",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "現金小數",
-    "cash_decimals_tooltip"                     => "如果現金小數和貨幣小數相同，則不會發生現金觸發的四捨五入，除非現金四捨五入設置為五分之一。",
-    "cash_rounding"                             => "現金四捨五入",
-    "category_dropdown"                         => "下拉式顯示類別",
-    "center"                                    => "中心",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "逗號",
-    "company"                                   => "公司名稱",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "更改圖像",
-    "company_logo"                              => "公司標誌",
-    "company_remove_image"                      => "刪除圖像",
-    "company_required"                          => "公司名稱為必填",
-    "company_select_image"                      => "選擇圖像",
-    "company_website_url"                       => "公司網址格式錯誤 (http://...).",
-    "country_codes"                             => "國家代碼",
-    "country_codes_tooltip"                     => "以逗號分隔的國家/地區代碼列表，用於提名地址查找。",
-    "currency_code"                             => "幣別代碼",
-    "currency_decimals"                         => "貨幣小數",
-    "currency_symbol"                           => "貨幣符號",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "報酬",
-    "customer_reward_duplicate"                 => "獎勵必須是唯一的。",
-    "customer_reward_enable"                    => "啟用客戶獎勵",
-    "customer_reward_invalid_chars"             => "獎勵不能包含“_”",
-    "customer_reward_required"                  => "獎勵是必填字段",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "日期和時間過濾器",
-    "datetimeformat"                            => "日期時間格式",
-    "decimal_point"                             => "小數點位數",
-    "default_barcode_font_size_number"          => "默認條形碼字體大小必須是數字。",
-    "default_barcode_font_size_required"        => "默認條碼字體大小是必填字段。",
-    "default_barcode_height_number"             => "默認條碼高度必須是數字。",
-    "default_barcode_height_required"           => "默認條碼高度是必填字段。",
-    "default_barcode_num_in_row_number"         => "行中的默認條形碼編號必須是數字。",
-    "default_barcode_num_in_row_required"       => "行中的默認條形碼編號是必填字段。",
-    "default_barcode_page_cellspacing_number"   => "默認條碼頁 Cellspacing 必須是一個數字。",
-    "default_barcode_page_cellspacing_required" => "默認條碼頁單元格間距是必填字段。",
-    "default_barcode_page_width_number"         => "默認條形碼頁面寬度必須是數字。",
-    "default_barcode_page_width_required"       => "默認條碼頁面寬度為必填字段.",
-    "default_barcode_width_number"              => "默認條碼寬度必須是數字。",
-    "default_barcode_width_required"            => "默認條碼寬度是必填字段。",
-    "default_item_columns"                      => "默認可見項目列",
-    "default_origin_tax_code"                   => "默認原產地稅碼",
-    "default_receivings_discount"               => "默認收款折扣",
-    "default_receivings_discount_number"        => "默認收款折扣必須是一個數字。",
-    "default_receivings_discount_required"      => "默認收款折扣是必填字段。",
-    "default_sales_discount"                    => "Default Sales Discount %",
-    "default_sales_discount_number"             => "默認銷售折扣必須是數字。",
-    "default_sales_discount_required"           => "默認銷售折扣是必填字段.",
-    "default_tax_category"                      => "默認稅種",
-    "default_tax_code"                          => "默認稅碼",
-    "default_tax_jurisdiction"                  => "默認稅收管轄權",
-    "default_tax_name_number"                   => "默認稅名必須是字符串。",
-    "default_tax_name_required"                 => "The default tax name is a required field.",
-    "default_tax_rate"                          => "預設稅率 %",
-    "default_tax_rate_1"                        => "稅率 1",
-    "default_tax_rate_2"                        => "稅率 2",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "預設稅率必需為數字.",
-    "default_tax_rate_required"                 => "預設稅率為必填.",
-    "derive_sale_quantity"                      => "允許派生銷售數量",
-    "derive_sale_quantity_tooltip"              => "如果選中，則將為按擴展金額訂購的商品提供新的商品類型",
-    "dinner_table"                              => "餐桌",
-    "dinner_table_duplicate"                    => "餐桌必須唯一.",
-    "dinner_table_enable"                       => "啟用餐桌",
-    "dinner_table_invalid_chars"                => "餐桌名稱不能包含 '_'.",
-    "dinner_table_required"                     => "餐桌是必填欄位.",
-    "dot"                                       => "點",
-    "email"                                     => "郵箱",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "發送郵件的路徑",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "電子郵件收據複選框",
-    "email_receipt_check_behaviour_always"      => "始終檢查",
-    "email_receipt_check_behaviour_last"        => "記住上次選擇",
-    "email_receipt_check_behaviour_never"       => "始終未選中",
-    "email_smtp_crypto"                         => "SMTP 加密",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP 逾時",
-    "email_smtp_user"                           => "SMTP 用戶名",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "保護隱私",
-    "enforce_privacy_tooltip"                   => "保護客戶隱私，在他們的數據被刪除的情況下強制執行數據擾亂",
-    "fax"                                       => "傳真",
-    "file_perm"                                 => "檔案權限有問題，請修正後重刷網頁.",
-    "financial_year"                            => "財務年起始",
-    "financial_year_apr"                        => "4月1日",
-    "financial_year_aug"                        => "8月1日",
-    "financial_year_dec"                        => "12月1日",
-    "financial_year_feb"                        => "2月1日",
-    "financial_year_jan"                        => "1月1日",
-    "financial_year_jul"                        => "7月1日",
-    "financial_year_jun"                        => "6月1日",
-    "financial_year_mar"                        => "3月1日",
-    "financial_year_may"                        => "5月1日",
-    "financial_year_nov"                        => "11月1日",
-    "financial_year_oct"                        => "10月1日",
-    "financial_year_sep"                        => "9月1日",
-    "floating_labels"                           => "浮動標籤",
-    "gcaptcha_enable"                           => "登入檢核碼(reCAPTCHA)",
-    "gcaptcha_secret_key"                       => "reCAPTCHA 密鑰",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA 密鑰是必填字段",
-    "gcaptcha_site_key"                         => "reCAPTCHA 站點密鑰",
-    "gcaptcha_site_key_required"                => "reCAPTCHA 站點密鑰是必填字段",
-    "gcaptcha_tooltip"                          => "登入使用Google reCAPTCHA保護，點選圖標進行 API key 配對.",
-    "general"                                   => "一般",
-    "general_configuration"                     => "一般設定",
-    "giftcard_number"                           => "禮物卡號碼",
-    "giftcard_random"                           => "亂數產生",
-    "giftcard_series"                           => "序列產生",
-    "image_allowed_file_types"                  => "允許圖檔類型",
-    "image_max_height_tooltip"                  => "上傳圖檔最大高度(px).",
-    "image_max_size_tooltip"                    => "上傳圖檔大小上限(kb).",
-    "image_max_width_tooltip"                   => "上傳圖檔最大寬度(px).",
-    "image_restrictions"                        => "上傳圖檔限制",
-    "include_hsn"                               => "包括對 HSN 代碼的支持",
-    "info"                                      => "儲存組態",
-    "info_configuration"                        => "儲存組態",
-    "input_groups"                              => "輸入組",
-    "integrations"                              => "整合",
-    "integrations_configuration"                => "第三方整合",
-    "invoice"                                   => "發票",
-    "invoice_configuration"                     => "發票打印設置",
-    "invoice_default_comments"                  => "默認發票註釋",
-    "invoice_email_message"                     => "發票電子郵件模板",
-    "invoice_enable"                            => "啟用發票",
-    "invoice_printer"                           => "發票打印機",
-    "invoice_type"                              => "發票類型",
-    "is_readable"                               => "可讀取但權限不正確，請設定為 640 或 660 後重整.",
-    "is_writable"                               => "可寫，但權限設置不正確。請將其設置為 750 並刷新。",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "語言",
-    "last_used_invoice_number"                  => "上次使用的發票編號",
-    "last_used_quote_number"                    => "上次使用的報價編號",
-    "last_used_work_order_number"               => "上次使用的 W / O 編號",
-    "left"                                      => "剩下",
-    "license"                                   => "許可証",
-    "license_configuration"                     => "許可聲明",
-    "line_sequence"                             => "行序",
-    "lines_per_page"                            => "Lines Per Page",
-    "lines_per_page_number"                     => "每頁行數必須是數字。",
-    "lines_per_page_required"                   => "每頁行數是必填字段。",
-    "locale"                                    => "Localisation",
-    "locale_configuration"                      => "Localisation Configuration",
-    "locale_info"                               => "Localisation Configuration Information",
-    "location"                                  => "庫存",
-    "location_configuration"                    => "庫存位置",
-    "location_info"                             => "位置配置信息",
-    "login_form"                                => "登錄表單樣式",
-    "logout"                                    => "是否要在註銷前進行備份？點擊【確定】進行備份，點擊【取消】退出。",
-    "mailchimp"                                 => "郵件黑猩猩",
-    "mailchimp_api_key"                         => "黑猩猩 API 密鑰",
-    "mailchimp_configuration"                   => "黑猩猩配置",
-    "mailchimp_key_successfully"                => "API 密鑰有效。",
-    "mailchimp_key_unsuccessfully"              => "無效的 API 密鑰.",
-    "mailchimp_lists"                           => "MailChimp 列表",
-    "mailchimp_tooltip"                         => "單擊 API 密鑰的圖標。",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "保存的短信",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here. Otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API 密碼是必填字段",
-    "msg_src"                                   => "SMS-API 發件人 ID",
-    "msg_src_required"                          => "SMS-API 發件人 ID 是必填字段",
-    "msg_uid"                                   => "SMS-API 用戶名",
-    "msg_uid_required"                          => "SMS-API 用戶名是必填字段",
-    "multi_pack_enabled"                        => "每件物品多個包裹",
-    "no_risk"                                   => "沒有安全/漏洞風險。",
-    "none"                                      => "none",
-    "notify_alignment"                          => "通知彈出位置",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localisation",
-    "number_locale_invalid"                     => "輸入的區域設置無效。檢查工具提示中的鏈接以查找有效的語言環境。",
-    "number_locale_required"                    => "數字語言是必填字段。",
-    "number_locale_tooltip"                     => "通過此鏈接找到合適的語言環境。",
-    "os_timezone"                               => "OSPOS 時區：",
-    "ospos_info"                                => "OSPOS 安裝信息",
-    "payment_options_order"                     => "付款選項訂單",
-    "perm_risk"                                 => "不正確的權限使該軟件面臨風險。",
-    "phone"                                     => "電話",
-    "phone_required"                            => "公司電話為必填.",
-    "print_bottom_margin"                       => "保證金底部",
-    "print_bottom_margin_number"                => "底部邊距必須是數字。",
-    "print_bottom_margin_required"              => "底部邊距是必填字段。",
-    "print_delay_autoreturn"                    => "自動返回銷售延遲",
-    "print_delay_autoreturn_number"             => "自動返回銷售延遲是必填字段。",
-    "print_delay_autoreturn_required"           => "自動返回銷售延遲必須是一個數字。",
-    "print_footer"                              => "打印瀏覽器頁腳",
-    "print_header"                              => "打印瀏覽器標題",
-    "print_left_margin"                         => "左邊界",
-    "print_left_margin_number"                  => "左邊距必須是一個數字。",
-    "print_left_margin_required"                => "左邊距是必填字段。",
-    "print_receipt_check_behaviour"             => "打印收據複選框",
-    "print_receipt_check_behaviour_always"      => "始終檢查",
-    "print_receipt_check_behaviour_last"        => "記住上次選擇",
-    "print_receipt_check_behaviour_never"       => "始終未選中",
-    "print_right_margin"                        => "右邊界",
-    "print_right_margin_number"                 => "邊距右邊必須是一個數字。",
-    "print_right_margin_required"               => "右邊距是必填字段。",
-    "print_silently"                            => "顯示打印對話框",
-    "print_top_margin"                          => "上邊界",
-    "print_top_margin_number"                   => "邊距頂部必須是一個數字。",
-    "print_top_margin_required"                 => "邊距頂部是必填字段。",
-    "quantity_decimals"                         => "數量小數",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "默認報價註釋",
-    "receipt"                                   => "收據",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "收據打印設置",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "字體大小",
-    "receipt_font_size_number"                  => "字體大小必須是數字。",
-    "receipt_font_size_required"                => "字體大小是必填字段。",
-    "receipt_info"                              => "收據配置信息",
-    "receipt_printer"                           => "票據打印機",
-    "receipt_short"                             => "簡短",
-    "receipt_show_company_name"                 => "顯示公司名稱",
-    "receipt_show_description"                  => "顯示說明",
-    "receipt_show_serialnumber"                 => "顯示序列號",
-    "receipt_show_tax_ind"                      => "顯示稅收指標",
-    "receipt_show_taxes"                        => "顯示稅金",
-    "receipt_show_total_discount"               => "顯示總折扣",
-    "receipt_template"                          => "收據模板",
-    "receiving_calculate_average_price"         => "計算平均值價格（收貨）",
-    "recv_invoice_format"                       => "收據發票格式",
-    "register_mode_default"                     => "默認註冊模式",
-    "report_an_issue"                           => "問題回報",
-    "return_policy_required"                    => "退換貨政策為必填.",
-    "reward"                                    => "獎勵",
-    "reward_configuration"                      => "獎勵配置",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "銷售發票格式",
-    "sales_quote_format"                        => "銷售報價格式",
-    "saved_successfully"                        => "組態設置儲存成功.",
-    "saved_unsuccessfully"                      => "組態設置儲存失敗.",
-    "security_issue"                            => "安全漏洞警告",
-    "server_notice"                             => "請使用以下信息進行問題報告。",
-    "service_charge"                            => "",
-    "show_due_enable"                           => "",
-    "show_office_group"                         => "顯示辦公室圖標",
-    "statistics"                                => "Send statistics",
-    "statistics_tooltip"                        => "發送統計數據用於開發和功能改進目的。",
-    "stock_location"                            => "倉庫地址",
-    "stock_location_duplicate"                  => "庫存位置必須是唯一的。",
-    "stock_location_invalid_chars"              => "庫存位置不能包含“_”。",
-    "stock_location_required"                   => "庫存位置是必填字段。",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "第 1 欄",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "搜索建議佈局",
-    "suggestions_second_column"                 => "第 2 欄",
-    "suggestions_third_column"                  => "第 3 欄",
-    "system_conf"                               => "設置和配置",
-    "system_info"                               => "System Info",
-    "table"                                     => "桌子",
-    "table_configuration"                       => "表配置",
-    "takings_printer"                           => "Takings Printer",
-    "tax"                                       => "稅",
-    "tax_category"                              => "",
-    "tax_category_duplicate"                    => "",
-    "tax_category_invalid_chars"                => "",
-    "tax_category_required"                     => "",
-    "tax_category_used"                         => "",
-    "tax_configuration"                         => "",
-    "tax_decimals"                              => "稅收小數",
-    "tax_id"                                    => "",
-    "tax_included"                              => "含稅",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "",
-    "thousands_separator"                       => "千位分隔符",
-    "timezone"                                  => "時區",
-    "timezone_error"                            => "",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "",
-    "user_timezone"                             => "本地時區:",
-    "website"                                   => "網站",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "",
-    "work_order_format"                         => "",
+    'address'                                   => '公司地址',
+    'address_required'                          => '公司地址為必填.',
+    'all_set'                                   => '所有文件權限設置正確！',
+    'allow_duplicate_barcodes'                  => '允許重複的條碼',
+    'apostrophe'                                => '撇號',
+    'backup_button'                             => 'Backup',
+    'backup_database'                           => 'Backup Database',
+    'barcode'                                   => '條碼',
+    'barcode_company'                           => '公司名稱',
+    'barcode_configuration'                     => '條碼配置',
+    'barcode_content'                           => '條碼內容',
+    'barcode_first_row'                         => '第 1 行',
+    'barcode_font'                              => 'Font',
+    'barcode_formats'                           => '輸入格式',
+    'barcode_generate_if_empty'                 => '為空時生成.',
+    'barcode_height'                            => '高度（像素）',
+    'barcode_id'                                => 'Item Id/Name',
+    'barcode_info'                              => '條碼配置信息',
+    'barcode_layout'                            => '條碼佈局',
+    'barcode_name'                              => '客戶',
+    'barcode_number'                            => 'UPC/EAN/ISBN',
+    'barcode_number_in_row'                     => '行數',
+    'barcode_page_cellspacing'                  => '顯示頁面單元格間距.',
+    'barcode_page_width'                        => '顯示頁面寬度',
+    'barcode_price'                             => '價格',
+    'barcode_second_row'                        => 'Row 4',
+    'barcode_third_row'                         => 'Row 5',
+    'barcode_tooltip'                           => '警告：此功能可能會導致導入或創建重複項。如果您不想要重複的條形碼，請不要使用。',
+    'barcode_type'                              => '條碼類型',
+    'barcode_width'                             => '寬度（像素）',
+    'bottom'                                    => '底部',
+    'cash_button'                               => '',
+    'cash_button_1'                             => '',
+    'cash_button_2'                             => '',
+    'cash_button_3'                             => '',
+    'cash_button_4'                             => '',
+    'cash_button_5'                             => '',
+    'cash_button_6'                             => '',
+    'cash_decimals'                             => '現金小數',
+    'cash_decimals_tooltip'                     => '如果現金小數和貨幣小數相同，則不會發生現金觸發的四捨五入，除非現金四捨五入設置為五分之一。',
+    'cash_rounding'                             => '現金四捨五入',
+    'category_dropdown'                         => '下拉式顯示類別',
+    'center'                                    => '中心',
+    'change_apperance_tooltip'                  => '',
+    'comma'                                     => '逗號',
+    'company'                                   => '公司名稱',
+    'company_avatar'                            => '',
+    'company_change_image'                      => '更改圖像',
+    'company_logo'                              => '公司標誌',
+    'company_remove_image'                      => '刪除圖像',
+    'company_required'                          => '公司名稱為必填',
+    'company_select_image'                      => '選擇圖像',
+    'company_website_url'                       => '公司網址格式錯誤 (http://...).',
+    'country_codes'                             => '國家代碼',
+    'country_codes_tooltip'                     => '以逗號分隔的國家/地區代碼列表，用於提名地址查找。',
+    'currency_code'                             => '幣別代碼',
+    'currency_decimals'                         => '貨幣小數',
+    'currency_symbol'                           => '貨幣符號',
+    'current_employee_only'                     => '',
+    'customer_reward'                           => '報酬',
+    'customer_reward_duplicate'                 => '獎勵必須是唯一的。',
+    'customer_reward_enable'                    => '啟用客戶獎勵',
+    'customer_reward_invalid_chars'             => '獎勵不能包含“_”',
+    'customer_reward_required'                  => '獎勵是必填字段',
+    'customer_sales_tax_support'                => '',
+    'date_or_time_format'                       => '日期和時間過濾器',
+    'datetimeformat'                            => '日期時間格式',
+    'decimal_point'                             => '小數點位數',
+    'default_barcode_font_size_number'          => '默認條形碼字體大小必須是數字。',
+    'default_barcode_font_size_required'        => '默認條碼字體大小是必填字段。',
+    'default_barcode_height_number'             => '默認條碼高度必須是數字。',
+    'default_barcode_height_required'           => '默認條碼高度是必填字段。',
+    'default_barcode_num_in_row_number'         => '行中的默認條形碼編號必須是數字。',
+    'default_barcode_num_in_row_required'       => '行中的默認條形碼編號是必填字段。',
+    'default_barcode_page_cellspacing_number'   => '默認條碼頁 Cellspacing 必須是一個數字。',
+    'default_barcode_page_cellspacing_required' => '默認條碼頁單元格間距是必填字段。',
+    'default_barcode_page_width_number'         => '默認條形碼頁面寬度必須是數字。',
+    'default_barcode_page_width_required'       => '默認條碼頁面寬度為必填字段.',
+    'default_barcode_width_number'              => '默認條碼寬度必須是數字。',
+    'default_barcode_width_required'            => '默認條碼寬度是必填字段。',
+    'default_item_columns'                      => '默認可見項目列',
+    'default_origin_tax_code'                   => '默認原產地稅碼',
+    'default_receivings_discount'               => '默認收款折扣',
+    'default_receivings_discount_number'        => '默認收款折扣必須是一個數字。',
+    'default_receivings_discount_required'      => '默認收款折扣是必填字段。',
+    'default_sales_discount'                    => 'Default Sales Discount %',
+    'default_sales_discount_number'             => '默認銷售折扣必須是數字。',
+    'default_sales_discount_required'           => '默認銷售折扣是必填字段.',
+    'default_tax_category'                      => '默認稅種',
+    'default_tax_code'                          => '默認稅碼',
+    'default_tax_jurisdiction'                  => '默認稅收管轄權',
+    'default_tax_name_number'                   => '默認稅名必須是字符串。',
+    'default_tax_name_required'                 => 'The default tax name is a required field.',
+    'default_tax_rate'                          => '預設稅率 %',
+    'default_tax_rate_1'                        => '稅率 1',
+    'default_tax_rate_2'                        => '稅率 2',
+    'default_tax_rate_3'                        => '',
+    'default_tax_rate_number'                   => '預設稅率必需為數字.',
+    'default_tax_rate_required'                 => '預設稅率為必填.',
+    'derive_sale_quantity'                      => '允許派生銷售數量',
+    'derive_sale_quantity_tooltip'              => '如果選中，則將為按擴展金額訂購的商品提供新的商品類型',
+    'dinner_table'                              => '餐桌',
+    'dinner_table_duplicate'                    => '餐桌必須唯一.',
+    'dinner_table_enable'                       => '啟用餐桌',
+    'dinner_table_invalid_chars'                => "餐桌名稱不能包含 '_'.",
+    'dinner_table_required'                     => '餐桌是必填欄位.',
+    'dot'                                       => '點',
+    'email'                                     => '郵箱',
+    'email_configuration'                       => 'Email Configuration',
+    'email_mailpath'                            => '發送郵件的路徑',
+    'email_protocol'                            => 'Protocol',
+    'email_receipt_check_behaviour'             => '電子郵件收據複選框',
+    'email_receipt_check_behaviour_always'      => '始終檢查',
+    'email_receipt_check_behaviour_last'        => '記住上次選擇',
+    'email_receipt_check_behaviour_never'       => '始終未選中',
+    'email_smtp_crypto'                         => 'SMTP 加密',
+    'email_smtp_host'                           => 'SMTP Server',
+    'email_smtp_pass'                           => 'SMTP Password',
+    'email_smtp_port'                           => 'SMTP Port',
+    'email_smtp_timeout'                        => 'SMTP 逾時',
+    'email_smtp_user'                           => 'SMTP 用戶名',
+    'enable_avatar'                             => '',
+    'enable_avatar_tooltip'                     => '',
+    'enable_dropdown_tooltip'                   => '',
+    'enable_new_look'                           => '',
+    'enable_right_bar'                          => '',
+    'enable_right_bar_tooltip'                  => '',
+    'enforce_privacy'                           => '保護隱私',
+    'enforce_privacy_tooltip'                   => '保護客戶隱私，在他們的數據被刪除的情況下強制執行數據擾亂',
+    'fax'                                       => '傳真',
+    'file_perm'                                 => '檔案權限有問題，請修正後重刷網頁.',
+    'financial_year'                            => '財務年起始',
+    'financial_year_apr'                        => '4月1日',
+    'financial_year_aug'                        => '8月1日',
+    'financial_year_dec'                        => '12月1日',
+    'financial_year_feb'                        => '2月1日',
+    'financial_year_jan'                        => '1月1日',
+    'financial_year_jul'                        => '7月1日',
+    'financial_year_jun'                        => '6月1日',
+    'financial_year_mar'                        => '3月1日',
+    'financial_year_may'                        => '5月1日',
+    'financial_year_nov'                        => '11月1日',
+    'financial_year_oct'                        => '10月1日',
+    'financial_year_sep'                        => '9月1日',
+    'floating_labels'                           => '浮動標籤',
+    'gcaptcha_enable'                           => '登入檢核碼(reCAPTCHA)',
+    'gcaptcha_secret_key'                       => 'reCAPTCHA 密鑰',
+    'gcaptcha_secret_key_required'              => 'reCAPTCHA 密鑰是必填字段',
+    'gcaptcha_site_key'                         => 'reCAPTCHA 站點密鑰',
+    'gcaptcha_site_key_required'                => 'reCAPTCHA 站點密鑰是必填字段',
+    'gcaptcha_tooltip'                          => '登入使用Google reCAPTCHA保護，點選圖標進行 API key 配對.',
+    'general'                                   => '一般',
+    'general_configuration'                     => '一般設定',
+    'giftcard_number'                           => '禮物卡號碼',
+    'giftcard_random'                           => '亂數產生',
+    'giftcard_series'                           => '序列產生',
+    'image_allowed_file_types'                  => '允許圖檔類型',
+    'image_max_height_tooltip'                  => '上傳圖檔最大高度(px).',
+    'image_max_size_tooltip'                    => '上傳圖檔大小上限(kb).',
+    'image_max_width_tooltip'                   => '上傳圖檔最大寬度(px).',
+    'image_restrictions'                        => '上傳圖檔限制',
+    'include_hsn'                               => '包括對 HSN 代碼的支持',
+    'info'                                      => '儲存組態',
+    'info_configuration'                        => '儲存組態',
+    'input_groups'                              => '輸入組',
+    'integrations'                              => '整合',
+    'integrations_configuration'                => '第三方整合',
+    'invoice'                                   => '發票',
+    'invoice_configuration'                     => '發票打印設置',
+    'invoice_default_comments'                  => '默認發票註釋',
+    'invoice_email_message'                     => '發票電子郵件模板',
+    'invoice_enable'                            => '啟用發票',
+    'invoice_printer'                           => '發票打印機',
+    'invoice_type'                              => '發票類型',
+    'is_readable'                               => '可讀取但權限不正確，請設定為 640 或 660 後重整.',
+    'is_writable'                               => '可寫，但權限設置不正確。請將其設置為 750 並刷新。',
+    'item_markup'                               => '',
+    'jsprintsetup_required'                     => 'Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?',
+    'language'                                  => '語言',
+    'last_used_invoice_number'                  => '上次使用的發票編號',
+    'last_used_quote_number'                    => '上次使用的報價編號',
+    'last_used_work_order_number'               => '上次使用的 W / O 編號',
+    'left'                                      => '剩下',
+    'license'                                   => '許可証',
+    'license_configuration'                     => '許可聲明',
+    'line_sequence'                             => '行序',
+    'lines_per_page'                            => 'Lines Per Page',
+    'lines_per_page_number'                     => '每頁行數必須是數字。',
+    'lines_per_page_required'                   => '每頁行數是必填字段。',
+    'locale'                                    => 'Localisation',
+    'locale_configuration'                      => 'Localisation Configuration',
+    'locale_info'                               => 'Localisation Configuration Information',
+    'location'                                  => '庫存',
+    'location_configuration'                    => '庫存位置',
+    'location_info'                             => '位置配置信息',
+    'login_form'                                => '登錄表單樣式',
+    'logout'                                    => '是否要在註銷前進行備份？點擊【確定】進行備份，點擊【取消】退出。',
+    'mailchimp'                                 => '郵件黑猩猩',
+    'mailchimp_api_key'                         => '黑猩猩 API 密鑰',
+    'mailchimp_configuration'                   => '黑猩猩配置',
+    'mailchimp_key_successfully'                => 'API 密鑰有效。',
+    'mailchimp_key_unsuccessfully'              => '無效的 API 密鑰.',
+    'mailchimp_lists'                           => 'MailChimp 列表',
+    'mailchimp_tooltip'                         => '單擊 API 密鑰的圖標。',
+    'message'                                   => 'Message',
+    'message_configuration'                     => 'Message Configuration',
+    'msg_msg'                                   => '保存的短信',
+    'msg_msg_placeholder'                       => 'If you wish to use a SMS template save your message here. Otherwise leave the box blank.',
+    'msg_pwd'                                   => 'SMS-API Password',
+    'msg_src'                                   => 'SMS-API 發件人 ID',
+    'msg_src_required'                          => 'SMS-API 發件人 ID 是必填字段',
+    'msg_uid'                                   => 'SMS-API 用戶名',
+    'msg_uid_required'                          => 'SMS-API 用戶名是必填字段',
+    'multi_pack_enabled'                        => '每件物品多個包裹',
+    'no_risk'                                   => '沒有安全/漏洞風險。',
+    'none'                                      => 'none',
+    'notify_alignment'                          => '通知彈出位置',
+    'number_format'                             => 'Number Format',
+    'number_locale'                             => 'Localisation',
+    'number_locale_invalid'                     => '輸入的區域設置無效。檢查工具提示中的鏈接以查找有效的語言環境。',
+    'number_locale_required'                    => '數字語言是必填字段。',
+    'number_locale_tooltip'                     => '通過此鏈接找到合適的語言環境。',
+    'os_timezone'                               => 'OSPOS 時區：',
+    'ospos_info'                                => 'OSPOS 安裝信息',
+    'payment_options_order'                     => '付款選項訂單',
+    'payment_reference_code_length_limits'      => '付款參考代碼<br>長度限制',
+    'payment_reference_code_length_max_label'   => '最大',
+    'payment_reference_code_length_min_label'   => '最小',
+    'perm_risk'                                 => '不正確的權限使該軟件面臨風險。',
+    'phone'                                     => '電話',
+    'phone_required'                            => '公司電話為必填.',
+    'print_bottom_margin'                       => '保證金底部',
+    'print_bottom_margin_number'                => '底部邊距必須是數字。',
+    'print_bottom_margin_required'              => '底部邊距是必填字段。',
+    'print_delay_autoreturn'                    => '自動返回銷售延遲',
+    'print_delay_autoreturn_number'             => '自動返回銷售延遲是必填字段。',
+    'print_delay_autoreturn_required'           => '自動返回銷售延遲必須是一個數字。',
+    'print_footer'                              => '打印瀏覽器頁腳',
+    'print_header'                              => '打印瀏覽器標題',
+    'print_left_margin'                         => '左邊界',
+    'print_left_margin_number'                  => '左邊距必須是一個數字。',
+    'print_left_margin_required'                => '左邊距是必填字段。',
+    'print_receipt_check_behaviour'             => '打印收據複選框',
+    'print_receipt_check_behaviour_always'      => '始終檢查',
+    'print_receipt_check_behaviour_last'        => '記住上次選擇',
+    'print_receipt_check_behaviour_never'       => '始終未選中',
+    'print_right_margin'                        => '右邊界',
+    'print_right_margin_number'                 => '邊距右邊必須是一個數字。',
+    'print_right_margin_required'               => '右邊距是必填字段。',
+    'print_silently'                            => '顯示打印對話框',
+    'print_top_margin'                          => '上邊界',
+    'print_top_margin_number'                   => '邊距頂部必須是一個數字。',
+    'print_top_margin_required'                 => '邊距頂部是必填字段。',
+    'quantity_decimals'                         => '數量小數',
+    'quick_cash_enable'                         => '',
+    'quote_default_comments'                    => '默認報價註釋',
+    'receipt'                                   => '收據',
+    'receipt_category'                          => '',
+    'receipt_configuration'                     => '收據打印設置',
+    'receipt_default'                           => 'Default',
+    'receipt_font_size'                         => '字體大小',
+    'receipt_font_size_number'                  => '字體大小必須是數字。',
+    'receipt_font_size_required'                => '字體大小是必填字段。',
+    'receipt_info'                              => '收據配置信息',
+    'receipt_printer'                           => '票據打印機',
+    'receipt_short'                             => '簡短',
+    'receipt_show_company_name'                 => '顯示公司名稱',
+    'receipt_show_description'                  => '顯示說明',
+    'receipt_show_serialnumber'                 => '顯示序列號',
+    'receipt_show_tax_ind'                      => '顯示稅收指標',
+    'receipt_show_taxes'                        => '顯示稅金',
+    'receipt_show_total_discount'               => '顯示總折扣',
+    'receipt_template'                          => '收據模板',
+    'receiving_calculate_average_price'         => '計算平均值價格（收貨）',
+    'recv_invoice_format'                       => '收據發票格式',
+    'register_mode_default'                     => '默認註冊模式',
+    'report_an_issue'                           => '問題回報',
+    'return_policy_required'                    => '退換貨政策為必填.',
+    'reward'                                    => '獎勵',
+    'reward_configuration'                      => '獎勵配置',
+    'right'                                     => 'Right',
+    'sales_invoice_format'                      => '銷售發票格式',
+    'sales_quote_format'                        => '銷售報價格式',
+    'mailpath_invalid'                          => '無效的 sendmail 路徑。僅允許字母、數字、連字號、底線、正斜線、反斜線、冒號、空格和句點。',
+    'saved_successfully'                        => '組態設置儲存成功.',
+    'saved_unsuccessfully'                      => '組態設置儲存失敗.',
+    'security_issue'                            => '安全漏洞警告',
+    'server_notice'                             => '請使用以下信息進行問題報告。',
+    'service_charge'                            => '',
+    'show_due_enable'                           => '',
+    'show_office_group'                         => '顯示辦公室圖標',
+    'statistics'                                => 'Send statistics',
+    'statistics_tooltip'                        => '發送統計數據用於開發和功能改進目的。',
+    'stock_location'                            => '倉庫地址',
+    'stock_location_duplicate'                  => '庫存位置必須是唯一的。',
+    'stock_location_invalid_chars'              => '庫存位置不能包含“_”。',
+    'stock_location_required'                   => '庫存位置是必填字段。',
+    'suggestions_fifth_column'                  => '',
+    'suggestions_first_column'                  => '第 1 欄',
+    'suggestions_fourth_column'                 => '',
+    'suggestions_layout'                        => '搜索建議佈局',
+    'suggestions_second_column'                 => '第 2 欄',
+    'suggestions_third_column'                  => '第 3 欄',
+    'system_conf'                               => '設置和配置',
+    'system_info'                               => 'System Info',
+    'table'                                     => '桌子',
+    'table_configuration'                       => '表配置',
+    'takings_printer'                           => 'Takings Printer',
+    'tax'                                       => '稅',
+    'tax_category'                              => '',
+    'tax_category_duplicate'                    => '',
+    'tax_category_invalid_chars'                => '',
+    'tax_category_required'                     => '',
+    'tax_category_used'                         => '',
+    'tax_configuration'                         => '',
+    'tax_decimals'                              => '稅收小數',
+    'tax_id'                                    => '',
+    'tax_included'                              => '含稅',
+    'theme'                                     => 'Theme',
+    'theme_preview'                             => '',
+    'thousands_separator'                       => '千位分隔符',
+    'timezone'                                  => '時區',
+    'timezone_error'                            => '',
+    'top'                                       => 'Top',
+    'use_destination_based_tax'                 => '',
+    'user_timezone'                             => '本地時區:',
+    'website'                                   => '網站',
+    'wholesale_markup'                          => '',
+    'work_order_enable'                         => '',
+    'work_order_format'                         => '',
 ];
diff --git a/app/Language/zh-Hant/Employees.php b/app/Language/zh-Hant/Employees.php
index 9bffdf8ad..e20ca0257 100644
--- a/app/Language/zh-Hant/Employees.php
+++ b/app/Language/zh-Hant/Employees.php
@@ -1,47 +1,50 @@
 <?php
 
 return [
-    "administrator"                => "",
-    "basic_information"            => "員工基本資料",
-    "cannot_be_deleted"            => "無法刪除選定的僱員，選定的員工中已有銷售紀錄或你正在試圖刪除自己.",
-    "change_employee"              => "",
-    "change_password"              => "更改密碼",
-    "clerk"                        => "",
-    "commission"                   => "",
-    "confirm_delete"               => "你確定要刪除所選的員工嗎？",
-    "confirm_restore"              => "您確定要還原所選員工嗎？",
-    "current_password"             => "當前密碼",
-    "current_password_invalid"     => "當前密碼無效。",
-    "employee"                     => "員工",
-    "error_adding_updating"        => "添加/更新員工錯誤.",
-    "error_deleting_admin"         => "",
-    "error_updating_admin"         => "",
-    "error_deleting_demo_admin"    => "您不能刪除admin用戶.",
-    "error_updating_demo_admin"    => "您不能更改admin用戶.",
-    "language"                     => "語言",
-    "login_info"                   => "員工登錄資料",
-    "manager"                      => "",
-    "new"                          => "新員工",
-    "none_selected"                => "您還沒有選擇任何員工進行刪除.",
-    "one_or_multiple"              => "員工",
-    "password"                     => "密碼",
-    "password_minlength"           => "密碼需為八個字元以上.",
-    "password_must_match"          => "密碼與確認密碼不一致.",
-    "password_not_must_match"      => "當前密碼和新密碼一致。",
-    "password_required"            => "請輸入密碼.",
-    "permission_desc"              => "勾選後授予使用該模組功能.",
-    "permission_info"              => "員工權限",
-    "repeat_password"              => "確認密碼",
-    "subpermission_required"       => "為每個模塊添加至少一項撥款.",
-    "successful_adding"            => "新增員工資料成功.",
-    "successful_change_password"   => "密碼更改成功。",
-    "successful_deleted"           => "成功刪除員工資料",
-    "successful_updating"          => "成功更新員工資料",
-    "system_language"              => "系統語言",
-    "unsuccessful_change_password" => "密碼更改失敗。",
-    "update"                       => "更新員工",
-    "username"                     => "帳號",
-    "username_duplicate"           => "",
-    "username_minlength"           => "帳號必需為五個字元以上.",
-    "username_required"            => "帳號為必填.",
+    'administrator'                          => '',
+    'basic_information'                      => '員工基本資料',
+    'cannot_be_deleted'                      => '無法刪除選定的僱員，選定的員工中已有銷售紀錄或你正在試圖刪除自己.',
+    'change_employee'                        => '',
+    'change_password'                        => '更改密碼',
+    'clerk'                                  => '',
+    'commission'                             => '',
+    'confirm_delete'                         => '你確定要刪除所選的員工嗎？',
+    'confirm_restore'                        => '您確定要還原所選員工嗎？',
+    'current_password'                       => '當前密碼',
+    'current_password_invalid'               => '當前密碼無效。',
+    'employee'                               => '員工',
+    'error_adding_updating'                  => '添加/更新員工錯誤.',
+    'error_cannot_remove_own_minimum_grant'  => '您不能移除自己的最低模組存取權限。',
+    'error_deleting_admin'                   => '',
+    'error_deleting_demo_admin'              => '您不能刪除admin用戶.',
+    'error_grant_change_disallowed'          => '演示中禁用了權限更改。',
+    'error_password_change_disallowed'       => '演示中禁用了密碼更改。',
+    'error_updating_admin'                   => '',
+    'error_updating_demo_admin'              => '您不能更改admin用戶.',
+    'language'                               => '語言',
+    'login_info'                             => '員工登錄資料',
+    'manager'                                => '',
+    'new'                                    => '新員工',
+    'none_selected'                          => '您還沒有選擇任何員工進行刪除.',
+    'one_or_multiple'                        => '員工',
+    'password'                               => '密碼',
+    'password_minlength'                     => '密碼需為八個字元以上.',
+    'password_must_match'                    => '密碼與確認密碼不一致.',
+    'password_not_must_match'                => '當前密碼和新密碼一致。',
+    'password_required'                      => '請輸入密碼.',
+    'permission_desc'                        => '勾選後授予使用該模組功能.',
+    'permission_info'                        => '員工權限',
+    'repeat_password'                        => '確認密碼',
+    'subpermission_required'                 => '為每個模塊添加至少一項撥款.',
+    'successful_adding'                      => '新增員工資料成功.',
+    'successful_change_password'             => '密碼更改成功。',
+    'successful_deleted'                     => '成功刪除員工資料',
+    'successful_updating'                    => '成功更新員工資料',
+    'system_language'                        => '系統語言',
+    'unsuccessful_change_password'           => '密碼更改失敗。',
+    'update'                                 => '更新員工',
+    'username'                               => '帳號',
+    'username_duplicate'                     => '',
+    'username_minlength'                     => '帳號必需為五個字元以上.',
+    'username_required'                      => '帳號為必填.',
 ];
diff --git a/app/Language/zh-Hant/Error.php b/app/Language/zh-Hant/Error.php
index 78e324b5b..e0a9cff26 100644
--- a/app/Language/zh-Hant/Error.php
+++ b/app/Language/zh-Hant/Error.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
-    "no_permission_module" => "您沒有權限使用模組",
-    "unknown"              => "發生未知的錯誤",
+    'no_permission_module'           => '您沒有權限使用模組',
+    'unable_to_create_env_file'      => '無法建立 {filePath} 以設定 throttle.key',
+    'unable_to_lock_file'            => '無法鎖定 {filePath}：{reason}',
+    'unable_to_open_lock_file'       => '無法開啟 {filePath}：{reason}',
+    'unable_to_persist_throttle_key' => '無法將 throttle.key 儲存至 {filePath}',
+    'unable_to_persist_encryption_key' => '',
+    'encryption_key_not_provisioned' => '',
+    'throttle_key_not_provisioned' => '',
+    'unable_to_read_env_file'        => '無法讀取 {filePath} 以設定 throttle.key',
+    'unknown'                        => '發生未知的錯誤',
 ];
diff --git a/app/Language/zh-Hant/Items.php b/app/Language/zh-Hant/Items.php
index b214ca34e..8cd3389ec 100644
--- a/app/Language/zh-Hant/Items.php
+++ b/app/Language/zh-Hant/Items.php
@@ -1,122 +1,124 @@
 <?php
 
 return [
-    "add_minus"                          => "增/減庫存.",
-    "allow_alt_description"              => "允許ALT描述",
-    "amount_entry"                       => "金額輸入",
-    "bulk_edit"                          => "批次編輯",
-    "buy_price_required"                 => "進貨價為必填欄位.",
-    "cannot_be_deleted"                  => "無法刪除選定產品，所選產品中的一個或多個有銷售紀綠。",
-    "cannot_find_item"                   => "無法找到任何有關的產品.",
-    "categories"                         => "",
-    "category"                           => "類別",
-    "category_new"                       => "",
-    "category_required"                  => "類別為必填欄位.",
-    "change_all_to_allow_alt_desc"       => "充許全部ALT倒序.",
-    "change_all_to_not_allow_allow_desc" => "不允許全部ALT倒序.",
-    "change_all_to_serialized"           => "全部更改序號至序列化",
-    "change_all_to_unserialized"         => "全部更改序號至非序列化",
-    "change_image"                       => "更改圖像",
-    "confirm_bulk_edit"                  => "您確定您要編輯的所有選定的產品嗎？",
-    "confirm_bulk_edit_wipe_taxes"       => "所有項目稅信息將被替換。",
-    "confirm_delete"                     => "你確定你要刪除選定的產品嗎？",
-    "confirm_restore"                    => "您確定要恢復所選項目嗎？",
-    "cost_price"                         => "成本價",
-    "cost_price_number"                  => "成本價必需是數值.",
-    "cost_price_required"                => "成本價為必填攔位.",
-    "count"                              => "更新庫存",
-    "csv_import_failed"                  => "CSV匯入失敗",
-    "csv_import_invalid_location"        => "",
-    "csv_import_nodata_wrongformat"      => "上傳的 CSV 文件沒有數據或格式不正確。",
-    "csv_import_partially_failed"        => "線上有 {0} 個項目導入失敗：{1}。未導入任何行。",
-    "csv_import_success"                 => "項目 CSV 導入成功。",
-    "current_quantity"                   => "當前數量",
-    "default_pack_name"                  => "每個",
-    "description"                        => "描述",
-    "details_count"                      => "庫存盤點詳情",
-    "do_nothing"                         => "沒有執行任何修改",
-    "edit"                               => "",
-    "edit_fields_you_want_to_update"     => "編輯您選定產品的所有欄位.",
-    "edit_multiple_items"                => "編輯多項產品",
-    "empty_upc_items"                    => "Empty UPC Items",
-    "error_adding_updating"              => "新增/更新產品錯誤",
-    "error_updating_multiple"            => "更新產品錯誤",
-    "generate_barcodes"                  => "產生條碼",
-    "hsn_code"                           => "協調系統命名法",
-    "image"                              => "Avatar",
-    "import_items_csv"                   => "Import items from CSV sheet",
-    "info_provided_by"                   => "訊息提供者",
-    "inventory"                          => "庫存",
-    "inventory_CSV_import_quantity"      => "從 CSV 導入的數量",
-    "inventory_comments"                 => "評論",
-    "inventory_data_tracking"            => "庫存數據跟踪",
-    "inventory_date"                     => "日期",
-    "inventory_employee"                 => "員工",
-    "inventory_in_out_quantity"          => "進/出數量",
-    "inventory_remarks"                  => "評論",
-    "is_deleted"                         => "已刪除",
-    "is_printed"                         => "",
-    "is_serialized"                      => "產品有序號",
-    "item"                               => "產品",
-    "item_id"                            => "",
-    "item_number"                        => "UPC/EAN/ISBN",
-    "item_number_duplicate"              => "項目編號已存在於數據庫中。",
-    "kit"                                => "成套工具",
-    "location"                           => "位置",
-    "low_inventory_items"                => "低庫存產品",
-    "low_sell_item"                      => "低價商品",
-    "manually_editing_of_quantity"       => "手動編輯數量",
-    "markup"                             => "",
-    "name"                               => "產品名稱",
-    "name_required"                      => "產品名稱為必填.",
-    "new"                                => "新增產品",
-    "no_description_items"               => "產品沒有說明",
-    "no_items_to_display"                => "沒有產品可以顯示.",
-    "none"                               => "無",
-    "none_selected"                      => "您還沒有選擇任何產品進行編輯",
-    "nonstock"                           => "無庫存",
-    "number_information"                 => "產品編號",
-    "number_required"                    => "條形碼是必填字段。",
-    "one_or_multiple"                    => "產品",
-    "pack_name"                          => "包裝名稱",
-    "qty_per_pack"                       => "每包數量",
-    "quantity"                           => "數量",
-    "quantity_number"                    => "數量必需是數值.",
-    "quantity_required"                  => "數量為必填欄位.",
-    "receiving_quantity"                 => "Receiving quantity",
-    "remove_image"                       => "刪除圖像",
-    "reorder_level"                      => "補貨點",
-    "reorder_level_number"               => "補貨點必需是數值.",
-    "reorder_level_required"             => "補貨點為必填欄位.",
-    "retrive_item_info"                  => "檢索產品訊息",
-    "sales_tax_1"                        => "營業稅",
-    "sales_tax_2"                        => "營業稅 2",
-    "search_attributes"                  => "Search Custom Fields",
-    "select_image"                       => "選擇圖像",
-    "serialized_items"                   => "序列化產品",
-    "standard"                           => "標準",
-    "stock"                              => "庫存",
-    "stock_location"                     => "倉庫地址",
-    "stock_type"                         => "股票類型",
-    "successful_adding"                  => "已成功新增產品",
-    "successful_bulk_edit"               => "您已成功更新所選產品",
-    "successful_deleted"                 => "刪除成功",
-    "successful_updating"                => "已成功更新產品",
-    "supplier"                           => "供貨商",
-    "tax_1"                              => "稅額 1",
-    "tax_2"                              => "稅額 2",
-    "tax_3"                              => "",
-    "tax_category"                       => "稅種",
-    "tax_percent"                        => "稅率",
-    "tax_percent_number"                 => "稅收百分比必須是數值",
-    "tax_percent_required"               => "稅率為必填欄位.",
-    "tax_percents"                       => "稅率 %",
-    "temp"                               => "臨時",
-    "type"                               => "物品種類",
-    "unit_price"                         => "單價",
-    "unit_price_number"                  => "單價必需是數值.",
-    "unit_price_required"                => "單價為必填欄位.",
-    "upc_database"                       => "UPC Database",
-    "update"                             => "更新產品",
-    "use_inventory_menu"                 => "使用庫存清單",
+    'add_minus'                          => '增/減庫存.',
+    'allow_alt_description'              => '允許ALT描述',
+    'amount_entry'                       => '金額輸入',
+    'bulk_edit'                          => '批次編輯',
+    'buy_price_required'                 => '進貨價為必填欄位.',
+    'cannot_be_deleted'                  => '無法刪除選定產品，所選產品中的一個或多個有銷售紀綠。',
+    'cannot_find_item'                   => '無法找到任何有關的產品.',
+    'categories'                         => '',
+    'category'                           => '類別',
+    'category_new'                       => '',
+    'category_required'                  => '類別為必填欄位.',
+    'change_all_to_allow_alt_desc'       => '充許全部ALT倒序.',
+    'change_all_to_not_allow_allow_desc' => '不允許全部ALT倒序.',
+    'change_all_to_serialized'           => '全部更改序號至序列化',
+    'change_all_to_unserialized'         => '全部更改序號至非序列化',
+    'change_image'                       => '更改圖像',
+    'confirm_bulk_edit'                  => '您確定您要編輯的所有選定的產品嗎？',
+    'confirm_bulk_edit_wipe_taxes'       => '所有項目稅信息將被替換。',
+    'confirm_delete'                     => '你確定你要刪除選定的產品嗎？',
+    'confirm_restore'                    => '您確定要恢復所選項目嗎？',
+    'cost_price'                         => '成本價',
+    'cost_price_number'                  => '成本價必需是數值.',
+    'cost_price_required'                => '成本價為必填攔位.',
+    'count'                              => '更新庫存',
+    'csv_import_failed'                  => 'CSV匯入失敗',
+    'csv_import_invalid_location'        => '',
+    'csv_import_nodata_wrongformat'      => '上傳的 CSV 文件沒有數據或格式不正確。',
+    'csv_import_partially_failed'        => '線上有 {0} 個項目導入失敗：{1}。未導入任何行。',
+    'csv_import_success'                 => '項目 CSV 導入成功。',
+    'current_quantity'                   => '當前數量',
+    'default_pack_name'                  => '每個',
+    'description'                        => '描述',
+    'details_count'                      => '庫存盤點詳情',
+    'do_nothing'                         => '沒有執行任何修改',
+    'edit'                               => '',
+    'edit_fields_you_want_to_update'     => '編輯您選定產品的所有欄位.',
+    'edit_multiple_items'                => '編輯多項產品',
+    'empty_upc_items'                    => 'Empty UPC Items',
+    'error_adding_updating'              => '新增/更新產品錯誤',
+    'error_updating_multiple'            => '更新產品錯誤',
+    'generate_barcodes'                  => '產生條碼',
+    'hsn_code'                           => '協調系統命名法',
+    'image'                              => 'Avatar',
+    'import_items_csv'                   => 'Import items from CSV sheet',
+    'info_provided_by'                   => '訊息提供者',
+    'inventory'                          => '庫存',
+    'inventory_CSV_import_quantity'      => '從 CSV 導入的數量',
+    'inventory_comments'                 => '評論',
+    'inventory_data_tracking'            => '庫存數據跟踪',
+    'inventory_date'                     => '日期',
+    'inventory_employee'                 => '員工',
+    'inventory_in_out_quantity'          => '進/出數量',
+    'inventory_remarks'                  => '評論',
+    'is_deleted'                         => '已刪除',
+    'is_printed'                         => '',
+    'is_serialized'                      => '產品有序號',
+    'item'                               => '產品',
+    'item_id'                            => '',
+    'item_number'                        => 'UPC/EAN/ISBN',
+    'item_number_duplicate'              => '項目編號已存在於數據庫中。',
+    'item_number_invalid'                => '項目編號包含不允許的字符。',
+    'kit'                                => '成套工具',
+    'location'                           => '位置',
+    'low_inventory_items'                => '低庫存產品',
+    'low_sell_item'                      => '低價商品',
+    'manually_editing_of_quantity'       => '手動編輯數量',
+    'markup'                             => '',
+    'name'                               => '產品名稱',
+    'name_required'                      => '產品名稱為必填.',
+    'new'                                => '新增產品',
+    'no_description_items'               => '產品沒有說明',
+    'no_items_to_display'                => '沒有產品可以顯示.',
+    'none'                               => '無',
+    'none_selected'                      => '您還沒有選擇任何產品進行編輯',
+    'nonstock'                           => '無庫存',
+    'number_information'                 => '產品編號',
+    'number_required'                    => '條形碼是必填字段。',
+    'one_or_multiple'                    => '產品',
+    'pack_name'                          => '包裝名稱',
+    'qty_per_pack'                       => '每包數量',
+    'quantity'                           => '數量',
+    'quantity_number'                    => '數量必需是數值.',
+    'quantity_required'                  => '數量為必填欄位.',
+    'receiving_quantity'                 => 'Receiving quantity',
+    'remove_image'                       => '刪除圖像',
+    'reorder_level'                      => '補貨點',
+    'reorder_level_number'               => '補貨點必需是數值.',
+    'reorder_level_required'             => '補貨點為必填欄位.',
+    'retrive_item_info'                  => '檢索產品訊息',
+    'sales_tax_1'                        => '營業稅',
+    'sales_tax_2'                        => '營業稅 2',
+    'search_attributes'                  => 'Search Custom Fields',
+    'select_image'                       => '選擇圖像',
+    'serialized_items'                   => '序列化產品',
+    'standard'                           => '標準',
+    'stock'                              => '庫存',
+    'stock_location'                     => '倉庫地址',
+    'stock_type'                         => '股票類型',
+    'successful_adding'                  => '已成功新增產品',
+    'successful_bulk_edit'               => '您已成功更新所選產品',
+    'successful_deleted'                 => '刪除成功',
+    'successful_updating'                => '已成功更新產品',
+    'supplier'                           => '供貨商',
+    'tax_1'                              => '稅額 1',
+    'tax_2'                              => '稅額 2',
+    'tax_3'                              => '',
+    'tax_category'                       => '稅種',
+    'tax_name_invalid'                   => '稅項名稱包含不允許的字元。',
+    'tax_percent'                        => '稅率',
+    'tax_percent_number'                 => '稅收百分比必須是數值',
+    'tax_percent_required'               => '稅率為必填欄位.',
+    'tax_percents'                       => '稅率 %',
+    'temp'                               => '臨時',
+    'type'                               => '物品種類',
+    'unit_price'                         => '單價',
+    'unit_price_number'                  => '單價必需是數值.',
+    'unit_price_required'                => '單價為必填欄位.',
+    'upc_database'                       => 'UPC Database',
+    'update'                             => '更新產品',
+    'use_inventory_menu'                 => '使用庫存清單',
 ];
diff --git a/app/Language/zh-Hant/Login.php b/app/Language/zh-Hant/Login.php
index eb0264ca0..dc77b0c80 100644
--- a/app/Language/zh-Hant/Login.php
+++ b/app/Language/zh-Hant/Login.php
@@ -1,16 +1,31 @@
 <?php
 
 return [
-    "gcaptcha"                      => "我不是機器人。",
-    "go"                            => "登入",
-    "invalid_gcaptcha"              => "請確認您不是機器人。",
-    "invalid_installation"          => "安裝不正確，請檢查您的php.ini文件。",
-    "invalid_username_and_password" => "帳號或密碼錯誤。",
-    "login"                         => "登入",
-    "logout"                        => "登出",
-    "migration_needed"              => "登錄後將開始向 {0} 的數據庫遷移。",
-    "password"                      => "密碼",
-    "required_username"             => "",
-    "username"                      => "帳號",
-    "welcome"                       => "歡迎來到 {0}！",
+    "gcaptcha"                            => "我不是機器人。",
+    "go"                                  => "登入",
+    "initialization_message"              => "",
+    "initialization_required"             => "",
+    "initialize"                          => "",
+    "invalid_gcaptcha"                    => "請確認您不是機器人。",
+    "invalid_installation"                => "安裝不正確，請檢查您的php.ini文件。",
+    "invalid_username_and_password"       => "帳號或密碼錯誤。",
+    "login"                               => "登入",
+    "logout"                              => "登出",
+    "migrating_database"                  => "正在遷移資料庫",
+    "migration_auth_message"              => "",
+    "migration_complete"                  => "",
+    "migration_complete_login"            => "",
+    "migration_complete_migrate"          => "資料庫遷移成功！",
+    "migration_complete_redirect"         => "",
+    "migration_error_connection"          => "",
+    "migration_failed"                    => "",
+    "migration_initializing"              => "",
+    "migration_needed"                    => "登錄後將開始向 {0} 的數據庫遷移。",
+    "migration_required"                  => "",
+    "migration_running"                   => "",
+    "password"                            => "密碼",
+    "required_username"                   => "",
+    'too_many_attempts'                   => '嘗試次數過多。請稍候片刻後再試一次。',
+    "username"                            => "帳號",
+    "welcome"                             => "歡迎來到 {0}！"
 ];
diff --git a/app/Language/zh-Hant/Reports.php b/app/Language/zh-Hant/Reports.php
index 3df510f36..da361338e 100644
--- a/app/Language/zh-Hant/Reports.php
+++ b/app/Language/zh-Hant/Reports.php
@@ -128,6 +128,7 @@ return [
     "tax_rate"                                => "稅率",
     "taxes"                                   => "稅額",
     "taxes_summary_report"                    => "稅金摘要報告",
+    "toggle_cost_and_profit"                  => "",
     "total"                                   => "總計",
     "total_inventory_value"                   => "總庫存價值",
     "total_low_sell_quantity"                 => "總低銷售量",
diff --git a/app/Language/zh-Hant/Sales.php b/app/Language/zh-Hant/Sales.php
index cb1af0dfb..986dd69e8 100644
--- a/app/Language/zh-Hant/Sales.php
+++ b/app/Language/zh-Hant/Sales.php
@@ -1,225 +1,239 @@
 <?php
 
 return [
-    "customers_available_points"       => "現有積分",
-    "rewards_package"                  => "獎賞",
-    "rewards_remaining_balance"        => "剩餘獎賞積分 ",
-    "account_number"                   => "帳戶 #",
-    "add_payment"                      => "新增付款",
-    "amount_due"                       => "商品金額",
-    "amount_tendered"                  => "已收帳款",
-    "authorized_signature"             => "授權簽名",
-    "cancel_sale"                      => "取消銷售",
-    "cash"                             => "現金",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "現金調整",
-    "cash_deposit"                     => "已預付金額",
-    "cash_filter"                      => "現金",
-    "change_due"                       => "更改到期日",
-    "change_price"                     => "更改售價",
-    "check"                            => "支票",
-    "check_balance"                    => "查看餘額",
-    "check_filter"                     => "查看選項",
-    "close"                            => "",
-    "comment"                          => "評論",
-    "comments"                         => "評論",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "完成銷售",
-    "confirm_cancel_sale"              => "你確定要清除此筆銷售單？本單內的所有產品將被清除。",
-    "confirm_delete"                   => "你確定要清除此銷售產品？",
-    "confirm_restore"                  => "你確定要回復此銷售產品？",
-    "credit"                           => "信用卡",
-    "credit_deposit"                   => "預付卡",
-    "credit_filter"                    => "信用卡",
-    "current_table"                    => "",
-    "customer"                         => "客戶",
-    "customer_address"                 => "客戶地址",
-    "customer_discount"                => "折扣",
-    "customer_email"                   => "客戶電郵地址",
-    "customer_location"                => "客戶所在地",
-    "customer_mailchimp_status"        => "MailChimp電子報行銷狀態",
-    "customer_optional"                => "到期付款需要",
-    "customer_required"                => "必需",
-    "customer_total"                   => "總數",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "日期",
-    "date_range"                       => "日期範圍",
-    "date_required"                    => "必需填上正確的日期.",
-    "date_type"                        => "必需填寫日期.",
-    "debit"                            => "簽帳卡",
-    "debit_filter"                     => "",
-    "delete"                           => "確認刪除",
-    "delete_confirmation"              => "你確定要刪除此銷售資料，這個動作不能還原.",
-    "delete_entire_sale"               => "刪除全部銷售資料",
-    "delete_successful"                => "您已成功刪除銷售資料.",
-    "delete_unsuccessful"              => "銷售資料刪除失敗.",
-    "description_abbrv"                => "倒序.",
-    "discard"                          => "放棄",
-    "discard_quote"                    => "",
-    "discount"                         => "折扣 %",
-    "discount_included"                => "% 折扣",
-    "discount_short"                   => "%",
-    "due"                              => "由",
-    "due_filter"                       => "由...選項",
-    "edit"                             => "編輯",
-    "edit_item"                        => "編輯產品",
-    "edit_sale"                        => "編輯銷售資料",
-    "email_receipt"                    => "Email 銷售單",
-    "employee"                         => "員工",
-    "entry"                            => "加入項目",
-    "error_editing_item"               => "編輯產品錯誤",
-    "find_or_scan_item"                => "查找/掃描商品",
-    "find_or_scan_item_or_receipt"     => "查找/掃描產品或收貨單",
-    "giftcard"                         => "禮金券",
-    "giftcard_balance"                 => "䄠金劵餘額",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "禮金券編號",
-    "group_by_category"                => "以類別分類",
-    "group_by_type"                    => "以類型分類",
-    "hsn"                              => "HSN",
-    "id"                               => "銷售編號",
-    "include_prices"                   => "包括價格？",
-    "invoice"                          => "發票",
-    "invoice_confirm"                  => "已傳送發票到",
-    "invoice_enable"                   => "建立發票",
-    "invoice_filter"                   => "發票選項",
-    "invoice_no_email"                 => "此客戶沒有正確的電郵地址.",
-    "invoice_number"                   => "發票編號#",
-    "invoice_number_duplicate"         => "重覆的發票號碼.",
-    "invoice_sent"                     => "發票已發送到",
-    "invoice_total"                    => "帳單總額",
-    "invoice_type_custom_invoice"      => "自定義發票",
-    "invoice_type_custom_tax_invoice"  => "自定義稅務發票",
-    "invoice_type_invoice"             => "發票",
-    "invoice_type_tax_invoice"         => "稅務發票",
-    "invoice_unsent"                   => "發票傳送失敗",
-    "invoice_update"                   => "重新清點",
-    "item_insufficient_of_stock"       => "產品庫存不足.",
-    "item_name"                        => "產品名稱",
-    "item_number"                      => "產品 #",
-    "item_out_of_stock"                => "產品缺貨.",
-    "key_browser"                      => "",
-    "key_cancel"                       => "取消目前詢價/收據/銷售",
-    "key_customer_search"              => "搜尋顧客",
-    "key_finish_quote"                 => "完成詢價/收據 尚未付款",
-    "key_finish_sale"                  => "增加付款及完成收據/販售",
-    "key_full"                         => "",
-    "key_function"                     => "功能",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "",
-    "key_restore"                      => "",
-    "key_search"                       => "",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "登記模式",
-    "must_enter_numeric"               => "已收帳款必須輸入數值.",
-    "must_enter_numeric_giftcard"      => "禮金券編號必須輸入數值.",
-    "new_customer"                     => "新客戶",
-    "new_item"                         => "新增產品",
-    "no_description"                   => "沒有描述",
-    "no_filter"                        => "全部",
-    "no_items_in_cart"                 => "購物車中沒有任何產品.",
-    "no_sales_to_display"              => "沒有任何紀錄.",
-    "none_selected"                    => "您還沒有選擇任何產品進行編輯.",
-    "nontaxed_ind"                     => " . ",
-    "not_authorized"                   => "此操作未經授權.",
-    "one_or_multiple"                  => "銷售",
-    "payment"                          => "付款方式",
-    "payment_amount"                   => "總額",
-    "payment_not_cover_total"          => "付款金額不足.",
-    "payment_type"                     => "銷售付款類別",
-    "payments"                         => "",
-    "payments_total"                   => "付款總額",
-    "price"                            => "價格",
-    "print_after_sale"                 => "出貨時打印收據",
-    "quantity"                         => "數量",
-    "quantity_less_than_reorder_level" => "警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存.",
-    "quantity_less_than_zero"          => "警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存.",
-    "quantity_of_items"                => "貨品數量",
-    "quote"                            => "報價",
-    "quote_number"                     => "報價單編號",
-    "quote_number_duplicate"           => "報價單編號必須獨有.",
-    "quote_sent"                       => "報價單寄給",
-    "quote_unsent"                     => "報價單發送敗失",
-    "receipt"                          => "銷貨單",
-    "receipt_no_email"                 => "此客戶沒有有效的電子郵件地址.",
-    "receipt_number"                   => "銷售收據編號",
-    "receipt_sent"                     => "發送收據",
-    "receipt_unsent"                   => "收據未能發送",
-    "refund"                           => "退款類型",
-    "register"                         => "銷售登記",
-    "remove_customer"                  => "移除客戶",
-    "remove_discount"                  => "",
-    "return"                           => "退貨",
-    "rewards"                          => "積分",
-    "rewards_balance"                  => "積分總數",
-    "sale"                             => "銷售",
-    "sale_by_invoice"                  => "發票銷售",
-    "sale_for_customer"                => "客戶:",
-    "sale_time"                        => "時間",
-    "sales_tax"                        => "銷售稅",
-    "sales_total"                      => "",
-    "select_customer"                  => "選擇客戶 (Optional)",
-    "send_invoice"                     => "發送發票",
-    "send_quote"                       => "發送報價",
-    "send_receipt"                     => "發送收據",
-    "send_work_order"                  => "發送訂單",
-    "serial"                           => "序號",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "顯示發票",
-    "show_receipt"                     => "顯示收據",
-    "start_typing_customer_name"       => "開始輸入客戶的名字...",
-    "start_typing_item_name"           => "開始輸入產品名或掃描條碼...",
-    "stock"                            => "庫存",
-    "stock_location"                   => "庫存地點",
-    "sub_total"                        => "小計",
-    "successfully_deleted"             => "銷售資料成功刪除",
-    "successfully_restored"            => "您已成功還原",
-    "successfully_suspended_sale"      => "本銷售資料已經成功暫停.",
-    "successfully_updated"             => "銷售資料成功更新.",
-    "suspend_sale"                     => "暫停銷售",
-    "suspended_doc_id"                 => "文件",
-    "suspended_sale_id"                => "暫停銷售編號",
-    "suspended_sales"                  => "已暫停銷售",
-    "table"                            => "銷售表格",
-    "takings"                          => "銷售收入",
-    "tax"                              => "稅額",
-    "tax_id"                           => "稅務編號",
-    "tax_invoice"                      => "稅務發票",
-    "tax_percent"                      => "稅率 %",
-    "taxed_ind"                        => "t",
-    "total"                            => "總計",
-    "total_tax_exclusive"              => "不含稅",
-    "transaction_failed"               => "銷售交易失敗.",
-    "unable_to_add_item"               => "無法增加出售產品",
-    "unsuccessfully_deleted"           => "銷售資料刪除失敗.",
-    "unsuccessfully_restored"          => "銷售還原失敗.",
-    "unsuccessfully_suspended_sale"    => "本銷售資料已經成功暫停.",
-    "unsuccessfully_updated"           => "銷售資料更新失敗.",
-    "unsuspend"                        => "取消暫停銷售",
-    "unsuspend_and_delete"             => "取消暫停銷售並刪除",
-    "update"                           => "編輯",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "工作指示",
-    "work_order_number"                => "工作指示編號",
-    "work_order_number_duplicate"      => "工作編號重複.",
-    "work_order_sent"                  => "發送工作指示",
-    "work_order_unsent"                => "工作指示發送失敗",
+    'account_number'                    => '帳戶 #',
+    'add_payment'                       => '新增付款',
+    'amount_due'                        => '商品金額',
+    'amount_due_not_covered'            => '付款金額未涵蓋應付金額。',
+    'amount_tendered'                   => '已收帳款',
+    'authorized_signature'              => '授權簽名',
+    'cancel_sale'                       => '取消銷售',
+    'cash'                              => '現金',
+    'cash_1'                            => '',
+    'cash_2'                            => '',
+    'cash_3'                            => '',
+    'cash_4'                            => '',
+    'cash_adjustment'                   => '現金調整',
+    'cash_deposit'                      => '已預付金額',
+    'cash_filter'                       => '現金',
+    'change_due'                        => '更改到期日',
+    'change_price'                      => '更改售價',
+    'check'                             => '支票',
+    'check_balance'                     => '查看餘額',
+    'check_filter'                      => '查看選項',
+    'close'                             => '',
+    'comment'                           => '評論',
+    'comments'                          => '評論',
+    'company_name'                      => '',
+    'complete'                          => '',
+    'complete_sale'                     => '完成銷售',
+    'confirm_cancel_sale'               => '你確定要清除此筆銷售單？本單內的所有產品將被清除。',
+    'confirm_delete'                    => '你確定要清除此銷售產品？',
+    'confirm_restore'                   => '你確定要回復此銷售產品？',
+    'credit'                            => '信用卡',
+    'credit_deposit'                    => '預付卡',
+    'credit_filter'                     => '信用卡',
+    'current_table'                     => '',
+    'customer'                          => '客戶',
+    'customer_address'                  => '客戶地址',
+    'customer_discount'                 => '折扣',
+    'customer_email'                    => '客戶電郵地址',
+    'customer_location'                 => '客戶所在地',
+    'customer_mailchimp_status'         => 'MailChimp電子報行銷狀態',
+    'customer_optional'                 => '到期付款需要',
+    'customer_required'                 => '必需',
+    'customer_total'                    => '總數',
+    'customer_total_spent'              => '',
+    'customers_available_points'        => '現有積分',
+    'daily_sales'                       => '',
+    'date'                              => '日期',
+    'date_range'                        => '日期範圍',
+    'date_required'                     => '必需填上正確的日期.',
+    'date_type'                         => '必需填寫日期.',
+    'debit'                             => '簽帳卡',
+    'debit_filter'                      => '',
+    'delete'                            => '確認刪除',
+    'delete_confirmation'               => '你確定要刪除此銷售資料，這個動作不能還原.',
+    'delete_entire_sale'                => '刪除全部銷售資料',
+    'delete_successful'                 => '您已成功刪除銷售資料.',
+    'delete_unsuccessful'               => '銷售資料刪除失敗.',
+    'description_abbrv'                 => '倒序.',
+    'discard'                           => '放棄',
+    'discard_quote'                     => '',
+    'discount'                          => '折扣 %',
+    'discount_exceeds_item_total'       => '',
+    'discount_included'                 => '% 折扣',
+    'discount_percent_exceeds_100'      => '',
+    'discount_short'                    => '%',
+    'due'                               => '由',
+    'due_filter'                        => '由...選項',
+    'edit'                              => '編輯',
+    'edit_item'                         => '編輯產品',
+    'edit_sale'                         => '編輯銷售資料',
+    'email_receipt'                     => 'Email 銷售單',
+    'employee'                          => '員工',
+    'entry'                             => '加入項目',
+    'error_editing_item'                => '編輯產品錯誤',
+    'find_or_scan_item'                 => '查找/掃描商品',
+    'find_or_scan_item_or_receipt'      => '查找/掃描產品或收貨單',
+    'giftcard'                          => '禮金券',
+    'giftcard_balance'                  => '䄠金劵餘額',
+    'giftcard_filter'                   => '',
+    'giftcard_number'                   => '禮金券編號',
+    'group_by_category'                 => '以類別分類',
+    'group_by_type'                     => '以類型分類',
+    'hsn'                               => 'HSN',
+    'id'                                => '銷售編號',
+    'include_prices'                    => '包括價格？',
+    'insufficient_giftcard_balance'     => '此次支付的禮品卡餘額不足。',
+    'insufficient_reward_points'        => '此次支付的獎勵積分不足。',
+    'invoice'                           => '發票',
+    'invoice_confirm'                   => '已傳送發票到',
+    'invoice_enable'                    => '建立發票',
+    'invoice_filter'                    => '發票選項',
+    'invoice_no_email'                  => '此客戶沒有正確的電郵地址.',
+    'invoice_number'                    => '發票編號#',
+    'invoice_number_duplicate'          => '重覆的發票號碼.',
+    'invoice_sent'                      => '發票已發送到',
+    'invoice_total'                     => '帳單總額',
+    'invoice_type_custom_invoice'       => '自定義發票',
+    'invoice_type_custom_tax_invoice'   => '自定義稅務發票',
+    'invoice_type_invoice'              => '發票',
+    'invoice_type_tax_invoice'          => '稅務發票',
+    'invoice_unsent'                    => '發票傳送失敗',
+    'invoice_update'                    => '重新清點',
+    'item_insufficient_of_stock'        => '產品庫存不足.',
+    'item_name'                         => '產品名稱',
+    'item_number'                       => '產品 #',
+    'item_out_of_stock'                 => '產品缺貨.',
+    'key_browser'                       => '',
+    'key_cancel'                        => '取消目前詢價/收據/銷售',
+    'key_customer_search'               => '搜尋顧客',
+    'key_finish_quote'                  => '完成詢價/收據 尚未付款',
+    'key_finish_sale'                   => '增加付款及完成收據/販售',
+    'key_full'                          => '',
+    'key_function'                      => '功能',
+    'key_help'                          => 'Shortcuts',
+    'key_help_modal'                    => 'Open Shortcuts Window',
+    'key_in'                            => '',
+    'key_item_search'                   => 'Item Search',
+    'key_out'                           => '',
+    'key_payment'                       => 'Add Payment',
+    'key_print'                         => '',
+    'key_restore'                       => '',
+    'key_search'                        => '',
+    'key_suspend'                       => 'Suspend Current Sale',
+    'key_suspended'                     => 'Show Suspended Sales',
+    'key_system'                        => '',
+    'key_tendered'                      => 'Edit Amount Tendered',
+    'key_title'                         => 'Sales Keyboard Shortcuts',
+    'mc'                                => '',
+    'mode'                              => '登記模式',
+    'must_enter_numeric'                => '已收帳款必須輸入數值.',
+    'must_enter_numeric_giftcard'       => '禮金券編號必須輸入數值.',
+    'must_enter_reference_code'         => '必須輸入參考/檢索編號。',
+    'negative_amount_tendered'          => '已收帳款不能為負數。',
+    'negative_discount_invalid'         => '',
+    'negative_price_invalid'            => '',
+    'negative_quantity_invalid'         => '',
+    'negative_total_invalid'            => '',
+    'new_customer'                      => '新客戶',
+    'new_item'                          => '新增產品',
+    'no_description'                    => '沒有描述',
+    'no_filter'                         => '全部',
+    'no_items_in_cart'                  => '購物車中沒有任何產品.',
+    'no_sales_to_display'               => '沒有任何紀錄.',
+    'none_selected'                     => '您還沒有選擇任何產品進行編輯.',
+    'nontaxed_ind'                      => ' . ',
+    'not_authorized'                    => '此操作未經授權.',
+    'one_or_multiple'                   => '銷售',
+    'payment'                           => '付款方式',
+    'payment_amount'                    => '總額',
+    'payment_not_cover_total'           => '付款金額不足.',
+    'payment_type'                      => '銷售付款類別',
+    'payments'                          => '',
+    'payments_total'                    => '付款總額',
+    'price'                             => '價格',
+    'print_after_sale'                  => '出貨時打印收據',
+    'quantity'                          => '數量',
+    'quantity_less_than_reorder_level'  => '警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存.',
+    'quantity_less_than_zero'           => '警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存.',
+    'quantity_of_items'                 => '貨品數量',
+    'quote'                             => '報價',
+    'quote_number'                      => '報價單編號',
+    'quote_number_duplicate'            => '報價單編號必須獨有.',
+    'quote_sent'                        => '報價單寄給',
+    'quote_unsent'                      => '報價單發送敗失',
+    'receipt'                           => '銷貨單',
+    'receipt_no_email'                  => '此客戶沒有有效的電子郵件地址.',
+    'receipt_number'                    => '銷售收據編號',
+    'receipt_sent'                      => '發送收據',
+    'receipt_unsent'                    => '收據未能發送',
+    'reference_code'                    => '付款參考代碼',
+    'reference_code_invalid_characters' => '參考代碼只能包含字母和數字。',
+    'reference_code_length_error'       => '參考代碼長度無效。',
+    'refund'                            => '退款類型',
+    'register'                          => '銷售登記',
+    'remove_customer'                   => '移除客戶',
+    'remove_discount'                   => '',
+    'return'                            => '退貨',
+    'rewards'                           => '積分',
+    'rewards_balance'                   => '積分總數',
+    'rewards_package'                   => '獎賞',
+    'rewards_remaining_balance'         => '剩餘獎賞積分 ',
+    'sale'                              => '銷售',
+    'sale_by_invoice'                   => '發票銷售',
+    'sale_for_customer'                 => '客戶:',
+    'sale_time'                         => '時間',
+    'sales_tax'                         => '銷售稅',
+    'sales_total'                       => '',
+    'select_customer'                   => '選擇客戶 (Optional)',
+    'send_invoice'                      => '發送發票',
+    'send_quote'                        => '發送報價',
+    'send_receipt'                      => '發送收據',
+    'send_work_order'                   => '發送訂單',
+    'serial'                            => '序號',
+    'service_charge'                    => '',
+    'show_due'                          => '',
+    'show_invoice'                      => '顯示發票',
+    'show_receipt'                      => '顯示收據',
+    'start_typing_customer_name'        => '開始輸入客戶的名字...',
+    'start_typing_item_name'            => '開始輸入產品名或掃描條碼...',
+    'stock'                             => '庫存',
+    'stock_location'                    => '庫存地點',
+    'sub_total'                         => '小計',
+    'successfully_deleted'              => '銷售資料成功刪除',
+    'successfully_restored'             => '您已成功還原',
+    'successfully_suspended_sale'       => '本銷售資料已經成功暫停.',
+    'successfully_updated'              => '銷售資料成功更新.',
+    'suspend_sale'                      => '暫停銷售',
+    'suspended_doc_id'                  => '文件',
+    'suspended_sale_id'                 => '暫停銷售編號',
+    'suspended_sales'                   => '已暫停銷售',
+    'table'                             => '銷售表格',
+    'takings'                           => '銷售收入',
+    'tax'                               => '稅額',
+    'tax_id'                            => '稅務編號',
+    'tax_invoice'                       => '稅務發票',
+    'tax_percent'                       => '稅率 %',
+    'taxed_ind'                         => 't',
+    'total'                             => '總計',
+    'total_tax_exclusive'               => '不含稅',
+    'transaction_failed'                => '銷售交易失敗.',
+    'unable_to_add_item'                => '無法增加出售產品',
+    'unsuccessfully_deleted'            => '銷售資料刪除失敗.',
+    'unsuccessfully_restored'           => '銷售還原失敗.',
+    'unsuccessfully_suspended_sale'     => '本銷售資料已經成功暫停.',
+    'unsuccessfully_updated'            => '銷售資料更新失敗.',
+    'unsuspend'                         => '取消暫停銷售',
+    'unsuspend_and_delete'              => '取消暫停銷售並刪除',
+    'update'                            => '編輯',
+    'upi'                               => 'UPI',
+    'visa'                              => '',
+    'wholesale'                         => '',
+    'work_order'                        => '工作指示',
+    'work_order_number'                 => '工作指示編號',
+    'work_order_number_duplicate'       => '工作編號重複.',
+    'work_order_sent'                   => '發送工作指示',
+    'work_order_unsent'                 => '工作指示發送失敗',
 ];
diff --git a/app/Libraries/Barcode_lib.php b/app/Libraries/Barcode_lib.php
index 202457adc..1b62e1c4d 100644
--- a/app/Libraries/Barcode_lib.php
+++ b/app/Libraries/Barcode_lib.php
@@ -146,10 +146,10 @@ class Barcode_lib
         if ((isset($item['item_number']) || isset($item['name'])) && isset($item['item_id'])) {
             $barcode = $this->generate_barcode($item, $barcode_config);
             $display_table = '<table>';
-            $display_table .= '<tr><td style="text-align: center;">' . $this->manage_display_layout($barcode_config['barcode_first_row'], $item, $barcode_config) . '</td></tr>';
-            $display_table .= '<tr><td style="text-align: center;"><div class="barcode">'.$barcode.'</div></td></tr>';
-            $display_table .= '<tr><td style="text-align: center;">' . $this->manage_display_layout($barcode_config['barcode_second_row'], $item, $barcode_config) . '</td></tr>';
-            $display_table .= '<tr><td style="text-align: center;">' . $this->manage_display_layout($barcode_config['barcode_third_row'], $item, $barcode_config) . '</td></tr>';
+            $display_table .= '<tr><td style="text-align: center;">' . $this->manageDisplayLayout($barcode_config['barcode_first_row'], $item, $barcode_config) . '</td></tr>';
+            $display_table .= '<tr><td style="text-align: center;"><div class="barcode">' . $barcode . '</div></td></tr>';
+            $display_table .= '<tr><td style="text-align: center;">' . $this->manageDisplayLayout($barcode_config['barcode_second_row'], $item, $barcode_config) . '</td></tr>';
+            $display_table .= '<tr><td style="text-align: center;">' . $this->manageDisplayLayout($barcode_config['barcode_third_row'], $item, $barcode_config) . '</td></tr>';
             $display_table .= '</table>';
 
             return $display_table;
@@ -159,30 +159,30 @@ class Barcode_lib
     }
 
     /**
-     * @param $layout_type
+     * @param string $layoutType
      * @param array $item
-     * @param array $barcode_config
+     * @param array $barcodeConfig
      * @return string
      */
-    private function manage_display_layout($layout_type, array $item, array $barcode_config): string
+    private function manageDisplayLayout(string $layoutType, array $item, array $barcodeConfig): string
     {
         $result = '';
         helper('text');
 
-        if ($layout_type == 'name') {
-            $result = $item['name'];
-        } elseif ($layout_type == 'category' && isset($item['category'])) {
+        if ($layoutType == 'name') {
+            $result = esc($item['name']);
+        } elseif ($layoutType == 'category' && isset($item['category'])) {
             $result = lang('Items.category') . " " . esc($item['category']);
-        } elseif ($layout_type == 'cost_price' && isset($item['cost_price'])) {
+        } elseif ($layoutType == 'cost_price' && isset($item['cost_price'])) {
             $result = lang('Items.cost_price') . " " . to_currency($item['cost_price']);
-        } elseif ($layout_type == 'unit_price' && isset($item['unit_price'])) {
+        } elseif ($layoutType == 'unit_price' && isset($item['unit_price'])) {
             $result = lang('Items.unit_price') . " " . to_currency($item['unit_price']);
-        } elseif ($layout_type == 'company_name') {
-            $result = $barcode_config['company'];
-        } elseif ($layout_type == 'item_code') {
-            $result = $barcode_config['barcode_content'] !== "id" && isset($item['item_number'])
-                ? $item['item_number']
-                : $item['item_id'];
+        } elseif ($layoutType == 'company_name') {
+            $result = esc($barcodeConfig['company']);
+        } elseif ($layoutType == 'item_code') {
+            $result = $barcodeConfig['barcode_content'] !== "id" && isset($item['item_number'])
+                ? esc($item['item_number'])
+                : esc($item['item_id']);
         }
 
         return character_limiter($result, 40);
diff --git a/app/Libraries/CI3SecretConverter.php b/app/Libraries/CI3SecretConverter.php
new file mode 100644
index 000000000..545cebe7f
--- /dev/null
+++ b/app/Libraries/CI3SecretConverter.php
@@ -0,0 +1,173 @@
+<?php
+
+namespace App\Libraries;
+
+use App\Models\Appconfig;
+use Config\Encryption as EncryptionConfig;
+use Config\Services;
+use RuntimeException;
+
+/**
+ * Shared converter for the CI3 -> CI4 encrypted-secret migration.
+ *
+ * CI3 encrypted its config secrets (SMTP password, Mailchimp API key, etc.)
+ * with AES-128-CBC + `encryptKeyInfo='encryption'` + `rawData=false` +
+ * `authKeyInfo='authentication'`. CI4 defaults to AES-256-CTR, and the CI4
+ * "previous keys" fallback cannot bridge a *cipher* change -- it only rotates
+ * keys within a single cipher. So legacy rows must be decrypted with the old
+ * cipher and re-encrypted with the new one.
+ *
+ * This class centralises both ciphers so the interactive UI migration
+ * (ConvertToCI4) and the docker startup command (env:provision) share a single
+ * implementation. It performs no persistence of its own except saveAll(); key
+ * rotation is left to the caller (rotateEncryptionKey in security_helper).
+ */
+class CI3SecretConverter
+{
+    /**
+     * Legacy CI3 secret keys stored in the ospos_app_config table.
+     *
+     * @var list<string>
+     */
+    public const LEGACY_KEYS = [
+        'clcdesq_api_key',
+        'clcdesq_api_url',
+        'mailchimp_api_key',
+        'mailchimp_list_id',
+        'smtp_pass',
+    ];
+
+    /**
+     * @var Appconfig|null
+     */
+    private ?Appconfig $model;
+
+    public function __construct(?Appconfig $model = null)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * Decrypts all legacy CI3 secrets into plaintext using the CI3 cipher and
+     * the supplied key. Empty/missing rows become ''.
+     *
+     * @param string $key the CI3-era encryption key
+     * @return array<string,string>
+     */
+    public function decryptAll(string $key): array
+    {
+        $encrypter = Services::encrypter($this->ci3Config($key));
+        $appConfig = $this->resolveModel();
+
+        $result = [];
+        foreach (self::LEGACY_KEYS as $col) {
+            $value = (string) $appConfig->get_value($col);
+            $result[$col] = $value === '' ? '' : $encrypter->decrypt($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Encrypts plaintext values under the current CI4 cipher (no persistence).
+     *
+     * @param array<string,string> $plain
+     * @return array<string,string>
+     */
+    public function encryptAll(array $plain): array
+    {
+        $encrypter = Services::encrypter();
+
+        $result = [];
+        foreach ($plain as $col => $value) {
+            $value = (string) $value;
+            $result[$col] = $value === '' ? '' : $encrypter->encrypt($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Decrypts CI4-cipher values back to plaintext. Used to verify a round
+     * trip before persisting the converted result.
+     *
+     * @param array<string,string> $encrypted
+     * @return array<string,string>
+     */
+    public function verifyAll(array $encrypted): array
+    {
+        $encrypter = Services::encrypter();
+
+        $result = [];
+        foreach ($encrypted as $col => $value) {
+            $value = (string) $value;
+            $result[$col] = $value === '' ? '' : $encrypter->decrypt($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Persists already-encrypted values to the ospos_app_config table.
+     *
+     * @param array<string,string> $encrypted
+     * @return bool
+     * @throws RuntimeException
+     */
+    public function saveAll(array $encrypted): bool
+    {
+        if (!$this->resolveModel()->batch_save($encrypted)) {
+            throw new RuntimeException('Failed to save converted encryption data. Check logs for details.');
+        }
+
+        return true;
+    }
+
+    /**
+     * True when at least one legacy secret decrypts to a non-empty plaintext
+     * value with $oldKey. Used to decide whether a conversion is necessary.
+     */
+    public function hasLegacyData(string $oldKey): bool
+    {
+        foreach ($this->decryptAll($oldKey) as $value) {
+            if ((string) $value !== '') {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Build a Config\Encryption instance matching the CI3 cipher settings so
+     * Services::encrypter() can construct a handler with AES-128-CBC.
+     *
+     * @return EncryptionConfig
+     */
+    private function ci3Config(string $key): EncryptionConfig
+    {
+        $config        = new EncryptionConfig();
+        $config->driver = 'OpenSSL';
+        $config->digest = 'SHA512';
+        $config->key    = $key;
+        $config->cipher = 'AES-128-CBC';
+        $config->rawData = false;
+        $config->encryptKeyInfo = 'encryption';
+        $config->authKeyInfo = 'authentication';
+        $config->previousKeys = [];
+
+        return $config;
+    }
+
+    /**
+     * @return Appconfig
+     */
+    private function resolveModel(): Appconfig
+    {
+        if ($this->model === null) {
+            $this->model = model(Appconfig::class);
+        }
+
+        return $this->model;
+    }
+}
diff --git a/app/Libraries/Email_lib.php b/app/Libraries/Email_lib.php
index 914344567..30ce547e5 100644
--- a/app/Libraries/Email_lib.php
+++ b/app/Libraries/Email_lib.php
@@ -28,8 +28,8 @@ class Email_lib
 
         $encrypter = Services::encrypter();
 
-        $smtp_pass = $this->config['smtp_pass'];
-        if (!empty($smtp_pass) && check_encryption()) {
+        $smtp_pass = $this->config['smtp_pass'] ?? '';
+        if (!empty($smtp_pass) && checkEncryption()) {
             try {
                 $smtp_pass = $encrypter->decrypt($smtp_pass);
             } catch (\EncryptionException $e) {
@@ -44,14 +44,14 @@ class Email_lib
             'mailType'    => 'html',
             'userAgent'   => 'OSPOS',
             'validate'    => true,
-            'protocol'    => $this->config['protocol'],
-            'mailPath'    => $this->config['mailpath'],
-            'SMTPHost'    => $this->config['smtp_host'],
-            'SMTPUser'    => $this->config['smtp_user'],
+            'protocol'    => $this->config['protocol'] ?? 'mail',
+            'mailPath'    => $this->config['mailpath'] ?? '/usr/sbin/sendmail',
+            'SMTPHost'    => $this->config['smtp_host'] ?? '',
+            'SMTPUser'    => $this->config['smtp_user'] ?? '',
             'SMTPPass'    => $smtp_pass,
-            'SMTPPort'    => (int)$this->config['smtp_port'],
-            'SMTPTimeout' => (int)$this->config['smtp_timeout'],
-            'SMTPCrypto'  => $this->config['smtp_crypto']
+            'SMTPPort'    => (int)(!empty($this->config['smtp_port']) ? $this->config['smtp_port'] : 465),
+            'SMTPTimeout' => (int)(!empty($this->config['smtp_timeout']) ? $this->config['smtp_timeout'] : 5),
+            'SMTPCrypto'  => $this->config['smtp_crypto'] ?? 'ssl'
         ];
         $this->email->initialize($email_config);
     }
@@ -82,4 +82,40 @@ class Email_lib
 
         return $result;
     }
+
+    /**
+     * Gets the mime type of the company logo file.
+     *
+     * @return string Mime type or empty string if logo doesn't exist
+     */
+    public function getLogoMimeType(): string
+    {
+        $logo_path = FCPATH . 'uploads/' . $this->config['company_logo'];
+
+        if (!empty($this->config['company_logo']) && file_exists($logo_path)) {
+            $mimeType = mime_content_type($logo_path);
+            return $mimeType !== false ? $mimeType : '';
+        }
+
+        return '';
+    }
+
+    /**
+     * Builds an img tag for the company logo to use in email templates.
+     *
+     * @return string HTML img tag with base64-encoded logo, or empty string if no logo
+     */
+    public function buildLogoImgTag(): string
+    {
+        $mimeType = $this->getLogoMimeType();
+
+        if ($mimeType === '') {
+            return '';
+        }
+
+        $logo_path = FCPATH . 'uploads/' . $this->config['company_logo'];
+        $logo_data = base64_encode(file_get_contents($logo_path));
+
+        return '<img id="image" src="data:' . $mimeType . ';base64,' . $logo_data . '" alt="company_logo">';
+    }
 }
diff --git a/app/Libraries/MY_Language.php b/app/Libraries/MY_Language.php
index c12d5ced8..fe70f4afb 100644
--- a/app/Libraries/MY_Language.php
+++ b/app/Libraries/MY_Language.php
@@ -6,8 +6,7 @@ use CodeIgniter\Language\Language;
 
 class MY_Language extends Language
 {
-
-    public function getLine(string $line, array $args = [])
+    public function getLine(string $line, array $args = []): array|string
     {
         // If no file is given, just parse the line
         if (! str_contains($line, '.')) {
@@ -20,7 +19,7 @@ class MY_Language extends Language
 
         $output = $this->getTranslationOutput($this->locale, $file, $parsedLine);
 
-        if ($output === NULL && strpos($this->locale, '-')) {
+        if ($output === null && strpos($this->locale, '-')) {
             [$locale] = explode('-', $this->locale, 2);
 
             [$file, $parsedLine] = $this->parseLine($line, $locale);
@@ -29,7 +28,7 @@ class MY_Language extends Language
         }
 
         // If still not found, try English
-        if ($output === NULL || $output === "") {
+        if ($output === null || $output === "") {
             [$file, $parsedLine] = $this->parseLine($line, 'en');
 
             $output = $this->getTranslationOutput('en', $file, $parsedLine);
diff --git a/app/Libraries/MY_Migration.php b/app/Libraries/MY_Migration.php
index 951b50a14..a1bf1f256 100644
--- a/app/Libraries/MY_Migration.php
+++ b/app/Libraries/MY_Migration.php
@@ -4,6 +4,7 @@ namespace App\Libraries;
 
 use CodeIgniter\Database\MigrationRunner;
 use Config\Database;
+use Exception;
 use stdClass;
 
 class MY_Migration extends MigrationRunner
@@ -11,35 +12,43 @@ class MY_Migration extends MigrationRunner
     /**
      * @return bool
      */
-    public function is_latest(): bool
+    public function isLatest(): bool
     {
-        $latest_version = $this->get_latest_migration();
-        $current_version = $this->get_current_version();
+        $latestVersion = $this->getLatestMigration();
+        $currentVersion = $this->getCurrentVersion();
 
-        return $latest_version === $current_version;
+        return $latestVersion === $currentVersion;
     }
 
     /**
      * @return int
      */
-    public function get_latest_migration(): int
+    public function getLatestMigration(): int
     {
         $migrations = $this->findMigrations();
-        return basename(end($migrations)->version);
+        return (int) basename(end($migrations)->version);
     }
 
     /**
      * Gets the database version number
      *
-     * @return int The version number of the last successfully run database migration.
+     * @return int|null The version number of the last successfully run database migration,
+     *                  0 for a confirmed empty database, or null if the database is unavailable.
      */
-    public static function get_current_version(): int
+    public static function getCurrentVersion(): ?int
     {
-        $db = Database::connect();
-        if ($db->tableExists('migrations')) {
-            $builder = $db->table('migrations');
-            $builder->select('version')->orderBy('version', 'DESC')->limit(1);
-            return $builder->get()->getRow()->version;
+        try {
+            $db = Database::connect();
+            if ($db->tableExists('migrations')) {
+                $builder = $db->table('migrations');
+                $builder->select('version')->orderBy('version', 'DESC')->limit(1);
+                $result = $builder->get()->getRow();
+                return $result ? (int) $result->version : 0;
+            }
+        } catch (Exception $e) {
+            // Database unavailable — distinct from a confirmed empty database.
+            // Catches mysqli_sql_exception which is not a DatabaseException.
+            return null;
         }
 
         return 0;
@@ -48,11 +57,11 @@ class MY_Migration extends MigrationRunner
     /**
      * @return void
      */
-    public function migrate_to_ci4(): void
+    public function migrateToCI4(): void
     {
-        $ci3_migrations_version = $this->ci3_migrations_exists();
+        $ci3_migrations_version = $this->ci3MigrationsExists();
         if ($ci3_migrations_version) {
-            $this->migrate_table($ci3_migrations_version);
+            $this->migrateTable($ci3_migrations_version);
         }
     }
 
@@ -61,12 +70,18 @@ class MY_Migration extends MigrationRunner
      *
      * @return bool|string The version number of the last CI3 migration to run or false if the table is CI4 or doesn't exist
      */
-    private function ci3_migrations_exists(): bool|string
+    private function ci3MigrationsExists(): bool|string
     {
-        if ($this->db->tableExists('migrations') && !$this->db->fieldExists('id', 'migrations')) {
-            $builder = $this->db->table('migrations');
-            $builder->select('version');
-            return $builder->get()->getRow()->version;
+        try {
+            if ($this->db->tableExists('migrations') && !$this->db->fieldExists('id', 'migrations')) {
+                $builder = $this->db->table('migrations');
+                $builder->select('version');
+                $result = $builder->get()->getRow();
+                return $result ? $result->version : false;
+            }
+        } catch (Exception $e) {
+            // Database not available yet (e.g. fresh install before schema).
+            // Catches mysqli_sql_exception which is not a DatabaseException.
         }
 
         return false;
@@ -76,11 +91,11 @@ class MY_Migration extends MigrationRunner
      * @param string $ci3_migrations_version
      * @return void
      */
-    private function migrate_table(string $ci3_migrations_version): void
+    private function migrateTable(string $ci3_migrations_version): void
     {
-        $this->convert_table();
+        $this->convertTable();
 
-        $available_migrations = $this->get_available_migrations();
+        $available_migrations = $this->getAvailableMigrations();
 
         foreach ($available_migrations as $version => $path) {
             if ($version > (int)$ci3_migrations_version) {
@@ -115,32 +130,33 @@ class MY_Migration extends MigrationRunner
     /**
      * @return array
      */
-    private function get_available_migrations(): array
+    private function getAvailableMigrations(): array
     {
         $migrations = $this->findMigrations();
-        $exploded_migrations = [];
+        $explodedMigrations = [];
 
         foreach ($migrations as $migration) {
             $version = substr($migration->uid, 0, 14);
             $path = substr($migration->uid, 14);
 
-            $exploded_migrations[$version] = $path;
+            $explodedMigrations[$version] = $path;
         }
 
-        ksort($exploded_migrations);
+        ksort($explodedMigrations);
 
-        return $exploded_migrations;
+        return $explodedMigrations;
     }
 
     /**
      * Converts the CI3 migrations database to CI4
      * @return void
      */
-    public function convert_table(): void
+    public function convertTable(): void
     {
         $forge = Database::forge();
         $forge->dropTable('migrations');
 
         $this->ensureTable();
     }
+
 }
diff --git a/app/Libraries/Receiving_lib.php b/app/Libraries/Receiving_lib.php
index c1eba30f8..2c5162930 100644
--- a/app/Libraries/Receiving_lib.php
+++ b/app/Libraries/Receiving_lib.php
@@ -394,7 +394,7 @@ class Receiving_lib
     /**
      * @param $line int|string The item_number or item_id of the item to be removed from the receiving.
      */
-    public function delete_item($line): void
+    public function delete_item(int|string $line): void
     {
         $items = $this->get_cart();
         unset($items[$line]);
diff --git a/app/Libraries/Sale_lib.php b/app/Libraries/Sale_lib.php
index d2a4ac273..8dc518b0b 100644
--- a/app/Libraries/Sale_lib.php
+++ b/app/Libraries/Sale_lib.php
@@ -23,6 +23,19 @@ use ReflectionException;
  */
 class Sale_lib
 {
+    private const KEY_SHORTCUT_DEFAULTS = [
+        'cancel'    => ['value' => '27 | ESC', 'code' => 27, 'label' => 'ESC'],
+        'items'     => ['value' => '49 | ALT + 1', 'code' => 49, 'label' => 'ALT + 1'],
+        'customers' => ['value' => '50 | ALT + 2', 'code' => 50, 'label' => 'ALT + 2'],
+        'suspend'   => ['value' => '51 | ALT + 3', 'code' => 51, 'label' => 'ALT + 3'],
+        'suspended' => ['value' => '52 | ALT + 4', 'code' => 52, 'label' => 'ALT + 4'],
+        'amount'    => ['value' => '53 | ALT + 5', 'code' => 53, 'label' => 'ALT + 5'],
+        'payment'   => ['value' => '54 | ALT + 6', 'code' => 54, 'label' => 'ALT + 6'],
+        'complete'  => ['value' => '55 | ALT + 7', 'code' => 55, 'label' => 'ALT + 7'],
+        'finish'    => ['value' => '56 | ALT + 8', 'code' => 56, 'label' => 'ALT + 8'],
+        'help'      => ['value' => '57 | ALT + 9', 'code' => 57, 'label' => 'ALT + 9'],
+    ];
+
     private Attribute $attribute;
     private Customer $customer;
     private Dinner_table $dinner_table;
@@ -95,6 +108,11 @@ class Sale_lib
         'custom_tax_invoice'
     ];
 
+    private const ALLOWED_RECEIPT_TEMPLATES = [
+        'receipt_default',
+        'receipt_short'
+    ];
+
     public function get_invoice_type_options(): array
     {
         $invoice_types = [];
@@ -105,11 +123,54 @@ class Sale_lib
         return $invoice_types;
     }
 
+    /**
+     * Returns the available keyboard shortcut choices for the configuration screen.
+     *
+     * @return array<string, string>
+     */
+    public function getKeyShortcutsOptions(): array
+    {
+        $keyShortcuts = [];
+
+        foreach (self::KEY_SHORTCUT_DEFAULTS as $shortcut) {
+            $keyShortcuts[$shortcut['value']] = $shortcut['label'];
+        }
+
+        return $keyShortcuts;
+    }
+
+    /**
+     * Returns parsed shortcut bindings from app_config with sensible defaults.
+     *
+     * @return array<string, array{value:string,code:int,label:string}>
+     */
+    public function getKeyShortcuts(): array
+    {
+        $keyboardShortcuts = [];
+
+        foreach (self::KEY_SHORTCUT_DEFAULTS as $name => $default) {
+            $value = $this->config["key_$name"] ?? $default['value'];
+            $parts = array_map('trim', explode('|', $value, 2));
+            $keyboardShortcuts[$name] = [
+                'value' => $value,
+                'code'  => (int)($parts[0] ?? $default['code']),
+                'label' => $parts[1] ?? $default['label']
+            ];
+        }
+
+        return $keyboardShortcuts;
+    }
+
     public static function isValidInvoiceType(string $invoice_type): bool
     {
         return in_array($invoice_type, self::ALLOWED_INVOICE_TYPES, true);
     }
 
+    public static function isValidReceiptTemplate(string $receipt_template): bool
+    {
+        return in_array($receipt_template, self::ALLOWED_RECEIPT_TEMPLATES, true);
+    }
+
     /**
      * @return array
      */
@@ -270,9 +331,9 @@ class Sale_lib
     /**
      * @return int|null
      */
-    public function get_sale_type(): ?int
+    public function getSaleType(): ?int
     {
-        return $this->session->get('sale_type', 0);
+        return $this->session->get('sale_type') ?? 0;
     }
 
     /**
@@ -497,10 +558,10 @@ class Sale_lib
     /**
      * Multiple Payments
      */
-    public function get_payments(): array
+    public function getPayments(): array
     {
         if (!$this->session->get('sales_payments')) {
-            $this->set_payments([]);
+            $this->setPayments([]);
         }
 
         return $this->session->get('sales_payments');
@@ -509,32 +570,34 @@ class Sale_lib
     /**
      * Multiple Payments
      */
-    public function set_payments(array $payments_data): void
+    public function setPayments(array $payments_data): void
     {
         $this->session->set('sales_payments', $payments_data);
     }
 
     /**
-     * Adds a new payment to the payments array or updates an existing one.
+     * Adds a new payment to the payment array or updates an existing one.
      * It will also disable cash_mode if a non-qualifying payment type is added.
-     * @param string $payment_id
-     * @param string $payment_amount
-     * @param int $cash_adjustment
+     * @param string $paymentId
+     * @param string $paymentAmount
+     * @param string|null $referenceCode
+     * @param int $cashAdjustment
      */
-    public function add_payment(string $payment_id, string $payment_amount, int $cash_adjustment = CASH_ADJUSTMENT_FALSE): void
+    public function addPayment(string $paymentId, string $paymentAmount, ?string $referenceCode = null, int $cashAdjustment = CASH_ADJUSTMENT_FALSE): void
     {
-        $payments = $this->get_payments();
-        if (isset($payments[$payment_id])) {
+        $payments = $this->getPayments();
+        if (isset($payments[$paymentId])) {
             // payment_method already exists, add to payment_amount
-            $payments[$payment_id]['payment_amount'] = bcadd($payments[$payment_id]['payment_amount'], $payment_amount);
+            $payments[$paymentId]['payment_amount'] = bcadd($payments[$paymentId]['payment_amount'], $paymentAmount);
         } else {
             // Add to existing array
             $payment = [
-                $payment_id => [
-                    'payment_type'    => $payment_id,
-                    'payment_amount'  => $payment_amount,
+                $paymentId => [
+                    'payment_type'    => $paymentId,
+                    'payment_amount'  => $paymentAmount,
                     'cash_refund'     => 0,
-                    'cash_adjustment' => $cash_adjustment
+                    'cash_adjustment' => $cashAdjustment,
+                    'reference_code'  => $referenceCode,
                 ]
             ];
 
@@ -542,12 +605,12 @@ class Sale_lib
         }
 
         if ($this->session->get('cash_mode')) {
-            if ($this->session->get('cash_rounding') && $payment_id != lang('Sales.cash') && $payment_id != lang('Sales.cash_adjustment')) {
+            if ($this->session->get('cash_rounding') && $paymentId != lang('Sales.cash') && $paymentId != lang('Sales.cash_adjustment')) {
                 $this->session->set('cash_mode', CASH_MODE_FALSE);
             }
         }
 
-        $this->set_payments($payments);
+        $this->setPayments($payments);
     }
 
     /**
@@ -555,11 +618,11 @@ class Sale_lib
      */
     public function edit_payment(string $payment_id, float $payment_amount): bool
     {
-        $payments = $this->get_payments();
+        $payments = $this->getPayments();
         if (isset($payments[$payment_id])) {
             $payments[$payment_id]['payment_type'] = $payment_id;
             $payments[$payment_id]['payment_amount'] = $payment_amount;
-            $this->set_payments($payments);
+            $this->setPayments($payments);
 
             return true;
         }
@@ -574,7 +637,7 @@ class Sale_lib
      */
     public function delete_payment(string $payment_id): void
     {
-        $payments = $this->get_payments();
+        $payments = $this->getPayments();
         $decoded_payment_id = urldecode($payment_id);
 
         unset($payments[$decoded_payment_id]);
@@ -590,7 +653,7 @@ class Sale_lib
                 unset($payments[lang('Sales.cash')]);
             }
         }
-        $this->set_payments($payments);
+        $this->setPayments($payments);
     }
 
     /**
@@ -610,7 +673,7 @@ class Sale_lib
         $subtotal = '0.0';
         $cash_mode_eligible = CASH_MODE_TRUE;
 
-        foreach ($this->get_payments() as $payments) {
+        foreach ($this->getPayments() as $payments) {
             if (!$payments['cash_adjustment']) {
                 $subtotal = bcadd($payments['payment_amount'], $subtotal);
             }
@@ -1325,7 +1388,7 @@ class Sale_lib
 
         // Now load payments
         foreach ($this->sale->get_sale_payments($sale_id)->getResult() as $row) {
-            $this->add_payment($row->payment_type, $row->payment_amount, $row->cash_adjustment);
+            $this->addPayment($row->payment_type, $row->payment_amount, $row->reference_code ?? null, $row->cash_adjustment);
         }
 
         $this->set_customer($this->sale->get_customer($sale_id)->person_id);
diff --git a/app/Libraries/Token_lib.php b/app/Libraries/Token_lib.php
index 057af6607..e260240e1 100644
--- a/app/Libraries/Token_lib.php
+++ b/app/Libraries/Token_lib.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\Libraries;
+namespace App\Libraries;
 
 use App\Models\Tokens\Token;
 use Config\OSPOS;
@@ -14,40 +14,137 @@ use DateTime;
  */
 class Token_lib
 {
+    private array $strftimeToIntlPatternMap = [
+        '%a' => 'EEE',
+        '%A' => 'EEEE',
+        '%b' => 'MMM',
+        '%B' => 'MMMM',
+        '%d' => 'dd',
+        '%D' => 'MM/dd/yy',
+        '%e' => 'd',
+        '%F' => 'yyyy-MM-dd',
+        '%h' => 'MMM',
+        '%j' => 'D',
+        '%m' => 'MM',
+        '%U' => 'w',
+        '%V' => 'ww',
+        '%W' => 'ww',
+        '%y' => 'yy',
+        '%Y' => 'yyyy',
+        '%H' => 'HH',
+        '%I' => 'hh',
+        '%l' => 'h',
+        '%M' => 'mm',
+        '%p' => 'a',
+        '%P' => 'a',
+        '%r' => 'hh:mm:ss a',
+        '%R' => 'HH:mm',
+        '%S' => 'ss',
+        '%T' => 'HH:mm:ss',
+        '%X' => 'HH:mm:ss',
+        '%z' => 'ZZZZZ',
+        '%Z' => 'z',
+        '%g' => 'yy',
+        '%G' => 'yyyy',
+        '%u' => 'e',
+        '%w' => 'c',
+    ];
+
+    private array $validStrftimeFormats = [
+        'a', 'A', 'b', 'B', 'c', 'd', 'D', 'e', 'F', 'g', 'G',
+        'h', 'H', 'I', 'j', 'm', 'M', 'n', 'p', 'P', 'r', 'R',
+        'S', 't', 'T', 'u', 'U', 'V', 'w', 'W', 'x', 'X', 'y', 'Y', 'z', 'Z'
+    ];
+
     /**
      * Expands all the tokens found in a given text string and returns the results.
      */
     public function render(string $tokened_text, array $tokens = [], $save = true): string
     {
-        // Apply the transformation for the "%" tokens if any are used
-        if (strpos($tokened_text, '%') !== false) {
-            $tokened_text = strftime($tokened_text);    // TODO: these need to be converted to IntlDateFormatter::format()
+        if (str_contains($tokened_text, '%')) {
+            $tokened_text = $this->applyDateFormats($tokened_text);
         }
 
-        // Call scan to build an array of all of the tokens used in the text to be transformed
         $token_tree = $this->scan($tokened_text);
 
         if (empty($token_tree)) {
-            if (strpos($tokened_text, '%') !== false) {
-                return strftime($tokened_text);
-            } else {
-                return $tokened_text;
-            }
+            return $tokened_text;
         }
 
         $token_values = [];
         $tokens_to_replace = [];
-        $this->generate($token_tree, $tokens_to_replace, $token_values, $tokens, $save);
+        $this->generate($token_tree, $tokens, $tokens_to_replace, $token_values, $save);
 
         return str_replace($tokens_to_replace, $token_values, $tokened_text);
     }
 
-    /**
-     * Parses out the all the tokens enclosed in braces {} and subparses on the colon : character where supplied
-     */
+    private function applyDateFormats(string $text): string
+    {
+        $formatter = new IntlDateFormatter(
+            null,
+            IntlDateFormatter::FULL,
+            IntlDateFormatter::FULL,
+            null,
+            null,
+            ''
+        );
+
+        $dateTime = new DateTime();
+
+        return preg_replace_callback(
+            '/%([a-zA-Z%])/',
+            function ($match) use ($formatter, $dateTime) {
+                $formatChar = $match[1];
+
+                if ($formatChar === '%') {
+                    return '%';
+                }
+
+                if ($formatChar === 'n') {
+                    return "\n";
+                }
+
+                if ($formatChar === 't') {
+                    return "\t";
+                }
+
+                if ($formatChar === 'C') {
+                    return str_pad((string) intdiv((int) $dateTime->format('Y'), 100), 2, '0', STR_PAD_LEFT);
+                }
+
+                if ($formatChar === 'c') {
+                    $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
+                    $result = $formatter->format($dateTime);
+                    return $result !== false ? $result : $match[0];
+                }
+
+                if ($formatChar === 'x') {
+                    $formatter->setPattern('yyyy-MM-dd');
+                    $result = $formatter->format($dateTime);
+                    return $result !== false ? $result : $match[0];
+                }
+
+                if (!in_array($formatChar, $this->validStrftimeFormats, true)) {
+                    return $match[0];
+                }
+
+                $intlPattern = $this->strftimeToIntlPatternMap[$match[0]] ?? null;
+
+                if ($intlPattern === null) {
+                    return $match[0];
+                }
+
+                $formatter->setPattern($intlPattern);
+                $result = $formatter->format($dateTime);
+
+                return $result !== false ? $result : $match[0];
+            },
+            $text
+        );
+    }
+
     public function scan(string $text): array
     {
-        // Matches tokens with the following pattern: [$token:$length]
         preg_match_all('/
                 \{             # [ - pattern start
                 ([^\s\{\}:]+)  # match $token not containing whitespace : { or }
@@ -69,12 +166,6 @@ class Token_lib
         return $token_tree;
     }
 
-    /**
-     * @param string|null $quantity
-     * @param string|null $price
-     * @param string|null $item_id_or_number_or_item_kit_or_receipt
-     * @return void
-     */
     public function parse_barcode(?string &$quantity, ?string &$price, ?string &$item_id_or_number_or_item_kit_or_receipt): void
     {
         $config = config(OSPOS::class)->settings;
@@ -90,17 +181,11 @@ class Token_lib
                 $price = (isset($parsed_results['P'])) ? (double) $parsed_results['P'] : null;
             }
         } else {
-            $quantity = 1;    // TODO: Quantity is handled using bcmath functions so that it is precision safe.  This should be '1'
+            $quantity = 1;
         }
     }
 
-    /**
-     * @param string $string
-     * @param string $pattern
-     * @param array $tokens
-     * @return array
-     */
-    public function parse(string $string, string $pattern, array $tokens = []): array    // TODO: $string is a poor name for this parameter.
+    public function parse(string $string, string $pattern, array $tokens = []): array
     {
         $token_tree = $this->scan($pattern);
 
@@ -129,19 +214,10 @@ class Token_lib
         return $results;
     }
 
-    /**
-     * @param array $used_tokens
-     * @param array $tokens_to_replace
-     * @param array $token_values
-     * @param array $tokens
-     * @param bool $save
-     * @return array
-     */
-    public function generate(array $used_tokens, array &$tokens_to_replace, array &$token_values, array $tokens, bool $save = true): array    // TODO: $tokens
+    private function generate(array $used_tokens, array $tokens, array &$tokens_to_replace, array &$token_values, bool $save = true): void
     {
         foreach ($used_tokens as $token_code => $token_info) {
-            // Generate value here based on the key value
-            $token_value = $this->resolve_token($token_code, [], $save);
+            $token_value = $this->resolve_token($token_code, $tokens, $save);
 
             foreach ($token_info as $length => $token_spec) {
                 $tokens_to_replace[] = $token_spec;
@@ -152,16 +228,8 @@ class Token_lib
                 }
             }
         }
-
-        return $token_values;
     }
 
-    /**
-     * @param $token_code
-     * @param array $tokens
-     * @param bool $save
-     * @return string
-     */
     private function resolve_token($token_code, array $tokens = [], bool $save = true): string
     {
         foreach (array_merge($tokens, Token::get_tokens()) as $token) {
@@ -172,4 +240,4 @@ class Token_lib
 
         return '';
     }
-}
+}
\ No newline at end of file
diff --git a/app/Models/Attribute.php b/app/Models/Attribute.php
index 79e292953..79a021ffd 100644
--- a/app/Models/Attribute.php
+++ b/app/Models/Attribute.php
@@ -9,6 +9,7 @@ use CodeIgniter\Model;
 use CodeIgniter\Database\RawSql;
 use Config\OSPOS;
 use DateTime;
+use InvalidArgumentException;
 use stdClass;
 use ReflectionClass;
 
@@ -37,9 +38,10 @@ class Attribute extends Model
         'attribute_decimal'
     ];
 
-    public const SHOW_IN_ITEMS = 1;    // TODO: These need to be moved to constants.php
+    public const SHOW_IN_ITEMS = 1;
     public const SHOW_IN_SALES = 2;
     public const SHOW_IN_RECEIVINGS = 4;
+    public const SHOW_IN_SEARCH = 8;
     public function deleteDropdownAttributeValue(string $attribute_value, int $definition_id): bool
     {
         $attribute_id = $this->getAttributeIdByValue($attribute_value);
@@ -59,7 +61,7 @@ class Attribute extends Model
     /**
      * @return array
      */
-    public static function get_definition_flags(): array
+    public static function getDefinitionFlags(): array
     {
         $class = new ReflectionClass(__CLASS__);
 
@@ -244,7 +246,7 @@ class Attribute extends Model
      * @param int $definition_id
      * @return array
      */
-    public function get_definitions_by_type(string $attribute_type, int $definition_id = NO_DEFINITION_ID): array
+    public function getDefinitionsByType(string $attribute_type, int $definition_id = NO_DEFINITION_ID): array
     {
         $builder = $this->db->table('attribute_definitions');
         $builder->where('definition_type', $attribute_type);
@@ -262,9 +264,10 @@ class Attribute extends Model
 
     /**
      * @param int $definition_flags
+     * @param bool $include_types If true, returns array with definition_id => ['name' => name, 'type' => type]
      * @return array
      */
-    public function get_definitions_by_flags(int $definition_flags): array
+    public function getDefinitionsByFlags(int $definition_flags, bool $include_types = false): array
     {
         $builder = $this->db->table('attribute_definitions');
         $builder->where(new RawSql("definition_flags & $definition_flags"));    // TODO: we need to heed CI warnings to escape properly
@@ -274,6 +277,17 @@ class Attribute extends Model
 
         $results = $builder->get()->getResultArray();
 
+        if ($include_types) {
+            $definitions = [];
+            foreach ($results as $result) {
+                $definitions[$result['definition_id']] = [
+                    'name' => $result['definition_name'],
+                    'type' => $result['definition_type']
+                ];
+            }
+            return $definitions;
+        }
+
         return $this->to_array($results, 'definition_id', 'definition_name');
     }
 
@@ -283,7 +297,7 @@ class Attribute extends Model
      * @param     boolean        $groups        If false does not return GROUP type attributes in the array
      * @return    array                    Array containing definition IDs, attribute names and -1 index with the local language '[SELECT]' line.
      */
-    public function get_definition_names(bool $groups = true): array
+    public function getDefinitionNames(bool $groups = true): array
     {
         $builder = $this->db->table('attribute_definitions');
         $builder->where('deleted', 0);
@@ -303,7 +317,7 @@ class Attribute extends Model
      * @param int $definition_id
      * @return array
      */
-    public function get_definition_values(int $definition_id): array
+    public function getDefinitionValues(int $definition_id): array
     {
         $attribute_values = [];
 
@@ -375,7 +389,7 @@ class Attribute extends Model
             foreach ($builder->get()->getResult() as $attribute) {
                 switch ($to) {
                     case DATE:
-                        $success = valid_date($attribute->attribute_value);
+                        $success = isValidDate($attribute->attribute_value);
                         break;
                     case DECIMAL:
                         $success = valid_decimal($attribute->attribute_value);
@@ -384,12 +398,10 @@ class Attribute extends Model
 
                 if (!$success) {
                     $affected_items = $this->get_items_by_value($attribute->attribute_value, $definition_id);
-                    foreach ($affected_items as $affected_item) {
-                        $affected_items[] = $affected_item['item_id'];
-                    }
+                    $affected_item_ids = array_column($affected_items, 'item_id');
 
-                    log_message('error', "Attribute_value: '$attribute->attribute_value' cannot be converted to $to. Affected Items: " . implode(',', $affected_items));
-                    unset($affected_items);
+                    log_message('error', "Attribute_value: '$attribute->attribute_value' cannot be converted to $to. Affected Items: " . implode(',', $affected_item_ids));
+                    unset($affected_items, $affected_item_ids);
                 }
             }
         }
@@ -486,7 +498,7 @@ class Attribute extends Model
         }
 
         $this->delete_orphaned_links($definition_id);
-        $this->delete_orphaned_values();
+        $this->deleteOrphanedValues();
         return $success;
     }
 
@@ -505,7 +517,6 @@ class Attribute extends Model
 
         if (!$one_attribute_id) {
             $one_attribute_id = $this->saveAttributeValue('1', $definition_id, false, false, CHECKBOX);
-            $one_attribute_id = $this->saveAttributeValue('1', $definition_id, false, false, CHECKBOX);
         }
 
         return [$zero_attribute_id, $one_attribute_id];
@@ -514,43 +525,43 @@ class Attribute extends Model
     /**
      * Inserts or updates a definition
      */
-    public function save_definition(array &$definition_data, int $definition_id = NO_DEFINITION_ID): bool
+    public function saveDefinition(array &$definitionData, int $definitionId = NO_DEFINITION_ID): bool
     {
         $this->db->transStart();
 
-        // Definition doesn't exist
-        if ($definition_id === NO_DEFINITION_ID || !$this->exists($definition_id)) {
-            if ($this->exists($definition_id, true)) {
-                $success = $this->undelete($definition_id);
+        // Insert definition
+        if ($definitionId === NO_DEFINITION_ID || !$this->exists($definitionId)) {
+            if ($this->exists($definitionId, true)) {
+                $success = $this->undelete($definitionId);
             } else {
                 $builder = $this->db->table('attribute_definitions');
-                $success = $builder->insert($definition_data);
-                $definition_data['definition_id'] = $this->db->insertID();
+                $success = $builder->insert($definitionData);
+
+                $definitionData['definition_id'] = $definitionId !== CATEGORY_DEFINITION_ID ? $this->db->insertID() : $definitionId;
             }
         }
 
-        // Definition already exists
+        // Update definition
         else {
             $builder = $this->db->table('attribute_definitions');
             $builder->select('definition_type');
-            $builder->where('definition_id', $definition_id);
+            $builder->where('definition_id', $definitionId);
             $builder->where('deleted', ACTIVE);
             $query = $builder->get();
             $row = $query->getRow();
 
             $from_definition_type = $row->definition_type;
-            $to_definition_type = $definition_data['definition_type'];
+            $to_definition_type = $definitionData['definition_type'];
 
-            // Update the definition values
-            $builder->where('definition_id', $definition_id);
+            // Update definition values
+            $builder->where('definition_id', $definitionId);
+            $success = $builder->update($definitionData);
+            $definitionData['definition_id'] = $definitionId;
 
-            $success = $builder->update($definition_data);
-            $definition_data['definition_id'] = $definition_id;
-
-            if ($from_definition_type !== $to_definition_type) {
-                if (!$this->convert_definition_data($definition_id, $from_definition_type, $to_definition_type)) {
-                    return false;
-                }
+            if ($from_definition_type !== $to_definition_type
+                && !$this->convert_definition_data($definitionId, $from_definition_type, $to_definition_type)) {
+                $this->db->transRollback();
+                return false;
             }
         }
 
@@ -562,11 +573,13 @@ class Attribute extends Model
     }
 
     /**
-     * @param string $definition_name
-     * @param $definition_type
-     * @return array
+     * Looks up a single, non-deleted attribute definition by name.
+     *
+     * @param string $definition_name Name of the definition to look up
+     * @param string|bool $definition_type Optional definition type used to further constrain the lookup
+     * @return array The matching definition row as an associative array, or an empty array when no definition matches
      */
-    public function get_definition_by_name(string $definition_name, $definition_type = false): array
+    public function getDefinitionByName(string $definition_name, string|bool $definition_type = false): array
     {
         $builder = $this->db->table('attribute_definitions');
         $builder->where('definition_name', $definition_name);
@@ -576,7 +589,8 @@ class Attribute extends Model
             $builder->where('definition_type', $definition_type);
         }
 
-        return $builder->get()->getResultArray();
+        $row = $builder->get()->getRowArray();
+        return $row ?? [];
     }
 
     /**
@@ -589,24 +603,52 @@ class Attribute extends Model
      */
     public function saveAttributeLink(int $itemId, int $definitionId, int $attributeId): bool
     {
+        if ($attributeId <= 0) {
+            return false;
+        }
+
+        $normalizedItemId = empty($itemId) ? null : $itemId;
+        $normalizedAttributeId = empty($attributeId) ? null : $attributeId;
+
         $this->db->transStart();
 
+        $definitionType = $this->getAttributeInfo($definitionId)->definition_type ?? '';
+
         $builder = $this->db->table('attribute_links');
 
-        if ($this->attributeLinkExists($itemId, $definitionId)) {
-            $builder->set(['attribute_id' => $attributeId]);
+        if ($definitionType === DROPDOWN && $normalizedItemId === null) {
+            $builder->where('item_id', $normalizedItemId);
             $builder->where('definition_id', $definitionId);
-            $builder->where('item_id', $itemId);
+            $builder->where('attribute_id', $normalizedAttributeId);
             $builder->where('sale_id', null);
             $builder->where('receiving_id', null);
-            $builder->update();
+
+            $dropdownAttributeLinkExists = $builder->countAllResults(false) !== 0;
+
+            if (!$dropdownAttributeLinkExists) {
+                $data = [
+                    'attribute_id'  => $normalizedAttributeId,
+                    'item_id'       => $normalizedItemId,
+                    'definition_id' => $definitionId
+                ];
+                $builder->insert($data);
+            }
         } else {
-            $data = [
-                'attribute_id'  => $attributeId,
-                'item_id'       => $itemId,
-                'definition_id' => $definitionId
-            ];
-            $builder->insert($data);
+            if ($this->attributeLinkExists($normalizedItemId, $definitionId)) {
+                $builder->set(['attribute_id' => $normalizedAttributeId]);
+                $builder->where('definition_id', $definitionId);
+                $builder->where('item_id', $normalizedItemId);
+                $builder->where('sale_id', null);
+                $builder->where('receiving_id', null);
+                $builder->update();
+            } else {
+                $data = [
+                    'attribute_id' => $normalizedAttributeId,
+                    'item_id' => $normalizedItemId,
+                    'definition_id' => $definitionId
+                ];
+                $builder->insert($data);
+            }
         }
 
         $this->db->transComplete();
@@ -615,24 +657,28 @@ class Attribute extends Model
     }
 
     /**
-     * @param int $item_id
-     * @param int|bool $definition_id
-     * @return bool
+     * Deletes attribute links for a given item and optionally a given definition. Does not delete links where sale_id
+     * or receiving_id has a value. If a definitionId is not provided, deletes all attribute links for the item that do
+     * not have a sale_id or receiving_id value.
+     *
+     * @param int $itemId The item ID to delete links for.
+     * @param int|bool $definitionId The definition ID to delete links for. (optional)
+     * @return bool true if successful, false otherwise
      */
-    public function deleteAttributeLinks(int $item_id, int|bool $definition_id = false): bool
+    public function deleteAttributeLinks(int $itemId, int|bool $definitionId = false): bool
     {
-        $delete_data = ['item_id' => $item_id];
+        $deleteData = ['item_id' => $itemId];
 
         // Exclude rows where sale_id or receiving_id has a value
         $builder = $this->db->table('attribute_links');
         $builder->where('sale_id', null);
         $builder->where('receiving_id', null);
 
-        if (!empty($definition_id)) {
-            $delete_data += ['definition_id' => $definition_id];
+        if (!empty($definitionId)) {
+            $deleteData += ['definition_id' => $definitionId];
         }
 
-        return $builder->delete($delete_data);
+        return $builder->delete($deleteData);
     }
 
     /**
@@ -691,7 +737,7 @@ class Attribute extends Model
      * @param int $definition_id
      * @return object|null
      */
-    public function get_attribute_value(int $item_id, int $definition_id): ?object
+    public function getAttributeValue(int $item_id, int $definition_id): ?object
     {
         $builder = $this->db->table('attribute_values');
         $builder->join('attribute_links', 'attribute_links.attribute_id = attribute_values.attribute_id');
@@ -708,6 +754,31 @@ class Attribute extends Model
         return $this->getEmptyObject('attribute_values');
     }
 
+    /**
+     * Gets a single attribute value by attribute ID.
+     *
+     * @param int $attributeId The attribute ID to look up
+     * @param string $dataType The column name to retrieve (attribute_value, attribute_date, or attribute_decimal)
+     * @return string|float|null The attribute value. Note: MySQL returns values as follows:
+     *                           - attribute_value (TEXT): string
+     *                           - attribute_date (DATE): string in 'Y-m-d' format
+     *                           - attribute_decimal (DECIMAL): string or float depending on CodeIgniter configuration
+     *                           Returns null if the attribute_id is not found.
+     */
+    public function getAttributeValueByAttributeId(int $attributeId, string $dataType): string|float|null
+    {
+        helper('attribute');
+        validateAttributeValueType($dataType);
+
+        $builder = $this->db->table('attribute_values');
+        $builder->select($dataType);
+        $builder->where('attribute_id', $attributeId);
+        $builder->limit(1);
+        $row = $builder->get()->getRow();
+
+        return $row ? $row->$dataType : null;
+    }
+
     /**
      * Initializes an empty object based on database definitions
      * @param string $table_name
@@ -794,67 +865,155 @@ class Attribute extends Model
     }
 
     /**
-     * @param string $attribute_value
-     * @param int $definition_id
-     * @param $item_id
-     * @param $attribute_id
-     * @param string $definition_type
-     * @return int
+     * Saves an attribute value and creates an attribute link between the attribute value and item if necessary.
+     * If the attribute value already exists, it will simply create a link to the existing attribute value.
+     * If the attribute value exists but only has capitalization differences, it will update the existing attribute
+     * value to match the new capitalization.
+     * @param string $attributeValue The attribute value to be saved.
+     * @param int $definitionId The ID of the attribute definition this value is associated with.
+     * @param int|bool $itemId The ID of the item to link this attribute value to. If false, NULL will be inserted into
+     * the database for that itemId indicating it is a dropdown value and not linked to a specific item.
+     * @param int|bool $attributeId The ID of the attribute value if it already exists and is being updated. If false,
+     * a new attribute value will be created.
+     * @param string $definitionType The type of the attribute definition which will dictate which column the attribute
+     * value is saved to.
+     * @return int The attribute ID of the saved attribute value.
      */
-    public function saveAttributeValue(string $attribute_value, int $definition_id, int|bool $item_id = false, int|bool $attribute_id = false, string $definition_type = DROPDOWN): int
+    public function saveAttributeValue(string $attributeValue, int $definitionId, int|bool $itemId = false, int|bool $attributeId = false, string $definitionType = DROPDOWN): int
     {
-        $config = config(OSPOS::class)->settings;
+        helper('attribute');
+        $dataType = getAttributeDataType($definitionType);
+
+        if ($definitionType === DATE) {
+            $config = config(OSPOS::class)->settings;
+            $date = DateTime::createFromFormat($config['dateformat'], $attributeValue);
+            if ($date !== false) {
+                $attributeValue = $date->format('Y-m-d');
+            }
+        }
 
         $this->db->transStart();
 
-        switch ($definition_type) {
-            case DATE:
-                $data_type                = 'date';
-                $attribute_date_value    = DateTime::createFromFormat($config['dateformat'], $attribute_value);
-                $attribute_value        = $attribute_date_value->format('Y-m-d');
-                break;
-            case DECIMAL:
-                $data_type    = 'decimal';
-                break;
-            default:
-                $data_type    = 'value';
-                break;
-        }
+        $existingAttributeId = $this->attributeValueExists($attributeValue, $definitionType);
 
-        // New Attribute
-        if (empty($attribute_id) || empty($item_id) || $attribute_id == -1) {
-            $attribute_id = $this->attributeValueExists($attribute_value, $definition_type);
+        // Update
+        if ($existingAttributeId) {
+            $attributeId = $existingAttributeId;
+            $storedValue = $this->getAttributeValueByAttributeId($attributeId, $dataType);
 
-            if (!$attribute_id) {
-
-                $builder = $this->db->table('attribute_values');
-                $builder->set(["attribute_$data_type" => $attribute_value]);
-                $builder->insert();
-
-                $attribute_id = $this->db->insertID();
+            if ($dataType === 'attribute_value'
+                && is_string($storedValue)
+                && strcasecmp($storedValue, $attributeValue) === 0
+                && $storedValue !== $attributeValue
+            ) {
+                $this->updateAttributeValue($attributeId, $dataType, $attributeValue);
             }
-
-            $data = [
-                'attribute_id'  => empty($attribute_id) ? null : $attribute_id,
-                'item_id'       => empty($item_id) ? null : $item_id,
-                'definition_id' => $definition_id
-            ];
-
-            $builder = $this->db->table('attribute_links');
-            $builder->set($data);
-            $builder->insert();
-        }
-        // Existing Attribute
-        else {
+        } else {
+            // Insert
             $builder = $this->db->table('attribute_values');
-            $builder->set(["attribute_$data_type" => $attribute_value]);
-            $builder->where('attribute_id', $attribute_id);
-            $builder->update();
+            $builder->set([$dataType => $attributeValue]);
+            $builder->insert();
+            $attributeId = $this->db->insertID();
+        }
+
+        if (!empty($definitionId)) {
+            $success = $this->saveAttributeLink($itemId, $definitionId, $attributeId);
+            if (!$success) {
+                $this->db->transRollback();
+                return 0;
+            }
         }
 
         $this->db->transComplete();
 
-        return $attribute_id;
+        return $attributeId;
+    }
+
+    /**
+     * Saves attribute data found in one row of a CSV import file. Loops through all attribute definitions and checks
+     * if there is data for that attribute in the row. If there is, it saves the attribute value and link to the item.
+     *
+     * @param array $attributeValues Attribute name/value pairs from one row of the CSV import file
+     * @param array $itemData Contains data for the item being imported/updated from the CSV file.
+     * @param array $definitions Contains all attribute definitions in the system.
+     * @return bool Returns true if all attribute data saves correctly and false if there is an error saving any of
+     * the attribute data.
+     */
+    public function saveCSVRowAttributeData(array $attributeValues, array $itemData, array $definitions): bool
+    {
+        helper('attribute');
+        foreach ($definitions as $definition) {
+            $attributeName = $definition['definition_name'];
+            $attributeValue = $attributeValues[$attributeName] ?? null;
+
+            if (isset($attributeValue) && strcasecmp($attributeValue, '_DELETE_') === 0) {
+                if (!$this->deleteAttributeLinks($itemData['item_id'], $definition['definition_id'])) {
+                    return false;
+                }
+                continue;
+            }
+
+            // Create attribute value
+            if (!empty($attributeValue) || $attributeValue === '0') {
+                if ($definition['definition_type'] === CHECKBOX) {
+                    $checkbox_is_unchecked = (strcasecmp($attributeValue, 'false') === 0 || $attributeValue === '0');
+                    $attributeValue = $checkbox_is_unchecked ? '0' : '1';
+
+                    $attribute_id = $this->storeCSVAttributeValue($attributeValue, $definition, $itemData['item_id']);
+                } elseif (!empty($attributeValue) || $attributeValue === '0') {
+                    $attribute_id = $this->storeCSVAttributeValue($attributeValue, $definition, $itemData['item_id']);
+                } else {
+                    return false;
+                }
+
+                if (!$attribute_id) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Saves the attribute_value and attribute_link in a CSV file if necessary
+     *
+     * @param string $value
+     * @param array $attributeData
+     * @param int $itemId
+     * @return bool|int
+     */
+    private function storeCSVAttributeValue(string $value, array $attributeData, int $itemId): bool|int
+    {
+        $this->db->transStart();
+        $attributeId = $this->attributeValueExists($value, $attributeData['definition_type']);
+
+        $this->deleteAttributeLinks($itemId, $attributeData['definition_id']);
+
+        if (!$attributeId) {
+            $attributeId = $this->saveAttributeValue($value, $attributeData['definition_id'], $itemId, false, $attributeData['definition_type']);
+        } else {
+            helper('attribute');
+            $dataType = getAttributeDataType($attributeData['definition_type']);
+            $storedValue = $this->getAttributeValueByAttributeId($attributeId, $dataType);
+
+            // Update the attribute value if only the case has changed and only for text values.
+            if ($dataType === 'attribute_value'
+                && is_string($storedValue)
+                && strcasecmp($storedValue, $value) === 0
+                && $storedValue !== $value) {
+                $attributeId = $this->saveAttributeValue($value, $attributeData['definition_id'], $itemId, $attributeId, $attributeData['definition_type']);
+            } elseif (!$this->saveAttributeLink($itemId, $attributeData['definition_id'], $attributeId)) {
+                return false;
+            }
+        }
+
+        $this->db->transComplete();
+
+        if (!$this->db->transStatus()) {
+            return false;
+        }
+
+        return $attributeId;
     }
 
     /**
@@ -887,15 +1046,14 @@ class Attribute extends Model
         return $builder->update(['deleted' => DELETED]);
     }
 
-	/**
-	 * Deletes attribute links by definition ID
-	 *
-	 * @param int|array $definition_id
-	 */
+    /**
+     * Deletes attribute links by definition ID
+     *
+     * @param int|array $definition_id
+     */
     public function deleteAttributeLinksByDefinitionId(int|array $definition_id): void
     {
-        if(!is_array($definition_id))
-        {
+        if (!is_array($definition_id)) {
             $definition_id = [$definition_id];
         }
 
@@ -939,7 +1097,7 @@ class Attribute extends Model
      *
      * @return boolean true is returned if the delete was successful or false if there were any failures
      */
-    public function delete_orphaned_values(): bool
+    public function deleteOrphanedValues(): bool
     {
         $subquery = $this->db->table('attribute_links')
             ->distinct()
@@ -1027,7 +1185,7 @@ class Attribute extends Model
      *
      * @param int $definitionId
      * @param int $attributeId
-     * @return \CodeIgniter\Database\BaseBuilder
+     * @return void
      */
     private function deleteAttributeLinksByDefinitionIdAndAttributeId(int $definitionId, int $attributeId): void
     {
@@ -1038,4 +1196,41 @@ class Attribute extends Model
         $builder->where('attribute_id', $attributeId);
         $builder->delete();
     }
+
+    /**
+     * Updates the attribute_value, attribute_date, or attribute_decimal column in the attribute_values table based on
+     * the provided data type for a specific attribute ID.
+     *
+     * @param int $attributeId
+     * @param string $dataType
+     * @param mixed $attributeValue
+     * @return void
+     */
+    private function updateAttributeValue(int $attributeId, string $dataType, mixed $attributeValue): void
+    {
+        helper('attribute');
+        validateAttributeValueType($dataType);
+
+        // Update the attribute_values table
+        $builder = $this->db->table('attribute_values');
+        $builder->set([$dataType => $attributeValue]);
+        $builder->where('attribute_id', $attributeId);
+        $builder->update();
+
+        // Check if this attribute_id is linked to definition_id = -1 (category dropdown) using COUNT
+        $linkBuilder = $this->db->table('attribute_links');
+        $linkBuilder->selectCount('attribute_id', 'cnt');
+        $linkBuilder->where('attribute_id', $attributeId);
+        $linkBuilder->where('definition_id', CATEGORY_DEFINITION_ID);
+        $countRow = $linkBuilder->get()->getRow();
+        $isCategoryDropdownAttribute = $countRow && $countRow->cnt > 0;
+
+        // Update the items.category column to match new capitalization.
+        if ($isCategoryDropdownAttribute) {
+            $itemsBuilder = $this->db->table('items');
+            $itemsBuilder->set(['category' => $attributeValue]);
+            $itemsBuilder->where('category', $attributeValue);
+            $itemsBuilder->update();
+        }
+    }
 }
diff --git a/app/Models/Customer.php b/app/Models/Customer.php
index 2dd58c87a..8ffdd62ae 100644
--- a/app/Models/Customer.php
+++ b/app/Models/Customer.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use CodeIgniter\Database\ResultInterface;
 use Config\OSPOS;
+use stdClass;
 
 /**
  * Customer class
@@ -128,7 +129,7 @@ class Customer extends Person
     /**
      * Gets stats about a particular customer
      */
-    public function get_stats(int $customer_id)
+    public function get_stats(int $customer_id): ?stdClass
     {
         $db_prefix = $this->db->getPrefix();
         $totals_decimals = totals_decimals();
@@ -242,6 +243,25 @@ class Customer extends Person
         $builder->update(['points' => $value]);
     }
 
+    /**
+     * Atomically adjusts a customer's reward points by a signed delta, failing if a
+     * negative delta would take the balance below zero
+     */
+    public function adjustRewardPoints(int $customerId, float $delta): bool
+    {
+        $builder = $this->db->table('customers');
+        $builder->where('person_id', $customerId);
+
+        if ($delta < 0) {
+            $builder->where('points >=', abs($delta));
+        }
+
+        $operator = $delta >= 0 ? '+' : '-';
+        $builder->set('points', 'points ' . $operator . ' ' . $this->db->escape(abs($delta)), false);
+
+        return $builder->update() && $this->db->affectedRows() > 0;
+    }
+
     /**
      * @param $customer_id
      * @param bool $purge
diff --git a/app/Models/Employee.php b/app/Models/Employee.php
index 098139740..1e6427e4d 100644
--- a/app/Models/Employee.php
+++ b/app/Models/Employee.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Session\Session;
+use stdClass;
 
 /**
  * Employee class
@@ -129,46 +130,57 @@ class Employee extends Person
      */
     public function save_employee(array &$person_data, array &$employee_data, array &$grants_data, int $employee_id = NEW_ENTRY): bool
     {
-        $success = false;
+        $success = true;
+        $isNewEmployee = ($employee_id == NEW_ENTRY || !$this->exists($employee_id));
+        $grantChangeDisallowed = filter_var(getenv('DISALLOW_GRANT_CHANGE'), FILTER_VALIDATE_BOOLEAN);
 
         // Run these queries as a transaction, we want to make sure we do all or nothing
         $this->db->transStart();
 
-        if (ENVIRONMENT != 'testing' && parent::save_value($person_data, $employee_id)) {
-            $builder = $this->db->table('employees');
-            if ($employee_id == NEW_ENTRY || !$this->exists($employee_id)) {
+        if ($grantChangeDisallowed && $isNewEmployee && !empty($grants_data)) {
+            $this->db->transComplete();
+
+            return false;
+        }
+
+        $personSaved = parent::save_value($person_data, $employee_id);
+
+        if ($isNewEmployee && !$personSaved) {
+            // A new employee must have a person record; abort if the insert failed
+            $this->db->transComplete();
+
+            return false;
+        }
+
+        if ($personSaved) {
+            if ($isNewEmployee) {
                 $employee_data['person_id'] = $employee_id = $person_data['person_id'];
-                $success = $builder->insert($employee_data);
+                $success = $this->db->table('employees')->insert($employee_data);
             } else {
-                $builder->where('person_id', $employee_id);
-                $success = $builder->update($employee_data);
+                $success = $success && $this->db->table('employees')->where('person_id', $employee_id)->update($employee_data);
             }
+        }
 
-            // We have either inserted or updated a new employee, now lets set permissions.
-            if ($success) {
-                // First lets clear out any grants the employee currently has.
-                $builder = $this->db->table('grants');
-                $success = $builder->delete(['person_id' => $employee_id]);
+        // Grants update is gated only by the DISALLOW_GRANT_CHANGE flag, not by
+        // whether person/employee data was actually written (a 0-row affected
+        // update on existing data is a no-op, not a failure).
+        if (!$grantChangeDisallowed && !empty($grants_data)) {
+            $success = $success && $this->db->table('grants')->delete(['person_id' => $employee_id]);
 
-                // Now insert the new grants
-                if ($success) {
-                    foreach ($grants_data as $grant) {
-                        $data = [
-                            'permission_id' => $grant['permission_id'],
-                            'person_id'     => $employee_id,
-                            'menu_group'    => $grant['menu_group']
-                        ];
+            foreach ($grants_data as $grant) {
+                $data = [
+                    'permission_id' => $grant['permission_id'],
+                    'person_id'     => $employee_id,
+                    'menu_group'    => $grant['menu_group']
+                ];
 
-                        $builder = $this->db->table('grants');
-                        $success = $builder->insert($data);
-                    }
-                }
+                $success = $success && $this->db->table('grants')->insert($data);
             }
         }
 
         $this->db->transComplete();
 
-        $success &= $this->db->transStatus();
+        $success = $success && $this->db->transStatus();
 
         return $success;
     }
@@ -374,11 +386,21 @@ class Employee extends Person
             // Compare passwords depending on the hash version
             if ($row->hash_version === '1' && $row->password === md5($password)) {
                 $builder->where('person_id', $row->person_id);
-                $this->session->set('person_id', $row->person_id);
-                $password_hash = password_hash($password, PASSWORD_DEFAULT);
+                $passwordHash = password_hash($password, PASSWORD_DEFAULT);
+                $updated = $builder->update(['hash_version' => 2, 'password' => $passwordHash]);
 
-                return $builder->update(['hash_version' => 2, 'password' => $password_hash]);
+                if ($updated) {
+                    if (session_status() === PHP_SESSION_ACTIVE) {
+                        $this->session->regenerate(true);
+                    }
+                    $this->session->set('person_id', $row->person_id);
+                }
+
+                return $updated;
             } elseif ($row->hash_version === '2' && password_verify($password, $row->password)) {
+                if (session_status() === PHP_SESSION_ACTIVE) {
+                    $this->session->regenerate(true);
+                }
                 $this->session->set('person_id', $row->person_id);
 
                 return true;
@@ -407,7 +429,7 @@ class Employee extends Person
     /**
      * Gets information about the currently logged in employee.
      */
-    public function get_logged_in_employee_info()
+    public function get_logged_in_employee_info(): float|false|array|int|string|stdClass|null
     {
         if ($this->is_logged_in()) {
             return $this->get_info($this->session->get('person_id'));
@@ -520,7 +542,7 @@ class Employee extends Person
     {
         $success = false;
 
-        if (!getenv('DISALLOW_PASSWORD_CHANGE')) {
+        if (!filter_var(getenv('DISALLOW_PASSWORD_CHANGE'), FILTER_VALIDATE_BOOLEAN)) {
             $this->db->transStart();
 
             $builder = $this->db->table('employees');
diff --git a/app/Models/Giftcard.php b/app/Models/Giftcard.php
index ffa485666..8900f7b5c 100644
--- a/app/Models/Giftcard.php
+++ b/app/Models/Giftcard.php
@@ -106,15 +106,15 @@ class Giftcard extends Model
     /**
      * Gets a giftcard id given a giftcard number
      */
-    public function get_giftcard_id(string $giftcard_number): bool
+    public function getGiftcardId(string $giftcardNumber): int|false
     {
         $builder = $this->db->table('giftcards');
-        $builder->where('giftcard_number', $giftcard_number);
+        $builder->where('giftcard_number', $giftcardNumber);
         $builder->where('deleted', 0);
 
         $query = $builder->get();
 
-        if ($query->getNumRows() == 1) {    // TODO: ===
+        if ($query->getNumRows() === 1) {
             return $query->getRow()->giftcard_id;
         }
 
@@ -291,7 +291,7 @@ class Giftcard extends Model
      */
     public function get_giftcard_value(string $giftcard_number): float    // TODO: we may need to do a search for all float values and for currencies cast them to strings at the point where we get them from the database.
     {
-        if (!$this->exists($this->get_giftcard_id($giftcard_number))) {
+        if (!$this->exists($this->getGiftcardId($giftcard_number))) {
             return 0;
         }
 
@@ -311,6 +311,21 @@ class Giftcard extends Model
         $builder->update(['value' => $value]);
     }
 
+    public function decrementGiftcardValue(string $giftcardNumber, float $amount): bool
+    {
+        if ($amount <= 0.0) {
+            return false;
+        }
+
+        $builder = $this->db->table('giftcards');
+        $builder->where('giftcard_number', $giftcardNumber);
+        $builder->where('deleted', 0);
+        $builder->where('value >=', $amount);
+        $builder->set('value', 'value - ' . $this->db->escape($amount), false);
+
+        return $builder->update() && $this->db->affectedRows() > 0;
+    }
+
     /**
      * Determines if a given giftcard_name exists
      */
@@ -349,7 +364,7 @@ class Giftcard extends Model
      */
     public function get_giftcard_customer(string $giftcard_number): int|null
     {
-        if (!$this->exists($this->get_giftcard_id($giftcard_number))) {
+        if (!$this->exists($this->getGiftcardId($giftcard_number))) {
             return 0;
         }
 
diff --git a/app/Models/Item.php b/app/Models/Item.php
index 0d21edaaa..3eba73183 100644
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -2,9 +2,11 @@
 
 namespace App\Models;
 
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Model;
 use Config\OSPOS;
+use DateTime;
 use ReflectionException;
 use stdClass;
 
@@ -16,6 +18,17 @@ use stdClass;
  */
 class Item extends Model
 {
+
+    public const ALLOWED_SUGGESTIONS_COLUMNS = ['name', 'item_number', 'description', 'cost_price', 'unit_price'];
+    public const ALLOWED_SUGGESTIONS_COLUMNS_WITH_EMPTY = ['', 'name', 'item_number', 'description', 'cost_price', 'unit_price'];
+
+    /**
+     * Sentinel posted by the bulk edit form to clear supplier_id, since an empty
+     * value there means "leave the column alone". Non-numeric so it can never
+     * collide with a suppliers.person_id.
+     */
+    public const CLEAR_SUPPLIER_OPTION = 'NONE';
+
     public const ALLOWED_BULK_EDIT_FIELDS = [
         'name',
         'category',
@@ -55,21 +68,22 @@ class Item extends Model
         'hsn_code'
     ];
 
-
     /**
      * Determines if a given item_id is an item
      */
     public function exists(string $item_id, bool $ignore_deleted = false, bool $deleted = false): bool
     {
         $builder = $this->db->table('items');
+        $builder->groupStart();
         $builder->where('item_id', $item_id);
         $builder->orWhere('item_number', $item_id);
+        $builder->groupEnd();
 
         if (!$ignore_deleted) {
             $builder->where('deleted', $deleted);
         }
 
-        return ($builder->get()->getNumRows() === 1);
+        return ($builder->get()->getNumRows() >= 1);
     }
 
     /**
@@ -128,16 +142,183 @@ class Item extends Model
     }
 
     /**
-     * Perform a search on items
+     * Parse search string for attribute-specific queries
+     * Supports syntax like "color: blue size: large" or "color:blue AND size:large"
+     *
+     * @param string $search The raw search string
+     * @return array{terms: array, attributes: array} Parsed terms and attribute queries
      */
-    public function search(string $search, array $filters, ?int $rows = 0, ?int $limit_from = 0, ?string $sort = 'items.name', ?string $order = 'asc', ?bool $count_only = false)
+    public function parseAttributeSearch(string $search): array
+    {
+        $result = [
+            'terms' => [],
+            'attributes' => []
+        ];
+
+        if ($search === '') {
+            return $result;
+        }
+
+        $pattern = '/([[:alpha:]][[:alnum:] _-]*?)\s*:\s*([0-9]+,[0-9]+|[^\s,]+)(?:\s*,\s*|\s+(?:AND|OR)\s+)?/iu';
+        $remaining = preg_replace($pattern, '', $search);
+
+        if (preg_match_all($pattern, $search, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $attrName = strtolower(trim($match[1]));
+                $attrValue = trim($match[2]);
+                $result['attributes'][$attrName][] = $attrValue;
+            }
+        }
+
+        $remaining = trim(preg_replace('/\s+/', ' ', $remaining));
+        if ($remaining !== '') {
+            $result['terms'][] = $remaining;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Joins rather than correlated EXISTS per name: EXISTS made MySQL materialize one
+     * subquery as a full attribute_links scan instead of using attribute_links_uq2 (~400ms vs ~150ms).
+     *
+     * $definitionInfo must be resolved by the caller before $builder exists - a query here
+     * would reset CodeIgniter's table-alias tracking and corrupt $builder's "items" alias.
+     *
+     * @param array<int, array{name: string, type: string}> $definitionInfo definition_id => info, from getDefinitionsByFlags(..., true)
+     * @param array<string, string[]> $parsedAttributes Attribute name => list of search values
+     * @param int[] $allowedDefinitionIds Definition ids this search is scoped to
+     * @return string[] Attribute names that resolved to a known, allowed definition and were joined into $builder
+     */
+    private function applyNamedAttributeSearch($builder, array $definitionInfo, array $parsedAttributes, array $allowedDefinitionIds): array
+    {
+        $definitionIdByName = [];
+        foreach ($definitionInfo as $id => $info) {
+            $name = is_array($info) ? $info['name'] : $info;
+            $definitionIdByName[strtolower($name)] = (int) $id;
+        }
+
+        $consumedNames = [];
+        $index = 0;
+        foreach ($parsedAttributes as $attrName => $values) {
+            if (!isset($definitionIdByName[$attrName])) {
+                continue;
+            }
+
+            $definitionId = $definitionIdByName[$attrName];
+
+            if (!in_array($definitionId, $allowedDefinitionIds, true)) {
+                continue;
+            }
+
+            $consumedNames[] = $attrName;
+
+            $defType = is_array($definitionInfo[$definitionId]) ? ($definitionInfo[$definitionId]['type'] ?? TEXT) : TEXT;
+
+            $linksAlias = "named_attr_links_{$index}";
+            $valuesAlias = "named_attr_values_{$index}";
+            $index++;
+
+            $builder->join(
+                "attribute_links AS {$linksAlias}",
+                "{$linksAlias}.item_id = items.item_id AND {$linksAlias}.definition_id = {$definitionId} AND {$linksAlias}.receiving_id IS NULL AND {$linksAlias}.sale_id IS NULL"
+            );
+            $builder->join(
+                "attribute_values AS {$valuesAlias}",
+                "{$valuesAlias}.attribute_id = {$linksAlias}.attribute_id"
+            );
+
+            $builder->groupStart();
+            $matched = false;
+            foreach ($values as $value) {
+                if ($defType === DECIMAL) {
+                    $parsedValue = parse_decimals($value);
+                    if ($parsedValue === false) {
+                        continue;
+                    }
+                    $builder->orWhere("{$valuesAlias}.attribute_decimal", $parsedValue);
+                    $matched = true;
+                } elseif ($defType === DATE) {
+                    $config = config(OSPOS::class)->settings;
+                    $date = DateTime::createFromFormat($config['dateformat'], $value);
+                    if ($date === false) {
+                        continue;
+                    }
+                    $builder->orWhere("{$valuesAlias}.attribute_date", $date->format('Y-m-d'));
+                    $matched = true;
+                } else {
+                    $builder->orWhere("{$valuesAlias}.attribute_value", $value);
+                    $matched = true;
+                }
+            }
+            $builder->groupEnd();
+
+            if (!$matched) {
+                $builder->where('1 = 0', null, false);
+            }
+        }
+
+        return $consumedNames;
+    }
+
+    /**
+     * Get attribute definition ID from column name for sorting
+     *
+     * @param string $sortColumn The sort column name
+     * @return int|null The definition ID or null if not an attribute column
+     */
+    private function getAttributeSortDefinitionId(string $sortColumn): ?int
+    {
+        if (!ctype_digit($sortColumn)) {
+            return null;
+        }
+
+        return (int) $sortColumn;
+    }
+
+    /**
+     * Left-joins the attribute tables needed to sort by a given attribute definition,
+     * and applies the order-by using the type-appropriate value column.
+     *
+     * $definitionInfo must be resolved by the caller before any joins are added to $builder —
+     * see the note on applyNamedAttributeSearch() for why a query here would corrupt $builder.
+     *
+     * @param array<int, array{name: string, type: string}> $definitionInfo definition_id => info, from getDefinitionsByFlags(..., true)
+     */
+    private function applyAttributeSort($builder, array $definitionInfo, int $sortDefinitionId, string $order): void
+    {
+        $sortAlias = "sort_attr_{$sortDefinitionId}";
+        $builder->join("attribute_links AS {$sortAlias}", "{$sortAlias}.item_id = items.item_id AND {$sortAlias}.definition_id = {$sortDefinitionId} AND {$sortAlias}.sale_id IS NULL AND {$sortAlias}.receiving_id IS NULL", 'left');
+        $builder->join("attribute_values AS {$sortAlias}_val", "{$sortAlias}_val.attribute_id = {$sortAlias}.attribute_id", 'left');
+
+        $sortColumn = "{$sortAlias}_val.attribute_value";
+
+        if (isset($definitionInfo[$sortDefinitionId])) {
+            $defType = is_array($definitionInfo[$sortDefinitionId]) ? ($definitionInfo[$sortDefinitionId]['type'] ?? TEXT) : TEXT;
+            if ($defType === DECIMAL) {
+                $sortColumn = "{$sortAlias}_val.attribute_decimal";
+            } elseif ($defType === DATE) {
+                $sortColumn = "{$sortAlias}_val.attribute_date";
+            }
+        }
+
+        $builder->orderBy("MAX($sortColumn)", $order);
+    }
+
+    /**
+     * Perform a search on items
+     *
+     * Resolves qualifying item_ids first (Phase A), then joins the expensive display-only
+     * tables scoped to just those ids (Phase B) instead of the whole matching set.
+     */
+    public function search(string $search, array $filters, ?int $rows = 0, ?int $limitFrom = 0, ?string $sort = 'items.name', ?string $order = 'asc', ?bool $countOnly = false)
     {
         // Set default values
         if ($rows == null) {
             $rows = 0;
         }
-        if ($limit_from == null) {
-            $limit_from = 0;
+        if ($limitFrom == null) {
+            $limitFrom = 0;
         }
         if ($sort == null) {
             $sort = 'items.name';
@@ -145,53 +326,196 @@ class Item extends Model
         if ($order == null) {
             $order = 'asc';
         }
-        if ($count_only == null) {
-            $count_only = false;
+        if ($countOnly == null) {
+            $countOnly = false;
         }
 
         $config = config(OSPOS::class)->settings;
-        $builder = $this->db->table('items AS items');    // TODO: I'm not sure if it's needed to write items AS items... I think you can just get away with items
+
+        $dateFormatEnabled = empty($config['date_or_time_format']);
+        $hasTransDateRange = !empty($filters['start_date']) && !empty($filters['end_date']);
+        $rangeStart = $hasTransDateRange ? ($dateFormatEnabled ? $filters['start_date'] : rawurldecode($filters['start_date'])) : null;
+        $rangeEnd = $hasTransDateRange ? ($dateFormatEnabled ? $filters['end_date'] : rawurldecode($filters['end_date'])) : null;
+        $applyTransDateRange = function ($builder) use ($hasTransDateRange, $dateFormatEnabled, $rangeStart, $rangeEnd) {
+            if (!$hasTransDateRange) {
+                return;
+            }
+            $column = $dateFormatEnabled ? 'DATE_FORMAT(trans_date, "%Y-%m-%d")' : 'trans_date';
+            $builder->groupStart();
+            $builder->where("$column >=", $rangeStart);
+            $builder->where("$column <=", $rangeEnd);
+            $builder->groupEnd();
+        };
+
+        $definitionIds = array_map('intval', $filters['definition_ids']);
+        $attributesEnabled = count($filters['definition_ids']) > 0;
+        $customAttributeSearch = $attributesEnabled && $filters['search_custom'] && !empty($search);
+
+        // Resolved before $idBuilder exists - see applyNamedAttributeSearch() for why.
+        $attribute = model(Attribute::class);
+        $definitionInfo = $attribute->getDefinitionsByFlags(Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_SEARCH, true);
+
+        if ($attributesEnabled) {
+            $this->db->simpleQuery('SET SESSION group_concat_max_len=49152');
+        }
+
+        $idBuilder = $this->db->table('items AS items');
+
+        if ($customAttributeSearch) {
+            // Matching is per attribute row (WHERE, pre-GROUP BY), not against a GROUP_CONCAT
+            // blob (HAVING, post-GROUP BY), so a match can't bleed across definitions.
+            $idBuilder->select('items.item_id');
+            $idBuilder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $definitionIds) . ')', 'left');
+            $idBuilder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
+        } else {
+            $idBuilder->select('items.item_id');
+        }
+
+        $idBuilder->join('suppliers AS suppliers', 'suppliers.person_id = items.supplier_id', 'left');
+        $idBuilder->join('inventory AS inventory', 'inventory.trans_items = items.item_id');
+
+        if ($filters['stock_location_id'] > -1) {
+            $idBuilder->join('item_quantities AS item_quantities', 'item_quantities.item_id = items.item_id');
+            $idBuilder->where('location_id', $filters['stock_location_id']);
+        }
+
+        $applyTransDateRange($idBuilder);
+
+        $parsedAttributeSearch = $customAttributeSearch ? $this->parseAttributeSearch($search) : null;
+        $freeTextSearch = $search;
+
+        if ($parsedAttributeSearch !== null && !empty($parsedAttributeSearch['attributes'])) {
+            $consumedNames = $this->applyNamedAttributeSearch($idBuilder, $definitionInfo, $parsedAttributeSearch['attributes'], $definitionIds);
+
+            $unconsumedTerms = $parsedAttributeSearch['terms'];
+            foreach ($parsedAttributeSearch['attributes'] as $attrName => $values) {
+                if (in_array($attrName, $consumedNames, true)) {
+                    continue;
+                }
+                foreach ($values as $value) {
+                    $unconsumedTerms[] = $value;
+                }
+            }
+
+            $freeTextSearch = implode(' ', $unconsumedTerms);
+        }
+
+        if (!empty($freeTextSearch)) {
+            if ($customAttributeSearch) {
+                $format = $this->db->escape(dateformat_mysql());
+                $attributeValuesTable = $this->db->prefixTable('attribute_values');
+                $idBuilder->groupStart();
+                $idBuilder->like('attribute_values.attribute_value', $freeTextSearch);
+                $idBuilder->orLike(new RawSql("DATE_FORMAT($attributeValuesTable.attribute_date, $format)"), $freeTextSearch);
+                $idBuilder->orLike('attribute_values.attribute_decimal', $freeTextSearch);
+                $idBuilder->groupEnd();
+            } else {
+                $idBuilder->groupStart();
+                $idBuilder->like('name', $search);
+                $idBuilder->orLike('item_number', $search);
+                $idBuilder->orLike('items.item_id', $search);
+                $idBuilder->orLike('company_name', $search);
+                $idBuilder->orLike('items.category', $search);
+                $idBuilder->groupEnd();
+            }
+        }
+
+        $idBuilder->where('items.deleted', $filters['is_deleted']);
+
+        if ($filters['empty_upc']) {
+            $idBuilder->where('item_number', null);
+        }
+        if ($filters['low_inventory'] && $filters['stock_location_id'] > -1) {
+            $idBuilder->where('item_quantities.quantity <=', new RawSql('items.reorder_level'));
+        }
+        if ($filters['is_serialized']) {
+            $idBuilder->where('is_serialized', 1);
+        }
+        if ($filters['no_description']) {
+            $idBuilder->where('items.description', '');
+        }
+        if ($filters['temporary']) {
+            $idBuilder->where('items.item_type', ITEM_TEMP);
+        } else {
+            $nonTemp = [ITEM, ITEM_KIT, ITEM_AMOUNT_ENTRY];
+            $idBuilder->whereIn('items.item_type', $nonTemp);
+        }
+
+        // Avoid duplicated entries with same name because of inventory reporting multiple changes on the same item in the same date range
+        $idBuilder->groupBy('items.item_id');
 
         // get_found_rows case
-        if ($count_only) {
-            $builder->select('COUNT(DISTINCT items.item_id) AS count');
+        if ($countOnly) {
+            return $idBuilder->countAllResults();
+        }
+
+        // Order by name of item by default
+        $sortDefinitionId = $this->getAttributeSortDefinitionId($sort);
+        if ($sort === 'quantity' && $filters['stock_location_id'] <= -1) {
+            $itemQuantitiesTable = $this->db->prefixTable('item_quantities');
+            $idBuilder->join(
+                "(SELECT item_id, SUM(quantity) AS total_quantity FROM $itemQuantitiesTable GROUP BY item_id) AS item_quantity_totals",
+                'item_quantity_totals.item_id = items.item_id',
+                'left'
+            );
+            $idBuilder->orderBy('MAX(item_quantity_totals.total_quantity)', $order);
+        } elseif ($sortDefinitionId !== null) {
+            $this->applyAttributeSort($idBuilder, $definitionInfo, $sortDefinitionId, $order);
         } else {
-            $builder->select('MAX(items.item_id) AS item_id');
-            $builder->select('MAX(items.name) AS name');
-            $builder->select('MAX(items.category) AS category');
-            $builder->select('MAX(items.supplier_id) AS supplier_id');
-            $builder->select('MAX(items.item_number) AS item_number');
-            $builder->select('MAX(items.description) AS description');
-            $builder->select('MAX(items.cost_price) AS cost_price');
-            $builder->select('MAX(items.unit_price) AS unit_price');
-            $builder->select('MAX(items.reorder_level) AS reorder_level');
-            $builder->select('MAX(items.receiving_quantity) AS receiving_quantity');
-            $builder->select('MAX(items.pic_filename) AS pic_filename');
-            $builder->select('MAX(items.allow_alt_description) AS allow_alt_description');
-            $builder->select('MAX(items.is_serialized) AS is_serialized');
-            $builder->select('MAX(items.pack_name) AS pack_name');
-            $builder->select('MAX(items.tax_category_id) AS tax_category_id');
-            $builder->select('MAX(items.deleted) AS deleted');
+            $idBuilder->orderBy($sort, $order);
+        }
 
-            $builder->select('MAX(suppliers.person_id) AS person_id');
-            $builder->select('MAX(suppliers.company_name) AS company_name');
-            $builder->select('MAX(suppliers.agency_name) AS agency_name');
-            $builder->select('MAX(suppliers.account_number) AS account_number');
-            $builder->select('MAX(suppliers.deleted) AS deleted');
+        if ($rows > 0) {
+            $idBuilder->limit($rows, $limitFrom);
+        }
 
-            $builder->select('MAX(inventory.trans_id) AS trans_id');
-            $builder->select('MAX(inventory.trans_items) AS trans_items');
-            $builder->select('MAX(inventory.trans_user) AS trans_user');
-            $builder->select('MAX(inventory.trans_date) AS trans_date');
-            $builder->select('MAX(inventory.trans_comment) AS trans_comment');
-            $builder->select('MAX(inventory.trans_location) AS trans_location');
-            $builder->select('MAX(inventory.trans_inventory) AS trans_inventory');
+        $itemIds = array_column($idBuilder->get()->getResultArray(), 'item_id');
 
-            if ($filters['stock_location_id'] > -1) {
-                $builder->select('MAX(item_quantities.item_id) AS qty_item_id');
-                $builder->select('MAX(item_quantities.location_id) AS location_id');
-                $builder->select('MAX(item_quantities.quantity) AS quantity');
-            }
+        if (empty($itemIds)) {
+            return $this->db->table('items AS items')->where('1 = 0')->get();
+        }
+
+        $builder = $this->db->table('items AS items');
+
+        $builder->select('MAX(items.item_id) AS item_id');
+        $builder->select('MAX(items.name) AS name');
+        $builder->select('MAX(items.category) AS category');
+        $builder->select('MAX(items.supplier_id) AS supplier_id');
+        $builder->select('MAX(items.item_number) AS item_number');
+        $builder->select('MAX(items.description) AS description');
+        $builder->select('MAX(items.cost_price) AS cost_price');
+        $builder->select('MAX(items.unit_price) AS unit_price');
+        $builder->select('MAX(items.reorder_level) AS reorder_level');
+        $builder->select('MAX(items.receiving_quantity) AS receiving_quantity');
+        $builder->select('MAX(items.pic_filename) AS pic_filename');
+        $builder->select('MAX(items.allow_alt_description) AS allow_alt_description');
+        $builder->select('MAX(items.is_serialized) AS is_serialized');
+        $builder->select('MAX(items.pack_name) AS pack_name');
+        $builder->select('MAX(items.tax_category_id) AS tax_category_id');
+        $builder->select('MAX(items.deleted) AS deleted');
+
+        $builder->select('MAX(suppliers.person_id) AS person_id');
+        $builder->select('MAX(suppliers.company_name) AS company_name');
+        $builder->select('MAX(suppliers.agency_name) AS agency_name');
+        $builder->select('MAX(suppliers.account_number) AS account_number');
+        $builder->select('MAX(suppliers.deleted) AS supplier_deleted');
+
+        $builder->select('MAX(inventory.trans_id) AS trans_id');
+        $builder->select('MAX(inventory.trans_items) AS trans_items');
+        $builder->select('MAX(inventory.trans_user) AS trans_user');
+        $builder->select('MAX(inventory.trans_date) AS trans_date');
+        $builder->select('MAX(inventory.trans_comment) AS trans_comment');
+        $builder->select('MAX(inventory.trans_location) AS trans_location');
+        $builder->select('MAX(inventory.trans_inventory) AS trans_inventory');
+
+        $sortByQuantityAllLocations = $sort === 'quantity' && $filters['stock_location_id'] <= -1;
+
+        if ($filters['stock_location_id'] > -1) {
+            $builder->select('MAX(item_quantities.item_id) AS qty_item_id');
+            $builder->select('MAX(item_quantities.location_id) AS location_id');
+            $builder->select('MAX(item_quantities.quantity) AS quantity');
+        } elseif ($sortByQuantityAllLocations) {
+            $builder->select('MAX(item_quantity_totals.total_quantity) AS quantity');
         }
 
         $builder->join('suppliers AS suppliers', 'suppliers.person_id = items.supplier_id', 'left');
@@ -200,75 +524,39 @@ class Item extends Model
         if ($filters['stock_location_id'] > -1) {
             $builder->join('item_quantities AS item_quantities', 'item_quantities.item_id = items.item_id');
             $builder->where('location_id', $filters['stock_location_id']);
+        } elseif ($sortByQuantityAllLocations) {
+            $itemQuantitiesTable = $this->db->prefixTable('item_quantities');
+            $builder->join(
+                "(SELECT item_id, SUM(quantity) AS total_quantity FROM $itemQuantitiesTable GROUP BY item_id) AS item_quantity_totals",
+                'item_quantity_totals.item_id = items.item_id',
+                'left'
+            );
         }
 
-        $where = empty($config['date_or_time_format'])
-            ? 'DATE_FORMAT(trans_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date'])
-            : 'trans_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date']));
-        $builder->where($where);
+        $applyTransDateRange($builder);
 
-        $attributes_enabled = count($filters['definition_ids']) > 0;
-
-        if (!empty($search)) {
-            if ($attributes_enabled && $filters['search_custom']) {
-                $builder->havingLike('attribute_values', $search);
-                $builder->orHavingLike('attribute_dtvalues', $search);
-                $builder->orHavingLike('attribute_dvalues', $search);
-            } else {
-                $builder->groupStart();
-                $builder->like('name', $search);
-                $builder->orLike('item_number', $search);
-                $builder->orLike('items.item_id', $search);
-                $builder->orLike('company_name', $search);
-                $builder->orLike('items.category', $search);
-                $builder->groupEnd();
-            }
-        }
-
-        if ($attributes_enabled) {
+        if ($attributesEnabled) {
             $format = $this->db->escape(dateformat_mysql());
-            $this->db->simpleQuery('SET SESSION group_concat_max_len=49152');
-            $builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
-            $builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
-            $builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
-            $builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left');
+            $attributeLinksTable = $this->db->prefixTable('attribute_links');
+            $attributeValuesTable = $this->db->prefixTable('attribute_values');
+            $builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', $attributeLinksTable.definition_id, $attributeValuesTable.attribute_value) ORDER BY $attributeLinksTable.definition_id SEPARATOR '|') AS attribute_values");
+            $builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', $attributeLinksTable.definition_id, DATE_FORMAT($attributeValuesTable.attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
+            $builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', $attributeLinksTable.definition_id, $attributeValuesTable.attribute_decimal) SEPARATOR '|') AS attribute_dvalues");
+            $builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND attribute_links.definition_id IN (' . implode(',', $definitionIds) . ')', 'left');
             $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
         }
 
-        $builder->where('items.deleted', $filters['is_deleted']);
+        $builder->whereIn('items.item_id', $itemIds);
 
-        if ($filters['empty_upc']) {
-            $builder->where('item_number', null);
-        }
-        if ($filters['low_inventory']) {
-            $builder->where('quantity <=', 'reorder_level');
-        }
-        if ($filters['is_serialized']) {
-            $builder->where('is_serialized', 1);
-        }
-        if ($filters['no_description']) {
-            $builder->where('items.description', '');
-        }
-        if ($filters['temporary']) {
-            $builder->where('items.item_type', ITEM_TEMP);
-        } else {
-            $non_temp = [ITEM, ITEM_KIT, ITEM_AMOUNT_ENTRY];
-            $builder->whereIn('items.item_type', $non_temp);
-        }
-
-        // get_found_rows case
-        if ($count_only) {
-            return $builder->get()->getRow()->count;
-        }
-
-        // Avoid duplicated entries with same name because of inventory reporting multiple changes on the same item in the same date range
         $builder->groupBy('items.item_id');
 
-        // Order by name of item by default
-        $builder->orderBy($sort, $order);
-
-        if ($rows > 0) {
-            $builder->limit($rows, $limit_from);
+        // Re-apply order: WHERE...IN + GROUP BY do not preserve Phase A's row order
+        if ($sortByQuantityAllLocations) {
+            $builder->orderBy('MAX(item_quantity_totals.total_quantity)', $order);
+        } elseif ($sortDefinitionId !== null) {
+            $this->applyAttributeSort($builder, $definitionInfo, $sortDefinitionId, $order);
+        } else {
+            $builder->orderBy($sort, $order);
         }
 
         return $builder->get();
@@ -349,7 +637,7 @@ class Item extends Model
     /**
      * Gets information about a particular item by item id or number
      */
-    public function get_info_by_id_or_number(string $item_id, bool $include_deleted = true)
+    public function get_info_by_id_or_number(string $item_id, bool $include_deleted = true): stdClass|string
     {
         $builder = $this->db->table('items');
         $builder->groupStart();
@@ -386,9 +674,10 @@ class Item extends Model
     public function get_item_id(string $item_number, bool $ignore_deleted = false, bool $deleted = false): bool|int
     {
         $builder = $this->db->table('items');
-        $builder->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
+        $builder->groupStart();
         $builder->where('item_number', $item_number);
         $builder->orWhere('item_id', $item_number);
+        $builder->groupEnd();
 
         if (!$ignore_deleted) {
             $builder->where('items.deleted', $deleted);
@@ -461,15 +750,72 @@ class Item extends Model
         return $builder->update($item_data);
     }
 
+    /**
+     * Reduces raw bulk edit input to the columns that may be bulk updated.
+     *
+     * Keys outside ALLOWED_BULK_EDIT_FIELDS are dropped, and a field that is absent,
+     * empty, or invalid for its column is left untouched so it keeps its current
+     * value. Prices and quantities are locale-parsed the same way postSave() does,
+     * booleans must be 0/1, and supplier_id must be numeric. supplier_id is
+     * nullable, so CLEAR_SUPPLIER_OPTION is how the form asks for it to be cleared.
+     */
+    public static function filterBulkEditFields(array $input): array
+    {
+        $itemData = [];
+
+        foreach (self::ALLOWED_BULK_EDIT_FIELDS as $field) {
+            $value = $input[$field] ?? null;
+
+            if ($value === null || $value === '' || !is_scalar($value)) {
+                continue;
+            }
+
+            if ($field === 'supplier_id') {
+                if ($value === self::CLEAR_SUPPLIER_OPTION) {
+                    $itemData[$field] = null;
+                } elseif (ctype_digit((string)$value)) {
+                    $itemData[$field] = (int)$value;
+                }
+
+                continue;
+            }
+
+            if ($field === 'cost_price' || $field === 'unit_price') {
+                $value = parse_decimals((string)$value);
+            } elseif ($field === 'reorder_level') {
+                $value = parse_quantity((string)$value);
+            } elseif ($field === 'allow_alt_description' || $field === 'is_serialized') {
+                if (!in_array((string)$value, ['0', '1'], true)) {
+                    continue;
+                }
+            }
+
+            if ($value === false) {
+                continue;
+            }
+
+            $itemData[$field] = $value;
+        }
+
+        return $itemData;
+    }
+
     /**
      * Updates multiple items at once
      */
-    public function update_multiple(array $item_data, string $item_ids): bool
+    public function updateMultiple(array $itemData, string $itemIds): bool
     {
-        $builder = $this->db->table('items');
-        $builder->whereIn('item_id', explode(':', $item_ids));
+        // Query Builder bypasses $allowedFields, so the whitelist is enforced here
+        $itemData = array_intersect_key($itemData, array_flip(self::ALLOWED_BULK_EDIT_FIELDS));
 
-        return $builder->update($item_data);
+        if (empty($itemData)) {
+            return false;
+        }
+
+        $builder = $this->db->table('items');
+        $builder->whereIn('item_id', explode(':', $itemIds));
+
+        return $builder->update($itemData);
     }
 
     /**
@@ -544,13 +890,17 @@ class Item extends Model
     public function get_search_suggestion_format(?string $seed = null): string
     {
         $config = config(OSPOS::class)->settings;
-        $seed .= ',' . $config['suggestions_first_column'];
 
-        if ($config['suggestions_second_column'] !== '') {
+        $suggestionsFirstColumn = $this->suggestionColumnIsAllowed($config['suggestions_first_column'])
+            ? $config['suggestions_first_column']
+            : 'name';
+        $seed .= ',' . $suggestionsFirstColumn;
+
+        if ($config['suggestions_second_column'] !== '' && $this->suggestionColumnIsAllowed($config['suggestions_second_column'])) {
             $seed .= ',' . $config['suggestions_second_column'];
         }
 
-        if ($config['suggestions_third_column'] !== '') {
+        if ($config['suggestions_third_column'] !== '' && $this->suggestionColumnIsAllowed($config['suggestions_third_column'])) {
             $seed .= ',' . $config['suggestions_third_column'];
         }
 
@@ -566,9 +916,15 @@ class Item extends Model
         $config = config(OSPOS::class)->settings;
 
         $label = '';
-        $label1 = $config['suggestions_first_column'];
-        $label2 = $config['suggestions_second_column'];
-        $label3 = $config['suggestions_third_column'];
+        $label1 = $this->suggestionColumnIsAllowed($config['suggestions_first_column'])
+            ? $config['suggestions_first_column']
+            : 'name';
+        $label2 = $this->suggestionColumnIsAllowed($config['suggestions_second_column'])
+            ? $config['suggestions_second_column']
+            : '';
+        $label3 = $this->suggestionColumnIsAllowed($config['suggestions_third_column'])
+            ? $config['suggestions_third_column']
+            : '';
 
         $this->format_result_numbers($result_row);
 
@@ -592,6 +948,17 @@ class Item extends Model
         return $label;
     }
 
+    /**
+     * Validates if a column name is in the allowed suggestions columns.
+     *
+     * @param string $columnName
+     * @return bool
+     */
+    private function suggestionColumnIsAllowed(string $columnName): bool
+    {
+        return in_array($columnName, self::ALLOWED_SUGGESTIONS_COLUMNS, true);
+    }
+
     /**
      * Converts decimal money values to their correct locale format.
      *
diff --git a/app/Models/Item_quantity.php b/app/Models/Item_quantity.php
index f7c95c6e5..e622a62d9 100644
--- a/app/Models/Item_quantity.php
+++ b/app/Models/Item_quantity.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Model;
 use stdClass;
 
@@ -84,17 +85,22 @@ class Item_quantity extends Model
     }
 
     /**
-     * changes to quantity of an item according to the given amount.
-     * if $quantity_change is negative, it will be subtracted,
-     * if it is positive, it will be added to the current quantity
+     * Atomically changes an item's quantity at a location by a signed delta.
+     * Positive delta adds; negative delta subtracts. Creates the
+     * item_quantities row if it doesn't yet exist. Negative resulting
+     * quantity is allowed (no floor guard).
      */
-    public function change_quantity(int $item_id, int $location_id, int $quantity_change): bool
+    public function changeQuantity(int $itemId, int $locationId, float $quantityChange): bool
     {
-        $quantity_old = $this->get_item_quantity($item_id, $location_id);
-        $quantity_new = $quantity_old->quantity + $quantity_change;
-        $location_detail = ['item_id' => $item_id, 'location_id' => $location_id, 'quantity' => $quantity_new];
+        $builder = $this->db->table('item_quantities');
+        $builder->set([
+            'item_id'     => $itemId,
+            'location_id' => $locationId,
+            'quantity'    => $quantityChange,
+        ]);
+        $builder->updateFields(['quantity' => new RawSql('quantity + ' . $this->db->escape($quantityChange))]);
 
-        return $this->save_value($location_detail, $item_id, $location_id);
+        return $builder->upsert() !== false;
     }
 
     /**
diff --git a/app/Models/Item_taxes.php b/app/Models/Item_taxes.php
index 0f42aff52..bfb07b36a 100644
--- a/app/Models/Item_taxes.php
+++ b/app/Models/Item_taxes.php
@@ -30,6 +30,26 @@ class Item_taxes extends Model
         return $builder->get()->getResultArray();
     }
 
+    /**
+     * @return array item_id => array of taxes for that item
+     */
+    public function getInfoMultiple(array $itemIds): array
+    {
+        if (empty($itemIds)) {
+            return [];
+        }
+
+        $builder = $this->db->table('items_taxes');
+        $builder->whereIn('item_id', $itemIds);
+
+        $taxesByItemId = [];
+        foreach ($builder->get()->getResultArray() as $tax) {
+            $taxesByItemId[$tax['item_id']][] = $tax;
+        }
+
+        return $taxesByItemId;
+    }
+
     /**
      * Inserts or updates an item's taxes
      */
@@ -37,9 +57,6 @@ class Item_taxes extends Model
     {
         $success = true;
 
-        // Run these queries as a transaction, we want to make sure we do all or nothing
-        $this->db->transStart();
-
         $this->delete($item_id);
 
         $builder = $this->db->table('items_taxes');
@@ -49,10 +66,6 @@ class Item_taxes extends Model
             $success &= $builder->insert($row);
         }
 
-        $this->db->transComplete();
-
-        $success &= $this->db->transStatus();
-
         return $success;
     }
 
diff --git a/app/Models/Module.php b/app/Models/Module.php
index c0e3e6364..a7dab5fdd 100644
--- a/app/Models/Module.php
+++ b/app/Models/Module.php
@@ -32,10 +32,10 @@ class Module extends Model
         if ($query->getNumRows() == 1) {    // TODO: ===
             $row = $query->getRow();
 
-            return lang($row->name_lang_key);
+            return lang('Module.' . $row->module_id);
         }
 
-        return lang('Errors.unknown');
+        return lang('Error.unknown');
     }
 
     /**
@@ -50,10 +50,10 @@ class Module extends Model
         if ($query->getNumRows() == 1) {    // TODO: ===
             $row = $query->getRow();
 
-            return lang($row->desc_lang_key);
+            return lang('Module.' . $row->module_id . '_desc');
         }
 
-        return lang('Errors.unknown');
+        return lang('Error.unknown');
     }
 
     /**
diff --git a/app/Models/Receiving.php b/app/Models/Receiving.php
index 2627418e3..5ce6ab9a6 100644
--- a/app/Models/Receiving.php
+++ b/app/Models/Receiving.php
@@ -241,7 +241,7 @@ class Receiving extends Model
                 $inventory->insert($inv_data, false);
 
                 // Update quantities
-                $item_quantity->change_quantity($item['item_id'], $item['item_location'], $item['quantity_purchased'] * (-$item['receiving_quantity']));
+                $item_quantity->changeQuantity($item['item_id'], $item['item_location'], $item['quantity_purchased'] * (-$item['receiving_quantity']));
             }
         }
 
@@ -294,7 +294,9 @@ class Receiving extends Model
             lang('Sales.check') => lang('Sales.check'),
             lang('Sales.debit') => lang('Sales.debit'),
             lang('Sales.credit') => lang('Sales.credit'),
-            lang('Sales.due') => lang('Sales.due')
+            lang('Sales.due') => lang('Sales.due'),
+            lang('Sales.bank_transfer') => lang('Sales.bank_transfer'),
+            lang('Sales.wallet') => lang('Sales.wallet')
         ];
     }
 
diff --git a/app/Models/Reports/Summary_report.php b/app/Models/Reports/Summary_report.php
index 02592830f..c652f370e 100644
--- a/app/Models/Reports/Summary_report.php
+++ b/app/Models/Reports/Summary_report.php
@@ -49,7 +49,9 @@ abstract class Summary_report extends Report
                 SELECT sales_items_taxes.sale_id AS sale_id,
                     sales_items_taxes.item_id AS item_id,
                     sales_items_taxes.line AS line,
-                    SUM(ROUND(sales_items_taxes.item_tax_amount,' . $decimals . ')) AS tax
+                    SUM(ROUND(sales_items_taxes.item_tax_amount,' . $decimals . ')) AS tax,
+                    SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END, ' . $decimals . ')) AS internal_tax,
+                    SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END, ' . $decimals . ')) AS sales_tax
                 FROM ' . $this->db->prefixTable('sales_items_taxes') . ' AS sales_items_taxes
                 INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
                     ON sales.sale_id = sales_items_taxes.sale_id
@@ -61,14 +63,15 @@ abstract class Summary_report extends Report
         );
 
         $this->db->query(
-            'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_payments_temp') .
+            'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_report_payments_temp') .
                 ' (PRIMARY KEY(sale_id), INDEX(sale_id))
             (
                 SELECT payments.sale_id AS sale_id,
                     SUM(CASE WHEN payments.cash_adjustment = 0 THEN payments.payment_amount ELSE 0 END) AS sale_payment_amount,
                     SUM(CASE WHEN payments.cash_adjustment = 1 THEN payments.payment_amount ELSE 0 END) AS sale_cash_adjustment,
                     SUM(payments.cash_refund) AS sale_cash_refund,
-                    GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type
+                    GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type,
+                    GROUP_CONCAT(NULLIF(payments.reference_code, "") SEPARATOR ", ") AS reference_code
                 FROM ' . $this->db->prefixTable('sales_payments') . ' AS payments
                 INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
                     ON sales.sale_id = payments.sale_id
@@ -98,7 +101,7 @@ abstract class Summary_report extends Report
             'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
             'left outer'
         );
-        $builder->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
+        $builder->join('sales_report_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
     }
 
     /**
diff --git a/app/Models/Reports/Summary_sales_taxes.php b/app/Models/Reports/Summary_sales_taxes.php
index a739bfe7d..5b4db1077 100644
--- a/app/Models/Reports/Summary_sales_taxes.php
+++ b/app/Models/Reports/Summary_sales_taxes.php
@@ -33,14 +33,16 @@ class Summary_sales_taxes extends Summary_report
      * @param object $builder
      * @return void
      */
-    protected function _where(array $inputs, object &$builder): void    // TODO: hungarian notation
+    protected function _where(array $inputs, object &$builder): void
     {
         $builder->where('sales.sale_status', COMPLETED);
 
-        if (empty($this->config['date_or_time_format'])) {    // TODO: Duplicated code
-            $builder->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+        if (empty($this->config['date_or_time_format'])) {
+            $builder->where('DATE(sales.sale_time) >=', $inputs['start_date']);
+            $builder->where('DATE(sales.sale_time) <=', $inputs['end_date']);
         } else {
-            $builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+            $builder->where('sales.sale_time >=', $inputs['start_date']);
+            $builder->where('sales.sale_time <=', $inputs['end_date']);
         }
     }
 
@@ -53,9 +55,11 @@ class Summary_sales_taxes extends Summary_report
         $builder = $this->db->table('sales_taxes');
 
         if (empty($this->config['date_or_time_format'])) {
-            $builder->where('DATE(sale_time) BETWEEN ' . $inputs['start_date'] . ' AND ' . $inputs['end_date']);
+            $builder->where('DATE(sale_time) >=', $inputs['start_date']);
+            $builder->where('DATE(sale_time) <=', $inputs['end_date']);
         } else {
-            $builder->where('sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+            $builder->where('sale_time >=', $inputs['start_date']);
+            $builder->where('sale_time <=', $inputs['end_date']);
         }
 
         $builder->select('reporting_authority, jurisdiction_name, tax_category, tax_rate, SUM(sale_tax_amount) AS tax');
diff --git a/app/Models/Reports/Summary_taxes.php b/app/Models/Reports/Summary_taxes.php
index 078738e18..6ebd05898 100644
--- a/app/Models/Reports/Summary_taxes.php
+++ b/app/Models/Reports/Summary_taxes.php
@@ -14,10 +14,7 @@ class Summary_taxes extends Summary_report
         $this->config = config(OSPOS::class)->settings;
     }
 
-    /**
-     * @return array[]
-     */
-    protected function _get_data_columns(): array    // TODO: hungarian notation
+    protected function _get_data_columns(): array
     {
         return [
             ['tax_name'     => lang('Reports.tax_name'), 'sortable' => false],
@@ -29,12 +26,7 @@ class Summary_taxes extends Summary_report
         ];
     }
 
-    /**
-     * @param array $inputs
-     * @param $builder
-     * @return void
-     */
-    protected function _where(array $inputs, &$builder): void    // TODO: hungarian notation
+    protected function _where(array $inputs, &$builder): void
     {
         $builder->where('sales.sale_status', COMPLETED);
 
@@ -45,51 +37,90 @@ class Summary_taxes extends Summary_report
         }
     }
 
-    /**
-     * @param array $inputs
-     * @return array
-     */
     public function getData(array $inputs): array
     {
         $decimals = totals_decimals();
         $db_prefix = $this->db->getPrefix();
 
+        $sale_amount = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
+            . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
+            . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * (' . $db_prefix . "sales_items.item_unit_price - " . $db_prefix . "sales_items.discount) END)";
+
+        $sale_tax = "IFNULL(" . $db_prefix . "sales_items_taxes.item_tax_amount, 0)";
+
         if ($this->config['tax_included']) {
-            $sale_total = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
-                . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * (' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount) END)';
-
-            $sale_subtotal = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals) "
-                . 'ELSE ' . $db_prefix . 'sales_items.quantity_purchased * ' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount END * (100 / (100 + ' . $db_prefix . 'sales_items_taxes.percent)))';
+            $sale_subtotal = "ROUND($sale_amount - $sale_tax, $decimals)";
         } else {
-            $sale_total = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
-                . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * ' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount END * (1 + (' . $db_prefix . 'sales_items_taxes.percent / 100)))';
-
-            $sale_subtotal = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
-                . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * (' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount) END)';
+            $sale_subtotal = "ROUND($sale_amount, $decimals)";
         }
+        $sale_tax_rounded = "ROUND($sale_tax, $decimals)";
+        $sale_total = "($sale_subtotal + $sale_tax_rounded)";
 
         $subquery_builder = $this->db->table('sales_items');
-        $subquery_builder->select("name AS name, CONCAT(IFNULL(ROUND(percent, $decimals), 0), '%') AS percent, sales.sale_id AS sale_id, $sale_subtotal AS subtotal, IFNULL($db_prefix" . "sales_items_taxes.item_tax_amount, 0) AS tax, IFNULL($sale_total, $sale_subtotal) AS total");
+        $subquery_builder->select(
+            "name AS name, "
+            . "CONCAT(IFNULL(ROUND(percent, $decimals), 0), '%') AS percent, "
+            . "sales.sale_id AS sale_id, "
+            . "$sale_subtotal AS subtotal, "
+            . "$sale_tax_rounded AS tax, "
+            . "$sale_total AS total"
+        );
 
         $subquery_builder->join('sales', 'sales_items.sale_id = sales.sale_id', 'inner');
-        $subquery_builder->join('sales_items_taxes', 'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line', 'left outer');
+        $subquery_builder->join(
+            'sales_items_taxes',
+            'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
+            'left outer'
+        );
 
         $subquery_builder->where('sale_status', COMPLETED);
 
         if (empty($this->config['date_or_time_format'])) {
-            $subquery_builder->where('DATE(' . $db_prefix . 'sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+            $subquery_builder->where(
+                'DATE(' . $db_prefix . 'sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date'])
+                . ' AND ' . $this->db->escape($inputs['end_date'])
+            );
         } else {
-            $subquery_builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+            $subquery_builder->where(
+                'sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date']))
+                . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']))
+            );
         }
 
         $builder = $this->db->newQuery()->fromSubquery($subquery_builder, 'temp_taxes');
-        $builder->select("name, percent, COUNT(DISTINCT sale_id) AS count, ROUND(SUM(subtotal), $decimals) AS subtotal, ROUND(SUM(tax), $decimals) AS tax, ROUND(SUM(total), $decimals) total");
+        $builder->select(
+            "name, percent, COUNT(DISTINCT sale_id) AS count, "
+            . "ROUND(SUM(subtotal), $decimals) AS subtotal, "
+            . "ROUND(SUM(tax), $decimals) AS tax, "
+            . "ROUND(SUM(total), $decimals) AS total"
+        );
         $builder->groupBy('percent, name');
 
         return $builder->get()->getResultArray();
     }
-}
+
+    public function getSummaryData(array $inputs): array
+    {
+        $decimals = totals_decimals();
+        $data = $this->getData($inputs);
+
+        $subtotal = 0;
+        $tax = 0;
+        $total = 0;
+        $count = 0;
+
+        foreach ($data as $row) {
+            $subtotal += (float) $row['subtotal'];
+            $tax += (float) $row['tax'];
+            $total += (float) $row['total'];
+            $count += (int) $row['count'];
+        }
+
+        return [
+            'subtotal' => round($subtotal, $decimals),
+            'tax'      => round($tax, $decimals),
+            'total'    => round($total, $decimals),
+            'count'    => $count
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Models/Sale.php b/app/Models/Sale.php
index b19c9e8de..2318fccb4 100644
--- a/app/Models/Sale.php
+++ b/app/Models/Sale.php
@@ -78,7 +78,8 @@ class Sale extends Model
                 MAX(IFnull(payments.sale_payment_amount, 0)) AS amount_tendered,
                 (MAX(payments.sale_payment_amount)) - ($sale_total) AS change_due,
                 " . '
-                MAX(payments.payment_type) AS payment_type';
+                MAX(payments.payment_type) AS payment_type,
+                MAX(payments.reference_code) AS reference_code';
 
         $builder = $this->db->table('sales_items AS sales_items');
         $builder->select($sql);
@@ -95,7 +96,7 @@ class Sale extends Model
 
         $builder->where('sales.sale_id', $sale_id);
 
-        $builder->groupBy('sales.sale_id');
+        $builder->groupBy('sales.sale_id, payments.reference_code');
         $builder->orderBy('sales.sale_time', 'asc');
 
         return $builder->get();
@@ -179,7 +180,7 @@ class Sale extends Model
         $builder->join('sales', '`sales_items`.`sale_id` = `' . $db_prefix . 'sales`.`sale_id`', 'inner');
         $builder->join('people AS customer_p', '`' . $db_prefix . 'sales`.`customer_id` = `customer_p`.`person_id`', 'LEFT');
         $builder->join('customers AS customer', '`' . $db_prefix . 'sales`.`customer_id` = `customer`.`person_id`', 'LEFT');
-        $builder->join('sales_payments_temp AS payments', '`' . $db_prefix . 'sales`.`sale_id` = `payments`.`sale_id`', 'LEFT OUTER');
+        $builder->join('sales_search_payments_temp AS payments', '`' . $db_prefix . 'sales`.`sale_id` = `payments`.`sale_id`', 'LEFT OUTER');
         $builder->join(
             'sales_items_taxes_temp AS sales_items_taxes',
             'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
@@ -210,7 +211,7 @@ class Sale extends Model
     /**
      * Get the payment summary for the takings (sales/manage) view
      */
-    public function get_payments_summary(?string $search, array $filters): array
+    public function getPaymentsSummary(?string $search, array $filters): array
     {
         $config = config(OSPOS::class)->settings;
 
@@ -238,6 +239,9 @@ class Sale extends Model
                 $builder->orLike('customer_p.first_name', $search);    // Customer first name
                 $builder->orLike('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search);    // Customer first and last name
                 $builder->orLike('customer.company_name', $search);    // Customer company name
+                if (ctype_digit($search)) {
+                    $builder->orWhere('sales.sale_id', $search);    // Sale ID
+                }
                 $builder->groupEnd();
             }
         }
@@ -274,6 +278,18 @@ class Sale extends Model
             $builder->like('payment_type', lang('Sales.credit'));
         }
 
+        if ($filters['only_debit']) {
+            $builder->like('payment_type', lang('Sales.debit'));
+        }
+
+        if ($filters['only_bank_transfer']) {
+            $builder->like('payment_type', lang('Sales.bank_transfer'));
+        }
+
+        if ($filters['only_wallet']) {
+            $builder->like('payment_type', lang('Sales.wallet'));
+        }
+
         $builder->groupBy('payment_type');
 
         $payments = $builder->get()->getResultArray();
@@ -316,7 +332,7 @@ class Sale extends Model
     {
         $suggestions = [];
 
-        if (!$this->is_valid_receipt($search)) {
+        if (!$this->isValidReceipt($search)) {
             $builder = $this->db->table('sales');
             $builder->distinct()->select('first_name, last_name');
             $builder->join('people', 'people.person_id = sales.customer_id');
@@ -397,21 +413,21 @@ class Sale extends Model
     /**
      * Checks if valid receipt
      */
-    public function is_valid_receipt(string|null &$receipt_sale_id): bool    // TODO: like the others, maybe this should be an array rather than a delimited string... either that or the parameter name needs to be changed. $receipt_sale_id implies that it's an int.
+    public function isValidReceipt(string|null &$receiptSaleId): bool    // TODO: like the others, maybe this should be an array rather than a delimited string... either that or the parameter name needs to be changed. $receipt_sale_id implies that it's an int.
     {
         $config = config(OSPOS::class)->settings;
 
-        if (!empty($receipt_sale_id)) {
+        if (!empty($receiptSaleId)) {
             // POS #
-            $pieces = explode(' ', $receipt_sale_id);
+            $pieces = explode(' ', trim($receiptSaleId));
 
-            if (count($pieces) == 2 && preg_match('/(POS)/i', $pieces[0])) {
-                return $this->exists($pieces[1]);
+            if (count($pieces) == 2 && strtoupper($pieces[0]) === 'POS' && ctype_digit($pieces[1])) {
+                return $this->exists((int)$pieces[1]);
             } elseif ($config['invoice_enable']) {
-                $sale_info = $this->get_sale_by_invoice_number($receipt_sale_id);
+                $saleInfo = $this->get_sale_by_invoice_number($receiptSaleId);
 
-                if ($sale_info->getNumRows() > 0) {
-                    $receipt_sale_id = 'POS ' . $sale_info->getRow()->sale_id;
+                if ($saleInfo->getNumRows() > 0) {
+                    $receiptSaleId = 'POS ' . $saleInfo->getRow()->sale_id;
 
                     return true;
                 }
@@ -512,7 +528,8 @@ class Sale extends Model
                         'payment_amount'  => $paymentAmount,
                         'cash_refund'     => $cashRefund,
                         'cash_adjustment' => $cashAdjustment,
-                        'employee_id'     => $employeeId
+                        'employee_id'     => $employeeId,
+                        'reference_code'  => $payment['reference_code'] ?? null,
                     ];
                     $success = $builder->insert($salesPaymentsData);
                 } elseif ($paymentId != NEW_ENTRY) {
@@ -604,19 +621,19 @@ class Sale extends Model
      * @throws ReflectionException
      */
     public function save_value(
-        int $sale_id,
-        string &$sale_status,
-        array &$items,
-        int $customer_id,
-        int $employee_id,
-        string $comment,
-        ?string $invoice_number,
-        ?string $work_order_number,
-        ?string $quote_number,
-        int $sale_type,
-        ?array $payments,
-        ?int $dinner_table_id,
-        ?array &$sales_taxes
+        int     $saleId,
+        string  &$saleStatus,
+        array   &$items,
+        int     $customerId,
+        int     $employeeId,
+        string  $comment,
+        ?string $invoiceNumber,
+        ?string $workOrderNumber,
+        ?string $quoteNumber,
+        int     $saleType,
+        ?array  $payments,
+        ?int    $dinnerTableId,
+        ?array  &$salesTaxes
     ): int {    // TODO: this method returns the sale_id but the override is expecting it to return a bool. The signature needs to be reworked.  Generally when there are more than 3 maybe 4 parameters, there's a good chance that an object needs to be passed rather than so many params.
         $config = config(OSPOS::class)->settings;
         $attribute = model(Attribute::class);
@@ -625,11 +642,7 @@ class Sale extends Model
         $inventory = model('Inventory');
         $item = model(Item::class);
 
-        $item_quantity = model(Item_quantity::class);
-
-        if ($sale_id != NEW_ENTRY) {
-            $this->clear_suspended_sale_detail($sale_id);
-        }
+        $itemQuantity = model(Item_quantity::class);
 
         if (count($items) == 0) {    // TODO: ===
             return -1;    // TODO: Replace -1 with a constant
@@ -637,47 +650,63 @@ class Sale extends Model
 
         $salesData = [
             'sale_time'         => date('Y-m-d H:i:s'),
-            'customer_id'       => $customer->exists($customer_id) ? $customer_id : null,
-            'employee_id'       => $employee_id,
+            'customer_id'       => $customer->exists($customerId) ? $customerId : null,
+            'employee_id'       => $employeeId,
             'comment'           => $comment,
-            'sale_status'       => $sale_status,
-            'invoice_number'    => $invoice_number,
-            'quote_number'      => $quote_number,
-            'work_order_number' => $work_order_number,
-            'dinner_table_id'   => $dinner_table_id,
-            'sale_type'         => $sale_type
+            'sale_status'       => $saleStatus,
+            'invoice_number'    => $invoiceNumber,
+            'quote_number'      => $quoteNumber,
+            'work_order_number' => $workOrderNumber,
+            'dinner_table_id'   => $dinnerTableId,
+            'sale_type'         => $saleType
         ];
 
         $this->db->transStart();
 
-        if ($sale_id == NEW_ENTRY) {
-            $builder = $this->db->table('sales');
+        if ($saleId != NEW_ENTRY) {
+            $this->clear_suspended_sale_detail($saleId);
+        }
+
+        $builder = $this->db->table('sales');
+        if ($saleId == NEW_ENTRY) {
             $builder->insert($salesData);
-            $sale_id = $this->db->insertID();
+            $saleId = $this->db->insertID();
         } else {
-            $builder = $this->db->table('sales');
-            $builder->where('sale_id', $sale_id);
+            $builder->where('sale_id', $saleId);
             $builder->update($salesData);
         }
 
         $totalAmount = 0;
         $totalAmountUsed = 0;
 
-        foreach ($payments as $payment) {
-            $totalAmountUsed += $this->processPaymentType(
-                $payment,
-                $customer_id,
-                $customer,
-                $giftcard
-            );
+        foreach ($payments as $paymentId => $payment) {
+            $splitPayment = explode(':', $payment['payment_type'], 2);
+            $paymentPrefix = $splitPayment[0];
+
+            if ($paymentPrefix === lang('Sales.giftcard')) {
+                if (empty($splitPayment[1]) || ! $giftcard->decrementGiftcardValue($splitPayment[1], (float) $payment['payment_amount'])) {
+                    $this->db->transRollback();
+
+                    return INSUFFICIENT_GIFTCARD_BALANCE;
+                }
+            } elseif ($paymentPrefix === lang('Sales.rewards')) {
+                if (! $customer->adjustRewardPoints($customerId, -(float) $payment['payment_amount'])) {
+                    $this->db->transRollback();
+
+                    return INSUFFICIENT_REWARD_POINTS;
+                }
+
+                $totalAmountUsed = floatval($totalAmountUsed) + floatval($payment['payment_amount']);
+            }
 
             $salesPaymentsData = [
-                'sale_id'         => $sale_id,
+                'sale_id'         => $saleId,
                 'payment_type'    => $payment['payment_type'],
                 'payment_amount'  => $payment['payment_amount'],
                 'cash_refund'     => $payment['cash_refund'],
                 'cash_adjustment' => $payment['cash_adjustment'],
-                'employee_id'     => $employee_id
+                'employee_id'     => $employeeId,
+                'reference_code'  => $payment['reference_code'] ?? '',
             ];
 
             $builder = $this->db->table('sales_payments');
@@ -686,19 +715,19 @@ class Sale extends Model
             $totalAmount = floatval($totalAmount) + floatval($payment['payment_amount']) - floatval($payment['cash_refund']);
         }
 
-        $this->save_customer_rewards($customer_id, $sale_id, $totalAmount, $totalAmountUsed);
+        $this->save_customer_rewards($customerId, $saleId, $totalAmount, $totalAmountUsed);
 
-        $customer = $customer->get_info($customer_id);
+        $customer = $customer->get_info($customerId);
 
-        foreach ($items as $itemData) {
-            $currentItemInfo = $item->get_info($itemData['item_id']);
+        foreach ($items as $line => $itemData) {
+            $curItemInfo = $item->get_info($itemData['item_id']);
 
             if ($itemData['price'] == 0.00) {
                 $itemData['discount'] = 0.00;
             }
 
             $salesItemsData = [
-                'sale_id'            => $sale_id,
+                'sale_id'            => $saleId,
                 'item_id'            => $itemData['item_id'],
                 'line'               => $itemData['line'],
                 'description'        => character_limiter($itemData['description'], 255),
@@ -715,56 +744,57 @@ class Sale extends Model
             $builder = $this->db->table('sales_items');
             $builder->insert($salesItemsData);
 
-            if ($currentItemInfo->stock_type == HAS_STOCK && $sale_status == COMPLETED) {
-                $itemQuantityData = $item_quantity->get_item_quantity($itemData['item_id'], $itemData['item_location']);
-
-                $item_quantity->save_value(
-                    [
-                        'quantity'    => $itemQuantityData->quantity - $itemData['quantity'],
-                        'item_id'     => $itemData['item_id'],
-                        'location_id' => $itemData['item_location']
-                    ],
+            if ($curItemInfo->stock_type == HAS_STOCK && $saleStatus == COMPLETED) {    // TODO: === ?
+                // Update stock quantity if item type is a standard stock item and the sale is a standard sale
+                if (! $itemQuantity->changeQuantity(
                     $itemData['item_id'],
-                    $itemData['item_location']
-                );
+                    $itemData['item_location'],
+                    -(float) $itemData['quantity'],
+                )) {
+                    $this->db->transRollback();
 
+                    return INSUFFICIENT_STOCK;
+                }
+
+                // If an items was deleted but later returned it's restored with this rule
                 if ($itemData['quantity'] < 0) {
                     $item->undelete($itemData['item_id']);
                 }
 
-                $saleRemarks = 'POS ' . $sale_id;
-                $inventoryData = [
+                // Inventory Count Details
+                $saleRemarks = 'POS ' . $saleId;    // TODO: Use string interpolation here.
+                $invData = [
                     'trans_date'      => date('Y-m-d H:i:s'),
                     'trans_items'     => $itemData['item_id'],
-                    'trans_user'      => $employee_id,
+                    'trans_user'      => $employeeId,
                     'trans_location'  => $itemData['item_location'],
                     'trans_comment'   => $saleRemarks,
                     'trans_inventory' => -$itemData['quantity']
                 ];
 
-                $inventory->insert($inventoryData, false);
+                $inventory->insert($invData, false);
             }
 
-            $attribute->copy_attribute_links($itemData['item_id'], 'sale_id', $sale_id);
+            $attribute->copy_attribute_links($itemData['item_id'], 'sale_id', $saleId);
         }
 
-        if ($customer_id == NEW_ENTRY || $customer->taxable) {
-            $this->save_sales_tax($sale_id, $sales_taxes[0]);
-            $this->save_sales_items_taxes($sale_id, $sales_taxes[1]);
+        if ($customerId == NEW_ENTRY || $customer->taxable) {
+            $this->save_sales_tax($saleId, $salesTaxes[0]);
+            $this->save_sales_items_taxes($saleId, $salesTaxes[1]);
         }
 
         if ($config['dinner_table_enable']) {
-            $dinner_table = model(Dinner_table::class);
-            if ($sale_status == COMPLETED) {    // TODO: === ?
-                $dinner_table->release($dinner_table_id);
+            $dinnerTable = model(Dinner_table::class);
+            if ($saleStatus == COMPLETED) {    // TODO: === ?
+                $dinnerTable->release($dinnerTableId);
             } else {
-                $dinner_table->occupy($dinner_table_id);
+                $dinnerTable->occupy($dinnerTableId);
             }
         }
 
         $this->db->transComplete();
 
-        return $this->db->transStatus() ? $sale_id : -1;
+        return $this->db->transStatus() ? $saleId : -1;
     }
 
     /**
@@ -876,7 +906,7 @@ class Sale extends Model
     {
         $this->db->transStart();
 
-        $sale_status = $this->get_sale_status($sale_id);
+        $sale_status = $this->getSaleStatus($sale_id);
 
         if ($update_inventory && $sale_status == COMPLETED) {
             $inventory = model('Inventory');
@@ -899,7 +929,7 @@ class Sale extends Model
                     ];
                     $inventory->insert($inventoryData, false);
 
-                    $itemQuantity->change_quantity($itemData['item_id'], $itemData['item_location'], $itemData['quantity_purchased']);
+                    $itemQuantity->changeQuantity($itemData['item_id'], $itemData['item_location'], $itemData['quantity_purchased']);
                 }
             }
         }
@@ -1121,7 +1151,7 @@ class Sale extends Model
     {
         $giftcard = model(Giftcard::class);
 
-        if (!$giftcard->exists($giftcard->get_giftcard_id($giftcardNumber))) {    // TODO: camelCase is used here for the variable name but we are using _ everywhere else. CI4 moved to camelCase... we should pick one and do that.
+        if (!$giftcard->exists($giftcard->getGiftcardId($giftcardNumber))) {    // TODO: camelCase is used here for the variable name but we are using _ everywhere else. CI4 moved to camelCase... we should pick one and do that.
             return 0;
         }
 
@@ -1199,7 +1229,8 @@ class Sale extends Model
                     SUM(CASE WHEN payments.cash_adjustment = 0 THEN payments.payment_amount ELSE 0 END) AS sale_payment_amount,
                     SUM(CASE WHEN payments.cash_adjustment = 1 THEN payments.payment_amount ELSE 0 END) AS sale_cash_adjustment,
                     SUM(payments.cash_refund) AS sale_cash_refund,
-                    GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type
+                    GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type,
+                    GROUP_CONCAT(NULLIF(payments.reference_code, "") SEPARATOR ", ") AS reference_code
                 FROM ' . $this->db->prefixTable('sales_payments') . ' AS payments
                 INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
                     ON sales.sale_id = payments.sale_id
@@ -1322,12 +1353,14 @@ class Sale extends Model
     /**
      * Gets the sale status for the selected sale
      */
-    public function get_sale_status(int $sale_id): int
+    public function getSaleStatus(int $sale_id): ?int
     {
         $builder = $this->db->table('sales');
         $builder->where('sale_id', $sale_id);
 
-        return $builder->get()->getRow()->sale_status;
+        $row = $builder->get()->getRow();
+
+        return $row === null ? null : $row->sale_status;
     }
 
     /**
@@ -1486,24 +1519,21 @@ class Sale extends Model
 
         if (!empty($customer_id) && $config['customer_reward_enable']) {
             $customer = model(Customer::class);
-            $customer_rewards = model(Customer_rewards::class);
+            $customerRewards = model(Customer_rewards::class);
             $rewards = model(Rewards::class);
 
-            $package_id = $customer->get_info($customer_id)->package_id;
+            $packageId = $customer->get_info($customer_id)->package_id;
 
-            if (!empty($package_id)) {
-                $points_percent = $customer_rewards->get_points_percent($package_id);
-                $points = $customer->get_info($customer_id)->points;
-                $points = ($points == null ? 0 : $points);
-                $points_percent = ($points_percent == null ? 0 : $points_percent);
-                $total_amount_earned = ($total_amount * $points_percent / 100);
-                $points = $points + $total_amount_earned;
+            if (! empty($packageId)) {
+                $pointsPercent     = $customerRewards->get_points_percent($packageId);
+                $pointsPercent     = ($pointsPercent === null ? 0 : $pointsPercent);
+                $totalAmountEarned = ($total_amount * $pointsPercent / 100);
 
-                $customer->update_reward_points_value($customer_id, $points);
+                $customer->adjustRewardPoints($customer_id, $totalAmountEarned);
 
-                $rewards_data = ['sale_id' => $sale_id, 'earned' => $total_amount_earned, 'used' => $total_amount_used];
+                $rewardsData = ['sale_id' => $sale_id, 'earned' => $totalAmountEarned, 'used' => $total_amount_used];
 
-                $rewards->save_value($rewards_data);
+                $rewards->save_value($rewardsData);
             }
         }
     }
@@ -1559,43 +1589,6 @@ class Sale extends Model
         return $labels;
     }
 
-    /**
-     * Processes payment type for giftcard and reward deductions during sale creation.
-     * Returns the amount used for rewards (0 for giftcards).
-     */
-    private function processPaymentType(array $payment, int $customerId, object $customer, object $giftcard): float
-    {
-        $paymentType = $payment['payment_type'];
-        $paymentAmount = $payment['payment_amount'];
-
-        if (!empty(strstr($paymentType, lang('Sales.giftcard')))) {
-            $splitPayment = explode(':', $paymentType);
-            if (count($splitPayment) < 2 || empty($splitPayment[1])) {
-                log_message('error', 'Sale::processPaymentType invalid giftcard format: ' . $paymentType);
-                return 0;
-            }
-            $giftcardNumber = $splitPayment[1];
-            $currentGiftcardValue = $giftcard->get_giftcard_value($giftcardNumber);
-            $giftcard->update_giftcard_value($giftcardNumber, $currentGiftcardValue - $paymentAmount);
-            return 0;
-        }
-
-        if ($this->isRewardPayment($paymentType)) {
-            $currentRewardsValue = $customer->get_info($customerId)->points ?? 0;
-            if ($currentRewardsValue < $paymentAmount) {
-                log_message(
-                    'warning',
-                    'Sale::processPaymentType insufficient points customer_id=' . $customerId
-                    . ' available=' . $currentRewardsValue . ' requested=' . $paymentAmount
-                );
-            }
-            $customer->update_reward_points_value($customerId, max(0, $currentRewardsValue - $paymentAmount));
-            return floatval($paymentAmount);
-        }
-
-        return 0;
-    }
-
     /**
      * Creates a temporary table to store the sales_payments data
      *
@@ -1609,7 +1602,9 @@ class Sale extends Model
             'payments.sale_id',
             'SUM(CASE WHEN `payments`.`cash_adjustment` = 0 THEN `payments`.`payment_amount` ELSE 0 END) AS sale_payment_amount',
             'SUM(CASE WHEN `payments`.`cash_adjustment` = 1 THEN `payments`.`payment_amount` ELSE 0 END) AS sale_cash_adjustment',
-            'GROUP_CONCAT(CONCAT(`payments`.`payment_type`, " ", (`payments`.`payment_amount` - `payments`.`cash_refund`)) SEPARATOR ", ") AS payment_type'
+            'SUM(`payments`.`cash_refund`) AS sale_cash_refund',
+            'GROUP_CONCAT(CONCAT(`payments`.`payment_type`, " ", (`payments`.`payment_amount` - `payments`.`cash_refund`)) SEPARATOR ", ") AS payment_type',
+            'GROUP_CONCAT(NULLIF(`payments`.`reference_code`, "") SEPARATOR ", ") AS reference_code'
         ]);
         $builder->join('sales', 'sales.sale_id = payments.sale_id', 'inner');
         $builder->where($where);
@@ -1619,7 +1614,7 @@ class Sale extends Model
         log_message('error', $sub_query);
 
         $this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS '
-            . $this->db->prefixTable('sales_payments_temp')
+            . $this->db->prefixTable('sales_search_payments_temp')
             . ' (PRIMARY KEY(`sale_id`), INDEX(`sale_id`)) AS (' . $sub_query . ')');
     }
 
@@ -1674,6 +1669,9 @@ class Sale extends Model
                 $builder->orLike('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search);
                 // Customer company name
                 $builder->orLike('customer.company_name', $search);
+                if (ctype_digit($search)) {
+                    $builder->orWhere('sales.sale_id', $search);    // Sale ID
+                }
                 $builder->groupEnd();
             }
         }
@@ -1703,6 +1701,10 @@ class Sale extends Model
             $builder->like('payments.payment_type', lang('Sales.credit'));
         }
 
+        if ($filters['only_debit']) {
+            $builder->like('payments.payment_type', lang('Sales.debit'));
+        }
+
         if ($filters['only_due']) {
             $builder->like('payments.payment_type', lang('Sales.due'));
         }
@@ -1710,5 +1712,13 @@ class Sale extends Model
         if ($filters['only_check']) {
             $builder->like('payments.payment_type', lang('Sales.check'));
         }
+
+        if ($filters['only_bank_transfer']) {
+            $builder->like('payments.payment_type', lang('Sales.bank_transfer'));
+        }
+
+        if ($filters['only_wallet']) {
+            $builder->like('payments.payment_type', lang('Sales.wallet'));
+        }
     }
 }
diff --git a/app/Models/Stock_location.php b/app/Models/Stock_location.php
index 678f71455..358120496 100644
--- a/app/Models/Stock_location.php
+++ b/app/Models/Stock_location.php
@@ -185,6 +185,7 @@ class Stock_location extends Model
             $builder = $this->db->table('stock_locations');
             $builder->insert($location_data_to_save);
             $location_id = $this->db->insertID();
+            $location_data['location_id'] = $location_id;
 
             $this->_insert_new_permission('items', $location_id, $location_name);    // TODO: need to refactor out the hungarian notation.
             $this->_insert_new_permission('sales', $location_id, $location_name);
diff --git a/app/Views/attributes/form.php b/app/Views/attributes/form.php
index 46afb3d23..43f68c730 100644
--- a/app/Views/attributes/form.php
+++ b/app/Views/attributes/form.php
@@ -102,12 +102,12 @@
 <script type="text/javascript">
     // Validation and submit handling
     $(document).ready(function() {
-        var values = [];
-        var definition_id = <?= esc($definition_id, 'js') ?>;
-        var is_new = definition_id == 0;
+        const values = [];
+        const definition_id = <?= esc($definition_id, 'js') ?>;
+        const is_new = definition_id == 0;
 
-        var disable_definition_types = function() {
-            var definition_type = $("#definition_type option:selected").text();
+        const disable_definition_types = function() {
+            const definition_type = $("#definition_type option:selected").text();
 
             if (definition_type == "DATE" || (definition_type == "GROUP" && !is_new) || definition_type == "DECIMAL") {
                 $('#definition_type').prop("disabled", true);
@@ -121,7 +121,7 @@
         }
         disable_definition_types();
 
-        var disable_category_dropdown = function() {
+        const disable_category_dropdown = function() {
             if (definition_id == -1) {
                 $('#definition_name').prop("disabled", true);
                 $('#definition_type').prop("disabled", true);
@@ -131,11 +131,11 @@
         }
         disable_category_dropdown();
 
-        var show_hide_fields = function(event) {
-            var is_dropdown = $('#definition_type').val() !== '1';
-            var is_decimal = $('#definition_type').val() !== '2';
-            var is_no_group = $('#definition_type').val() !== '0';
-            var is_category_dropdown = definition_id == -1;
+        const show_hide_fields = function(event) {
+            const is_dropdown = $('#definition_type').val() !== '1';
+            const is_decimal = $('#definition_type').val() !== '2';
+            const is_no_group = $('#definition_type').val() !== '0';
+            const is_category_dropdown = definition_id == -1;
 
             $('#definition_value, #definition_list_group').parents('.form-group').toggleClass('hidden', is_dropdown);
             $('#definition_unit').parents('.form-group').toggleClass('hidden', is_decimal);
@@ -150,12 +150,12 @@
         show_hide_fields();
 
         $('.selectpicker').each(function() {
-            var $selectpicker = $(this);
+            const $selectpicker = $(this);
             $.fn.selectpicker.call($selectpicker, $selectpicker.data());
         });
 
-        var remove_attribute_value = function() {
-            var value = $(this).parents("li").text();
+        const remove_attribute_value = function() {
+            const value = $(this).parents("li").text();
 
             if (is_new) {
                 values.splice($.inArray(value, values), 1);
@@ -168,8 +168,8 @@
             $(this).parents("li").remove();
         };
 
-        var add_attribute_value = function(value) {
-            var is_event = typeof(value) !== 'string';
+        const add_attribute_value = function(value) {
+            const is_event = typeof(value) !== 'string';
 
             if ($("#definition_value").val().match(/(\||_)/g) != null) {
                 return;
@@ -206,7 +206,7 @@
             }
         });
 
-        var definition_values = <?= json_encode(array_values($definition_values)) ?>;
+        const definition_values = <?= json_encode(array_map('esc', array_values($definition_values))) ?>;
         $.each(definition_values, function(index, element) {
             add_attribute_value(element);
         });
diff --git a/app/Views/attributes/item.php b/app/Views/attributes/item.php
index 6b1bf8b69..75dff9927 100644
--- a/app/Views/attributes/item.php
+++ b/app/Views/attributes/item.php
@@ -12,7 +12,7 @@
     <div class="col-xs-8">
         <?= form_dropdown([
             'name'     => 'definition_name',
-            'options'  => $definition_names,
+            'options'  => esc($definition_names),
             'selected' => -1,
             'class'    => 'form-control',
             'id'       => 'definition_name'
@@ -23,7 +23,7 @@
 <?php foreach ($definition_values as $definition_id => $definition_value) { ?>
 
     <div class="form-group form-group-sm">
-        <?= form_label($definition_value['definition_name'], $definition_value['definition_name'], ['class' => 'control-label col-xs-3']) ?>
+        <?= form_label(esc($definition_value['definition_name']), esc($definition_value['definition_name']), ['class' => 'control-label col-xs-3']) ?>
         <div class="col-xs-8">
             <div class="input-group">
                 <?php
@@ -45,7 +45,7 @@
                         $selected_value = $definition_value['selected_value'];
                         echo form_dropdown([
                             'name'               => "attribute_links[$definition_id]",
-                            'options'            => $definition_value['values'],
+                            'options'            => esc($definition_value['values']),
                             'selected'           => $selected_value,
                             'class'              => 'form-control',
                             'data-definition-id' => $definition_id
@@ -104,7 +104,7 @@
     (function() {
         <?= view('partial/datepicker_locale', ['format' => dateformat_bootstrap($config['dateformat'])]) ?>
 
-        var enable_delete = function() {
+        const enable_delete = function() {
             $('.remove_attribute_btn').click(function() {
                 $(this).parents('.form-group').remove();
             });
@@ -113,7 +113,7 @@
         enable_delete();
 
         $("input[name*='attribute_links']").change(function() {
-            var definition_id = $(this).data('definition-id');
+            const definition_id = $(this).data('definition-id');
             $("input[name='attribute_ids[" + definition_id + "]']").val('');
         }).autocomplete({
             source: function(request, response) {
@@ -129,11 +129,11 @@
             delay: 10
         });
 
-        var definition_values = function() {
-            var result = {};
+        const definition_values = function() {
+            const result = {};
             $("[name*='attribute_links'").each(function() {
-                var definition_id = $(this).data('definition-id');
-                var element = $(this);
+                const definition_id = $(this).data('definition-id');
+                const element = $(this);
                 
                 // For checkboxes, use the visible checkbox, not the hidden input
                 if (element.attr('type') === 'hidden' && element.siblings('input[type="checkbox"]').length > 0) {
@@ -151,9 +151,9 @@
             return result;
         };
 
-        var refresh = function() {
-            var definition_id = $("#definition_name option:selected").val();
-            var attribute_values = definition_values();
+        const refresh = function() {
+            const definition_id = $("#definition_name option:selected").val();
+            let attribute_values = definition_values();
             attribute_values[definition_id] = '';
             $('#attributes').load('<?= "items/attributes/$item_id" ?>', {
                 'definition_ids': JSON.stringify(attribute_values)
diff --git a/app/Views/barcodes/barcode_sheet.php b/app/Views/barcodes/barcode_sheet.php
index 58221fba1..12a6a360a 100644
--- a/app/Views/barcodes/barcode_sheet.php
+++ b/app/Views/barcodes/barcode_sheet.php
@@ -14,28 +14,28 @@ $barcode_lib = new Barcode_lib();
 
 <head>
     <meta charset="utf-8">
-    <title><?= lang('Items.generate_barcodes') ?></title>
-    <link rel="stylesheet" href="<?= base_url() ?>css/barcode_font.css">
+    <title><?= esc(lang('Items.generate_barcodes')) ?></title>
+    <link rel="stylesheet" href="<?= esc(base_url('css/barcode_font.css'), 'url') ?>">
     <style>
         .barcode svg {
-            height: <?= $barcode_config['barcode_height'] ?>px;
-            width: <?= $barcode_config['barcode_width'] ?>px;
+            height: <?= (int) $barcode_config['barcode_height'] ?>px;
+            width: <?= (int) $barcode_config['barcode_width'] ?>px;
         }
     </style>
 </head>
 
-<body class=<?= 'font_' . $barcode_lib->get_font_name($barcode_config['barcode_font']) ?> style="font-size: <?= $barcode_config['barcode_font_size'] ?>px;">
-    <table cellspacing="<?= $barcode_config['barcode_page_cellspacing'] ?>" width="<?= $barcode_config['barcode_page_width'] . '%' ?>">
+<body class="<?= esc('font_' . $barcode_lib->get_font_name($barcode_config['barcode_font']), 'attr') ?>" style="font-size: <?= (int) $barcode_config['barcode_font_size'] ?>px;">
+    <table style="border-spacing: <?= (int) $barcode_config['barcode_page_cellspacing'] ?>px; width: <?= (int) $barcode_config['barcode_page_width'] ?>%;">
         <tr>
             <?php
-            $count = 0;
-            foreach ($items as $item) {
-                if ($count % $barcode_config['barcode_num_in_row'] == 0 && $count != 0) {
-                    echo '</tr><tr>';
+                $count = 0;
+                foreach ($items as $item) {
+                    if ($count % $barcode_config['barcode_num_in_row'] == 0 && $count != 0) {
+                        echo '</tr><tr>';
+                    }
+                    echo '<td>' . $barcode_lib->display_barcode($item, $barcode_config) . '</td>';
+                    $count++;
                 }
-                echo '<td>' . $barcode_lib->display_barcode($item, $barcode_config) . '</td>';
-                $count++;
-            }
             ?>
         </tr>
     </table>
diff --git a/app/Views/cashups/form.php b/app/Views/cashups/form.php
index 052c6733b..cbfe8f757 100644
--- a/app/Views/cashups/form.php
+++ b/app/Views/cashups/form.php
@@ -308,7 +308,7 @@
             );
         });
 
-        var submit_form = function() {
+        const submit_form = function() {
             $(this).ajaxSubmit({
                 success: function(response) {
                     dialog_support.hide();
diff --git a/app/Views/cashups/manage.php b/app/Views/cashups/manage.php
index db21cbb37..1d53ec20a 100644
--- a/app/Views/cashups/manage.php
+++ b/app/Views/cashups/manage.php
@@ -3,7 +3,10 @@
  * @var string $controller_name
  * @var string $table_headers
  * @var array $filters
+ * @var array $selected_filters
  * @var array $config
+ * @var string|null $start_date
+ * @var string|null $end_date
  */
 ?>
 
@@ -11,20 +14,19 @@
 
 <script type="text/javascript">
     $(document).ready(function() {
-        // When any filter is clicked and the dropdown window is closed
-        $('#filters').on('hidden.bs.select', function(e) {
-            table_support.refresh();
-        });
-
         // Load the preset datarange picker
         <?= view('partial/daterangepicker') ?>
 
-        $("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
-            table_support.refresh();
-        });
-
         <?= view('partial/bootstrap_tables_locale') ?>
 
+        // Override dates from server if provided
+        <?php if (isset($start_date) && $start_date): ?>
+        start_date = "<?= esc($start_date) ?>";
+        <?php endif; ?>
+        <?php if (isset($end_date) && $end_date): ?>
+        end_date = "<?= esc($end_date) ?>";
+        <?php endif; ?>
+
         table_support.init({
             resource: '<?= esc($controller_name) ?>',
             headers: <?= $table_headers ?>,
@@ -40,11 +42,12 @@
         });
     });
 </script>
+<?= view('partial/table_filter_persistence') ?>
 
 <?= view('partial/print_receipt', ['print_after_sale' => false, 'selected_printer' => 'takings_printer']) ?>
 
 <div id="title_bar" class="print_hide btn-toolbar">
-    <button onclick="javascript:printdoc()" class="btn btn-info btn-sm pull-right">
+    <button onclick="printdoc()" class="btn btn-info btn-sm pull-right">
         <span class="glyphicon glyphicon-print">&nbsp;</span><?= lang('Common.print') ?>
     </button>
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) . ".new") ?>">
@@ -58,7 +61,7 @@
             <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
         </button>
         <?= form_input(['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
-        <?= form_multiselect('filters[]', $filters, [''], [
+        <?= form_multiselect('filters[]', $filters, $selected_filters ?? [], [
             'id'                        => 'filters',
             'data-none-selected-text'   => lang('Common.none_selected_text'),
             'class'                     => 'selectpicker show-menu-arrow',
diff --git a/app/Views/configs/barcode_config.php b/app/Views/configs/barcode_config.php
index f32f9b753..0a30f505a 100644
--- a/app/Views/configs/barcode_config.php
+++ b/app/Views/configs/barcode_config.php
@@ -204,6 +204,7 @@
                 <?= form_label(lang('Config.barcode_number_in_row'), 'barcode_num_in_row', ['class' => 'control-label col-xs-2 required']) ?>
                 <div class="col-xs-2">
                     <?= form_input([
+                        'type'  => 'number',
                         'name'  => 'barcode_num_in_row',
                         'id'    => 'barcode_num_in_row',
                         'class' => 'form-control input-sm required',
@@ -217,6 +218,9 @@
                 <div class="col-sm-2">
                     <div class="input-group">
                         <?= form_input([
+                            'type'  => 'number',
+                            'min'   => '0',
+                            'max'   => '100',
                             'name'  => 'barcode_page_width',
                             'id'    => 'barcode_page_width',
                             'class' => 'form-control input-sm required',
@@ -232,6 +236,7 @@
                 <div class="col-sm-2">
                     <div class="input-group">
                         <?= form_input([
+                            'type'  => 'number',
                             'name'  => 'barcode_page_cellspacing',
                             'id'    => 'barcode_page_cellspacing',
                             'class' => 'form-control input-sm required',
diff --git a/app/Views/configs/email_config.php b/app/Views/configs/email_config.php
index 6396a978b..46d0f26b1 100644
--- a/app/Views/configs/email_config.php
+++ b/app/Views/configs/email_config.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @var array $config
+ * @var bool $smtp_pass_set
  */
 ?>
 
@@ -17,9 +18,9 @@
                     <?= form_dropdown(
                         'protocol',
                         [
-                            'mail'     => 'mail',
-                            'sendmail' => 'sendmail',
-                            'smtp'     => 'smtp'
+                            'mail'     => 'Mail',
+                            'sendmail' => 'Sendmail',
+                            'smtp'     => 'SMTP'
                         ],
                         $config['protocol'],
                         'class="form-control input-sm" id="protocol"'
@@ -55,6 +56,7 @@
                 <?= form_label(lang('Config.email_smtp_port'), 'smtp_port', ['class' => 'control-label col-xs-2']) ?>
                 <div class="col-xs-2">
                     <?= form_input([
+                        'type'  => 'number',
                         'name'  => 'smtp_port',
                         'id'    => 'smtp_port',
                         'class' => 'form-control input-sm',
@@ -83,6 +85,7 @@
                 <?= form_label(lang('Config.email_smtp_timeout'), 'smtp_timeout', ['class' => 'control-label col-xs-2']) ?>
                 <div class="col-xs-2">
                     <?= form_input([
+                        'type'  => 'number',
                         'name'  => 'smtp_timeout',
                         'id'    => 'smtp_timeout',
                         'class' => 'form-control input-sm',
@@ -115,12 +118,12 @@
                         <span class="input-group-addon input-sm">
                             <span class="glyphicon glyphicon-asterisk"></span>
                         </span>
-                        <?= form_password([
-                            'name'  => 'smtp_pass',
-                            'id'    => 'smtp_pass',
-                            'class' => 'form-control input-sm',
-                            'value' => $config['smtp_pass']
-                        ]) ?>
+                        <input type="password"
+                               name="smtp_pass"
+                               id="smtp_pass"
+                               class="form-control input-sm"
+                               placeholder="<?= !empty($smtp_pass_set) ? lang('Config.email_smtp_pass_set') : esc(lang('Config.email_smtp_pass')) ?>"
+                               autocomplete="off">
                     </div>
                 </div>
             </div>
@@ -139,13 +142,14 @@
 <script type="text/javascript">
     // Validation and submit handling
     $(document).ready(function() {
-        var check_protocol = function() {
+        const check_protocol = function() {
             if ($('#protocol').val() == 'sendmail') {
                 $('#mailpath').prop('disabled', false);
                 $('#smtp_host, #smtp_user, #smtp_pass, #smtp_port, #smtp_timeout, #smtp_crypto').prop('disabled', true);
             } else if ($('#protocol').val() == 'smtp') {
-                $('#smtp_host, #smtp_user, #smtp_pass, #smtp_port, #smtp_timeout, #smtp_crypto').prop('disabled', false);
+                $('#smtp_host, #smtp_user, #smtp_port, #smtp_timeout, #smtp_crypto').prop('disabled', false);
                 $('#mailpath').prop('disabled', true);
+                $('#smtp_pass').prop('disabled', false);
             } else {
                 $('#mailpath, #smtp_host, #smtp_user, #smtp_pass, #smtp_port, #smtp_timeout, #smtp_crypto').prop('disabled', true);
             }
diff --git a/app/Views/configs/general_config.php b/app/Views/configs/general_config.php
index b9c9f71da..df7ef179b 100644
--- a/app/Views/configs/general_config.php
+++ b/app/Views/configs/general_config.php
@@ -467,8 +467,8 @@
 <script type="text/javascript">
     // Validation and submit handling
     $(document).ready(function() {
-        var enable_disable_gcaptcha_enable = (function() {
-            var gcaptcha_enable = $("#gcaptcha_enable").is(":checked");
+        const enable_disable_gcaptcha_enable = (function() {
+            const gcaptcha_enable = $("#gcaptcha_enable").is(":checked");
             if (gcaptcha_enable) {
                 $("#gcaptcha_site_key, #gcaptcha_secret_key").prop("disabled", !gcaptcha_enable).addClass("required");
                 $("#config_gcaptcha_site_key, #config_gcaptcha_secret_key").addClass("required");
diff --git a/app/Views/configs/info_config.php b/app/Views/configs/info_config.php
index 01506465e..1a7051844 100644
--- a/app/Views/configs/info_config.php
+++ b/app/Views/configs/info_config.php
@@ -36,7 +36,7 @@
                     <div class="fileinput <?= $logo_exists ? 'fileinput-exists' : 'fileinput-new' ?>" data-provides="fileinput">
                         <div class="fileinput-new thumbnail" style="width: 200px; height: 200px;"></div>
                         <div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 200px;">
-                            <img data-src="holder.js/100%x100%" alt="<?= esc(lang('Config.company_logo')) ?>" src="<?= $logo_src ?>" style="max-height: 100%; max-width: 100%;">
+                            <img data-src="holder.js/100%x100%" alt="<?= esc(lang('Config.company_logo')) ?>" src="<?= esc($logo_src, 'attr') ?>" style="max-height: 100%; max-width: 100%;">
                         </div>
                         <div>
                             <span class="btn btn-default btn-sm btn-file">
@@ -105,6 +105,7 @@
                             <span class="glyphicon glyphicon-phone-alt"></span>
                         </span>
                         <?= form_input([
+                            'type'  => 'tel',
                             'name'  => 'phone',
                             'id'    => 'phone',
                             'class' => 'form-control input-sm required',
@@ -122,6 +123,7 @@
                             <span class="glyphicon glyphicon-phone-alt"></span>
                         </span>
                         <?= form_input([
+                            'type'  => 'tel',
                             'name'  => 'fax',
                             'id'    => 'fax',
                             'class' => 'form-control input-sm',
diff --git a/app/Views/configs/integrations_config.php b/app/Views/configs/integrations_config.php
index ea5881643..7e8f24909 100644
--- a/app/Views/configs/integrations_config.php
+++ b/app/Views/configs/integrations_config.php
@@ -20,12 +20,13 @@
                         <span class="input-group-addon input-sm">
                             <span class="glyphicon glyphicon-cloud"></span>
                         </span>
-                        <?= form_input([
-                            'name'  => 'mailchimp_api_key',
-                            'id'    => 'mailchimp_api_key',
-                            'class' => 'form-control input-sm',
-                            'value' => $mailchimp['api_key']
-                        ]) ?>
+                        <?php $apiKeySet = !empty($mailchimp['api_key_set']) ?>
+                        <input type="password"
+                               name="mailchimp_api_key"
+                               id="mailchimp_api_key"
+                               class="form-control input-sm"
+                               placeholder="<?= $apiKeySet ? lang('Config.mailchimp_api_key_set') : esc(lang('Config.mailchimp_api_key')) ?>"
+                               autocomplete="off">
                     </div>
                 </div>
                 <div class="col-xs-1">
diff --git a/app/Views/configs/invoice_config.php b/app/Views/configs/invoice_config.php
index 760d936e8..128855739 100644
--- a/app/Views/configs/invoice_config.php
+++ b/app/Views/configs/invoice_config.php
@@ -198,9 +198,9 @@
 <script type="text/javascript">
     // Validation and submit handling
     $(document).ready(function() {
-        var enable_disable_invoice_enable = (function() {
-            var invoice_enabled = $("#invoice_enable").is(":checked");
-            var work_order_enabled = $("#work_order_enable").is(":checked");
+        const enable_disable_invoice_enable = (function() {
+            const invoice_enabled = $("#invoice_enable").is(":checked");
+            const work_order_enabled = $("#work_order_enable").is(":checked");
             $("#sales_invoice_format, #recv_invoice_format, #invoice_default_comments, #invoice_email_message, select[name='invoice_type'], #sales_quote_format, select[name='line_sequence'], #last_used_invoice_number, #last_used_quote_number, #quote_default_comments, #work_order_enable, #work_order_format, #last_used_work_order_number").prop("disabled", !invoice_enabled);
             if (invoice_enabled) {
                 $("#work_order_format, #last_used_work_order_number").prop("disabled", !work_order_enabled);
@@ -210,9 +210,9 @@
             return arguments.callee;
         })();
 
-        var enable_disable_work_order_enable = (function() {
-            var work_order_enabled = $("#work_order_enable").is(":checked");
-            var invoice_enabled = $("#invoice_enable").is(":checked");
+        const enable_disable_work_order_enable = (function() {
+            const work_order_enabled = $("#work_order_enable").is(":checked");
+            const invoice_enabled = $("#invoice_enable").is(":checked");
             if (invoice_enabled) {
                 $("#work_order_format, #last_used_work_order_number").prop("disabled", !work_order_enabled);
             }
diff --git a/app/Views/configs/locale_config.php b/app/Views/configs/locale_config.php
index 93bd72d8b..52159f85d 100644
--- a/app/Views/configs/locale_config.php
+++ b/app/Views/configs/locale_config.php
@@ -176,6 +176,25 @@
                 </div>
             </div>
 
+            <div class="form-group form-group-sm" style="display:flex; align-items:center">
+                <?= form_label(lang('Config.payment_reference_code_length_limits'), 'payment_reference_code_length', ['class' => 'control-label col-xs-2', 'style' => 'padding-top:0; line-height:1.4; margin-top:-8px']) ?>
+                <div class="col-xs-4">
+                    <div id="payment_reference_code_slider"></div>
+                    <div class="row" style="margin-top:6px">
+                        <div class="col-xs-6">
+                            <span class="control-label"><?= lang('Config.payment_reference_code_length_min_label') ?>: </span>
+                            <span id="payment_reference_code_min_display"><?= $config['payment_reference_code_min'] ?? 3 ?></span>
+                            <?= form_input(['type' => 'hidden', 'name' => 'payment_reference_code_min', 'id' => 'payment_reference_code_min', 'value' => $config['payment_reference_code_min'] ?? 3]) ?>
+                        </div>
+                        <div class="col-xs-6">
+                            <span class="control-label"><?= lang('Config.payment_reference_code_length_max_label') ?>: </span>
+                            <span id="payment_reference_code_max_display"><?= $config['payment_reference_code_max'] ?? 40 ?></span>
+                            <?= form_input(['type' => 'hidden', 'name' => 'payment_reference_code_max', 'id' => 'payment_reference_code_max', 'value' => $config['payment_reference_code_max'] ?? 40]) ?>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="form-group form-group-sm">
                 <?= form_label(lang('Config.country_codes'), 'country_codes', ['class' => 'control-label col-xs-2']) ?>
                 <div class="col-xs-1">
@@ -291,8 +310,31 @@
     $(document).ready(function() {
         $('span').tooltip();
 
+        var primaryColor = $('.btn-primary').css('background-color');
+        $('<style>').text(
+            '#payment_reference_code_slider .ui-slider-range { background: ' + primaryColor + '; }' +
+            '#payment_reference_code_slider .ui-slider-handle { border-color: ' + primaryColor + '; }'
+        ).appendTo('head');
+
+        $('#payment_reference_code_slider').slider({
+            range: true,
+            min: 3,
+            max: 40,
+            step: 1,
+            values: [
+                parseInt($('#payment_reference_code_min').val()),
+                parseInt($('#payment_reference_code_max').val())
+            ],
+            slide: function(event, ui) {
+                $('#payment_reference_code_min').val(ui.values[0]);
+                $('#payment_reference_code_max').val(ui.values[1]);
+                $('#payment_reference_code_min_display').text(ui.values[0]);
+                $('#payment_reference_code_max_display').text(ui.values[1]);
+            }
+        });
+
         $('#currency_symbol, #thousands_separator, #currency_code').change(function() {
-            var data = {
+            const data = {
                 number_locale: $('#number_locale').val()
             };
             data['save_number_locale'] = $("input[name='save_number_locale']").val();
@@ -336,7 +378,7 @@
                             }
                         },
                         dataFilter: function(data) {
-                            var response = JSON.parse(data);
+                            const response = JSON.parse(data);
                             $("input[name='save_number_locale']").val(response.save_number_locale);
                             $('#number_locale_example').text(response.number_locale_example);
                             $('#currency_symbol').val(response.currency_symbol);
diff --git a/app/Views/configs/manage.php b/app/Views/configs/manage.php
index e7eb81411..af71fc87b 100644
--- a/app/Views/configs/manage.php
+++ b/app/Views/configs/manage.php
@@ -29,6 +29,9 @@
     <li role="presentation">
         <a data-toggle="tab" href="#invoice_tab" title="<?= lang('Config.invoice_configuration') ?>"><?= lang('Config.invoice') ?></a>
     </li>
+    <li role="presentation">
+        <a data-toggle="tab" href="#shortcuts_tab" title="<?= lang('Config.shortcuts_configuration') ?>"><?= lang('Config.shortcuts') ?></a>
+    </li>
     <li role="presentation">
         <a data-toggle="tab" href="#reward_tab" title="<?= lang('Config.reward_configuration') ?>"><?= lang('Config.reward') ?></a>
     </li>
@@ -65,6 +68,9 @@
     <div class="tab-pane" id="invoice_tab">
         <?= view('configs/invoice_config') ?>
     </div>
+    <div class="tab-pane" id="shortcuts_tab">
+        <?= view('configs/shortcuts_config') ?>
+    </div>
     <div class="tab-pane" id="reward_tab">
         <?= view('configs/reward_config') ?>
     </div>
diff --git a/app/Views/configs/message_config.php b/app/Views/configs/message_config.php
index 3ddae26b6..190628789 100644
--- a/app/Views/configs/message_config.php
+++ b/app/Views/configs/message_config.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @var array $config
+ * @var bool $msg_pwd_set
  */
 ?>
 
@@ -29,18 +30,18 @@
             </div>
 
             <div class="form-group form-group-sm">
-                <?= form_label(lang('Config.msg_pwd'), 'msg_pwd', ['class' => 'control-label col-xs-2 required']) ?>
+                <?= form_label(lang('Config.msg_pwd'), 'msg_pwd', ['class' => 'control-label col-xs-2']) ?>
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
                             <span class="glyphicon glyphicon-lock"></span>
                         </span>
-                        <?= form_password([
-                            'name'  => 'msg_pwd',
-                            'id'    => 'msg_pwd',
-                            'class' => 'form-control input-sm required',
-                            'value' => $config['msg_pwd']
-                        ]) ?>
+                        <input type="password"
+                               name="msg_pwd"
+                               id="msg_pwd"
+                               class="form-control input-sm"
+                               placeholder="<?= !empty($msg_pwd_set) ? lang('Config.msg_pwd_set') : esc(lang('Config.msg_pwd')) ?>"
+                               autocomplete="off">
                     </div>
                 </div>
             </div>
@@ -95,13 +96,11 @@
 
             rules: {
                 msg_uid: "required",
-                msg_pwd: "required",
                 msg_src: "required"
             },
 
             messages: {
                 msg_uid: "<?= lang('Config.msg_uid_required') ?>",
-                msg_pwd: "<?= lang('Config.msg_pwd_required') ?>",
                 msg_src: "<?= lang('Config.msg_src_required') ?>"
             }
         }));
diff --git a/app/Views/configs/receipt_config.php b/app/Views/configs/receipt_config.php
index 5301b9d9d..2b916b767 100644
--- a/app/Views/configs/receipt_config.php
+++ b/app/Views/configs/receipt_config.php
@@ -338,9 +338,9 @@
     // Validation and submit handling
     $(document).ready(function() {
         if (window.localStorage && window.jsPrintSetup) {
-            var printers = (jsPrintSetup.getPrintersList() && jsPrintSetup.getPrintersList().split(',')) || [];
+            const printers = (jsPrintSetup.getPrintersList() && jsPrintSetup.getPrintersList().split(',')) || [];
             $('#receipt_printer, #invoice_printer, #takings_printer').each(function() {
-                var $this = $(this)
+                const $this = $(this)
                 $(printers).each(function(key, value) {
                     $this.append($('<option>', {
                         value: value
@@ -360,7 +360,7 @@
             });
         }
 
-        var dialog_confirmed = window.jsPrintSetup;
+        const dialog_confirmed = window.jsPrintSetup;
 
         $('#receipt_config_form').validate($.extend(form_support.handler, {
             submitHandler: function(form) {
diff --git a/app/Views/configs/reward_config.php b/app/Views/configs/reward_config.php
index c27ee32f1..db533e830 100644
--- a/app/Views/configs/reward_config.php
+++ b/app/Views/configs/reward_config.php
@@ -43,8 +43,8 @@
     // Validation and submit handling
     $(document).ready(function() {
 
-        var enable_disable_customer_reward_enable = (function() {
-            var customer_reward_enable = $("#customer_reward_enable").is(":checked");
+        const enable_disable_customer_reward_enable = (function() {
+            const customer_reward_enable = $("#customer_reward_enable").is(":checked");
             $("input[name*='customer_reward']:not(input[name=customer_reward_enable])").prop("disabled", !customer_reward_enable);
             $("input[name*='reward_points_']:not(input[name=customer_reward_enable])").prop("disabled", !customer_reward_enable);
             if (customer_reward_enable) {
@@ -57,9 +57,9 @@
 
         $("#customer_reward_enable").change(enable_disable_customer_reward_enable);
 
-        var table_count = <?= sizeof($customer_rewards) ?>;
+        let table_count = <?= sizeof($customer_rewards) ?>;
 
-        var hide_show_remove = function() {
+        const hide_show_remove = function() {
             if ($("input[name*='customer_rewards']:enabled").length > 1) {
                 $(".remove_customer_rewards").show();
             } else {
@@ -67,27 +67,27 @@
             }
         };
 
-        var add_customer_reward = function() {
-            var id = $(this).parent().find('input').attr('id');
+        const add_customer_reward = function() {
+            let id = $(this).parent().find('input').attr('id');
             id = id.replace(/.*?_(\d+)$/g, "$1");
-            var previous_id = 'customer_reward_' + id;
-            var previous_id_next = 'reward_points_' + id;
-            var block = $(this).parent().clone(true);
-            var new_block = block.insertAfter($(this).parent());
-            var new_block_id = 'customer_reward_' + ++id;
-            var new_block_id_next = 'reward_points_' + id;
+            const previous_id = 'customer_reward_' + id;
+            const previous_id_next = 'reward_points_' + id;
+            const block = $(this).parent().clone(true);
+            const new_block = block.insertAfter($(this).parent());
+            const new_block_id = 'customer_reward_' + ++id;
+            const new_block_id_next = 'reward_points_' + id;
             $(new_block).find('label').html("<?= lang('Config.customer_reward') ?> " + ++table_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
             $(new_block).find("input[id='" + previous_id + "']").attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val('');
             $(new_block).find("input[id='" + previous_id_next + "']").attr('id', new_block_id_next).removeAttr('disabled').attr('name', new_block_id_next).attr('class', 'form-control input-sm').val('');
             hide_show_remove();
         };
 
-        var remove_customer_reward = function() {
+        const remove_customer_reward = function() {
             $(this).parent().remove();
             hide_show_remove();
         };
 
-        var init_add_remove_tables = function() {
+        const init_add_remove_tables = function() {
             $('.add_customer_reward').click(add_customer_reward);
             $('.remove_customer_reward').click(remove_customer_reward);
             hide_show_remove();
@@ -96,10 +96,10 @@
         };
         init_add_remove_tables();
 
-        var duplicate_found = false;
+        const duplicate_found = false;
         // Run validator once for all fields
         $.validator.addMethod('customer_reward', function(value, element) {
-            var value_count = 0;
+            let value_count = 0;
             $("input[name*='customer_reward']:not(input[name=customer_reward_enable])").each(function() {
                 value_count = $(this).val() == value ? value_count + 1 : value_count;
             });
diff --git a/app/Views/configs/shortcuts_config.php b/app/Views/configs/shortcuts_config.php
new file mode 100644
index 000000000..8ccb356f6
--- /dev/null
+++ b/app/Views/configs/shortcuts_config.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @var array $config
+ * @var array $keyboardShortcutOptions
+ * @var array $keyboardShortcuts
+ */
+
+$keyboardShortcuts ??= [];
+$keyboardShortcutOptions ??= [];
+$config ??= [];
+
+$shortcutLabels = [
+    'cancel'    => lang('Sales.key_cancel'),
+    'items'     => lang('Sales.key_item_search'),
+    'customers' => lang('Sales.key_customer_search'),
+    'suspend'   => lang('Sales.key_suspend'),
+    'suspended' => lang('Sales.key_suspended'),
+    'amount'    => lang('Sales.key_tendered'),
+    'payment'   => lang('Sales.key_payment'),
+    'complete'  => lang('Sales.key_finish_sale'),
+    'finish'    => lang('Sales.key_finish_quote'),
+    'help'      => lang('Sales.key_help_modal')
+];
+?>
+
+<?= form_open('config/saveShortcuts', ['id' => 'shortcuts_config_form', 'class' => 'form-horizontal']) ?>
+    <div id="config_wrapper">
+        <div class="row">
+            <fieldset id="config_info">
+                <div class="col-md-8">
+                    <div id="required_fields_message"><?= esc(lang('Common.fields_required_message')) ?></div>
+                    <ul id="shortcuts_error_message_box" class="error_message_box"></ul>
+
+                    <?php foreach ($shortcutLabels as $name => $label): ?>
+                        <div class="form-group form-group-sm">
+                            <?= form_label($label, 'key_' . $name, ['class' => 'control-label col-xs-3']) ?>
+                            <div class="col-xs-4">
+                                <?php $keyboardShortcutSelectedValue = $keyboardShortcuts[$name]['value'] ?? ''; ?>
+                                <?= form_dropdown(
+                                    'key_' . $name,
+                                    $keyboardShortcutOptions,
+                                    $keyboardShortcutSelectedValue,
+                                    'class="form-control input-sm"'
+                                ) ?>
+                            </div>
+                        </div>
+                    <?php endforeach; ?>
+
+                    <div class="col-xs-12 clearfix">
+                        <?= form_submit([
+                            'name'  => 'submit_shortcuts',
+                            'id'    => 'submit_shortcuts',
+                            'value' => lang('Common.submit'),
+                            'class' => 'btn btn-primary btn-sm pull-right'
+                        ]) ?>
+                    </div>
+                </div>
+            </fieldset>
+        </div>
+    </div>
+<?= form_close() ?>
+
+<script type="text/javascript">
+    $('#shortcuts_config_form').validate($.extend(form_support.handler, {
+        submitHandler: function(form) {
+            $(form).ajaxSubmit({
+                success: function(response) {
+                    $.notify({
+                        message: response.message
+                    }, {
+                        type: response.success ? 'success' : 'danger'
+                    });
+                },
+                error: function(xhr) {
+                    const rawMessage = xhr.responseJSON?.message ?? xhr.responseText ?? <?= json_encode(lang('Config.shortcuts_save_error')) ?>;
+                    $.notify({
+                        message: DOMPurify.sanitize(rawMessage)
+                    }, {
+                        type: 'danger'
+                    });
+                },
+                dataType: 'json'
+            });
+        },
+
+        errorLabelContainer: '#shortcuts_error_message_box'
+    }));
+</script>
diff --git a/app/Views/configs/stock_config.php b/app/Views/configs/stock_config.php
index b49986ff1..af0e15a7a 100644
--- a/app/Views/configs/stock_config.php
+++ b/app/Views/configs/stock_config.php
@@ -29,9 +29,9 @@
 <script type="text/javascript">
     // Validation and submit handling
     $(document).ready(function() {
-        var location_count = <?= sizeof($stock_locations) ?>;
+        let location_count = <?= sizeof($stock_locations) ?>;
 
-        var hide_show_remove = function() {
+        const hide_show_remove = function() {
             if ($("input[name*='stock_location']:enabled").length > 1) {
                 $(".remove_stock_location").show();
             } else {
@@ -39,31 +39,31 @@
             }
         };
 
-        var add_stock_location = function() {
-            var block = $(this).parent().clone(true);
-            var new_block = block.insertAfter($(this).parent());
-            var new_block_id = 'stock_location[]';
+        const add_stock_location = function() {
+            const block = $(this).parent().clone(true);
+            const new_block = block.insertAfter($(this).parent());
+            const new_block_id = 'stock_location[]';
             $(new_block).find('label').html("<?= lang('Config.stock_location') ?> " + ++location_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
             $(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val('');
             hide_show_remove();
         };
 
-        var remove_stock_location = function() {
+        const remove_stock_location = function() {
             $(this).parent().remove();
             hide_show_remove();
         };
 
-        var init_add_remove_locations = function() {
+        const init_add_remove_locations = function() {
             $('.add_stock_location').click(add_stock_location);
             $('.remove_stock_location').click(remove_stock_location);
             hide_show_remove();
         };
         init_add_remove_locations();
 
-        var duplicate_found = false;
+        const duplicate_found = false;
         // Run validator once for all fields
         $.validator.addMethod('stock_location', function(value, element) {
-            var value_count = 0;
+            let value_count = 0;
             $("input[name*='stock_location']").each(function() {
                 value_count = $(this).val() == value ? value_count + 1 : value_count;
             });
diff --git a/app/Views/configs/system_info.php b/app/Views/configs/system_info.php
index 9bba2f12a..10df45685 100644
--- a/app/Views/configs/system_info.php
+++ b/app/Views/configs/system_info.php
@@ -25,11 +25,9 @@ use Config\OSPOS;
     <div class="container">
         <div class="row">
             <div class="col-sm-2" style="text-align: left;"><br>
-                <strong>
-                    <p style="min-height: 14.7em;">General Info</p>
-                    <p style="min-height: 10.5em;">User Setup</p><br>
-                    <p>Permissions</p>
-                </strong>
+                <p style="min-height: 17.7em; font-weight: bold;">General Info</p>
+                <p style="min-height: 12.2em; font-weight: bold;">User Setup</p><br>
+                <p style="font-weight: bold;">Permissions</p>
             </div>
             <div class="col-sm-8" id="issuetemplate" style="text-align: left;"><br>
                 <?= lang('Config.ospos_info') . ':' ?>
@@ -38,14 +36,14 @@ use Config\OSPOS;
                 <div id="TimeError"></div>
                 Extensions & Modules:<br>
                 <?php
-                echo "&#187; GD: ", extension_loaded('gd') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
-                echo "&#187; BC Math: ", extension_loaded('bcmath') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
-                echo "&#187; INTL: ", extension_loaded('intl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
-                echo "&#187; OpenSSL: ", extension_loaded('openssl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
-                echo "&#187; MBString: ", extension_loaded('mbstring') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
-                echo "&#187; Curl: ", extension_loaded('curl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
-                echo "&#187; Json: ", extension_loaded('json') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br><br>';
-                echo "&#187; Xml: ", extension_loaded('xml') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br><br>';
+                    echo "&#187; GD: ", extension_loaded('gd') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+                    echo "&#187; BC Math: ", extension_loaded('bcmath') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+                    echo "&#187; INTL: ", extension_loaded('intl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+                    echo "&#187; OpenSSL: ", extension_loaded('openssl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+                    echo "&#187; MBString: ", extension_loaded('mbstring') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+                    echo "&#187; Curl: ", extension_loaded('curl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+                    echo "&#187; Json: ", extension_loaded('json') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+                    echo "&#187; Xml: ", extension_loaded('xml') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br><br>';
                 ?>
                 User Configuration:<br>
                 .Browser:
@@ -200,7 +198,7 @@ use Config\OSPOS;
 <div style="text-align: center;">
     <a class="copy" data-clipboard-action="copy" data-clipboard-target="#issuetemplate">Copy Info</a> | <a href="https://github.com/opensourcepos/opensourcepos/issues/new" target="_blank"> <?= lang('Config.report_an_issue') ?></a>
     <script type="text/javascript">
-        var clipboard = new ClipboardJS('.copy');
+        const clipboard = new ClipboardJS('.copy');
 
         clipboard.on('success', function(e) {
             document.getSelection().removeAllRanges();
diff --git a/app/Views/configs/table_config.php b/app/Views/configs/table_config.php
index d54452283..ce71ca268 100644
--- a/app/Views/configs/table_config.php
+++ b/app/Views/configs/table_config.php
@@ -43,8 +43,8 @@
     // Validation and submit handling
     $(document).ready(function() {
 
-        var enable_disable_dinner_table_enable = (function() {
-            var dinner_table_enable = $("#dinner_table_enable").is(":checked");
+        const enable_disable_dinner_table_enable = (function() {
+            const dinner_table_enable = $("#dinner_table_enable").is(":checked");
             $("input[name*='dinner_table']:not(input[name=dinner_table_enable])").prop("disabled", !dinner_table_enable);
             if (dinner_table_enable) {
                 $(".add_dinner_table, .remove_dinner_table").show();
@@ -56,9 +56,9 @@
 
         $("#dinner_table_enable").change(enable_disable_dinner_table_enable);
 
-        var table_count = <?= sizeof($dinner_tables) ?>;
+        let table_count = <?= sizeof($dinner_tables) ?>;
 
-        var hide_show_remove = function() {
+        const hide_show_remove = function() {
             if ($("input[name*='dinner_tables']:enabled").length > 1) {
                 $(".remove_dinner_tables").show();
             } else {
@@ -66,23 +66,23 @@
             }
         };
 
-        var add_dinner_table = function() {
-            var id = $(this).parent().find('input').attr('id');
+        const add_dinner_table = function() {
+            let id = $(this).parent().find('input').attr('id');
             id = id.replace(/.*?_(\d+)$/g, "$1");
-            var block = $(this).parent().clone(true);
-            var new_block = block.insertAfter($(this).parent());
-            var new_block_id = 'dinner_table_' + ++id;
+            const block = $(this).parent().clone(true);
+            const new_block = block.insertAfter($(this).parent());
+            const new_block_id = 'dinner_table_' + ++id;
             $(new_block).find('label').html("<?= lang('Config.dinner_table') ?> " + ++table_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
             $(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val('');
             hide_show_remove();
         };
 
-        var remove_dinner_table = function() {
+        const remove_dinner_table = function() {
             $(this).parent().remove();
             hide_show_remove();
         };
 
-        var init_add_remove_tables = function() {
+        const init_add_remove_tables = function() {
             $('.add_dinner_table').click(add_dinner_table);
             $('.remove_dinner_table').click(remove_dinner_table);
             hide_show_remove();
@@ -91,10 +91,10 @@
         };
         init_add_remove_tables();
 
-        var duplicate_found = false;
+        const duplicate_found = false;
         // Run validator once for all fields
         $.validator.addMethod('dinner_table', function(value, element) {
-            var value_count = 0;
+            let value_count = 0;
             $("input[name*='dinner_table']:not(input[name=dinner_table_enable])").each(function() {
                 value_count = $(this).val() == value ? value_count + 1 : value_count;
             });
diff --git a/app/Views/configs/tax_config.php b/app/Views/configs/tax_config.php
index 23248082c..822126ea1 100644
--- a/app/Views/configs/tax_config.php
+++ b/app/Views/configs/tax_config.php
@@ -143,8 +143,8 @@
 <script type="text/javascript">
     // Validation and submit handling
     $(document).ready(function() {
-        var enable_disable_use_destination_based_tax = (function() {
-            var use_destination_based_tax = $("#use_destination_based_tax").is(":checked");
+        const enable_disable_use_destination_based_tax = (function() {
+            const use_destination_based_tax = $("#use_destination_based_tax").is(":checked");
             $("select[name='default_tax_code']").prop("disabled", !use_destination_based_tax);
             $("select[name='default_tax_category']").prop("disabled", !use_destination_based_tax);
             $("select[name='default_tax_jurisdiction']").prop("disabled", !use_destination_based_tax);
diff --git a/app/Views/customers/form.php b/app/Views/customers/form.php
index c314ac6e4..b348d98da 100644
--- a/app/Views/customers/form.php
+++ b/app/Views/customers/form.php
@@ -453,7 +453,7 @@
             }
         });
 
-        var fill_value = function(event, ui) {
+        const fill_value = function(event, ui) {
             event.preventDefault();
             $("input[name='sales_tax_code_id']").val(ui.item.value);
             $("input[name='sales_tax_code_name']").val(ui.item.label);
diff --git a/app/Views/employees/form.php b/app/Views/employees/form.php
index ba12ffde5..625219b1f 100644
--- a/app/Views/employees/form.php
+++ b/app/Views/employees/form.php
@@ -26,7 +26,7 @@
     </ul>
 
     <div class="tab-content">
-        <div class="tab-pane fade in active" id="employee_basic_info">
+        <div class="tab-pane active" id="employee_basic_info">
             <fieldset>
                 <?= view('people/form_basic_info') ?>
             </fieldset>
@@ -113,9 +113,10 @@
                 <p><?= lang('Employees.permission_desc') ?></p>
 
                 <ul id="permission_list">
+                    <?= form_hidden('module_validation', '1', 'class="module"') ?>
                     <?php foreach ($all_modules as $module) { ?>
                         <li>
-                            <?= form_checkbox("grant_$module->module_id", $module->module_id, $module->grant == 1, 'class="module"') ?>
+                            <?= form_checkbox("grant_$module->module_id", $module->module_id, $module->grant == 1, 'class="module-toggle"') ?>
                             <?= form_dropdown(
                                 "menu_group_$module->module_id",
                                 [
@@ -123,8 +124,7 @@
                                     'office' => lang('Module.office'),
                                     'both'   => lang('Module.both')
                                 ],
-                                $module->menu_group,
-                                'class="module"'
+                                $module->menu_group
                             ) ?>
 
                             <span class="medium"><?= lang("Module.$module->module_id") ?>:</span>
@@ -166,11 +166,11 @@
             ignore: []
         });
 
-        $.validator.addMethod('module', function(value, element) {
-            var result = $('#permission_list input').is(':checked');
-            $('.module').each(function(index, element) {
-                var parent = $(element).parent();
-                var checked = $(element).is(':checked');
+        $.validator.addMethod('module', function() {
+            let result = $('#permission_list input').is(':checked');
+            $('.module-toggle').each(function(index, element) {
+                const parent = $(element);
+                const checked = $(element).is(':checked');
                 if ($('ul', parent).length > 0 && result) {
                     result &= !checked || (checked && $('ul > li > input:checked', parent).length > 0);
                 }
@@ -178,11 +178,11 @@
             return result;
         }, "<?= lang('Employees.subpermission_required') ?>");
 
-        $('ul#permission_list > li > input.module').each(function() {
-            var $this = $(this);
+        $('ul#permission_list > li > input.module-toggle').each(function() {
+            const $this = $(this);
             $('ul > li > input,select', $this.parent()).each(function() {
-                var $that = $(this);
-                var updateInputs = function(checked) {
+                const $that = $(this);
+                const updateInputs = function(checked) {
                     $that.prop('disabled', !checked);
                     !checked && $that.prop('checked', false);
                 }
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
index 3283ece84..3f0b40021 100644
--- a/app/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -57,7 +57,7 @@ if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) {
         $args = implode(', ', array_map(static fn ($value): string => match (true) {
             is_object($value) => 'Object(' . $value::class . ')',
             is_array($value)  => $value !== [] ? '[...]' : '[]',
-            $value === null   => 'null', // Return the lowercased version
+            $value === null   => 'null', // return the lowercased version
             default           => var_export($value, true),
         }, array_values($error['args'] ?? [])));
 
diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
index b20f36a53..b8539a420 100644
--- a/app/Views/errors/html/debug.css
+++ b/app/Views/errors/html/debug.css
@@ -3,7 +3,7 @@
     --main-text-color: #555;
     --dark-text-color: #222;
     --light-text-color: #c7c7c7;
-    --brand-primary-color: #E06E3F;
+    --brand-primary-color: #DC4814;
     --light-bg-color: #ededee;
     --dark-bg-color: #404040;
 }
@@ -71,7 +71,7 @@ p.lead {
     text-align: center;
     padding: calc(4px + 0.2083vw);
     width: 100%;
-    margin-top: -2.14rem;
+    top: 0;
     position: fixed;
 }
 
diff --git a/app/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
index 99199cac8..7d4c72a37 100644
--- a/app/Views/errors/html/debug.js
+++ b/app/Views/errors/html/debug.js
@@ -1,17 +1,17 @@
-var tabLinks    = new Array();
-var contentDivs = new Array();
+const tabLinks    = new Array();
+const contentDivs = new Array();
 
 function init()
 {
     // Grab the tab links and content divs from the page
-    var tabListItems = document.getElementById('tabs').childNodes;
+    const tabListItems = document.getElementById('tabs').childNodes;
     console.log(tabListItems);
-    for (var i = 0; i < tabListItems.length; i ++)
+    for (let i = 0; i < tabListItems.length; i ++)
     {
         if (tabListItems[i].nodeName == "LI")
         {
-            var tabLink     = getFirstChildWithTagName(tabListItems[i], 'A');
-            var id          = getHash(tabLink.getAttribute('href'));
+            const tabLink     = getFirstChildWithTagName(tabListItems[i], 'A');
+            const id          = getHash(tabLink.getAttribute('href'));
             tabLinks[id]    = tabLink;
             contentDivs[id] = document.getElementById(id);
         }
@@ -19,9 +19,9 @@ function init()
 
     // Assign onclick events to the tab links, and
     // highlight the first tab
-    var i = 0;
+    let i = 0;
 
-    for (var id in tabLinks)
+    for (const id in tabLinks)
     {
         tabLinks[id].onclick = showTab;
         tabLinks[id].onfocus = function () {
@@ -35,26 +35,26 @@ function init()
     }
 
     // Hide all content divs except the first
-    var i = 0;
+    let j = 0;
 
-    for (var id in contentDivs)
+    for (const id in contentDivs)
     {
-        if (i != 0)
+        if (j != 0)
         {
             console.log(contentDivs[id]);
             contentDivs[id].className = 'content hide';
         }
-        i ++;
+        j ++;
     }
 }
 
 function showTab()
 {
-    var selectedId = getHash(this.getAttribute('href'));
+    const selectedId = getHash(this.getAttribute('href'));
 
     // Highlight the selected tab, and dim all others.
     // Also show the selected content div, and hide all others.
-    for (var id in contentDivs)
+    for (const id in contentDivs)
     {
         if (id == selectedId)
         {
@@ -74,7 +74,7 @@ function showTab()
 
 function getFirstChildWithTagName(element, tagName)
 {
-    for (var i = 0; i < element.childNodes.length; i ++)
+    for (let i = 0; i < element.childNodes.length; i ++)
     {
         if (element.childNodes[i].nodeName == tagName)
         {
@@ -85,28 +85,29 @@ function getFirstChildWithTagName(element, tagName)
 
 function getHash(url)
 {
-    var hashPos = url.lastIndexOf('#');
+    const hashPos = url.lastIndexOf('#');
     return url.substring(hashPos + 1);
 }
 
 function toggle(elem)
 {
     elem = document.getElementById(elem);
+    let disp;
 
     if (elem.style && elem.style['display'])
     {
         // Only works with the "style" attr
-        var disp = elem.style['display'];
+        disp = elem.style['display'];
     }
     else if (elem.currentStyle)
     {
         // For MSIE, naturally
-        var disp = elem.currentStyle['display'];
+        disp = elem.currentStyle['display'];
     }
     else if (window.getComputedStyle)
     {
         // For most other browsers
-        var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+        disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
     }
 
     // Toggle the state of the "display" style
diff --git a/app/Views/errors/html/error_400.php b/app/Views/errors/html/error_400.php
index b0e8e7d9d..555da042b 100644
--- a/app/Views/errors/html/error_400.php
+++ b/app/Views/errors/html/error_400.php
@@ -1,6 +1,5 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-
 <head>
     <meta charset="utf-8">
     <title><?= lang('Errors.badRequest') ?></title>
@@ -16,7 +15,6 @@
             left: 50%;
             margin-left: -73px;
         }
-
         body {
             height: 100%;
             background: #fafafa;
@@ -24,7 +22,6 @@
             color: #777;
             font-weight: 300;
         }
-
         h1 {
             font-weight: lighter;
             letter-spacing: normal;
@@ -33,7 +30,6 @@
             margin-bottom: 0;
             color: #222;
         }
-
         .wrap {
             max-width: 1024px;
             margin: 5rem auto;
@@ -44,12 +40,10 @@
             border-radius: 0.5rem;
             position: relative;
         }
-
         pre {
             white-space: normal;
             margin-top: 1.5rem;
         }
-
         code {
             background: #fafafa;
             border: 1px solid #efefef;
@@ -57,11 +51,9 @@
             border-radius: 5px;
             display: block;
         }
-
         p {
             margin-top: 1.5rem;
         }
-
         .footer {
             margin-top: 2rem;
             border-top: 1px solid #efefef;
@@ -69,7 +61,6 @@
             font-size: 85%;
             color: #999;
         }
-
         a:active,
         a:link,
         a:visited {
@@ -77,19 +68,17 @@
         }
     </style>
 </head>
-
 <body>
-    <div class="wrap">
-        <h1>400</h1>
+<div class="wrap">
+    <h1>400</h1>
 
-        <p>
-            <?php if (ENVIRONMENT !== 'production') : ?>
-                <?= nl2br(esc($message)) ?>
-            <?php else : ?>
-                <?= lang('Errors.sorryBadRequest') ?>
-            <?php endif; ?>
-        </p>
-    </div>
+    <p>
+        <?php if (ENVIRONMENT !== 'production') : ?>
+            <?= nl2br(esc($message)) ?>
+        <?php else : ?>
+            <?= lang('Errors.sorryBadRequest') ?>
+        <?php endif; ?>
+    </p>
+</div>
 </body>
-
 </html>
diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
index 9c088da68..e506f0835 100644
--- a/app/Views/errors/html/error_404.php
+++ b/app/Views/errors/html/error_404.php
@@ -1,10 +1,4 @@
-<?php
-/**
- * @var string $message
- */
-?>
-
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 9aa03b3d2..d2f2e47a8 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -14,421 +14,424 @@ $errorId = uniqid('error', true);
 ?>
 <!doctype html>
 <html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="robots" content="noindex">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="robots" content="noindex">
 
-    <title><?= esc($title) ?></title>
-    <style>
-        <?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
-    </style>
+        <title><?= esc($title) ?></title>
+        <style>
+            <?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+        </style>
 
-    <script type="text/javascript">
-        <?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
-    </script>
-</head>
-<body onload="init()">
+        <script type="text/javascript">
+            <?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
+        </script>
+    </head>
+    <body onload="init()">
 
-    <!-- Header -->
-    <div class="header">
-        <div class="environment">
-            Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
-            PHP: <?= esc(PHP_VERSION) ?>  &mdash;
-            CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
-            Environment: <?= ENVIRONMENT ?>
+        <!-- Header -->
+        <div class="header">
+            <div class="environment">
+                Displayed at <?= esc(date('H:i:s')) ?> &mdash;
+                PHP: <?= esc(PHP_VERSION) ?>  &mdash;
+                CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
+                Environment: <?= ENVIRONMENT ?>
+            </div>
+            <div class="container">
+                <h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
+                <p>
+                    <?= nl2br(esc($exception->getMessage())) ?>
+                    <a href="https://www.duckduckgo.com/?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
+                       rel="noreferrer" target="_blank">search &rarr;</a>
+                </p>
+            </div>
         </div>
+
+        <!-- Source -->
         <div class="container">
-            <h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
-            <p>
-                <?= nl2br(esc($exception->getMessage())) ?>
-                <a href="https://www.duckduckgo.com/?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
-                   rel="noreferrer" target="_blank">search &rarr;</a>
-            </p>
+            <p><b><?= esc(clean_path($file)) ?></b> at line <b><?= esc($line) ?></b></p>
+
+            <?php if (is_file($file)) : ?>
+                <div class="source">
+                    <?= static::highlightFile($file, $line, 15); ?>
+                </div>
+            <?php endif; ?>
         </div>
-    </div>
 
-    <!-- Source -->
-    <div class="container">
-        <p><b><?= esc(clean_path($file)) ?></b> at line <b><?= esc($line) ?></b></p>
-
-        <?php if (is_file($file)) : ?>
-            <div class="source">
-                <?= static::highlightFile($file, $line, 15); ?>
-            </div>
-        <?php endif; ?>
-    </div>
-
-    <div class="container">
-        <?php
-        $last = $exception;
-
-        while ($prevException = $last->getPrevious()) {
-            $last = $prevException;
-        ?>
-
-            <pre>
-                Caused by:
-                <?= esc($prevException::class), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
-
-                <?= nl2br(esc($prevException->getMessage())) ?>
-                <a href="https://www.duckduckgo.com/?q=<?= urlencode($prevException::class . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>" rel="noreferrer" target="_blank">search &rarr;</a>
-                <?= esc(clean_path($prevException->getFile()) . ':' . $prevException->getLine()) ?>
-            </pre>
-
-        <?php } ?>
-    </div>
-
-    <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
-    <div class="container">
-
-        <ul class="tabs" id="tabs">
-            <li><a href="#backtrace">Backtrace</a></li>
-            <li><a href="#server">Server</a></li>
-            <li><a href="#request">Request</a></li>
-            <li><a href="#response">Response</a></li>
-            <li><a href="#files">Files</a></li>
-            <li><a href="#memory">Memory</a></li>
-        </ul>
-
-        <div class="tab-content">
-
-            <!-- Backtrace -->
-            <div class="content" id="backtrace">
-
-                <ol class="trace">
-                <?php foreach ($trace as $index => $row) : ?>
-
-                    <li>
-                        <p>
-                            <!-- Trace info -->
-                            <?php if (isset($row['file']) && is_file($row['file'])) : ?>
-                                <?php
-                                if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
-                                    echo esc($row['function'] . ' ' . clean_path($row['file']));
-                                } else {
-                                    echo esc(clean_path($row['file']) . ' : ' . $row['line']);
-                                }
-                                ?>
-                            <?php else: ?>
-                                {PHP internal code}
-                            <?php endif; ?>
-
-                            <!-- Class/Method -->
-                            <?php if (isset($row['class'])) : ?>
-                                &nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
-                                <?php if (! empty($row['args'])) : ?>
-                                    <?php $argsId = $errorId . 'args' . $index ?>
-                                    ( <a href="#" onclick="return toggle('<?= esc($argsId, 'attr') ?>');">arguments</a> )
-                                    <div class="args" id="<?= esc($argsId, 'attr') ?>">
-                                        <table cellspacing="0">
-
-                                        <?php
-                                        $params = null;
-                                        // Reflection by name is not available for closure function
-                                        if (! str_ends_with($row['function'], '}')) {
-                                            $mirror = isset($row['class']) ? new ReflectionMethod($row['class'], $row['function']) : new ReflectionFunction($row['function']);
-                                            $params = $mirror->getParameters();
-                                        }
-
-                                        foreach ($row['args'] as $key => $value) : ?>
-                                            <tr>
-                                                <td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
-                                                <td><pre><?= esc(print_r($value, true)) ?></pre></td>
-                                            </tr>
-                                        <?php endforeach ?>
-
-                                        </table>
-                                    </div>
-                                <?php else : ?>
-                                    ()
-                                <?php endif; ?>
-                            <?php endif; ?>
-
-                            <?php if (! isset($row['class']) && isset($row['function'])) : ?>
-                                &nbsp;&nbsp;&mdash;&nbsp;&nbsp;    <?= esc($row['function']) ?>()
-                            <?php endif; ?>
-                        </p>
-
-                        <!-- Source? -->
-                        <?php if (isset($row['file']) && is_file($row['file']) && isset($row['class'])) : ?>
-                            <div class="source">
-                                <?= static::highlightFile($row['file'], $row['line']) ?>
-                            </div>
-                        <?php endif; ?>
-                    </li>
-
-                <?php endforeach; ?>
-                </ol>
-
-            </div>
-
-            <!-- Server -->
-            <div class="content" id="server">
-                <?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
-                    <?php
-                    if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
-                        continue;
-                    } ?>
-
-                    <h3>$<?= esc($var) ?></h3>
-
-                    <table>
-                        <thead>
-                            <tr>
-                                <th>Key</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        <?php foreach ($GLOBALS[$var] as $key => $value) : ?>
-                            <tr>
-                                <td><?= esc($key) ?></td>
-                                <td>
-                                    <?php if (is_string($value)) : ?>
-                                        <?= esc($value) ?>
-                                    <?php else: ?>
-                                        <pre><?= esc(print_r($value, true)) ?></pre>
-                                    <?php endif; ?>
-                                </td>
-                            </tr>
-                        <?php endforeach; ?>
-                        </tbody>
-                    </table>
-
-                <?php endforeach ?>
-
-                <!-- Constants -->
-                <?php $constants = get_defined_constants(true); ?>
-                <?php if (! empty($constants['user'])) : ?>
-                    <h3>Constants</h3>
-
-                    <table>
-                        <thead>
-                            <tr>
-                                <th>Key</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        <?php foreach ($constants['user'] as $key => $value) : ?>
-                            <tr>
-                                <td><?= esc($key) ?></td>
-                                <td>
-                                    <?php if (is_string($value)) : ?>
-                                        <?= esc($value) ?>
-                                    <?php else: ?>
-                                        <pre><?= esc(print_r($value, true)) ?></pre>
-                                    <?php endif; ?>
-                                </td>
-                            </tr>
-                        <?php endforeach; ?>
-                        </tbody>
-                    </table>
-                <?php endif; ?>
-            </div>
-
-            <!-- Request -->
-            <div class="content" id="request">
-                <?php $request = service('request'); ?>
-
-                <table>
-                    <tbody>
-                        <tr>
-                            <td style="width: 10em">Path</td>
-                            <td><?= esc($request->getUri()) ?></td>
-                        </tr>
-                        <tr>
-                            <td>HTTP Method</td>
-                            <td><?= esc($request->getMethod()) ?></td>
-                        </tr>
-                        <tr>
-                            <td>IP Address</td>
-                            <td><?= esc($request->getIPAddress()) ?></td>
-                        </tr>
-                        <tr>
-                            <td style="width: 10em">Is AJAX Request?</td>
-                            <td><?= $request->isAJAX() ? 'yes' : 'no' ?></td>
-                        </tr>
-                        <tr>
-                            <td>Is CLI Request?</td>
-                            <td><?= $request->isCLI() ? 'yes' : 'no' ?></td>
-                        </tr>
-                        <tr>
-                            <td>Is Secure Request?</td>
-                            <td><?= $request->isSecure() ? 'yes' : 'no' ?></td>
-                        </tr>
-                        <tr>
-                            <td>User Agent</td>
-                            <td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
-                        </tr>
-
-                    </tbody>
-                </table>
-
-
-                <?php $empty = true; ?>
-                <?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
-                    <?php
-                    if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
-                        continue;
-                    } ?>
-
-                    <?php $empty = false; ?>
-
-                    <h3>$<?= esc($var) ?></h3>
-
-                    <table style="width: 100%">
-                        <thead>
-                            <tr>
-                                <th>Key</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        <?php foreach ($GLOBALS[$var] as $key => $value) : ?>
-                            <tr>
-                                <td><?= esc($key) ?></td>
-                                <td>
-                                    <?php if (is_string($value)) : ?>
-                                        <?= esc($value) ?>
-                                    <?php else: ?>
-                                        <pre><?= esc(print_r($value, true)) ?></pre>
-                                    <?php endif; ?>
-                                </td>
-                            </tr>
-                        <?php endforeach; ?>
-                        </tbody>
-                    </table>
-
-                <?php endforeach ?>
-
-                <?php if ($empty) : ?>
-
-                    <div class="alert">
-                        No $_GET, $_POST, or $_COOKIE Information to show.
-                    </div>
-
-                <?php endif; ?>
-
-                <?php $headers = $request->headers(); ?>
-                <?php if (! empty($headers)) : ?>
-
-                    <h3>Headers</h3>
-
-                    <table>
-                        <thead>
-                            <tr>
-                                <th>Header</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        <?php foreach ($headers as $name => $value) : ?>
-                            <tr>
-                                <td><?= esc($name, 'html') ?></td>
-                                <td>
-                                <?php
-                                if ($value instanceof Header) {
-                                    echo esc($value->getValueLine(), 'html');
-                                } else {
-                                    foreach ($value as $i => $header) {
-                                        echo ' ('. $i+1 . ') ' . esc($header->getValueLine(), 'html');
-                                    }
-                                }
-                                ?>
-                                </td>
-                            </tr>
-                        <?php endforeach; ?>
-                        </tbody>
-                    </table>
-
-                <?php endif; ?>
-            </div>
-
-            <!-- Response -->
+        <div class="container">
             <?php
-                $response = service('response');
-                $response->setStatusCode(http_response_code());
-            ?>
-            <div class="content" id="response">
-                <table>
-                    <tr>
-                        <td style="width: 15em">Response Status</td>
-                        <td><?= esc($response->getStatusCode() . ' - ' . $response->getReasonPhrase()) ?></td>
-                    </tr>
-                </table>
+            $last = $exception;
 
-                <?php $headers = $response->headers(); ?>
-                <?php if (! empty($headers)) : ?>
-                    <h3>Headers</h3>
+            while ($prevException = $last->getPrevious()) {
+                $last = $prevException;
+            ?>
+
+        <pre>
+        Caused by:
+        <?= esc($prevException::class), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
+
+        <?= nl2br(esc($prevException->getMessage())) ?>
+        <a href="https://www.duckduckgo.com/?q=<?= urlencode($prevException::class . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>"
+           rel="noreferrer" target="_blank">search &rarr;</a>
+        <?= esc(clean_path($prevException->getFile()) . ':' . $prevException->getLine()) ?>
+        </pre>
+
+            <?php
+            }
+            ?>
+        </div>
+
+        <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
+        <div class="container">
+
+            <ul class="tabs" id="tabs">
+                <li><a href="#backtrace">Backtrace</a></li>
+                <li><a href="#server">Server</a></li>
+                <li><a href="#request">Request</a></li>
+                <li><a href="#response">Response</a></li>
+                <li><a href="#files">Files</a></li>
+                <li><a href="#memory">Memory</a></li>
+            </ul>
+
+            <div class="tab-content">
+
+                <!-- Backtrace -->
+                <div class="content" id="backtrace">
+
+                    <ol class="trace">
+                    <?php foreach ($trace as $index => $row) : ?>
+
+                        <li>
+                            <p>
+                                <!-- Trace info -->
+                                <?php if (isset($row['file']) && is_file($row['file'])) : ?>
+                                    <?php
+                                    if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
+                                        echo esc($row['function'] . ' ' . clean_path($row['file']));
+                                    } else {
+                                        echo esc(clean_path($row['file']) . ' : ' . $row['line']);
+                                    }
+                                    ?>
+                                <?php else: ?>
+                                    {PHP internal code}
+                                <?php endif; ?>
+
+                                <!-- Class/Method -->
+                                <?php if (isset($row['class'])) : ?>
+                                    &nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
+                                    <?php if (! empty($row['args'])) : ?>
+                                        <?php $argsId = $errorId . 'args' . $index ?>
+                                        ( <a href="#" onclick="return toggle('<?= esc($argsId, 'attr') ?>');">arguments</a> )
+                                        <div class="args" id="<?= esc($argsId, 'attr') ?>">
+                                            <table style="border-spacing: 0;">
+
+                                            <?php
+                                            $params = null;
+                                            // Reflection by name is not available for closure function
+                                            if (! str_ends_with($row['function'], '}')) {
+                                                $mirror = isset($row['class']) ? new ReflectionMethod($row['class'], $row['function']) : new ReflectionFunction($row['function']);
+                                                $params = $mirror->getParameters();
+                                            }
+
+                                            foreach ($row['args'] as $key => $value) : ?>
+                                                <tr>
+                                                    <td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
+                                                    <td><pre><?= esc(print_r($value, true)) ?></pre></td>
+                                                </tr>
+                                            <?php endforeach ?>
+
+                                            </table>
+                                        </div>
+                                    <?php else : ?>
+                                        ()
+                                    <?php endif; ?>
+                                <?php endif; ?>
+
+                                <?php if (! isset($row['class']) && isset($row['function'])) : ?>
+                                    &nbsp;&nbsp;&mdash;&nbsp;&nbsp;    <?= esc($row['function']) ?>()
+                                <?php endif; ?>
+                            </p>
+
+                            <!-- Source? -->
+                            <?php if (isset($row['file']) && is_file($row['file']) && isset($row['class'])) : ?>
+                                <div class="source">
+                                    <?= static::highlightFile($row['file'], $row['line']) ?>
+                                </div>
+                            <?php endif; ?>
+                        </li>
+
+                    <?php endforeach; ?>
+                    </ol>
+
+                </div>
+
+                <!-- Server -->
+                <div class="content" id="server">
+                    <?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
+                        <?php
+                        if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
+                            continue;
+                        } ?>
+
+                        <h3>$<?= esc($var) ?></h3>
+
+                        <table>
+                            <thead>
+                                <tr>
+                                    <th>Key</th>
+                                    <th>Value</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            <?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+                                <tr>
+                                    <td><?= esc($key) ?></td>
+                                    <td>
+                                        <?php if (is_string($value)) : ?>
+                                            <?= esc($value) ?>
+                                        <?php else: ?>
+                                            <pre><?= esc(print_r($value, true)) ?></pre>
+                                        <?php endif; ?>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                            </tbody>
+                        </table>
+
+                    <?php endforeach ?>
+
+                    <!-- Constants -->
+                    <?php $constants = get_defined_constants(true); ?>
+                    <?php if (! empty($constants['user'])) : ?>
+                        <h3>Constants</h3>
+
+                        <table>
+                            <thead>
+                                <tr>
+                                    <th>Key</th>
+                                    <th>Value</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            <?php foreach ($constants['user'] as $key => $value) : ?>
+                                <tr>
+                                    <td><?= esc($key) ?></td>
+                                    <td>
+                                        <?php if (is_string($value)) : ?>
+                                            <?= esc($value) ?>
+                                        <?php else: ?>
+                                            <pre><?= esc(print_r($value, true)) ?></pre>
+                                        <?php endif; ?>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                            </tbody>
+                        </table>
+                    <?php endif; ?>
+                </div>
+
+                <!-- Request -->
+                <div class="content" id="request">
+                    <?php $request = service('request'); ?>
 
                     <table>
-                        <thead>
-                            <tr>
-                                <th>Header</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
                         <tbody>
-                        <?php foreach ($headers as $name => $value) : ?>
                             <tr>
-                                <td><?= esc($name, 'html') ?></td>
-                                <td>
-                                <?php
-                                if ($value instanceof Header) {
-                                    echo esc($response->getHeaderLine($name), 'html');
-                                } else {
-                                    foreach ($value as $i => $header) {
-                                        echo ' ('. $i+1 . ') ' . esc($header->getValueLine(), 'html');
-                                    }
-                                }
-                                ?>
-                                </td>
+                                <td style="width: 10em">Path</td>
+                                <td><?= esc($request->getUri()) ?></td>
                             </tr>
-                        <?php endforeach; ?>
+                            <tr>
+                                <td>HTTP Method</td>
+                                <td><?= esc($request->getMethod()) ?></td>
+                            </tr>
+                            <tr>
+                                <td>IP Address</td>
+                                <td><?= esc($request->getIPAddress()) ?></td>
+                            </tr>
+                            <tr>
+                                <td style="width: 10em">Is AJAX Request?</td>
+                                <td><?= $request->isAJAX() ? 'yes' : 'no' ?></td>
+                            </tr>
+                            <tr>
+                                <td>Is CLI Request?</td>
+                                <td><?= $request->isCLI() ? 'yes' : 'no' ?></td>
+                            </tr>
+                            <tr>
+                                <td>Is Secure Request?</td>
+                                <td><?= $request->isSecure() ? 'yes' : 'no' ?></td>
+                            </tr>
+                            <tr>
+                                <td>User Agent</td>
+                                <td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
+                            </tr>
+
                         </tbody>
                     </table>
 
-                <?php endif; ?>
-            </div>
 
-            <!-- Files -->
-            <div class="content" id="files">
-                <?php $files = get_included_files(); ?>
+                    <?php $empty = true; ?>
+                    <?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
+                        <?php
+                        if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
+                            continue;
+                        } ?>
 
-                <ol>
-                <?php foreach ($files as $file) :?>
-                    <li><?= esc(clean_path($file)) ?></li>
-                <?php endforeach ?>
-                </ol>
-            </div>
+                        <?php $empty = false; ?>
 
-            <!-- Memory -->
-            <div class="content" id="memory">
+                        <h3>$<?= esc($var) ?></h3>
 
-                <table>
-                    <tbody>
+                        <table style="width: 100%">
+                            <thead>
+                                <tr>
+                                    <th>Key</th>
+                                    <th>Value</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            <?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+                                <tr>
+                                    <td><?= esc($key) ?></td>
+                                    <td>
+                                        <?php if (is_string($value)) : ?>
+                                            <?= esc($value) ?>
+                                        <?php else: ?>
+                                            <pre><?= esc(print_r($value, true)) ?></pre>
+                                        <?php endif; ?>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                            </tbody>
+                        </table>
+
+                    <?php endforeach ?>
+
+                    <?php if ($empty) : ?>
+
+                        <div class="alert">
+                            No $_GET, $_POST, or $_COOKIE Information to show.
+                        </div>
+
+                    <?php endif; ?>
+
+                    <?php $headers = $request->headers(); ?>
+                    <?php if (! empty($headers)) : ?>
+
+                        <h3>Headers</h3>
+
+                        <table>
+                            <thead>
+                                <tr>
+                                    <th>Header</th>
+                                    <th>Value</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            <?php foreach ($headers as $name => $value) : ?>
+                                <tr>
+                                    <td><?= esc($name, 'html') ?></td>
+                                    <td>
+                                    <?php
+                                    if ($value instanceof Header) {
+                                        echo esc($value->getValueLine(), 'html');
+                                    } else {
+                                        foreach ($value as $i => $header) {
+                                            echo ' (' . ($i + 1) . ') ' . esc($header->getValueLine(), 'html');
+                                        }
+                                    }
+                                    ?>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                            </tbody>
+                        </table>
+
+                    <?php endif; ?>
+                </div>
+
+                <!-- Response -->
+                <?php
+                    $response = service('response');
+                    $response->setStatusCode(http_response_code());
+                ?>
+                <div class="content" id="response">
+                    <table>
                         <tr>
-                            <td>Memory Usage</td>
-                            <td><?= esc(static::describeMemory(memory_get_usage(true))) ?></td>
+                            <td style="width: 15em">Response Status</td>
+                            <td><?= esc($response->getStatusCode() . ' - ' . $response->getReasonPhrase()) ?></td>
                         </tr>
-                        <tr>
-                            <td style="width: 12em">Peak Memory Usage:</td>
-                            <td><?= esc(static::describeMemory(memory_get_peak_usage(true))) ?></td>
-                        </tr>
-                        <tr>
-                            <td>Memory Limit:</td>
-                            <td><?= esc(ini_get('memory_limit')) ?></td>
-                        </tr>
-                    </tbody>
-                </table>
+                    </table>
 
-            </div>
+                    <?php $headers = $response->headers(); ?>
+                    <?php if (! empty($headers)) : ?>
+                        <h3>Headers</h3>
 
-        </div>  <!-- /tab-content -->
+                        <table>
+                            <thead>
+                                <tr>
+                                    <th>Header</th>
+                                    <th>Value</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            <?php foreach ($headers as $name => $value) : ?>
+                                <tr>
+                                    <td><?= esc($name, 'html') ?></td>
+                                    <td>
+                                    <?php
+                                    if ($value instanceof Header) {
+                                        echo esc($response->getHeaderLine($name), 'html');
+                                    } else {
+                                        foreach ($value as $i => $header) {
+                                            echo ' (' . ($i + 1) . ') ' . esc($header->getValueLine(), 'html');
+                                        }
+                                    }
+                                    ?>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                            </tbody>
+                        </table>
 
-    </div> <!-- /container -->
-    <?php endif; ?>
+                    <?php endif; ?>
+                </div>
 
-</body>
+                <!-- Files -->
+                <div class="content" id="files">
+                    <?php $files = get_included_files(); ?>
+
+                    <ol>
+                    <?php foreach ($files as $file) :?>
+                        <li><?= esc(clean_path($file)) ?></li>
+                    <?php endforeach ?>
+                    </ol>
+                </div>
+
+                <!-- Memory -->
+                <div class="content" id="memory">
+
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td>Memory Usage</td>
+                                <td><?= esc(static::describeMemory(memory_get_usage(true))) ?></td>
+                            </tr>
+                            <tr>
+                                <td style="width: 12em">Peak Memory Usage:</td>
+                                <td><?= esc(static::describeMemory(memory_get_peak_usage(true))) ?></td>
+                            </tr>
+                            <tr>
+                                <td>Memory Limit:</td>
+                                <td><?= esc(ini_get('memory_limit')) ?></td>
+                            </tr>
+                        </tbody>
+                    </table>
+
+                </div>
+
+            </div>  <!-- /tab-content -->
+
+        </div> <!-- /container -->
+        <?php endif; ?>
+
+    </body>
 </html>
diff --git a/app/Views/expenses/form.php b/app/Views/expenses/form.php
index 2fc89f99e..8169cc8a9 100644
--- a/app/Views/expenses/form.php
+++ b/app/Views/expenses/form.php
@@ -126,7 +126,12 @@
         <div class="form-group form-group-sm">
             <?= form_label(lang('Expenses.employee'), 'employee', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-6">
-                <?= form_dropdown('employee_id', $employees, $expenses_info->employee_id, 'id="employee_id" class="form-control"') ?>
+                <?php if ($can_assign_employee): ?>
+                    <?= form_dropdown('employee_id', $employees, $expenses_info->employee_id, 'id="employee_id" class="form-control"') ?>
+                <?php else: ?>
+                    <?= form_hidden('employee_id', $expenses_info->employee_id) ?>
+                    <?= form_input(['name' => 'employee_name', 'value' => $employees[$expenses_info->employee_id] ?? '', 'class' => 'form-control', 'readonly' => 'readonly']) ?>
+                <?php endif; ?>
             </div>
         </div>
 
diff --git a/app/Views/expenses/manage.php b/app/Views/expenses/manage.php
index a47e57334..ecdba7450 100644
--- a/app/Views/expenses/manage.php
+++ b/app/Views/expenses/manage.php
@@ -3,7 +3,10 @@
  * @var string $controller_name
  * @var string $table_headers
  * @var array $filters
+ * @var array $selected_filters
  * @var array $config
+ * @var string|null $start_date
+ * @var string|null $end_date
  */
 ?>
 
@@ -11,12 +14,10 @@
 
 <script type="text/javascript">
     $(document).ready(function() {
-        // When any filter is clicked and the dropdown window is closed
         $('#filters').on('hidden.bs.select', function(e) {
             table_support.refresh();
         });
 
-        // Load the preset datarange picker
         <?= view('partial/daterangepicker') ?>
 
         $("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
@@ -25,6 +26,13 @@
 
         <?= view('partial/bootstrap_tables_locale') ?>
 
+        <?php if (isset($start_date) && $start_date): ?>
+        start_date = "<?= esc($start_date) ?>";
+        <?php endif; ?>
+        <?php if (isset($end_date) && $end_date): ?>
+        end_date = "<?= esc($end_date) ?>";
+        <?php endif; ?>
+
         table_support.init({
             resource: '<?= esc($controller_name) ?>',
             headers: <?= $table_headers ?>,
@@ -45,13 +53,15 @@
                 });
             }
         });
+
     });
 </script>
+<?= view('partial/table_filter_persistence') ?>
 
 <?= view('partial/print_receipt', ['print_after_sale' => false, 'selected_printer' => 'takings_printer']) ?>
 
 <div id="title_bar" class="print_hide btn-toolbar">
-    <button onclick="javascript:printdoc()" class="btn btn-info btn-sm pull-right">
+    <button onclick="printdoc()" class="btn btn-info btn-sm pull-right">
         <span class="glyphicon glyphicon-print">&nbsp;</span><?= lang('Common.print') ?>
     </button>
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
@@ -65,7 +75,7 @@
             <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
         </button>
         <?= form_input(['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
-        <?= form_multiselect('filters[]', esc($filters), [''], [
+        <?= form_multiselect('filters[]', esc($filters), $selected_filters ?? [], [
             'id'                        => 'filters',
             'data-none-selected-text'   => lang('Common.none_selected_text'),
             'class'                     => 'selectpicker show-menu-arrow',
diff --git a/app/Views/giftcards/form.php b/app/Views/giftcards/form.php
index 586c995c5..38c8130c4 100644
--- a/app/Views/giftcards/form.php
+++ b/app/Views/giftcards/form.php
@@ -78,7 +78,7 @@
             !$(this).val() && $(this).val('');
         });
 
-        var fill_value = function(event, ui) {
+        const fill_value = function(event, ui) {
             event.preventDefault();
             $(this).val((ui.item ? ui.item.label : ""));
             $("input[name='person_id']").val(ui.item.value);
diff --git a/app/Views/item_kits/form.php b/app/Views/item_kits/form.php
index dde0d1f0f..51d90188c 100644
--- a/app/Views/item_kits/form.php
+++ b/app/Views/item_kits/form.php
@@ -235,7 +235,7 @@
             }
         });
 
-        var fill_value = function(event, ui) {
+        const fill_value = function(event, ui) {
             event.preventDefault();
             $("input[name='kit_item_id']").val(ui.item.value);
             $("input[name='item_name']").val(DOMPurify.sanitize(ui.item.label));
diff --git a/app/Views/items/form.php b/app/Views/items/form.php
index f14002fc7..be2e9b3c5 100644
--- a/app/Views/items/form.php
+++ b/app/Views/items/form.php
@@ -467,7 +467,7 @@
             !$(this).val() && $(this).val('');
         });
 
-        var fill_tax_category_value = function(event, ui) {
+        const fill_tax_category_value = function(event, ui) {
             event.preventDefault();
             $("input[name='tax_category_id']").val(ui.item.value);
             $("input[name='tax_category']").val(ui.item.label);
@@ -483,7 +483,7 @@
             focus: fill_tax_category_value
         });
 
-        var fill_low_sell_value = function(event, ui) {
+        const fill_low_sell_value = function(event, ui) {
             event.preventDefault();
             $("input[name='low_sell_item_id']").val(ui.item.value);
             $("input[name='low_sell_item_name']").val(ui.item.label);
@@ -517,7 +517,7 @@
             return value.match(/(\||_)/g) == null;
         }, "<?= lang('Attributes.attribute_value_invalid_chars') ?>");
 
-        var init_validation = function() {
+        const init_validation = function() {
             $('#item_form').validate($.extend({
                 submitHandler: function(form, event) { // Event is not used as a parameter here
                     $(form).ajaxSubmit({
diff --git a/app/Views/items/form_bulk.php b/app/Views/items/form_bulk.php
index e4c32d712..4612cbf89 100644
--- a/app/Views/items/form_bulk.php
+++ b/app/Views/items/form_bulk.php
@@ -178,10 +178,10 @@
             delay: 10
         });
 
-        var confirm_message = false;
+        let confirm_message = false;
         $('#tax_percent_name_2, #tax_name_2').prop('disabled', true),
             $('#tax_percent_name_1, #tax_name_1').blur(function() {
-                var disabled = !($('#tax_percent_name_1').val() + $('#tax_name_1').val());
+                const disabled = !($('#tax_percent_name_1').val() + $('#tax_name_1').val());
                 $('#tax_percent_name_2, #tax_name_2').prop('disabled', disabled);
                 confirm_message = disabled ? '' : "<?= lang('Items.confirm_bulk_edit_wipe_taxes') ?>";
             });
diff --git a/app/Views/items/form_count_details.php b/app/Views/items/form_count_details.php
index 242888fb7..07abb2e97 100644
--- a/app/Views/items/form_count_details.php
+++ b/app/Views/items/form_count_details.php
@@ -115,27 +115,27 @@ use App\Models\Inventory;
     });
 
     function display_stock(location_id) {
-        var item_quantities = <?= json_encode(esc($item_quantities, 'raw')) ?>;
+        const item_quantities = <?= json_encode(esc($item_quantities, 'raw')) ?>;
         document.getElementById("quantity").value = parseFloat(item_quantities[location_id]).toFixed(<?= quantity_decimals() ?>);
 
-        var inventory_data = <?= json_encode(esc($inventory_array, 'raw')) ?>;
-        var employee_data = <?= json_encode(esc($employee_name, 'raw')) ?>;
+        const inventory_data = <?= json_encode(esc($inventory_array, 'raw')) ?>;
+        const employee_data = <?= json_encode(esc($employee_name, 'raw')) ?>;
 
-        var table = document.getElementById("inventory_result");
+        const table = document.getElementById("inventory_result");
 
         // Remove old query from tbody
-        var rowCount = table.rows.length;
-        for (var index = rowCount; index > 0; index--) {
+        const rowCount = table.rows.length;
+        for (let index = rowCount; index > 0; index--) {
             table.deleteRow(index - 1);
         }
 
         // Add new query to tbody
-        for (var index = 0; index < inventory_data.length; index++) {
-            var data = inventory_data[index];
+        for (let index = 0; index < inventory_data.length; index++) {
+            const data = inventory_data[index];
             if (data['trans_location'] == location_id) {
-                var tr = document.createElement('tr');
+                const tr = document.createElement('tr');
 
-                var td = document.createElement('td');
+                let td = document.createElement('td');
                 td.appendChild(document.createTextNode(data['trans_date']));
                 tr.appendChild(td);
 
diff --git a/app/Views/items/form_inventory.php b/app/Views/items/form_inventory.php
index 690057d76..886075ba9 100644
--- a/app/Views/items/form_inventory.php
+++ b/app/Views/items/form_inventory.php
@@ -136,7 +136,7 @@
     });
 
     function fill_quantity(val) {
-        var item_quantities = <?= json_encode(esc($item_quantities, 'raw')) ?>;
+        const item_quantities = <?= json_encode(esc($item_quantities, 'raw')) ?>;
         document.getElementById('quantity').value = parseFloat(item_quantities[val]).toFixed(<?= quantity_decimals() ?>);
     }
 </script>
diff --git a/app/Views/items/manage.php b/app/Views/items/manage.php
index 71d0428df..4815d00b4 100644
--- a/app/Views/items/manage.php
+++ b/app/Views/items/manage.php
@@ -6,6 +6,9 @@
  * @var array $stock_locations
  * @var int $stock_location
  * @var array $config
+ * @var string|null $start_date
+ * @var string|null $end_date
+ * @var array $selected_filters
  */
 
 use App\Models\Employee;
@@ -22,24 +25,20 @@ use App\Models\Employee;
             );
         });
 
-        // When any filter is clicked and the dropdown window is closed
-        $('#filters').on('hidden.bs.select', function(e) {
-            table_support.refresh();
-        });
-
         // Load the preset daterange picker
         <?= view('partial/daterangepicker') ?>
         // Set the beginning of time as starting date
         $('#daterangepicker').data('daterangepicker').setStartDate("<?= date($config['dateformat'], mktime(0, 0, 0, 01, 01, 2010)) ?>");
         // Update the hidden inputs with the selected dates before submitting the search data
-        var start_date = "<?= date('Y-m-d', mktime(0, 0, 0, 01, 01, 2010)) ?>";
-        $("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
-            table_support.refresh();
-        });
+        start_date = "<?= date('Y-m-d', mktime(0, 0, 0, 01, 01, 2010)) ?>";
 
-        $("#stock_location").change(function() {
-            table_support.refresh();
-        });
+        // Override dates from server if provided
+        <?php if (isset($start_date) && $start_date): ?>
+        start_date = "<?= esc($start_date) ?>";
+        <?php endif; ?>
+        <?php if (isset($end_date) && $end_date): ?>
+        end_date = "<?= esc($end_date) ?>";
+        <?php endif; ?>
 
         <?php
         echo view('partial/bootstrap_tables_locale');
@@ -75,6 +74,8 @@ use App\Models\Employee;
     });
 </script>
 
+<?= view('partial/table_filter_persistence', ['additional_params' => ['stock_location']]) ?>
+
 <div id="title_bar" class="btn-toolbar print_hide">
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/csvImport" ?>" title="<?= lang('Items.import_items_csv') ?>">
         <span class="glyphicon glyphicon-import">&nbsp;</span><?= lang('Common.import_csv') ?>
@@ -97,7 +98,7 @@ use App\Models\Employee;
             <span class="glyphicon glyphicon-barcode">&nbsp;</span><?= lang('Items.generate_barcodes') ?>
         </button>
         <?= form_input(['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
-        <?= form_multiselect('filters[]', $filters, [''], [
+        <?= form_multiselect('filters[]', $filters, $selected_filters ?? [], [
             'id'                        => 'filters',
             'class'                     => 'selectpicker show-menu-arrow',
             'data-none-selected-text'   => lang('Common.none_selected_text'),
diff --git a/app/Views/login.php b/app/Views/login.php
index d665c0677..46c29bd8c 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -1,12 +1,18 @@
 <?php
 /**
- * @var bool $has_errors
- * @var bool $is_latest
- * @var string $latest_version
- * @var bool $gcaptcha_enabled
+ * @var bool $hasErrors
+ * @var bool $isLatest
+ * @var bool $isNewInstall
+ * @var string $latestVersion
+ * @var bool $gcaptchaEnabled
+ * @var CodeIgniter\HTTP\IncomingRequest $request
  * @var array $config
  * @var $validation
  */
+
+use Config\Services;
+
+$request = Services::request();
 ?>
 
 <!doctype html>
@@ -26,7 +32,7 @@
         ? 'flatly'
         : $config['theme']);
     ?>
-    <link rel="stylesheet" href="resources/bootswatch5/<?= "$theme" ?>/bootstrap.min.css">
+    <link rel="stylesheet" href="resources/bootswatch5/<?= esc($theme, 'attr') ?>/bootstrap.min.css">
     <link rel="stylesheet" href="css/login.css">
     <meta name="theme-color" content="#2c3e50">
 </head>
@@ -46,57 +52,104 @@
                 <?php endif; ?>
             </div>
             <section class="box-login d-flex flex-column justify-content-center align-items-center p-md-4">
-                <?= form_open('login') ?>
-                <h3 class="text-center m-0"><?= lang('Login.welcome', [lang('Common.software_short')]) ?></h3>
-                <?php if ($has_errors): ?>
+                <?= form_open('login', ['id' => 'login-form']) ?>
+
+                <h3 id="form-heading" class="text-center m-0">
+                    <?php if ($isNewInstall): ?>
+                        <?= lang('Login.initialization_required') ?>
+                    <?php elseif (!$isLatest): ?>
+                        <?= lang('Login.migration_required') ?>
+                    <?php else: ?>
+                        <?= lang('Login.welcome', [lang('Common.software_short')]) ?>
+                    <?php endif; ?>
+                </h3>
+
+                <div id="migration-warning" class="alert alert-warning mt-3<?= ($isNewInstall || !$isLatest) ? '' : ' d-none' ?>">
+                    <strong>
+                        <?php if ($isNewInstall): ?>
+                            <?= lang('Login.initialization_message') ?>
+                        <?php else: ?>
+                            <?= lang('Login.migration_auth_message', [$latestVersion]) ?>
+                        <?php endif; ?>
+                    </strong>
+                </div>
+
+                <?php if ($hasErrors): ?>
                     <?php foreach ($validation->getErrors() as $error): ?>
                         <div class="alert alert-danger mt-3">
                             <?= $error ?>
                         </div>
                     <?php endforeach; ?>
                 <?php endif; ?>
-                <?php if (!$is_latest): ?>
-                    <div class="alert alert-info mt-3">
-                        <?= lang('Login.migration_needed', [$latest_version]) ?>
+
+                <div id="migration-success" class="alert alert-success d-none mt-3">
+                    <strong><?= lang('Login.migration_complete') ?></strong> <?= lang('Login.migration_complete_login') ?>
+                </div>
+
+                <div id="migration-progress" class="d-none mt-4">
+                    <h3 class="text-center mb-4"><?= lang('Login.migration_initializing') ?></h3>
+                    <div class="progress mb-3" style="height: 30px;">
+                        <div class="progress-bar progress-bar-striped progress-bar-animated bg-primary"
+                             role="progressbar"
+                             style="width: 100%">
+                        </div>
                     </div>
-                <?php endif; ?>
-                <?php if (empty($config['login_form']) || 'floating_labels' == ($config['login_form'])): ?>
-                    <div class="form-floating mt-3">
-                        <input class="form-control" id="input-username" name="username" type="text" placeholder="<?= lang('Login.username') ?>" <?php if (ENVIRONMENT == "testing") echo 'value="admin"'; ?>>
-                        <label for="input-username"><?= lang('Login.username') ?></label>
-                    </div>
-                    <div class="form-floating mb-3">
-                        <input class="form-control" id="input-password" name="password" type="password" placeholder="<?= lang('Login.password') ?>" <?php if (ENVIRONMENT == "testing") echo 'value="pointofsale"'; ?>>
-                        <label for="input-password"><?= lang('Login.password') ?></label>
-                    </div>
-                <?php elseif ('input_groups' == ($config['login_form'])): ?>
-                    <div class="input-group mt-3">
-                        <span class="input-group-text" id="input-username">
-                            <svg class="bi bi-person-fill" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-                                <title><?= lang('Common.icon') . '&nbsp;' . lang('Login.username') ?></title>
-                                <path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6" />
-                            </svg>
-                        </span>
-                        <input class="form-control" name="username" type="text" placeholder="<?= lang('Login.username'); ?>" aria-label="<?= lang('Login.username') ?>" aria-describedby="input-username" <?php if (ENVIRONMENT == "testing") echo 'value="admin"'; ?>>
-                    </div>
-                    <div class="input-group mb-3">
-                        <span class="input-group-text" id="input-password">
-                            <svg class="bi bi-key-fill" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-                                <title><?= lang('Common.icon') . '&nbsp;' . lang('Login.password') ?></title>
-                                <path d="M3.5 11.5a3.5 3.5 0 1 1 3.163-5H14L15.5 8 14 9.5l-1-1-1 1-1-1-1 1-1-1-1 1H6.663a3.5 3.5 0 0 1-3.163 2M2.5 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2" />
-                            </svg>
-                        </span>
-                        <input class="form-control" name="password" type="password" placeholder="<?= lang('Login.password') ?>" aria-label="<?= lang('Login.password') ?>" aria-describedby="input-password" <?php if (ENVIRONMENT == "testing") echo 'value="pointofsale"'; ?>>
-                    </div>
-                <?php endif; ?>
-                <?php
-                if ($gcaptcha_enabled) {
-                    echo '<script src="https://www.google.com/recaptcha/api.js"></script>';
-                    echo '<div class="g-recaptcha mb-3" style="text-align: center;" data-sitekey="' . $config['gcaptcha_site_key'] . '"></div>';
-                }
-                ?>
+                    <p class="text-center text-muted" id="migration-status">
+                        <?= lang('Login.migration_running') ?>
+                    </p>
+                </div>
+
+                <div id="migration-error" class="alert alert-danger d-none mt-3" role="alert">
+                    <strong>Error:</strong> <span id="migration-error-message"></span>
+                </div>
+
+                <div id="login-fields" class="w-100<?= $isNewInstall ? ' d-none' : '' ?>">
+                    <?php if (empty($config['login_form']) || 'floating_labels' == ($config['login_form'])): ?>
+                        <div class="form-floating mt-3">
+                            <input class="form-control" id="input-username" name="username" type="text" placeholder="<?= lang('Login.username') ?>" <?php if (ENVIRONMENT == "testing") echo 'value="admin"'; ?>>
+                            <label for="input-username"><?= lang('Login.username') ?></label>
+                        </div>
+                        <div class="form-floating mb-3">
+                            <input class="form-control" id="input-password" name="password" type="password" placeholder="<?= lang('Login.password') ?>" <?php if (ENVIRONMENT == "testing") echo 'value="pointofsale"'; ?>>
+                            <label for="input-password"><?= lang('Login.password') ?></label>
+                        </div>
+                    <?php elseif ('input_groups' == ($config['login_form'])): ?>
+                        <div class="input-group mt-3">
+                            <span class="input-group-text" id="input-username">
+                                <svg class="bi bi-person-fill" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+                                    <title><?= lang('Common.icon') . '&nbsp;' . lang('Login.username') ?></title>
+                                    <path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6" />
+                                </svg>
+                            </span>
+                            <input class="form-control" name="username" type="text" placeholder="<?= lang('Login.username'); ?>" aria-label="<?= lang('Login.username') ?>" aria-describedby="input-username" <?php if (ENVIRONMENT == "testing") echo 'value="admin"'; ?>>
+                        </div>
+                        <div class="input-group mb-3">
+                            <span class="input-group-text" id="input-password">
+                                <svg class="bi bi-key-fill" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+                                    <title><?= lang('Common.icon') . '&nbsp;' . lang('Login.password') ?></title>
+                                    <path d="M3.5 11.5a3.5 3.5 0 1 1 3.163-5H14L15.5 8 14 9.5l-1-1-1 1-1-1-1 1-1-1-1 1H6.663a3.5 3.5 0 0 1-3.163 2M2.5 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2" />
+                                </svg>
+                            </span>
+                            <input class="form-control" name="password" type="password" placeholder="<?= lang('Login.password') ?>" aria-label="<?= lang('Login.password') ?>" aria-describedby="input-password" <?php if (ENVIRONMENT == "testing") echo 'value="pointofsale"'; ?>>
+                        </div>
+                    <?php endif; ?>
+
+                    <?php if ($gcaptchaEnabled): ?>
+                        <script src="https://www.google.com/recaptcha/api.js"></script>
+                        <div class="g-recaptcha mb-3" style="text-align: center;" data-sitekey="<?= esc($config['gcaptcha_site_key']) ?>"></div>
+                    <?php endif; ?>
+                </div>
+
                 <div class="d-grid">
-                    <button class="btn btn-lg btn-primary" name="login-button" type="submit"><?= lang('Login.go') ?></button>
+                    <button id="submit-button" class="btn btn-lg btn-primary" name="login-button" type="submit">
+                        <?php if ($isNewInstall): ?>
+                            <?= lang('Login.initialize') ?>
+                        <?php elseif (!$isLatest): ?>
+                            <?= lang('Module.migrate') ?>
+                        <?php else: ?>
+                            <?= lang('Login.go') ?>
+                        <?php endif; ?>
+                    </button>
                 </div>
                 <?= form_close() ?>
             </section>
@@ -115,6 +168,160 @@
             <span><?= lang('Common.software_title') ?></span>
         </div>
     </footer>
+
+    <?php if (ENVIRONMENT == 'development' || get_cookie('debug') == 'true' || $request->getGet('debug') == 'true') : ?>
+        <!-- inject:login:debug:js -->
+        <!-- endinject -->
+    <?php else : ?>
+        <!-- inject:login:prod:js -->
+        <!-- endinject -->
+    <?php endif; ?>
+    <script>
+        // @noinspection JSInitializingVariableWithUndefined
+        const APP_STATE = {
+            isNewInstall: <?= $isNewInstall ? 'true' : 'false' ?>,
+            isLatest: <?= $isLatest ? 'true' : 'false' ?>,
+            csrfToken: '<?= csrf_token() ?>',
+            csrfHash: '<?= csrf_hash() ?>',
+            migrateUrl: '<?= site_url('migrate') ?>',
+            loginUrl: '<?= site_url('login') ?>',
+            i18n: {
+                welcome: <?= json_encode(lang('Login.welcome', [lang('Common.software_short')])) ?>,
+                initialize: <?= json_encode(lang('Login.initialize')) ?>,
+                initializationRequired: <?= json_encode(lang('Login.initialization_required')) ?>,
+                initializationMessage: <?= json_encode(lang('Login.initialization_message')) ?>,
+                migrate: <?= json_encode(lang('Module.migrate')) ?>,
+                go: <?= json_encode(lang('Login.go')) ?>,
+                migrationRequired: <?= json_encode(lang('Login.migration_required')) ?>,
+                migrationInitializing: <?= json_encode(lang('Login.migration_initializing')) ?>,
+                migratingDatabase: <?= json_encode(lang('Login.migrating_database')) ?>,
+                migrationRunning: <?= json_encode(lang('Login.migration_running')) ?>,
+                migrationComplete: <?= json_encode(lang('Login.migration_complete')) ?>,
+                migrationCompleteMigrate: <?= json_encode(lang('Login.migration_complete_migrate')) ?>,
+                migrationCompleteLogin: <?= json_encode(lang('Login.migration_complete_login')) ?>,
+                migrationFailed: <?= json_encode(lang('Login.migration_failed')) ?>,
+                migrationErrorConnection: <?= json_encode(lang('Login.migration_error_connection')) ?>
+            }
+        };
+
+        $(document).ready(function() {
+            const $form = $('#login-form');
+            const $heading = $('#form-heading');
+            const $warning = $('#migration-warning');
+            const $success = $('#migration-success');
+            const $progress = $('#migration-progress');
+            const $error = $('#migration-error');
+            const $errorMessage = $('#migration-error-message');
+            const $loginFields = $('#login-fields');
+            const $submitButton = $('#submit-button');
+
+            function showMigrationRequired() {
+                if (APP_STATE.isNewInstall) {
+                    $heading.text(APP_STATE.i18n.initializationRequired);
+                    $submitButton.text(APP_STATE.i18n.initialize);
+                    $loginFields.addClass('d-none');
+                } else {
+                    $heading.text(APP_STATE.i18n.migrationRequired);
+                    $submitButton.text(APP_STATE.i18n.migrate);
+                    $loginFields.removeClass('d-none');
+                }
+                $warning.removeClass('d-none');
+                $success.addClass('d-none');
+                $progress.addClass('d-none');
+                $error.addClass('d-none');
+            }
+
+            function showMigrationProgress() {
+                $warning.addClass('d-none');
+                $success.addClass('d-none');
+                $error.addClass('d-none');
+                $loginFields.addClass('d-none');
+                $progress.find('h3').text(APP_STATE.isNewInstall ? APP_STATE.i18n.migrationInitializing : APP_STATE.i18n.migratingDatabase);
+                $progress.removeClass('d-none');
+                $submitButton.prop('disabled', true);
+            }
+
+            function showMigrationSuccess() {
+                $progress.addClass('d-none');
+                $error.addClass('d-none');
+                $warning.addClass('d-none');
+                $success.find('strong').text(APP_STATE.isNewInstall ? APP_STATE.i18n.migrationComplete : APP_STATE.i18n.migrationCompleteMigrate);
+                $success.removeClass('d-none');
+                $heading.text(APP_STATE.i18n.welcome);
+                $loginFields.removeClass('d-none');
+                $submitButton.text(APP_STATE.i18n.go);
+                $submitButton.prop('disabled', false);
+            }
+
+            function showMigrationError(message) {
+                $progress.addClass('d-none');
+                $success.addClass('d-none');
+                $errorMessage.text(message);
+                $error.removeClass('d-none');
+                $warning.addClass('d-none');
+                if (APP_STATE.isNewInstall) {
+                    $loginFields.addClass('d-none');
+                    $submitButton.text(APP_STATE.i18n.initialize);
+                } else {
+                    $loginFields.removeClass('d-none');
+                    $submitButton.text(APP_STATE.i18n.migrate);
+                }
+                $submitButton.prop('disabled', false);
+            }
+
+            function showLoginForm() {
+                $heading.text(APP_STATE.i18n.welcome);
+                $warning.addClass('d-none');
+                $progress.addClass('d-none');
+                $error.addClass('d-none');
+                $success.addClass('d-none');
+                $loginFields.removeClass('d-none');
+                $submitButton.text(APP_STATE.i18n.go);
+            }
+
+            if (!APP_STATE.isNewInstall && APP_STATE.isLatest) {
+                showLoginForm();
+            } else {
+                showMigrationRequired();
+            }
+
+            $form.on('submit', function(e) {
+                if (APP_STATE.isNewInstall || !APP_STATE.isLatest) {
+                    e.preventDefault();
+
+                    showMigrationProgress();
+
+                    $.ajax({
+                        url: APP_STATE.migrateUrl,
+                        type: 'POST',
+                        dataType: 'json',
+                        timeout: 3600000,
+                        data: {
+                            [APP_STATE.csrfToken]: APP_STATE.csrfHash,
+                            username: $('#input-username').val(),
+                            password: $('#input-password').val(),
+                        },
+                        success: function(response) {
+                            if (response.success) {
+                                APP_STATE.isNewInstall = false;
+                                APP_STATE.isLatest = true;
+                                showMigrationSuccess();
+                            } else {
+                                showMigrationError(response.message || APP_STATE.i18n.migrationFailed);
+                            }
+                        },
+                        error: function(xhr, status, error) {
+                            let message = APP_STATE.i18n.migrationErrorConnection;
+                            if (xhr.responseJSON && xhr.responseJSON.message) {
+                                message = xhr.responseJSON.message;
+                            }
+                            showMigrationError(message);
+                        }
+                    });
+                }
+            });
+        });
+    </script>
 </body>
 
 </html>
diff --git a/app/Views/no_access.php b/app/Views/no_access.php
index 519cb34aa..3a4bdc599 100644
--- a/app/Views/no_access.php
+++ b/app/Views/no_access.php
@@ -4,3 +4,5 @@
  */
 
 echo lang('Error.no_permission_module') . " $module_name" . (!empty($permission_id) ? " ($permission_id)" : '');
+?>
+<script>document.getElementById('submit')?.setAttribute('disabled', 'disabled');</script>
diff --git a/app/Views/partial/datepicker_locale.php b/app/Views/partial/datepicker_locale.php
index ae897359f..6ad207e7b 100644
--- a/app/Views/partial/datepicker_locale.php
+++ b/app/Views/partial/datepicker_locale.php
@@ -3,7 +3,7 @@ use Config\OSPOS;
 
 $config = config(OSPOS::class)->settings; ?>
 
-var pickerconfig = function(config) {
+const pickerconfig = function(config) {
     return $.extend({
         format: "<?= $this->data["format"] ?? dateformat_bootstrap($config['dateformat']) . ' ' . dateformat_bootstrap($config['timeformat'])?>",
         <?php
diff --git a/app/Views/partial/daterangepicker.php b/app/Views/partial/daterangepicker.php
index d91e79722..c8c44fc0f 100644
--- a/app/Views/partial/daterangepicker.php
+++ b/app/Views/partial/daterangepicker.php
@@ -6,8 +6,8 @@
 
 <?php if (empty($config['date_or_time_format'])) { ?>
     $('#daterangepicker').css("width", "180");
-    var start_date = "<?= date('Y-m-d') ?>";
-    var end_date = "<?= date('Y-m-d') ?>";
+    let start_date = "<?= date('Y-m-d') ?>";
+    let end_date = "<?= date('Y-m-d') ?>";
 
     $('#daterangepicker').daterangepicker({
     "ranges": {
@@ -112,8 +112,8 @@
     });
 <?php } else { ?>
     $('#daterangepicker').css("width", "305");
-    var start_date = "<?= date('Y-m-d H:i:s', mktime(0, 0, 0, date("m"), date("d"), date("Y"))) ?>";
-    var end_date = "<?= date('Y-m-d H:i:s', mktime(23, 59, 59, date("m"), date("d"), date("Y"))) ?>";
+    let start_date = "<?= date('Y-m-d H:i:s', mktime(0, 0, 0, date("m"), date("d"), date("Y"))) ?>";
+    let end_date = "<?= date('Y-m-d H:i:s', mktime(23, 59, 59, date("m"), date("d"), date("Y"))) ?>";
     $('#daterangepicker').daterangepicker({
     "ranges": {
     "<?= lang('Datepicker.today') ?>": [
diff --git a/app/Views/partial/footer.php b/app/Views/partial/footer.php
index 0512d649f..ed1caa7e5 100644
--- a/app/Views/partial/footer.php
+++ b/app/Views/partial/footer.php
@@ -4,21 +4,20 @@ use Config\OSPOS;
 
 ?>
 
+            </div>
         </div>
-    </div>
 
-    <div id="footer">
-        <div class="jumbotron push-spaces">
-            <strong>
-                <?= lang('Common.copyrights', [date('Y')]) ?> ·
-                <a href="https://opensourcepos.org" target="_blank"><?= lang('Common.website') ?></a> ·
-                <?= esc(config('App')->application_version) ?> -
-                <a target="_blank" href="https://github.com/opensourcepos/opensourcepos/commit/<?= esc(config(OSPOS::class)->commit_sha1) ?>">
-                    <?= esc(substr(config(OSPOS::class)->commit_sha1, 0, 6)); ?>
-                </a>
-            </strong>.
+        <div id="footer">
+            <div class="jumbotron push-spaces">
+                <strong>
+                    <?= lang('Common.copyrights', [date('Y')]) ?> ·
+                    <a href="https://opensourcepos.org" target="_blank"><?= lang('Common.website') ?></a> ·
+                    <?= esc(config('App')->application_version) ?> -
+                    <a target="_blank" href="https://github.com/opensourcepos/opensourcepos/commit/<?= esc(config(OSPOS::class)->commit_sha1) ?>">
+                        <?= esc(substr(config(OSPOS::class)->commit_sha1, 0, 6)); ?>
+                    </a>
+                </strong>.
+            </div>
         </div>
-    </div>
-</body>
-
+    </body>
 </html>
diff --git a/app/Views/partial/header.php b/app/Views/partial/header.php
index 3bb51ac57..84b59545a 100644
--- a/app/Views/partial/header.php
+++ b/app/Views/partial/header.php
@@ -12,14 +12,16 @@ $request = Services::request();
 ?>
 
 <!doctype html>
-<html lang="<?= $request->getLocale() ?>">
+<html lang="<?= current_language_code() ?>">
 
 <head>
     <meta charset="utf-8">
     <base href="<?= base_url() ?>">
     <title><?= esc($config['company']) . ' | ' . lang('Common.powered_by') . ' OSPOS ' . esc(config('App')->application_version) ?></title>
+    <meta name="robots" content="noindex, nofollow">
     <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
-    <link rel="stylesheet" href="<?= 'resources/bootswatch/' . (empty($config['theme']) ? 'flatly' : esc($config['theme'])) . '/bootstrap.min.css' ?>">
+    <?php $theme = (empty($config['theme']) ? 'flatly' : esc($config['theme'])); ?>
+    <link rel="stylesheet" href="resources/bootswatch/<?= "$theme" ?>/bootstrap.min.css">
 
     <?php if (ENVIRONMENT == 'development' || get_cookie('debug') == 'true' || $request->getGet('debug') == 'true') : ?>
         <!-- inject:debug:css -->
diff --git a/app/Views/partial/header_js.php b/app/Views/partial/header_js.php
index 5f33789ce..2a101ece3 100644
--- a/app/Views/partial/header_js.php
+++ b/app/Views/partial/header_js.php
@@ -6,14 +6,14 @@
 
 <script type="text/javascript">
     // Live clock
-    var clock_tick = function clock_tick() {
+    const clock_tick = function clock_tick() {
         setInterval('update_clock();', 1000);
     }
 
     // Start the clock immediately
     clock_tick();
 
-    var update_clock = function update_clock() {
+    const update_clock = function update_clock() {
         document.getElementById('liveclock').innerHTML = moment().format("<?= dateformat_momentjs($config['dateformat'] . ' ' . $config['timeformat']) ?>");
     }
 
@@ -21,7 +21,7 @@
 
     $.notify = function(content, options) {
         const message = typeof content === "object" ? content.message : content;
-        const sanitizedMessage = DOMPurify.sanitize(message);
+        const sanitizedMessage = DOMPurify.sanitize(message, { ALLOWED_TAGS: [], ALLOWED_ATTR: [] });
         return notify(sanitizedMessage, options);
     };
 
@@ -32,11 +32,11 @@
         }
     });
 
-    var csrf_token = function() {
-        return "<?= csrf_hash() ?>";
+    const csrf_token = function() {
+        return "<?= esc(csrf_hash(), 'js') ?>";
     };
 
-    var csrf_form_base = function() {
+    const csrf_form_base = function() {
         return {
             <?= esc(config('Security')->tokenName, 'js') ?>: function() {
                 return csrf_token()
@@ -44,14 +44,14 @@
         }
     };
 
-    var setup_csrf_token = function() {
+    const setup_csrf_token = function() {
         $('input[name="<?= esc(config('Security')->tokenName, 'js') ?>"]').val(csrf_token());
     };
 
-    var ajax = $.ajax;
+    const ajax = $.ajax;
 
     $.ajax = function() {
-        var args = arguments[0];
+        let args = arguments[0];
         if (args['type'] && args['type'].toLowerCase() == 'post' && csrf_token()) {
             if (typeof args['data'] === 'string') {
                 args['data'] += '&' + $.param(csrf_form_base());
@@ -64,6 +64,11 @@
     };
 
     $(document).ajaxComplete(setup_csrf_token);
+    $(document).ajaxError(function(event, jqXHR, settings) {
+        if (jqXHR.status === 401) {
+            window.location.href = '<?= site_url('login') ?>';
+        }
+    });
     $(document).ready(function() {
         $("#logout").click(function(event) {
             event.preventDefault();
@@ -80,7 +85,7 @@
         });
     });
 
-    var submit = $.fn.submit;
+    const submit = $.fn.submit;
 
     $.fn.submit = function() {
         setup_csrf_token();
diff --git a/app/Views/partial/lang_lines.php b/app/Views/partial/lang_lines.php
index 86db24dbf..102d9db93 100644
--- a/app/Views/partial/lang_lines.php
+++ b/app/Views/partial/lang_lines.php
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     (function(lang, $) {
 
-        var lines = {
+        const lines = {
             'common_submit': "<?= lang('Common.submit') ?>",
             'common_close': "<?= lang('Common.close') ?>"
         };
diff --git a/app/Views/partial/print_receipt.php b/app/Views/partial/print_receipt.php
index fe58a7af7..b2436e301 100644
--- a/app/Views/partial/print_receipt.php
+++ b/app/Views/partial/print_receipt.php
@@ -29,11 +29,11 @@
                 jsPrintSetup.setOption('footerStrRight', '');
             <?php } ?>
 
-            var printers = jsPrintSetup.getPrintersList().split(',');
+            const printers = jsPrintSetup.getPrintersList().split(',');
             // Get right printer here..
-            for (var index in printers) {
-                var default_ticket_printer = window.localStorage && localStorage['<?= esc($selected_printer, 'js') ?>'];
-                var selected_printer = printers[index];
+            for (const index in printers) {
+                const default_ticket_printer = window.localStorage && localStorage['<?= esc($selected_printer, 'js') ?>'];
+                const selected_printer = printers[index];
                 if (selected_printer == default_ticket_printer) {
                     // Select Epson label printer
                     jsPrintSetup.setPrinter(selected_printer);
diff --git a/app/Views/partial/table_filter_persistence.php b/app/Views/partial/table_filter_persistence.php
new file mode 100644
index 000000000..d230b4ad7
--- /dev/null
+++ b/app/Views/partial/table_filter_persistence.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Table Filter Persistence
+ *
+ * This partially updates the URL when filters change, allowing users to
+ * share/bookmark filtered views and maintain state on back navigation.
+ *
+ * Filter restoration from URL is handled server-side in the controller.
+ *
+ * @param array $options Additional filter options
+ *   - 'additional_params': Array of additional parameter names to track (e.g., ['stock_location'])
+ *   - 'filter_select_id': Filter multiselect element ID (default: 'filters')
+ */
+$options = $options ?? [];
+$additional_params = $options['additional_params'] ?? [];
+$filter_select_id = $options['filter_select_id'] ?? 'filters';
+?>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        const additional_params = <?= json_encode($additional_params) ?>;
+        const filter_select_id = '<?= esc($filter_select_id) ?>';
+
+        function update_url() {
+            const params = new URLSearchParams();
+
+            // Add dates
+            if (typeof start_date !== 'undefined') {
+                params.set('start_date', start_date);
+            }
+            if (typeof end_date !== 'undefined') {
+                params.set('end_date', end_date);
+            }
+
+            // Add filters
+            const filters = $('#' + filter_select_id).val();
+            if (filters) {
+                filters.forEach(function(filter) {
+                    params.append('filters[]', filter);
+                });
+            }
+
+            // Add additional params
+            additional_params.forEach(function(param) {
+                const element = $('#' + param);
+                if (element.length) {
+                    const value = element.val();
+                    if (Array.isArray(value) && value.length > 0) {
+                        value.forEach(function(v) {
+                            params.append(param + '[]', v);
+                        });
+                    } else if (value) {
+                        params.set(param, value);
+                    }
+                }
+            });
+
+            // Update URL without page reload
+            const new_url = window.location.pathname;
+            const params_str = params.toString();
+            if (params_str) {
+                new_url += '?' + params_str;
+            }
+            window.history.replaceState({}, '', new_url);
+        }
+
+        // Update URL when filter dropdown changes
+        $('#' + filter_select_id).on('hidden.bs.select', function(e) {
+            update_url();
+        });
+
+        // Update URL when stock location changes (if exists)
+        if ($('#stock_location').length) {
+            $("#stock_location").change(function() {
+                update_url();
+            });
+        }
+
+        // Update URL when daterangepicker changes
+        $("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
+            update_url();
+        });
+    });
+</script>
diff --git a/app/Views/partial/visibility_js.php b/app/Views/partial/visibility_js.php
index 7fcb3e4d1..1dff86b73 100644
--- a/app/Views/partial/visibility_js.php
+++ b/app/Views/partial/visibility_js.php
@@ -26,8 +26,8 @@ function safeRemoveItem(key) {
 }
 
 // Load saved column visibility from localStorage
-var savedVisibility = JSON.parse(safeGetItem('columnVisibility')) || { cost: false, profit: false };
-var visibleColumns = savedVisibility;
+const savedVisibility = JSON.parse(safeGetItem('columnVisibility')) || { cost: false, profit: false };
+let visibleColumns = savedVisibility;
 
 // Function to save column visibility to localStorage
 function saveColumnVisibility(visibility) {
@@ -56,13 +56,13 @@ $('#table').bootstrapTable('refreshOptions', {
 });
 
 // Initialize visibility settings from localStorage
-var summaryVisibility = JSON.parse(safeGetItem('summaryVisibility')) || { cost: false, profit: false };
+let summaryVisibility = JSON.parse(safeGetItem('summaryVisibility')) || { cost: false, profit: false };
 
 // Function to apply visibility for cost and profit rows
 function applySummaryVisibility() {
-    var rows = $('#report_summary .summary_row');
-    var costRow = rows.eq(rows.length - 2); // Second-to-last row
-    var profitRow = rows.eq(rows.length - 1); // Last row
+    const rows = $('#report_summary .summary_row');
+    const costRow = rows.eq(rows.length - 2); // Second-to-last row
+    const profitRow = rows.eq(rows.length - 1); // Last row
 
     if (summaryVisibility.cost === false) {
         costRow.hide(); // Hide the cost row
@@ -90,7 +90,7 @@ $('#toggleCostProfitButton').click(function () {
 applySummaryVisibility();
 
 // Initialize dialog (if editable)
-var init_dialog = function () {
+const init_dialog = function () {
 <?php if (isset($editable)): ?>
         table_support.submit_handler('<?php echo site_url("reports/get_detailed_{$editable}_row") ?>');
     dialog_support.init("a.modal-dlg");
diff --git a/app/Views/people/manage.php b/app/Views/people/manage.php
index 598b4d44a..cc6c3dd98 100644
--- a/app/Views/people/manage.php
+++ b/app/Views/people/manage.php
@@ -18,13 +18,13 @@
             pageSize: <?= $config['lines_per_page'] ?>,
             uniqueId: 'people.person_id',
             enableActions: function() {
-                var email_disabled = $("td input:checkbox:checked").parents("tr").find("td a[href^='mailto:']").length == 0;
+                const email_disabled = $("td input:checkbox:checked").parents("tr").find("td a[href^='mailto:']").length == 0;
                 $("#email").prop('disabled', email_disabled);
             }
         });
 
         $("#email").click(function(event) {
-            var recipients = $.map($("tr.selected a[href^='mailto:']"), function(element) {
+            const recipients = $.map($("tr.selected a[href^='mailto:']"), function(element) {
                 return $(element).attr('href').replace(/^mailto:/, '');
             });
             location.href = "mailto:" + recipients.join(",");
diff --git a/app/Views/receivings/form.php b/app/Views/receivings/form.php
index 927d9a530..37b7101df 100644
--- a/app/Views/receivings/form.php
+++ b/app/Views/receivings/form.php
@@ -5,6 +5,7 @@
  * @var int $selected_supplier_id
  * @var array $employees
  * @var string $controller_name
+ * @var bool $can_assign_employee
  */
 ?>
 
@@ -50,7 +51,12 @@
         <div class="form-group form-group-sm">
             <?= form_label(lang('Receivings.employee'), 'employee', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
-                <?= form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id" class="form-control"') ?>
+                <?php if ($can_assign_employee): ?>
+                    <?= form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id" class="form-control"') ?>
+                <?php else: ?>
+                    <?= form_hidden('employee_id', $receiving_info['employee_id']) ?>
+                    <?= form_input(['name' => 'employee_name', 'value' => $employees[$receiving_info['employee_id']] ?? '', 'class' => 'form-control input-sm', 'readonly' => 'readonly']) ?>
+                <?php endif; ?>
             </div>
         </div>
 
@@ -70,7 +76,7 @@
 
         $('#datetime').datetimepicker(pickerconfig);
 
-        var fill_value = function(event, ui) {
+        const fill_value = function(event, ui) {
             event.preventDefault();
             $("input[name='supplier_id']").val(ui.item.value);
             $("input[name='supplier_name']").val(ui.item.label);
diff --git a/app/Views/receivings/receiving.php b/app/Views/receivings/receiving.php
index 7a39ab682..47205573e 100644
--- a/app/Views/receivings/receiving.php
+++ b/app/Views/receivings/receiving.php
@@ -137,7 +137,7 @@ if (isset($success)) {
                         <td><?= esc($item['item_number']) ?></td>
                         <td style="text-align: center;">
                             <?= esc($item['name'] . ' ' . implode(' ', [$item['attribute_values'], $item['attribute_dtvalues']])) ?><br>
-                            <?= '[' . to_quantity_decimals($item['in_stock']) . ' in ' . $item['stock_name'] . ']' ?>
+                            <?= '[' . to_quantity_decimals($item['in_stock']) . ' in ' . esc($item['stock_name']) . ']' ?>
                             <?= form_hidden('location', (string)$item['item_location']) ?>
                         </td>
 
@@ -533,7 +533,7 @@ if (isset($success)) {
         });
 
         $('[name="discount_toggle"]').change(function() {
-            var input = $("<input>").attr("type", "hidden").attr("name", "discount_type").val(($(this).prop('checked')) ? 1 : 0);
+            const input = $("<input>").attr("type", "hidden").attr("name", "discount_type").val(($(this).prop('checked')) ? 1 : 0);
             $('#cart_' + $(this).attr('data-line')).append($(input));
             $('#cart_' + $(this).attr('data-line')).submit();
         });
diff --git a/app/Views/reports/graphs/bar.php b/app/Views/reports/graphs/bar.php
index add7cd026..ad85798d7 100644
--- a/app/Views/reports/graphs/bar.php
+++ b/app/Views/reports/graphs/bar.php
@@ -11,7 +11,7 @@
 
 <script type="text/javascript">
     // Labels and data series
-    var data = {
+    const data = {
         labels: <?= esc(json_encode($labels_1), 'js') ?>,
         series: [{
             name: '<?= esc($yaxis_title, 'js') ?>',
@@ -20,7 +20,7 @@
     };
 
     // We are setting a few options for our chart and override the defaults
-    var options = {
+    const options = {
 
         // Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
         width: '100%',
@@ -47,24 +47,26 @@
             offset: 60,
             // The label interpolation function enables you to modify the values
             // used for the labels on each axis.
-            labelInterpolationFnc: function(value) {
-                <?php
+            <?php
+                $currency_symbol = esc($config['currency_symbol'], 'js');
+                $currency_prefix = '';
+                $currency_suffix = '';
+
                 if ($show_currency) {
                     if (is_right_side_currency_symbol()) {
-                ?>
-                        return value + '<?= esc($config['currency_symbol'], 'js') ?>';
-                    <?php } else { ?>
-                        return '<?= esc($config['currency_symbol'], 'js') ?>' + value;
-                    <?php
+                        $currency_suffix = $currency_symbol;
+                    } else {
+                        $currency_prefix = $currency_symbol;
                     }
-                } else {
-                    ?>
-                    return value;
-                <?php } ?>
+                }
+            ?>
+
+            labelInterpolationFnc: function(value) {
+                return '<?= $currency_prefix ?>' + value + '<?= $currency_suffix ?>';
             }
         },
 
-        // Plugins configuration
+        // Plugin configuration
         plugins: [
             Chartist.plugins.ctAxisTitle({
                 axisX: {
@@ -96,7 +98,7 @@
         ]
     };
 
-    var responsiveOptions = [
+    const responsiveOptions = [
         ['screen and (min-width: 640px)', {
             height: '80%',
             chartPadding: {
diff --git a/app/Views/reports/graphs/hbar.php b/app/Views/reports/graphs/hbar.php
index 12be58120..9782eb081 100644
--- a/app/Views/reports/graphs/hbar.php
+++ b/app/Views/reports/graphs/hbar.php
@@ -11,7 +11,7 @@
 
 <script type="text/javascript">
     // Labels and data series
-    var data = {
+    const data = {
         labels: <?= json_encode(esc($labels_1, 'js')) ?>,
         series: [{
             name: '<?= esc($yaxis_title, 'js') ?>',
@@ -20,7 +20,7 @@
     };
 
     // We are setting a few options for our chart and override the defaults
-    var options = {
+    const options = {
 
         // Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
         width: '100%',
@@ -44,30 +44,32 @@
             position: 'end',
             // The label interpolation function enables you to modify the values
             // used for the labels on each axis.
-            labelInterpolationFnc: function(value) {
-                <?php
+            <?php
+                $currency_symbol = esc($config['currency_symbol'], 'js');
+                $currency_prefix = '';
+                $currency_suffix = '';
+
                 if ($show_currency) {
                     if (is_right_side_currency_symbol()) {
-                ?>
-                        return value + '<?= esc($config['currency_symbol'], 'js') ?>';
-                    <?php } else { ?>
-                        return '<?= esc($config['currency_symbol'], 'js') ?>' + value;
-                    <?php
+                        $currency_suffix = $currency_symbol;
+                    } else {
+                        $currency_prefix = $currency_symbol;
                     }
-                } else {
-                    ?>
-                    return value;
-                <?php } ?>
+                }
+            ?>
+
+            labelInterpolationFnc: function(value) {
+                return '<?= $currency_prefix ?>' + value + '<?= $currency_suffix ?>';
             }
         },
 
         // Y-Axis specific configuration
         axisY: {
-            // Lets offset the chart a bit from the labels
+            // Let's offset the chart a bit from the labels
             offset: 120
         },
 
-        // Plugins configuration
+        // Plugin configuration
         plugins: [
             Chartist.plugins.ctAxisTitle({
                 axisX: {
@@ -99,7 +101,7 @@
         ]
     };
 
-    var responsiveOptions = [
+    const responsiveOptions = [
         ['screen and (min-width: 640px)', {
             height: '80%',
             chartPadding: {
diff --git a/app/Views/reports/graphs/line.php b/app/Views/reports/graphs/line.php
index 108972ba0..2205249e0 100644
--- a/app/Views/reports/graphs/line.php
+++ b/app/Views/reports/graphs/line.php
@@ -11,7 +11,7 @@
 
 <script type="text/javascript">
     // Labels and data series
-    var data = {
+    const data = {
         labels: <?= json_encode(esc($labels_1, 'js')) ?>,
         series: [{
             name: '<?= esc($yaxis_title, 'js') ?>',
@@ -20,7 +20,7 @@
     };
 
     // We are setting a few options for our chart and override the defaults
-    var options = {
+    const options = {
 
         // Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
         width: '100%',
@@ -63,24 +63,26 @@
             },
             // The label interpolation function enables you to modify the values
             // used for the labels on each axis.
-            labelInterpolationFnc: function(value) {
-                <?php
+            <?php
+                $currency_symbol = esc($config['currency_symbol'], 'js');
+                $currency_prefix = '';
+                $currency_suffix = '';
+
                 if ($show_currency) {
                     if (is_right_side_currency_symbol()) {
-                ?>
-                        return value + '<?= esc($config['currency_symbol'], 'js') ?>';
-                    <?php } else { ?>
-                        return '<?= esc($config['currency_symbol'], 'js') ?>' + value;
-                    <?php
+                        $currency_suffix = $currency_symbol;
+                    } else {
+                        $currency_prefix = $currency_symbol;
                     }
-                } else {
-                    ?>
-                    return value;
-                <?php } ?>
+                }
+            ?>
+
+            labelInterpolationFnc: function(value) {
+                return '<?= $currency_prefix ?>' + value + '<?= $currency_suffix ?>';
             }
         },
 
-        // Plugins configuration
+        // Plugin configuration
         plugins: [
             Chartist.plugins.ctAxisTitle({
                 axisX: {
@@ -104,47 +106,51 @@
                 }
             }),
 
+            <?php
+                $currency_symbol = esc($config['currency_symbol'], 'js');
+                $currency_prefix = '';
+                $currency_suffix = '';
+
+                if ($show_currency) {
+                    if (is_right_side_currency_symbol()) {
+                        $currency_suffix = $currency_symbol;
+                    } else {
+                        $currency_prefix = $currency_symbol;
+                    }
+                }
+            ?>
+
             Chartist.plugins.ctPointLabels({
                 textAnchor: 'middle',
                 labelInterpolationFnc: function(value) {
-                    <?php
-                    if ($show_currency) {
-                        if (is_right_side_currency_symbol()) {
-                    ?>
-                            return value + '<?= esc($config['currency_symbol'], 'js') ?>';
-                        <?php } else { ?>
-                            return '<?= esc($config['currency_symbol'], 'js') ?>' + value;
-                        <?php
-                        }
-                    } else {
-                        ?>
-                        return value;
-                    <?php } ?>
+                    return '<?= $currency_prefix ?>' + value + '<?= $currency_suffix ?>';
                 }
             }),
 
+            <?php
+                $currency_symbol = esc($config['currency_symbol'], 'js');
+                $currency_prefix = '';
+                $currency_suffix = '';
+
+                if ($show_currency) {
+                    if (is_right_side_currency_symbol()) {
+                        $currency_suffix = $currency_symbol;
+                    } else {
+                        $currency_prefix = $currency_symbol;
+                    }
+                }
+            ?>
+
             Chartist.plugins.tooltip({
                 pointClass: 'ct-tooltip-point',
                 transformTooltipTextFnc: function(value) {
-                    <?php
-                    if ($show_currency) {
-                        if (is_right_side_currency_symbol()) {
-                    ?>
-                            return value + '<?= esc($config['currency_symbol'], 'js') ?>';
-                        <?php } else { ?>
-                            return '<?= esc($config['currency_symbol'], 'js') ?>' + value;
-                        <?php
-                        }
-                    } else {
-                        ?>
-                        return value;
-                    <?php } ?>
+                    return '<?= $currency_prefix ?>' + value + '<?= $currency_suffix ?>';
                 }
             })
         ]
     };
 
-    var responsiveOptions = [
+    const responsiveOptions = [
         ['screen and (min-width: 640px)', {
             height: '80%',
             chartPadding: {
@@ -166,7 +172,7 @@
         // If the draw event was triggered from drawing a point on the line chart
         if (data.type === 'point') {
             // We are creating a new path SVG element that draws a triangle around the point coordinates
-            var circle = new Chartist.Svg('circle', {
+            const circle = new Chartist.Svg('circle', {
                 cx: [data.x],
                 cy: [data.y],
                 r: [5],
diff --git a/app/Views/reports/graphs/pie.php b/app/Views/reports/graphs/pie.php
index 71854379b..86ec65120 100644
--- a/app/Views/reports/graphs/pie.php
+++ b/app/Views/reports/graphs/pie.php
@@ -9,13 +9,13 @@
 
 <script type="text/javascript">
     // Labels and data series
-    var data = {
+    const data = {
         labels: <?= json_encode(esc($labels_1, 'js')) ?>,
         series: <?= json_encode(esc($series_data_1, 'js')) ?>
     };
 
     // We are setting a few options for our chart and override the defaults
-    var options = {
+    const options = {
 
         // Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
         width: '100%',
@@ -31,28 +31,29 @@
         labelPosition: 'outside',
         labelDirection: 'explode',
 
+        <?php
+            $currency_symbol = esc($config['currency_symbol'], 'js');
+            $currency_prefix = '';
+            $currency_suffix = '';
+
+            if ($show_currency) {
+                if (is_right_side_currency_symbol()) {
+                    $currency_suffix = $currency_symbol;
+                } else {
+                    $currency_prefix = $currency_symbol;
+                }
+            }
+        ?>
+
         plugins: [
             Chartist.plugins.tooltip({
                 transformTooltipTextFnc: function(value) {
-                    <?php
-                    if ($show_currency) {
-                        if (is_right_side_currency_symbol()) {
-                    ?>
-                            return value + '<?= esc($config['currency_symbol'], 'js') ?>';
-                        <?php } else { ?>
-                            return '<?= esc($config['currency_symbol'], 'js') ?>' + value;
-                        <?php
-                        }
-                    } else {
-                        ?>
-                        return value;
-                    <?php } ?>
+                    return '<?= $currency_prefix ?>' + value + '<?= $currency_suffix ?>';
                 }
             })
-        ]
-    };
+        ]    };
 
-    var responsiveOptions = [
+    const responsiveOptions = [
         ['screen and (min-width: 640px)', {
             height: '80%',
             chartPadding: 20
@@ -71,9 +72,9 @@
     // Generate random colours for the pie sliced because Chartist is currently limited to 15 colours
     chart.on('draw', function(data) {
         if (data.type === 'slice') {
-            var r = Math.floor(Math.random() * 256);
-            var g = Math.floor(Math.random() * 256);
-            var b = Math.floor(Math.random() * 256);
+            const r = Math.floor(Math.random() * 256);
+            const g = Math.floor(Math.random() * 256);
+            const b = Math.floor(Math.random() * 256);
 
             data.element.attr({
                 style: 'fill: #' + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1)
diff --git a/app/Views/reports/specific_input.php b/app/Views/reports/specific_input.php
index a94aa7d6e..7bc00d48d 100644
--- a/app/Views/reports/specific_input.php
+++ b/app/Views/reports/specific_input.php
@@ -87,7 +87,7 @@ if (isset($error)) {
         <?= view('partial/daterangepicker') ?>
 
         $("#generate_report").click(function() {
-            var specific_input_data = $('#specific_input_data').val();
+            let specific_input_data = $('#specific_input_data').val();
             if (!$(".discount_percent").is(":visible")) {
                 specific_input_data = $('#discount_fixed').val();
             }
@@ -97,7 +97,7 @@ if (isset($error)) {
     });
 
     function check_discount_type() {
-        var discount_type = $("#discount_type_id").val();
+        const discount_type = $("#discount_type_id").val();
 
         if (discount_type == 1) {
             $(".discount_percent").hide();
diff --git a/app/Views/reports/tabular.php b/app/Views/reports/tabular.php
index 02393513c..5bb0c102b 100644
--- a/app/Views/reports/tabular.php
+++ b/app/Views/reports/tabular.php
@@ -62,7 +62,7 @@
                 sortable: true,
                 showExport: true,
                 exportDataType: 'all',
-                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'],
+                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'xlsx', 'pdf'],
                 pagination: true,
                 showColumns: true,
                 data: <?= json_encode($data) ?>,
diff --git a/app/Views/reports/tabular_details.php b/app/Views/reports/tabular_details.php
index 281b9e1b9..79a8c9364 100644
--- a/app/Views/reports/tabular_details.php
+++ b/app/Views/reports/tabular_details.php
@@ -39,19 +39,12 @@
     $(document).ready(function () {
         <?= view('partial/bootstrap_tables_locale') ?>
 
-        var details_data = <?= json_encode(esc($details_data)) ?>;
+        const details_data = <?= json_encode(esc($details_data)) ?>;
         <?php if ($config['customer_reward_enable'] && !empty($details_data_rewards)) { ?>
-            var details_data_rewards = <?= json_encode(esc($details_data_rewards)) ?>;
+            const details_data_rewards = <?= json_encode(esc($details_data_rewards)) ?>;
         <?php } ?>
         <?= view('partial/visibility_js') ?>
 
-        var init_dialog = function () {
-            <?php if (isset($editable)) { ?>
-                table_support.submit_handler('<?= esc(site_url("reports/get_detailed_$editable" . '_row')) ?>');
-                dialog_support.init("a.modal-dlg");
-            <?php } ?>
-        };
-
         $('#table')
             .addClass("table-striped")
             .addClass("table-bordered")
@@ -67,7 +60,7 @@
                 uniqueId: 'id',
                 showExport: true,
                 exportDataType: 'all',
-                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'],
+                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'xlsx', 'pdf'],
                 data: <?= json_encode($summary_data) ?>,
                 iconSize: 'sm',
                 paginationVAlign: 'bottom',
diff --git a/app/Views/sales/form.php b/app/Views/sales/form.php
index e59484da0..8b46f8804 100644
--- a/app/Views/sales/form.php
+++ b/app/Views/sales/form.php
@@ -67,6 +67,12 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group form-group-sm reference-code-input-new" style="display:none;">
+                <?= form_label(lang('Sales.reference_code'), 'reference_code_new', ['class' => 'control-label col-xs-3']) ?>
+                <div class="col-xs-8">
+                    <?= form_input(['name' => 'reference_code_new', 'id' => 'reference_code_new', 'value' => '', 'class' => 'form-control input-sm', 'disabled' => true]) ?>
+                </div>
+            </div>
         <?php } ?>
 
         <?php
@@ -78,6 +84,7 @@
                 <div class="col-xs-4">
                     <?php // No editing of Gift Card payments as it's a complex change ?>
                     <?= form_hidden("payment_id_$i", $row->payment_id) ?>
+                    <?= form_hidden("reference_code_$i", $row->reference_code ?? '') ?>
                     <?php if (!empty(strstr($row->payment_type, lang('Sales.giftcard')))): ?>
                         <?= form_input(['name' => "payment_type_$i", 'value' => $row->payment_type, 'id' => "payment_type_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?>
                     <?php else: ?>
@@ -172,7 +179,7 @@
 
         <?= view('partial/datepicker_locale') ?>
 
-        var fill_value_customer = function(event, ui) {
+        const fill_value_customer = function(event, ui) {
             event.preventDefault();
             $("input[name='customer_id']").val(ui.item.value);
             $("input[name='customer_name']").val(ui.item.label);
@@ -188,7 +195,7 @@
             focus: fill_value_customer
         });
 
-        var fill_value_employee = function(event, ui) {
+        const fill_value_employee = function(event, ui) {
             event.preventDefault();
             $("input[name='employee_id']").val(ui.item.value);
             $("input[name='employee_name']").val(ui.item.label);
@@ -204,6 +211,20 @@
             focus: fill_value_employee
         });
 
+        const referenceCodePaymentTypes = <?= json_encode($reference_code_payment_types ?? []) ?>;
+
+        $('#payment_types_new').on('change', function() {
+            const paymentType = $(this).val();
+            const needsReferenceCode = referenceCodePaymentTypes.indexOf(paymentType) !== -1;
+            if (needsReferenceCode) {
+                $('.reference-code-input-new').show();
+                $('#reference_code_new').attr('disabled', false);
+            } else {
+                $('.reference-code-input-new').hide();
+                $('#reference_code_new').attr('disabled', true).val('');
+            }
+        });
+
         $('button#delete').click(function() {
             dialog_support.hide();
             table_support.do_delete("<?= esc($controller_name); ?>", <?= $sale_info['sale_id'] ?>);
diff --git a/app/Views/sales/help.php b/app/Views/sales/help.php
index a4715d026..5c9cc82e8 100644
--- a/app/Views/sales/help.php
+++ b/app/Views/sales/help.php
@@ -1,3 +1,24 @@
+<?php
+/**
+ * @var array $keyboardShortcuts
+ */
+
+$keyboardShortcuts ??= [];
+
+$shortcut_labels = [
+    'cancel'    => lang('Sales.key_cancel'),
+    'items'     => lang('Sales.key_item_search'),
+    'customers' => lang('Sales.key_customer_search'),
+    'suspend'   => lang('Sales.key_suspend'),
+    'suspended' => lang('Sales.key_suspended'),
+    'amount'    => lang('Sales.key_tendered'),
+    'payment'   => lang('Sales.key_payment'),
+    'complete'  => lang('Sales.key_finish_sale'),
+    'finish'    => lang('Sales.key_finish_quote'),
+    'help'      => lang('Sales.key_help_modal')
+];
+?>
+
 <div class="container-fluid">
 
     <ul class="nav nav-tabs" id="SCTabs" data-toggle="tab">
@@ -15,46 +36,13 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr>
-                        <td><code>ESC</code></td>
-                        <td><?= lang('Sales.key_cancel'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 1</code></td>
-                        <td><?= lang('Sales.key_item_search'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 2</code></td>
-                        <td><?= lang('Sales.key_customer_search'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 3</code></td>
-                        <td><?= lang('Sales.key_suspend'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 4</code></td>
-                        <td><?= lang('Sales.key_suspended'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 5</code></td>
-                        <td><?= lang('Sales.key_tendered'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 6</code></td>
-                        <td><?= lang('Sales.key_payment'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 7</code></td>
-                        <td><?= lang('Sales.key_finish_sale'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 8</code></td>
-                        <td><?= lang('Sales.key_finish_quote'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 9</code></td>
-                        <td><?= lang('Sales.key_help_modal'); ?></td>
-                    </tr>
+                    <?php foreach ($shortcut_labels as $name => $label): ?>
+                        <?php $shortcut = $keyboardShortcuts[$name] ?? ['label' => '', 'code' => '']; ?>
+                        <tr>
+                            <td><code><?= esc($shortcut['label'] !== '' ? $shortcut['label'] : $shortcut['code']) ?></code></td>
+                            <td><?= esc($label) ?></td>
+                        </tr>
+                    <?php endforeach; ?>
                 </tbody>
             </table>
         </div>
diff --git a/app/Views/sales/invoice.php b/app/Views/sales/invoice.php
index 654dab96f..b38fe5326 100644
--- a/app/Views/sales/invoice.php
+++ b/app/Views/sales/invoice.php
@@ -32,7 +32,7 @@ if (isset($error_message)) {
 <?php if (!empty($customer_email)): ?>
     <script type="text/javascript">
         $(document).ready(function() {
-            var send_email = function() {
+            const send_email = function() {
                 $.get('<?= site_url() . "sales/sendPdf/$sale_id_num" ?>',
                     function(response) {
                         $.notify({
@@ -63,7 +63,7 @@ if (isset($error_message)) {
     /* This line will allow to print and go back to sales automatically.
      * echo anchor('sales', '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
      */
-    ?>
+?>
     <?php if (isset($customer_email) && !empty($customer_email)): ?>
         <a href="javascript:void(0);">
             <div class="btn btn-info btn-sm" id="show_email_button"><?= '<span class="glyphicon glyphicon-envelope">&nbsp;</span>' . lang('Sales.send_invoice') ?></div>
@@ -115,10 +115,10 @@ if (isset($error_message)) {
         <tr>
             <th><?= lang('Sales.item_number') ?></th>
             <?php
-            $invoice_columns = 6;
-            if ($include_hsn) {
-                $invoice_columns += 1;
-            ?>
+        $invoice_columns = 6;
+if ($include_hsn) {
+    $invoice_columns += 1;
+    ?>
                 <th><?= lang('Sales.hsn') ?></th>
             <?php } ?>
             <th><?= lang('Sales.item_name') ?></th>
@@ -126,9 +126,9 @@ if (isset($error_message)) {
             <th><?= lang('Sales.price') ?></th>
             <th><?= lang('Sales.discount') ?></th>
             <?php
-            if ($discount > 0) {
-                $invoice_columns += 1;
-            ?>
+    if ($discount > 0) {
+        $invoice_columns += 1;
+        ?>
                 <th><?= lang('Sales.customer_discount') ?></th>
             <?php } ?>
             <th><?= lang('Sales.total') ?></th>
@@ -137,7 +137,7 @@ if (isset($error_message)) {
         <?php
         foreach ($cart as $line => $item) {
             if ($item['print_option'] == PRINT_YES) {
-        ?>
+                ?>
                 <tr class="item-row">
                     <td><?= esc($item['item_number']) ?></td>
                     <?php if ($include_hsn): ?>
@@ -146,7 +146,7 @@ if (isset($error_message)) {
                     <td class="item-name"><?= ($item['is_serialized'] || $item['allow_alt_description']) && !empty($item['description']) ? esc($item['description']) : esc($item['name'] . ' ' . $item['attribute_values']) ?></td>
                     <td style="text-align: center;"><?= to_quantity_decimals($item['quantity']) ?></td>
                     <td><?= to_currency($item['price']) ?></td>
-                    <td style="height: center;"><?= ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
+                    <td style="text-align: center;"><?= ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
                     <?php if ($discount > 0): ?>
                         <td style="text-align: center;"><?= to_currency($item['discounted_total'] / $item['quantity']) ?></td>
                     <?php endif; ?>
@@ -155,13 +155,13 @@ if (isset($error_message)) {
                 <?php if ($item['is_serialized']) { ?>
                     <tr class="item-row">
                         <td class="item-description" colspan="<?= $invoice_columns - 1 ?>"></td>
-                        <td style="text-align: center;"><?= esc($item['serialnumber'])    // TODO: serialnumber does not match variable naming conventions for this project ?></td>
+                        <td style="text-align: center;"><?= esc($item['serialnumber'])    // TODO: `serialnumber` does not match variable naming conventions for this project.  Should be `serialNumber`?></td>
                     </tr>
         <?php
                 }
             }
         }
-        ?>
+?>
 
         <tr>
             <td class="blank" colspan="<?= $invoice_columns ?>" style="text-align: center;"><?= '&nbsp;' ?></td>
@@ -188,13 +188,13 @@ if (isset($error_message)) {
         </tr>
 
         <?php
-        $only_sale_check = false;
-        $show_giftcard_remainder = false;
-        foreach ($payments as $payment_id => $payment) {
-            $only_sale_check |= $payment['payment_type'] == lang('Sales.check');
-            $splitpayment = explode(':', $payment['payment_type']);    // TODO: $splitpayment does not meet variable naming standards for this project
-            $show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
-        ?>
+$only_sale_check = false;
+$show_giftcard_remainder = false;
+foreach ($payments as $payment_id => $payment) {
+    $only_sale_check |= $payment['payment_type'] == lang('Sales.check');
+    $splitpayment = explode(':', $payment['payment_type']);    // TODO: $splitpayment does not meet variable naming standards for this project
+    $show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
+    ?>
             <tr>
                 <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
                 <td colspan="2" class="total-line"><?= esc($splitpayment[0]) ?></td>
diff --git a/app/Views/sales/invoice_email.php b/app/Views/sales/invoice_email.php
index 076bed071..863a761b8 100644
--- a/app/Views/sales/invoice_email.php
+++ b/app/Views/sales/invoice_email.php
@@ -20,171 +20,167 @@
 ?>
 
 <!doctype html>
-
-<head>
-    <meta charset="utf-8">
-    <title><?= lang('Sales.email_receipt') ?></title>
-    <link rel="stylesheet" href="<?= base_url('css/invoice_email.css') ?>">
-</head>
-
-<body>
-    <?php
-    if (isset($error_message)) {
-        echo '<div class="alert alert-dismissible alert-danger">' . esc($error_message) . '</div>';
-        exit;
-    }
-    ?>
-
-    <div id="page-wrap">
-        <div id="header"><?= lang('Sales.invoice') ?></div>
-        <table id="info">
-            <tr>
-                <td id="logo">
-                    <?php if ($config['company_logo'] != '') { ?>
-                        <img id="image" src="data:<?= esc($mimetype, 'attr') ?>;base64,<?= base64_encode(file_get_contents('uploads/' . esc($config['company_logo']))) ?>" alt="company_logo">
-                    <?php } ?>
-                </td>
-                <td id="customer-title" id="customer">
-                    <?php if (isset($customer)) {
-                        echo nl2br(esc($customer_info));
-                    } ?>
-                </td>
-            </tr>
-            <tr>
-                <td id="company-title" id="company">
-                    <?= esc($config['company']) ?><br>
-                    <?= nl2br(esc($company_info)) ?>
-                </td>
-                <td id="meta">
-                    <table id="meta-content" align="right">
-                        <tr>
-                            <td class="meta-head"><?= lang('Sales.invoice_number') ?></td>
-                            <td><?= esc($invoice_number) ?></td>
-                        </tr>
-                        <tr>
-                            <td class="meta-head"><?= lang('Common.date') ?></td>
-                            <td><?= esc($transaction_date) ?></td>
-                        </tr>
-                        <?php if ($amount_due > 0) { ?>
-                            <tr>
-                                <td class="meta-head"><?= lang('Sales.amount_due') ?></td>
-                                <td class="due"><?= to_currency($total) ?></td>
-                            </tr>
-                        <?php } ?>
-                    </table>
-                </td>
-            </tr>
-        </table>
-
-        <table id="items">
-            <tr>
-                <th><?= lang('Sales.item_number') ?></th>
-                <th><?= lang('Sales.item_name') ?></th>
-                <th><?= lang('Sales.quantity') ?></th>
-                <th><?= lang('Sales.price') ?></th>
-                <th><?= lang('Sales.discount') ?></th>
-                <?php
-                $invoice_columns = 6;
-                if ($discount > 0) {
-                    $invoice_columns = $invoice_columns + 1;
-                ?>
-                    <th><?= lang('Sales.customer_discount') ?></th>
-                <?php } ?>
-                <th><?= lang('Sales.total') ?></th>
-            </tr>
-
-            <?php
-            foreach ($cart as $line => $item) {
-                if ($item['print_option'] == PRINT_YES) {
-            ?>
-                    <tr class="item-row">
-                        <td><?= esc($item['item_number']) ?></td>
-                        <td class="item-name"><?= esc($item['name']) ?></td>
-                        <td><?= to_quantity_decimals($item['quantity']) ?></td>
-                        <td><?= to_currency($item['price']) ?></td>
-                        <td><?= ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
-                        <?php if ($item['discount'] > 0): ?>
-                            <td><?= to_currency($item['discounted_total'] / $item['quantity']) ?></td>
-                        <?php endif; ?>
-                        <td class="total-line"><?= to_currency($item['discounted_total']) ?></td>
-                    </tr>
-            <?php
-                }
+    <head>
+        <meta charset="utf-8">
+        <title><?= lang('Sales.email_receipt') ?></title>
+        <link rel="stylesheet" href="<?= base_url('css/invoice_email.css') ?>">
+    </head>
+    <body>
+        <?php
+            if (isset($error_message)) {
+                echo '<div class="alert alert-dismissible alert-danger">' . esc($error_message) . '</div>';
+                exit;
             }
-            ?>
+        ?>
 
-            <tr>
-                <td colspan="<?= $invoice_columns ?>" align="center"><?= '&nbsp;' ?></td>
-            </tr>
+        <div id="page-wrap">
+            <div id="header"><?= lang('Sales.invoice') ?></div>
+            <table id="info">
+                <tr>
+                    <td id="logo">
+                        <?php if ($config['company_logo'] != '') { ?>
+                            <img id="image" src="data:<?= esc($mimetype, 'attr') ?>;base64,<?= base64_encode(file_get_contents('uploads/' . esc($config['company_logo']))) ?>" alt="company_logo">
+                        <?php } ?>
+                    </td>
+                    <td id="customer-title" id="customer">
+                        <?php if (isset($customer)) {
+                            echo nl2br(esc($customer_info));
+                        } ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td id="company-title" id="company">
+                        <?= esc($config['company']) ?><br>
+                        <?= nl2br(esc($company_info)) ?>
+                    </td>
+                    <td id="meta">
+                        <table id="meta-content" style="text-align: right;">
+                            <tr>
+                                <td class="meta-head"><?= lang('Sales.invoice_number') ?></td>
+                                <td><?= esc($invoice_number) ?></td>
+                            </tr>
+                            <tr>
+                                <td class="meta-head"><?= lang('Common.date') ?></td>
+                                <td><?= esc($transaction_date) ?></td>
+                            </tr>
+                            <?php if ($amount_due > 0) { ?>
+                                <tr>
+                                    <td class="meta-head"><?= lang('Sales.amount_due') ?></td>
+                                    <td class="due"><?= to_currency($total) ?></td>
+                                </tr>
+                            <?php } ?>
+                        </table>
+                    </td>
+                </tr>
+            </table>
 
-            <tr>
-                <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
-                <td colspan="2" class="total-line"><?= lang('Sales.sub_total') ?></td>
-                <td id="subtotal" class="total-value"><?= to_currency($subtotal) ?></td>
-            </tr>
+            <table id="items">
+                <tr>
+                    <th><?= lang('Sales.item_number') ?></th>
+                    <th><?= lang('Sales.item_name') ?></th>
+                    <th><?= lang('Sales.quantity') ?></th>
+                    <th><?= lang('Sales.price') ?></th>
+                    <th><?= lang('Sales.discount') ?></th>
+                    <?php
+                    $invoice_columns = 6;
+                    if ($discount > 0) {
+                        $invoice_columns = $invoice_columns + 1;
+                    ?>
+                        <th><?= lang('Sales.customer_discount') ?></th>
+                    <?php } ?>
+                    <th><?= lang('Sales.total') ?></th>
+                </tr>
+
+                <?php
+                foreach ($cart as $line => $item) {
+                    if ($item['print_option'] == PRINT_YES) {
+                ?>
+                        <tr class="item-row">
+                            <td><?= esc($item['item_number']) ?></td>
+                            <td class="item-name"><?= esc($item['name']) ?></td>
+                            <td><?= to_quantity_decimals($item['quantity']) ?></td>
+                            <td><?= to_currency($item['price']) ?></td>
+                            <td><?= ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
+                            <?php if ($discount > 0): ?>
+                                <td><?= to_currency($item['discounted_total'] / $item['quantity']) ?></td>
+                            <?php endif; ?>
+                            <td class="total-line"><?= to_currency($item['discounted_total']) ?></td>
+                        </tr>
+                <?php
+                    }
+                }
+                ?>
+
+                <tr>
+                    <td colspan="<?= $invoice_columns ?>" style="text-align: center;"><?= '&nbsp;' ?></td>
+                </tr>
 
-            <?php foreach ($taxes as $tax_group_index => $tax) { ?>
                 <tr>
                     <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
-                    <td colspan="2" class="total-line"><?= (float)$tax['tax_rate'] . '% ' . esc($tax['tax_group']) ?></td>
-                    <td id="taxes" class="total-value"><?= to_currency_tax($tax['sale_tax_amount']) ?></td>
+                    <td colspan="2" class="total-line"><?= lang('Sales.sub_total') ?></td>
+                    <td id="subtotal" class="total-value"><?= to_currency($subtotal) ?></td>
                 </tr>
-            <?php } ?>
 
-            <tr>
-                <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
-                <td colspan="2" class="total-line"><?= lang('Sales.total') ?></td>
-                <td id="total" class="total-value"><?= to_currency($total) ?></td>
-            </tr>
+                <?php foreach ($taxes as $tax_group_index => $tax) { ?>
+                    <tr>
+                        <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
+                        <td colspan="2" class="total-line"><?= (float)$tax['tax_rate'] . '% ' . esc($tax['tax_group']) ?></td>
+                        <td id="taxes" class="total-value"><?= to_currency_tax($tax['sale_tax_amount']) ?></td>
+                    </tr>
+                <?php } ?>
 
-            <?php
-            $only_sale_check = false;
-            $show_giftcard_remainder = false;
-
-            foreach ($payments as $payment_id => $payment) {
-                $only_sale_check |= $payment['payment_type'] == lang('Sales.check');
-                $splitpayment = explode(':', $payment['payment_type']);    // TODO: $splitpayment does not meet the variable naming conventions for this project
-                $show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
-            ?>
                 <tr>
                     <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
-                    <td colspan="2" class="total-line"><?= esc($splitpayment[0]) ?></td>
-                    <td class="total-value"><?= to_currency(-$payment['payment_amount']) ?></td>
+                    <td colspan="2" class="total-line"><?= lang('Sales.total') ?></td>
+                    <td id="total" class="total-value"><?= to_currency($total) ?></td>
                 </tr>
-            <?php } ?>
 
-            <?php if (isset($cur_giftcard_value) && $show_giftcard_remainder) { ?>
-                <tr>
-                    <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
-                    <td colspan="2" class="total-line"><?= lang('Sales.giftcard_balance') ?></td>
-                    <td class="total-value" id="giftcard"><?= to_currency($cur_giftcard_value) ?></td>
-                </tr>
-            <?php } ?>
+                <?php
+                $only_sale_check = false;
+                $show_giftcard_remainder = false;
 
-            <?php if (!empty($payments)) { ?>
-                <tr>
-                    <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
-                    <td colspan="2" class="total-line"><?= lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?></td>
-                    <td class="total-value"><?= to_currency($amount_change) ?></td>
-                </tr>
-            <?php } ?>
-        </table>
+                foreach ($payments as $payment_id => $payment) {
+                    $only_sale_check |= $payment['payment_type'] == lang('Sales.check');
+                    $splitpayment = explode(':', $payment['payment_type']);    // TODO: $splitpayment does not meet the variable naming conventions for this project
+                    $show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
+                ?>
+                    <tr>
+                        <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
+                        <td colspan="2" class="total-line"><?= esc($splitpayment[0]) ?></td>
+                        <td class="total-value"><?= to_currency(-$payment['payment_amount']) ?></td>
+                    </tr>
+                <?php } ?>
 
-        <div id="terms">
-            <div id="sale_return_policy">
-                <h5>
-                    <span><?= nl2br($config['payment_message']) ?></span>
-                    <span><?= lang('Sales.comments') . ': ' . (empty($comments) ? esc($config['invoice_default_comments']) : esc($comments)) ?></span>
-                </h5>
-                <?= nl2br(esc($config['return_policy'])) ?>
-            </div>
-            <div id="barcode">
-                <img alt="<?= esc($sale_id) ?>" src="data:image/svg+xml;base64,<?= base64_encode($barcode) ?>"><br>
-                <?= esc($sale_id) ?>
+                <?php if (isset($cur_giftcard_value) && $show_giftcard_remainder) { ?>
+                    <tr>
+                        <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
+                        <td colspan="2" class="total-line"><?= lang('Sales.giftcard_balance') ?></td>
+                        <td class="total-value" id="giftcard"><?= to_currency($cur_giftcard_value) ?></td>
+                    </tr>
+                <?php } ?>
+
+                <?php if (!empty($payments)) { ?>
+                    <tr>
+                        <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
+                        <td colspan="2" class="total-line"><?= lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?></td>
+                        <td class="total-value"><?= to_currency($amount_change) ?></td>
+                    </tr>
+                <?php } ?>
+            </table>
+
+            <div id="terms">
+                <div id="sale_return_policy">
+                    <h5>
+                        <span><?= nl2br(esc($config['payment_message'])) ?></span>
+                        <span><?= lang('Sales.comments') . ': ' . (empty($comments) ? esc($config['invoice_default_comments']) : esc($comments)) ?></span>
+                    </h5>
+                    <?= nl2br(esc($config['return_policy'])) ?>
+                </div>
+                <div id="barcode">
+                    <img alt="<?= esc($sale_id) ?>" src="data:image/svg+xml;base64,<?= base64_encode($barcode) ?>"><br>
+                    <?= esc($sale_id) ?>
+                </div>
             </div>
         </div>
-    </div>
-
-</body>
-
+    </body>
 </html>
diff --git a/app/Views/sales/manage.php b/app/Views/sales/manage.php
index 277d438ab..d3d9ceaaf 100644
--- a/app/Views/sales/manage.php
+++ b/app/Views/sales/manage.php
@@ -5,6 +5,8 @@
  * @var array $filters
  * @var array $selected_filters
  * @var array $config
+ * @var string|null $start_date
+ * @var string|null $end_date
  */
 ?>
 
@@ -26,6 +28,14 @@
 
         <?= view('partial/bootstrap_tables_locale') ?>
 
+        // Override dates from server if provided
+        <?php if (isset($start_date) && $start_date): ?>
+        start_date = "<?= esc($start_date) ?>";
+        <?php endif; ?>
+        <?php if (isset($end_date) && $end_date): ?>
+        end_date = "<?= esc($end_date) ?>";
+        <?php endif; ?>
+
         table_support.query_params = function() {
             return {
                 "start_date": start_date,
@@ -55,13 +65,15 @@
                 }
             }
         });
-    });
+     });
 </script>
 
+<?= view('partial/table_filter_persistence') ?>
+
 <?= view('partial/print_receipt', ['print_after_sale' => false, 'selected_printer' => 'takings_printer']) ?>
 
 <div id="title_bar" class="print_hide btn-toolbar">
-    <button onclick="javascript:printdoc()" class="btn btn-info btn-sm pull-right">
+    <button onclick="printdoc()" class="btn btn-info btn-sm pull-right">
         <span class="glyphicon glyphicon-print">&nbsp;</span><?= lang('Common.print') ?>
     </button>
     <?= anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm pull-right', 'id' => 'show_sales_button']) ?>
diff --git a/app/Views/sales/quote.php b/app/Views/sales/quote.php
index 28bf59352..7dc927c66 100644
--- a/app/Views/sales/quote.php
+++ b/app/Views/sales/quote.php
@@ -28,7 +28,7 @@ if (isset($error_message)) {
 <?php if (!empty($customer_email)): ?>
     <script type="text/javascript">
         $(document).ready(function() {
-            var send_email = function() {
+            const send_email = function() {
                 $.get('<?= site_url() . esc("/sales/sendPdf/$sale_id_num/quote") ?>',
                     function(response) {
                         $.notify({
@@ -164,7 +164,7 @@ if (isset($error_message)) {
         <?php foreach ($taxes as $tax_group_index => $tax) { ?>
             <tr>
                 <td colspan="<?= $quote_columns - 3 ?>" class="blank"> </td>
-                <td colspan="2" class="total-line"><?= (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+                <td colspan="2" class="total-line"><?= (float)$tax['tax_rate'] . '% ' . esc($tax['tax_group']) ?></td>
                 <td class="total-value" id="taxes"><?= to_currency_tax($tax['sale_tax_amount']) ?></td>
             </tr>
         <?php } ?>
diff --git a/app/Views/sales/quote_email.php b/app/Views/sales/quote_email.php
index 6bc1117ff..f169b0e68 100644
--- a/app/Views/sales/quote_email.php
+++ b/app/Views/sales/quote_email.php
@@ -15,7 +15,7 @@
 ?>
 
 <!doctype html>
-<html lang="<?= $this->request->getLocale() ?>">
+<html lang="<?= current_language_code() ?>">
 
 <head>
     <meta charset="utf-8">
@@ -58,7 +58,7 @@
                     </div>
                 </td>
                 <td id="meta">
-                    <table id="meta-content" align="right">
+                    <table id="meta-content" style="text-align: right;">
                         <tr>
                             <td class="meta-head"><?= lang('Sales.quote_number') ?> </td>
                             <td><?= esc($quote_number) ?></td>
@@ -116,7 +116,7 @@
             ?>
 
             <tr>
-                <td colspan="<?= $quote_columns ?>" align="center"><?= '&nbsp;' //TODO: Replace the php echo for nbsp with just straight html? ?></td>
+                <td colspan="<?= $quote_columns ?>" style="text-align: center;"><?= '&nbsp;' //TODO: Replace the php echo for nbsp with just straight html? ?></td>
             </tr>
 
             <tr>
@@ -149,7 +149,7 @@
                 <?= nl2br(esc($config['return_policy'])) ?>
             </div>
             <div id="barcode">
-                <?= $quote_number ?>
+                <?= esc($quote_number) ?>
             </div>
         </div>
     </div>
diff --git a/app/Views/sales/receipt.php b/app/Views/sales/receipt.php
index cd168cb33..7aad189ca 100644
--- a/app/Views/sales/receipt.php
+++ b/app/Views/sales/receipt.php
@@ -2,11 +2,14 @@
 /**
  * @var int $sale_id_num
  * @var bool $print_after_sale
+ * @var string $receipt_template_view
  * @var array $config
  */
 
 use App\Models\Employee;
 
+$template = $receipt_template_view ?? 'receipt_default';
+
 ?>
 
 <?= view('partial/header') ?>
@@ -21,7 +24,7 @@ if (isset($error_message)) {
 <?php if (!empty($customer_email)): ?>
     <script type="text/javascript">
         $(document).ready(function() {
-            var send_email = function() {
+            const send_email = function() {
                 $.get('<?= site_url() . esc("/sales/sendPdf/$sale_id_num/receipt") ?>',
                     function(response) {
                         $.notify({
@@ -61,6 +64,6 @@ if (isset($error_message)) {
     <?php endif; ?>
 </div>
 
-<?= view('sales/' . $config['receipt_template']) ?>
+<?= view('sales/' . $template) ?>
 
 <?= view('partial/footer') ?>
diff --git a/app/Views/sales/receipt_email.php b/app/Views/sales/receipt_email.php
index 480a21b96..88451e0b2 100644
--- a/app/Views/sales/receipt_email.php
+++ b/app/Views/sales/receipt_email.php
@@ -106,7 +106,7 @@
             </tr>
             <?php foreach ($taxes as $tax_group_index => $tax) { ?>
                 <tr>
-                    <td colspan="3" style="text-align: right;"><?= (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?>:</td>
+                    <td colspan="3" style="text-align: right;"><?= (float)$tax['tax_rate'] . '% ' . esc($tax['tax_group']) ?>:</td>
                     <td style="text-align: right;"><?= to_currency_tax($tax['sale_tax_amount']) ?></td>
                 </tr>
         <?php
diff --git a/app/Views/sales/register.php b/app/Views/sales/register.php
index f0ca9df98..ac3735442 100644
--- a/app/Views/sales/register.php
+++ b/app/Views/sales/register.php
@@ -173,15 +173,15 @@ helper('url');
                             </td>
                             <?php if ($item['item_type'] == ITEM_TEMP) { ?>
                                 <td><?= form_input(['name' => 'item_number', 'id' => 'item_number', 'class' => 'form-control input-sm', 'value' => $item['item_number'], 'tabindex' => ++$tabindex]) ?></td>
-                                <td style="align: center;">
+                                <td style="text-align: center;">
                                     <?= form_input(['name' => 'name', 'id' => 'name', 'class' => 'form-control input-sm', 'value' => $item['name'], 'tabindex' => ++$tabindex]) ?>
                                 </td>
                             <?php } else { ?>
                                 <td><?= esc($item['item_number']) ?></td>
-                                <td style="align: center;">
-                                    <?= esc($item['name']) . ' ' . implode(' ', [$item['attribute_values'], $item['attribute_dtvalues']]) ?>
+                                <td style="text-align: center;">
+                                    <?= esc($item['name']) . ' ' . esc(implode(' ', [$item['attribute_values'], $item['attribute_dtvalues']])) ?>
                                     <br>
-                                    <?php if ($item['stock_type'] == '0'): echo '[' . to_quantity_decimals($item['in_stock']) . ' in ' . $item['stock_name'] . ']';
+                                    <?php if ($item['stock_type'] == '0'): echo '[' . to_quantity_decimals($item['in_stock']) . ' in ' . esc($item['stock_name']) . ']';
                                     endif; ?>
                                 </td>
                             <?php } ?>
@@ -236,7 +236,7 @@ helper('url');
                         <tr>
                             <?php if ($item['item_type'] == ITEM_TEMP) { ?>
                                 <td><?= form_input(['type' => 'hidden', 'name' => 'item_id', 'value' => $item['item_id']]) ?></td>
-                                <td style="align: center;" colspan="6">
+                                <td style="text-align: center;" colspan="6">
                                     <?= form_input(['name' => 'item_description', 'id' => 'item_description', 'class' => 'form-control input-sm', 'value' => $item['description'], 'tabindex' => ++$tabindex]) ?>
                                 </td>
                                 <td> </td>
@@ -380,7 +380,7 @@ helper('url');
             </tr>
             <?php foreach ($taxes as $tax_group_index => $tax) { ?>
                 <tr>
-                    <th style="width: 55%;"><?= (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></th>
+                    <th style="width: 55%;"><?= (float)$tax['tax_rate'] . '% ' . esc($tax['tax_group']) ?></th>
                     <th style="width: 45%; text-align: right;"><?= to_currency_tax($tax['sale_tax_amount']) ?></th>
                 </tr>
             <?php } ?>
@@ -405,17 +405,42 @@ helper('url');
             <div id="payment_details">
                 <?php if ($payments_cover_total) { // Show Complete sale button instead of Add Payment if there is no amount due left ?>
                     <?= form_open("$controller_name/addPayment", ['id' => 'add_payment_form', 'class' => 'form-horizontal']) ?>
+                        <input type="hidden" name="complete_after_payment" value="0">
                         <table class="sales_table_100">
                             <tr>
                                 <td><?= lang(ucfirst($controller_name) . '.payment') ?></td>
                                 <td>
-                                    <?= form_dropdown('payment_type', $payment_options, $selected_payment_type, ['id' => 'payment_types', 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit', 'disabled' => 'disabled']) ?>
+                                    <?= form_dropdown('payment_type', $payment_options, $selected_payment_type, ['id' => 'payment_types', 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => '100%', 'disabled' => 'disabled']) ?>
                                 </td>
                             </tr>
                             <tr>
                                 <td><span id="amount_tendered_label"><?= lang(ucfirst($controller_name) . '.amount_tendered') ?></span></td>
                                 <td>
-                                    <?= form_input(['name' => 'amount_tendered', 'id' => 'amount_tendered', 'class' => 'form-control input-sm disabled', 'disabled' => 'disabled', 'value' => '0', 'size' => '5', 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']) ?>
+                                    <?= form_input([
+                                        'name' => 'amount_tendered',
+                                        'id' => 'amount_tendered',
+                                        'class' => 'form-control input-sm disabled',
+                                        'disabled' => 'disabled',
+                                        'value' => '0',
+                                        'size' => '5',
+                                        'tabindex' => ++$tabindex,
+                                        'onClick' => 'this.select();'
+                                    ]) ?>
+                                </td>
+                            </tr>
+                            <tr class="reference-code-input reference-code-input-hidden">
+                                <td style="padding-top: 8px;"><span id='reference_code_label'><?= lang('Sales.reference_code') ?></span></td>
+                                <td style="padding-top: 8px;">
+                                    <?php echo form_input(array(
+                                        'name'	=> 'reference_code',
+                                        'id'	=> 'reference_code',
+                                        'class'	=> 'form-control input-sm non-giftcard-input',
+                                        'disabled' => true,
+                                        'value'	=> '',
+                                        'size' => 5,
+                                        'tabindex'	=> ++$tabindex,
+                                        'onClick'	=> 'this.select();'));
+                                    ?>
                                 </td>
                             </tr>
                         </table>
@@ -445,11 +470,12 @@ helper('url');
                     ?>
                 <?php } else { ?>
                     <?= form_open("$controller_name/addPayment", ['id' => 'add_payment_form', 'class' => 'form-horizontal']) ?>
+                        <input type="hidden" name="complete_after_payment" value="0">
                         <table class="sales_table_100">
                             <tr>
                                 <td><?= lang(ucfirst($controller_name) . '.payment') ?></td>
                                 <td>
-                                    <?= form_dropdown('payment_type', $payment_options,  $selected_payment_type, ['id' => 'payment_types', 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
+                                    <?= form_dropdown('payment_type', $payment_options,  $selected_payment_type, ['id' => 'payment_types', 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => '100%']) ?>
                                 </td>
                             </tr>
                             <tr>
@@ -459,6 +485,21 @@ helper('url');
                                     <?= form_input(['name' => 'amount_tendered', 'id' => 'amount_tendered', 'class' => 'form-control input-sm giftcard-input', 'disabled' => true, 'value' => to_currency_no_money($amount_due), 'size' => '5', 'tabindex' => ++$tabindex]) ?>
                                 </td>
                             </tr>
+                            <tr class="reference-code-input reference-code-input-hidden">
+                                <td style="padding-top: 8px;"><span id='reference_code_label'><?= lang('Sales.reference_code') ?></span></td>
+                                <td style="padding-top: 8px;">
+                                    <?php echo form_input(array(
+                                        'name'     => 'reference_code',
+                                        'id'       => 'reference_code',
+                                        'class'    => 'form-control input-sm non-giftcard-input',
+                                        'disabled' => true,
+                                        'value'    => '',
+                                        'size'     => 5,
+                                        'tabindex' => ++$tabindex,
+                                        'onClick'  => 'this.select();'));
+                                    ?>
+                                </td>
+                            </tr>
                         </table>
                     <?= form_close() ?>
 
@@ -565,6 +606,22 @@ helper('url');
 </div>
 
 <script type="text/javascript">
+    const keyboardShortcuts = <?= json_encode($keyboardShortcuts ?? []) ?>;
+    const paymentsCoverTotal = <?= json_encode((bool) $payments_cover_total) ?>;
+    const referenceCodePaymentTypes = <?= json_encode($reference_code_payment_types) ?>;
+    const shortcutCodes = {
+        items: keyboardShortcuts?.items?.code ?? null,
+        customers: keyboardShortcuts?.customers?.code ?? null,
+        suspend: keyboardShortcuts?.suspend?.code ?? null,
+        suspended: keyboardShortcuts?.suspended?.code ?? null,
+        amount: keyboardShortcuts?.amount?.code ?? null,
+        payment: keyboardShortcuts?.payment?.code ?? null,
+        complete: keyboardShortcuts?.complete?.code ?? null,
+        finish: keyboardShortcuts?.finish?.code ?? null,
+        help: keyboardShortcuts?.help?.code ?? null,
+        cancel: keyboardShortcuts?.cancel?.code ?? null
+    };
+
     $(document).ready(function() {
         const redirect = function() {
             window.location.href = "<?= site_url('sales'); ?>";
@@ -585,8 +642,8 @@ helper('url');
         });
 
         $("input[name='item_number']").change(function() {
-            var item_id = $(this).parents('tr').find("input[name='item_id']").val();
-            var item_number = $(this).val();
+            const item_id = $(this).parents('tr').find("input[name='item_id']").val();
+            const item_number = $(this).val();
             $.ajax({
                 url: "<?= site_url('sales/changeItemNumber') ?>",
                 method: 'post',
@@ -599,8 +656,8 @@ helper('url');
         });
 
         $("input[name='name']").change(function() {
-            var item_id = $(this).parents('tr').find("input[name='item_id']").val();
-            var item_name = $(this).val();
+            const item_id = $(this).parents('tr').find("input[name='item_id']").val();
+            const item_name = $(this).val();
             $.ajax({
                 url: "<?= site_url('sales/changeItemName') ?>",
                 method: 'post',
@@ -613,8 +670,8 @@ helper('url');
         });
 
         $("input[name='item_description']").change(function() {
-            var item_id = $(this).parents('tr').find("input[name='item_id']").val();
-            var item_description = $(this).val();
+            const item_id = $(this).parents('tr').find("input[name='item_id']").val();
+            const item_description = $(this).val();
             $.ajax({
                 url: "<?= site_url('sales/changeItemDescription') ?>",
                 method: 'post',
@@ -651,7 +708,7 @@ helper('url');
             }
         });
 
-        var clear_fields = function() {
+        const clear_fields = function() {
             if ($(this).val().match("<?= lang(ucfirst($controller_name) . '.start_typing_item_name') . '|' . lang(ucfirst($controller_name) . '.start_typing_customer_name') ?>")) {
                 $(this).val('');
             }
@@ -750,6 +807,7 @@ helper('url');
         });
 
         $('#add_payment_button').click(function() {
+            $('#add_payment_form').find('input[name="complete_after_payment"]').val('0');
             $('#add_payment_form').submit();
         });
 
@@ -787,7 +845,7 @@ helper('url');
                     $('#customer').val(response.id);
                     $('#select_customer_form').submit();
                 } else {
-                    var $stock_location = $("select[name='stock_location']").val();
+                    const $stock_location = $("select[name='stock_location']").val();
                     $('#item_location').val($stock_location);
                     $('#item').val(response.id);
                     if (stay_open) {
@@ -804,16 +862,20 @@ helper('url');
         });
 
         $('[name="discount_toggle"]').change(function() {
-            var input = $('<input>').attr('type', 'hidden').attr('name', 'discount_type').val(($(this).prop('checked')) ? 1 : 0);
+            const input = $('<input>').attr('type', 'hidden').attr('name', 'discount_type').val(($(this).prop('checked')) ? 1 : 0);
             $('#cart_' + $(this).attr('data-line')).append($(input));
             $('#cart_' + $(this).attr('data-line')).submit();
         });
     });
 
     function check_payment_type() {
-        var cash_mode = <?= json_encode($cash_mode) ?>;
+        const cash_mode = <?= json_encode($cash_mode) ?>;
+        const paymentType = $("#payment_types").val();
+        const isGiftCard = paymentType == "<?= lang(ucfirst($controller_name) . '.giftcard') ?>";
+        const isCash = paymentType == "<?= lang(ucfirst($controller_name) . '.cash') ?>";
+        const needsReferenceCode = referenceCodePaymentTypes.indexOf(paymentType) !== -1;
 
-        if ($("#payment_types").val() == "<?= lang(ucfirst($controller_name) . '.giftcard') ?>") {
+        if (isGiftCard) {
             $("#sale_total").html("<?= to_currency($total) ?>");
             $("#sale_amount_due").html("<?= to_currency($amount_due) ?>");
             $("#amount_tendered_label").html("<?= lang(ucfirst($controller_name) . '.giftcard_number') ?>");
@@ -821,13 +883,15 @@ helper('url');
             $(".giftcard-input").attr('disabled', false);
             $(".non-giftcard-input").attr('disabled', true);
             $(".giftcard-input:enabled").val('').focus();
-        } else if (($("#payment_types").val() == "<?= lang(ucfirst($controller_name) . '.cash') ?>" && cash_mode == '1')) {
+            $(".reference-code-input").hide();
+        } else if (isCash && cash_mode == '1') {
             $("#sale_total").html("<?= to_currency($non_cash_total) ?>");
             $("#sale_amount_due").html("<?= to_currency($cash_amount_due) ?>");
             $("#amount_tendered_label").html("<?= lang(ucfirst($controller_name) . '.amount_tendered') ?>");
             $("#amount_tendered:enabled").val("<?= to_currency_no_money($cash_amount_due) ?>");
             $(".giftcard-input").attr('disabled', true);
             $(".non-giftcard-input").attr('disabled', false);
+            $(".reference-code-input").hide();
         } else {
             $("#sale_total").html("<?= to_currency($non_cash_total) ?>");
             $("#sale_amount_due").html("<?= to_currency($amount_due) ?>");
@@ -835,47 +899,63 @@ helper('url');
             $("#amount_tendered:enabled").val("<?= to_currency_no_money($amount_due) ?>");
             $(".giftcard-input").attr('disabled', true);
             $(".non-giftcard-input").attr('disabled', false);
+            if (needsReferenceCode) {
+                $("#reference_code_label").html("<?= lang(ucfirst($controller_name) . '.reference_code') ?>");
+                $(".reference-code-input").show();
+                $(".reference-code-input input").attr('disabled', false);
+            } else {
+                $(".reference-code-input").hide();
+                $(".reference-code-input input").attr('disabled', true);
+            }
         }
     }
 
     // Add Keyboard Shortcuts/Hotkeys to Sale Register
-    document.body.onkeyup = function(e) {
-        switch (event.altKey && event.keyCode) {
-            case 49: // Alt + 1 Items Seach
-                $("#item").focus();
-                $("#item").select();
-                break;
-            case 50: // Alt + 2 Customers Search
-                $("#customer").focus();
-                $("#customer").select();
-                break;
-            case 51: // Alt + 3 Suspend Current Sale
-                $("#suspend_sale_button").click();
-                break;
-            case 52: // Alt + 4 Check Suspended
-                $("#show_suspended_sales_button").click();
-                break;
-            case 53: // Alt + 5 Edit Amount Tendered Value
-                $("#amount_tendered").focus();
-                $("#amount_tendered").select();
-                break;
-            case 54: // Alt + 6 Add Payment
-                $("#add_payment_button").click();
-                break;
-            case 55: // Alt + 7 Add Payment and Complete Sales/Invoice
-                $("#add_payment_button").click();
-                window.location.href = "<?= 'sales/complete' ?>";
-                break;
-            case 56: // Alt + 8 Finish Quote/Invoice without payment
-                $("#finish_invoice_quote_button").click();
-                break;
-            case 57: // Alt + 9 Open Shortcuts Help Modal
-                $("#show_keyboard_help").click();
-                break;
+    document.body.onkeyup = function(event) {
+        if ($(event.target).closest('.modal').length || $('.modal.in').length) {
+            return;
+        }
+        if (event.altKey) {
+            switch (event.keyCode) {
+                case shortcutCodes.items:
+                    $("#item").focus();
+                    $("#item").select();
+                    break;
+                case shortcutCodes.customers:
+                    $("#customer").focus();
+                    $("#customer").select();
+                    break;
+                case shortcutCodes.suspend:
+                    $("#suspend_sale_button").click();
+                    break;
+                case shortcutCodes.suspended:
+                    $("#show_suspended_sales_button").click();
+                    break;
+                case shortcutCodes.amount:
+                    $("#amount_tendered").focus();
+                    $("#amount_tendered").select();
+                    break;
+                case shortcutCodes.payment:
+                    $("#add_payment_button").click();
+                    break;
+                case shortcutCodes.complete:
+                    if (paymentsCoverTotal && $("#finish_sale_button").length) {
+                        $("#finish_sale_button").click();
+                    } else {
+                        $("#add_payment_button").click();
+                    }
+                    break;
+                case shortcutCodes.finish:
+                    $("#finish_invoice_quote_button").click();
+                    break;
+                case shortcutCodes.help:
+                    $("#show_keyboard_help").click();
+                    break;
+            }
         }
 
         switch (event.keyCode) {
-            case 27: // ESC Cancel Current Sale
+            case shortcutCodes.cancel:
                 $("#cancel_sale_button").click();
                 break;
         }
diff --git a/app/Views/sales/tax_invoice.php b/app/Views/sales/tax_invoice.php
index fddcc6d3f..3b2665ecc 100644
--- a/app/Views/sales/tax_invoice.php
+++ b/app/Views/sales/tax_invoice.php
@@ -32,7 +32,7 @@ if (isset($error_message)) {
 <?php if (!empty($customer_email)): ?>
     <script type="text/javascript">
         $(document).ready(function() {
-            var send_email = function() {
+            const send_email = function() {
                 $.get('<?= esc("/sales/sendPdf/$sale_id_num") ?>',
                     function(response) {
                         $.notify({
@@ -139,7 +139,7 @@ if (isset($error_message)) {
             if ($item['print_option'] == PRINT_YES) {    // TODO: === ?
         ?>
                 <tr class="item-row">
-                    <td><?= $item['item_number'] ?></td>
+                    <td><?= esc($item['item_number']) ?></td>
                     <?php if ($include_hsn): ?>
                         <td style="text-align: center;"><?= esc($item['hsn_code']) ?></td>
                     <?php endif; ?>
@@ -179,7 +179,7 @@ if (isset($error_message)) {
         <?php foreach ($taxes as $tax_group_index => $tax) { ?>
             <tr>
                 <td colspan="<?= $invoice_columns - 3 ?>" class="blank"> </td>
-                <td colspan="2" class="total-line"><?= (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+                <td colspan="2" class="total-line"><?= (float)$tax['tax_rate'] . '% ' . esc($tax['tax_group']) ?></td>
                 <td class="total-value" id="taxes"><?= to_currency_tax($tax['sale_tax_amount']) ?></td>
             </tr>
         <?php } ?>
diff --git a/app/Views/sales/work_order.php b/app/Views/sales/work_order.php
index de6226b18..ecb80d625 100644
--- a/app/Views/sales/work_order.php
+++ b/app/Views/sales/work_order.php
@@ -30,7 +30,7 @@ if (isset($error_message)) {
 <?php if (!empty($customer_email)): ?>
     <script type="text/javascript">
         $(document).ready(function() {
-            var send_email = function() {
+            const send_email = function() {
                 $.get('<?= esc("/sales/sendPdf/$sale_id_num/work_order") ?>',
                     function(response) {
                         $.notify({
diff --git a/app/Views/sales/work_order_email.php b/app/Views/sales/work_order_email.php
index 22da1c75d..428bb6560 100644
--- a/app/Views/sales/work_order_email.php
+++ b/app/Views/sales/work_order_email.php
@@ -14,7 +14,7 @@
 ?>
 
 <!doctype html>
-<html lang="<?= $this->request->getLocale() ?>">
+<html lang="<?= current_language_code() ?>">
 
 <head>
     <meta charset="utf-8">
@@ -55,7 +55,7 @@
                     <pre><?= esc($company_info) ?></pre>
                 </td>
                 <td id="meta">
-                    <table align="right">
+                    <table style="text-align: right;">
                         <tr>
                             <td class="meta-head"><?= lang('Sales.work_order_number') ?> </td>
                             <td><?= esc($work_order_number) ?></td>
@@ -103,7 +103,7 @@
             ?>
 
             <tr>
-                <td colspan="6" align="center"><?= '&nbsp;' ?></td>
+                <td colspan="6" style="text-align: center;"><?= '&nbsp;' ?></td>
             </tr>
 
             <tr>
diff --git a/app/Views/taxes/tax_categories.php b/app/Views/taxes/tax_categories.php
index 64b57e508..1c7ebdff6 100644
--- a/app/Views/taxes/tax_categories.php
+++ b/app/Views/taxes/tax_categories.php
@@ -27,14 +27,14 @@
 <?= form_close() ?>
 
 <script type="text/javascript">
-    // Validation and submit handling
+    // Validation and Submit Handling
     $(document).ready(function() {
-        var tax_categories_count = <?= sizeof($tax_categories) ?>;
+        let tax_categories_count = <?= sizeof($tax_categories) ?>;
         if (tax_categories_count == 0) {
             tax_categories_count = 1;
         }
 
-        var hide_show_remove_tax_category = function() {
+        const hide_show_remove_tax_category = function() {
             if ($("input[name*='tax_category']:enabled").length > 1) {
                 $(".remove_tax_category").show();
             } else {
@@ -42,15 +42,15 @@
             }
         };
 
-        var add_tax_category = function() {
-            var id = $(this).parent().find('input').attr('id');
+        const add_tax_category = function() {
+            let id = $(this).parent().find('input').attr('id');
             id = id.replace(/.*?_(\d+)$/g, "$1");
 
-            var previous_tax_category_id = 'tax_category_' + id;
-            var block = $(this).parent().clone(true);
-            var new_block = block.insertAfter($(this).parent());
+            const previous_tax_category_id = 'tax_category_' + id;
+            const block = $(this).parent().clone(true);
+            const new_block = block.insertAfter($(this).parent());
             ++tax_categories_count;
-            var new_tax_category_id = 'tax_category_' + tax_categories_count;
+            const new_tax_category_id = 'tax_category_' + tax_categories_count;
 
             $(new_block).find('label').html("<?= lang('Taxes.tax_category') ?> " + tax_categories_count).attr('for', new_tax_category_id).attr('class', 'control-label col-xs-2');
             $(new_block).find("input[name='tax_category[]']").attr('id', new_tax_category_id).removeAttr('disabled').attr('class', 'form-control input-sm required').val('');
@@ -59,44 +59,38 @@
             hide_show_remove_tax_category();
         };
 
-        var remove_tax_category = function() {
+        const remove_tax_category = function() {
             $(this).parent().remove();
             hide_show_remove_tax_category();
         };
 
-        var init_add_remove_tax_categories = function() {
+        const init_add_remove_tax_categories = function() {
             $('.add_tax_category').click(add_tax_category);
             $('.remove_tax_category').click(remove_tax_category);
             hide_show_remove_tax_category();
         };
         init_add_remove_tax_categories();
 
-        var duplicate_found = false;
+        let duplicate_found = false;
 
         // Run validator once for all fields
         $.validator.addMethod("check4TaxCategoryDups", function(value, element) {
-            var value_count = 0;
+            let value_count = 0;
             $('input[name="tax_category[]"]').each(function() {
                 value_count = $(this).val() == value ? value_count + 1 : value_count;
             });
-            if (value_count > 1) {
-                return false;
-            }
-            return true;
+            return value_count <= 1;
+
         }, "<?= lang('Taxes.tax_category_duplicate') ?>");
 
         $.validator.addMethod('validateTaxCategoryCharacters', function(value, element) {
-            if ((value.indexOf('_') != -1)) {
-                return false;
-            }
-            return true;
+            return (value.indexOf('_') == -1);
+
         }, "<?= lang('Taxes.tax_category_invalid_chars') ?>");
 
         $.validator.addMethod('requireTaxCategory', function(value, element) {
-            if (value.trim() == '') {
-                return false;
-            }
-            return true;
+            return value.trim() != '';
+
         }, "<?= lang('Taxes.tax_category_required') ?>");
 
         $('#tax_categories_form').validate($.extend(form_support.handler, {
@@ -120,8 +114,8 @@
         }));
 
         <?php
-        $i = 0;
-        foreach ($tax_categories as $tax_category => $tax_category_data) {
+            $i = 0;
+            foreach ($tax_categories as $tax_category => $tax_category_data) {
         ?>
             $('<?= '#tax_category_' . ++$i ?>').rules("add", {
                 requireTaxCategory: true,
diff --git a/app/Views/taxes/tax_codes.php b/app/Views/taxes/tax_codes.php
index cae03bff7..4a8d255e6 100644
--- a/app/Views/taxes/tax_codes.php
+++ b/app/Views/taxes/tax_codes.php
@@ -27,14 +27,14 @@
 <?= form_close() ?>
 
 <script type="text/javascript">
-    // Validation and submit handling
+    // Validation and Submit Handling
     $(document).ready(function() {
-        var tax_code_count = <?= sizeof($tax_codes) ?>;
+        let tax_code_count = <?= sizeof($tax_codes) ?>;
         if (tax_code_count == 0) {
             tax_code_count = 1;
         }
 
-        var hide_show_remove_tax_code = function() {
+        const hide_show_remove_tax_code = function() {
             if ($("input[name*='tax_code']:enabled").length > 1) {
                 $(".remove_tax_code").show();
             } else {
@@ -42,14 +42,14 @@
             }
         };
 
-        var add_tax_code = function() {
-            var id = $(this).parent().find("input[name='tax_code[]']").attr('id');
+        const add_tax_code = function() {
+            let id = $(this).parent().find("input[name='tax_code[]']").attr('id');
             id = id.replace(/.*?_(\d+)$/g, "$1");
-            var previous_tax_code_id = 'tax_code_' + id;
-            var block = $(this).parent().clone(true);
-            var new_block = block.insertAfter($(this).parent());
+            const previous_tax_code_id = 'tax_code_' + id;
+            const block = $(this).parent().clone(true);
+            const new_block = block.insertAfter($(this).parent());
             ++tax_code_count;
-            var new_tax_code_id = 'tax_code_' + tax_code_count;
+            const new_tax_code_id = 'tax_code_' + tax_code_count;
 
             $(new_block).find('label').html("<?= lang('Taxes.tax_code') ?> " + tax_code_count).attr('for', new_tax_code_id).attr('class', 'control-label col-xs-2');
             $(new_block).find("input[name='tax_code[]']").attr('id', new_tax_code_id).removeAttr('disabled').attr('class', 'form-control text-uppercase required input-sm').val('');
@@ -61,12 +61,12 @@
             hide_show_remove_tax_code();
         };
 
-        var remove_tax_code = function() {
+        const remove_tax_code = function() {
             $(this).parent().remove();
             hide_show_remove_tax_code();
         };
 
-        var init_add_remove_tax_codes = function() {
+        const init_add_remove_tax_codes = function() {
             $('.add_tax_code').click(add_tax_code);
             $('.remove_tax_code').click(remove_tax_code);
             hide_show_remove_tax_code();
@@ -75,28 +75,22 @@
 
         // Run validator once for all fields
         $.validator.addMethod('check4TaxCodeDups', function(value, element) {
-            var value_count = 0;
+            let value_count = 0;
             $("input[name='tax_code[]']").each(function() {
                 value_count = $(this).val() == value ? value_count + 1 : value_count;
             });
-            if (value_count > 1) {
-                return false;
-            }
-            return true;
+            return value_count <= 1;
+
         }, "<?= lang('Taxes.tax_code_duplicate') ?>");
 
         $.validator.addMethod('validateTaxCodeCharacters', function(value, element) {
-            if ((value.indexOf('_') != -1)) {
-                return false;
-            }
-            return true;
+            return (value.indexOf('_') == -1);
+
         }, "<?= lang('Taxes.tax_code_invalid_chars') ?>");
 
         $.validator.addMethod('requireTaxCode', function(value, element) {
-            if (value.trim() == '') {
-                return false;
-            }
-            return true;
+            return value.trim() != '';
+
         }, "<?= lang('Taxes.tax_code_required') ?>");
 
         $('#tax_codes_form').validate($.extend(form_support.handler, {
diff --git a/app/Views/taxes/tax_jurisdictions.php b/app/Views/taxes/tax_jurisdictions.php
index 8b5c312a3..7fbb05ea5 100644
--- a/app/Views/taxes/tax_jurisdictions.php
+++ b/app/Views/taxes/tax_jurisdictions.php
@@ -28,31 +28,31 @@
 <?= form_close() ?>
 
 <script type="text/javascript">
-    // Validation and submit handling
+    // Validation and Submit Handling
     $(document).ready(function() {
-        var tax_jurisdictions_count = <?= sizeof($tax_jurisdictions) ?>;
+        let tax_jurisdictions_count = <?= sizeof($tax_jurisdictions) ?>;
         if (tax_jurisdictions_count == 0) {
             tax_jurisdictions_count = 1;
         }
-        var tax_type_options = '<?= esc($tax_type_options, 'js') ?>';
+        const tax_type_options = '<?= esc($tax_type_options, 'js') ?>';
 
-        var hide_show_remove_tax_jurisdiction = function() {
+        const hide_show_remove_tax_jurisdiction = function() {
             if ($("input[name*='tax_jurisdiction']:enabled").length > 1) {
                 $(".remove_tax_jurisdiction").show();
             } else {
-                $(".remove_tax_jurisdictions").hide();
+                $(".remove_tax_jurisdiction").hide();
             }
         };
 
-        var add_tax_jurisdiction = function() {
-            var id = $(this).parent().find('input').attr('id');
+        const add_tax_jurisdiction = function() {
+            let id = $(this).parent().find('input').attr('id');
             id = id.replace(/.*?_(\d+)$/g, "$1");
 
-            var previous_jurisdiction_name_id = 'jurisdiction_name_' + id;
-            var block = $(this).parent().clone(true);
-            var new_block = block.insertAfter($(this).parent());
+            const previous_jurisdiction_name_id = 'jurisdiction_name_' + id;
+            const block = $(this).parent().clone(true);
+            const new_block = block.insertAfter($(this).parent());
             ++tax_jurisdictions_count;
-            var new_jurisdiction_name_id = 'jurisdiction_name_' + tax_jurisdictions_count;
+            const new_jurisdiction_name_id = 'jurisdiction_name_' + tax_jurisdictions_count;
 
             $(new_block).find('label').html("<?= lang('Taxes.tax_jurisdiction') ?> " + tax_jurisdictions_count).attr('for', new_jurisdiction_name_id).attr('class', 'control-label col-xs-2');
             $(new_block).find("input[name='jurisdiction_name[]']").attr('id', new_jurisdiction_name_id).removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
@@ -65,12 +65,12 @@
             hide_show_remove_tax_jurisdiction();
         };
 
-        var remove_tax_jurisdiction = function() {
+        const remove_tax_jurisdiction = function() {
             $(this).parent().remove();
             hide_show_remove_tax_jurisdiction();
         };
 
-        var init_add_remove_tax_jurisdiction = function() {
+        const init_add_remove_tax_jurisdiction = function() {
             $('.add_tax_jurisdiction').click(add_tax_jurisdiction);
             $('.remove_tax_jurisdiction').click(remove_tax_jurisdiction);
             hide_show_remove_tax_jurisdiction();
@@ -79,28 +79,22 @@
 
         // Run validator once for all fields
         $.validator.addMethod('check4TaxJurisdictionDups', function(value, element) {
-            var value_count = 0;
+            let value_count = 0;
             $("input[name='jurisdiction_name[]']").each(function() {
                 value_count = $(this).val() == value ? value_count + 1 : value_count;
             });
-            if (value_count > 1) {
-                return false;
-            }
-            return true;
+            return value_count <= 1;
+
         }, "<?= lang('Taxes.tax_jurisdiction_duplicate') ?>");
 
         $.validator.addMethod('validateTaxJurisdictionCharacters', function(value, element) {
-            if ((value.indexOf('_') != -1)) {
-                return false;
-            }
-            return true;
+            return (value.indexOf('_') == -1);
+
         }, "<?= lang('Taxes.tax_jurisdiction_invalid_chars') ?>");
 
         $.validator.addMethod('requireTaxJurisdiction', function(value, element) {
-            if (value.trim() == '') {
-                return false;
-            }
-            return true;
+            return value.trim() != '';
+
         }, "<?= lang('Taxes.tax_jurisdiction_required') ?>");
 
         $('#tax_jurisdictions_form').validate($.extend(form_support.handler, {
diff --git a/cliff.toml b/cliff.toml
new file mode 100644
index 000000000..6e4bbb8ad
--- /dev/null
+++ b/cliff.toml
@@ -0,0 +1,28 @@
+[changelog]
+header = ""
+header_marker = "<!-- git-cliff: end of header -->"
+body = """
+{% if version %}\
+## [{{ version | trim_start_matches(pat='v') }}] - {{ timestamp | date(format='%Y-%m-%d') }}
+{% else %}\
+## [unreleased]
+{% endif %}\
+{% for commit in commits %}- {{ commit.message }} by @{{ commit.author.name }}
+{% endfor %}
+"""
+trim = true
+render_always = true
+footer = ""
+
+[git]
+sort_commits = "oldest"
+conventional_commits = false
+filter_unconventional = false
+ignore_tags = "unstable|master\\."
+commit_preprocessors = [
+  { pattern = "\\n[\\s\\S]*", replace = "" },
+]
+commit_parsers = [
+  { message = "^Translated using Weblate", skip = true },
+  { message = "^Set release version", skip = true },
+]
diff --git a/composer.json b/composer.json
index 296c5b921..f12384fa4 100644
--- a/composer.json
+++ b/composer.json
@@ -2,25 +2,19 @@
     "name": "opensourcepos/opensourcepos",
     "description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
     "license": "MIT",
+    "type": "project",
+    "keywords": [
+        "point-of-sale",
+        "POS"
+    ],
     "authors": [
         {
             "name": "jekkos"
         },
-        {
-            "name": "FrancescoUK"
-        },
         {
             "name": "objecttothis"
-        },
-        {
-            "name": "steveireland"
         }
     ],
-    "type": "project",
-    "keywords": [
-        "point-of-sale",
-        "POS"
-    ],
     "homepage": "https://opensourcepos.org",
     "support": {
         "issues": "https://github.com/opensourcepos/opensourcepos/issues",
@@ -31,12 +25,12 @@
         "matrix": "https://matrix.to/#/#opensourcepos_Lobby:gitter.im"
     },
     "require": {
+        "php": "^8.2",
         "ext-intl": "*",
-        "php": "^8.1",
-        "codeigniter4/framework": "^4.6.3",
-        "dompdf/dompdf": "^2.0.3",
+        "codeigniter4/framework": "4.7.4",
+        "dompdf/dompdf": "^3.1.6",
         "ezyang/htmlpurifier": "^4.17",
-        "laminas/laminas-escaper": "2.17.0",
+        "laminas/laminas-escaper": "2.18.0",
         "paragonie/random_compat": "^2.0.21",
         "picqer/php-barcode-generator": "^2.4.0",
         "tamtamchik/namecase": "^3.0.0"
@@ -56,13 +50,18 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\":  "app/",
+            "App\\": "app/",
             "CodeIgniter\\": "vendor/codeigniter4/framework/system/"
         },
         "exclude-from-classmap": [
             "**/Database/Migrations/**"
         ]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
     "config": {
         "allow-plugins": {
             "phpstan/extension-installer": true
@@ -73,5 +72,8 @@
     },
     "scripts": {
         "test": "phpunit"
+    },
+    "scripts-descriptions": {
+        "test": "Run unit tests"
     }
 }
diff --git a/composer.lock b/composer.lock
index 9817fb506..661a34712 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,40 +4,41 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3fe9e4622879914bfa763b71c236c7fe",
+    "content-hash": "caa6ba9519694ccf54b8a487640e87fd",
     "packages": [
         {
             "name": "codeigniter4/framework",
-            "version": "v4.6.3",
+            "version": "v4.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/codeigniter4/framework.git",
-                "reference": "68d1a5896106f869452dd369a690dd5bc75160fb"
+                "reference": "67ead895b7491703e5e5bc17436778806192008f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/codeigniter4/framework/zipball/68d1a5896106f869452dd369a690dd5bc75160fb",
-                "reference": "68d1a5896106f869452dd369a690dd5bc75160fb",
+                "url": "https://api.github.com/repos/codeigniter4/framework/zipball/67ead895b7491703e5e5bc17436778806192008f",
+                "reference": "67ead895b7491703e5e5bc17436778806192008f",
                 "shasum": ""
             },
             "require": {
                 "ext-intl": "*",
                 "ext-mbstring": "*",
-                "laminas/laminas-escaper": "^2.17",
-                "php": "^8.1",
+                "laminas/laminas-escaper": "^2.18",
+                "php": "^8.2",
                 "psr/log": "^3.0"
             },
             "require-dev": {
                 "codeigniter/coding-standard": "^1.7",
                 "fakerphp/faker": "^1.24",
                 "friendsofphp/php-cs-fixer": "^3.47.1",
-                "kint-php/kint": "^6.0",
+                "kint-php/kint": "^6.1",
                 "mikey179/vfsstream": "^1.6.12",
                 "nexusphp/cs-config": "^3.6",
                 "phpunit/phpunit": "^10.5.16 || ^11.2",
                 "predis/predis": "^3.0"
             },
             "suggest": {
+                "ext-apcu": "If you use Cache class ApcuHandler",
                 "ext-curl": "If you use CURLRequest class",
                 "ext-dom": "If you use TestResponse",
                 "ext-exif": "If you run Image class tests",
@@ -49,7 +50,9 @@
                 "ext-memcached": "If you use Cache class MemcachedHandler with Memcached",
                 "ext-mysqli": "If you use MySQL",
                 "ext-oci8": "If you use Oracle Database",
+                "ext-pcntl": "If you use Signals",
                 "ext-pgsql": "If you use PostgreSQL",
+                "ext-posix": "If you use Signals",
                 "ext-readline": "Improves CLI::input() usability",
                 "ext-redis": "If you use Cache class RedisHandler",
                 "ext-simplexml": "If you format XML",
@@ -78,36 +81,38 @@
                 "slack": "https://codeigniterchat.slack.com",
                 "source": "https://github.com/codeigniter4/CodeIgniter4"
             },
-            "time": "2025-08-02T13:36:13+00:00"
+            "time": "2026-07-07T09:23:35+00:00"
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v2.0.8",
+            "version": "v3.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "c20247574601700e1f7c8dab39310fca1964dc52"
+                "reference": "6d4b4eb8500f7a786da8868ba463a71b725a4005"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c20247574601700e1f7c8dab39310fca1964dc52",
-                "reference": "c20247574601700e1f7c8dab39310fca1964dc52",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/6d4b4eb8500f7a786da8868ba463a71b725a4005",
+                "reference": "6d4b4eb8500f7a786da8868ba463a71b725a4005",
                 "shasum": ""
             },
             "require": {
+                "dompdf/php-font-lib": "^1.0.0",
+                "dompdf/php-svg-lib": "^1.0.0",
                 "ext-dom": "*",
                 "ext-mbstring": "*",
                 "masterminds/html5": "^2.0",
-                "phenx/php-font-lib": ">=0.5.4 <1.0.0",
-                "phenx/php-svg-lib": ">=0.5.2 <1.0.0",
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
+                "ext-gd": "*",
                 "ext-json": "*",
                 "ext-zip": "*",
                 "mockery/mockery": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8 || ^9",
-                "squizlabs/php_codesniffer": "^3.5"
+                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/process": "^4.4 || ^5.4 || ^6.2 || ^7.0"
             },
             "suggest": {
                 "ext-gd": "Needed to process images",
@@ -138,9 +143,100 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v2.0.8"
+                "source": "https://github.com/dompdf/dompdf/tree/v3.1.6"
             },
-            "time": "2024-04-29T13:06:17+00:00"
+            "time": "2026-07-20T12:29:38+00:00"
+        },
+        {
+            "name": "dompdf/php-font-lib",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/php-font-lib.git",
+                "reference": "a6e9a688a2a80016ac080b97be73d3e10c444c9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a6e9a688a2a80016ac080b97be73d3e10c444c9a",
+                "reference": "a6e9a688a2a80016ac080b97be73d3e10c444c9a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11 || ^12"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "FontLib\\": "src/FontLib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "The FontLib Community",
+                    "homepage": "https://github.com/dompdf/php-font-lib/blob/master/AUTHORS.md"
+                }
+            ],
+            "description": "A library to read, parse, export and make subsets of different types of font files.",
+            "homepage": "https://github.com/dompdf/php-font-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-font-lib/issues",
+                "source": "https://github.com/dompdf/php-font-lib/tree/1.0.2"
+            },
+            "time": "2026-01-20T14:10:26+00:00"
+        },
+        {
+            "name": "dompdf/php-svg-lib",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/php-svg-lib.git",
+                "reference": "8259ffb930817e72b1ff1caef5d226501f3dfeb1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8259ffb930817e72b1ff1caef5d226501f3dfeb1",
+                "reference": "8259ffb930817e72b1ff1caef5d226501f3dfeb1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.1 || ^8.0",
+                "sabberworm/php-css-parser": "^8.4 || ^9.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Svg\\": "src/Svg"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "The SvgLib Community",
+                    "homepage": "https://github.com/dompdf/php-svg-lib/blob/master/AUTHORS.md"
+                }
+            ],
+            "description": "A library to read, parse and export to PDF SVG files.",
+            "homepage": "https://github.com/dompdf/php-svg-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-svg-lib/issues",
+                "source": "https://github.com/dompdf/php-svg-lib/tree/1.0.2"
+            },
+            "time": "2026-01-02T16:01:13+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
@@ -205,32 +301,32 @@
         },
         {
             "name": "laminas/laminas-escaper",
-            "version": "2.17.0",
+            "version": "2.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "df1ef9503299a8e3920079a16263b578eaf7c3ba"
+                "reference": "06f211dfffff18d91844c1f55250d5d13c007e18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/df1ef9503299a8e3920079a16263b578eaf7c3ba",
-                "reference": "df1ef9503299a8e3920079a16263b578eaf7c3ba",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/06f211dfffff18d91844c1f55250d5d13c007e18",
+                "reference": "06f211dfffff18d91844c1f55250d5d13c007e18",
                 "shasum": ""
             },
             "require": {
                 "ext-ctype": "*",
                 "ext-mbstring": "*",
-                "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
             },
             "conflict": {
                 "zendframework/zend-escaper": "*"
             },
             "require-dev": {
-                "infection/infection": "^0.29.8",
-                "laminas/laminas-coding-standard": "~3.0.1",
-                "phpunit/phpunit": "^10.5.45",
-                "psalm/plugin-phpunit": "^0.19.2",
-                "vimeo/psalm": "^6.6.2"
+                "infection/infection": "^0.31.0",
+                "laminas/laminas-coding-standard": "~3.1.0",
+                "phpunit/phpunit": "^11.5.42",
+                "psalm/plugin-phpunit": "^0.19.5",
+                "vimeo/psalm": "^6.13.1"
             },
             "type": "library",
             "autoload": {
@@ -262,20 +358,20 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2025-05-06T19:29:36+00:00"
+            "time": "2025-10-14T18:31:13+00:00"
         },
         {
             "name": "masterminds/html5",
-            "version": "2.10.0",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "fcf91eb64359852f00d921887b219479b4f21251"
+                "reference": "fd5018f6815fff903946d0564977b44ce8010e29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251",
-                "reference": "fcf91eb64359852f00d921887b219479b4f21251",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fd5018f6815fff903946d0564977b44ce8010e29",
+                "reference": "fd5018f6815fff903946d0564977b44ce8010e29",
                 "shasum": ""
             },
             "require": {
@@ -283,7 +379,7 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9 || ^10"
             },
             "type": "library",
             "extra": {
@@ -327,9 +423,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.10.0"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.10.1"
             },
-            "time": "2025-07-25T09:04:22+00:00"
+            "time": "2026-06-23T18:43:15+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -385,96 +481,6 @@
             },
             "time": "2022-02-16T17:07:03+00:00"
         },
-        {
-            "name": "phenx/php-font-lib",
-            "version": "0.5.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dompdf/php-font-lib.git",
-                "reference": "a1681e9793040740a405ac5b189275059e2a9863"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863",
-                "reference": "a1681e9793040740a405ac5b189275059e2a9863",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^3 || ^4 || ^5 || ^6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "FontLib\\": "src/FontLib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Ménager",
-                    "email": "fabien.menager@gmail.com"
-                }
-            ],
-            "description": "A library to read, parse, export and make subsets of different types of font files.",
-            "homepage": "https://github.com/PhenX/php-font-lib",
-            "support": {
-                "issues": "https://github.com/dompdf/php-font-lib/issues",
-                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.6"
-            },
-            "time": "2024-01-29T14:45:26+00:00"
-        },
-        {
-            "name": "phenx/php-svg-lib",
-            "version": "0.5.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "46b25da81613a9cf43c83b2a8c2c1bdab27df691"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/46b25da81613a9cf43c83b2a8c2c1bdab27df691",
-                "reference": "46b25da81613a9cf43c83b2a8c2c1bdab27df691",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": "^7.1 || ^8.0",
-                "sabberworm/php-css-parser": "^8.4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Svg\\": "src/Svg"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Ménager",
-                    "email": "fabien.menager@gmail.com"
-                }
-            ],
-            "description": "A library to read, parse and export to PDF SVG files.",
-            "homepage": "https://github.com/PhenX/php-svg-lib",
-            "support": {
-                "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.4"
-            },
-            "time": "2024-04-08T12:52:34+00:00"
-        },
         {
             "name": "picqer/php-barcode-generator",
             "version": "v2.4.2",
@@ -564,25 +570,35 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.9.0",
+            "version": "v9.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
+                "reference": "fd3bf9fb173e0df649bc4e3e0d088a1b2417c08f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
-                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/fd3bf9fb173e0df649bc4e3e0d088a1b2417c08f",
+                "reference": "fd3bf9fb173e0df649bc4e3e0d088a1b2417c08f",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+                "php": "^7.2.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+                "thecodingmachine/safe": "^1.3 || ^2.5 || ^3.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
-                "rawr/cross-data-providers": "^2.0.0"
+                "php-parallel-lint/php-parallel-lint": "1.4.0",
+                "phpstan/extension-installer": "1.4.3",
+                "phpstan/phpstan": "1.12.33 || 2.2.2",
+                "phpstan/phpstan-phpunit": "1.4.2 || 2.0.16",
+                "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.11",
+                "phpunit/phpunit": "8.5.52",
+                "rawr/phpunit-data-provider": "3.3.1",
+                "rector/rector": "1.2.10 || 2.4.6",
+                "rector/type-perfect": "1.0.0 || 2.1.3",
+                "squizlabs/php_codesniffer": "4.0.1",
+                "thecodingmachine/phpstan-safe-rule": "1.2.0 || 1.4.3"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
@@ -590,10 +606,14 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "9.0.x-dev"
+                    "dev-main": "9.5.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Rule/Rule.php",
+                    "src/RuleSet/RuleContainer.php"
+                ],
                 "psr-4": {
                     "Sabberworm\\CSS\\": "src/"
                 }
@@ -624,9 +644,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v9.4.0"
             },
-            "time": "2025-07-11T13:20:48+00:00"
+            "time": "2026-06-18T15:10:53+00:00"
         },
         {
             "name": "tamtamchik/namecase",
@@ -691,6 +711,149 @@
                 "source": "https://github.com/tamtamchik/namecase/tree/3.0.0"
             },
             "time": "2023-01-26T15:07:18+00:00"
+        },
+        {
+            "name": "thecodingmachine/safe",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thecodingmachine/safe.git",
+                "reference": "705683a25bacf0d4860c7dea4d7947bfd09eea19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/705683a25bacf0d4860c7dea4d7947bfd09eea19",
+                "reference": "705683a25bacf0d4860c7dea4d7947bfd09eea19",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpstan/phpstan": "^2",
+                "phpunit/phpunit": "^10",
+                "squizlabs/php_codesniffer": "^3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/special_cases.php",
+                    "generated/apache.php",
+                    "generated/apcu.php",
+                    "generated/array.php",
+                    "generated/bzip2.php",
+                    "generated/calendar.php",
+                    "generated/classobj.php",
+                    "generated/com.php",
+                    "generated/cubrid.php",
+                    "generated/curl.php",
+                    "generated/datetime.php",
+                    "generated/dir.php",
+                    "generated/eio.php",
+                    "generated/errorfunc.php",
+                    "generated/exec.php",
+                    "generated/fileinfo.php",
+                    "generated/filesystem.php",
+                    "generated/filter.php",
+                    "generated/fpm.php",
+                    "generated/ftp.php",
+                    "generated/funchand.php",
+                    "generated/gettext.php",
+                    "generated/gmp.php",
+                    "generated/gnupg.php",
+                    "generated/hash.php",
+                    "generated/ibase.php",
+                    "generated/ibmDb2.php",
+                    "generated/iconv.php",
+                    "generated/image.php",
+                    "generated/imap.php",
+                    "generated/info.php",
+                    "generated/inotify.php",
+                    "generated/json.php",
+                    "generated/ldap.php",
+                    "generated/libxml.php",
+                    "generated/lzf.php",
+                    "generated/mailparse.php",
+                    "generated/mbstring.php",
+                    "generated/misc.php",
+                    "generated/mysql.php",
+                    "generated/mysqli.php",
+                    "generated/network.php",
+                    "generated/oci8.php",
+                    "generated/opcache.php",
+                    "generated/openssl.php",
+                    "generated/outcontrol.php",
+                    "generated/pcntl.php",
+                    "generated/pcre.php",
+                    "generated/pgsql.php",
+                    "generated/posix.php",
+                    "generated/ps.php",
+                    "generated/pspell.php",
+                    "generated/readline.php",
+                    "generated/rnp.php",
+                    "generated/rpminfo.php",
+                    "generated/rrd.php",
+                    "generated/sem.php",
+                    "generated/session.php",
+                    "generated/shmop.php",
+                    "generated/sockets.php",
+                    "generated/sodium.php",
+                    "generated/solr.php",
+                    "generated/spl.php",
+                    "generated/sqlsrv.php",
+                    "generated/ssdeep.php",
+                    "generated/ssh2.php",
+                    "generated/stream.php",
+                    "generated/strings.php",
+                    "generated/swoole.php",
+                    "generated/uodbc.php",
+                    "generated/uopz.php",
+                    "generated/url.php",
+                    "generated/var.php",
+                    "generated/xdiff.php",
+                    "generated/xml.php",
+                    "generated/xmlrpc.php",
+                    "generated/yaml.php",
+                    "generated/yaz.php",
+                    "generated/zip.php",
+                    "generated/zlib.php"
+                ],
+                "classmap": [
+                    "lib/DateTime.php",
+                    "lib/DateTimeImmutable.php",
+                    "lib/Exceptions/",
+                    "generated/Exceptions/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
+            "support": {
+                "issues": "https://github.com/thecodingmachine/safe/issues",
+                "source": "https://github.com/thecodingmachine/safe/tree/v3.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/OskarStark",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/shish",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/silasjoisten",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/staabm",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-02-04T18:08:13+00:00"
         }
     ],
     "packages-dev": [
@@ -760,28 +923,28 @@
         },
         {
             "name": "codeigniter/coding-standard",
-            "version": "v1.8.8",
+            "version": "v1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CodeIgniter/coding-standard.git",
-                "reference": "410526fc1447a04fcdf5441b9c8507668b97b3a7"
+                "reference": "c7d227d3d3d0f2270405c8317c5e8c55f2262956"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CodeIgniter/coding-standard/zipball/410526fc1447a04fcdf5441b9c8507668b97b3a7",
-                "reference": "410526fc1447a04fcdf5441b9c8507668b97b3a7",
+                "url": "https://api.github.com/repos/CodeIgniter/coding-standard/zipball/c7d227d3d3d0f2270405c8317c5e8c55f2262956",
+                "reference": "c7d227d3d3d0f2270405c8317c5e8c55f2262956",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "friendsofphp/php-cs-fixer": "^3.76",
-                "nexusphp/cs-config": "^3.26",
-                "php": "^8.1"
+                "friendsofphp/php-cs-fixer": "^3.94",
+                "nexusphp/cs-config": "^3.28",
+                "php": "^8.2"
             },
             "require-dev": {
-                "nexusphp/tachycardia": "^2.3",
-                "phpstan/phpstan": "^2.0",
-                "phpunit/phpunit": "^10.5 || ^11.2"
+                "nexusphp/tachycardia": "^2.4",
+                "phpstan/phpstan": "^2.1",
+                "phpunit/phpunit": "^11.5 || ^12.5"
             },
             "type": "library",
             "autoload": {
@@ -810,7 +973,7 @@
                 "slack": "https://codeigniterchat.slack.com",
                 "source": "https://github.com/CodeIgniter/coding-standard"
             },
-            "time": "2025-09-27T13:54:11+00:00"
+            "time": "2026-02-17T18:41:24+00:00"
         },
         {
             "name": "composer/pcre",
@@ -1207,16 +1370,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.90.0",
+            "version": "v3.94.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "ad732c2e9299c9743f9c55ae53cc0e7642ab1155"
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ad732c2e9299c9743f9c55ae53cc0e7642ab1155",
-                "reference": "ad732c2e9299c9743f9c55ae53cc0e7642ab1155",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7787ceff91365ba7d623ec410b8f429cdebb4f63",
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63",
                 "shasum": ""
             },
             "require": {
@@ -1233,7 +1396,7 @@
                 "react/event-loop": "^1.5",
                 "react/socket": "^1.16",
                 "react/stream": "^1.4",
-                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0 || ^8.0",
                 "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0 || ^8.0",
                 "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
                 "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
@@ -1247,17 +1410,18 @@
                 "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.7",
-                "infection/infection": "^0.31.0",
-                "justinrainbow/json-schema": "^6.5",
-                "keradus/cli-executor": "^2.2",
+                "facile-it/paraunit": "^1.3.1 || ^2.7.1",
+                "infection/infection": "^0.32.3",
+                "justinrainbow/json-schema": "^6.6.4",
+                "keradus/cli-executor": "^2.3",
                 "mikey179/vfsstream": "^1.6.12",
-                "php-coveralls/php-coveralls": "^2.9",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2 || ^8.0",
-                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2 || ^8.0"
+                "php-coveralls/php-coveralls": "^2.9.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.7",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.7",
+                "phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.51",
+                "symfony/polyfill-php85": "^1.33",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.32 || ^7.4.4 || ^8.0.4",
+                "symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.1"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -1272,7 +1436,7 @@
                     "PhpCsFixer\\": "src/"
                 },
                 "exclude-from-classmap": [
-                    "src/Fixer/Internal/*"
+                    "src/**/Internal/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1298,7 +1462,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.90.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.94.2"
             },
             "funding": [
                 {
@@ -1306,7 +1470,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-11-20T15:15:16+00:00"
+            "time": "2026-02-20T16:13:53+00:00"
         },
         {
             "name": "kint-php/kint",
@@ -1487,33 +1651,30 @@
         },
         {
             "name": "nexusphp/cs-config",
-            "version": "v3.26.4",
+            "version": "v3.28.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/NexusPHP/cs-config.git",
-                "reference": "21cddae9917ec7b98e0b6890540222b658a4bf6e"
+                "reference": "4175b75a053b35dc64f37727df526520efb456f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/NexusPHP/cs-config/zipball/21cddae9917ec7b98e0b6890540222b658a4bf6e",
-                "reference": "21cddae9917ec7b98e0b6890540222b658a4bf6e",
+                "url": "https://api.github.com/repos/NexusPHP/cs-config/zipball/4175b75a053b35dc64f37727df526520efb456f8",
+                "reference": "4175b75a053b35dc64f37727df526520efb456f8",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "friendsofphp/php-cs-fixer": "^3.84",
-                "php": "^8.1"
-            },
-            "conflict": {
-                "liaison/cs-config": "*"
+                "friendsofphp/php-cs-fixer": "^3.94",
+                "php": "^8.2"
             },
             "require-dev": {
-                "nexusphp/tachycardia": "^2.1",
+                "nexusphp/tachycardia": "^2.4",
                 "phpstan/extension-installer": "^1.4",
                 "phpstan/phpstan": "^2.1",
                 "phpstan/phpstan-phpunit": "^2.0",
                 "phpstan/phpstan-strict-rules": "^2.0",
-                "phpunit/phpunit": "^10.5 || ^11.0"
+                "phpunit/phpunit": "^11.5 || ^12.5"
             },
             "type": "library",
             "autoload": {
@@ -1537,20 +1698,20 @@
                 "slack": "https://nexusphp.slack.com",
                 "source": "https://github.com/NexusPHP/cs-config.git"
             },
-            "time": "2025-09-27T13:51:19+00:00"
+            "time": "2026-02-22T12:03:01+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.6.2",
+            "version": "v5.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "3a454ca033b9e06b63282ce19562e892747449bb"
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
-                "reference": "3a454ca033b9e06b63282ce19562e892747449bb",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82",
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82",
                 "shasum": ""
             },
             "require": {
@@ -1593,9 +1754,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0"
             },
-            "time": "2025-10-21T19:32:17+00:00"
+            "time": "2025-12-06T11:56:16+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1717,35 +1878,35 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "11.0.11",
+            "version": "11.0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4"
+                "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4",
-                "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2c1ed04922802c15e1de5d7447b4856de949cf56",
+                "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^5.4.0",
+                "nikic/php-parser": "^5.7.0",
                 "php": ">=8.2",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-text-template": "^4.0.1",
                 "sebastian/code-unit-reverse-lookup": "^4.0.1",
                 "sebastian/complexity": "^4.0.1",
-                "sebastian/environment": "^7.2.0",
+                "sebastian/environment": "^7.2.1",
                 "sebastian/lines-of-code": "^3.0.1",
                 "sebastian/version": "^5.0.2",
-                "theseer/tokenizer": "^1.2.3"
+                "theseer/tokenizer": "^1.3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.5.2"
+                "phpunit/phpunit": "^11.5.46"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -1783,7 +1944,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.11"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.12"
             },
             "funding": [
                 {
@@ -1803,32 +1964,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-27T14:37:49+00:00"
+            "time": "2025-12-24T07:01:01+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "5.1.0",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6"
+                "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6",
-                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2f3a64888c814fc235386b7387dd5b5ed92ad903",
+                "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -1856,15 +2017,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
                 "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-08-27T05:02:59+00:00"
+            "time": "2026-02-02T13:52:54+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -2052,16 +2225,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.44",
+            "version": "11.5.55",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c346885c95423eda3f65d85a194aaa24873cda82"
+                "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c346885c95423eda3f65d85a194aaa24873cda82",
-                "reference": "c346885c95423eda3f65d85a194aaa24873cda82",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/adc7262fccc12de2b30f12a8aa0b33775d814f00",
+                "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00",
                 "shasum": ""
             },
             "require": {
@@ -2075,19 +2248,20 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.11",
-                "phpunit/php-file-iterator": "^5.1.0",
+                "phpunit/php-code-coverage": "^11.0.12",
+                "phpunit/php-file-iterator": "^5.1.1",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
                 "sebastian/code-unit": "^3.0.3",
-                "sebastian/comparator": "^6.3.2",
+                "sebastian/comparator": "^6.3.3",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.1",
                 "sebastian/exporter": "^6.3.2",
                 "sebastian/global-state": "^7.0.2",
                 "sebastian/object-enumerator": "^6.0.1",
+                "sebastian/recursion-context": "^6.0.3",
                 "sebastian/type": "^5.1.3",
                 "sebastian/version": "^5.0.2",
                 "staabm/side-effects-detector": "^1.0.5"
@@ -2133,7 +2307,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.44"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.55"
             },
             "funding": [
                 {
@@ -2157,7 +2331,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-13T07:17:35+00:00"
+            "time": "2026-02-18T12:37:06+00:00"
         },
         {
             "name": "predis/predis",
@@ -2398,16 +2572,16 @@
         },
         {
             "name": "react/child-process",
-            "version": "v0.6.6",
+            "version": "v0.6.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/child-process.git",
-                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
+                "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
-                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/970f0e71945556422ee4570ccbabaedc3cf04ad3",
+                "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3",
                 "shasum": ""
             },
             "require": {
@@ -2461,7 +2635,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/child-process/issues",
-                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.7"
             },
             "funding": [
                 {
@@ -2469,7 +2643,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2025-01-01T16:37:48+00:00"
+            "time": "2025-12-23T15:25:20+00:00"
         },
         {
             "name": "react/dns",
@@ -3022,16 +3196,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.3.2",
+            "version": "6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8"
+                "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85c77556683e6eee4323e4c5468641ca0237e2e8",
-                "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2c95e1e86cb8dd41beb8d502057d1081ccc8eca9",
+                "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9",
                 "shasum": ""
             },
             "require": {
@@ -3090,7 +3264,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.2"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.3"
             },
             "funding": [
                 {
@@ -3110,7 +3284,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-10T08:07:46+00:00"
+            "time": "2026-01-24T09:26:40+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -3890,16 +4064,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.6",
+            "version": "v7.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c28ad91448f86c5f6d9d2c70f0cf68bf135f252a"
+                "reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c28ad91448f86c5f6d9d2c70f0cf68bf135f252a",
-                "reference": "c28ad91448f86c5f6d9d2c70f0cf68bf135f252a",
+                "url": "https://api.github.com/repos/symfony/console/zipball/e1e6770440fb9c9b0cf725f81d1361ad1835329d",
+                "reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d",
                 "shasum": ""
             },
             "require": {
@@ -3907,7 +4081,7 @@
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^7.2"
+                "symfony/string": "^7.2|^8.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<6.4",
@@ -3921,16 +4095,16 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/process": "^6.4|^7.0",
-                "symfony/stopwatch": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0"
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/lock": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -3964,7 +4138,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.6"
+                "source": "https://github.com/symfony/console/tree/v7.4.7"
             },
             "funding": [
                 {
@@ -3984,7 +4158,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-04T01:21:42+00:00"
+            "time": "2026-03-06T14:06:20+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -4055,16 +4229,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.3.3",
+            "version": "v7.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
+                "reference": "dc2c0eba1af673e736bb851d747d266108aea746"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
-                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dc2c0eba1af673e736bb851d747d266108aea746",
+                "reference": "dc2c0eba1af673e736bb851d747d266108aea746",
                 "shasum": ""
             },
             "require": {
@@ -4081,13 +4255,14 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/error-handler": "^6.4|^7.0",
-                "symfony/expression-language": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/framework-bundle": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^6.4|^7.0"
+                "symfony/stopwatch": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4115,7 +4290,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.4"
             },
             "funding": [
                 {
@@ -4135,7 +4310,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T11:49:31+00:00"
+            "time": "2026-01-05T11:45:34+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -4215,16 +4390,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.3.6",
+            "version": "v7.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "e9bcfd7837928ab656276fe00464092cc9e1826a"
+                "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e9bcfd7837928ab656276fe00464092cc9e1826a",
-                "reference": "e9bcfd7837928ab656276fe00464092cc9e1826a",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3ebc794fa5315e59fd122561623c2e2e4280538e",
+                "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e",
                 "shasum": ""
             },
             "require": {
@@ -4233,7 +4408,7 @@
                 "symfony/polyfill-mbstring": "~1.8"
             },
             "require-dev": {
-                "symfony/process": "^6.4|^7.0"
+                "symfony/process": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4261,7 +4436,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.3.6"
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.6"
             },
             "funding": [
                 {
@@ -4281,27 +4456,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-05T09:52:27+00:00"
+            "time": "2026-02-25T16:50:00+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.5",
+            "version": "v7.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "9f696d2f1e340484b4683f7853b273abff94421f"
+                "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9f696d2f1e340484b4683f7853b273abff94421f",
-                "reference": "9f696d2f1e340484b4683f7853b273abff94421f",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/8655bf1076b7a3a346cb11413ffdabff50c7ffcf",
+                "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.4|^7.0"
+                "symfony/filesystem": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4329,7 +4504,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.5"
+                "source": "https://github.com/symfony/finder/tree/v7.4.6"
             },
             "funding": [
                 {
@@ -4349,20 +4524,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-10-15T18:45:57+00:00"
+            "time": "2026-01-29T09:40:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.3.3",
+            "version": "v7.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d"
+                "reference": "b38026df55197f9e39a44f3215788edf83187b80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
-                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b38026df55197f9e39a44f3215788edf83187b80",
+                "reference": "b38026df55197f9e39a44f3215788edf83187b80",
                 "shasum": ""
             },
             "require": {
@@ -4400,7 +4575,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.3.3"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.4.0"
             },
             "funding": [
                 {
@@ -4420,7 +4595,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-05T10:16:07+00:00"
+            "time": "2025-11-12T15:39:26+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -5003,16 +5178,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.3.4",
+            "version": "v7.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b"
+                "reference": "608476f4604102976d687c483ac63a79ba18cc97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f24f8f316367b30810810d4eb30c543d7003ff3b",
-                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b",
+                "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97",
+                "reference": "608476f4604102976d687c483ac63a79ba18cc97",
                 "shasum": ""
             },
             "require": {
@@ -5044,7 +5219,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.3.4"
+                "source": "https://github.com/symfony/process/tree/v7.4.5"
             },
             "funding": [
                 {
@@ -5064,7 +5239,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:12:26+00:00"
+            "time": "2026-01-26T15:07:59+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -5155,16 +5330,16 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v7.3.0",
+            "version": "v7.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd"
+                "reference": "8a24af0a2e8a872fb745047180649b8418303084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
-                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8a24af0a2e8a872fb745047180649b8418303084",
+                "reference": "8a24af0a2e8a872fb745047180649b8418303084",
                 "shasum": ""
             },
             "require": {
@@ -5197,7 +5372,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.3.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.4.0"
             },
             "funding": [
                 {
@@ -5208,31 +5383,36 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-24T10:49:57+00:00"
+            "time": "2025-08-04T07:05:15+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.3.4",
+            "version": "v7.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f96476035142921000338bad71e5247fbc138872"
+                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f96476035142921000338bad71e5247fbc138872",
-                "reference": "f96476035142921000338bad71e5247fbc138872",
+                "url": "https://api.github.com/repos/symfony/string/zipball/9f209231affa85aa930a5e46e6eb03381424b30b",
+                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.33",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
@@ -5240,11 +5420,11 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/emoji": "^7.1",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/intl": "^6.4|^7.0",
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.4|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5283,7 +5463,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.4"
+                "source": "https://github.com/symfony/string/tree/v7.4.6"
             },
             "funding": [
                 {
@@ -5303,7 +5483,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T14:36:48+00:00"
+            "time": "2026-02-09T09:33:46+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -5358,13 +5538,13 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "ext-intl": "*",
-        "php": "^8.1"
+        "php": "^8.2",
+        "ext-intl": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.9.0"
 }
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 47f7ef996..3b0a2f2c6 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -20,7 +20,6 @@ services:
         networks:
             - app_net
         volumes:
-            - ./app/Database/database.sql:/docker-entrypoint-initdb.d/database.sql
             - mysql:/var/lib/mysql:rw
         environment:
             - MYSQL_ROOT_PASSWORD=pointofsale
@@ -47,6 +46,7 @@ services:
             - .:/app
         environment:
             - CI_ENVIRONMENT=development
+            - ALLOWED_HOSTNAMES=localhost
             - MYSQL_USERNAME=admin
             - MYSQL_PASSWORD=pointofsale
             - MYSQL_DB_NAME=ospos
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
deleted file mode 100644
index 4ff0e18fe..000000000
--- a/docker-compose.test.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-include:
-    - docker/docker-mysql.yml
-
-services:
-    test:
-        build:
-            context: .
-            target: ospos_test
-        depends_on:
-            - mysql
-        container_name: ospos_test
-        environment:
-            - CI_ENVIRONMENT=testing
-            - ENCRYPTION_KEY=
-            - MYSQL_HOST_NAME=mysql
-            - MYSQL_DATABASE=ospos
-            - MYSQL_USERNAME=admin
-            - MYSQL_PASSWORD=pointofsale
-        command: [ "/bin/wait-for-it.sh", "mysql:3306", "--", "/app/vendor/bin/phpunit", "/app/tests" ]
-        ports:
-            - "80:80"
diff --git a/docker-compose.yml b/docker-compose.yml
index 2622a5906..fd221cf67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,9 +2,6 @@ include:
     - docker/docker-mysql.yml
 
 services:
-    sqlscript:
-        image: jekkos/opensourcepos:sql-master
-        command: /bin/sh -c 'exit 0'
     ospos:
         image: jekkos/opensourcepos:master
         restart: always
@@ -14,11 +11,24 @@ services:
             - "80:80"
         networks:
             - app_net
+        command: ["sh", "-c", "php spark env:provision && exec apache2-foreground"]
         volumes:
+            # .env holds the two runtime-generated secrets (encryption.key +
+            # throttle.key), persisted as a single host file so the same keys
+            # survive container recreation (a named volume is a directory and
+            # forces .env to be a directory, breaking atomicWriteFile's rename).
+            # create_host_path is explicitly false so a missing host file fails
+            # startup instead of being auto-created as a directory (see INSTALL.md).
+            - type: bind
+              source: ./.env
+              target: /app/.env
+              bind:
+                  create_host_path: false
             - uploads:/app/public/uploads
             - logs:/app/writable/logs
         environment:
             - CI_ENVIRONMENT=production
+            - ALLOWED_HOSTNAMES=localhost
             - FORCE_HTTPS=false
             - PHP_TIMEZONE=UTC
             - MYSQL_USERNAME=admin
diff --git a/docker/docker-mysql.yml b/docker/docker-mysql.yml
index d3e9cf347..69171c645 100644
--- a/docker/docker-mysql.yml
+++ b/docker/docker-mysql.yml
@@ -19,8 +19,6 @@ services:
           - "3306"
         networks:
           - app_net
-        volumes_from:
-          - sqlscript
         volumes:
           - mysql:/var/lib/mysql:rw
         environment:
diff --git a/gulpfile.js b/gulpfile.js
index e234778dc..78b28464d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,8 +20,8 @@ import { Stream } from 'readable-stream'
 const {finished, pipeline} = Stream.promises
 
 
-var prod0js;
-var prod1js;
+let prod0js;
+let prod1js;
 
 // Clear and remove the resources folder
 gulp.task('clean', function () {
@@ -39,57 +39,69 @@ gulp.task('compress', function() {
 
 
 gulp.task('update-licenses', function() {
-    run('composer licenses --format=json --no-dev > public/license/composer.LICENSES').exec();
-    run('npx license-report --only=prod --output=json --fields=name --fields=author --fields=homepage --fields=installedVersion --fields=licenseType > public/license/npm-prod.LICENSES').exec();
-    run('npx license-report --only=dev --output=json --fields=name --fields=author --fields=homepage --fields=installedVersion --fields=licenseType > public/license/npm-dev.LICENSES').exec();
-    return pipeline(gulp.src('LICENSE'),gulp.dest('public/license'));
+    function run_completion(execStream) {
+        return finished(execStream.resume());
+    }
+
+    return Promise.all([
+        run_completion(run('composer licenses --format=json --no-dev > public/license/composer.LICENSES').exec()),
+        run_completion(run('npx license-report --only=prod --output=json --fields=name --fields=author --fields=homepage --fields=installedVersion --fields=licenseType > public/license/npm-prod.LICENSES').exec()),
+        run_completion(run('npx license-report --only=dev --output=json --fields=name --fields=author --fields=homepage --fields=installedVersion --fields=licenseType > public/license/npm-dev.LICENSES').exec()),
+        pipeline(gulp.src('LICENSE'),gulp.dest('public/license'))
+    ]);
 });
 
 
 // Copy the bootswatch styles into their own folder so OSPOS can select one from the collection
 gulp.task('copy-bootswatch', function() {
-    pipeline(gulp.src('./node_modules/bootswatch/cerulean/*.min.css'),gulp.dest('public/resources/bootswatch/cerulean'));
-    pipeline(gulp.src('./node_modules/bootswatch/cosmo/*.min.css'),gulp.dest('public/resources/bootswatch/cosmo'));
-    pipeline(gulp.src('./node_modules/bootswatch/cyborg/*.min.css'),gulp.dest('public/resources/bootswatch/cyborg'));
-    pipeline(gulp.src('./node_modules/bootswatch/darkly/*.min.css'),gulp.dest('public/resources/bootswatch/darkly'));
-    pipeline(gulp.src('./node_modules/bootswatch/flatly/*.min.css'),gulp.dest('public/resources/bootswatch/flatly'));
-    pipeline(gulp.src('./node_modules/bootswatch/journal/*.min.css'),gulp.dest('public/resources/bootswatch/journal'));
-    pipeline(gulp.src('./node_modules/bootswatch/lumen/*.min.css'),gulp.dest('public/resources/bootswatch/lumen'));
-    pipeline(gulp.src('./node_modules/bootswatch/paper/*.min.css'),gulp.dest('public/resources/bootswatch/paper'));
-    pipeline(gulp.src('./node_modules/bootswatch/readable/*.min.css'),gulp.dest('public/resources/bootswatch/readable'));
-    pipeline(gulp.src('./node_modules/bootswatch/sandstone/*.min.css'),gulp.dest('public/resources/bootswatch/sandstone'));
-    pipeline(gulp.src('./node_modules/bootswatch/simplex/*.min.css'),gulp.dest('public/resources/bootswatch/simplex'));
-    pipeline(gulp.src('./node_modules/bootswatch/slate/*.min.css'),gulp.dest('public/resources/bootswatch/slate'));
-    pipeline(gulp.src('./node_modules/bootswatch/spacelab/*.min.css'),gulp.dest('public/resources/bootswatch/spacelab'));
-    pipeline(gulp.src('./node_modules/bootswatch/superhero/*.min.css'),gulp.dest('public/resources/bootswatch/superhero'));
-    pipeline(gulp.src('./node_modules/bootswatch/united/*.min.css'),gulp.dest('public/resources/bootswatch/united'));
-    pipeline(gulp.src('./node_modules/bootswatch/yeti/*.min.css'),gulp.dest('public/resources/bootswatch/yeti'));
-    return pipeline(gulp.src('./node_modules/bootswatch/fonts/*.*', {encoding:false}),gulp.dest('public/resources/bootswatch/fonts'));
+    return Promise.all([
+        pipeline(gulp.src('./node_modules/bootswatch/cerulean/*.min.css'),gulp.dest('public/resources/bootswatch/cerulean')),
+        pipeline(gulp.src('./node_modules/bootswatch/cosmo/*.min.css'),gulp.dest('public/resources/bootswatch/cosmo')),
+        pipeline(gulp.src('./node_modules/bootswatch/cyborg/*.min.css'),gulp.dest('public/resources/bootswatch/cyborg')),
+        pipeline(gulp.src('./node_modules/bootswatch/darkly/*.min.css'),gulp.dest('public/resources/bootswatch/darkly')),
+        pipeline(gulp.src('./node_modules/bootswatch/flatly/*.min.css'),gulp.dest('public/resources/bootswatch/flatly')),
+        pipeline(gulp.src('./node_modules/bootswatch/journal/*.min.css'),gulp.dest('public/resources/bootswatch/journal')),
+        pipeline(gulp.src('./node_modules/bootswatch/lumen/*.min.css'),gulp.dest('public/resources/bootswatch/lumen')),
+        pipeline(gulp.src('./node_modules/bootswatch/paper/*.min.css'),gulp.dest('public/resources/bootswatch/paper')),
+        pipeline(gulp.src('./node_modules/bootswatch/readable/*.min.css'),gulp.dest('public/resources/bootswatch/readable')),
+        pipeline(gulp.src('./node_modules/bootswatch/sandstone/*.min.css'),gulp.dest('public/resources/bootswatch/sandstone')),
+        pipeline(gulp.src('./node_modules/bootswatch/simplex/*.min.css'),gulp.dest('public/resources/bootswatch/simplex')),
+        pipeline(gulp.src('./node_modules/bootswatch/slate/*.min.css'),gulp.dest('public/resources/bootswatch/slate')),
+        pipeline(gulp.src('./node_modules/bootswatch/spacelab/*.min.css'),gulp.dest('public/resources/bootswatch/spacelab')),
+        pipeline(gulp.src('./node_modules/bootswatch/superhero/*.min.css'),gulp.dest('public/resources/bootswatch/superhero')),
+        pipeline(gulp.src('./node_modules/bootswatch/united/*.min.css'),gulp.dest('public/resources/bootswatch/united')),
+        pipeline(gulp.src('./node_modules/bootswatch/yeti/*.min.css'),gulp.dest('public/resources/bootswatch/yeti')),
+        pipeline(gulp.src('./node_modules/bootswatch/fonts/*.*', {encoding:false}),gulp.dest('public/resources/bootswatch/fonts'))
+    ]);
 });
 
 // Copy the bootswatch styles into their own folder so OSPOS can select one from the collection
 gulp.task('copy-bootswatch5', function() {
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/cerulean/*.min.css'),gulp.dest('public/resources/bootswatch5/cerulean'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/cosmo/*.min.css'),gulp.dest('public/resources/bootswatch5/cosmo'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/cyborg/*.min.css'),gulp.dest('public/resources/bootswatch5/cyborg'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/darkly/*.min.css'),gulp.dest('public/resources/bootswatch5/darkly'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/flatly/*.min.css'),gulp.dest('public/resources/bootswatch5/flatly'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/journal/*.min.css'),gulp.dest('public/resources/bootswatch5/journal'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/lumen/*.min.css'),gulp.dest('public/resources/bootswatch5/lumen'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/sandstone/*.min.css'),gulp.dest('public/resources/bootswatch5/sandstone'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/simplex/*.min.css'),gulp.dest('public/resources/bootswatch5/simplex'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/slate/*.min.css'),gulp.dest('public/resources/bootswatch5/slate'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/spacelab/*.min.css'),gulp.dest('public/resources/bootswatch5/spacelab'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/superhero/*.min.css'),gulp.dest('public/resources/bootswatch5/superhero'));
-    pipeline(gulp.src('./node_modules/bootswatch5/dist/united/*.min.css'),gulp.dest('public/resources/bootswatch5/united'));
-    return pipeline(gulp.src('./node_modules/bootswatch5/dist/yeti/*.min.css'),gulp.dest('public/resources/bootswatch5/yeti'));
+    return Promise.all([
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/cerulean/*.min.css'),gulp.dest('public/resources/bootswatch5/cerulean')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/cosmo/*.min.css'),gulp.dest('public/resources/bootswatch5/cosmo')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/cyborg/*.min.css'),gulp.dest('public/resources/bootswatch5/cyborg')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/darkly/*.min.css'),gulp.dest('public/resources/bootswatch5/darkly')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/flatly/*.min.css'),gulp.dest('public/resources/bootswatch5/flatly')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/journal/*.min.css'),gulp.dest('public/resources/bootswatch5/journal')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/lumen/*.min.css'),gulp.dest('public/resources/bootswatch5/lumen')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/sandstone/*.min.css'),gulp.dest('public/resources/bootswatch5/sandstone')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/simplex/*.min.css'),gulp.dest('public/resources/bootswatch5/simplex')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/slate/*.min.css'),gulp.dest('public/resources/bootswatch5/slate')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/spacelab/*.min.css'),gulp.dest('public/resources/bootswatch5/spacelab')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/superhero/*.min.css'),gulp.dest('public/resources/bootswatch5/superhero')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/united/*.min.css'),gulp.dest('public/resources/bootswatch5/united')),
+        pipeline(gulp.src('./node_modules/bootswatch5/dist/yeti/*.min.css'),gulp.dest('public/resources/bootswatch5/yeti'))
+    ]);
 });
 
 // Copy the bootstrap style into its own folder so OSPOS can select it from the collection
 gulp.task('copy-bootstrap', function() {
-    pipeline(gulp.src('./node_modules/bootstrap/dist/css/bootstrap.min.css*'),gulp.dest('public/resources/bootswatch/bootstrap'));
-    pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.min.css*'),gulp.dest('public/resources/bootswatch5/bootstrap'));
-    return pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.rtl.min.css*'),gulp.dest('public/resources/bootswatch5/bootstrap'));
+    return Promise.all([
+        pipeline(gulp.src('./node_modules/bootstrap/dist/css/bootstrap.min.css*'),gulp.dest('public/resources/bootswatch/bootstrap')),
+        pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.min.css*'),gulp.dest('public/resources/bootswatch5/bootstrap')),
+        pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.rtl.min.css*'),gulp.dest('public/resources/bootswatch5/bootstrap'))
+    ]);
 });
 
 // /public/resources/ospos - contains the minimized files to be packed into opensourcepos.min.[css/js]
@@ -102,7 +114,7 @@ gulp.task('copy-bootstrap', function() {
 
 
 gulp.task('debug-js', function() {
-    var debugjs = gulp.src(['./node_modules/jquery/dist/jquery.js',
+    const debugjs = gulp.src(['./node_modules/jquery/dist/jquery.js',
         './node_modules/jquery-form/src/jquery.form.js',
         './node_modules/jquery-validation/dist/jquery.validate.js',
         './node_modules/jquery-ui-dist/jquery-ui.js',
@@ -123,6 +135,7 @@ gulp.task('debug-js', function() {
         './node_modules/jspdf/dist/jspdf.umd.js',
         './node_modules/dompurify/dist/purify.js',
         './node_modules/jspdf-autotable/dist/jspdf.plugin.autotable.js',
+        './node_modules/xlsx/dist/xlsx.full.min.js',
         './node_modules/tableexport.jquery.plugin/tableExport.min.js',
         './node_modules/chartist/dist/chartist.js',
         './node_modules/chartist-plugin-pointlabels/dist/chartist-plugin-pointlabels.js',
@@ -141,9 +154,9 @@ gulp.task('debug-js', function() {
 
 gulp.task('prod-js', function() {
 
-    var prod0js = gulp.src('./node_modules/jquery/dist/jquery.min.js').pipe(rev()).pipe(gulp.dest('public/resources'));
+    const prod0js = gulp.src('./node_modules/jquery/dist/jquery.min.js').pipe(rev()).pipe(gulp.dest('public/resources'));
 
-    var opensourcepos1js = gulp.src(['./node_modules/bootstrap/dist/js/bootstrap.min.js',
+    const opensourcepos1js = gulp.src(['./node_modules/bootstrap/dist/js/bootstrap.min.js',
         './node_modules/bootstrap-table/dist/bootstrap-table.min.js',
         './node_modules/moment/min/moment.min.js',
         './node_modules/jquery-ui-dist/jquery-ui.min.js',
@@ -172,15 +185,16 @@ gulp.task('prod-js', function() {
         './node_modules/chartist-plugin-axistitle/dist/chartist-plugin-axistitle.min.js',
         './node_modules/chartist-plugin-tooltips/dist/chartist-plugin-tooltip.min.js',
         './node_modules/chartist-plugin-barlabels/dist/chartist-plugin-barlabels.min.js',
+        './node_modules/xlsx/dist/xlsx.full.min.js',
         './node_modules/tableexport.jquery.plugin/tableExport.min.js'], { allowEmpty: true });
 
-    var opensourcepos2js = gulp.src(['./node_modules/bootstrap-daterangepicker/daterangepicker.js',
+    const opensourcepos2js = gulp.src(['./node_modules/bootstrap-daterangepicker/daterangepicker.js',
         './public/js/imgpreview.full.jquery.js',
         './public/js/manage_tables.js',
         './public/js/nominatim.autocomplete.js']).pipe(uglify());
 
 
-    var prod1js = series(opensourcepos1js, opensourcepos2js).pipe(concat('opensourcepos.min.js'))
+    const prod1js = series(opensourcepos1js, opensourcepos2js).pipe(concat('opensourcepos.min.js'))
         .pipe(rev())
         .pipe(gulp.dest('./public/resources/'));
 
@@ -190,9 +204,25 @@ gulp.task('prod-js', function() {
 });
 
 
+// Inject jQuery into login.php (debug mode) - reuse the jQuery file already created by debug-js
+gulp.task('debug-login-js', function() {
+    // Match only core jQuery (jquery-HASH.js), exclude jquery plugins (jquery-HASH.form.js, etc) and jquery-ui (jquery-ui-HASH.js)
+    // Pattern: jquery-[hash].js where hash is alphanumeric - core jQuery only
+    const loginDebugJs = gulp.src(['./public/resources/js/jquery-*.js', '!./public/resources/js/jquery-*.form.js', '!./public/resources/js/jquery-*.validate.js', '!./public/resources/js/jquery-ui-*.js']);
+    return gulp.src('./app/Views/login.php').pipe(inject(loginDebugJs, {addRootSlash: false, ignorePath: '/public/', starttag: '<!-- inject:login:debug:js -->'})).pipe(gulp.dest('./app/Views'));
+});
+
+// Inject jQuery into login.php (production mode) - reuse the jQuery file already created by prod-js
+gulp.task('prod-login-js', function() {
+    // jQuery prod file is already in resources/jquery-*.min.js from prod-js task
+    const loginProdJs = gulp.src('./public/resources/jquery-*.min.js');
+    return gulp.src('./app/Views/login.php').pipe(inject(loginProdJs, {addRootSlash: false, ignorePath: '/public/', starttag: '<!-- inject:login:prod:js -->'})).pipe(gulp.dest('./app/Views'));
+});
+
+
 
 gulp.task('debug-css', function() {
-    var debugcss = gulp.src(['./node_modules/jquery-ui-dist/jquery-ui.css',
+    const debugcss = gulp.src(['./node_modules/jquery-ui-dist/jquery-ui.css',
         './node_modules/bootstrap3-dialog/dist/css/bootstrap-dialog.css',
         './node_modules/jasny-bootstrap/dist/css/jasny-bootstrap.css',
         './node_modules/bootstrap-datetime-picker/css/bootstrap-datetimepicker.css',
@@ -218,23 +248,23 @@ gulp.task('debug-css', function() {
 
 
 gulp.task('prod-css', function() {
-    var opensourcepos1css = gulp.src(['./node_modules/jquery-ui-dist/jquery-ui.min.css',
+    const opensourcepos1css = gulp.src(['./node_modules/jquery-ui-dist/jquery-ui.min.css',
         './node_modules/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css',
         './node_modules/jasny-bootstrap/dist/css/jasny-bootstrap.min.css',
         './node_modules/bootstrap-datetime-picker/css/bootstrap-datetimepicker.min.css']);
 
-    var opensourcepos2css = gulp.src(['./node_modules/bootstrap-daterangepicker/daterangepicker.css',
+    const opensourcepos2css = gulp.src(['./node_modules/bootstrap-daterangepicker/daterangepicker.css',
         './node_modules/bootstrap-tagsinput-2021/src/bootstrap-tagsinput.css']).pipe(cleanCSS({compatibility: 'ie8'}));
 
-    var opensourcepos3css = gulp.src(['./node_modules/bootstrap-select/dist/css/bootstrap-select.min.css',
+    const opensourcepos3css = gulp.src(['./node_modules/bootstrap-select/dist/css/bootstrap-select.min.css',
         './node_modules/bootstrap-table/dist/bootstrap-table.min.css',
         './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.min.css',
         './node_modules/bootstrap-toggle/css/bootstrap-toggle.min.css',
         './node_modules/chartist/dist/chartist.min.css']);
 
-    var opensourcepos4css = gulp.src('./node_modules/chartist-plugin-tooltips/dist/chartist-plugin-tooltip.css').pipe(cleanCSS({compatibility: 'ie8'}));
+    const opensourcepos4css = gulp.src('./node_modules/chartist-plugin-tooltips/dist/chartist-plugin-tooltip.css').pipe(cleanCSS({compatibility: 'ie8'}));
 
-    var opensourcepos5css = gulp.src(['./node_modules/chartist-plugin-tooltips/dist/chartist-plugin-tooltip.css',
+    const opensourcepos5css = gulp.src(['./node_modules/chartist-plugin-tooltips/dist/chartist-plugin-tooltip.css',
         './public/css/bootstrap.autocomplete.css',
         './public/css/invoice.css',
         './public/css/ospos.css',
@@ -245,7 +275,7 @@ gulp.task('prod-css', function() {
         './public/css/reports.css'
     ]).pipe(cleanCSS({compatibility: 'ie8'}));
 
-    var prodcss = series(opensourcepos1css, opensourcepos2css, opensourcepos3css, opensourcepos4css, opensourcepos5css)
+    const prodcss = series(opensourcepos1css, opensourcepos2css, opensourcepos3css, opensourcepos4css, opensourcepos5css)
         .pipe(concat('opensourcepos.min.css')).pipe(rev()).pipe(gulp.dest('public/resources'));
 
 
@@ -259,46 +289,43 @@ gulp.task('copy-fonts', function() {
 
 
 gulp.task('copy-menubar', function() {
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/star.svg"),rename("attributes.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/bookshelf.svg"),rename("cashups.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/gear.svg"),rename("config.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/contacts.svg"),rename("customers.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/profle.svg"),rename("employees.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/compose.svg"),rename("expenses.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/clipboard.svg"),rename("expenses_categories.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/heart.svg"),rename("giftcards.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/door.svg"),rename("home.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/stack.svg"),rename("item_kits.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/shop.svg"),rename("items.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/smartphone.svg"),rename("messages.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/tools.svg"),rename("migrate.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/door.svg"),rename("office.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/dolly.svg"),rename("receivings.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/bar-chart.svg"),rename("reports.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/cart.svg"),rename("sales.svg"),gulp.dest("public/images/menubar"));
-    pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/briefcase.svg"),rename("suppliers.svg"),gulp.dest("public/images/menubar"));
-    return pipeline(gulp.src('./node_modules/elegant-circles/svg/full-color/money.svg'),rename("taxes.svg"),gulp.dest("public/images/menubar"));
+    return Promise.all([
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/star.svg"),rename("attributes.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/bookshelf.svg"),rename("cashups.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/gear.svg"),rename("config.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/contacts.svg"),rename("customers.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/profle.svg"),rename("employees.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/compose.svg"),rename("expenses.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/clipboard.svg"),rename("expenses_categories.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/heart.svg"),rename("giftcards.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/door.svg"),rename("home.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/stack.svg"),rename("item_kits.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/shop.svg"),rename("items.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/smartphone.svg"),rename("messages.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/tools.svg"),rename("migrate.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/door.svg"),rename("office.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/dolly.svg"),rename("receivings.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/bar-chart.svg"),rename("reports.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/cart.svg"),rename("sales.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src("./node_modules/elegant-circles/svg/full-color/briefcase.svg"),rename("suppliers.svg"),gulp.dest("public/images/menubar")),
+        pipeline(gulp.src('./node_modules/elegant-circles/svg/full-color/money.svg'),rename("taxes.svg"),gulp.dest("public/images/menubar"))
+    ]);
 });
 
 
-gulp.task('build-database', function() {
-    return gulp.src(['./app/Database/tables.sql','./app/Database/constraints.sql'])
-        .pipe(header('-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --'))
-        .pipe(concat('database.sql'))
-        .pipe(gulp.dest('./app/Database'));
-});
-
 // Run all required tasks
 gulp.task('default',
     gulp.series('clean',
+        'update-licenses',
         'copy-bootswatch',
         'copy-bootswatch5',
         'copy-bootstrap',
         'debug-js',
         'prod-js',
+        'debug-login-js',
+        'prod-login-js',
         'debug-css',
         'prod-css',
         'copy-fonts',
-        'copy-menubar',
-        'build-database'
+        'copy-menubar'
     ));
diff --git a/package-lock.json b/package-lock.json
index debfcf84e..acb1b5fff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@opensourcepos/opensourcepos",
-    "version": "3.4.2",
+    "version": "3.4.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@opensourcepos/opensourcepos",
-            "version": "3.4.2",
+            "version": "3.4.3",
             "license": "MIT",
             "dependencies": {
                 "bootstrap": "^3.4.1",
@@ -18,9 +18,9 @@
                 "bootstrap-tagsinput-2021": "^0.8.6",
                 "bootstrap-toggle": "^2.2.2",
                 "bootstrap3-dialog": "github:nakupanda/bootstrap3-dialog#master",
-                "bootstrap5": "npm:bootstrap@^5.3.5",
+                "bootstrap5": "npm:bootstrap@^5.3.8",
                 "bootswatch": "^3.4.1",
-                "bootswatch5": "npm:bootswatch@^5.3.5",
+                "bootswatch5": "npm:bootswatch@^5.3.8",
                 "chartist": "^0.11.4",
                 "chartist-plugin-axistitle": "^0.0.7",
                 "chartist-plugin-barlabels": "^0.0.5",
@@ -28,7 +28,7 @@
                 "chartist-plugin-tooltips": "^0.0.17",
                 "clipboard": "^2.0.11",
                 "coffeescript": "^2.7.0",
-                "dompurify": "^3.3.2",
+                "dompurify": "^3.4.16",
                 "elegant-circles": "github:opensourcepos/elegant-circles#minified",
                 "es6-promise": "^4.2.8",
                 "file-saver": "^2.0.5",
@@ -38,29 +38,32 @@
                 "jquery-form": "^4.3.0",
                 "jquery-ui-dist": "^1.12.1",
                 "jquery-validation": "^1.19.5",
-                "jspdf": "^4.2.0",
+                "jspdf": "^4.2.1",
                 "jspdf-autotable": "^5.0.7",
-                "tableexport.jquery.plugin": "^1.30.0"
+                "tableexport.jquery.plugin": "^1.33.0"
             },
             "devDependencies": {
-                "gulp": "^5.0.0",
+                "gulp": "^5.0.1",
                 "gulp-clean": "^0.4.0",
                 "gulp-clean-css": "^4.3.0",
                 "gulp-concat": "^2.6.1",
                 "gulp-debug": "^5.0.1",
                 "gulp-gzip": "^1.4.2",
-                "gulp-header": "^2.0.9",
+                "gulp-header": "^2.0.12",
                 "gulp-inject": "^5.0.5",
-                "gulp-rename": "^2.0.0",
-                "gulp-rev": "^10.0.0",
+                "gulp-rename": "^2.1.0",
+                "gulp-rev": "^12.0.0",
                 "gulp-run": "^1.7.1",
-                "gulp-tar": "^4.0.0",
+                "gulp-tar": "^5.0.0",
                 "gulp-uglify": "^3.0.2",
                 "gulp-zip": "^6.1.0",
-                "license-report": "^6.7.2",
-                "npm-check-updates": "^17.1.14",
+                "license-report": "^6.8.2",
+                "npm-check-updates": "^22.1.1",
                 "readable-stream": "^4.4.2",
                 "stream-series": "^0.1.1"
+            },
+            "engines": {
+                "node": ">=20"
             }
         },
         "node_modules/@babel/runtime": {
@@ -77,6 +80,7 @@
             "resolved": "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz",
             "integrity": "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10.13.0"
             }
@@ -86,6 +90,7 @@
             "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz",
             "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-negated-glob": "^1.0.0"
             },
@@ -93,6 +98,78 @@
                 "node": ">=10.13.0"
             }
         },
+        "node_modules/@isaacs/cliui": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^5.1.2",
+                "string-width-cjs": "npm:string-width@^4.2.0",
+                "strip-ansi": "^7.0.1",
+                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+                "wrap-ansi": "^8.1.0",
+                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+            "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@isaacs/cliui/node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+            "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.2.2"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
         "node_modules/@kessler/tableify": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/@kessler/tableify/-/tableify-1.0.2.tgz",
@@ -100,6 +177,24 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@keyv/serialize": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+            "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@pkgjs/parseargs": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=14"
+            }
+        },
         "node_modules/@popperjs/core": {
             "version": "2.11.8",
             "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -118,9 +213,9 @@
             "license": "MIT"
         },
         "node_modules/@sindresorhus/is": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.0.1.tgz",
-            "integrity": "sha512-QWLl2P+rsCJeofkDNIT3WFmb6NrRud1SUYW8dIhXK/46XFV8Q/g7Bsvib0Askb0reRLe+WYPeeE+l5cH7SlkuQ==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.2.0.tgz",
+            "integrity": "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -138,17 +233,14 @@
                 "tslib": "^2.4.0"
             }
         },
-        "node_modules/@szmarczak/http-timer": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
-            "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
+        "node_modules/@types/archiver": {
+            "version": "6.0.4",
+            "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-6.0.4.tgz",
+            "integrity": "sha512-ULdQpARQ3sz9WH4nb98mJDYA0ft2A8C4f4fovvUcFwINa1cgGjY36JCAYuP5YypRq4mco1lJp1/7jEMS2oR0Hg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "defer-to-connect": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=14.16"
+                "@types/readdir-glob": "*"
             }
         },
         "node_modules/@types/expect": {
@@ -158,9 +250,9 @@
             "dev": true
         },
         "node_modules/@types/http-cache-semantics": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-            "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+            "integrity": "sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==",
             "dev": true,
             "license": "MIT"
         },
@@ -185,6 +277,16 @@
             "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==",
             "optional": true
         },
+        "node_modules/@types/readdir-glob": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.5.tgz",
+            "integrity": "sha512-raiuEPUYqXu+nvtY2Pe8s8FEmZ3x5yAH4VkLdihcPdalvsHltomrRC9BzuStrJ9yk06470hS0Crw0f1pXqD+Hg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
         "node_modules/@types/trusted-types": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -214,14 +316,6 @@
                 "node": ">=6.5"
             }
         },
-        "node_modules/adler-32": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
-            "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
         "node_modules/ansi-colors": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -319,97 +413,54 @@
             }
         },
         "node_modules/archiver": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/archiver/-/archiver-6.0.2.tgz",
-            "integrity": "sha512-UQ/2nW7NMl1G+1UnrLypQw1VdT9XZg/ECcKPq7l+STzStrSivFIXIp34D8M5zeNGW5NoOupdYCHv6VySCPNNlw==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+            "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "archiver-utils": "^4.0.1",
+                "archiver-utils": "^5.0.2",
                 "async": "^3.2.4",
-                "buffer-crc32": "^0.2.1",
-                "readable-stream": "^3.6.0",
+                "buffer-crc32": "^1.0.0",
+                "readable-stream": "^4.0.0",
                 "readdir-glob": "^1.1.2",
                 "tar-stream": "^3.0.0",
-                "zip-stream": "^5.0.1"
+                "zip-stream": "^6.0.1"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">= 14"
             }
         },
         "node_modules/archiver-utils": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-4.0.1.tgz",
-            "integrity": "sha512-Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg==",
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+            "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "glob": "^8.0.0",
+                "glob": "^10.0.0",
                 "graceful-fs": "^4.2.0",
+                "is-stream": "^2.0.1",
                 "lazystream": "^1.0.0",
                 "lodash": "^4.17.15",
                 "normalize-path": "^3.0.0",
-                "readable-stream": "^3.6.0"
+                "readable-stream": "^4.0.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">= 14"
             }
         },
-        "node_modules/archiver-utils/node_modules/glob": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+        "node_modules/archiver-utils/node_modules/is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
             "dev": true,
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^5.0.1",
-                "once": "^1.3.0"
-            },
+            "license": "MIT",
             "engines": {
-                "node": ">=12"
+                "node": ">=8"
             },
             "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/archiver-utils/node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/archiver-utils/node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-            "dev": true,
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/archiver/node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-            "dev": true,
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/arr-diff": {
@@ -478,6 +529,7 @@
             "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
             "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -511,10 +563,11 @@
             }
         },
         "node_modules/async": {
-            "version": "3.2.5",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-            "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
-            "dev": true
+            "version": "3.2.6",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+            "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/async-done": {
             "version": "2.0.0",
@@ -557,10 +610,19 @@
             }
         },
         "node_modules/b4a": {
-            "version": "1.6.6",
-            "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
-            "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
-            "dev": true
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.1.tgz",
+            "integrity": "sha512-aiqre1Nr0B/6DgE2N5vwTc+2/oQZ4Wh1t4NznYY4E00y8LCt6NqdRv81so00oo27D8MVKTpUa/MwUUtBLXCoDw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "peerDependencies": {
+                "react-native-b4a": "*"
+            },
+            "peerDependenciesMeta": {
+                "react-native-b4a": {
+                    "optional": true
+                }
+            }
         },
         "node_modules/bach": {
             "version": "2.0.1",
@@ -583,11 +645,101 @@
             "dev": true
         },
         "node_modules/bare-events": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.2.tgz",
-            "integrity": "sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==",
+            "version": "2.8.2",
+            "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
+            "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
             "dev": true,
-            "optional": true
+            "license": "Apache-2.0",
+            "peerDependencies": {
+                "bare-abort-controller": "*"
+            },
+            "peerDependenciesMeta": {
+                "bare-abort-controller": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/bare-fs": {
+            "version": "4.7.1",
+            "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.7.1.tgz",
+            "integrity": "sha512-WDRsyVN52eAx/lBamKD6uyw8H4228h/x0sGGGegOamM2cd7Pag88GfMQalobXI+HaEUxpCkbKQUDOQqt9wawRw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "bare-events": "^2.5.4",
+                "bare-path": "^3.0.0",
+                "bare-stream": "^2.6.4",
+                "bare-url": "^2.2.2",
+                "fast-fifo": "^1.3.2"
+            },
+            "engines": {
+                "bare": ">=1.16.0"
+            },
+            "peerDependencies": {
+                "bare-buffer": "*"
+            },
+            "peerDependenciesMeta": {
+                "bare-buffer": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/bare-os": {
+            "version": "3.9.1",
+            "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.9.1.tgz",
+            "integrity": "sha512-6M5XjcnsygQNPMCMPXSK379xrJFiZ/AEMNBmFEmQW8d/789VQATvriyi5r0HYTL9TkQ26rn3kgdTG3aisbrXkQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "bare": ">=1.14.0"
+            }
+        },
+        "node_modules/bare-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
+            "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "bare-os": "^3.0.1"
+            }
+        },
+        "node_modules/bare-stream": {
+            "version": "2.13.1",
+            "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.13.1.tgz",
+            "integrity": "sha512-Vp0cnjYyrEC4whYTymQ+YZi6pBpfiICZO3cfRG8sy67ZNWe951urv1x4eW1BKNngw3U+3fPYb5JQvHbCtxH7Ow==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "streamx": "^2.25.0",
+                "teex": "^1.0.1"
+            },
+            "peerDependencies": {
+                "bare-abort-controller": "*",
+                "bare-buffer": "*",
+                "bare-events": "*"
+            },
+            "peerDependenciesMeta": {
+                "bare-abort-controller": {
+                    "optional": true
+                },
+                "bare-buffer": {
+                    "optional": true
+                },
+                "bare-events": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/bare-url": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.2.tgz",
+            "integrity": "sha512-/9a2j4ac6ckpmAHvod/ob7x439OAHst/drc2Clnq+reRYd/ovddwcF4LfoxHyNk5AuGBnPg+HqFjmE/Zpq6v0A==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "bare-path": "^3.0.0"
+            }
         },
         "node_modules/base64-arraybuffer": {
             "version": "1.0.2",
@@ -643,6 +795,7 @@
             "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
             "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "buffer": "^6.0.3",
                 "inherits": "^2.0.4",
@@ -654,6 +807,7 @@
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
             "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "inherits": "^2.0.3",
                 "string_decoder": "^1.1.1",
@@ -724,9 +878,9 @@
         },
         "node_modules/bootstrap5": {
             "name": "bootstrap",
-            "version": "5.3.5",
-            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.5.tgz",
-            "integrity": "sha512-ct1CHKtiobRimyGzmsSldEtM03E8fcEX4Tb3dGXz1V8faRwM50+vfHwTzOxB3IlKO7m+9vTH3s/3C6T2EAPeTA==",
+            "version": "5.3.8",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz",
+            "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==",
             "funding": [
                 {
                     "type": "github",
@@ -752,15 +906,15 @@
         },
         "node_modules/bootswatch5": {
             "name": "bootswatch",
-            "version": "5.3.5",
-            "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.3.5.tgz",
-            "integrity": "sha512-1z8LNoUL5NHmv/hNROALQ6qtjw9OJIjMgP8ovBlIft+oI15b/mvnzxGL896iO9LtoDZH0Vdm+D2YW+j03GduSg==",
+            "version": "5.3.8",
+            "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.3.8.tgz",
+            "integrity": "sha512-88mnH9tv+x6DV+scBxYFOpM4YSDVhyfEgbhqaEfvkHNctKI9qRcACxIP9nmBZ5mSeLXtsgax1VsRkUs1eWjlAQ==",
             "license": "MIT"
         },
         "node_modules/brace-expansion": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
+            "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -812,12 +966,26 @@
             }
         },
         "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+            "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": "*"
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/byte-counter": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/byte-counter/-/byte-counter-0.1.0.tgz",
+            "integrity": "sha512-jheRLVMeUKrDBjVw2O5+k4EvR4t9wtxHL+bo/LxfkxsVeuGMy3a5SEGgXdAFA4FSzTrU8rQXQIrsZ3oBq5a0pQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/bytes": {
@@ -840,19 +1008,19 @@
             }
         },
         "node_modules/cacheable-request": {
-            "version": "12.0.1",
-            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-12.0.1.tgz",
-            "integrity": "sha512-Yo9wGIQUaAfIbk+qY0X4cDQgCosecfBe3V9NSyeY4qPC2SAkbCS4Xj79VP8WOzitpJUZKc/wsRCYF5ariDIwkg==",
+            "version": "13.0.18",
+            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-13.0.18.tgz",
+            "integrity": "sha512-rFWadDRKJs3s2eYdXlGggnBZKG7MTblkFBB0YllFds+UYnfogDp2wcR6JN97FhRkHTvq59n2vhNoHNZn29dh/Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@types/http-cache-semantics": "^4.0.4",
                 "get-stream": "^9.0.1",
-                "http-cache-semantics": "^4.1.1",
-                "keyv": "^4.5.4",
+                "http-cache-semantics": "^4.2.0",
+                "keyv": "^5.5.5",
                 "mimic-response": "^4.0.0",
-                "normalize-url": "^8.0.1",
-                "responselike": "^3.0.0"
+                "normalize-url": "^8.1.1",
+                "responselike": "^4.0.2"
             },
             "engines": {
                 "node": ">=18"
@@ -902,18 +1070,6 @@
             "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
             "optional": true
         },
-        "node_modules/cfb": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
-            "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
-            "dependencies": {
-                "adler-32": "~1.3.0",
-                "crc-32": "~1.2.0"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
         "node_modules/chalk": {
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
@@ -926,6 +1082,13 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
+        "node_modules/change-case": {
+            "version": "5.4.4",
+            "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
+            "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/chartist": {
             "version": "0.11.4",
             "resolved": "https://registry.npmjs.org/chartist/-/chartist-0.11.4.tgz",
@@ -1017,6 +1180,7 @@
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
             "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "string-width": "^4.2.0",
                 "strip-ansi": "^6.0.0",
@@ -1028,6 +1192,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -1037,6 +1202,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -1052,6 +1218,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -1064,6 +1231,7 @@
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
@@ -1140,14 +1308,6 @@
                 "safe-buffer": "~5.1.0"
             }
         },
-        "node_modules/codepage": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
-            "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
         "node_modules/coffeescript": {
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz",
@@ -1165,6 +1325,7 @@
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-name": "~1.1.4"
             },
@@ -1176,7 +1337,8 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/color-support": {
             "version": "1.1.3",
@@ -1188,32 +1350,33 @@
             }
         },
         "node_modules/compress-commons": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-5.0.3.tgz",
-            "integrity": "sha512-/UIcLWvwAQyVibgpQDPtfNM3SvqN7G9elAPAV7GM0L53EbNWwWiCsWtK8Fwed/APEbptPHXs5PuW+y8Bq8lFTA==",
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+            "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "crc-32": "^1.2.0",
-                "crc32-stream": "^5.0.0",
+                "crc32-stream": "^6.0.0",
+                "is-stream": "^2.0.1",
                 "normalize-path": "^3.0.0",
-                "readable-stream": "^3.6.0"
+                "readable-stream": "^4.0.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">= 14"
             }
         },
-        "node_modules/compress-commons/node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+        "node_modules/compress-commons/node_modules/is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
             "dev": true,
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
+            "license": "MIT",
             "engines": {
-                "node": ">= 6"
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/concat-map": {
@@ -1235,13 +1398,15 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
             "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/copy-props": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz",
             "integrity": "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "each-props": "^3.0.0",
                 "is-plain-object": "^5.0.0"
@@ -1271,6 +1436,7 @@
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
             "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+            "dev": true,
             "bin": {
                 "crc32": "bin/crc32.njs"
             },
@@ -1279,30 +1445,32 @@
             }
         },
         "node_modules/crc32-stream": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-5.0.1.tgz",
-            "integrity": "sha512-lO1dFui+CEUh/ztYIpgpKItKW9Bb4NWakCRJrnqAbFIYD+OZAwb2VfD5T5eXMw2FNcsDHkQcNl/Wh3iVXYwU6g==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+            "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "crc-32": "^1.2.0",
-                "readable-stream": "^3.4.0"
+                "readable-stream": "^4.0.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">= 14"
             }
         },
-        "node_modules/crc32-stream/node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">= 8"
             }
         },
         "node_modules/crypto-js": {
@@ -1329,9 +1497,9 @@
             }
         },
         "node_modules/debug": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1347,29 +1515,16 @@
             }
         },
         "node_modules/decompress-response": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-10.0.0.tgz",
+            "integrity": "sha512-oj7KWToJuuxlPr7VV0vabvxEIiqNMo+q0NueIiL3XhtwC6FVOX7Hr1c0C4eD0bmf7Zr+S/dSf2xvkH3Ad6sU3Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "mimic-response": "^3.1.0"
+                "mimic-response": "^4.0.0"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/decompress-response/node_modules/mimic-response": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-            "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
+                "node": ">=20"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -1421,16 +1576,6 @@
                 "node": ">=4.0.0"
             }
         },
-        "node_modules/defer-to-connect": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-            "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/define-data-property": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
@@ -1473,6 +1618,7 @@
             "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
             "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1483,13 +1629,10 @@
             "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q=="
         },
         "node_modules/dompurify": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz",
-            "integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==",
+            "version": "3.4.16",
+            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.16.tgz",
+            "integrity": "sha512-sqo+pNp3qRhCIpbgRi1y8Tgk27Bo2Ry7w0dC1NBeNTdZChWjz9Xb/KOoZbRP/R6pQZ80Qw8YhXw13hWWBbMRnQ==",
             "license": "(MPL-2.0 OR Apache-2.0)",
-            "engines": {
-                "node": ">=20"
-            },
             "optionalDependencies": {
                 "@types/trusted-types": "^2.0.7"
             }
@@ -1536,6 +1679,7 @@
             "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz",
             "integrity": "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-plain-object": "^5.0.0",
                 "object.defaults": "^1.1.0"
@@ -1544,6 +1688,13 @@
                 "node": ">= 10.13.0"
             }
         },
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/easy-transform-stream": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/easy-transform-stream/-/easy-transform-stream-1.0.1.tgz",
@@ -1565,7 +1716,8 @@
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/end-of-stream": {
             "version": "1.4.4",
@@ -1635,10 +1787,11 @@
             "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
         },
         "node_modules/escalade": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -1670,11 +1823,22 @@
                 "node": ">=0.8.x"
             }
         },
+        "node_modules/events-universal": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
+            "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "bare-events": "^2.7.0"
+            }
+        },
         "node_modules/expand-tilde": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
             "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "homedir-polyfill": "^1.0.1"
             },
@@ -1686,7 +1850,8 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
             "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/extend-shallow": {
             "version": "3.0.2",
@@ -1758,18 +1923,19 @@
             }
         },
         "node_modules/fastq": {
-            "version": "1.17.1",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+            "version": "1.20.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+            "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "reusify": "^1.0.4"
             }
         },
         "node_modules/fflate": {
-            "version": "0.8.2",
-            "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
-            "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
+            "version": "0.8.3",
+            "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz",
+            "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==",
             "license": "MIT"
         },
         "node_modules/file-saver": {
@@ -1789,11 +1955,25 @@
                 "node": ">=8"
             }
         },
+        "node_modules/find-up-simple": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz",
+            "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/findup-sync": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
             "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "detect-file": "^1.0.0",
                 "is-glob": "^4.0.3",
@@ -1809,6 +1989,7 @@
             "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz",
             "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.2",
                 "is-plain-object": "^5.0.0",
@@ -1837,6 +2018,7 @@
             "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz",
             "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10.13.0"
             }
@@ -1886,29 +2068,39 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/foreground-child": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+            "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "cross-spawn": "^7.0.6",
+                "signal-exit": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/form-data-encoder": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-4.0.2.tgz",
-            "integrity": "sha512-KQVhvhK8ZkWzxKxOr56CPulAhH3dobtuQ4+hNQ+HekH/Wp5gSOafqRAeTphQUJAIk0GBvHZgJ2ZGRWd5kphMuw==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-4.1.0.tgz",
+            "integrity": "sha512-G6NsmEW15s0Uw9XnCg+33H3ViYRyiM0hMrMhhqQOR8NFc5GhYrI+6I3u7OTw7b91J2g8rtvMBZJDbcGb2YUniw==",
             "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 18"
             }
         },
-        "node_modules/frac": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
-            "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
         "node_modules/fs-mkdirp-stream": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz",
             "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "graceful-fs": "^4.2.8",
                 "streamx": "^2.12.0"
@@ -1929,6 +2121,7 @@
             "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "dev": true,
             "hasInstallScript": true,
+            "license": "MIT",
             "optional": true,
             "os": [
                 "darwin"
@@ -1958,10 +2151,24 @@
             "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
             "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
             "dev": true,
+            "license": "ISC",
             "engines": {
                 "node": "6.* || 8.* || >= 10.*"
             }
         },
+        "node_modules/get-east-asian-width": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz",
+            "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/get-intrinsic": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -1992,16 +2199,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/get-stdin": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-            "integrity": "sha512-jZV7n6jGE3Gt7fgSTJoz91Ak5MuTLwMwkoYdjxuJ/AmjIsE1UC03y/IWkZCQGEvVNS9qoRNwy5BCqxImv0FVeA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.12.0"
-            }
-        },
         "node_modules/get-stream": {
             "version": "9.0.1",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
@@ -2019,6 +2216,28 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/glob": {
+            "version": "10.5.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+            "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^3.1.2",
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^1.11.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/glob-parent": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -2032,10 +2251,11 @@
             }
         },
         "node_modules/glob-stream": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.2.tgz",
-            "integrity": "sha512-R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==",
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.3.tgz",
+            "integrity": "sha512-fqZVj22LtFJkHODT+M4N1RJQ3TjnnQhfE9GwZI8qXscYarnhpip70poMldRnP8ipQ/w0B621kOhfc53/J9bd/A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@gulpjs/to-absolute-glob": "^4.0.0",
                 "anymatch": "^3.1.3",
@@ -2055,6 +2275,7 @@
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
             "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "is-glob": "^4.0.3"
             },
@@ -2080,6 +2301,7 @@
             "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
             "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "global-prefix": "^1.0.1",
                 "is-windows": "^1.0.1",
@@ -2094,6 +2316,7 @@
             "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
             "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.2",
                 "homedir-polyfill": "^1.0.1",
@@ -2110,6 +2333,7 @@
             "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
             "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -2149,22 +2373,23 @@
             }
         },
         "node_modules/got": {
-            "version": "14.4.7",
-            "resolved": "https://registry.npmjs.org/got/-/got-14.4.7.tgz",
-            "integrity": "sha512-DI8zV1231tqiGzOiOzQWDhsBmncFW7oQDH6Zgy6pDPrqJuVZMtoSgPLLsBZQj8Jg4JFfwoOsDA8NGtLQLnIx2g==",
+            "version": "14.6.6",
+            "resolved": "https://registry.npmjs.org/got/-/got-14.6.6.tgz",
+            "integrity": "sha512-QLV1qeYSo5l13mQzWgP/y0LbMr5Plr5fJilgAIwgnwseproEbtNym8xpLsDzeZ6MWXgNE6kdWGBjdh3zT/Qerg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@sindresorhus/is": "^7.0.1",
-                "@szmarczak/http-timer": "^5.0.1",
+                "byte-counter": "^0.1.0",
                 "cacheable-lookup": "^7.0.0",
-                "cacheable-request": "^12.0.1",
-                "decompress-response": "^6.0.0",
+                "cacheable-request": "^13.0.12",
+                "decompress-response": "^10.0.0",
                 "form-data-encoder": "^4.0.2",
                 "http2-wrapper": "^2.2.1",
+                "keyv": "^5.5.3",
                 "lowercase-keys": "^3.0.0",
                 "p-cancelable": "^4.0.1",
-                "responselike": "^3.0.0",
+                "responselike": "^4.0.2",
                 "type-fest": "^4.26.1"
             },
             "engines": {
@@ -2178,7 +2403,8 @@
             "version": "4.2.11",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
             "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/group-array": {
             "version": "1.0.0",
@@ -2228,15 +2454,16 @@
             }
         },
         "node_modules/gulp": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.0.tgz",
-            "integrity": "sha512-S8Z8066SSileaYw1S2N1I64IUc/myI2bqe2ihOBzO6+nKpvNSg7ZcWJt/AwF8LC/NVN+/QZ560Cb/5OPsyhkhg==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz",
+            "integrity": "sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "glob-watcher": "^6.0.0",
-                "gulp-cli": "^3.0.0",
+                "gulp-cli": "^3.1.0",
                 "undertaker": "^2.0.0",
-                "vinyl-fs": "^4.0.0"
+                "vinyl-fs": "^4.0.2"
             },
             "bin": {
                 "gulp": "bin/gulp.js"
@@ -2321,17 +2548,18 @@
             }
         },
         "node_modules/gulp-cli": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz",
-            "integrity": "sha512-RtMIitkT8DEMZZygHK2vEuLPqLPAFB4sntSxg4NoDta7ciwGZ18l7JuhCTiS5deOJi2IoK0btE+hs6R4sfj7AA==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.1.0.tgz",
+            "integrity": "sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@gulpjs/messages": "^1.1.0",
                 "chalk": "^4.1.2",
                 "copy-props": "^4.0.0",
                 "gulplog": "^2.2.0",
                 "interpret": "^3.1.1",
-                "liftoff": "^5.0.0",
+                "liftoff": "^5.0.1",
                 "mute-stdout": "^2.0.0",
                 "replace-homedir": "^2.0.0",
                 "semver-greatest-satisfied-range": "^2.0.0",
@@ -2351,6 +2579,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -2366,6 +2595,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -2382,6 +2612,7 @@
             "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz",
             "integrity": "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "sparkles": "^2.1.0"
             },
@@ -2394,6 +2625,7 @@
             "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz",
             "integrity": "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "glogg": "^2.2.0"
             },
@@ -2406,6 +2638,7 @@
             "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz",
             "integrity": "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10.13.0"
             }
@@ -2493,15 +2726,41 @@
             }
         },
         "node_modules/gulp-header": {
-            "version": "2.0.9",
-            "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.9.tgz",
-            "integrity": "sha512-LMGiBx+qH8giwrOuuZXSGvswcIUh0OiioNkUpLhNyvaC6/Ga8X6cfAeme2L5PqsbXMhL8o8b/OmVqIQdxprhcQ==",
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.12.tgz",
+            "integrity": "sha512-7PFW56tRISOroZ3N5R+f1Bn4wvdtE5LZXfZqz4ubEAXLEsLS7kSifgsk/lF26hSqnYO786GniQCxCuLxQZ0SoA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "concat-with-sourcemaps": "^1.1.0",
-                "lodash.template": "^4.5.0",
-                "map-stream": "0.0.7",
-                "through2": "^2.0.0"
+                "lodash": "^4.17.21",
+                "map-stream": "^0.0.7",
+                "through2": "^4.0.2"
+            }
+        },
+        "node_modules/gulp-header/node_modules/readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/gulp-header/node_modules/through2": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+            "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readable-stream": "3"
             }
         },
         "node_modules/gulp-inject": {
@@ -2610,31 +2869,32 @@
             }
         },
         "node_modules/gulp-rename": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
-            "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.1.0.tgz",
+            "integrity": "sha512-dGuzuH8jQGqCMqC544IEPhs5+O2l+IkdoSZsgd4kY97M1CxQeI3qrmweQBIrxLBbjbe/8uEWK8HHcNBc3OCy4g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
         },
         "node_modules/gulp-rev": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/gulp-rev/-/gulp-rev-10.0.0.tgz",
-            "integrity": "sha512-5mP6oOGp1DUzBQuiy9IrtyAWHWUOz2n1qLUHfo7LU0p111t7sTkUhKW01b70B2MsDWgScTdz6sGLg76KCbqclw==",
+            "version": "12.0.0",
+            "resolved": "https://registry.npmjs.org/gulp-rev/-/gulp-rev-12.0.0.tgz",
+            "integrity": "sha512-MU3IASTTx+XZQrmz5WdhoflA2AIir815b/ItpRBFWkIP8kWSInU1IFRSvdX36AvIDRxR9izFqod/PXdjSw7tXw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "easy-transform-stream": "^1.0.0",
+                "gulp-plugin-extras": "^1.1.0",
                 "modify-filename": "^2.0.0",
-                "plugin-error": "^2.0.1",
-                "rev-hash": "^4.0.0",
+                "rev-hash": "^4.1.0",
                 "rev-path": "^3.0.0",
-                "sort-keys": "^5.0.0",
-                "vinyl": "^3.0.0",
+                "sort-keys": "^6.0.0",
+                "vinyl": "^3.0.1",
                 "vinyl-file": "^5.0.0"
             },
             "engines": {
-                "node": ">=16"
+                "node": ">=20"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -2648,16 +2908,22 @@
                 }
             }
         },
-        "node_modules/gulp-rev/node_modules/plugin-error": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
-            "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
+        "node_modules/gulp-rev/node_modules/gulp-plugin-extras": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/gulp-plugin-extras/-/gulp-plugin-extras-1.1.0.tgz",
+            "integrity": "sha512-T0AXOEVoKYzLIBlwEZ7LtAx2w4ExIozIoxVeYEVLFbdxI7i0sWvFDq0F8mm47djixDF3vAqDPoyGwh3Sg/PWtQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "ansi-colors": "^1.0.1"
+                "@types/vinyl": "^2.0.12",
+                "chalk": "^5.3.0",
+                "easy-transform-stream": "^1.0.1"
             },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/gulp-rev/node_modules/replace-ext": {
@@ -2665,18 +2931,19 @@
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
             "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/gulp-rev/node_modules/vinyl": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-            "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+            "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "clone": "^2.1.2",
-                "clone-stats": "^1.0.0",
                 "remove-trailing-separator": "^1.1.0",
                 "replace-ext": "^2.0.0",
                 "teex": "^1.0.1"
@@ -2729,17 +2996,19 @@
             }
         },
         "node_modules/gulp-tar": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/gulp-tar/-/gulp-tar-4.0.0.tgz",
-            "integrity": "sha512-lvBYoWV+I+0DVmjylWw/TZtHdQAQ9cVaqQ+u/fWcB8Hth3k4BKAT5EpLBoJiiU77ZXZmEgdPWzJ9KZmCuVCyFA==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/gulp-tar/-/gulp-tar-5.0.0.tgz",
+            "integrity": "sha512-XZhI9R8mRvqW01mnzj5ob4DS/PcJCordBAdIXh3JZ5pGOt/CAf3K1NLM63Ic0pKpIttQHznk6k7UO0O4NxIfKQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "archiver": "^6.0.1",
-                "gulp-plugin-extras": "^0.3.0",
-                "vinyl": "^3.0.0"
+                "@types/archiver": "^6.0.3",
+                "archiver": "^7.0.1",
+                "gulp-plugin-extras": "^1.1.0",
+                "vinyl": "^3.0.1"
             },
             "engines": {
-                "node": ">=18"
+                "node": ">=20"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -2753,23 +3022,42 @@
                 }
             }
         },
+        "node_modules/gulp-tar/node_modules/gulp-plugin-extras": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/gulp-plugin-extras/-/gulp-plugin-extras-1.1.0.tgz",
+            "integrity": "sha512-T0AXOEVoKYzLIBlwEZ7LtAx2w4ExIozIoxVeYEVLFbdxI7i0sWvFDq0F8mm47djixDF3vAqDPoyGwh3Sg/PWtQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/vinyl": "^2.0.12",
+                "chalk": "^5.3.0",
+                "easy-transform-stream": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/gulp-tar/node_modules/replace-ext": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
             "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/gulp-tar/node_modules/vinyl": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-            "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+            "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "clone": "^2.1.2",
-                "clone-stats": "^1.0.0",
                 "remove-trailing-separator": "^1.1.0",
                 "replace-ext": "^2.0.0",
                 "teex": "^1.0.1"
@@ -3043,6 +3331,7 @@
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
             "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -3122,6 +3411,7 @@
             "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
             "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "parse-passwd": "^1.0.0"
             },
@@ -3142,9 +3432,9 @@
             }
         },
         "node_modules/http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+            "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
             "dev": true,
             "license": "BSD-2-Clause"
         },
@@ -3234,6 +3524,7 @@
             "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
             "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10.13.0"
             }
@@ -3258,6 +3549,7 @@
             "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
             "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-relative": "^1.0.0",
                 "is-windows": "^1.0.1"
@@ -3346,12 +3638,16 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.13.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-            "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+            "version": "2.16.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "hasown": "^2.0.0"
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -3409,6 +3705,7 @@
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -3441,6 +3738,7 @@
             "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
             "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3485,6 +3783,7 @@
             "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
             "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=12"
             },
@@ -3497,6 +3796,7 @@
             "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
             "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3533,6 +3833,7 @@
             "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
             "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-unc-path": "^1.0.0"
             },
@@ -3611,6 +3912,7 @@
             "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
             "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "unc-path-regex": "^0.1.2"
             },
@@ -3629,6 +3931,7 @@
             "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
             "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3664,6 +3967,7 @@
             "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
             "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3678,7 +3982,8 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/isobject": {
             "version": "3.0.1",
@@ -3689,6 +3994,22 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/jackspeak": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            },
+            "optionalDependencies": {
+                "@pkgjs/parseargs": "^0.11.0"
+            }
+        },
         "node_modules/jasny-bootstrap": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/jasny-bootstrap/-/jasny-bootstrap-3.1.3.tgz",
@@ -3723,17 +4044,10 @@
                 "jquery": "^1.7 || ^2.0 || ^3.1"
             }
         },
-        "node_modules/json-buffer": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/jspdf": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.2.0.tgz",
-            "integrity": "sha512-hR/hnRevAXXlrjeqU5oahOE+Ln9ORJUB5brLHHqH67A+RBQZuFr5GkbI9XQI8OUFSEezKegsi45QRpc4bGj75Q==",
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.2.1.tgz",
+            "integrity": "sha512-YyAXyvnmjTbR4bHQRLzex3CuINCDlQnBqoSYyjJwTP2x9jDLuKDzy7aKUl0hgx3uhcl7xzg32agn5vlie6HIlQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.28.6",
@@ -3757,13 +4071,13 @@
             }
         },
         "node_modules/keyv": {
-            "version": "4.5.4",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-            "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+            "version": "5.6.0",
+            "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+            "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "json-buffer": "3.0.1"
+                "@keyv/serialize": "^1.1.1"
             }
         },
         "node_modules/last-run": {
@@ -3780,6 +4094,7 @@
             "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
             "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "readable-stream": "^2.0.5"
             },
@@ -3792,6 +4107,7 @@
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
             "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.3",
@@ -3806,13 +4122,15 @@
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
             "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/lazystream/node_modules/string_decoder": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
             "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "safe-buffer": "~5.1.0"
             }
@@ -3822,24 +4140,27 @@
             "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz",
             "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10.13.0"
             }
         },
         "node_modules/license-report": {
-            "version": "6.7.2",
-            "resolved": "https://registry.npmjs.org/license-report/-/license-report-6.7.2.tgz",
-            "integrity": "sha512-DWWy7Hmm266CAtx9T+rPNnBwqLNT/Gddc6nToMERQTrsp/caQjrS8PEOl/ymiER24rk12GDLqJqri73mBQj0dg==",
+            "version": "6.8.2",
+            "resolved": "https://registry.npmjs.org/license-report/-/license-report-6.8.2.tgz",
+            "integrity": "sha512-eWzJujDhPm5bKTrolTBt8mvL6YW3c5SY1kpqnt7GmTLU01rOtzjqe3sevOQLF2dPY7dV+VnSZIWV774Cgqz/Eg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@kessler/tableify": "^1.0.2",
-                "debug": "^4.4.0",
+                "debug": "^4.4.3",
                 "eol": "^0.10.0",
-                "got": "^14.4.6",
+                "find-up-simple": "^1.0.1",
+                "got": "^14.6.6",
+                "ini": "^6.0.0",
                 "rc": "^1.2.8",
-                "semver": "^7.7.1",
-                "tablemark": "^3.1.0",
+                "semver": "^7.7.4",
+                "tablemark": "^4.1.0",
                 "text-table": "^0.2.0",
                 "visit-values": "^2.0.0"
             },
@@ -3847,14 +4168,25 @@
                 "license-report": "index.js"
             },
             "engines": {
-                "node": ">=18"
+                "node": ">=20"
+            }
+        },
+        "node_modules/license-report/node_modules/ini": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
+            "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^20.17.0 || >=22.9.0"
             }
         },
         "node_modules/liftoff": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.0.tgz",
-            "integrity": "sha512-a5BQjbCHnB+cy+gsro8lXJ4kZluzOijzJ1UVVfyJYZC+IP2pLv1h4+aysQeKuTmyO8NAqfyQAk4HWaP/HjcKTg==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.1.tgz",
+            "integrity": "sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "extend": "^3.0.2",
                 "findup-sync": "^5.0.0",
@@ -3886,9 +4218,9 @@
             }
         },
         "node_modules/lodash": {
-            "version": "4.17.23",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-            "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+            "version": "4.18.1",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+            "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
             "dev": true,
             "license": "MIT"
         },
@@ -4005,10 +4337,12 @@
             "license": "MIT"
         },
         "node_modules/lodash.template": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-            "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+            "version": "4.18.1",
+            "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.18.1.tgz",
+            "integrity": "sha512-5urZrLnV/VD6zHK5KsVtZgt7H19v51mIzoS0aBNH8yp3I8tbswrEjOABOPY8m8uB7NuibubLrMX+Y0PXsU9X+w==",
+            "deprecated": "This package is deprecated. Use https://socket.dev/npm/package/eta instead.",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "lodash._reinterpolate": "^3.0.0",
                 "lodash.templatesettings": "^4.0.0"
@@ -4023,16 +4357,6 @@
                 "lodash._reinterpolate": "^3.0.0"
             }
         },
-        "node_modules/lower-case": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-            "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.0.3"
-            }
-        },
         "node_modules/lowercase-keys": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
@@ -4046,6 +4370,13 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/lru-cache": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/make-error": {
             "version": "1.3.6",
             "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -4066,6 +4397,7 @@
             "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
             "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4081,6 +4413,7 @@
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
             "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "braces": "^3.0.3",
                 "picomatch": "^2.3.1"
@@ -4102,6 +4435,22 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/minimatch": {
+            "version": "9.0.9",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.2"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/minimist": {
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
@@ -4112,6 +4461,16 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/minipass": {
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+            "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
         "node_modules/modify-filename": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-2.0.0.tgz",
@@ -4125,9 +4484,10 @@
             }
         },
         "node_modules/moment": {
-            "version": "2.30.1",
-            "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-            "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+            "version": "2.31.0",
+            "resolved": "https://registry.npmjs.org/moment/-/moment-2.31.0.tgz",
+            "integrity": "sha512-0acOTfMiWOheYS4eoWb80yYMb/JLvVv9SHbs2PehaDzfUG0Bw855SKyk0IKTnPGa5+U2bmi3W68l1+sGLX/pvw==",
+            "license": "MIT",
             "engines": {
                 "node": "*"
             }
@@ -4154,21 +4514,11 @@
             "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz",
             "integrity": "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10.13.0"
             }
         },
-        "node_modules/no-case": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-            "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "lower-case": "^2.0.2",
-                "tslib": "^2.0.3"
-            }
-        },
         "node_modules/normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -4179,9 +4529,9 @@
             }
         },
         "node_modules/normalize-url": {
-            "version": "8.0.1",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
-            "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.1.tgz",
+            "integrity": "sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -4204,9 +4554,9 @@
             }
         },
         "node_modules/npm-check-updates": {
-            "version": "17.1.14",
-            "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.14.tgz",
-            "integrity": "sha512-dr4bXIxETubLI1tFGeock5hN8yVjahvaVpx+lPO4/O2md3zJuxB7FgH3MIoTvQSCgsgkIRpe0skti01IEAA5tA==",
+            "version": "22.1.1",
+            "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-22.1.1.tgz",
+            "integrity": "sha512-uWSxJW25dy5ZM4SdLsi0VBgPSJlo7u+jARQ6Xql+85YYCoqXU2ZaympAZ6237/oybCq/I4nXddE9S9BTwBfBXA==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -4214,8 +4564,8 @@
                 "npm-check-updates": "build/cli.js"
             },
             "engines": {
-                "node": "^18.18.0 || >=20.0.0",
-                "npm": ">=8.12.1"
+                "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
+                "npm": ">=10.0.0"
             }
         },
         "node_modules/object-assign": {
@@ -4281,6 +4631,7 @@
             "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
             "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "array-each": "^1.0.1",
                 "array-slice": "^1.0.0",
@@ -4296,6 +4647,7 @@
             "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
             "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "isobject": "^3.0.1"
             },
@@ -4322,6 +4674,13 @@
                 "node": ">=14.16"
             }
         },
+        "node_modules/package-json-from-dist": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+            "dev": true,
+            "license": "BlueOak-1.0.0"
+        },
         "node_modules/pako": {
             "version": "0.2.9",
             "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
@@ -4332,6 +4691,7 @@
             "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
             "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-absolute": "^1.0.0",
                 "map-cache": "^0.2.0",
@@ -4355,6 +4715,7 @@
             "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
             "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4368,17 +4729,29 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/path-parse": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/path-root": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
             "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "path-root-regex": "^0.1.0"
             },
@@ -4391,10 +4764,28 @@
             "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
             "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/path-scurry": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^10.2.0",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
         "node_modules/pause-stream": {
             "version": "0.0.11",
             "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
@@ -4437,10 +4828,11 @@
             "optional": true
         },
         "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+            "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8.6"
             },
@@ -4550,12 +4942,6 @@
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
             "dev": true
         },
-        "node_modules/queue-tick": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-            "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-            "dev": true
-        },
         "node_modules/quick-lru": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -4615,15 +5001,17 @@
             "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
             "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "minimatch": "^5.1.0"
             }
         },
         "node_modules/readdir-glob/node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "version": "5.1.9",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+            "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             },
@@ -4648,6 +5036,7 @@
             "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
             "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "resolve": "^1.20.0"
             },
@@ -4692,6 +5081,7 @@
             "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz",
             "integrity": "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10.13.0"
             }
@@ -4701,23 +5091,29 @@
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
             "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/resolve": {
-            "version": "1.22.8",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+            "version": "1.22.12",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
+            "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "is-core-module": "^2.13.0",
+                "es-errors": "^1.3.0",
+                "is-core-module": "^2.16.1",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
             },
             "bin": {
                 "resolve": "bin/resolve"
             },
+            "engines": {
+                "node": ">= 0.4"
+            },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -4734,6 +5130,7 @@
             "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
             "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.0",
                 "global-modules": "^1.0.0"
@@ -4747,6 +5144,7 @@
             "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz",
             "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "value-or-function": "^4.0.0"
             },
@@ -4755,16 +5153,16 @@
             }
         },
         "node_modules/responselike": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
-            "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/responselike/-/responselike-4.0.2.tgz",
+            "integrity": "sha512-cGk8IbWEAnaCpdAt1BHzJ3Ahz5ewDJa0KseTsE3qIRMJ3C698W8psM7byCeWVpd/Ha7FUYzuRVzXoKoM6nRUbA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "lowercase-keys": "^3.0.0"
             },
             "engines": {
-                "node": ">=14.16"
+                "node": ">=20"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -4776,10 +5174,11 @@
             "integrity": "sha512-e0dOpjm5DseomnXx2M5lpdZ5zoHqF1+bqdMJUohoYVVQa7cBdnk7fdmeI6byNWP/kiME72EeTiSypTCVnpLiDg=="
         },
         "node_modules/reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+            "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "iojs": ">=1.0.0",
                 "node": ">=0.10.0"
@@ -4834,9 +5233,9 @@
             }
         },
         "node_modules/rimraf/node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "version": "1.1.21",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
+            "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4865,10 +5264,11 @@
             }
         },
         "node_modules/rimraf/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -4912,9 +5312,9 @@
             "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
         },
         "node_modules/semver": {
-            "version": "7.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "version": "7.7.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
             "dev": true,
             "license": "ISC",
             "bin": {
@@ -4929,6 +5329,7 @@
             "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz",
             "integrity": "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "sver": "^1.8.3"
             },
@@ -4936,18 +5337,6 @@
                 "node": ">= 10.13.0"
             }
         },
-        "node_modules/sentence-case": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz",
-            "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "no-case": "^3.0.4",
-                "tslib": "^2.0.3",
-                "upper-case-first": "^2.0.2"
-            }
-        },
         "node_modules/set-function-length": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -4978,6 +5367,29 @@
                 "node": ">= 0.4"
             }
         },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/side-channel": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
@@ -4995,16 +5407,30 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/sort-keys": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-5.0.0.tgz",
-            "integrity": "sha512-Pdz01AvCAottHTPQGzndktFNdbRA75BgOfeT1hH+AMnJFv8lynkPi42rfeEhpx1saTEI3YNMWxfqu0sFD1G8pw==",
+        "node_modules/signal-exit": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+            "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
             "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/sort-keys": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-6.0.0.tgz",
+            "integrity": "sha512-ueSlHJMwpIw42CJ4B11Uxzh/S0p0AlOyiNktlv2KOu5e1JpUE6DlC4AAUjXqesHdBRv/g0wC9Q4vwq0NP2pA9w==",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "is-plain-obj": "^4.0.0"
+                "is-plain-obj": "^4.1.0"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=20"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -5028,31 +5454,6 @@
                 "node": ">= 0.10"
             }
         },
-        "node_modules/split-text-to-chunks": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/split-text-to-chunks/-/split-text-to-chunks-1.0.0.tgz",
-            "integrity": "sha512-HLtEwXK/T4l7QZSJ/kOSsZC0o5e2Xg3GzKKFxm0ZexJXw0Bo4CaEl39l7MCSRHk9EOOL5jT8JIDjmhTtcoe6lQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "get-stdin": "^5.0.1",
-                "minimist": "^1.2.0"
-            },
-            "bin": {
-                "wordwrap": "cli.js"
-            }
-        },
-        "node_modules/ssf": {
-            "version": "0.11.2",
-            "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
-            "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
-            "dependencies": {
-                "frac": "~1.1.2"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
         "node_modules/stackblur-canvas": {
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
@@ -5078,6 +5479,7 @@
             "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz",
             "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "streamx": "^2.13.2"
             }
@@ -5107,16 +5509,15 @@
             }
         },
         "node_modules/streamx": {
-            "version": "2.16.1",
-            "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.16.1.tgz",
-            "integrity": "sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==",
+            "version": "2.25.0",
+            "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.25.0.tgz",
+            "integrity": "sha512-0nQuG6jf1w+wddNEEXCF4nTg3LtufWINB5eFEN+5TNZW7KWJp6x87+JFL43vaAUPyCfH1wID+mNVyW6OHtFamg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "fast-fifo": "^1.1.0",
-                "queue-tick": "^1.0.1"
-            },
-            "optionalDependencies": {
-                "bare-events": "^2.2.0"
+                "events-universal": "^1.0.0",
+                "fast-fifo": "^1.3.2",
+                "text-decoder": "^1.1.0"
             }
         },
         "node_modules/string_decoder": {
@@ -5133,6 +5534,7 @@
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -5142,11 +5544,51 @@
                 "node": ">=8"
             }
         },
+        "node_modules/string-width-cjs": {
+            "name": "string-width",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/string-width/node_modules/ansi-regex": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5156,6 +5598,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -5193,6 +5636,30 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/strip-ansi-cjs": {
+            "name": "strip-ansi",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/strip-bom-buf": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-3.0.1.tgz",
@@ -5239,6 +5706,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -5251,6 +5719,7 @@
             "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
             "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -5263,6 +5732,7 @@
             "resolved": "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz",
             "integrity": "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==",
             "dev": true,
+            "license": "MIT",
             "optionalDependencies": {
                 "semver": "^6.3.0"
             }
@@ -5272,6 +5742,7 @@
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
             "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
+            "license": "ISC",
             "optional": true,
             "bin": {
                 "semver": "bin/semver.js"
@@ -5309,26 +5780,133 @@
             }
         },
         "node_modules/tablemark": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/tablemark/-/tablemark-3.1.0.tgz",
-            "integrity": "sha512-IwO6f0SEzp1Z+zqz/7ANUmeEac4gaNlknWyj/S9aSg11wZmWYnLeyI/xXvEOU88BYUIf8y30y0wxB58xIKrVlQ==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/tablemark/-/tablemark-4.1.0.tgz",
+            "integrity": "sha512-B3LDjbDo+ac+D5RwkBOPZZ6ua8716KdT+6NO3DKOCHJq0ezE6vV2r92rjrC1ci2H+ocuysl5ytf1T0QqV65yoA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "sentence-case": "^3.0.4",
-                "split-text-to-chunks": "^1.0.0"
+                "ansi-regex": "^6.2.2",
+                "change-case": "^5.4.4",
+                "string-width": "^8.1.0",
+                "wordwrapjs": "^5.1.0",
+                "wrap-ansi": "^9.0.2"
             },
             "engines": {
-                "node": ">=14.16"
+                "node": ">=20"
+            }
+        },
+        "node_modules/tablemark/node_modules/ansi-regex": {
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+            "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/tablemark/node_modules/ansi-styles": {
+            "version": "6.2.3",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+            "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/tablemark/node_modules/emoji-regex": {
+            "version": "10.6.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+            "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/tablemark/node_modules/string-width": {
+            "version": "8.2.1",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz",
+            "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "get-east-asian-width": "^1.5.0",
+                "strip-ansi": "^7.1.2"
+            },
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/tablemark/node_modules/strip-ansi": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+            "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.2.2"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
+        "node_modules/tablemark/node_modules/wrap-ansi": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+            "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^6.2.1",
+                "string-width": "^7.0.0",
+                "strip-ansi": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/tablemark/node_modules/wrap-ansi/node_modules/string-width": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+            "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^10.3.0",
+                "get-east-asian-width": "^1.0.0",
+                "strip-ansi": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/tar-stream": {
-            "version": "3.1.7",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-            "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.2.0.tgz",
+            "integrity": "sha512-ojzvCvVaNp6aOTFmG7jaRD0meowIAuPc3cMMhSgKiVWws1GyHbGd/xvnyuRKcKlMpt3qvxx6r0hreCNITP9hIg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "b4a": "^1.6.4",
+                "bare-fs": "^4.5.5",
                 "fast-fifo": "^1.2.0",
                 "streamx": "^2.15.0"
             }
@@ -5342,6 +5920,16 @@
                 "streamx": "^2.12.5"
             }
         },
+        "node_modules/text-decoder": {
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
+            "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "b4a": "^1.6.4"
+            }
+        },
         "node_modules/text-segmentation": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
@@ -5451,6 +6039,7 @@
             "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz",
             "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "streamx": "^2.12.5"
             },
@@ -5464,9 +6053,9 @@
             "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         },
         "node_modules/type-fest": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.40.0.tgz",
-            "integrity": "sha512-ABHZ2/tS2JkvH1PEjxFDTUWC8dB5OsIGZP4IFLhR293GqT5Y5qB1WwL2kMPYhQW9DVgVD8Hd7I8gjwPIf5GFkw==",
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+            "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
             "dev": true,
             "license": "(MIT OR CC0-1.0)",
             "engines": {
@@ -5493,6 +6082,7 @@
             "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
             "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5594,16 +6184,6 @@
                 "node": ">=6.0"
             }
         },
-        "node_modules/upper-case-first": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz",
-            "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.0.3"
-            }
-        },
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -5623,6 +6203,7 @@
             "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz",
             "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10.13.0"
             }
@@ -5632,6 +6213,7 @@
             "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz",
             "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10.13.0"
             }
@@ -5658,6 +6240,7 @@
             "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz",
             "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "bl": "^5.0.0",
                 "vinyl": "^3.0.0"
@@ -5671,18 +6254,19 @@
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
             "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/vinyl-contents/node_modules/vinyl": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-            "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+            "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "clone": "^2.1.2",
-                "clone-stats": "^1.0.0",
                 "remove-trailing-separator": "^1.1.0",
                 "replace-ext": "^2.0.0",
                 "teex": "^1.0.1"
@@ -5735,13 +6319,14 @@
             }
         },
         "node_modules/vinyl-fs": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz",
-            "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.2.tgz",
+            "integrity": "sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "fs-mkdirp-stream": "^2.0.1",
-                "glob-stream": "^8.0.0",
+                "glob-stream": "^8.0.3",
                 "graceful-fs": "^4.2.11",
                 "iconv-lite": "^0.6.3",
                 "is-valid-glob": "^1.0.0",
@@ -5752,7 +6337,7 @@
                 "streamx": "^2.14.0",
                 "to-through": "^3.0.0",
                 "value-or-function": "^4.0.0",
-                "vinyl": "^3.0.0",
+                "vinyl": "^3.0.1",
                 "vinyl-sourcemap": "^2.0.0"
             },
             "engines": {
@@ -5764,18 +6349,19 @@
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
             "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/vinyl-fs/node_modules/vinyl": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-            "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+            "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "clone": "^2.1.2",
-                "clone-stats": "^1.0.0",
                 "remove-trailing-separator": "^1.1.0",
                 "replace-ext": "^2.0.0",
                 "teex": "^1.0.1"
@@ -5789,6 +6375,7 @@
             "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz",
             "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "convert-source-map": "^2.0.0",
                 "graceful-fs": "^4.2.10",
@@ -5806,18 +6393,19 @@
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
             "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/vinyl-sourcemap/node_modules/vinyl": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-            "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+            "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "clone": "^2.1.2",
-                "clone-stats": "^1.0.0",
                 "remove-trailing-separator": "^1.1.0",
                 "replace-ext": "^2.0.0",
                 "teex": "^1.0.1"
@@ -5851,6 +6439,22 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
         "node_modules/which-boxed-primitive": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
@@ -5901,20 +6505,157 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/wmf": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
-            "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+        "node_modules/wordwrapjs": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-5.1.1.tgz",
+            "integrity": "sha512-0yweIbkINJodk27gX9LBGMzyQdBDan3s/dEAiwBOj+Mf0PPyWL6/rikalkv8EeD0E8jm4o5RXEOrFTP3NXbhJg==",
+            "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": ">=0.8"
+                "node": ">=12.17"
             }
         },
-        "node_modules/word": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
-            "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+        "node_modules/wrap-ansi": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
+            },
             "engines": {
-                "node": ">=0.8"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs": {
+            "name": "wrap-ansi",
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-regex": {
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+            "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-styles": {
+            "version": "6.2.3",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+            "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/wrap-ansi/node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/strip-ansi": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+            "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.2.2"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
             }
         },
         "node_modules/wrappy": {
@@ -5924,18 +6665,10 @@
             "dev": true
         },
         "node_modules/xlsx": {
-            "version": "0.18.5",
-            "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
-            "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
-            "dependencies": {
-                "adler-32": "~1.3.0",
-                "cfb": "~1.2.1",
-                "codepage": "~1.15.0",
-                "crc-32": "~1.2.1",
-                "ssf": "~0.11.2",
-                "wmf": "~1.0.1",
-                "word": "~0.3.0"
-            },
+            "version": "0.20.3",
+            "resolved": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
+            "integrity": "sha512-oLDq3jw7AcLqKWH2AhCpVTZl8mf6X2YReP+Neh0SJUzV/BdZYjth94tG5toiMB1PPrYtxOCfaoUCkvtuH+3AJA==",
+            "license": "Apache-2.0",
             "bin": {
                 "xlsx": "bin/xlsx.njs"
             },
@@ -5965,6 +6698,7 @@
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
             "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
             "dev": true,
+            "license": "ISC",
             "engines": {
                 "node": ">=10"
             }
@@ -5974,6 +6708,7 @@
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
             "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "cliui": "^7.0.2",
                 "escalade": "^3.1.1",
@@ -5992,6 +6727,7 @@
             "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
             "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
             "dev": true,
+            "license": "ISC",
             "engines": {
                 "node": ">=10"
             }
@@ -6006,42 +6742,19 @@
                 "buffer-crc32": "^1.0.0"
             }
         },
-        "node_modules/yazl/node_modules/buffer-crc32": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
-            "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+        "node_modules/zip-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+            "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==",
             "dev": true,
             "license": "MIT",
-            "engines": {
-                "node": ">=8.0.0"
-            }
-        },
-        "node_modules/zip-stream": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-5.0.2.tgz",
-            "integrity": "sha512-LfOdrUvPB8ZoXtvOBz6DlNClfvi//b5d56mSWyJi7XbH/HfhOHfUhOqxhT/rUiR7yiktlunqRo+jY6y/cWC/5g==",
-            "dev": true,
             "dependencies": {
-                "archiver-utils": "^4.0.1",
-                "compress-commons": "^5.0.1",
-                "readable-stream": "^3.6.0"
+                "archiver-utils": "^5.0.0",
+                "compress-commons": "^6.0.2",
+                "readable-stream": "^4.0.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
-            }
-        },
-        "node_modules/zip-stream/node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-            "dev": true,
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
+                "node": ">= 14"
             }
         }
     }
diff --git a/package.json b/package.json
index 87b54f224..51beed1f4 100644
--- a/package.json
+++ b/package.json
@@ -1,34 +1,36 @@
 {
     "name": "@opensourcepos/opensourcepos",
-    "version": "3.4.2",
-    "description": "pen Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
-    "main": "index.php",
-    "license": "MIT",
-    "authors": [
-        "jekkos <jekkos - at - opensourcepos.org>",
-        "FrancescoUK <francesco.lodolo.uk - at - gmail.com>",
-        "objecttothis <objecttothis - at - gmail.com>",
-        "SteveIreland <stevei - at - ruledomain.com>"
-    ],
-    "files": [
-        "dist/opensourcepos.$version.tgz"
-    ],
-    "publishConfig": {
-        "registry": "https://npm.pkg.github.com/"
-    },
+    "version": "3.4.3",
+    "description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
     "keywords": [
         "point-of-sale",
         "POS"
     ],
+    "homepage": "https://opensourcepos.org",
+    "bugs": {
+        "url": "https://github.com/opensourcepos/opensourcepos/issues"
+    },
     "repository": {
         "type": "git",
-        "url": "https://github.com/opensourcepos/opensourcepos"
+        "url": "git+https://github.com/opensourcepos/opensourcepos.git"
+    },
+    "license": "MIT",
+    "contributors": [
+        "jekkos <jekkos - at - opensourcepos.org>",
+        "objecttothis <objecttothis - at - gmail.com>"
+    ],
+    "files": [
+        "dist/opensourcepos.$version.tgz"
+    ],
+    "type": "module",
+    "main": "index.php",
+    "engines": {
+        "node": ">=20"
     },
     "scripts": {
         "build": "gulp default",
         "gulp": "gulp"
     },
-    "type": "module",
     "dependencies": {
         "bootstrap": "^3.4.1",
         "bootstrap-daterangepicker": "^2.1.27",
@@ -39,9 +41,9 @@
         "bootstrap-tagsinput-2021": "^0.8.6",
         "bootstrap-toggle": "^2.2.2",
         "bootstrap3-dialog": "github:nakupanda/bootstrap3-dialog#master",
-        "bootstrap5": "npm:bootstrap@^5.3.5",
+        "bootstrap5": "npm:bootstrap@^5.3.8",
         "bootswatch": "^3.4.1",
-        "bootswatch5": "npm:bootswatch@^5.3.5",
+        "bootswatch5": "npm:bootswatch@^5.3.8",
         "chartist": "^0.11.4",
         "chartist-plugin-axistitle": "^0.0.7",
         "chartist-plugin-barlabels": "^0.0.5",
@@ -49,7 +51,7 @@
         "chartist-plugin-tooltips": "^0.0.17",
         "clipboard": "^2.0.11",
         "coffeescript": "^2.7.0",
-        "dompurify": "^3.3.2",
+        "dompurify": "^3.4.16",
         "elegant-circles": "github:opensourcepos/elegant-circles#minified",
         "es6-promise": "^4.2.8",
         "file-saver": "^2.0.5",
@@ -59,28 +61,34 @@
         "jquery-form": "^4.3.0",
         "jquery-ui-dist": "^1.12.1",
         "jquery-validation": "^1.19.5",
-        "jspdf": "^4.2.0",
+        "jspdf": "^4.2.1",
         "jspdf-autotable": "^5.0.7",
-        "tableexport.jquery.plugin": "^1.30.0"
+        "tableexport.jquery.plugin": "^1.33.0"
+    },
+    "overrides": {
+        "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
     },
     "devDependencies": {
-        "gulp": "^5.0.0",
+        "gulp": "^5.0.1",
         "gulp-clean": "^0.4.0",
         "gulp-clean-css": "^4.3.0",
         "gulp-concat": "^2.6.1",
         "gulp-debug": "^5.0.1",
         "gulp-gzip": "^1.4.2",
-        "gulp-header": "^2.0.9",
+        "gulp-header": "^2.0.12",
         "gulp-inject": "^5.0.5",
-        "gulp-rename": "^2.0.0",
-        "gulp-rev": "^10.0.0",
+        "gulp-rename": "^2.1.0",
+        "gulp-rev": "^12.0.0",
         "gulp-run": "^1.7.1",
-        "gulp-tar": "^4.0.0",
+        "gulp-tar": "^5.0.0",
         "gulp-uglify": "^3.0.2",
         "gulp-zip": "^6.1.0",
-        "license-report": "^6.7.2",
-        "npm-check-updates": "^17.1.14",
+        "license-report": "^6.8.2",
+        "npm-check-updates": "^22.1.1",
         "readable-stream": "^4.4.2",
         "stream-series": "^0.1.1"
+    },
+    "publishConfig": {
+        "registry": "https://npm.pkg.github.com/"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b408a99d9..3d6b6912d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -50,14 +50,6 @@
         <const name="CONFIGPATH" value="./app/Config/"/>
         <!-- Directory containing the front controller (index.php) -->
         <const name="PUBLICPATH" value="./public/"/>
-        <!-- Database configuration -->
-        <!-- Uncomment to provide your own database for testing
-            <env name="database.tests.hostname" value="localhost"/>
-            <env name="database.tests.database" value="tests"/>
-            <env name="database.tests.username" value="tests_user"/>
-            <env name="database.tests.password" value=""/>
-            <env name="database.tests.DBDriver" value="MySQLi"/>
-            <env name="database.tests.DBPrefix" value="tests_"/>
-            -->
+        <!-- Database configuration for testing: provided by .env (database.tests.*) -->
     </php>
 </phpunit>
diff --git a/preload.php b/preload.php
index 0b4531223..288b30b4e 100644
--- a/preload.php
+++ b/preload.php
@@ -9,6 +9,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  *---------------------------------------------------------------
  * Sample file for Preloading
@@ -54,6 +57,7 @@ class preload
                 '/system/Config/Routes.php',
                 '/system/Language/',
                 '/system/bootstrap.php',
+                '/system/util_bootstrap.php',
                 '/system/rewrite.php',
                 '/Views/',
                 // Errors occur.
@@ -69,10 +73,10 @@ class preload
 
     private function loadAutoloader(): void
     {
-        $paths = new Config\Paths();
+        $paths = new Paths();
         require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php';
 
-        CodeIgniter\Boot::preload($paths);
+        Boot::preload($paths);
     }
 
     /**
@@ -97,7 +101,9 @@ class preload
                 }
 
                 require_once $file[0];
-                echo 'Loaded: ' . $file[0] . "\n";
+                // Uncomment only for debugging (to inspect which files are included).
+                // Never use this in production - preload scripts must not generate output.
+                // echo 'Loaded: ' . $file[0] . "\n";
             }
         }
     }
diff --git a/public/css/register.css b/public/css/register.css
index 2ef9f149f..bad07b60f 100644
--- a/public/css/register.css
+++ b/public/css/register.css
@@ -103,6 +103,15 @@ input#amount_tendered:disabled {
     clear: both;
 }
 
+#buttons_sale {
+    padding-right: 0.5em;
+}
+
 .alert {
     margin-bottom: 5px;
 }
+
+#add_payment_button,
+#buttons_sale .btn {
+    min-width: 120px;
+}
diff --git a/public/index.php b/public/index.php
index eb7f5c988..8e834f2c8 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,12 +1,15 @@
 <?php
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  *---------------------------------------------------------------
  * CHECK PHP VERSION
  *---------------------------------------------------------------
  */
 
-$minPhpVersion = '8.1'; // If you update this, don't forget to update `spark`.
+$minPhpVersion = '8.2'; // If you update this, don't forget to update `spark`.
 if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
@@ -48,9 +51,9 @@ if (getcwd() . DIRECTORY_SEPARATOR !== FCPATH) {
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootWeb($paths));
+exit(Boot::bootWeb($paths));
diff --git a/public/js/manage_tables.js b/public/js/manage_tables.js
index b5a5d0c7c..8899d1191 100644
--- a/public/js/manage_tables.js
+++ b/public/js/manage_tables.js
@@ -1,16 +1,16 @@
 (function(dialog_support, $) {
 
-    var btn_id, dialog_ref;
+    let btn_id, dialog_ref;
 
-    var hide = function() {
+    const hide = function() {
         dialog_ref && dialog_ref.close();
     };
 
-    var clicked_id = function() {
+    const clicked_id = function() {
         return btn_id;
     };
 
-    var submit = function(button_id) {
+    const submit = function(button_id) {
         return function(dlog_ref) {
             const form = $('form', dlog_ref.$modalBody).first();
             const validator = form.data('validator');
@@ -27,31 +27,31 @@
         }
     };
 
-    var button_class = {
+    const button_class = {
         'submit' : 'btn-primary',
         'delete' : 'btn-danger'
     };
 
-    var init = function(selector) {
+    const init = function(selector) {
 
-        var buttons = function(event) {
-            var buttons = [];
-            var dialog_class = 'modal-dlg';
+        const buttons = function(event) {
+            const buttons = [];
+            let dialog_class = 'modal-dlg';
             $.each($(this).attr('class').split(/\s+/), function(classIndex, className) {
-                var width_class = className.split("modal-dlg-");
+                const width_class = className.split("modal-dlg-");
                 if (width_class && width_class.length > 1) {
                     dialog_class = className;
                 }
             });
 
-            var has_new_btn = "btnNew" in $(this).data();
+            const has_new_btn = "btnNew" in $(this).data();
             $.each($(this).data(), function(name, value) {
-                var btn_class = name.split("btn");
+                const btn_class = name.split("btn");
                 if (btn_class && btn_class.length > 1) {
-                    var btn_name = btn_class[1].toLowerCase();
-                    var is_submit = btn_name == 'submit';
-                    var is_new = btn_name === 'new';
-                    var is_enter = has_new_btn ? is_new: is_submit;
+                    const btn_name = btn_class[1].toLowerCase();
+                    const is_submit = btn_name == 'submit';
+                    const is_new = btn_name === 'new';
+                    const is_enter = has_new_btn ? is_new: is_submit;
                     buttons.push({
                         id: btn_name,
                         label: value,
@@ -78,12 +78,12 @@
         $(selector).each(function(index, $element) {
 
             return $(selector).off('click').on('click', function(event) {
-                var $link = $(event.target);
+                let $link = $(event.target);
                 $link = !$link.is("a, button") ? $link.parents("a, button") : $link ;
                 BootstrapDialog.show($.extend({
                     title: $link.attr('title'),
                     message: (function() {
-                        var node = $('<div></div>');
+                        const node = $('<div></div>');
                         $.get($link.attr('href') || $link.data('href'), function(data) {
                             node.html(data);
                         });
@@ -107,34 +107,34 @@
 
 (function(table_support, $) {
 
-    var enable_actions = function(callback) {
+    let enable_actions = function(callback) {
         return function() {
-            var selection_empty = selected_rows().length == 0;
+            const selection_empty = selected_rows().length == 0;
             $("#toolbar button:not(.dropdown-toggle)").attr('disabled', selection_empty);
             typeof callback == 'function' && callback();
         }
     };
 
-    var table = function() {
+    const table = function() {
         return $("#table").data('bootstrap.table');
     }
 
-    var selected_ids = function () {
+    const selected_ids = function () {
         return $.map(table().getSelections(), function (element) {
             return element[options.uniqueId || 'id'] !== '-' ? element[options.uniqueId || 'id'] : null;
         });
     };
 
-    var selected_rows = function () {
+    const selected_rows = function () {
         return $("#table td input:checkbox:checked").parents("tr");
     };
 
-    var row_selector = function(id) {
+    const row_selector = function(id) {
         return "tr[data-uniqueid='" + id + "']";
     };
 
-    var rows_selector = function(ids) {
-        var selectors = [];
+    const rows_selector = function(ids) {
+        const selectors = [];
         ids = ids instanceof Array ? ids : ("" + ids).split(":");
         $.each(ids, function(index, element) {
             selectors.push(row_selector(element));
@@ -142,36 +142,40 @@
         return selectors;;
     };
 
-    var highlight_row = function (id, color) {
+    const highlight_row = function (id, color) {
         $(rows_selector(id)).each(function(index, element) {
-            var original = $(element).css('backgroundColor');
+            const original = $(element).css('backgroundColor');
             $(element).find("td").animate({backgroundColor: color || '#e1ffdd'}, "slow", "linear")
                 .animate({backgroundColor: color || '#e1ffdd'}, 5000)
                 .animate({backgroundColor: original}, "slow", "linear");
         });
     };
 
-    var do_action = function(action) {
+    const do_action = function(action) {
         return function (url, ids) {
             if (confirm($.fn.bootstrapTable.defaults.formatConfirmAction(action))) {
                 $.post((url || options.resource) + '/' + action, {'ids[]': ids || selected_ids()}, function (response) {
                     // Delete was successful, remove checkbox rows
                     if (response.success) {
-                        var selector = ids ? row_selector(ids) : selected_rows();
-                        table().collapseAllRows();
-                        $(selector).each(function (index, element) {
-                            $(this).find("td").animate({backgroundColor: "green"}, 1200, "linear")
-                                .end().animate({opacity: 0}, 1200, "linear", function () {
-                                table().remove({
-                                    field: options.uniqueId,
-                                    values: selected_ids()
+                        if (options) {
+                            const selector = ids ? row_selector(ids) : selected_rows();
+                            table().collapseAllRows();
+                            $(selector).each(function (index, element) {
+                                $(this).find("td").animate({backgroundColor: "green"}, 1200, "linear")
+                                    .end().animate({opacity: 0}, 1200, "linear", function () {
+                                    table().remove({
+                                        field: options.uniqueId,
+                                        values: selected_ids()
+                                    });
+                                    if (index == $(selector).length - 1) {
+                                        refresh();
+                                        enable_actions();
+                                    }
                                 });
-                                if (index == $(selector).length - 1) {
-                                    refresh();
-                                    enable_actions();
-                                }
                             });
-                        });
+                        } else {
+                            location.reload();
+                        }
                         $.notify(response.message, {type: 'success'});
                     } else {
                         $.notify(response.message, {type: 'danger'});
@@ -183,7 +187,7 @@
         };
     };
 
-    var load_success = function(callback) {
+    let load_success = function(callback) {
         return function(response) {
             typeof options.load_callback == 'function' && options.load_callback();
             options.load_callback = undefined;
@@ -192,18 +196,18 @@
         }
     };
 
-    var options;
+    let options;
 
-    var toggle_column_visibility = function() {
+    const toggle_column_visibility = function() {
         if (localStorage[options.employee_id]) {
-            var user_settings = JSON.parse(localStorage[options.employee_id]);
+            const user_settings = JSON.parse(localStorage[options.employee_id]);
             user_settings[options.resource] && $.each(user_settings[options.resource], function(index, element) {
                 element ? table().showColumn(index) : table().hideColumn(index);
             });
         }
     };
 
-    var init = function (_options) {
+    const init = function (_options) {
         options = _options;
         enable_actions = enable_actions(options.enableActions);
         load_success = load_success(options.onLoadSuccess);
@@ -244,7 +248,7 @@
                 enable_actions();
             },
             onColumnSwitch : function(field, checked) {
-                var user_settings = localStorage[options.employee_id];
+                let user_settings = localStorage[options.employee_id];
                 user_settings = (user_settings && JSON.parse(user_settings)) || {};
                 user_settings[options.resource] = user_settings[options.resource] || {};
                 user_settings[options.resource][field] = checked;
@@ -264,36 +268,36 @@
         dialog_support.init("button.modal-dlg");
     };
 
-    var init_delete = function (confirmMessage) {
+    const init_delete = function (confirmMessage) {
         $("#delete").click(function(event) {
             do_action("delete")();
         });
     };
 
-    var init_restore = function (confirmMessage) {
+    const init_restore = function (confirmMessage) {
         $("#restore").click(function(event) {
             do_action("restore")();
         });
     };
 
-    var refresh = function() {
+    const refresh = function() {
         table().refresh();
     }
 
-    var submit_handler = function(url) {
+    const submit_handler = function(url) {
         return function (resource, response) {
-            var id = response.id !== undefined ? response.id.toString() : "";
+            const id = response.id !== undefined ? response.id.toString() : "";
             if (!response.success) {
                 $.notify(response.message, { type: 'danger' });
             } else {
-                var message = response.message;
-                var selector = rows_selector(response.id);
-                var rows = $(selector.join(",")).length;
+                const message = response.message;
+                const selector = rows_selector(response.id);
+                const rows = $(selector.join(",")).length;
                 if (rows > 0 && rows < 15) {
-                    var ids = id.split(":");
+                    const ids = id.split(":");
                     $.get([url || resource + '/row', id].join("/"), {}, function (response) {
                         $.each(selector, function (index, element) {
-                            var id = $(element).data('uniqueid');
+                            const id = $(element).data('uniqueid');
                             table().updateByUniqueId({id: id, row: response[id] || response});
                         });
                         dialog_support.init("a.modal-dlg");
@@ -313,7 +317,7 @@
         };
     };
 
-    var handle_submit = submit_handler();
+    const handle_submit = submit_handler();
 
     $.extend(table_support, {
         submit_handler: function(url) {
diff --git a/public/js/nominatim.autocomplete.js b/public/js/nominatim.autocomplete.js
index ecdead1bb..1e37a703a 100644
--- a/public/js/nominatim.autocomplete.js
+++ b/public/js/nominatim.autocomplete.js
@@ -5,14 +5,14 @@
         return document.location.protocol + '//' + url;
     }
 
-    var url = http_s('nominatim.openstreetmap.org/search');
+    const url = http_s('nominatim.openstreetmap.org/search');
 
-    var handle_auto_completion = function(fields) {
+    const handle_auto_completion = function(fields) {
         return function(event, ui) {
-            var results = ui.item.results;
+            const results = ui.item.results;
             if (results != null && results.length > 0) {
                 // Handle auto completion
-                for(var i in fields) {
+                for(const i in fields) {
                     $("#" + fields[i]).val(results[i]);
                 }
                 return false;
@@ -21,11 +21,11 @@
         };
     };
 
-    var create_parser = function(field_name, parse_format)
+    const create_parser = function(field_name, parse_format)
     {
-        var parse_field = function(format, address)
+        const parse_field = function(format, address)
         {
-            var fields = [];
+            const fields = [];
             $.each(format.split("|"), function(key, value)
                {
                 if (address[value] && fields.length < 2 && $.inArray(address[value], fields) === -1)
@@ -38,11 +38,11 @@
 
         return function(data)
         {
-            var parsed = [];
+            const parsed = [];
             $.each(data, function(index, value)
             {
-                var row = [];
-                var address = value.address;
+                const row = [];
+                const address = value.address;
                 $.each(parse_format, function(key, format)
                 {
                     row.push(parse_field(format, address));
@@ -57,12 +57,12 @@
         };
     };
 
-    var init = function(options) {
+    const init = function(options) {
 
-        var default_params = function(id, key, language)
+        const default_params = function(id, key, language)
         {
             return function() {
-                var result = {
+                const result = {
                     format: 'json',
                     limit: 5,
                     addressdetails: 1,
@@ -75,8 +75,8 @@
 
         };
 
-        var unique = function(parsed) {
-            var filtered = [];
+        const unique = function(parsed) {
+            let filtered = [];
             $.each(parsed, function(index, element)
             {
                 filtered = $.map(filtered, function(el, ind)
@@ -91,12 +91,12 @@
 
         $.each(options.fields, function(key, value)
         {
-            var handle_field_completion = handle_auto_completion(value.dependencies);
+            const handle_field_completion = handle_auto_completion(value.dependencies);
 
             $("#" + key).autocomplete({
                 source: function (request, response) {
-                    var params = default_params(key, value.response && value.response.field, options.language);
-                    var request_params = {};
+                    const params = default_params(key, value.response && value.response.field, options.language);
+                    const request_params = {};
                     options.extra_params && $.each(options.extra_params, function(key, param) {
                         request_params[key] = typeof param == "function" ? param() : param;
                     });
@@ -122,7 +122,7 @@
         });
     };
 
-    var nominatim = {
+    const nominatim = {
 
         init : init
 
@@ -130,4 +130,4 @@
 
     window['nominatim'] = nominatim;
 
-})(jQuery);
+})(jQuery);
\ No newline at end of file
diff --git a/resources/bootswatch/darkly/.gitkeep b/resources/bootswatch/darkly/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/resources/bootswatch/flatly/.gitkeep b/resources/bootswatch/flatly/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/spark b/spark
index 856dc3f8a..61bc572b9 100644
--- a/spark
+++ b/spark
@@ -10,6 +10,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  * --------------------------------------------------------------------
  * CODEIGNITER COMMAND-LINE TOOLS
@@ -35,7 +38,7 @@ if (str_starts_with(PHP_SAPI, 'cgi')) {
  *---------------------------------------------------------------
  */
 
-$minPhpVersion = '8.1'; // If you update this, don't forget to update `public/index.php`.
+$minPhpVersion = '8.2'; // If you update this, don't forget to update `public/index.php`.
 if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
@@ -76,9 +79,9 @@ chdir(FCPATH);
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootSpark($paths));
+exit(Boot::bootSpark($paths));
diff --git a/tests/Config/AppTest.php b/tests/Config/AppTest.php
new file mode 100644
index 000000000..d3beeab3d
--- /dev/null
+++ b/tests/Config/AppTest.php
@@ -0,0 +1,442 @@
+<?php
+
+namespace Tests\Config;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\App;
+
+class AppTest extends CIUnitTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        putenv('app.allowedHostnames');
+        putenv('ALLOWED_HOSTNAMES');
+        unset($_ENV['app.allowedHostnames'], $_ENV['ALLOWED_HOSTNAMES']);
+        unset($_SERVER['app.allowedHostnames'], $_SERVER['ALLOWED_HOSTNAMES']);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        // Clean up environment
+        putenv('CI_ENVIRONMENT');
+        putenv('app.allowedHostnames');
+        putenv('ALLOWED_HOSTNAMES');
+        unset($_SERVER['HTTP_HOST']);
+        unset($_ENV['app.allowedHostnames'], $_ENV['ALLOWED_HOSTNAMES']);
+        unset($_SERVER['app.allowedHostnames'], $_SERVER['ALLOWED_HOSTNAMES']);
+        $_SERVER['CI_ENVIRONMENT'] = 'testing';
+    }
+
+    public function testGetValidHostReturnsHostWhenValid(): void
+    {
+        $app = new class extends App {
+            public array $allowedHostnames = ['example.com', 'www.example.com'];
+
+            public function __construct() {}
+        };
+
+        $reflection = new \ReflectionClass($app);
+        $method = $reflection->getMethod('getValidHost');
+        $method->setAccessible(true);
+
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $host = $method->invoke($app);
+        $this->assertEquals('example.com', $host);
+
+        $_SERVER['HTTP_HOST'] = 'www.example.com';
+        $host = $method->invoke($app);
+        $this->assertEquals('www.example.com', $host);
+    }
+
+    public function testGetValidHostReturnsFallbackForInvalidHost(): void
+    {
+        $app = new class extends App {
+            public array $allowedHostnames = ['example.com', 'www.example.com'];
+
+            public function __construct() {}
+        };
+
+        $reflection = new \ReflectionClass($app);
+        $method = $reflection->getMethod('getValidHost');
+        $method->setAccessible(true);
+
+        $_SERVER['HTTP_HOST'] = 'malicious.com';
+        $host = $method->invoke($app);
+        $this->assertEquals('example.com', $host);
+
+        $_SERVER['HTTP_HOST'] = 'evil.org';
+        $host = $method->invoke($app);
+        $this->assertEquals('example.com', $host);
+    }
+
+    public function testGetValidHostReturnsLocalhostInDevelopmentWhenNoWhitelist(): void
+    {
+        // Set development environment
+        putenv('CI_ENVIRONMENT=development');
+
+        $app = new class extends App {
+            public array $allowedHostnames = [];
+
+            public function __construct() {}
+        };
+
+        $reflection = new \ReflectionClass($app);
+        $method = $reflection->getMethod('getValidHost');
+        $method->setAccessible(true);
+
+        $_SERVER['HTTP_HOST'] = 'malicious.com';
+        $host = $method->invoke($app);
+        $this->assertEquals('localhost', $host);
+
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $host = $method->invoke($app);
+        $this->assertEquals('localhost', $host);
+    }
+
+    public function testGetValidHostThrowsExceptionInProductionWhenNoWhitelist(): void
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('allowedHostnames is not configured');
+
+        $_SERVER['CI_ENVIRONMENT'] = 'production';
+        putenv('CI_ENVIRONMENT=production');
+
+        $app = new class extends App {
+            public array $allowedHostnames = [];
+
+            public function __construct() {}
+        };
+
+        $reflection = new \ReflectionClass($app);
+        $method = $reflection->getMethod('getValidHost');
+        $method->setAccessible(true);
+
+        $_SERVER['HTTP_HOST'] = 'malicious.com';
+        $method->invoke($app);
+    }
+
+    public function testGetValidHostHandlesMissingHttpHost(): void
+    {
+        $app = new class extends App {
+            public array $allowedHostnames = ['example.com'];
+
+            public function __construct() {}
+        };
+
+        $reflection = new \ReflectionClass($app);
+        $method = $reflection->getMethod('getValidHost');
+        $method->setAccessible(true);
+
+        unset($_SERVER['HTTP_HOST']);
+        $host = $method->invoke($app);
+        $this->assertEquals('example.com', $host);
+    }
+
+    public function testBaseURLContainsValidHost(): void
+    {
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new class extends App {
+            public array $allowedHostnames = ['example.com'];
+        };
+
+        $this->assertStringContainsString('example.com', $app->baseURL);
+    }
+
+    public function testBaseURLUsesFallbackHostWhenInvalidHostProvided(): void
+    {
+        $_SERVER['HTTP_HOST'] = 'malicious.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new class extends App {
+            public array $allowedHostnames = ['example.com'];
+        };
+
+        $this->assertStringContainsString('example.com', $app->baseURL);
+        $this->assertStringNotContainsString('malicious.com', $app->baseURL);
+    }
+
+    public function testEnvAllowedHostnamesParsedAsCommaSeparated(): void
+    {
+        // Set environment variable
+        putenv('app.allowedHostnames=example.com,www.example.com,demo.example.com');
+
+        $_SERVER['HTTP_HOST'] = 'www.example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Constructor should parse comma-separated values
+        $this->assertEquals(['example.com', 'www.example.com', 'demo.example.com'], $app->allowedHostnames);
+        $this->assertStringContainsString('www.example.com', $app->baseURL);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+    }
+
+    public function testEnvAllowedHostnamesTrimmedWhitespace(): void
+    {
+        // Set environment variable with whitespace
+        putenv('app.allowedHostnames= example.com , www.example.com , demo.example.com ');
+
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Values should be trimmed
+        $this->assertEquals(['example.com', 'www.example.com', 'demo.example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+    }
+
+    public function testEnvAllowedHostnamesSingleValue(): void
+    {
+        // Set environment variable with single value
+        putenv('app.allowedHostnames=localhost');
+
+        $_SERVER['HTTP_HOST'] = 'localhost';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Single value should work
+        $this->assertEquals(['localhost'], $app->allowedHostnames);
+        $this->assertStringContainsString('localhost', $app->baseURL);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+    }
+
+    public function testEnvAllowedHostnamesEmptyStringNotConfigured(): void
+    {
+        // Set environment variable to empty string
+        putenv('app.allowedHostnames=');
+
+        // Set development environment
+        putenv('CI_ENVIRONMENT=development');
+
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Empty string should be treated as not configured
+        $this->assertEquals([], $app->allowedHostnames);
+
+        // In development, should fall back to localhost
+        $this->assertStringContainsString('localhost', $app->baseURL);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+        putenv('CI_ENVIRONMENT');
+    }
+
+    public function testEnvAllowedHostnamesFiltersEmptyEntries(): void
+    {
+        // Trailing comma should not produce empty entry
+        putenv('app.allowedHostnames=example.com,');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+        $this->assertEquals(['example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+
+        // Leading comma should not produce empty entry
+        putenv('app.allowedHostnames=,example.com');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+
+        $app = new App();
+        $this->assertEquals(['example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+
+        // Whitespace-only entry should be filtered
+        putenv('app.allowedHostnames=example.com, ,www.example.com');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+
+        $app = new App();
+        $this->assertEquals(['example.com', 'www.example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+
+        // All-whitespace value should be treated as not configured
+        putenv('CI_ENVIRONMENT=development');
+        putenv('app.allowedHostnames= , , ');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+
+        $app = new App();
+        $this->assertEquals([], $app->allowedHostnames);
+        $this->assertStringContainsString('localhost', $app->baseURL);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+        putenv('CI_ENVIRONMENT');
+    }
+
+    public function testAllowedHostnamesEnvVarParsedAsCommaSeparated(): void
+    {
+        // Set ALLOWED_HOSTNAMES environment variable
+        putenv('ALLOWED_HOSTNAMES=example.com,www.example.com,demo.example.com');
+
+        $_SERVER['HTTP_HOST'] = 'www.example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Constructor should parse comma-separated values
+        $this->assertEquals(['example.com', 'www.example.com', 'demo.example.com'], $app->allowedHostnames);
+        $this->assertStringContainsString('www.example.com', $app->baseURL);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+    }
+
+    public function testAllowedHostnamesEnvVarTakesPrecedenceOverDotEnv(): void
+    {
+        // Set both environment variables
+        putenv('ALLOWED_HOSTNAMES=allowed1.com,allowed2.com');
+        putenv('app.allowedHostnames=dotenv1.com,dotenv2.com');
+
+        $_SERVER['HTTP_HOST'] = 'allowed1.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // ALLOWED_HOSTNAMES should take precedence
+        $this->assertEquals(['allowed1.com', 'allowed2.com'], $app->allowedHostnames);
+        $this->assertStringContainsString('allowed1.com', $app->baseURL);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+        putenv('app.allowedHostnames');
+    }
+
+    public function testAllowedHostnamesEnvVarFallsBackToDotEnv(): void
+    {
+        // Only set app.allowedHostnames, not ALLOWED_HOSTNAMES
+        putenv('app.allowedHostnames=dotenv1.com,dotenv2.com');
+
+        $_SERVER['HTTP_HOST'] = 'dotenv1.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Should fall back to app.allowedHostnames
+        $this->assertEquals(['dotenv1.com', 'dotenv2.com'], $app->allowedHostnames);
+        $this->assertStringContainsString('dotenv1.com', $app->baseURL);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+    }
+
+    public function testAllowedHostnamesEnvVarTrimmedWhitespace(): void
+    {
+        // Set environment variable with whitespace
+        putenv('ALLOWED_HOSTNAMES= example.com , www.example.com , demo.example.com ');
+
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Values should be trimmed
+        $this->assertEquals(['example.com', 'www.example.com', 'demo.example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+    }
+
+    public function testAllowedHostnamesEnvVarFiltersEmptyEntries(): void
+    {
+        // Trailing comma should not produce empty entry
+        putenv('ALLOWED_HOSTNAMES=example.com,');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+        $this->assertEquals(['example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+
+        // Whitespace-only entry should be filtered
+        putenv('ALLOWED_HOSTNAMES=example.com, ,www.example.com');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+
+        $app = new App();
+        $this->assertEquals(['example.com', 'www.example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+    }
+
+    public function testEnvAllowedHostnamesLiteralFalse(): void
+    {
+        putenv('app.allowedHostnames=false');
+
+        $_SERVER['HTTP_HOST'] = 'false';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        $this->assertEquals(['false'], $app->allowedHostnames);
+
+        putenv('app.allowedHostnames');
+    }
+
+    public function testEnvAllowedHostnamesLiteralNull(): void
+    {
+        putenv('app.allowedHostnames=null');
+
+        $_SERVER['HTTP_HOST'] = 'null';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        $this->assertEquals(['null'], $app->allowedHostnames);
+
+        putenv('app.allowedHostnames');
+    }
+
+    public function testEnvAllowedHostnamesWhitespaceOnly(): void
+    {
+        putenv('app.allowedHostnames=   ');
+        putenv('CI_ENVIRONMENT=development');
+
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        $this->assertEquals([], $app->allowedHostnames);
+        $this->assertStringContainsString('localhost', $app->baseURL);
+
+        putenv('app.allowedHostnames');
+        putenv('CI_ENVIRONMENT');
+    }
+}
diff --git a/tests/Config/EncryptionTest.php b/tests/Config/EncryptionTest.php
new file mode 100644
index 000000000..071e04519
--- /dev/null
+++ b/tests/Config/EncryptionTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Tests\Config;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Encryption;
+
+/**
+ * Pure-function tests for the app Encryption config's key helpers
+ * (resolveKey() / parseKey()) — no global env mutation, so no cross-test leaks.
+ */
+class EncryptionTest extends CIUnitTestCase
+{
+    public function testHighestPrecedenceNonEmptySourceWins(): void
+    {
+        $this->assertSame(
+            'server-key',
+            Encryption::resolveKey('server-key', 'env-key', 'getenv-key', 'docker-key')
+        );
+    }
+
+    public function testEmptyStringDoesNotShadowLaterSource(): void
+    {
+        // A `??`-based lookup would stop at a higher-precedence empty string;
+        // the cascade must skip empties and reach the real key.
+        $this->assertSame(
+            'getenv-key',
+            Encryption::resolveKey('', '', 'getenv-key', 'docker-key')
+        );
+
+        $this->assertSame(
+            'docker-key',
+            Encryption::resolveKey('', '', '', 'docker-key')
+        );
+    }
+
+    public function testAllEmptySourcesReturnEmptyString(): void
+    {
+        $this->assertSame('', Encryption::resolveKey('', '', '', ''));
+    }
+
+    public function testPrefixedFallbackKeyIsDecoded(): void
+    {
+        // Fallback-selected keys (notably ENCRYPTION_KEY, which BaseConfig
+        // never reads) must be decoded like BaseConfig does, so a
+        // hex2bin:/base64:-prefixed value is not stored verbatim.
+        $this->assertSame("\xab\xcd", Encryption::parseKey('hex2bin:abcd'));
+        $this->assertSame("\x68\x65\x6c\x6c\x6f", Encryption::parseKey('base64:aGVsbG8='));
+
+        // No prefix / empty value passes through unchanged.
+        $this->assertSame('plain-key', Encryption::parseKey('plain-key'));
+        $this->assertSame('', Encryption::parseKey(''));
+    }
+}
diff --git a/tests/Config/Validation/OSPOSRulesTest.php b/tests/Config/Validation/OSPOSRulesTest.php
new file mode 100644
index 000000000..6371db6bd
--- /dev/null
+++ b/tests/Config/Validation/OSPOSRulesTest.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace Tests\Config\Validation;
+
+use App\Config\Validation\OSPOSRules;
+use App\Models\Employee;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\OSPOS;
+use Config\Services;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * Regression tests for the login validation flow in OSPOSRules::login_check().
+ *
+ * Guards the fix from commit 5dea748b0: gcaptcha must be validated before
+ * Employee::login() is attempted, and the error contract must be preserved.
+ */
+class OSPOSRulesTest extends CIUnitTestCase
+{
+    protected function tearDown(): void
+    {
+        Factories::reset();
+        Services::reset();
+
+        parent::tearDown();
+    }
+
+    public function testFailedCaptchaReturnsWithoutCallingLogin(): void
+    {
+        $this->injectSettings(['gcaptcha_enable' => '1', 'gcaptcha_secret_key' => 'test-key']);
+        $this->injectRequest();
+        $employee = $this->injectEmployeeMock();
+        $employee->expects($this->never())->method('login');
+
+        $rules = $this->rulesWithCaptchaResult(false);
+        $error = null;
+
+        $result = $rules->login_check('admin', 'username,password', ['password' => 'secret'], $error);
+
+        $this->assertFalse($result);
+        $this->assertSame(lang('Login.invalid_gcaptcha'), $error);
+    }
+
+    public function testSuccessfulCaptchaWithInvalidCredentialsReturnsLoginError(): void
+    {
+        $this->injectSettings(['gcaptcha_enable' => '1', 'gcaptcha_secret_key' => 'test-key']);
+        $this->injectRequest();
+        $employee = $this->injectEmployeeMock();
+        $employee->expects($this->once())
+            ->method('login')
+            ->with('admin', 'wrong-password')
+            ->willReturn(false);
+
+        $rules = $this->rulesWithCaptchaResult(true);
+        $error = null;
+
+        $result = $rules->login_check('admin', 'username,password', ['password' => 'wrong-password'], $error);
+
+        $this->assertFalse($result);
+        $this->assertSame(lang('Login.invalid_username_and_password'), $error);
+    }
+
+    public function testCaptchaDisabledWithInvalidCredentialsReturnsLoginError(): void
+    {
+        $this->injectSettings([]);
+        $this->injectRequest();
+        $employee = $this->injectEmployeeMock();
+        $employee->expects($this->once())
+            ->method('login')
+            ->with('admin', 'wrong-password')
+            ->willReturn(false);
+
+        $rules = new OSPOSRules();
+        $error = null;
+
+        $result = $rules->login_check('admin', 'username,password', ['password' => 'wrong-password'], $error);
+
+        $this->assertFalse($result);
+        $this->assertSame(lang('Login.invalid_username_and_password'), $error);
+    }
+
+    public function testSuccessfulCaptchaWithValidCredentialsPasses(): void
+    {
+        $this->injectSettings(['gcaptcha_enable' => '1', 'gcaptcha_secret_key' => 'test-key']);
+        $this->injectRequest();
+        $employee = $this->injectEmployeeMock();
+        $employee->expects($this->once())
+            ->method('login')
+            ->with('admin', 'correct-password')
+            ->willReturn(true);
+
+        $rules = $this->rulesWithCaptchaResult(true);
+        $error = null;
+
+        $result = $rules->login_check('admin', 'username,password', ['password' => 'correct-password'], $error);
+
+        $this->assertTrue($result);
+        $this->assertNull($error);
+    }
+
+    /**
+     * @dataProvider validPathStrictProvider
+     */
+    public function testValidPathStrict(string $candidate, bool $expected): void
+    {
+        $rules = new OSPOSRules();
+
+        $this->assertSame($expected, $rules->valid_path_strict($candidate));
+    }
+
+    public static function validPathStrictProvider(): array
+    {
+        return [
+            'plain sendmail path'                    => ['/usr/sbin/sendmail', true],
+            'plain php path'                         => ['/usr/bin/php', true],
+            'path with dash and underscore'          => ['/opt/my-mail_bin/sendmail.exe', true],
+            'path with trailing args'                => ['/usr/sbin/sendmail -t -i', true],
+            'windows path'                           => ['C:\wamp64\bin\sendmail\sendmail.exe', true],
+            'windows path with trailing args'        => ['C:\wamp64\bin\sendmail\sendmail.exe -t -i', true],
+            'empty string'                           => ['', false],
+            'trailing newline bypass payload'        => ["/usr/bin/php\n", false],
+            'trailing newline plus injected command' => ["/usr/bin/php\nid", false],
+            'embedded newline mid-string'            => ["/usr/bin/php\n/bin/sh", false],
+            'semicolon injection'                    => ['/usr/bin/php;id', false],
+            'pipe injection'                         => ['/usr/bin/php|id', false],
+            'ampersand injection'                    => ['/usr/bin/php & id', false],
+            'backtick injection'                     => ['/usr/bin/php `id`', false],
+            'dollar subshell injection'               => ['/usr/bin/php $(id)', false],
+            'quoted args'                             => ['/usr/bin/php -r "phpinfo();"', false],
+            'redirect injection'                     => ['/usr/bin/php > /tmp/out', false],
+            'cmd.exe env var expansion'               => ['C:\path\sendmail.exe %COMSPEC%', false],
+            'cmd.exe escape char'                     => ['C:\path\sendmail.exe ^& calc', false],
+            'cmd.exe command chaining'                => ['C:\path\sendmail.exe && calc', false],
+        ];
+    }
+
+    private function injectSettings(array $settings): void
+    {
+        $ospos = new OSPOS();
+        $ospos->settings = $settings;
+        Factories::injectMock('config', OSPOS::class, $ospos);
+    }
+
+    private function injectRequest(): void
+    {
+        $request = $this->getMockBuilder(IncomingRequest::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getPost', 'getIPAddress', 'getLocale'])
+            ->getMock();
+        $request->method('getPost')->willReturn('dummy-captcha-response');
+        $request->method('getLocale')->willReturn('en');
+        $request->method('getIPAddress')->willReturn('127.0.0.1');
+        Services::injectMock('request', $request);
+    }
+
+    private function injectEmployeeMock(): MockObject
+    {
+        $employee = $this->getMockBuilder(Employee::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['login'])
+            ->getMock();
+        Factories::injectMock('models', Employee::class, $employee);
+
+        return $employee;
+    }
+
+    /**
+     * Builds an OSPOSRules instance whose gcaptcha_check() returns a fixed
+     * result, so the captcha outcome can be simulated without network access.
+     */
+    private function rulesWithCaptchaResult(bool $captcha_result): OSPOSRules
+    {
+        return new class ($captcha_result) extends OSPOSRules {
+            private bool $captcha_result;
+
+            public function __construct(bool $captcha_result)
+            {
+                $this->captcha_result = $captcha_result;
+            }
+
+            protected function gcaptcha_check($response): bool
+            {
+                return $this->captcha_result;
+            }
+        };
+    }
+}
diff --git a/tests/Controllers/CashupControllerTest.php b/tests/Controllers/CashupControllerTest.php
new file mode 100644
index 000000000..6373daabb
--- /dev/null
+++ b/tests/Controllers/CashupControllerTest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Tests\Controllers;
+
+use App\Models\Cashup;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Database\Config;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+use Config\OSPOS;
+use Tests\Support\EmployeeFixtureTrait;
+
+class CashupControllerTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+    use EmployeeFixtureTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $seedOnce    = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    private static bool $doneBootstrap = false;
+
+    protected function setUp(): void
+    {
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
+        parent::setUp();
+
+        $ospos = new OSPOS();
+        $ospos->settings = [
+            'company'             => 'Test Co',
+            'dateformat'          => 'Y-m-d',
+            'timeformat'          => 'H:i:s',
+            'number_locale'       => 'en_US',
+            'currency_decimals'   => 2,
+            'thousands_separator' => ',',
+        ];
+        Factories::injectMock('config', OSPOS::class, $ospos);
+    }
+
+    protected function tearDown(): void
+    {
+        Factories::reset();
+        parent::tearDown();
+    }
+
+    protected function createCashupEmployee(): int
+    {
+        return $this->createEmployee(
+            first_name: 'Cashier',
+            last_name:  'Cashup',
+            email:      'cashup.' . uniqid() . '@test.com',
+            username:   'cashup_' . uniqid(),
+            grants: [
+                ['permission_id' => 'cashups', 'menu_group' => 'home'],
+            ],
+        );
+    }
+
+    protected function loginAs(int $personId): void
+    {
+        $this->withSession([
+            'person_id'  => $personId,
+            'menu_group' => 'home',
+        ]);
+    }
+
+    public function testTamperedTotalIsRecomputedServerSide(): void
+    {
+        $cashierId = $this->createCashupEmployee();
+        $this->loginAs($cashierId);
+
+        // Component amounts only sum to (50 - 0 - 0 + 10 + 0 + 0) = 60, but the
+        // client claims a total of 1000.00. The server must store 60, not 1000.
+        $response = $this->post('/cashups/save/-1', [
+            'open_date'            => '2026-09-05 08:00:00',
+            'close_date'           => '2026-09-05 16:00:00',
+            'open_amount_cash'     => '0',
+            'transfer_amount_cash' => '0',
+            'closed_amount_cash'   => '50',
+            'closed_amount_due'    => '10',
+            'closed_amount_card'   => '0',
+            'closed_amount_check'  => '0',
+            'closed_amount_total'  => '1000.00',
+            'open_employee_id'     => '999999',
+            'close_employee_id'    => '999999',
+            'description'          => 'Test cashup - tampered total',
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+
+        $cashup = model(Cashup::class)->get_info($result['id']);
+        $this->assertEquals(60.0, (float) $cashup->closed_amount_total);
+    }
+
+    public function testConsistentTotalIsStoredAndOwnerIsForcedToAuthenticatedUser(): void
+    {
+        $cashierId = $this->createCashupEmployee();
+        $this->loginAs($cashierId);
+
+        // 100 - 20 - 5 + 15 + 40 + 25 = 155. The client also tries to attribute
+        // the cashup to other employees (777/888); the server must force the
+        // authenticated user's person_id.
+        $response = $this->post('/cashups/save/-1', [
+            'open_date'            => '2026-09-05 08:00:00',
+            'close_date'           => '2026-09-05 16:00:00',
+            'open_amount_cash'     => '20',
+            'transfer_amount_cash' => '5',
+            'closed_amount_cash'   => '100',
+            'closed_amount_due'    => '15',
+            'closed_amount_card'   => '40',
+            'closed_amount_check'  => '25',
+            'closed_amount_total'  => '155',
+            'open_employee_id'     => '777',
+            'close_employee_id'    => '888',
+            'description'          => 'Test cashup - consistent total',
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+
+        $cashup = model(Cashup::class)->get_info($result['id']);
+        $this->assertEquals(155.0, (float) $cashup->closed_amount_total);
+        $this->assertEquals($cashierId, (int) $cashup->open_employee_id);
+        $this->assertEquals($cashierId, (int) $cashup->close_employee_id);
+    }
+}
diff --git a/tests/Controllers/ConfigTest.php b/tests/Controllers/ConfigTest.php
new file mode 100644
index 000000000..a9c913096
--- /dev/null
+++ b/tests/Controllers/ConfigTest.php
@@ -0,0 +1,401 @@
+<?php
+
+namespace Tests\Controllers;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+
+class ConfigTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function resetSession(): void
+    {
+        $this->withSession(['person_id' => 1, 'menu_group' => 'office']);
+    }
+
+    // ========== Valid Mailpath Tests ==========
+
+    public function testValidMailpath_AcceptsStandardPath(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveEmail', [
+            'protocol' => 'sendmail',
+            'mailpath' => '/usr/sbin/sendmail'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testValidMailpath_AcceptsPathWithDots(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveEmail', [
+            'protocol' => 'sendmail',
+            'mailpath' => '/usr/local/bin/sendmail.local'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testValidMailpath_AcceptsEmptyStringForNonSendmailProtocol(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveEmail', [
+            'protocol' => 'mail',
+            'mailpath' => ''
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testSendmailProtocol_RequiresMailpath(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveEmail', [
+            'protocol' => 'sendmail',
+            'mailpath' => ''
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertStringContainsString('invalid', strtolower($result['message']));
+    }
+
+    public function testNonSendmailProtocol_RejectsMaliciousMailpath(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveEmail', [
+            'protocol' => 'smtp',
+            'mailpath' => '/usr/sbin/sendmail; cat /etc/passwd'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertStringContainsString('invalid', strtolower($result['message']));
+    }
+
+    // ========== Command Injection Prevention Tests ==========
+
+    public function testMailpath_RejectsCommandInjection_Semicolon(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveEmail', [
+            'protocol' => 'sendmail',
+            'mailpath' => '/usr/sbin/sendmail; cat /etc/passwd'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertStringContainsString('invalid', strtolower($result['message']));
+    }
+
+    public function testMailpath_AcceptsSendmailPathWithTrailingArgs(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveEmail', [
+            'protocol' => 'sendmail',
+            'mailpath' => '/usr/sbin/sendmail -t -i'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    // ========== postSaveLocale: payment_reference_code_min / max ==========
+
+    private function baseLocalePayload(array $overrides = []): array
+    {
+        return array_merge([
+            'language'         => 'en:english',
+            'currency_symbol'  => '$',
+            'currency_code'    => 'USD',
+            'timezone'         => 'UTC',
+            'dateformat'       => 'Y-m-d',
+            'timeformat'       => 'H:i',
+            'number_locale'    => 'en_US',
+            'currency_decimals' => '2',
+            'tax_decimals'     => '2',
+            'quantity_decimals' => '2',
+            'cash_decimals'    => '2',
+            'country_codes'    => 'US',
+            'payment_options_order' => '',
+            'cash_rounding_code'    => '',
+            'financial_year'        => '1',
+            'payment_reference_code_min' => '3',
+            'payment_reference_code_max' => '20',
+        ], $overrides);
+    }
+
+    public function testSaveLocale_AcceptsValidReferenceCodeMinMax(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'payment_reference_code_min' => '3',
+            'payment_reference_code_max' => '20',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testSaveLocale_AcceptsMinEqualToMax(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'payment_reference_code_min' => '10',
+            'payment_reference_code_max' => '10',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testSaveLocale_RejectsNonNumericReferenceCodeLimits(): void
+    {
+        $this->resetSession();
+
+        // Non-numeric values fail integer validation, so the controller returns success===false.
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'payment_reference_code_min' => 'abc',
+            'payment_reference_code_max' => 'xyz',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testSaveLocale_RejectsZeroReferenceCodeMin(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'payment_reference_code_min' => '0',
+            'payment_reference_code_max' => '20',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testSaveLocale_RejectsNegativeReferenceCodeMin(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'payment_reference_code_min' => '-1',
+            'payment_reference_code_max' => '20',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testSaveLocale_RejectsMaxLessThanMin(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'payment_reference_code_min' => '10',
+            'payment_reference_code_max' => '5',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    // ========== postSaveLocale: language_code allow-list (GHSA) ==========
+
+    public function testSaveLocale_RejectsPathTraversalLanguageCode(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'language' => '../../public/uploads:evil',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertStringContainsString('language', strtolower($result['message']));
+    }
+
+    public function testSaveLocale_RejectsLanguageCodeWithBackslash(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'language' => '..\\..\\public\\uploads:evil',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testSaveLocale_RejectsUnknownLanguage(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'language' => 'xx:nonexistent',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testSaveLocale_RejectsCaseMismatchedLanguage(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveLocale', $this->baseLocalePayload([
+            'language' => 'en:English',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    // ========== postSaveGeneral: theme validation ==========
+
+    private function baseGeneralPayload(array $overrides = []): array
+    {
+        return array_merge([
+            'theme'                          => 'flatly',
+            'login_form'                     => 'floating_labels',
+            'default_sales_discount_type'    => '',
+            'default_sales_discount'         => '0.00',
+            'default_receivings_discount_type' => '',
+            'default_receivings_discount'    => '0.00',
+            'enforce_privacy'                => '',
+            'receiving_calculate_average_price' => '',
+            'lines_per_page'                 => '20',
+            'notify_horizontal_position'     => 'bottom',
+            'notify_vertical_position'       => 'right',
+            'image_max_width'                => '1000',
+            'image_max_height'               => '1000',
+            'image_max_size'                 => '5120',
+            'image_allowed_types'            => ['jpg', 'jpeg', 'gif', 'png'],
+            'gcaptcha_enable'                => '',
+            'gcaptcha_secret_key'            => '',
+            'gcaptcha_site_key'              => '',
+            'suggestions_first_column'       => 'name',
+            'suggestions_second_column'      => '',
+            'suggestions_third_column'       => '',
+            'giftcard_number'                => '',
+            'derive_sale_quantity'           => '',
+            'multi_pack_enabled'             => '',
+            'include_hsn'                    => '',
+            'category_dropdown'              => '',
+            'show_office_group'              => '',
+        ], $overrides);
+    }
+
+    public function testSaveGeneral_AcceptsValidTheme(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveGeneral', $this->baseGeneralPayload([
+            'theme' => 'darkly',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testSaveGeneral_AcceptsEmptyTheme(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveGeneral', $this->baseGeneralPayload([
+            'theme' => '',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testSaveGeneral_RejectsUnknownTheme(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveGeneral', $this->baseGeneralPayload([
+            'theme' => 'nonexistent',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertStringContainsString('theme', strtolower($result['message']));
+    }
+
+    public function testSaveGeneral_RejectsXssPayloadInTheme(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveGeneral', $this->baseGeneralPayload([
+            'theme' => 'x" onerror="alert(document.domain)" x="',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertStringContainsString('theme', strtolower($result['message']));
+    }
+
+    public function testSaveGeneral_RejectsNonThemeDirectory(): void
+    {
+        $this->resetSession();
+
+        $response = $this->post('/config/saveGeneral', $this->baseGeneralPayload([
+            'theme' => 'fonts',
+        ]));
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertStringContainsString('theme', strtolower($result['message']));
+    }
+}
\ No newline at end of file
diff --git a/tests/Controllers/CustomersCsvImportTest.php b/tests/Controllers/CustomersCsvImportTest.php
new file mode 100644
index 000000000..fc30a1288
--- /dev/null
+++ b/tests/Controllers/CustomersCsvImportTest.php
@@ -0,0 +1,298 @@
+<?php
+
+namespace Tests\Controllers;
+
+use CodeIgniter\Database\Config;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+use App\Models\Customer;
+use App\Models\Employee;
+
+class CustomersCsvImportTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+
+    protected $migrate = true;
+    protected $migrateOnce = true;
+    protected $refresh = false;
+    protected $namespace = null;
+
+    protected Customer $customer;
+    protected Employee $employee;
+
+    private static bool $doneBootstrap = false;
+
+    protected function setUp(): void
+    {
+        // Reset the test database to a clean schema on the first test in this
+        // class so leftover customers with the same emails from prior runs
+        // cannot be rejected as duplicates by the import (check_email_exists).
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
+        parent::setUp();
+        // Reset any stale transaction state left on the shared in-process DB
+        // connection by a previous test.
+        $this->db->resetTransStatus();
+
+        $this->customer = model(Customer::class);
+        $this->employee = model(Employee::class);
+
+        helper('test');
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+    }
+
+    protected function loginAsEmployee(): void
+    {
+        $this->withSession(['person_id' => 1, 'menu_group' => 'office']);
+    }
+
+    protected function createCsvFile(array $rows): string
+    {
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_');
+        
+        $handle = fopen($tempFile, 'w');
+        foreach ($rows as $row) {
+            fputcsv($handle, $row);
+        }
+        fclose($handle);
+        
+        return $tempFile;
+    }
+
+    protected function findCustomerByEmail(string $email): ?array
+    {
+        return $this->customer
+            ->select('customers.*, people.*')
+            ->join('people', 'people.person_id = customers.person_id')
+            ->where('people.email', $email)
+            ->first();
+    }
+
+    protected function findCustomersByEmailLike(string $needle): ?array
+    {
+        return $this->customer
+            ->select('customers.*, people.*')
+            ->join('people', 'people.person_id = customers.person_id')
+            ->where('people.email LIKE', '%' . $needle . '%')
+            ->first();
+    }
+
+    public function testValidEmailIsAccepted(): void
+    {
+        $this->loginAsEmployee();
+
+        $csvContent = [
+            ['First Name', 'Last Name', 'Gender', 'Consent', 'Email', 'Phone', 'Address 1', 'Address 2', 'City', 'State', 'Zip', 'Country', 'Comments', 'Company', 'Account Number', 'Discount', 'Discount Type', 'Taxable'],
+            ['John', 'Doe', '1', '1', 'john.doe@example.com', '555-1234', '123 Main St', '', 'Springfield', 'IL', '62701', 'US', '', '', '', '', '', '']
+        ];
+
+        $tempFile = $this->createCsvFile($csvContent);
+
+        $_FILES['file_path'] = [
+            'name' => 'test.csv',
+            'type' => 'text/csv',
+            'tmp_name' => $tempFile,
+            'error' => UPLOAD_ERR_OK,
+            'size' => filesize($tempFile)
+        ];
+
+        $result = $this->post('/customers/importCsvFile');
+
+        $result->assertOK();
+        $resultBody = json_decode($result->getJSON(), true);
+        $this->assertTrue($resultBody['success'], 'Import should fully succeed');
+
+        $importedCustomer = $this->findCustomerByEmail('john.doe@example.com');
+        $this->assertNotNull($importedCustomer);
+
+        unlink($tempFile);
+    }
+
+    public function testInvalidEmailIsRejected(): void
+    {
+        $this->loginAsEmployee();
+
+        $csvContent = [
+            ['First Name', 'Last Name', 'Gender', 'Consent', 'Email', 'Phone', 'Address 1', 'Address 2', 'City', 'State', 'Zip', 'Country', 'Comments', 'Company', 'Account Number', 'Discount', 'Discount Type', 'Taxable'],
+            ['John', 'Doe', '1', '1', 'not-an-email', '555-1234', '123 Main St', '', 'Springfield', 'IL', '62701', 'US', '', '', '', '', '', '']
+        ];
+
+        $tempFile = $this->createCsvFile($csvContent);
+
+        $_FILES['file_path'] = [
+            'name' => 'test.csv',
+            'type' => 'text/csv',
+            'tmp_name' => $tempFile,
+            'error' => UPLOAD_ERR_OK,
+            'size' => filesize($tempFile)
+        ];
+
+        $result = $this->post('/customers/importCsvFile');
+
+        $result->assertOK();
+        
+        $resultBody = json_decode($result->getJSON(), true);
+        $this->assertFalse($resultBody['success'], 'Import should fail for invalid email');
+        $this->assertStringContainsString('Row 1', $resultBody['message'], 'Error message should reference failing row');
+        $this->assertStringContainsString('Invalid email format', $resultBody['message'], 'Error message should mention email validation');
+
+        $importedCustomer = $this->findCustomerByEmail('not-an-email');
+        $this->assertNull($importedCustomer, 'Customer with invalid email should not be imported');
+
+        unlink($tempFile);
+    }
+
+    public function testXssPayloadInEmailIsSanitized(): void
+    {
+        $this->loginAsEmployee();
+
+        $maliciousEmail = '<script>alert("xss")</script>@example.com';
+
+        $csvContent = [
+            ['First Name', 'Last Name', 'Gender', 'Consent', 'Email', 'Phone', 'Address 1', 'Address 2', 'City', 'State', 'Zip', 'Country', 'Comments', 'Company', 'Account Number', 'Discount', 'Discount Type', 'Taxable'],
+            ['John', 'Doe', '1', '1', $maliciousEmail, '555-1234', '123 Main St', '', 'Springfield', 'IL', '62701', 'US', '', '', '', '', '', '']
+        ];
+
+        $tempFile = $this->createCsvFile($csvContent);
+
+        $_FILES['file_path'] = [
+            'name' => 'test.csv',
+            'type' => 'text/csv',
+            'tmp_name' => $tempFile,
+            'error' => UPLOAD_ERR_OK,
+            'size' => filesize($tempFile)
+        ];
+
+        $result = $this->post('/customers/importCsvFile');
+
+        $result->assertOK();
+
+        $importedCustomer = $this->findCustomersByEmailLike('example.com');
+        
+        $this->assertNotNull($importedCustomer, 'Customer should be imported after sanitization');
+        $this->assertStringNotContainsString('<script>', $importedCustomer['email'], 'Script tags should be removed');
+        $this->assertStringNotContainsString('</script>', $importedCustomer['email'], 'Script tags should be removed');
+
+        unlink($tempFile);
+    }
+
+    public function testMixedValidAndInvalidEmails(): void
+    {
+        $this->loginAsEmployee();
+
+        $csvContent = [
+            ['First Name', 'Last Name', 'Gender', 'Consent', 'Email', 'Phone', 'Address 1', 'Address 2', 'City', 'State', 'Zip', 'Country', 'Comments', 'Company', 'Account Number', 'Discount', 'Discount Type', 'Taxable'],
+            ['Valid', 'User', '1', '1', 'valid@example.com', '555-1111', '123 Main St', '', 'City1', 'ST', '12345', 'US', '', '', '', '', '', ''],
+            ['Invalid', 'User', '1', '1', 'invalid-email', '555-2222', '456 Oak Ave', '', 'City2', 'ST', '23456', 'US', '', '', '', '', '', ''],
+            ['Another', 'Valid', '1', '1', 'another@example.com', '555-3333', '789 Pine Rd', '', 'City3', 'ST', '34567', 'US', '', '', '', '', '', '']
+        ];
+
+        $tempFile = $this->createCsvFile($csvContent);
+
+        $_FILES['file_path'] = [
+            'name' => 'test.csv',
+            'type' => 'text/csv',
+            'tmp_name' => $tempFile,
+            'error' => UPLOAD_ERR_OK,
+            'size' => filesize($tempFile)
+        ];
+
+        $result = $this->post('/customers/importCsvFile');
+
+        $result->assertOK();
+
+        $validCustomer1 = $this->findCustomerByEmail('valid@example.com');
+        $this->assertNotNull($validCustomer1, 'Valid customer should be imported');
+
+        $validCustomer2 = $this->findCustomerByEmail('another@example.com');
+        $this->assertNotNull($validCustomer2, 'Another valid customer should be imported');
+
+        $invalidCustomer = $this->findCustomerByEmail('invalid-email');
+        $this->assertNull($invalidCustomer, 'Invalid email customer should not be imported');
+
+        unlink($tempFile);
+    }
+
+    public function testEmailWithSpecialCharactersIsSanitized(): void
+    {
+        $this->loginAsEmployee();
+
+        $emailWithSpecialChars = 'test"user@example.com';
+        $csvContent = [
+            ['First Name', 'Last Name', 'Gender', 'Consent', 'Email', 'Phone', 'Address 1', 'Address 2', 'City', 'State', 'Zip', 'Country', 'Comments', 'Company', 'Account Number', 'Discount', 'Discount Type', 'Taxable'],
+            ['Test', 'User', '1', '1', $emailWithSpecialChars, '555-1234', '123 Main St', '', 'Springfield', 'IL', '62701', 'US', '', '', '', '', '', '']
+        ];
+
+        $tempFile = $this->createCsvFile($csvContent);
+
+        $_FILES['file_path'] = [
+            'name' => 'test.csv',
+            'type' => 'text/csv',
+            'tmp_name' => $tempFile,
+            'error' => UPLOAD_ERR_OK,
+            'size' => filesize($tempFile)
+        ];
+
+        $result = $this->post('/customers/importCsvFile');
+
+        $result->assertOK();
+
+        $importedCustomer = $this->findCustomersByEmailLike('example.com');
+        
+        $this->assertNotNull($importedCustomer, 'Sanitized email should be imported');
+        $this->assertStringNotContainsString('"', $importedCustomer['email'], 'Quote characters should be sanitized');
+
+        unlink($tempFile);
+    }
+
+    public function testEmptyEmailIsAccepted(): void
+    {
+        $this->loginAsEmployee();
+
+        // Empty email should be allowed - customers may not have email addresses
+        $csvContent = [
+            ['First Name', 'Last Name', 'Gender', 'Consent', 'Email', 'Phone', 'Address 1', 'Address 2', 'City', 'State', 'Zip', 'Country', 'Comments', 'Company', 'Account Number', 'Discount', 'Discount Type', 'Taxable'],
+            ['Empty', 'Mail', '1', '1', '', '555-1234', '123 Main St', '', 'Springfield', 'IL', '62701', 'US', '', '', '', '', '', '']
+        ];
+
+        $tempFile = $this->createCsvFile($csvContent);
+
+        $_FILES['file_path'] = [
+            'name' => 'test.csv',
+            'type' => 'text/csv',
+            'tmp_name' => $tempFile,
+            'error' => UPLOAD_ERR_OK,
+            'size' => filesize($tempFile)
+        ];
+
+        $result = $this->post('/customers/importCsvFile');
+
+        $result->assertOK();
+
+        $resultBody = json_decode($result->getJSON(), true);
+        $this->assertTrue($resultBody['success'], 'Import should succeed with empty email');
+
+        // Find customer by name since email is empty
+        $importedCustomer = $this->customer->select('customers.*, people.*')
+            ->join('people', 'people.person_id = customers.person_id')
+            ->where('first_name', 'Empty')
+            ->where('last_name', 'Mail')
+            ->first();
+        
+        $this->assertNotNull($importedCustomer, 'Customer with empty email should be imported');
+        $this->assertEquals('', $importedCustomer['email'], 'Email should be empty string');
+
+        unlink($tempFile);
+    }
+}
\ No newline at end of file
diff --git a/tests/Controllers/EmployeesControllerTest.php b/tests/Controllers/EmployeesControllerTest.php
index a0b63cd30..e9bf825cc 100644
--- a/tests/Controllers/EmployeesControllerTest.php
+++ b/tests/Controllers/EmployeesControllerTest.php
@@ -2,70 +2,86 @@
 
 namespace Tests\Controllers;
 
+use CodeIgniter\Database\Config;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\FeatureTestTrait;
 use CodeIgniter\Config\Services;
 use App\Models\Employee;
 use App\Models\Module;
+use Tests\Support\EmployeeFixtureTrait;
 
 class EmployeesControllerTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
     use FeatureTestTrait;
+    use EmployeeFixtureTrait;
 
     protected $migrate     = true;
     protected $migrateOnce = true;
     protected $refresh     = false;
     protected $namespace   = null;
 
+    protected $priorDisallowGrantChange;
+
+    private static bool $doneBootstrap = false;
+
     protected function setUp(): void
     {
+        // Reset the test database to a known clean schema on the first test in
+        // this class so stale employees from prior runs (whose usernames are
+        // unique-key bound and whose grant sets leak into these assertions)
+        // cannot contaminate the assertions below.
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
         parent::setUp();
+        // Reset any stale transaction state left on the shared in-process DB
+        // connection by a previous test (e.g. a failed transaction rollback in
+        // strict mode sets transStatus=false and poisons save_employee here).
+        $this->db->resetTransStatus();
+        $this->priorDisallowGrantChange = getenv('DISALLOW_GRANT_CHANGE');
+        putenv('DISALLOW_GRANT_CHANGE=false');
+    }
+
+    protected function tearDown(): void
+    {
+        if ($this->priorDisallowGrantChange === false) {
+            putenv('DISALLOW_GRANT_CHANGE');
+        } else {
+            putenv('DISALLOW_GRANT_CHANGE=' . $this->priorDisallowGrantChange);
+        }
+        parent::tearDown();
     }
 
     protected function createNonAdminEmployee(): int
     {
-        $personData = [
-            'first_name'   => 'NonAdmin',
-            'last_name'    => 'User',
-            'email'        => 'nonadmin@test.com',
-            'phone_number' => '555-1234'
-        ];
-        
-        $employeeData = [
-            'username'      => 'nonadmin',
-            'password'      => password_hash('password123', PASSWORD_DEFAULT),
-            'hash_version'  => 2,
-            'language_code' => 'en',
-            'language'      => 'english'
-        ];
-        
-        $grantsData = [
-            ['permission_id' => 'customers', 'menu_group' => 'home'],
-            ['permission_id' => 'sales', 'menu_group' => 'home']
-        ];
-        
-        $employeeModel = model(Employee::class);
-        $employeeModel->save_employee($personData, $employeeData, $grantsData, NEW_ENTRY);
-        
-        return $employeeModel->get_found_rows('');
+        return $this->createEmployee(
+            first_name:   'NonAdmin',
+            last_name:    'User',
+            email:        'nonadmin' . uniqid() . '@test.com',
+            username:     'nonadmin_' . uniqid(),
+            phone_number: '555-1234',
+            grants: [
+                ['permission_id' => 'employees', 'menu_group' => 'home'],
+                ['permission_id' => 'customers', 'menu_group' => 'home'],
+                ['permission_id' => 'sales', 'menu_group' => 'home'],
+            ],
+        );
     }
 
     protected function loginAsAdmin(): void
     {
-        $session = Services::session();
-        $session->destroy();
-        $session->set('person_id', 1);
-        $session->set('menu_group', 'office');
+        $this->withSession(['person_id' => 1, 'menu_group' => 'office']);
     }
 
     protected function loginAsNonAdmin(int $personId): void
     {
-        $session = Services::session();
-        $session->destroy();
-        $session->set('person_id', $personId);
-        $session->set('menu_group', 'home');
+        $this->withSession(['person_id' => $personId, 'menu_group' => 'home']);
     }
 
     public function testNonAdminCannotViewAdminAccount(): void
@@ -103,7 +119,7 @@ class EmployeesControllerTest extends CIUnitTestCase
         $this->loginAsNonAdmin($nonAdminId);
         
         $response = $this->post('/employees/delete', [
-            'ids' => [1]
+            'ids' => ['1']
         ]);
         
         $response->assertStatus(200);
@@ -116,25 +132,25 @@ class EmployeesControllerTest extends CIUnitTestCase
     {
         $nonAdminId = $this->createNonAdminEmployee();
         $this->loginAsNonAdmin($nonAdminId);
-        
-        $targetEmployeeId = $nonAdminId + rand(1000, 9999);
-        $this->createTestEmployee($targetEmployeeId);
-        
+
+        $targetEmployeeId = $this->createEmployee(email: 'test@test.com', username: 'testuser');
+
         $response = $this->post('/employees/save/' . $targetEmployeeId, [
             'first_name' => 'Test',
             'last_name' => 'Employee',
             'email' => 'test@test.com',
             'username' => 'testuser',
-            'grant_employees' => 'employees',
-            'grant_config' => 'config'
+            'language' => 'en:english',
+            'grant_config' => 'config',
+            'grant_giftcards' => 'giftcards'
         ]);
-        
+
         $employeeModel = model(Employee::class);
-        $hasEmployeesGrant = $employeeModel->has_grant('employees', $targetEmployeeId);
         $hasConfigGrant = $employeeModel->has_grant('config', $targetEmployeeId);
-        
-        $this->assertFalse($hasEmployeesGrant);
+        $hasGiftcardsGrant = $employeeModel->has_grant('giftcards', $targetEmployeeId);
+
         $this->assertFalse($hasConfigGrant);
+        $this->assertFalse($hasGiftcardsGrant);
     }
 
     public function testAdminCanModifyAnyAccount(): void
@@ -146,9 +162,10 @@ class EmployeesControllerTest extends CIUnitTestCase
             'first_name' => 'Modified',
             'last_name' => 'User',
             'email' => 'modified@test.com',
-            'username' => 'nonadmin'
+            'username' => 'modified',
+            'language' => 'en:english'
         ]);
-        
+
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertTrue($result['success']);
@@ -160,7 +177,7 @@ class EmployeesControllerTest extends CIUnitTestCase
         $this->loginAsAdmin();
         
         $response = $this->post('/employees/delete', [
-            'ids' => [$nonAdminId]
+            'ids' => [(string)$nonAdminId]
         ]);
         
         $response->assertStatus(200);
@@ -177,7 +194,8 @@ class EmployeesControllerTest extends CIUnitTestCase
             'first_name' => 'Modified',
             'last_name' => 'OwnAccount',
             'email' => 'own@test.com',
-            'username' => 'nonadmin'
+            'username' => 'owned',
+            'language' => 'en:english'
         ]);
         
         $response->assertStatus(200);
@@ -203,17 +221,154 @@ class EmployeesControllerTest extends CIUnitTestCase
 
     public function testAdminCanGrantAnyPermission(): void
     {
+        $employeeId = $this->createNonAdminEmployee();
+        $this->loginAsAdmin();
+
+        putenv('DISALLOW_GRANT_CHANGE=false');
+
         $permissionsRequested = ['customers', 'employees', 'sales', 'config'];
-        $userPermissions = ['customers', 'sales'];
-        $isAdmin = true;
-        
-        $granted = [];
+
+        $postData = [
+            'first_name' => 'NonAdmin',
+            'last_name'  => 'User',
+            'email'      => 'nonadmin@test.com',
+            'username'   => 'grantany' . uniqid(),
+            'language'   => 'en:english'
+        ];
         foreach ($permissionsRequested as $perm) {
-            if ($isAdmin || in_array($perm, $userPermissions)) {
-                $granted[] = $perm;
-            }
+            $postData['grant_' . $perm] = $perm;
         }
-        
-        $this->assertEquals($permissionsRequested, $granted);
+
+        $response = $this->post('/employees/save/' . $employeeId, $postData);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+
+        $employeeModel = model(Employee::class);
+        foreach ($permissionsRequested as $perm) {
+            $this->assertTrue($employeeModel->has_grant($perm, $employeeId));
+        }
+    }
+
+    public function testGrantChangeRequestFailsWhenGrantChangeDisallowed(): void
+    {
+        // Target holds customers+sales but NOT employees, so requesting the
+        // employees grant is a genuine change that DISALLOW_GRANT_CHANGE=true
+        // must reject (leaving the grant set untouched).
+        $unique = uniqid();
+        $employeeId = $this->createEmployee(
+            email:    "disallow{$unique}@test.com",
+            username: "disallow{$unique}",
+            grants: [
+                ['permission_id' => 'customers', 'menu_group' => 'home'],
+                ['permission_id' => 'sales', 'menu_group' => 'home'],
+            ],
+        );
+        $this->loginAsAdmin();
+
+        putenv('DISALLOW_GRANT_CHANGE=true');
+
+        $response = $this->post('/employees/save/' . $employeeId, [
+            'first_name'      => 'NonAdmin',
+            'last_name'       => 'User',
+            'email'           => "disallow{$unique}@test.com",
+            'username'        => "disallow{$unique}",
+            'language'        => 'en:english',
+            'grant_employees' => 'employees'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+
+        $employeeModel = model(Employee::class);
+        $this->assertTrue($employeeModel->has_grant('customers', $employeeId));
+        $this->assertTrue($employeeModel->has_grant('sales', $employeeId));
+        $this->assertFalse($employeeModel->has_grant('employees', $employeeId));
+    }
+
+    public function testNewEmployeeCreationWithGrantsFailsWhenGrantChangeDisallowed(): void
+    {
+        $this->loginAsAdmin();
+
+        putenv('DISALLOW_GRANT_CHANGE=true');
+
+        $response = $this->post('/employees/save', [
+            'first_name'      => 'Brand',
+            'last_name'       => 'New',
+            'email'           => 'brandnew@test.com',
+            'username'        => 'brandnew',
+            'password'        => 'password123',
+            'grant_customers' => 'customers'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+
+        $createdEmployee = $this->db->table('employees')->where('username', 'brandnew')->get()->getRow();
+        $this->assertNull($createdEmployee);
+    }
+
+    public function testGrantChangeRequestSucceedsWhenGrantChangeAllowed(): void
+    {
+        $employeeId = $this->createNonAdminEmployee();
+        $this->loginAsAdmin();
+
+        putenv('DISALLOW_GRANT_CHANGE=false');
+
+        $response = $this->post('/employees/save/' . $employeeId, [
+            'first_name'      => 'NonAdmin',
+            'last_name'       => 'User',
+            'email'           => 'nonadmin@test.com',
+            'username'        => 'grantsucc',
+            'language'        => 'en:english',
+            'grant_employees' => 'employees'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+
+        $employeeModel = model(Employee::class);
+        $this->assertTrue($employeeModel->has_grant('employees', $employeeId));
+        $this->assertFalse($employeeModel->has_grant('customers', $employeeId));
+        $this->assertFalse($employeeModel->has_grant('sales', $employeeId));
+    }
+
+    public function testNewEmployeeCreationWithGrantsSucceedsWhenGrantChangeAllowed(): void
+    {
+        $this->loginAsAdmin();
+
+        putenv('DISALLOW_GRANT_CHANGE=false');
+
+        $response = $this->post('/employees/save', [
+            'first_name'      => 'Brand',
+            'last_name'       => 'New2',
+            'email'           => 'brandnew2@test.com',
+            'phone_number'    => '555-1234',
+            'address_1'       => '',
+            'address_2'       => '',
+            'city'            => '',
+            'state'           => '',
+            'zip'             => '',
+            'country'         => '',
+            'comments'        => '',
+            'username'        => 'brandnew2',
+            'password'        => 'password123',
+            'language'        => 'en:english',
+            'grant_customers' => 'customers'
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+
+        $createdEmployee = $this->db->table('employees')->where('username', 'brandnew2')->get()->getRow();
+        $this->assertNotNull($createdEmployee);
+
+        $employeeModel = model(Employee::class);
+        $this->assertTrue($employeeModel->has_grant('customers', (int) $createdEmployee->person_id));
     }
 }
\ No newline at end of file
diff --git a/tests/Controllers/HomeTest.php b/tests/Controllers/HomeTest.php
index dddb1c716..d10c8c650 100644
--- a/tests/Controllers/HomeTest.php
+++ b/tests/Controllers/HomeTest.php
@@ -2,15 +2,16 @@
 
 namespace Tests\Controllers;
 
+use CodeIgniter\Database\Config;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\FeatureTestTrait;
-use CodeIgniter\Config\Services;
 use App\Models\Employee;
+use RuntimeException;
 
 /**
  * Test suite for Home controller password validation
- * 
+ *
  * Tests the critical fix for password minimum length validation bypass
  * Issue: Code was checking hashed password length (always 60 chars) instead of actual password
  * Fix: Validate raw password length BEFORE hashing
@@ -25,23 +26,29 @@ class HomeTest extends CIUnitTestCase
     protected $refresh     = false;
     protected $namespace   = null;
 
-    /**
-     * Set up test environment
-     */
+    private static bool $doneBootstrap = false;
+
     protected function setUp(): void
     {
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
         parent::setUp();
     }
 
     /**
      * Test password validation rejects passwords shorter than 8 characters
-     * 
+     *
      * @return void
      */
     public function testPasswordMinLength_Rejects7Characters(): void
     {
         $this->resetSession();
-        
+
         // Attempt to change password to 7 characters
         $response = $this->post('/home/save', [
             'employee_id' => 1,
@@ -49,29 +56,29 @@ class HomeTest extends CIUnitTestCase
             'current_password' => 'pointofsale',
             'password' => '1234567' // 7 characters
         ]);
-        
+
         // Assert failure response
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertFalse($result['success'], 'Password with 7 chars should be rejected');
         $this->assertEquals(-1, $result['id']);
-        
+
         // Verify password was not changed
         $employee = model(Employee::class);
         $admin = $employee->get_info(1);
-        $this->assertTrue(password_verify('pointofsale', $admin->password), 
+        $this->assertTrue(password_verify('pointofsale', $admin->password),
             'Password should not have been changed');
     }
-    
+
     /**
      * Test password validation accepts passwords with exactly 8 characters
-     * 
+     *
      * @return void
      */
     public function testPasswordMinLength_Accepts8Characters(): void
     {
         $this->resetSession();
-        
+
         // Change password to exactly 8 characters
         $response = $this->post('/home/save', [
             'employee_id' => 1,
@@ -79,19 +86,19 @@ class HomeTest extends CIUnitTestCase
             'current_password' => 'pointofsale',
             'password' => 'pa$$w0rd' // Exactly 8 characters including special chars
         ]);
-        
+
         // Assert success response
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertTrue($result['success'], 'Password with 8 chars should be accepted');
         $this->assertEquals(1, $result['id']);
-        
+
         // Verify password was changed
         $employee = model(Employee::class);
         $admin = $employee->get_info(1);
-        $this->assertTrue(password_verify('pa$$w0rd', $admin->password), 
+        $this->assertTrue(password_verify('pa$$w0rd', $admin->password),
             'Password with 8 chars should be accepted');
-        
+
         // Restore original password
         $employee->change_password([
             'username' => 'admin',
@@ -99,16 +106,16 @@ class HomeTest extends CIUnitTestCase
             'hash_version' => 2
         ], 1);
     }
-    
+
     /**
      * Test password validation rejects empty password
-     * 
+     *
      * @return void
      */
     public function testPasswordMinLength_RejectsEmptyString(): void
     {
         $this->resetSession();
-        
+
         // Attempt to set empty password
         $response = $this->post('/home/save', [
             'employee_id' => 1,
@@ -116,65 +123,75 @@ class HomeTest extends CIUnitTestCase
             'current_password' => 'pointofsale',
             'password' => '' // Empty string
         ]);
-        
+
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertFalse($result['success'], 'Empty password should be rejected');
         $this->assertEquals(-1, $result['id']);
     }
-    
+
     /**
-     * Test password validation rejects whitespace-only passwords
-     * 
+     * Password validation is a raw strlen() check with no whitespace
+     * handling, so a password consisting entirely of spaces still counts
+     * toward the length minimum.
+     *
      * @return void
      */
-    public function testPasswordMinLength_RejectsWhitespaceOnly(): void
+    public function testPasswordMinLength_WhitespaceOnlyPasswordCountsTowardLength(): void
     {
         $this->resetSession();
-        
-        // Attempt to set password as only whitespace
-        $response = $this->post('/home/save', [
-            'employee_id' => 1,
-            'username' => 'admin',
-            'current_password' => 'pointofsale',
-            'password' => '        ' // 8 spaces but empty actual password
-        ]);
-        
-        $response->assertStatus(200);
-        $result = json_decode($response->getJSON(), true);
-        $this->assertFalse($result['success'], 'Whitespace only password should be rejected');
-        $this->assertEquals(-1, $result['id']);
+
+        try {
+            $response = $this->post('/home/save', [
+                'employee_id' => 1,
+                'username' => 'admin',
+                'current_password' => 'pointofsale',
+                'password' => '        ' // 8 spaces: exactly meets the byte-length minimum
+            ]);
+
+            $response->assertStatus(200);
+            $result = json_decode($response->getJSON(), true);
+            $this->assertTrue($result['success'], 'strlen()-based validation accepts 8 spaces as meeting the minimum length');
+        } finally {
+            // Restore original password
+            $employee = model(Employee::class);
+            $employee->change_password([
+                'username' => 'admin',
+                'password' => password_hash('pointofsale', PASSWORD_DEFAULT),
+                'hash_version' => 2
+            ], 1);
+        }
     }
-    
+
     /**
      * Test password validation accepts passwords with special characters
      * as long as they meet minimum length
-     * 
+     *
      * @return void
      */
     public function testPasswordMinLength_AcceptsSpecialCharacters(): void
     {
         $this->resetSession();
-        
+
         $specialPassword = 'Str0ng!@#$'; // 11 characters with special chars
-        
+
         $response = $this->post('/home/save', [
             'employee_id' => 1,
             'username' => 'admin',
             'current_password' => 'pointofsale',
             'password' => $specialPassword
         ]);
-        
+
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertTrue($result['success'], 'Password with special chars should be accepted');
         $this->assertEquals(1, $result['id']);
-        
+
         // Verify password works
         $employee = model(Employee::class);
         $admin = $employee->get_info(1);
         $this->assertTrue(password_verify($specialPassword, $admin->password));
-        
+
         // Restore original password
         $employee->change_password([
             'username' => 'admin',
@@ -182,20 +199,20 @@ class HomeTest extends CIUnitTestCase
             'hash_version' => 2
         ], 1);
     }
-    
+
     /**
      * Regression test: Verify previous vulnerable behavior is fixed
-     * 
+     *
      * Before fix: 1-character passwords like "a" were accepted because
      * code checked len(hashed_password) which is always 60 for bcrypt
      * After fix: Raw password is validated before hashing
-     * 
+     *
      * @return void
      */
     public function testPasswordMinLength_RejectsPreviousBehavior(): void
     {
         $this->resetSession();
-        
+
         // Attempt the previously vulnerable case: single character password
         $response = $this->post('/home/save', [
             'employee_id' => 1,
@@ -203,224 +220,331 @@ class HomeTest extends CIUnitTestCase
             'current_password' => 'pointofsale',
             'password' => 'a' // Previously allowed due to bug
         ]);
-        
+
         // This should now fail
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertFalse($result['success'], 'Single character password should be rejected (CVE fix)');
         $this->assertEquals(-1, $result['id']);
-        
+
         // Verify password was NOT changed
         $employee = model(Employee::class);
         $admin = $employee->get_info(1);
-        $this->assertTrue(password_verify('pointofsale', $admin->password), 
+        $this->assertTrue(password_verify('pointofsale', $admin->password),
             'Single character password should be rejected (CVE fix)');
     }
-    
+
     /**
      * Helper method to reset session
-     * 
+     *
      * @return void
      */
     protected function resetSession(): void
     {
-        $session = Services::session();
-        $session->destroy();
-        $session->set('person_id', 1); // Admin user
+        $this->withSession(['person_id' => 1]); // Admin user
     }
-    
+
     /**
      * Create a non-admin employee for testing
-     * 
+     *
+     * @param array $overrides Optional overrides for username, email, password, etc.
      * @return int The person_id of the created employee
      */
-    protected function createNonAdminEmployee(): int
+    protected function createNonAdminEmployee(array $overrides = []): int
     {
+        $uniqueSuffix = uniqid();
+
         $personData = [
-            'first_name'   => 'NonAdmin',
-            'last_name'    => 'User',
-            'email'        => 'nonadmin@test.com',
-            'phone_number' => '555-1234'
+            'first_name'   => $overrides['first_name'] ?? 'NonAdmin',
+            'last_name'    => $overrides['last_name'] ?? 'User',
+            'email'        => $overrides['email'] ?? "nonadmin{$uniqueSuffix}@test.com",
+            'phone_number' => $overrides['phone_number'] ?? '555-1234'
         ];
-        
+
         $employeeData = [
-            'username'      => 'nonadmin',
-            'password'      => password_hash('password123', PASSWORD_DEFAULT),
+            'username'      => $overrides['username'] ?? "nonadmin{$uniqueSuffix}",
+            'password'      => password_hash($overrides['password'] ?? 'password123', PASSWORD_DEFAULT),
             'hash_version'  => 2,
             'language_code' => 'en',
             'language'      => 'english'
         ];
-        
-        $grantsData = [
+
+        $grantsData = $overrides['grants'] ?? [
+            ['permission_id' => 'home', 'menu_group' => 'home'],
             ['permission_id' => 'customers', 'menu_group' => 'home'],
             ['permission_id' => 'sales', 'menu_group' => 'home']
         ];
-        
+
         $employeeModel = model(Employee::class);
-        $employeeModel->save_employee($personData, $employeeData, $grantsData, NEW_ENTRY);
-        
-        return $employeeModel->get_found_rows('');
+        $saved = $employeeModel->save_employee($personData, $employeeData, $grantsData, NEW_ENTRY);
+
+        if (!$saved || empty($personData['person_id'])) {
+            throw new RuntimeException('Failed to create non-admin employee for testing');
+        }
+
+        return (int) $personData['person_id'];
     }
-    
+
     /**
      * Login as a specific user
-     * 
+     *
      * @param int $personId
      * @return void
      */
     protected function loginAs(int $personId): void
     {
-        $session = Services::session();
-        $session->destroy();
-        $session->set('person_id', $personId);
-        $session->set('menu_group', 'home');
+        $this->withSession([
+            'person_id'  => $personId,
+            'menu_group' => 'home',
+        ]);
     }
-    
+
     // ========== BOLA Authorization Tests ==========
-    
+
     /**
      * Test non-admin cannot view admin password change form
-     * BOLA vulnerability fix: GHSA-q58g-gg7v-f9rf
-     * 
+     * BOLA vulnerability fix.
+     *
      * @return void
      */
     public function testNonAdminCannotViewAdminPasswordForm(): void
     {
         $nonAdminId = $this->createNonAdminEmployee();
         $this->loginAs($nonAdminId);
-        
+
         $response = $this->get('/home/changePassword/1');
-        
-        $response->assertRedirect();
-        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+
+        $response->assertStatus(403);
     }
-    
+
     /**
      * Test non-admin cannot change admin password
-     * BOLA vulnerability fix: GHSA-q58g-gg7v-f9rf
-     * 
+     * BOLA vulnerability fix.
+     *
      * @return void
      */
     public function testNonAdminCannotChangeAdminPassword(): void
     {
         $nonAdminId = $this->createNonAdminEmployee();
         $this->loginAs($nonAdminId);
-        
+
         $response = $this->post('/home/save/1', [
             'username' => 'admin',
             'current_password' => 'pointofsale',
             'password' => 'hacked123'
         ]);
-        
+
         $response->assertStatus(403);
         $result = json_decode($response->getJSON(), true);
         $this->assertFalse($result['success']);
-        
+
         // Verify admin password was NOT changed
         $employee = model(Employee::class);
         $admin = $employee->get_info(1);
-        $this->assertTrue(password_verify('pointofsale', $admin->password), 
+        $this->assertTrue(password_verify('pointofsale', $admin->password),
             'Admin password should not have been changed by non-admin');
     }
-    
+
     /**
      * Test user can view their own password change form
-     * 
+     *
      * @return void
      */
     public function testUserCanViewOwnPasswordForm(): void
     {
         $nonAdminId = $this->createNonAdminEmployee();
         $this->loginAs($nonAdminId);
-        
+
         $response = $this->get('/home/changePassword/' . $nonAdminId);
-        
+
         $response->assertStatus(200);
         $response->assertSee('nonadmin'); // Username should be visible
     }
-    
+
     /**
      * Test user can change their own password
-     * 
+     *
      * @return void
      */
     public function testUserCanChangeOwnPassword(): void
     {
-        $nonAdminId = $this->createNonAdminEmployee();
+        $nonAdminId = $this->createNonAdminEmployee(['username' => 'nonadminchangeown']);
         $this->loginAs($nonAdminId);
-        
+
         $response = $this->post('/home/save/' . $nonAdminId, [
-            'username' => 'nonadmin',
+            'username' => 'nonadminchangeown',
             'current_password' => 'password123',
             'password' => 'newpassword123'
         ]);
-        
+
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertTrue($result['success']);
-        
+
         // Verify password was changed
         $employee = model(Employee::class);
         $user = $employee->get_info($nonAdminId);
         $this->assertTrue(password_verify('newpassword123', $user->password));
     }
-    
+
     /**
      * Test admin can view any user's password form
-     * 
+     *
      * @return void
      */
     public function testAdminCanViewAnyPasswordForm(): void
     {
         $nonAdminId = $this->createNonAdminEmployee();
         $this->resetSession(); // Login as admin
-        
+
         $response = $this->get('/home/changePassword/' . $nonAdminId);
-        
+
         $response->assertStatus(200);
         $response->assertSee('nonadmin');
     }
-    
+
     /**
      * Test admin can change any user's password
-     * 
+     *
      * @return void
      */
     public function testAdminCanChangeAnyPassword(): void
     {
-        $nonAdminId = $this->createNonAdminEmployee();
+        $nonAdminId = $this->createNonAdminEmployee(['username' => 'nonadminadminchange']);
         $this->resetSession(); // Login as admin
-        
+
         $response = $this->post('/home/save/' . $nonAdminId, [
-            'username' => 'nonadmin',
+            'username' => 'nonadminadminchange',
             'current_password' => 'password123',
             'password' => 'adminset123'
         ]);
-        
+
         $response->assertStatus(200);
         $result = json_decode($response->getJSON(), true);
         $this->assertTrue($result['success']);
-        
+
         // Verify password was changed
         $employee = model(Employee::class);
         $user = $employee->get_info($nonAdminId);
         $this->assertTrue(password_verify('adminset123', $user->password));
     }
-    
+
     /**
      * Test default employee_id parameter uses current user
-     * 
+     *
      * @return void
      */
     public function testDefaultEmployeeIdUsesCurrentUser(): void
     {
         $nonAdminId = $this->createNonAdminEmployee();
         $this->loginAs($nonAdminId);
-        
+
         // Calling without employee_id should use current user
         $response = $this->get('/home/changePassword');
-        
+
         $response->assertStatus(200);
         $response->assertSee('nonadmin');
     }
-}
\ No newline at end of file
+
+    /**
+     * Test non-admin cannot view another non-admin's password form
+     * IDOR vulnerability fix.
+     *
+     * @return void
+     */
+    public function testNonAdminCannotViewOtherNonAdminPasswordForm(): void
+    {
+        $nonAdminId1 = $this->createNonAdminEmployee();
+        $this->loginAs($nonAdminId1);
+
+        $otherUserId = $this->createNonAdminEmployee([
+            'username' => 'otheruser',
+            'email' => 'other@test.com',
+            'password' => 'password456'
+        ]);
+
+        $response = $this->get('/home/changePassword/' . $otherUserId);
+
+        $response->assertStatus(403);
+    }
+
+    /**
+     * Test non-admin cannot change another non-admin's password
+     * IDOR vulnerability fix.
+     *
+     * @return void
+     */
+    public function testNonAdminCannotChangeOtherNonAdminPassword(): void
+    {
+        $nonAdminId1 = $this->createNonAdminEmployee();
+        $this->loginAs($nonAdminId1);
+
+        $victimId = $this->createNonAdminEmployee([
+            'username' => 'victimuser',
+            'email' => 'victim@test.com',
+            'password' => 'victimpass123'
+        ]);
+
+        $response = $this->post('/home/save/' . $victimId, [
+            'username' => 'victimuser',
+            'current_password' => 'victimpass123',
+            'password' => 'hacked123456'
+        ]);
+
+        $response->assertStatus(403);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+
+        // Verify victim's password was NOT changed
+        $employeeModel = model(Employee::class);
+        $victim = $employeeModel->get_info($victimId);
+        $this->assertTrue(password_verify('victimpass123', $victim->password),
+            'Non-admin should not be able to change another non-admin password');
+    }
+
+    /**
+     * Regression test: Home::__construct() previously
+     * read the raw (single-decoded) URI segment to decide whether to skip
+     * Secure_Controller's module-grant check for 'logout'. A route whose
+     * double-decoded method name resolves to 'logout' must still be treated
+     * as logout consistently - using the router's fully-resolved method name
+     * removes any single-vs-double-decode mismatch as an attack surface.
+     *
+     * @return void
+     */
+    public function testLogoutStillBypassesGrantCheckAfterFix(): void
+    {
+        $nonAdminId = $this->createNonAdminEmployee([
+            'username' => 'logoutnograntuser',
+            'email' => 'logoutnograntuser@test.com',
+            'grants' => []
+        ]);
+        $this->loginAs($nonAdminId);
+
+        $response = $this->get('/home/logout');
+
+        $response->assertRedirectTo('login');
+    }
+
+    /**
+     * A non-'logout' Home method must still enforce Secure_Controller's
+     * module-grant check (i.e. parent::__construct() is not skipped) for a
+     * logged-in employee with no 'home' grant.
+     *
+     * @return void
+     */
+    public function testNonLogoutMethodStillEnforcesModuleGrantCheck(): void
+    {
+        $nonAdminId = $this->createNonAdminEmployee([
+            'username' => 'nogranthome',
+            'email' => 'nogranthome@test.com',
+            'grants' => []
+        ]);
+        $this->loginAs($nonAdminId);
+
+        $response = $this->get('/home/changePassword/' . $nonAdminId);
+
+        $response->assertRedirect();
+        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+    }
+}
diff --git a/tests/Controllers/ItemKitsControllerTest.php b/tests/Controllers/ItemKitsControllerTest.php
new file mode 100644
index 000000000..cfdfca983
--- /dev/null
+++ b/tests/Controllers/ItemKitsControllerTest.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Tests\Controllers;
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Database\Config;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+use App\Models\Item;
+use App\Models\Item_kit;
+use Config\OSPOS;
+use Exception;
+
+class ItemKitsControllerTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+
+    protected $migrate = true;
+    protected $migrateOnce = true;
+    protected $seedOnce = true;
+    protected $refresh = false;
+    protected $namespace = null;
+
+    private static bool $doneBootstrap = false;
+
+    protected Item $item;
+    protected Item_kit $itemKit;
+
+    protected function setUp(): void
+    {
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
+        parent::setUp();
+
+        $ospos = new OSPOS();
+        $ospos->settings = [
+            'company'                   => 'Test Co',
+            'barcode_content'           => 'id',
+            'barcode_type'              => 'C128',
+            'barcode_font'              => 'inconsolata.ttf',
+            'barcode_font_size'         => 10,
+            'barcode_height'            => 40,
+            'barcode_width'             => 2,
+            'barcode_first_row'         => 'item_code',
+            'barcode_second_row'        => 'none',
+            'barcode_third_row'         => 'none',
+            'barcode_num_in_row'        => 1,
+            'barcode_page_width'        => 8,
+            'barcode_page_cellspacing'  => 1,
+            'barcode_generate_if_empty' => 0,
+            'barcode_formats'           => 'null',
+        ];
+        Factories::injectMock('config', OSPOS::class, $ospos);
+
+        $this->item = model(Item::class);
+        $this->itemKit = model(Item_kit::class);
+    }
+
+    protected function tearDown(): void
+    {
+        Factories::reset();
+        parent::tearDown();
+    }
+
+    protected function loginAsAdmin(): void
+    {
+        $this->withSession([
+            'person_id'  => 1,
+            'menu_group' => 'office'
+        ]);
+    }
+
+    private function createItemKit(): int
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Kit Base Item',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'deleted' => 0
+        ];
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $itemKitData = [
+            'name' => 'Test Kit',
+            'description' => 'Test Kit Description',
+            'item_id' => $itemData['item_id'],
+            'kit_discount' => 0,
+            'kit_discount_type' => 0,
+            'price_option' => 0,
+            'print_option' => 0
+        ];
+        $this->assertTrue($this->itemKit->save_value($itemKitData));
+
+        return (int) $itemKitData['item_kit_id'];
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testGenerateBarcodesDoesNotDecodeTripleEncodedPayload(): void
+    {
+        $itemKitId = $this->createItemKit();
+        $this->loginAsAdmin();
+
+        // <svg onload=alert(document.domain)> URL-encoded three times.
+        // The framework's router decodes this twice before routing; the controller used to apply
+        // a third urldecode(), turning the remaining %3C.../%3E into a live <svg onload=...> tag.
+        // With that urldecode() removed, the value must stay percent-encoded text and never
+        // become a raw '<' in the response.
+        $payload = $itemKitId . '%25253Csvg%252520onload%25253Dalert%252528document.domain%252529%25253E';
+
+        $response = $this->get('/item_kits/generateBarcodes/' . $payload);
+        $response->assertStatus(200);
+
+        $body = $response->getBody();
+        $this->assertStringNotContainsString('<svg onload', $body);
+        $this->assertStringContainsString('%3Csvg', $body);
+    }
+
+    public function testGenerateBarcodesWorksForPlainItemKitId(): void
+    {
+        $itemKitId = $this->createItemKit();
+        $this->loginAsAdmin();
+
+        $response = $this->get('/item_kits/generateBarcodes/' . $itemKitId);
+
+        $response->assertStatus(200);
+        $this->assertStringContainsString('KIT ' . $itemKitId, $response->getBody());
+    }
+}
diff --git a/tests/Controllers/ItemsControllerTest.php b/tests/Controllers/ItemsControllerTest.php
new file mode 100644
index 000000000..1f73c73e5
--- /dev/null
+++ b/tests/Controllers/ItemsControllerTest.php
@@ -0,0 +1,1339 @@
+<?php
+
+namespace Tests\Controllers;
+
+use CodeIgniter\Database\Config;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+use App\Models\Item;
+use App\Models\Item_quantity;
+use App\Models\Inventory;
+use App\Models\Item_taxes;
+use App\Models\Attribute;
+use App\Models\Stock_location;
+use App\Models\Supplier;
+use Tests\Support\EmployeeFixtureTrait;
+
+class ItemsControllerTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+    use EmployeeFixtureTrait;
+
+    protected $migrate = true;
+    protected $migrateOnce = true;
+    protected $seedOnce = true;
+    protected $refresh = false;
+    protected $namespace = null;
+
+    private static $doneBootstrap = false;
+
+    protected $item;
+    protected $item_quantity;
+    protected $inventory;
+    protected $item_taxes;
+    protected $attribute;
+    protected $stock_location;
+    protected $supplier;
+
+    protected function setUp(): void
+    {
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
+        parent::setUp();
+
+        helper('importfile');
+        helper('attribute');
+
+        $this->item = model(Item::class);
+        $this->item_quantity = model(Item_quantity::class);
+        $this->inventory = model(Inventory::class);
+        $this->item_taxes = model(Item_taxes::class);
+        $this->attribute = model(Attribute::class);
+        $this->stock_location = model(Stock_location::class);
+        $this->supplier = model(Supplier::class);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+    }
+
+    protected function createItemsEmployee(): int
+    {
+        $personId = $this->createEmployee();
+
+        $db = Config::connect($this->DBGroup);
+        $db->table('grants')->insertBatch([
+            ['person_id' => $personId, 'permission_id' => 'items', 'menu_group' => 'home'],
+            ['person_id' => $personId, 'permission_id' => 'items_stock', 'menu_group' => 'home'],
+        ]);
+
+        return $personId;
+    }
+
+    protected function loginAsItemsEmployee(int $personId): void
+    {
+        $this->withSession([
+            'person_id'  => $personId,
+            'menu_group' => 'home',
+        ]);
+    }
+
+    protected function baseItemPostData(): array
+    {
+        return [
+            'name'          => 'Test Item ' . uniqid(),
+            'category'      => 'Test Category',
+            'description'   => 'Test Item',
+            'cost_price'    => '1.00',
+            'unit_price'    => '5.00',
+            'reorder_level' => '0',
+            'receiving_quantity' => '0',
+            'quantity_1'    => '0',
+            'item_type'     => (string) ITEM,
+            'tax_percents'  => ['5'],
+        ];
+    }
+
+    /**
+     * Regression test: `tax_names[]` containing `<`/`>`
+     * (the stored-XSS vector) must be rejected by postSave.
+     */
+    public function testPostSaveRejectsMaliciousTaxName(): void
+    {
+        $employeeId = $this->createItemsEmployee();
+        $this->loginAsItemsEmployee($employeeId);
+
+        $postData = $this->baseItemPostData();
+        $postData['tax_names'] = ['<svg onload=alert(1)>'];
+
+        $response = $this->post('/items/save', $postData);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    /**
+     * Legitimate unicode tax names must not be rejected by the XSS guard.
+     */
+    public function testPostSaveAcceptsUnicodeTaxName(): void
+    {
+        $employeeId = $this->createItemsEmployee();
+        $this->loginAsItemsEmployee($employeeId);
+
+        $postData = $this->baseItemPostData();
+        $postData['tax_names'] = ["Impôt, incl."];
+
+        $response = $this->post('/items/save', $postData);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    /**
+     * Apostrophes are common in real tax names (e.g. possessives) and must not be rejected.
+     */
+    public function testPostSaveAcceptsApostropheInTaxName(): void
+    {
+        $employeeId = $this->createItemsEmployee();
+        $this->loginAsItemsEmployee($employeeId);
+
+        $postData = $this->baseItemPostData();
+        $postData['tax_names'] = ["O'Brien's Tax"];
+
+        $response = $this->post('/items/save', $postData);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    public function testPostBulkUpdateRejectsMaliciousTaxName(): void
+    {
+        $employeeId = $this->createItemsEmployee();
+        $this->loginAsItemsEmployee($employeeId);
+
+        $response = $this->post('/items/bulkupdate', [
+            'item_ids'     => '1',
+            'tax_names'    => ['<svg onload=alert(1)>'],
+            'tax_percents' => ['5'],
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testPostBulkUpdateAcceptsUnicodeTaxName(): void
+    {
+        $employeeId = $this->createItemsEmployee();
+        $this->loginAsItemsEmployee($employeeId);
+
+        $response = $this->post('/items/bulkupdate', [
+            'item_ids'     => '1',
+            'tax_names'    => ["Impôt, incl."],
+            'tax_percents' => ['5'],
+        ]);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertTrue($result['success']);
+    }
+
+    /**
+     * Regression test: an attribute definition whose
+     * `definition_name` contains HTML must be entity-escaped when rendered in the
+     * items attributes dropdown, not emitted as a live (executable) tag.
+     */
+    public function testGetAttributesEscapesMaliciousDefinitionName(): void
+    {
+        $employeeId = $this->createItemsEmployee();
+        $this->loginAsItemsEmployee($employeeId);
+
+        $payload = '<img src=x onerror=alert(1)>';
+
+        $definitionData = [
+            'definition_name' => $payload,
+            'definition_type' => TEXT,
+            'definition_flags' => 0,
+            'deleted'         => 0,
+        ];
+        $this->assertTrue($this->attribute->saveDefinition($definitionData));
+        $this->assertNotEmpty($definitionData['definition_id']);
+
+        $response = $this->get('/items/attributes/1');
+        $output = (string) $response->getBody();
+
+        // A live, unescaped tag in the dropdown label is the stored-XSS sink.
+        $this->assertStringNotContainsString($payload, $output);
+        // The payload must be present only in entity-escaped form.
+        $this->assertStringContainsString('&lt;img src=x onerror=alert(1)&gt;', $output);
+    }
+
+    public function testGenerateCsvHeaderBasic(): void
+    {
+        $stockLocations = ['Warehouse'];
+        $attributes = [];
+
+        $csv = generate_import_items_csv($stockLocations, $attributes);
+
+        $this->assertStringContainsString('Id,Barcode,"Item Name"', $csv);
+        $this->assertStringContainsString('Category,"Supplier ID"', $csv);
+        $this->assertStringContainsString('"Cost Price","Unit Price"', $csv);
+        $this->assertStringContainsString('"Tax 1 Name","Tax 1 Percent"', $csv);
+        $this->assertStringContainsString('"Tax 2 Name","Tax 2 Percent"', $csv);
+        $this->assertStringContainsString('"Reorder Level"', $csv);
+        $this->assertStringContainsString('Description,"Allow Alt Description"', $csv);
+        $this->assertStringContainsString('"Item has Serial Number"', $csv);
+        $this->assertStringContainsString('Image,HSN', $csv);
+        $this->assertStringContainsString('"location_Warehouse"', $csv);
+        $this->assertStringContainsString("\xEF\xBB\xBF", $csv);
+    }
+
+    public function testGenerateCsvHeaderMultipleLocations(): void
+    {
+        $stockLocations = ['Warehouse', 'Store', 'Backroom'];
+        $attributes = [];
+
+        $csv = generate_import_items_csv($stockLocations, $attributes);
+
+        $this->assertStringContainsString('"location_Warehouse"', $csv);
+        $this->assertStringContainsString('"location_Store"', $csv);
+        $this->assertStringContainsString('"location_Backroom"', $csv);
+    }
+
+    public function testGenerateCsvHeaderWithAttributes(): void
+    {
+        $stockLocations = ['Warehouse'];
+        $attributes = ['Color', 'Size', 'Weight'];
+
+        $csv = generate_import_items_csv($stockLocations, $attributes);
+
+        $this->assertStringContainsString('"attribute_Color"', $csv);
+        $this->assertStringContainsString('"attribute_Size"', $csv);
+        $this->assertStringContainsString('"attribute_Weight"', $csv);
+    }
+
+    public function testGenerateStockLocationHeaders(): void
+    {
+        $locations = ['Warehouse', 'Store'];
+
+        $headers = generate_stock_location_headers($locations);
+
+        $this->assertEquals(',"location_Warehouse","location_Store"', $headers);
+    }
+
+    public function testGenerateAttributeHeaders(): void
+    {
+        $attributes = ['Color', 'Size'];
+
+        $headers = generate_attribute_headers($attributes);
+
+        $this->assertEquals(',"attribute_Color","attribute_Size"', $headers);
+    }
+
+    public function testGenerateAttributeHeadersRemovesNegativeOneIndex(): void
+    {
+        $attributes = [-1 => 'None', 'Color' => 'Color'];
+        unset($attributes[-1]);
+
+        $headers = generate_attribute_headers($attributes);
+
+        $this->assertStringContainsString('"attribute_Color"', $headers);
+    }
+
+    public function testGetCsvFileBasic(): void
+    {
+        $csvContent = "Id,Barcode,\"Item Name\",Category,\"Supplier ID\",\"Cost Price\",\"Unit Price\",\"Tax 1 Name\",\"Tax 1 Percent\",\"Tax 2 Name\",\"Tax 2 Percent\",\"Reorder Level\",Description,\"Allow Alt Description\",\"Item has Serial Number\",Image,HSN\n";
+        $csvContent .= ",ITEM001,Test Item,Electronics,1,10.00,15.00,,,,,5,Test Description,0,0,,HSN001\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+
+        $this->assertCount(1, $rows);
+        $this->assertEquals('', $rows[0]['Id']);
+        $this->assertEquals('ITEM001', $rows[0]['Barcode']);
+        $this->assertEquals('Test Item', $rows[0]['Item Name']);
+        $this->assertEquals('Electronics', $rows[0]['Category']);
+
+        unlink($tempFile);
+    }
+
+    public function testGetCsvFileWithBom(): void
+    {
+        $bom = pack('CCC', 0xef, 0xbb, 0xbf);
+        $csvContent = $bom . "Id,\"Item Name\",Category\n";
+        $csvContent .= "1,Test Item,Electronics\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_bom_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+
+        $this->assertCount(1, $rows);
+        $this->assertEquals('1', $rows[0]['Id']);
+        $this->assertEquals('Test Item', $rows[0]['Item Name']);
+
+        unlink($tempFile);
+    }
+
+    public function testGetCsvFileMultipleRows(): void
+    {
+        $csvContent = "Id,\"Item Name\",Category\n";
+        $csvContent .= "1,Item One,Cat A\n";
+        $csvContent .= "2,Item Two,Cat B\n";
+        $csvContent .= "3,Item Three,Cat C\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_multi_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+
+        $this->assertCount(3, $rows);
+        $this->assertEquals('Item One', $rows[0]['Item Name']);
+        $this->assertEquals('Item Two', $rows[1]['Item Name']);
+        $this->assertEquals('Item Three', $rows[2]['Item Name']);
+
+        unlink($tempFile);
+    }
+
+    public function testRequiredHeadersDetectedForTemplate(): void
+    {
+        $csvContent = 'Id,Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",Image,HSN' . "\n";
+        $csvContent .= ",ITEM001,Test Item,Electronics,1,10.00,15.00,,,,,5,Test Description,0,0,,HSN001\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_headers_ok_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+
+        $this->assertTrue(csvImportHasRequiredItemHeaders($rows, [], []));
+
+        unlink($tempFile);
+    }
+
+    public function testMissingIdHeaderIsRejected(): void
+    {
+        $csvContent = "Barcode,\"Item Name\",Category\n";
+        $csvContent .= "ITEM001,Test Item,Electronics\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_headers_bad_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+
+        $this->assertFalse(csvImportHasRequiredItemHeaders($rows, [], []));
+
+        unlink($tempFile);
+    }
+
+    public function testMissingSupplierIdHeaderIsRejected(): void
+    {
+        $csvContent = 'Id,Barcode,"Item Name",Category,"Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",Image,HSN' . "\n";
+        $csvContent .= ",ITEM001,Test Item,Electronics,10.00,15.00,,,,,5,Test Description,0,0,,HSN001\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_headers_no_supplier_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+
+        $this->assertFalse(csvImportHasRequiredItemHeaders($rows, [], []));
+
+        unlink($tempFile);
+    }
+
+    public function testMissingAttributeColumnIsRejected(): void
+    {
+        $csvContent = 'Id,Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",Image,HSN,"location_Warehouse"' . "\n";
+        $csvContent .= ",ITEM001,Test Item,Electronics,1,10.00,15.00,,,,,5,Test Description,0,0,,HSN001,100\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_test_headers_no_attribute_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+
+        $this->assertFalse(csvImportHasRequiredItemHeaders($rows, ['Warehouse'], ['Color']));
+
+        unlink($tempFile);
+    }
+
+    public function testEmptyCsvHasNoRequiredHeaders(): void
+    {
+        $this->assertFalse(csvImportHasRequiredItemHeaders([], [], []));
+    }
+
+    public function testBomExists(): void
+    {
+        $bom = pack('CCC', 0xef, 0xbb, 0xbf);
+        $contentWithBom = $bom . "test content";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'bom_test_');
+        file_put_contents($tempFile, $contentWithBom);
+
+        $handle = fopen($tempFile, 'r');
+        $result = bom_exists($handle);
+        fclose($handle);
+
+        $this->assertTrue($result);
+        unlink($tempFile);
+    }
+
+    public function testBomNotExists(): void
+    {
+        $contentWithoutBom = "test content without BOM";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'no_bom_test_');
+        file_put_contents($tempFile, $contentWithoutBom);
+
+        $handle = fopen($tempFile, 'r');
+        $result = bom_exists($handle);
+        fclose($handle);
+
+        $this->assertFalse($result);
+        unlink($tempFile);
+    }
+
+    public function testImportItemBasicFields(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'CSV Imported Item',
+            'description' => 'Description from CSV',
+            'category' => 'Electronics',
+            'cost_price' => 10.50,
+            'unit_price' => 25.99,
+            'reorder_level' => 5,
+            'supplier_id' => null,
+            'item_number' => 'CSV-ITEM-001',
+            'allow_alt_description' => 0,
+            'is_serialized' => 0,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $row = $this->db->table('items')
+            ->where('item_number', $itemData['item_number'])
+            ->get()
+            ->getRow();
+
+        $this->assertNotNull($row);
+        $this->assertIsInt((int) $row->item_id);
+        $this->assertGreaterThan(0, (int) $row->item_id);
+
+        $savedItem = $this->item->get_info((int) $row->item_id);
+        $this->assertEquals('CSV Imported Item', $savedItem->name);
+        $this->assertEquals('Description from CSV', $savedItem->description);
+        $this->assertEquals('Electronics', $savedItem->category);
+        $this->assertEquals(10.50, (float) $savedItem->cost_price);
+        $this->assertEquals(25.99, (float) $savedItem->unit_price);
+    }
+
+    public function testImportItemWithQuantity(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Item With Quantity',
+            'category' => 'Test Category',
+            'cost_price' => 5.00,
+            'unit_price' => 10.00,
+            'reorder_level' => 2,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $locationId = 1;
+        $quantity = 100;
+
+        $itemQuantityData = [
+            'item_id' => $itemData['item_id'],
+            'location_id' => $locationId,
+            'quantity' => $quantity
+        ];
+
+        $result = $this->item_quantity->save_value($itemQuantityData, $itemData['item_id'], $locationId);
+        $this->assertTrue($result);
+
+        $savedQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $locationId);
+        $this->assertEquals($quantity, $savedQuantity->quantity);
+    }
+
+    public function testImportItemCreatesInventoryRecord(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'item_number' => '1234567890',
+            'name' => 'Item With Inventory',
+            'category' => 'Test',
+            'cost_price' => 5.00,
+            'unit_price' => 10.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $inventoryData = [
+            'trans_inventory' => 50,
+            'trans_items' => $itemData['item_id'],
+            'trans_location' => 1,
+            'trans_comment' => 'CSV Import',
+            'trans_user' => 1
+        ];
+
+        $transId = $this->inventory->insert($inventoryData);
+
+        $this->assertIsInt($transId);
+        $this->assertGreaterThan(0, $transId);
+
+        $inventoryRecords = $this->inventory->get_inventory_data_for_item($itemData['item_id'], 1);
+        $this->assertGreaterThanOrEqual(1, $inventoryRecords->getNumRows());
+    }
+
+    public function testImportItemWithTaxes(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'item_number' => '1234567890',
+            'name' => 'Taxable Item',
+            'category' => 'Test',
+            'cost_price' => 100.00,
+            'unit_price' => 150.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $taxesData = [
+            ['name' => 'VAT', 'percent' => 20],
+            ['name' => 'GST', 'percent' => 10]
+        ];
+
+        $result = $this->item_taxes->save_value($taxesData, $itemData['item_id']);
+        $this->assertTrue($result);
+
+        $savedTaxes = $this->item_taxes->get_info($itemData['item_id']);
+
+        $taxNames = array_column($savedTaxes, 'name');
+        $this->assertContains('VAT', $taxNames);
+        $this->assertContains('GST', $taxNames);
+    }
+
+    public function testImportMultipleItemsFromSimulatedCsv(): void
+    {
+        $csvData = [
+            [
+                'Id' => '',
+                'Barcode' => 'ITEM-A',
+                'Item Name' => 'First Item',
+                'Category' => 'Category A',
+                'Supplier ID' => '',
+                'Cost Price' => '10.00',
+                'Unit Price' => '20.00',
+                'Tax 1 Name' => '',
+                'Tax 1 Percent' => '',
+                'Tax 2 Name' => '',
+                'Tax 2 Percent' => '',
+                'Reorder Level' => '5',
+                'Description' => 'First item description',
+                'Allow Alt Description' => '0',
+                'Item has Serial Number' => '0',
+                'Image' => '',
+                'HSN' => '',
+                'location_Warehouse' => '100'
+            ],
+            [
+                'Id' => '',
+                'Barcode' => 'ITEM-B',
+                'Item Name' => 'Second Item',
+                'Category' => 'Category B',
+                'Supplier ID' => '',
+                'Cost Price' => '15.00',
+                'Unit Price' => '30.00',
+                'Tax 1 Name' => '',
+                'Tax 1 Percent' => '',
+                'Tax 2 Name' => '',
+                'Tax 2 Percent' => '',
+                'Reorder Level' => '10',
+                'Description' => 'Second item description',
+                'Allow Alt Description' => '0',
+                'Item has Serial Number' => '0',
+                'Image' => '',
+                'HSN' => '',
+                'location_Warehouse' => '50'
+            ]
+        ];
+
+        foreach ($csvData as $row) {
+            $itemData = [
+                'item_id' => (int)$row['Id'] ?: null,
+                'name' => $row['Item Name'],
+                'description' => $row['Description'],
+                'category' => $row['Category'],
+                'cost_price' => (float)$row['Cost Price'],
+                'unit_price' => (float)$row['Unit Price'],
+                'reorder_level' => (int)$row['Reorder Level'],
+                'item_number' => $row['Barcode'] ?: null,
+                'allow_alt_description' => empty($row['Allow Alt Description']) ? '0' : '1',
+                'is_serialized' => empty($row['Item has Serial Number']) ? '0' : '1',
+                'deleted' => false
+            ];
+
+            $this->assertTrue($this->item->save_value($itemData));
+        }
+
+        $item1 = $this->item->get_info_by_id_or_number('ITEM-A');
+        $this->assertEquals('First Item', $item1->name);
+        $this->assertEquals(10.00, (float) $item1->cost_price);
+
+        $item2 = $this->item->get_info_by_id_or_number('ITEM-B');
+        $this->assertEquals('Second Item', $item2->name);
+        $this->assertEquals(15.00, (float) $item2->cost_price);
+    }
+
+    public function testImportUpdateExistingItem(): void
+    {
+        $originalData = [
+            'item_id' => null,
+            'item_number' => '1234567890',
+            'name' => 'Original Name',
+            'category' => 'Original Category',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($originalData));
+
+        $updatedData = [
+            'item_id' => $originalData['item_id'],
+            'name' => 'Updated Name',
+            'category' => 'Updated Category',
+            'cost_price' => 15.00,
+            'unit_price' => 30.00,
+            'description' => 'New description',
+            'reorder_level' => 10,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($updatedData, $updatedData['item_id']));
+
+        $updatedItem = $this->item->get_info($updatedData['item_id']);
+        $this->assertEquals('Updated Name', $updatedItem->name);
+        $this->assertEquals('Updated Category', $updatedItem->category);
+        $this->assertEquals(15.00, (float)$updatedItem->cost_price);
+        $this->assertEquals(30.00, (float)$updatedItem->unit_price);
+    }
+
+    public function testImportDeleteAttributeFromExistingItem(): void
+    {
+        $originalData = [
+            'item_id' => null,
+            'item_number' => '1234567890',
+            'name' => 'Original Name',
+            'category' => 'Original Category',
+            'cost_price' => '10.00',
+            'unit_price' => '20.00',
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($originalData));
+
+        $definitionData = [
+            'definition_name' => 'Color',
+            'definition_type' => TEXT,
+            'definition_flags' => 0,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->attribute->saveDefinition($definitionData));
+
+        //Assign attribute to item
+        $attributeValue = 'Red';
+        $attributeId = $this->attribute->saveAttributeValue(//need to properly assign an attribute link before this is going to work
+            $attributeValue,
+            $definitionData['definition_id'],
+            $originalData['item_id'],
+            false,
+            TEXT
+        );
+        $this->assertGreaterThan(0, $attributeId, 'Attribute fixture must exist before testing _DELETE_');
+
+        //Mock CSV import
+        $updatedItemData = ['item_id' => $originalData['item_id']];
+        $attributeDefinitionData = [$definitionData];
+        $updatedValues = ['Color' => '_DELETE_'];
+
+        $saveSuccess = $this->attribute->saveCSVRowAttributeData($updatedValues, $updatedItemData, $attributeDefinitionData);
+        $this->assertTrue($saveSuccess);
+
+        $resultingAttribute = $this->attribute->getAttributeValue($originalData['item_id'], $definitionData['definition_id']);
+        $this->assertEquals(NEW_ENTRY, $resultingAttribute->attribute_id);
+    }
+
+    public function testImportItemWithAttributeText(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'item_number' => '1234567890',
+            'name' => 'Item With Attribute',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $definitionData = [
+            'definition_name' => 'Color',
+            'definition_type' => TEXT,
+            'definition_flags' => 0,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->attribute->saveDefinition($definitionData));
+        $this->assertNotEmpty($definitionData['definition_id']);
+        $definitionId = $definitionData['definition_id'];
+
+        $this->assertNotNull($definitionId);
+
+
+        $attributeValue = 'Red';
+        $attributeId = $this->attribute->saveAttributeValue(
+            $attributeValue,
+            $definitionId,
+            $itemData['item_id'],
+            false,
+            TEXT
+        );
+
+        $this->assertNotFalse($attributeId);
+
+        $savedValue = $this->attribute->getAttributeValue($itemData['item_id'], $definitionId);
+        $this->assertEquals('Red', $savedValue->attribute_value);
+    }
+
+    public function testImportItemWithAttributeDropdown(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'item_number' => '1234567890',
+            'name' => 'Item With Dropdown',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        // Mock Attribute DROPDOWN
+        $definitionData = [
+            'definition_name' => 'Size',
+            'definition_type' => DROPDOWN,
+            'definition_flags' => 0,
+            'deleted' => 0
+        ];
+        $this->assertTrue($this->attribute->saveDefinition($definitionData));
+        $definitionId = $definitionData['definition_id'];
+
+        // Mock Attribute DROPDOWN Values
+        $dropdownValues = ['Small', 'Medium', 'Large'];
+        foreach ($dropdownValues as $value) {
+            $this->attribute->saveAttributeValue(
+                $value,
+                $definitionId,
+                false,
+                false,
+                DROPDOWN
+            );
+        }
+
+        // Save dropdown attribute value for item
+        $attributeValue = 'Medium';
+        $attributeId = $this->attribute->saveAttributeValue(
+            $attributeValue,
+            $definitionId,
+            $itemData['item_id'],
+            false,
+            DROPDOWN
+        );
+
+        $this->assertNotFalse($attributeId);
+
+        $savedValue = $this->attribute->getAttributeValue($itemData['item_id'], $definitionId);
+        $this->assertEquals('Medium', $savedValue->attribute_value);
+    }
+
+    public function testImportItemQuantityZero(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Item Zero Quantity',
+            'category' => 'Test',
+            'cost_price' => 5.00,
+            'unit_price' => 10.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $locationId = 1;
+
+        $itemQuantityData = [
+            'item_id' => $itemData['item_id'],
+            'location_id' => $locationId,
+            'quantity' => 0
+        ];
+
+        $result = $this->item_quantity->save_value($itemQuantityData, $itemData['item_id'], $locationId);
+        $this->assertTrue($result);
+
+        $savedQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $locationId);
+        $this->assertEquals(0, (int)$savedQuantity->quantity);
+    }
+
+    public function testImportItemWithNegativeReorderLevel(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Item Negative Reorder',
+            'category' => 'Test',
+            'cost_price' => 5.00,
+            'unit_price' => 10.00,
+            'reorder_level' => -1,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $savedItem = $this->item->get_info($itemData['item_id']);
+        $this->assertEquals(-1, (int)$savedItem->reorder_level);
+    }
+
+    public function testImportItemPriceRoundingBoundaries(): void
+    {
+        $cases = [
+            [
+                'cost_price' => 10.004,
+                'unit_price' => 25.004,
+                'expected_cost_price' => '10.00',
+                'expected_unit_price' => '25.00',
+            ],
+            [
+                'cost_price' => 10.005,
+                'unit_price' => 25.005,
+                'expected_cost_price' => '10.01',
+                'expected_unit_price' => '25.01',
+            ],
+            [
+                'cost_price' => 10.006,
+                'unit_price' => 25.006,
+                'expected_cost_price' => '10.01',
+                'expected_unit_price' => '25.01',
+            ],
+        ];
+
+        foreach ($cases as $case) {
+            $itemData = [
+                'item_id' => null,
+                'name' => 'Rounding Boundary Item ' . $case['cost_price'],
+                'category' => 'Test',
+                'cost_price' => $case['cost_price'],
+                'unit_price' => $case['unit_price'],
+                'deleted' => 0
+            ];
+
+            $this->assertTrue($this->item->save_value($itemData));
+
+            $savedItem = $this->item->get_info($itemData['item_id']);
+
+            $this->assertSame(
+                $case['expected_cost_price'],
+                number_format((float) $savedItem->cost_price, 2, '.', ''),
+                'Cost price should be rounded correctly at the 3rd decimal boundary'
+            );
+
+            $this->assertSame(
+                $case['expected_unit_price'],
+                number_format((float) $savedItem->unit_price, 2, '.', ''),
+                'Unit price should be rounded correctly at the 3rd decimal boundary'
+            );
+        }
+    }
+
+    public function testImportItemWithHsnCode(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Item With HSN',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'hsn_code' => '8471',
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $savedItem = $this->item->get_info($itemData['item_id']);
+        $this->assertEquals('8471', $savedItem->hsn_code);
+    }
+
+    public function testImportItemQuantityMultipleLocations(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Item Multi Location',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $locations = [
+            'Warehouse' => 100,
+            'Store' => 50,
+            'Backroom' => 25,
+        ];
+
+        $locationIds = [];
+
+        foreach ($locations as $locationName => $quantity) {
+            $locationData = [
+                'location_name' => $locationName,
+                'deleted' => 0
+            ];
+
+            $this->assertTrue($this->stock_location->save_value($locationData, NEW_ENTRY));
+            $this->assertNotEmpty($locationData['location_id']);
+
+            $locationIds[$locationName] = $locationData['location_id'];
+
+            $result = $this->item_quantity->save_value(
+                [
+                    'item_id' => $itemData['item_id'],
+                    'location_id' => $locationData['location_id'],
+                    'quantity' => $quantity
+                ],
+                $itemData['item_id'],
+                $locationData['location_id']
+            );
+
+            $this->assertTrue($result);
+        }
+
+        $warehouseQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $locationIds['Warehouse']);
+        $this->assertEquals(100, (int) $warehouseQuantity->quantity);
+
+        $storeQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $locationIds['Store']);
+        $this->assertEquals(50, (int) $storeQuantity->quantity);
+
+        $backroomQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $locationIds['Backroom']);
+        $this->assertEquals(25, (int) $backroomQuantity->quantity);
+    }
+
+    public function testCsvImportQuantityValidationNumeric(): void
+    {
+        $csvData = [
+            'Id' => '',
+            'Barcode' => 'VALID-ITEM',
+            'Item Name' => 'Valid Item',
+            'Category' => 'Test',
+            'Cost Price' => '10.00',
+            'Unit Price' => '20.00',
+            'location_Warehouse' => '100'
+        ];
+
+        $this->assertTrue(is_numeric($csvData['location_Warehouse']));
+        $this->assertTrue(is_numeric($csvData['Cost Price']));
+        $this->assertTrue(is_numeric($csvData['Unit Price']));
+    }
+
+    public function testCsvImportEmptyBarcodeAllowed(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Item Without Barcode',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'item_number' => null,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $this->assertIsInt($itemData['item_id']);
+        $this->assertGreaterThan(0, $itemData['item_id']);
+
+        $savedItem = $this->item->get_info($itemData['item_id']);
+        $this->assertEquals('Item Without Barcode', $savedItem->name);
+    }
+
+    public function testCsvImportItemExistsCheck(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Existing Item',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $exists = $this->item->exists($itemData['item_id']);
+        $this->assertTrue($exists);
+
+        $notExists = $this->item->exists(999999);
+        $this->assertFalse($notExists);
+    }
+
+    public function testFullCsvImportFlowSimulated(): void
+    {
+        $csvRow = [
+            'Id' => '',
+            'Barcode' => 'FULL-TEST-001',
+            'Item Name' => 'Complete Test Item',
+            'Category' => 'Electronics',
+            'Supplier ID' => '',
+            'Cost Price' => '50.00',
+            'Unit Price' => '100.00',
+            'Tax 1 Name' => 'VAT',
+            'Tax 1 Percent' => '20',
+            'Tax 2 Name' => '',
+            'Tax 2 Percent' => '',
+            'Reorder Level' => '10',
+            'Description' => 'A complete test item for CSV import',
+            'Allow Alt Description' => '1',
+            'Item has Serial Number' => '0',
+            'Image' => '',
+            'HSN' => '84713020'
+        ];
+
+        $itemData = [
+            'item_id' => (int)$csvRow['Id'] ?: null,
+            'name' => $csvRow['Item Name'],
+            'description' => $csvRow['Description'],
+            'category' => $csvRow['Category'],
+            'cost_price' => (float)$csvRow['Cost Price'],
+            'unit_price' => (float)$csvRow['Unit Price'],
+            'reorder_level' => (int)$csvRow['Reorder Level'],
+            'item_number' => $csvRow['Barcode'] ?: null,
+            'allow_alt_description' => empty($csvRow['Allow Alt Description']) ? '0' : '1',
+            'is_serialized' => empty($csvRow['Item has Serial Number']) ? '0' : '1',
+            'hsn_code' => $csvRow['HSN'],
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $taxesData = [];
+        if (is_numeric($csvRow['Tax 1 Percent']) && $csvRow['Tax 1 Name'] !== '') {
+            $taxesData[] = ['name' => $csvRow['Tax 1 Name'], 'percent' => $csvRow['Tax 1 Percent']];
+        }
+        if (is_numeric($csvRow['Tax 2 Percent']) && $csvRow['Tax 2 Name'] !== '') {
+            $taxesData[] = ['name' => $csvRow['Tax 2 Name'], 'percent' => $csvRow['Tax 2 Percent']];
+        }
+
+        if (!empty($taxesData)) {
+            $this->item_taxes->save_value($taxesData, $itemData['item_id']);
+        }
+
+        $locationId = 1;
+        $quantity = 75;
+
+        $quantityData = [
+            'item_id' => $itemData['item_id'],
+            'location_id' => $locationId,
+            'quantity' => $quantity
+        ];
+        $this->item_quantity->save_value($quantityData, $itemData['item_id'], $locationId);
+
+        $inventoryData = [
+            'trans_inventory' => $quantity,
+            'trans_items' => $itemData['item_id'],
+            'trans_location' => $locationId,
+            'trans_comment' => 'CSV import quantity',
+            'trans_user' => 1
+        ];
+        $this->inventory->insert($inventoryData);
+
+        $savedItem = $this->item->get_info($itemData['item_id']);
+        $this->assertEquals('Complete Test Item', $savedItem->name);
+        $this->assertEquals('Electronics', $savedItem->category);
+        $this->assertEquals(50.00, (float)$savedItem->cost_price);
+        $this->assertEquals(100.00, (float)$savedItem->unit_price);
+        $this->assertEquals('84713020', $savedItem->hsn_code);
+
+        $savedQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $locationId);
+        $this->assertEquals($quantity, (int)$savedQuantity->quantity);
+
+        $savedTaxes = $this->item_taxes->get_info($itemData['item_id']);
+        $this->assertCount(1, $savedTaxes);
+        $this->assertEquals('VAT', $savedTaxes[0]['name']);
+        $this->assertEquals(20, (float)$savedTaxes[0]['percent']);
+
+        $inventoryRecords = $this->inventory->get_inventory_data_for_item($itemData['item_id'], $locationId);
+        $this->assertGreaterThanOrEqual(1, $inventoryRecords->getNumRows());
+    }
+
+    public function testImportCsvInvalidStockLocationColumn(): void
+    {
+        $csvRow = [
+            'Id' => '',
+            'Item Name' => 'Test Item Invalid Location',
+            'Category' => 'Test',
+            'Cost Price' => '10.00',
+            'Unit Price' => '20.00',
+            'location_NonExistentLocation' => '100'
+        ];
+
+        $allowedLocations = [1 => 'Warehouse'];
+
+        $locationColumnsInCsv = [];
+        foreach (array_keys($csvRow) as $key) {
+            if (str_starts_with($key, 'location_')) {
+                $locationColumnsInCsv[$key] = substr($key, 9);
+            }
+        }
+
+        $invalidLocations = [];
+        foreach ($locationColumnsInCsv as $column => $locationName) {
+            if (!in_array($locationName, $allowedLocations)) {
+                $invalidLocations[] = $locationName;
+            }
+        }
+
+        $this->assertNotEmpty($invalidLocations, 'Should detect invalid location in CSV');
+        $this->assertContains('NonExistentLocation', $invalidLocations);
+    }
+
+    public function testImportCsvValidStockLocationColumn(): void
+    {
+        $csvRow = [
+            'Id' => '',
+            'Item Name' => 'Test Item Valid Location',
+            'Category' => 'Test',
+            'Cost Price' => '10.00',
+            'Unit Price' => '20.00',
+            'location_Warehouse' => '100'
+        ];
+
+        $allowedLocations = [1 => 'Warehouse'];
+
+        $locationColumnsInCsv = [];
+        foreach (array_keys($csvRow) as $key) {
+            if (str_starts_with($key, 'location_')) {
+                $locationColumnsInCsv[$key] = substr($key, 9);
+            }
+        }
+
+        $invalidLocations = [];
+        foreach ($locationColumnsInCsv as $column => $locationName) {
+            if (!in_array($locationName, $allowedLocations)) {
+                $invalidLocations[] = $locationName;
+            }
+        }
+
+        $this->assertEmpty($invalidLocations, 'Should have no invalid locations');
+    }
+
+    public function testImportCsvMixedValidAndInvalidLocations(): void
+    {
+        $csvRow = [
+            'Id' => '',
+            'Item Name' => 'Test Item Mixed Locations',
+            'Category' => 'Test',
+            'Cost Price' => '10.00',
+            'Unit Price' => '20.00',
+            'location_Warehouse' => '100',
+            'location_InvalidLocation' => '50'
+        ];
+
+        $allowedLocations = [1 => 'Warehouse', 2 => 'Store'];
+
+        $locationColumnsInCsv = [];
+        foreach (array_keys($csvRow) as $key) {
+            if (str_starts_with($key, 'location_')) {
+                $locationColumnsInCsv[$key] = substr($key, 9);
+            }
+        }
+
+        $invalidLocations = [];
+        foreach ($locationColumnsInCsv as $column => $locationName) {
+            if (!in_array($locationName, $allowedLocations)) {
+                $invalidLocations[] = $locationName;
+            }
+        }
+
+        $this->assertCount(1, $invalidLocations, 'Should have exactly one invalid location');
+        $this->assertContains('InvalidLocation', $invalidLocations);
+    }
+
+    public function testValidateCsvStockLocations(): void
+    {
+        $csvContent = "Id,\"Item Name\",Category,\"Cost Price\",\"Unit Price\",\"location_Warehouse\",\"location_FakeLocation\"\n";
+        $csvContent .= ",Test Item,Test,10.00,20.00,100,50\n";
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'csv_location_test_');
+        file_put_contents($tempFile, $csvContent);
+
+        $rows = get_csv_file($tempFile);
+        $this->assertCount(1, $rows);
+
+        $row = $rows[0];
+        $this->assertArrayHasKey('location_Warehouse', $row);
+        $this->assertArrayHasKey('location_FakeLocation', $row);
+
+        unlink($tempFile);
+    }
+
+    public function testImportItemQuantityOnlyForValidLocations(): void
+    {
+        $itemData = [
+            'item_id' => null,
+            'name' => 'Item Location Test',
+            'category' => 'Test',
+            'cost_price' => 10.00,
+            'unit_price' => 20.00,
+            'deleted' => 0
+        ];
+
+        $this->assertTrue($this->item->save_value($itemData));
+
+        $uniqueId = uniqid();
+        $locations = ['Warehouse' . $uniqueId, 'Store' . $uniqueId];
+
+        $allowedLocations = [];
+        foreach ($locations as $locationName) {
+            $currentLocation = ['location_name' => $locationName, 'deleted' => 0];
+            $this->assertTrue($this->stock_location->save_value($currentLocation, NEW_ENTRY));
+            $allowedLocations[$currentLocation['location_id']] = $locationName;
+        }
+
+        $csvRowSimulated = [
+            'location_Warehouse' . $uniqueId => '100',
+            'location_Store' . $uniqueId => '50',
+            'location_NonExistent' => '25'
+        ];
+
+        foreach ($allowedLocations as $locationId => $locationName) {
+            $columnName = "location_$locationName";
+            if (isset($csvRowSimulated[$columnName]) || $csvRowSimulated[$columnName] === '0') {
+                $quantityData = [
+                    'item_id' => $itemData['item_id'],
+                    'location_id' => $locationId,
+                    'quantity' => (int)$csvRowSimulated[$columnName]
+                ];
+                $this->item_quantity->save_value($quantityData, $itemData['item_id'], $locationId);
+            }
+        }
+
+        $warehouseId = array_search('Warehouse' . $uniqueId, $allowedLocations, true);
+        $warehouseQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $warehouseId);
+        $this->assertEquals(100, (int)$warehouseQuantity->quantity);
+
+        $storeId = array_search('Store'. $uniqueId, $allowedLocations, true);
+        $storeQuantity = $this->item_quantity->get_item_quantity($itemData['item_id'], $storeId);
+        $this->assertEquals(50, (int)$storeQuantity->quantity);
+
+        $result = $this->item_quantity->exists($itemData['item_id'], 999);
+        $this->assertFalse($result, 'Should not have quantity for non-existent location');
+    }
+
+    public function testDetectCsvLocationColumns(): void
+    {
+        $row = [
+            'Id' => '',
+            'Item Name' => 'Test',
+            'location_Warehouse' => '100',
+            'location_Store' => '50',
+            'attribute_Color' => 'Red'
+        ];
+
+        $locationColumns = [];
+        foreach (array_keys($row) as $key) {
+            if (str_starts_with($key, 'location_')) {
+                $locationColumns[$key] = substr($key, 9);
+            }
+        }
+
+        $this->assertCount(2, $locationColumns);
+        $this->assertArrayHasKey('location_Warehouse', $locationColumns);
+        $this->assertArrayHasKey('location_Store', $locationColumns);
+        $this->assertEquals('Warehouse', $locationColumns['location_Warehouse']);
+        $this->assertEquals('Store', $locationColumns['location_Store']);
+    }
+
+    public function testValidateLocationNamesCaseSensitivity(): void
+    {
+        $allowedLocations = [1 => 'Warehouse', 2 => 'Store'];
+
+        $csvLocationName = 'warehouse';
+
+        $isValid = in_array($csvLocationName, $allowedLocations);
+        $this->assertFalse($isValid, 'Location names should be case-sensitive');
+
+        $csvLocationName = 'Warehouse';
+        $isValid = in_array($csvLocationName, $allowedLocations);
+        $this->assertTrue($isValid, 'Valid location name should pass validation');
+    }
+}
+
diff --git a/tests/Controllers/ItemsCsvImportTest.php b/tests/Controllers/ItemsCsvImportTest.php
deleted file mode 100644
index 7c87b8300..000000000
--- a/tests/Controllers/ItemsCsvImportTest.php
+++ /dev/null
@@ -1,981 +0,0 @@
-<?php
-
-namespace Tests\Controllers;
-
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\DatabaseTestTrait;
-use App\Models\Item;
-use App\Models\Item_quantity;
-use App\Models\Inventory;
-use App\Models\Item_taxes;
-use App\Models\Attribute;
-use App\Models\Stock_location;
-use App\Models\Supplier;
-
-class ItemsCsvImportTest extends CIUnitTestCase
-{
-    use DatabaseTestTrait;
-
-    protected $migrate = true;
-    protected $migrateOnce = false;
-    protected $refresh = true;
-    protected $namespace = null;
-
-    protected $item;
-    protected $item_quantity;
-    protected $inventory;
-    protected $item_taxes;
-    protected $attribute;
-    protected $stock_location;
-    protected $supplier;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        helper('importfile');
-        helper('attribute');
-        
-        $this->item = model(Item::class);
-        $this->item_quantity = model(Item_quantity::class);
-        $this->inventory = model(Inventory::class);
-        $this->item_taxes = model(Item_taxes::class);
-        $this->attribute = model(Attribute::class);
-        $this->stock_location = model(Stock_location::class);
-        $this->supplier = model(Supplier::class);
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-    }
-
-    public function testGenerateCsvHeaderBasic(): void
-    {
-        $stock_locations = ['Warehouse'];
-        $attributes = [];
-
-        $csv = generate_import_items_csv($stock_locations, $attributes);
-
-        $this->assertStringContainsString('Id,Barcode,"Item Name"', $csv);
-        $this->assertStringContainsString('Category,"Supplier ID"', $csv);
-        $this->assertStringContainsString('"Cost Price","Unit Price"', $csv);
-        $this->assertStringContainsString('"Tax 1 Name","Tax 1 Percent"', $csv);
-        $this->assertStringContainsString('"Tax 2 Name","Tax 2 Percent"', $csv);
-        $this->assertStringContainsString('"Reorder Level"', $csv);
-        $this->assertStringContainsString('Description,"Allow Alt Description"', $csv);
-        $this->assertStringContainsString('"Item has Serial Number"', $csv);
-        $this->assertStringContainsString('Image,HSN', $csv);
-        $this->assertStringContainsString('"location_Warehouse"', $csv);
-        $this->assertStringContainsString("\xEF\xBB\xBF", $csv);
-    }
-
-    public function testGenerateCsvHeaderMultipleLocations(): void
-    {
-        $stock_locations = ['Warehouse', 'Store', 'Backroom'];
-        $attributes = [];
-
-        $csv = generate_import_items_csv($stock_locations, $attributes);
-
-        $this->assertStringContainsString('"location_Warehouse"', $csv);
-        $this->assertStringContainsString('"location_Store"', $csv);
-        $this->assertStringContainsString('"location_Backroom"', $csv);
-    }
-
-    public function testGenerateCsvHeaderWithAttributes(): void
-    {
-        $stock_locations = ['Warehouse'];
-        $attributes = ['Color', 'Size', 'Weight'];
-
-        $csv = generate_import_items_csv($stock_locations, $attributes);
-
-        $this->assertStringContainsString('"attribute_Color"', $csv);
-        $this->assertStringContainsString('"attribute_Size"', $csv);
-        $this->assertStringContainsString('"attribute_Weight"', $csv);
-    }
-
-    public function testGenerateStockLocationHeaders(): void
-    {
-        $locations = ['Warehouse', 'Store'];
-
-        $headers = generate_stock_location_headers($locations);
-
-        $this->assertEquals(',"location_Warehouse","location_Store"', $headers);
-    }
-
-    public function testGenerateAttributeHeaders(): void
-    {
-        $attributes = ['Color', 'Size'];
-
-        $headers = generate_attribute_headers($attributes);
-
-        $this->assertEquals(',"attribute_Color","attribute_Size"', $headers);
-    }
-
-    public function testGenerateAttributeHeadersRemovesNegativeOneIndex(): void
-    {
-        $attributes = [-1 => 'None', 'Color' => 'Color'];
-        unset($attributes[-1]);
-
-        $headers = generate_attribute_headers($attributes);
-
-        $this->assertStringContainsString('"attribute_Color"', $headers);
-    }
-
-    public function testGetCsvFileBasic(): void
-    {
-        $csv_content = "Id,Barcode,\"Item Name\",Category,\"Supplier ID\",\"Cost Price\",\"Unit Price\",\"Tax 1 Name\",\"Tax 1 Percent\",\"Tax 2 Name\",\"Tax 2 Percent\",\"Reorder Level\",Description,\"Allow Alt Description\",\"Item has Serial Number\",Image,HSN\n";
-        $csv_content .= ",ITEM001,Test Item,Electronics,1,10.00,15.00,,,,,5,Test Description,0,0,,HSN001\n";
-
-        $temp_file = tempnam(sys_get_temp_dir(), 'csv_test_');
-        file_put_contents($temp_file, $csv_content);
-
-        $rows = get_csv_file($temp_file);
-
-        $this->assertCount(1, $rows);
-        $this->assertEquals('', $rows[0]['Id']);
-        $this->assertEquals('ITEM001', $rows[0]['Barcode']);
-        $this->assertEquals('Test Item', $rows[0]['Item Name']);
-        $this->assertEquals('Electronics', $rows[0]['Category']);
-
-        unlink($temp_file);
-    }
-
-    public function testGetCsvFileWithBom(): void
-    {
-        $bom = pack('CCC', 0xef, 0xbb, 0xbf);
-        $csv_content = $bom . "Id,\"Item Name\",Category\n";
-        $csv_content .= "1,Test Item,Electronics\n";
-
-        $temp_file = tempnam(sys_get_temp_dir(), 'csv_test_bom_');
-        file_put_contents($temp_file, $csv_content);
-
-        $rows = get_csv_file($temp_file);
-
-        $this->assertCount(1, $rows);
-        $this->assertEquals('1', $rows[0]['Id']);
-        $this->assertEquals('Test Item', $rows[0]['Item Name']);
-
-        unlink($temp_file);
-    }
-
-    public function testGetCsvFileMultipleRows(): void
-    {
-        $csv_content = "Id,\"Item Name\",Category\n";
-        $csv_content .= "1,Item One,Cat A\n";
-        $csv_content .= "2,Item Two,Cat B\n";
-        $csv_content .= "3,Item Three,Cat C\n";
-
-        $temp_file = tempnam(sys_get_temp_dir(), 'csv_test_multi_');
-        file_put_contents($temp_file, $csv_content);
-
-        $rows = get_csv_file($temp_file);
-
-        $this->assertCount(3, $rows);
-        $this->assertEquals('Item One', $rows[0]['Item Name']);
-        $this->assertEquals('Item Two', $rows[1]['Item Name']);
-        $this->assertEquals('Item Three', $rows[2]['Item Name']);
-
-        unlink($temp_file);
-    }
-
-    public function testBomExists(): void
-    {
-        $bom = pack('CCC', 0xef, 0xbb, 0xbf);
-        $content_with_bom = $bom . "test content";
-
-        $temp_file = tempnam(sys_get_temp_dir(), 'bom_test_');
-        file_put_contents($temp_file, $content_with_bom);
-
-        $handle = fopen($temp_file, 'r');
-        $result = bom_exists($handle);
-        fclose($handle);
-
-        $this->assertTrue($result);
-        unlink($temp_file);
-    }
-
-    public function testBomNotExists(): void
-    {
-        $content_without_bom = "test content without BOM";
-
-        $temp_file = tempnam(sys_get_temp_dir(), 'no_bom_test_');
-        file_put_contents($temp_file, $content_without_bom);
-
-        $handle = fopen($temp_file, 'r');
-        $result = bom_exists($handle);
-        fclose($handle);
-
-        $this->assertFalse($result);
-        unlink($temp_file);
-    }
-
-    public function testImportItemBasicFields(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'CSV Imported Item',
-            'description' => 'Description from CSV',
-            'category' => 'Electronics',
-            'cost_price' => 10.50,
-            'unit_price' => 25.99,
-            'reorder_level' => 5,
-            'supplier_id' => null,
-            'item_number' => 'CSV-ITEM-001',
-            'allow_alt_description' => 0,
-            'is_serialized' => 0,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $this->assertIsInt($item_id);
-        $this->assertGreaterThan(0, $item_id);
-
-        $saved_item = $this->item->get_info($item_id);
-        $this->assertEquals('CSV Imported Item', $saved_item->name);
-        $this->assertEquals('Description from CSV', $saved_item->description);
-        $this->assertEquals('Electronics', $saved_item->category);
-        $this->assertEquals(10.50, (float)$saved_item->cost_price);
-        $this->assertEquals(25.99, (float)$saved_item->unit_price);
-    }
-
-    public function testImportItemWithQuantity(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item With Quantity',
-            'category' => 'Test Category',
-            'cost_price' => 5.00,
-            'unit_price' => 10.00,
-            'reorder_level' => 2,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $location_id = 1;
-        $quantity = 100;
-
-        $item_quantity_data = [
-            'item_id' => $item_id,
-            'location_id' => $location_id,
-            'quantity' => $quantity
-        ];
-
-        $result = $this->item_quantity->save_value($item_quantity_data, $item_id, $location_id);
-        $this->assertTrue($result);
-
-        $saved_quantity = $this->item_quantity->get_item_quantity($item_id, $location_id);
-        $this->assertEquals($quantity, $saved_quantity->quantity);
-    }
-
-    public function testImportItemCreatesInventoryRecord(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item With Inventory',
-            'category' => 'Test',
-            'cost_price' => 5.00,
-            'unit_price' => 10.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $inventory_data = [
-            'trans_inventory' => 50,
-            'trans_items' => $item_id,
-            'trans_location' => 1,
-            'trans_comment' => 'CSV Import',
-            'trans_user' => 1
-        ];
-
-        $trans_id = $this->inventory->insert($inventory_data);
-
-        $this->assertIsInt($trans_id);
-        $this->assertGreaterThan(0, $trans_id);
-
-        $inventory_records = $this->inventory->get_inventory_data_for_item($item_id, 1);
-        $this->assertGreaterThanOrEqual(1, $inventory_records->getNumRows());
-    }
-
-    public function testImportItemWithTaxes(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Taxable Item',
-            'category' => 'Test',
-            'cost_price' => 100.00,
-            'unit_price' => 150.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $taxes_data = [
-            ['name' => 'VAT', 'percent' => 20],
-            ['name' => 'GST', 'percent' => 10]
-        ];
-
-        $result = $this->item_taxes->save_value($taxes_data, $item_id);
-        $this->assertTrue($result);
-
-        $saved_taxes = $this->item_taxes->get_info($item_id);
-        
-        $tax_names = array_column($saved_taxes, 'name');
-        $this->assertContains('VAT', $tax_names);
-        $this->assertContains('GST', $tax_names);
-    }
-
-    public function testImportMultipleItemsFromSimulatedCsv(): void
-    {
-        $csv_data = [
-            [
-                'Id' => '',
-                'Barcode' => 'ITEM-A',
-                'Item Name' => 'First Item',
-                'Category' => 'Category A',
-                'Supplier ID' => '',
-                'Cost Price' => '10.00',
-                'Unit Price' => '20.00',
-                'Tax 1 Name' => '',
-                'Tax 1 Percent' => '',
-                'Tax 2 Name' => '',
-                'Tax 2 Percent' => '',
-                'Reorder Level' => '5',
-                'Description' => 'First item description',
-                'Allow Alt Description' => '0',
-                'Item has Serial Number' => '0',
-                'Image' => '',
-                'HSN' => '',
-                'location_Warehouse' => '100'
-            ],
-            [
-                'Id' => '',
-                'Barcode' => 'ITEM-B',
-                'Item Name' => 'Second Item',
-                'Category' => 'Category B',
-                'Supplier ID' => '',
-                'Cost Price' => '15.00',
-                'Unit Price' => '30.00',
-                'Tax 1 Name' => '',
-                'Tax 1 Percent' => '',
-                'Tax 2 Name' => '',
-                'Tax 2 Percent' => '',
-                'Reorder Level' => '10',
-                'Description' => 'Second item description',
-                'Allow Alt Description' => '0',
-                'Item has Serial Number' => '0',
-                'Image' => '',
-                'HSN' => '',
-                'location_Warehouse' => '50'
-            ]
-        ];
-
-        $imported_item_ids = [];
-
-        foreach ($csv_data as $row) {
-            $item_data = [
-                'item_id' => (int)$row['Id'] ?: null,
-                'name' => $row['Item Name'],
-                'description' => $row['Description'],
-                'category' => $row['Category'],
-                'cost_price' => (float)$row['Cost Price'],
-                'unit_price' => (float)$row['Unit Price'],
-                'reorder_level' => (int)$row['Reorder Level'],
-                'item_number' => $row['Barcode'] ?: null,
-                'allow_alt_description' => empty($row['Allow Alt Description']) ? '0' : '1',
-                'is_serialized' => empty($row['Item has Serial Number']) ? '0' : '1',
-                'deleted' => false
-            ];
-
-            $item_id = $this->item->save_value($item_data);
-            $imported_item_ids[] = $item_id;
-        }
-
-        $this->assertCount(2, $imported_item_ids);
-
-        $item1 = $this->item->get_info($imported_item_ids[0]);
-        $this->assertEquals('First Item', $item1->name);
-        $this->assertEquals(10.00, (float)$item1->cost_price);
-
-        $item2 = $this->item->get_info($imported_item_ids[1]);
-        $this->assertEquals('Second Item', $item2->name);
-        $this->assertEquals(15.00, (float)$item2->cost_price);
-    }
-
-    public function testImportUpdateExistingItem(): void
-    {
-        $original_data = [
-            'item_id' => null,
-            'name' => 'Original Name',
-            'category' => 'Original Category',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($original_data);
-
-        $updated_data = [
-            'item_id' => $item_id,
-            'name' => 'Updated Name',
-            'category' => 'Updated Category',
-            'cost_price' => 15.00,
-            'unit_price' => 30.00,
-            'description' => 'New description',
-            'reorder_level' => 10,
-            'deleted' => 0
-        ];
-
-        $this->item->save_value($updated_data);
-
-        $updated_item = $this->item->get_info($item_id);
-        $this->assertEquals('Updated Name', $updated_item->name);
-        $this->assertEquals('Updated Category', $updated_item->category);
-        $this->assertEquals(15.00, (float)$updated_item->cost_price);
-        $this->assertEquals(30.00, (float)$updated_item->unit_price);
-    }
-
-    public function testImportItemWithAttributeText(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item With Attribute',
-            'category' => 'Test',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $definition_data = [
-            'definition_name' => 'Color',
-            'definition_type' => TEXT,
-            'definition_flags' => 0,
-            'deleted' => 0
-        ];
-        $definition_id = $this->attribute->saveDefinition($definition_data);
-
-        $attribute_value = 'Red';
-        $attribute_id = $this->attribute->saveAttributeValue(
-            $attribute_value,
-            $definition_id,
-            $item_id,
-            false,
-            TEXT
-        );
-
-        $this->assertNotFalse($attribute_id);
-
-        $saved_value = $this->attribute->getAttributeValue($item_id, $definition_id);
-        $this->assertEquals('Red', $saved_value->attribute_value);
-    }
-
-    public function testImportItemWithAttributeDropdown(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item With Dropdown',
-            'category' => 'Test',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $definition_data = [
-            'definition_name' => 'Size',
-            'definition_type' => DROPDOWN,
-            'definition_flags' => 0,
-            'deleted' => 0
-        ];
-        $definition_id = $this->attribute->saveDefinition($definition_data);
-
-        $dropdown_values = ['Small', 'Medium', 'Large'];
-        foreach ($dropdown_values as $i => $value) {
-            $this->db->table('attribute_values')->insert([
-                'attribute_value' => $value,
-                'definition_id' => $definition_id,
-                'definition_type' => DROPDOWN,
-                'attribute_group' => $i,
-                'deleted' => 0
-            ]);
-        }
-
-        $attribute_value = 'Medium';
-        $attribute_id = $this->attribute->saveAttributeValue(
-            $attribute_value,
-            $definition_id,
-            $item_id,
-            false,
-            DROPDOWN
-        );
-
-        $this->assertNotFalse($attribute_id);
-
-        $saved_value = $this->attribute->getAttributeValue($item_id, $definition_id);
-        $this->assertEquals('Medium', $saved_value->attribute_value);
-    }
-
-    public function testImportItemQuantityZero(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item Zero Quantity',
-            'category' => 'Test',
-            'cost_price' => 5.00,
-            'unit_price' => 10.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $location_id = 1;
-
-        $item_quantity_data = [
-            'item_id' => $item_id,
-            'location_id' => $location_id,
-            'quantity' => 0
-        ];
-
-        $result = $this->item_quantity->save_value($item_quantity_data, $item_id, $location_id);
-        $this->assertTrue($result);
-
-        $saved_quantity = $this->item_quantity->get_item_quantity($item_id, $location_id);
-        $this->assertEquals(0, (int)$saved_quantity->quantity);
-    }
-
-    public function testImportItemWithNegativeReorderLevel(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item Negative Reorder',
-            'category' => 'Test',
-            'cost_price' => 5.00,
-            'unit_price' => 10.00,
-            'reorder_level' => -1,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $saved_item = $this->item->get_info($item_id);
-        $this->assertEquals(-1, (int)$saved_item->reorder_level);
-    }
-
-    public function testImportItemWithHighPrecisionPrices(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'High Precision Item',
-            'category' => 'Test',
-            'cost_price' => 10.123456,
-            'unit_price' => 25.876543,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $saved_item = $this->item->get_info($item_id);
-        $cost_diff = abs(10.123456 - (float)$saved_item->cost_price);
-        $price_diff = abs(25.876543 - (float)$saved_item->unit_price);
-
-        $this->assertLessThan(0.001, $cost_diff, 'Cost price should maintain precision');
-        $this->assertLessThan(0.001, $price_diff, 'Unit price should maintain precision');
-    }
-
-    public function testImportItemWithHsnCode(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item With HSN',
-            'category' => 'Test',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'hsn_code' => '8471',
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $saved_item = $this->item->get_info($item_id);
-        $this->assertEquals('8471', $saved_item->hsn_code);
-    }
-
-    public function testImportItemQuantityMultipleLocations(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item Multi Location',
-            'category' => 'Test',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $quantities = [
-            ['location_id' => 1, 'quantity' => 100],
-            ['location_id' => 2, 'quantity' => 50],
-            ['location_id' => 3, 'quantity' => 25]
-        ];
-
-        foreach ($quantities as $q) {
-            $result = $this->item_quantity->save_value(
-                ['item_id' => $item_id, 'location_id' => $q['location_id'], 'quantity' => $q['quantity']],
-                $item_id,
-                $q['location_id']
-            );
-            $this->assertTrue($result);
-        }
-
-        foreach ($quantities as $q) {
-            $saved = $this->item_quantity->get_item_quantity($item_id, $q['location_id']);
-            $this->assertEquals($q['quantity'], (int)$saved->quantity, "Quantity at location {$q['location_id']} should match");
-        }
-    }
-
-    public function testCsvImportQuantityValidationNumeric(): void
-    {
-        $csv_data = [
-            'Id' => '',
-            'Barcode' => 'VALID-ITEM',
-            'Item Name' => 'Valid Item',
-            'Category' => 'Test',
-            'Cost Price' => '10.00',
-            'Unit Price' => '20.00',
-            'location_Warehouse' => '100'
-        ];
-
-        $this->assertTrue(is_numeric($csv_data['location_Warehouse']));
-        $this->assertTrue(is_numeric($csv_data['Cost Price']));
-        $this->assertTrue(is_numeric($csv_data['Unit Price']));
-    }
-
-    public function testCsvImportEmptyBarcodeAllowed(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item Without Barcode',
-            'category' => 'Test',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'item_number' => null,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $this->assertIsInt($item_id);
-        $this->assertGreaterThan(0, $item_id);
-
-        $saved_item = $this->item->get_info($item_id);
-        $this->assertEquals('Item Without Barcode', $saved_item->name);
-    }
-
-    public function testCsvImportItemExistsCheck(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Existing Item',
-            'category' => 'Test',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $exists = $this->item->exists($item_id);
-        $this->assertTrue($exists);
-
-        $not_exists = $this->item->exists(999999);
-        $this->assertFalse($not_exists);
-    }
-
-    public function testFullCsvImportFlowSimulated(): void
-    {
-        $csv_row = [
-            'Id' => '',
-            'Barcode' => 'FULL-TEST-001',
-            'Item Name' => 'Complete Test Item',
-            'Category' => 'Electronics',
-            'Supplier ID' => '',
-            'Cost Price' => '50.00',
-            'Unit Price' => '100.00',
-            'Tax 1 Name' => 'VAT',
-            'Tax 1 Percent' => '20',
-            'Tax 2 Name' => '',
-            'Tax 2 Percent' => '',
-            'Reorder Level' => '10',
-            'Description' => 'A complete test item for CSV import',
-            'Allow Alt Description' => '1',
-            'Item has Serial Number' => '0',
-            'Image' => '',
-            'HSN' => '84713020'
-        ];
-
-        $item_data = [
-            'item_id' => (int)$csv_row['Id'] ?: null,
-            'name' => $csv_row['Item Name'],
-            'description' => $csv_row['Description'],
-            'category' => $csv_row['Category'],
-            'cost_price' => (float)$csv_row['Cost Price'],
-            'unit_price' => (float)$csv_row['Unit Price'],
-            'reorder_level' => (int)$csv_row['Reorder Level'],
-            'item_number' => $csv_row['Barcode'] ?: null,
-            'allow_alt_description' => empty($csv_row['Allow Alt Description']) ? '0' : '1',
-            'is_serialized' => empty($csv_row['Item has Serial Number']) ? '0' : '1',
-            'hsn_code' => $csv_row['HSN'],
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $taxes_data = [];
-        if (is_numeric($csv_row['Tax 1 Percent']) && $csv_row['Tax 1 Name'] !== '') {
-            $taxes_data[] = ['name' => $csv_row['Tax 1 Name'], 'percent' => $csv_row['Tax 1 Percent']];
-        }
-        if (is_numeric($csv_row['Tax 2 Percent']) && $csv_row['Tax 2 Name'] !== '') {
-            $taxes_data[] = ['name' => $csv_row['Tax 2 Name'], 'percent' => $csv_row['Tax 2 Percent']];
-        }
-
-        if (!empty($taxes_data)) {
-            $this->item_taxes->save_value($taxes_data, $item_id);
-        }
-
-        $location_id = 1;
-        $quantity = 75;
-
-        $quantity_data = [
-            'item_id' => $item_id,
-            'location_id' => $location_id,
-            'quantity' => $quantity
-        ];
-        $this->item_quantity->save_value($quantity_data, $item_id, $location_id);
-
-        $inventory_data = [
-            'trans_inventory' => $quantity,
-            'trans_items' => $item_id,
-            'trans_location' => $location_id,
-            'trans_comment' => 'CSV import quantity',
-            'trans_user' => 1
-        ];
-        $this->inventory->insert($inventory_data);
-
-        $saved_item = $this->item->get_info($item_id);
-        $this->assertEquals('Complete Test Item', $saved_item->name);
-        $this->assertEquals('Electronics', $saved_item->category);
-        $this->assertEquals(50.00, (float)$saved_item->cost_price);
-        $this->assertEquals(100.00, (float)$saved_item->unit_price);
-        $this->assertEquals('84713020', $saved_item->hsn_code);
-
-        $saved_quantity = $this->item_quantity->get_item_quantity($item_id, $location_id);
-        $this->assertEquals($quantity, (int)$saved_quantity->quantity);
-
-        $saved_taxes = $this->item_taxes->get_info($item_id);
-        $this->assertCount(1, $saved_taxes);
-        $this->assertEquals('VAT', $saved_taxes[0]['name']);
-        $this->assertEquals(20, (float)$saved_taxes[0]['percent']);
-
-        $inventory_records = $this->inventory->get_inventory_data_for_item($item_id, $location_id);
-        $this->assertGreaterThanOrEqual(1, $inventory_records->getNumRows());
-    }
-
-    public function testImportCsvInvalidStockLocationColumn(): void
-    {
-        $csv_headers = ['Id', 'Item Name', 'Category', 'Cost Price', 'Unit Price', 'location_NonExistentLocation'];
-        $csv_row = [
-            'Id' => '',
-            'Item Name' => 'Test Item Invalid Location',
-            'Category' => 'Test',
-            'Cost Price' => '10.00',
-            'Unit Price' => '20.00',
-            'location_NonExistentLocation' => '100'
-        ];
-
-        $allowed_locations = [1 => 'Warehouse'];
-
-        $location_columns_in_csv = [];
-        foreach (array_keys($csv_row) as $key) {
-            if (str_starts_with($key, 'location_')) {
-                $location_columns_in_csv[$key] = substr($key, 9);
-            }
-        }
-
-        $invalid_locations = [];
-        foreach ($location_columns_in_csv as $column => $location_name) {
-            if (!in_array($location_name, $allowed_locations)) {
-                $invalid_locations[] = $location_name;
-            }
-        }
-
-        $this->assertNotEmpty($invalid_locations, 'Should detect invalid location in CSV');
-        $this->assertContains('NonExistentLocation', $invalid_locations);
-    }
-
-    public function testImportCsvValidStockLocationColumn(): void
-    {
-        $csv_row = [
-            'Id' => '',
-            'Item Name' => 'Test Item Valid Location',
-            'Category' => 'Test',
-            'Cost Price' => '10.00',
-            'Unit Price' => '20.00',
-            'location_Warehouse' => '100'
-        ];
-
-        $allowed_locations = [1 => 'Warehouse'];
-
-        $location_columns_in_csv = [];
-        foreach (array_keys($csv_row) as $key) {
-            if (str_starts_with($key, 'location_')) {
-                $location_columns_in_csv[$key] = substr($key, 9);
-            }
-        }
-
-        $invalid_locations = [];
-        foreach ($location_columns_in_csv as $column => $location_name) {
-            if (!in_array($location_name, $allowed_locations)) {
-                $invalid_locations[] = $location_name;
-            }
-        }
-
-        $this->assertEmpty($invalid_locations, 'Should have no invalid locations');
-    }
-
-    public function testImportCsvMixedValidAndInvalidLocations(): void
-    {
-        $csv_row = [
-            'Id' => '',
-            'Item Name' => 'Test Item Mixed Locations',
-            'Category' => 'Test',
-            'Cost Price' => '10.00',
-            'Unit Price' => '20.00',
-            'location_Warehouse' => '100',
-            'location_InvalidLocation' => '50'
-        ];
-
-        $allowed_locations = [1 => 'Warehouse', 2 => 'Store'];
-
-        $location_columns_in_csv = [];
-        foreach (array_keys($csv_row) as $key) {
-            if (str_starts_with($key, 'location_')) {
-                $location_columns_in_csv[$key] = substr($key, 9);
-            }
-        }
-
-        $invalid_locations = [];
-        foreach ($location_columns_in_csv as $column => $location_name) {
-            if (!in_array($location_name, $allowed_locations)) {
-                $invalid_locations[] = $location_name;
-            }
-        }
-
-        $this->assertCount(1, $invalid_locations, 'Should have exactly one invalid location');
-        $this->assertContains('InvalidLocation', $invalid_locations);
-    }
-
-    public function testValidateCsvStockLocations(): void
-    {
-        $csv_content = "Id,\"Item Name\",Category,\"Cost Price\",\"Unit Price\",\"location_Warehouse\",\"location_FakeLocation\"\n";
-        $csv_content .= ",Test Item,Test,10.00,20.00,100,50\n";
-
-        $temp_file = tempnam(sys_get_temp_dir(), 'csv_location_test_');
-        file_put_contents($temp_file, $csv_content);
-
-        $rows = get_csv_file($temp_file);
-        $this->assertCount(1, $rows);
-
-        $row = $rows[0];
-        $this->assertArrayHasKey('location_Warehouse', $row);
-        $this->assertArrayHasKey('location_FakeLocation', $row);
-
-        unlink($temp_file);
-    }
-
-    public function testImportItemQuantityOnlyForValidLocations(): void
-    {
-        $item_data = [
-            'item_id' => null,
-            'name' => 'Item Location Test',
-            'category' => 'Test',
-            'cost_price' => 10.00,
-            'unit_price' => 20.00,
-            'deleted' => 0
-        ];
-
-        $item_id = $this->item->save_value($item_data);
-
-        $allowed_locations = [1 => 'Warehouse', 2 => 'Store'];
-
-        $csv_row_simulated = [
-            'location_Warehouse' => '100',
-            'location_Store' => '50',
-            'location_NonExistent' => '25'
-        ];
-
-        foreach ($allowed_locations as $location_id => $location_name) {
-            $column_name = "location_$location_name";
-            if (isset($csv_row_simulated[$column_name]) || $csv_row_simulated[$column_name] === '0') {
-                $quantity_data = [
-                    'item_id' => $item_id,
-                    'location_id' => $location_id,
-                    'quantity' => (int)$csv_row_simulated[$column_name]
-                ];
-                $this->item_quantity->save_value($quantity_data, $item_id, $location_id);
-            }
-        }
-
-        $warehouse_qty = $this->item_quantity->get_item_quantity($item_id, 1);
-        $this->assertEquals(100, (int)$warehouse_qty->quantity);
-
-        $store_qty = $this->item_quantity->get_item_quantity($item_id, 2);
-        $this->assertEquals(50, (int)$store_qty->quantity);
-
-        $result = $this->item_quantity->exists($item_id, 999);
-        $this->assertFalse($result, 'Should not have quantity for non-existent location');
-    }
-
-    public function testDetectCsvLocationColumns(): void
-    {
-        $row = [
-            'Id' => '',
-            'Item Name' => 'Test',
-            'location_Warehouse' => '100',
-            'location_Store' => '50',
-            'attribute_Color' => 'Red'
-        ];
-
-        $location_columns = [];
-        foreach (array_keys($row) as $key) {
-            if (str_starts_with($key, 'location_')) {
-                $location_columns[$key] = substr($key, 9);
-            }
-        }
-
-        $this->assertCount(2, $location_columns);
-        $this->assertArrayHasKey('location_Warehouse', $location_columns);
-        $this->assertArrayHasKey('location_Store', $location_columns);
-        $this->assertEquals('Warehouse', $location_columns['location_Warehouse']);
-        $this->assertEquals('Store', $location_columns['location_Store']);
-    }
-
-    public function testValidateLocationNamesCaseSensitivity(): void
-    {
-        $allowed_locations = [1 => 'Warehouse', 2 => 'Store'];
-
-        $csv_location_name = 'warehouse';
-
-        $is_valid = in_array($csv_location_name, $allowed_locations);
-        $this->assertFalse($is_valid, 'Location names should be case-sensitive');
-
-        $csv_location_name = 'Warehouse';
-        $is_valid = in_array($csv_location_name, $allowed_locations);
-        $this->assertTrue($is_valid, 'Valid location name should pass validation');
-    }
-}
\ No newline at end of file
diff --git a/tests/Controllers/LoginTest.php b/tests/Controllers/LoginTest.php
new file mode 100644
index 000000000..8d75c3134
--- /dev/null
+++ b/tests/Controllers/LoginTest.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Tests\Controllers;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+
+/**
+ * Test suite for the Login controller, including the CI Throttler
+ * mitigation for brute-force/credential-stuffing.
+ */
+class LoginTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    private array $usedKeys = [];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::session()->destroy();
+        $this->clearThrottleState();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->clearThrottleState();
+
+        parent::tearDown();
+    }
+
+    private function clearThrottleState(): void
+    {
+        $throttler = Services::throttler();
+
+        foreach ($this->usedKeys as $key) {
+            $throttler->remove($key);
+        }
+
+        $this->usedKeys = [];
+
+        Services::resetSingle('throttler');
+    }
+
+    private function trackThrottleKeys(string $username = ''): void
+    {
+        $this->usedKeys[] = 'login-ip-' . Services::request()->getIPAddress();
+
+        if ($username !== '') {
+            $this->usedKeys[] = 'login-user-' . strtolower($username);
+        }
+    }
+
+    /**
+     * Login::index() redirects to 'login' and runs a migration when the
+     * app's migration state isn't current, bypassing credential checks
+     * entirely. Skip credential-dependent assertions in that case so this
+     * test only exercises login logic when the DB is actually current
+     * (throttling itself is verified independently and runs before this
+     * branch, so it's unaffected).
+     */
+    private function skipIfMigrationRequired(\CodeIgniter\Test\TestResponse $response): void
+    {
+        $redirectUrl = $response->getRedirectUrl();
+
+        if ($redirectUrl !== null && str_ends_with(rtrim(strtolower($redirectUrl), '/'), '/login')) {
+            $this->markTestSkipped('App migration state is not current in this environment; skipping credential-path assertions.');
+        }
+    }
+
+    public function testValidCredentialsLogsIn(): void
+    {
+        $response = $this->post('/login', [
+            'username' => 'admin',
+            'password' => 'pointofsale',
+        ]);
+        $this->trackThrottleKeys('admin');
+
+        $this->skipIfMigrationRequired($response);
+
+        $response->assertRedirectTo('home');
+    }
+
+    public function testInvalidCredentialsShowsError(): void
+    {
+        $response = $this->post('/login', [
+            'username' => 'admin',
+            'password' => 'wrongpassword',
+        ]);
+        $this->trackThrottleKeys('admin');
+
+        $this->skipIfMigrationRequired($response);
+
+        $response->assertStatus(200);
+        $response->assertSee(lang('Login.invalid_username_and_password'));
+    }
+
+    public function testSixthFailedAttemptIsThrottled(): void
+    {
+        for ($i = 0; $i < 5; $i++) {
+            $this->post('/login', [
+                'username' => 'wronguser',
+                'password' => 'wrongpassword',
+            ]);
+            $this->trackThrottleKeys('wronguser');
+        }
+
+        $response = $this->post('/login', [
+            'username' => 'wronguser',
+            'password' => 'wrongpassword',
+        ]);
+        $this->trackThrottleKeys('wronguser');
+
+        $response->assertStatus(429);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertSame(lang('Login.too_many_attempts'), $result['message']);
+    }
+
+    public function testCorrectLoginStillWorksUnderThrottleCapacity(): void
+    {
+        for ($i = 0; $i < 3; $i++) {
+            $this->post('/login', [
+                'username' => 'admin',
+                'password' => 'wrongpassword',
+            ]);
+            $this->trackThrottleKeys('admin');
+        }
+
+        $response = $this->post('/login', [
+            'username' => 'admin',
+            'password' => 'pointofsale',
+        ]);
+        $this->trackThrottleKeys('admin');
+
+        $this->skipIfMigrationRequired($response);
+
+        $response->assertRedirectTo('home');
+    }
+
+    public function testGetRequestToLoginIsNeverThrottled(): void
+    {
+        for ($i = 0; $i < 10; $i++) {
+            $response = $this->get('/login');
+            $this->skipIfMigrationRequired($response);
+            $response->assertStatus(200);
+        }
+    }
+}
diff --git a/tests/Controllers/ReportsControllerTest.php b/tests/Controllers/ReportsControllerTest.php
index 584b81b5e..c2f59979c 100644
--- a/tests/Controllers/ReportsControllerTest.php
+++ b/tests/Controllers/ReportsControllerTest.php
@@ -3,55 +3,211 @@
 namespace Tests\Controllers;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+use App\Database\Seeds\TestDatabaseBootstrapSeeder;
+use App\Models\Employee;
+use Config\OSPOS;
 
+/**
+ * Regression tests for the reports permission bypass
+ *
+ * Reports::__construct() previously derived the report method name from
+ * $request->getUri()->getSegment(2), which CodeIgniter decodes once, while
+ * the router decodes the same path a second time before dispatch. Encoding
+ * the report name's underscore as %255F meant the constructor saw no
+ * underscore, skipped the has_grant() check entirely, and the router still
+ * dispatched to the real (double-decoded) method — letting any authenticated
+ * employee read reports they had no grant for.
+ */
 class ReportsControllerTest extends CIUnitTestCase
 {
-    public function testRedirectPatternUsesHeaderAndExit(): void
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    private static bool $doneBootstrap = false;
+
+    /**
+     * Set up test environment
+     */
+    protected function setUp(): void
     {
-        // This test validates that the Reports submodule permission check
-        // uses the correct redirect pattern in constructors.
-        // 
-        // The original bug: redirect() returns a RedirectResponse object
-        // but the constructor doesn't return it, so it gets discarded.
-        // 
-        // The fix: Use header('Location: ' . base_url(...)); exit();
-        // which properly terminates execution and redirects.
-        
-        $constructorCode = file_get_contents(APPPATH . 'Controllers/Reports.php');
-        
-        // Verify the fix pattern is present
-        $this->assertStringContainsString("header('Location: ' . base_url(", $constructorCode);
-        $this->assertStringContainsString('exit();', $constructorCode);
-        
-        // Verify the buggy pattern is NOT present in the permission check area
-        // (Note: redirect() may appear elsewhere in the codebase for valid uses)
-        $lines = explode("\n", $constructorCode);
-        $inConstructor = false;
-        foreach ($lines as $line) {
-            if (strpos($line, 'public function __construct') !== false) {
-                $inConstructor = true;
-            }
-            if ($inConstructor && strpos($line, '}') !== false && trim($line) === '}') {
-                break;
-            }
-            if ($inConstructor && strpos($line, "redirect('no_access") !== false) {
-                $this->fail('Old redirect() pattern found in constructor - should use header() + exit()');
-            }
+        if (self::$doneBootstrap === false) {
+            TestDatabaseBootstrapSeeder::reset();
+
+            self::$doneBootstrap = true;
         }
-        
-        $this->assertTrue(true, 'Permission check pattern validated');
+
+        parent::setUp();
+
+        config(OSPOS::class)->update_settings();
     }
 
-    public function testSubmodulePermissionCheckOccursBeforeControllerInitialization(): void
+    /**
+     * Create a non-admin employee for testing
+     *
+     * @param array $overrides
+     * @return int
+     */
+    protected function createNonAdminEmployee(array $overrides = []): int
     {
-        // Verify that permission checks happen in the constructor
-        // before any controller methods can execute
-        
-        $constructorCode = file_get_contents(APPPATH . 'Controllers/Reports.php');
-        
-        // Verify the permission check is in the constructor
-        $this->assertStringContainsString('has_grant', $constructorCode);
-        $this->assertStringContainsString('reports_', $constructorCode);
-        $this->assertStringContainsString('submodule_id', $constructorCode);
+        $uniqueSuffix = uniqid();
+
+        $personData = [
+            'first_name'   => $overrides['first_name'] ?? 'NonAdmin',
+            'last_name'    => $overrides['last_name'] ?? 'User',
+            'email'        => $overrides['email'] ?? "nonadmin{$uniqueSuffix}@test.com",
+            'phone_number' => $overrides['phone_number'] ?? '555-1234'
+        ];
+
+        $employeeData = [
+            'username'      => $overrides['username'] ?? "nonadmin{$uniqueSuffix}",
+            'password'      => password_hash($overrides['password'] ?? 'password123', PASSWORD_DEFAULT),
+            'hash_version'  => 2,
+            'language_code' => 'en',
+            'language'      => 'english'
+        ];
+
+        $grantsData = $overrides['grants'] ?? [
+            ['permission_id' => 'customers', 'menu_group' => 'home'],
+            ['permission_id' => 'sales', 'menu_group' => 'home']
+        ];
+
+        $employeeModel = model(Employee::class);
+        $saved = $employeeModel->save_employee($personData, $employeeData, $grantsData, NEW_ENTRY);
+
+        $this->assertTrue($saved, 'Failed to save non-admin employee fixture.');
+        $this->assertArrayHasKey('person_id', $personData, 'Saved employee fixture missing person_id.');
+
+        return (int) $personData['person_id'];
     }
-}
\ No newline at end of file
+
+    /**
+     * Log in as the given employee
+     *
+     * @param int $personId
+     * @return void
+     */
+    protected function loginAs(int $personId): void
+    {
+        $this->withSession([
+            'person_id'  => $personId,
+            'menu_group' => 'home',
+        ]);
+    }
+
+    /**
+     * A non-admin employee with no reports_customers grant must be denied
+     * access to the summary_customers report.
+     *
+     * @return void
+     */
+    public function testNonAdminWithoutReportGrantIsDeniedSummaryCustomers(): void
+    {
+        $nonAdminId = $this->createNonAdminEmployee([
+            'grants' => [
+                ['permission_id' => 'reports_sales', 'menu_group' => 'home']
+            ]
+        ]);
+        $this->loginAs($nonAdminId);
+
+        $response = $this->get('/reports/summary_customers');
+
+        $response->assertRedirect();
+        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+    }
+
+    /**
+     * Regression test for the double-URL-encoding bypass itself: replacing
+     * the underscore with %255F must not change the outcome versus the
+     * plain request in testNonAdminWithoutReportGrantIsDeniedSummaryCustomers().
+     *
+     * @return void
+     */
+    public function testDoubleEncodedUnderscoreCannotBypassSummaryCustomersGrantCheck(): void
+    {
+        $nonAdminId = $this->createNonAdminEmployee([
+            'grants' => [
+                ['permission_id' => 'reports_sales', 'menu_group' => 'home']
+            ]
+        ]);
+        $this->loginAs($nonAdminId);
+
+        $response = $this->get('/reports/summary%255Fcustomers');
+
+        $response->assertRedirect();
+        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+    }
+
+    /**
+     * Same bypass attempt against a different report prefix, to confirm the
+     * fix isn't narrowly specific to the summary_ prefix's regex path.
+     *
+     * @return void
+     */
+    public function testDoubleEncodedUnderscoreCannotBypassDetailedSalesGrantCheck(): void
+    {
+        $nonAdminId = $this->createNonAdminEmployee([
+            'grants' => [
+                ['permission_id' => 'reports_customers', 'menu_group' => 'home']
+            ]
+        ]);
+        $this->loginAs($nonAdminId);
+
+        $response = $this->get('/reports/detailed%255Fsales');
+
+        $response->assertRedirect();
+        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+    }
+
+    /**
+     * An employee with the reports_customers grant must be able to access
+     * the summary_customers report.
+     *
+     * @return void
+     */
+    public function testEmployeeWithReportGrantCanAccessSummaryCustomers(): void
+    {
+        $employeeId = $this->createNonAdminEmployee([
+            'username' => 'reportviewer',
+            'email'    => 'reportviewer@test.com',
+            'grants'   => [
+                ['permission_id' => 'reports', 'menu_group' => 'home'],
+                ['permission_id' => 'reports_customers', 'menu_group' => 'home']
+            ]
+        ]);
+        $this->loginAs($employeeId);
+
+        $response = $this->get('/reports/summary_customers');
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * An employee with the base reports grant plus a submodule grant must be
+     * able to access the base /reports listing route (no submodule id derivable).
+     *
+     * @return void
+     */
+    public function testEmployeeWithReportsGrantCanAccessBaseReportsIndex(): void
+    {
+        $employeeId = $this->createNonAdminEmployee([
+            'username' => 'reportsindexviewer',
+            'email'    => 'reportsindexviewer@test.com',
+            'grants'   => [
+                ['permission_id' => 'reports', 'menu_group' => 'home'],
+                ['permission_id' => 'reports_customers', 'menu_group' => 'home']
+            ]
+        ]);
+        $this->loginAs($employeeId);
+
+        $response = $this->get('/reports');
+
+        $response->assertStatus(200);
+    }
+}
diff --git a/tests/Controllers/SalesControllerTest.php b/tests/Controllers/SalesControllerTest.php
new file mode 100644
index 000000000..08e643c1a
--- /dev/null
+++ b/tests/Controllers/SalesControllerTest.php
@@ -0,0 +1,731 @@
+<?php
+
+namespace Tests\Controllers;
+
+use CodeIgniter\Database\Config;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+use CodeIgniter\Config\Services;
+use App\Models\Employee;
+use Config\Database;
+use Tests\Support\ItemFixtureTrait;
+use Tests\Support\EmployeeFixtureTrait;
+use Tests\Support\SaleFixtureTrait;
+
+/**
+ * Regression tests for the Sales per-endpoint access-control bypass.
+ *
+ * A cashier holding only the base "sales" grant (no "reports_sales") must
+ * not be able to reach the per-sale endpoints that getManage() gates
+ * behind reports_sales: getSearch, getRow, getEdit, postSave, getReceipt,
+ * getInvoice, getSendPdf, getSendReceipt.
+ *
+ * Also covers: getSearch() (the AJAX endpoint that
+ * supplies every row of the Sales Takings list) was the one sibling that
+ * returned the full ledger and was missing the reports_sales check.
+ */
+class SalesControllerTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
+    use ItemFixtureTrait;
+    use EmployeeFixtureTrait;
+    use SaleFixtureTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $seedOnce    = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    private static bool $doneBootstrap = false;
+
+    protected function setUp(): void
+    {
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * Cashier with bare "sales" + "sales_stock" grants. "sales_stock" is
+     * required alongside "sales": Employee::has_module_grant('sales', ...)
+     * treats the bare "sales" grant as insufficient once any sales_*
+     * submodule permission exists in the permissions table (see
+     * has_subpermissions()). Deliberately NOT "reports_sales" — that is the
+     * grant this test exercises the gate on.
+     */
+    protected function createCashierEmployee(): int
+    {
+        return $this->createEmployee(
+            first_name: 'Cashier',
+            last_name:  'NoReports',
+            email:      'cashier.' . uniqid() . '@test.com',
+            username:   'cashier_' . uniqid(),
+            grants: [
+                ['permission_id' => 'sales', 'menu_group' => 'home'],
+                ['permission_id' => 'sales_stock', 'menu_group' => 'home'],
+            ],
+        );
+    }
+
+    protected function createReportsSalesEmployee(): int
+    {
+        return $this->createEmployee(
+            first_name: 'Supervisor',
+            last_name:  'WithReports',
+            email:      'supervisor.' . uniqid() . '@test.com',
+            username:   'supervisor_' . uniqid(),
+            grants: [
+                ['permission_id' => 'sales', 'menu_group' => 'home'],
+                ['permission_id' => 'sales_stock', 'menu_group' => 'home'],
+                ['permission_id' => 'reports_sales', 'menu_group' => 'home'],
+            ],
+        );
+    }
+
+    protected function createCashierWithoutChangePriceGrant(): int
+    {
+        return $this->createEmployee(
+            first_name: 'Cashier',
+            last_name:  'NoChangePrice',
+            email:      'cashier-nochangeprice.' . uniqid() . '@test.com',
+            username:   'cashier_nochangeprice_' . uniqid(),
+            grants: [
+                ['permission_id' => 'sales', 'menu_group' => 'home'],
+                ['permission_id' => 'sales_stock', 'menu_group' => 'home'],
+            ],
+        );
+    }
+
+    protected function createCashierWithChangePriceGrant(): int
+    {
+        return $this->createEmployee(
+            first_name: 'Cashier',
+            last_name:  'ChangePrice',
+            email:      'cashier-changeprice.' . uniqid() . '@test.com',
+            username:   'cashier_changeprice_' . uniqid(),
+            grants: [
+                ['permission_id' => 'sales', 'menu_group' => 'home'],
+                ['permission_id' => 'sales_stock', 'menu_group' => 'home'],
+                ['permission_id' => 'sales_change_price', 'menu_group' => 'home'],
+            ],
+        );
+    }
+
+    protected function loginAs(int $personId): void
+    {
+        $this->withSession([
+            'person_id'  => $personId,
+            'menu_group' => 'home',
+        ]);
+    }
+
+    /**
+     * Seeds a single cart line directly in the session, mirroring the shape
+     * Sale_lib::add_item() produces, so tests can target postEditItem's
+     * authorization branch without exercising the full add-item flow.
+     */
+    protected function seedCartLine(int $line, string $price, int $itemId): void
+    {
+        $this->withSession(array_merge($this->session, [
+            'sales_cart' => [
+                $line => [
+                    'item_id'               => $itemId,
+                    'item_location'         => 1,
+                    'stock_name'            => 'Test Location',
+                    'line'                  => $line,
+                    'name'                  => 'Test Item',
+                    'item_number'           => 'TEST-1',
+                    'attribute_values'      => null,
+                    'attribute_dtvalues'    => null,
+                    'description'           => 'Test Item',
+                    'serialnumber'          => '',
+                    'allow_alt_description' => false,
+                    'is_serialized'         => false,
+                    'quantity'              => '1',
+                    'discount'              => '0',
+                    'discount_type'         => 0,
+                    'in_stock'              => '10',
+                    'price'                 => $price,
+                    'cost_price'            => '1.00',
+                    'total'                 => $price,
+                    'discounted_total'      => $price,
+                    'print_option'          => PRINT_YES,
+                    'stock_type'            => HAS_NO_STOCK,
+                    'item_type'             => ITEM,
+                    'hsn_code'              => null,
+                    'tax_category_id'       => null,
+                ],
+            ],
+        ]));
+    }
+
+    public function testCashierWithoutReportsSalesCannotGetRow(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $saleId = $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->get('/sales/row/' . $saleId);
+
+        $response->assertStatus(403);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testCashierWithoutReportsSalesCannotGetSearch(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->get('/sales/search');
+
+        $response->assertStatus(403);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertSame(lang('Sales.not_authorized'), $result['message']);
+    }
+
+    public function testCashierWithoutReportsSalesCannotGetEdit(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $saleId = $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->get('/sales/edit/' . $saleId);
+
+        $response->assertRedirect();
+        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+    }
+
+    public function testCashierWithoutReportsSalesCannotGetReceipt(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $saleId = $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->get('/sales/receipt/' . $saleId);
+
+        $response->assertRedirect();
+        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+    }
+
+    public function testCashierWithoutReportsSalesCannotGetInvoice(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $saleId = $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->get('/sales/invoice/' . $saleId);
+
+        $response->assertRedirect();
+        $this->assertStringContainsString('no_access', $response->getRedirectUrl());
+    }
+
+    public function testCashierWithoutReportsSalesCannotSendPdf(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $saleId = $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->get('/sales/sendpdf/' . $saleId);
+
+        $response->assertStatus(403);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testCashierWithoutReportsSalesCannotSendReceipt(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $saleId = $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->get('/sales/sendreceipt/' . $saleId);
+
+        $response->assertStatus(403);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+    }
+
+    public function testCashierWithoutReportsSalesCannotPostSave(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $saleId = $this->createSale($cashierId);
+        $this->loginAs($cashierId);
+
+        $response = $this->post('/sales/save/' . $saleId, [
+            'date'              => date('m/d/Y H:i:s'),
+            'customer_id'       => '',
+            'employee_id'       => $cashierId,
+            'comment'           => 'tampered',
+            'invoice_number'    => '',
+            'number_of_payments'=> 0,
+            'payment_type_new'  => '--',
+            'payment_amount_new'=> ''
+        ]);
+
+        $response->assertStatus(403);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+        $this->assertSame(lang('Sales.not_authorized'), $result['message']);
+    }
+
+    public function testEmployeeWithReportsSalesCanGetSearch(): void
+    {
+        $supervisorId = $this->createReportsSalesEmployee();
+        $this->createSale($supervisorId);
+        $this->loginAs($supervisorId);
+
+        $response = $this->get('/sales/search');
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertArrayNotHasKey('success', $result);
+        $this->assertArrayHasKey('total', $result);
+        $this->assertArrayHasKey('rows', $result);
+        $this->assertArrayHasKey('payment_summary', $result);
+    }
+
+    public function testEmployeeWithReportsSalesCanGetRow(): void
+    {
+        $supervisorId = $this->createReportsSalesEmployee();
+        $saleId = $this->createSale($supervisorId);
+        $this->loginAs($supervisorId);
+
+        $response = $this->get('/sales/row/' . $saleId);
+
+        $response->assertStatus(200);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertArrayNotHasKey('success', $result);
+    }
+
+    public function testEmployeeWithReportsSalesCanGetEdit(): void
+    {
+        $supervisorId = $this->createReportsSalesEmployee();
+        $saleId = $this->createSale($supervisorId);
+        $this->loginAs($supervisorId);
+
+        $response = $this->get('/sales/edit/' . $saleId);
+
+        $response->assertStatus(200);
+    }
+
+    public function testCashierWithoutGrantCannotChangePrice(): void
+    {
+        $cashierId = $this->createCashierWithoutChangePriceGrant();
+        $this->loginAs($cashierId);
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->seedCartLine(1, '5.00', $itemId);
+
+        $response = $this->post('/sales/editItem/1', [
+            'description'  => 'Test Item',
+            'serialnumber' => '',
+            'price'        => '0.01',
+            'quantity'     => '1',
+            'discount'     => '0',
+            'location'     => '1',
+        ]);
+
+        $response->assertStatus(200);
+        $response->assertSee(lang('Sales.not_authorized'));
+
+        $session = Services::session();
+        $cart = $session->get('sales_cart');
+        $this->assertEquals('5.00', $cart[1]['price']);
+    }
+
+    public function testCashierWithoutGrantCanEditQuantityAtSamePrice(): void
+    {
+        $cashierId = $this->createCashierWithoutChangePriceGrant();
+        $this->loginAs($cashierId);
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->seedCartLine(1, '5.00', $itemId);
+
+        $response = $this->post('/sales/editItem/1', [
+            'description'  => 'Test Item',
+            'serialnumber' => '',
+            'price'        => '5.00',
+            'quantity'     => '3',
+            'discount'     => '0',
+            'location'     => '1',
+        ]);
+
+        $response->assertStatus(200);
+
+        $session = Services::session();
+        $cart = $session->get('sales_cart');
+        $this->assertEquals('3', $cart[1]['quantity']);
+        $this->assertEquals('5.00', $cart[1]['price']);
+    }
+
+    public function testCashierWithGrantCanChangePrice(): void
+    {
+        $cashierId = $this->createCashierWithChangePriceGrant();
+        $this->loginAs($cashierId);
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->seedCartLine(1, '5.00', $itemId);
+
+        $response = $this->post('/sales/editItem/1', [
+            'description'  => 'Test Item',
+            'serialnumber' => '',
+            'price'        => '0.01',
+            'quantity'     => '1',
+            'discount'     => '0',
+            'location'     => '1',
+        ]);
+
+        $response->assertStatus(200);
+
+        $session = Services::session();
+        $cart = $session->get('sales_cart');
+        $this->assertEquals('0.01', $cart[1]['price']);
+    }
+
+    public function testPostAddPaymentRejectsNegativeAmountTendered(): void
+    {
+        $cashierId = $this->createCashierWithoutChangePriceGrant();
+        $this->loginAs($cashierId);
+        $itemId = $this->createTestItem();
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $forgedPaymentType = lang('Sales.giftcard') . ':AUDIT-100';
+
+        $response = $this->post('/sales/addPayment', [
+            'payment_type'    => $forgedPaymentType,
+            'amount_tendered' => '-500',
+        ]);
+
+        $response->assertStatus(200);
+        $response->assertSee(lang('Sales.must_enter_numeric'));
+
+        // ... and the negative payment must NOT have been added to the cart.
+        $session  = Services::session();
+        $payments = $session->get('sales_payments');
+        $this->assertArrayNotHasKey($forgedPaymentType, (array) $payments);
+    }
+
+    public function testPostAddPaymentRejectsMalformedAmountTendered(): void
+    {
+        $cashierId = $this->createCashierWithoutChangePriceGrant();
+        $this->loginAs($cashierId);
+        $itemId = $this->createTestItem();
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $response = $this->post('/sales/addPayment', [
+            'payment_type'    => lang('Sales.cash'),
+            'amount_tendered' => 'ABC123',
+        ]);
+
+        $response->assertStatus(200);
+        $response->assertSee(lang('Sales.must_enter_numeric'));
+
+        $session  = Services::session();
+        $payments = $session->get('sales_payments');
+        $this->assertArrayNotHasKey(lang('Sales.cash'), (array) $payments);
+    }
+
+    public function testCashierWithoutReportsSalesCannotUnsuspend(): void
+    {
+        $victimId = $this->createReportsSalesEmployee();
+        $saleId = $this->createSuspendedSale($victimId);
+
+        $cashierId = $this->createCashierEmployee();
+        $this->loginAs($cashierId);
+
+        $response = $this->post('/sales/unsuspend', [
+            'suspended_sale_id' => $saleId,
+        ]);
+
+        $response->assertStatus(403);
+        $result = json_decode($response->getJSON(), true);
+        $this->assertFalse($result['success']);
+
+        $session = Services::session();
+        $this->assertNotEquals($saleId, $session->get('sale_id'));
+    }
+
+    public function testEmployeeWithReportsSalesCannotUnsuspendCompletedSale(): void
+    {
+        $victimId = $this->createReportsSalesEmployee();
+        $saleId = $this->createSale($victimId);
+
+        $supervisorId = $this->createReportsSalesEmployee();
+        $this->loginAs($supervisorId);
+
+        $this->post('/sales/unsuspend', [
+            'suspended_sale_id' => $saleId,
+        ]);
+
+        $session = Services::session();
+        $this->assertNotEquals($saleId, $session->get('sale_id'));
+    }
+
+    public function testEmployeeWithReportsSalesCanUnsuspendSale(): void
+    {
+        $ownerId = $this->createReportsSalesEmployee();
+        $saleId = $this->createSuspendedSale($ownerId);
+
+        $supervisorId = $this->createReportsSalesEmployee();
+        $this->loginAs($supervisorId);
+
+        $this->post('/sales/unsuspend', [
+            'suspended_sale_id' => $saleId,
+        ]);
+
+        $session = Services::session();
+        $this->assertEquals($saleId, $session->get('sale_id'));
+    }
+
+    protected function createGiftcard(float $value): int
+    {
+        $giftcardNumber = random_int(1000000, 9999999);
+
+        Database::connect()->table('giftcards')->insert([
+            'giftcard_number' => $giftcardNumber,
+            'value'           => $value,
+            'deleted'         => 0,
+            'person_id'       => null,
+        ]);
+
+        return $giftcardNumber;
+    }
+
+    protected function getGiftcardValue(int $giftcardNumber): float
+    {
+        $row = Database::connect()->table('giftcards')
+            ->where('giftcard_number', $giftcardNumber)
+            ->get()
+            ->getRow();
+
+        return (float) $row->value;
+    }
+
+    public function testCashierCannotForgeGiftcardPaymentTypeWithNegativeAmount(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $giftcardNumber = $this->createGiftcard(100.00);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $this->post('/sales/addPayment', [
+            'payment_type'    => lang('Sales.giftcard') . ':' . $giftcardNumber,
+            'amount_tendered' => '-500',
+        ]);
+
+        $payments = Services::session()->get('sales_payments');
+        $this->assertEmpty($payments);
+        $this->assertEqualsWithDelta(100.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testCashierCanUseLegitimateGiftcardPayment(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $giftcardNumber = $this->createGiftcard(100.00);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $this->post('/sales/addPayment', [
+            'payment_type'    => lang('Sales.giftcard'),
+            'amount_tendered' => (string) $giftcardNumber,
+        ]);
+
+        $payments = Services::session()->get('sales_payments');
+        $this->assertNotEmpty($payments);
+        $this->assertArrayHasKey(lang('Sales.giftcard') . ':' . $giftcardNumber, $payments);
+    }
+
+    public function testCashierCannotSubmitNegativeAmountForReferenceCodePayment(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $this->post('/sales/addPayment', [
+            'payment_type'    => lang('Sales.debit'),
+            'amount_tendered' => '-25',
+            'reference_code'  => 'ABC123',
+        ]);
+
+        $payments = Services::session()->get('sales_payments');
+        $this->assertEmpty($payments);
+    }
+
+    public function testCashierCanUseLegitimateReferenceCodePayment(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $this->post('/sales/addPayment', [
+            'payment_type'    => lang('Sales.debit'),
+            'amount_tendered' => '25.00',
+            'reference_code'  => 'ABC123',
+        ]);
+
+        $payments = Services::session()->get('sales_payments');
+        $this->assertNotEmpty($payments);
+        $this->assertArrayHasKey(lang('Sales.debit'), $payments);
+        $this->assertSame('ABC123', $payments[lang('Sales.debit')]['reference_code']);
+    }
+
+    public function testCashierCannotSubmitNegativeAmountForCashPayment(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $this->post('/sales/addPayment', [
+            'payment_type'    => lang('Sales.cash'),
+            'amount_tendered' => '-10',
+        ]);
+
+        $payments = Services::session()->get('sales_payments');
+        $this->assertEmpty($payments);
+    }
+
+    public function testCashierCanUseLegitimateCashPayment(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $this->post('/sales/addPayment', [
+            'payment_type'    => lang('Sales.cash'),
+            'amount_tendered' => '10.00',
+        ]);
+
+        $payments = Services::session()->get('sales_payments');
+        $this->assertNotEmpty($payments);
+        $this->assertArrayHasKey(lang('Sales.cash'), $payments);
+    }
+
+    public function testPostCompleteRejectsSaleWithInsufficientPayments(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '100.00', $itemId);
+        $this->withSession(array_merge($this->session, ['sale_id' => NEW_ENTRY]));
+
+        $salesCountBefore = Database::connect()->table('sales')->countAllResults();
+
+        $this->post('/sales/complete');
+
+        $salesCountAfter = Database::connect()->table('sales')->countAllResults();
+        $this->assertSame($salesCountBefore, $salesCountAfter);
+    }
+
+    public function testPostCompleteAllowsZeroPaymentQuoteCompletion(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '100.00', $itemId);
+        $this->withSession(array_merge($this->session, ['sale_id' => NEW_ENTRY, 'sales_mode' => 'sale_quote']));
+
+        $salesCountBefore = Database::connect()->table('sales')->countAllResults();
+
+        $response = $this->post('/sales/complete');
+
+        $salesCountAfter = Database::connect()->table('sales')->countAllResults();
+        $this->assertSame($salesCountBefore + 1, $salesCountAfter);
+        $response->assertDontSee(lang('Sales.amount_due_not_covered'));
+    }
+
+    public function testPostCompleteAllowsZeroPaymentInvoiceCompletion(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '100.00', $itemId);
+        $this->withSession(array_merge($this->session, ['sale_id' => NEW_ENTRY, 'sales_mode' => 'sale_invoice']));
+
+        $salesCountBefore = Database::connect()->table('sales')->countAllResults();
+
+        $response = $this->post('/sales/complete');
+
+        $salesCountAfter = Database::connect()->table('sales')->countAllResults();
+        $this->assertSame($salesCountBefore + 1, $salesCountAfter);
+        $response->assertDontSee(lang('Sales.amount_due_not_covered'));
+    }
+
+    public function testRegisterEscapesMaliciousTaxName(): void
+    {
+        $cashierId = $this->createCashierEmployee();
+        $itemId = $this->createTestItem();
+
+        Database::connect()->table('items_taxes')->insert([
+            'item_id' => $itemId,
+            'name'    => '<svg onload=alert(1)>',
+            'percent' => 5,
+        ]);
+
+        $this->loginAs($cashierId);
+        $this->seedCartLine(1, '5.00', $itemId);
+
+        $response = $this->get('/sales');
+
+        $response->assertStatus(200);
+        $body = $response->getBody();
+        $this->assertStringNotContainsString('<svg onload', $body);
+        $this->assertStringContainsString('&lt;svg', $body);
+    }
+
+    public function testPostUnsuspendRejectsNonSuspendedSaleWithoutClearingActiveCart(): void
+    {
+        $employeeId = $this->createReportsSalesEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $notSuspendedSaleId = $this->createSale($employeeId);
+        $this->loginAs($employeeId);
+        $this->seedCartLine(1, '1.00', $itemId);
+        $this->withSession(array_merge($this->session, ['sale_id' => NEW_ENTRY]));
+
+        $this->post('/sales/unsuspend', [
+            'suspended_sale_id' => (string) $notSuspendedSaleId,
+        ]);
+
+        $cart = Services::session()->get('sales_cart');
+        $this->assertNotEmpty($cart);
+        $this->assertArrayHasKey(1, $cart);
+        $this->assertSame($itemId, $cart[1]['item_id']);
+        $this->assertSame(NEW_ENTRY, Services::session()->get('sale_id'));
+    }
+
+    public function testPostUnsuspendReplacesCartForValidSuspendedSale(): void
+    {
+        $employeeId = $this->createReportsSalesEmployee();
+        $itemId = $this->createTestItem(HAS_NO_STOCK);
+        $suspendedSaleId = $this->createSuspendedSale($employeeId);
+        $this->loginAs($employeeId);
+        $this->seedCartLine(1, '1.00', $itemId);
+
+        $this->post('/sales/unsuspend', [
+            'suspended_sale_id' => (string) $suspendedSaleId,
+        ]);
+
+        $this->assertSame($suspendedSaleId, Services::session()->get('sale_id'));
+        $cart = Services::session()->get('sales_cart');
+        $this->assertNotEmpty($cart);
+        $this->assertNotSame($itemId, array_values($cart)[0]['item_id']);
+    }
+}
diff --git a/tests/Events/Load_configTest.php b/tests/Events/Load_configTest.php
new file mode 100644
index 000000000..29a7c6190
--- /dev/null
+++ b/tests/Events/Load_configTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Tests\Events;
+
+use App\Events\Load_config;
+use CodeIgniter\Test\CIUnitTestCase;
+use ReflectionMethod;
+
+class Load_configTest extends CIUnitTestCase
+{
+    private function languageExists(string $languageCode): bool
+    {
+        $instance = new Load_config();
+        $method   = new ReflectionMethod(Load_config::class, 'languageExists');
+        $method->setAccessible(true);
+
+        return (bool) $method->invoke($instance, $languageCode);
+    }
+
+    public function testLanguageExistsAcceptsValidCode(): void
+    {
+        $this->assertTrue($this->languageExists('en'));
+    }
+
+    public function testLanguageExistsRejectsNullByte(): void
+    {
+        $this->assertFalse($this->languageExists("en\0"));
+    }
+
+    public function testLanguageExistsRejectsNullByteOnly(): void
+    {
+        $this->assertFalse($this->languageExists("\0"));
+    }
+
+    public function testLanguageExistsRejectsForwardSlashPath(): void
+    {
+        $this->assertFalse($this->languageExists('en/../../etc/passwd'));
+    }
+
+    public function testLanguageExistsRejectsBackslashPath(): void
+    {
+        $this->assertFalse($this->languageExists('..\..\etc\passwd'));
+    }
+
+    public function testLanguageExistsRejectsParentDir(): void
+    {
+        $this->assertFalse($this->languageExists('..'));
+    }
+}
diff --git a/tests/Filters/ThrottleTest.php b/tests/Filters/ThrottleTest.php
new file mode 100644
index 000000000..0edf51926
--- /dev/null
+++ b/tests/Filters/ThrottleTest.php
@@ -0,0 +1,262 @@
+<?php
+
+namespace Tests\Filters;
+
+use App\Filters\Throttle;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Services;
+
+class ThrottleTest extends CIUnitTestCase
+{
+    private Throttle $filter;
+    private array $usedKeys = [];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config('Encryption')->key = bin2hex(random_bytes(32));
+
+        $this->filter = new Throttle();
+    }
+
+    protected function tearDown(): void
+    {
+        $throttler = Services::throttler();
+
+        foreach ($this->usedKeys as $key) {
+            $throttler->remove($key);
+        }
+
+        parent::tearDown();
+    }
+
+    private function makeRequest(string $method, string $ip, mixed $username = null): IncomingRequest
+    {
+        $request = $this->createMock(IncomingRequest::class);
+
+        $request->method('getMethod')->willReturn($method);
+        $request->method('getIPAddress')->willReturn($ip);
+        $request->method('getPost')->with('username')->willReturn($username);
+
+        $secret = config('Encryption')->key;
+
+        $this->usedKeys[] = 'login-ip-' . hash_hmac('sha256', $ip, $secret);
+
+        if (is_scalar($username) && (string) $username !== '') {
+            $this->usedKeys[] = 'login-user-' . hash_hmac('sha256', strtolower((string) $username), $secret);
+        }
+
+        return $request;
+    }
+
+    public function testGetRequestsAreNotThrottled(): void
+    {
+        $request = $this->makeRequest('GET', '203.0.113.1', 'admin');
+
+        $result = $this->filter->before($request);
+
+        $this->assertNull($result);
+    }
+
+    public function testAllowsAttemptsUnderCapacity(): void
+    {
+        $ip = '203.0.113.2';
+
+        for ($i = 0; $i < 5; $i++) {
+            $request = $this->makeRequest('POST', $ip, 'employee1');
+            $result  = $this->filter->before($request);
+
+            $this->assertNull($result, "Attempt {$i} should not be throttled");
+        }
+    }
+
+    public function testBlocksAfterCapacityExceededByIp(): void
+    {
+        $ip = '203.0.113.3';
+
+        for ($i = 0; $i < 5; $i++) {
+            $this->filter->before($this->makeRequest('POST', $ip, "user{$i}"));
+        }
+
+        $result = $this->filter->before($this->makeRequest('POST', $ip, 'user-final'));
+
+        $this->assertNotNull($result);
+        $this->assertSame(429, $result->getStatusCode());
+    }
+
+    public function testBlocksAfterCapacityExceededByUsername(): void
+    {
+        $username = 'sameuser';
+
+        for ($i = 0; $i < 5; $i++) {
+            $this->filter->before($this->makeRequest('POST', "203.0.113.{$i}", $username));
+        }
+
+        $result = $this->filter->before($this->makeRequest('POST', '203.0.113.99', $username));
+
+        $this->assertNotNull($result);
+        $this->assertSame(429, $result->getStatusCode());
+    }
+
+    public function testThrottledResponseIsJsonWithMessage(): void
+    {
+        $ip = '203.0.113.4';
+
+        for ($i = 0; $i < 5; $i++) {
+            $this->filter->before($this->makeRequest('POST', $ip, 'someone'));
+        }
+
+        $result = $this->filter->before($this->makeRequest('POST', $ip, 'someone'));
+
+        $body = json_decode($result->getJSON(), true);
+
+        $this->assertFalse($body['success']);
+        $this->assertSame(lang('Login.too_many_attempts'), $body['message']);
+    }
+
+    public function testHandlesIpv6AddressWithoutThrowing(): void
+    {
+        $ip = '::1';
+
+        for ($i = 0; $i < 5; $i++) {
+            $result = $this->filter->before($this->makeRequest('POST', $ip, "user{$i}"));
+            $this->assertNull($result, "Attempt {$i} should not be throttled");
+        }
+
+        $result = $this->filter->before($this->makeRequest('POST', $ip, 'user-final'));
+
+        $this->assertNotNull($result);
+        $this->assertSame(429, $result->getStatusCode());
+    }
+
+    public function testMissingUsernameOnlyThrottlesByIp(): void
+    {
+        $ip = '203.0.113.5';
+
+        for ($i = 0; $i < 5; $i++) {
+            $this->filter->before($this->makeRequest('POST', $ip, null));
+        }
+
+        $result = $this->filter->before($this->makeRequest('POST', $ip, null));
+
+        $this->assertNotNull($result);
+        $this->assertSame(429, $result->getStatusCode());
+    }
+
+    public function testArrayUsernameIsIgnoredAndOnlyIpThrottles(): void
+    {
+        $ip       = '203.0.113.6';
+        $username = ['a', 'b'];
+
+        for ($i = 0; $i < 5; $i++) {
+            $result = $this->filter->before($this->makeRequest('POST', $ip, $username));
+
+            $this->assertNull($result, "Attempt {$i} should not be throttled");
+        }
+
+        $result = $this->filter->before($this->makeRequest('POST', $ip, $username));
+
+        $this->assertNotNull($result);
+        $this->assertSame(429, $result->getStatusCode());
+    }
+
+    public function testCustomCapacityIsHonored(): void
+    {
+        $ip     = '203.0.113.7';
+        $prev   = $this->captureEnv('throttle.capacity');
+
+        $this->putEnv('throttle.capacity', '2');
+
+        try {
+            $this->assertNull($this->filter->before($this->makeRequest('POST', $ip, 'c1')));
+            $this->assertNull($this->filter->before($this->makeRequest('POST', $ip, 'c2')));
+
+            $result = $this->filter->before($this->makeRequest('POST', $ip, 'c3'));
+
+            $this->assertNotNull($result);
+            $this->assertSame(429, $result->getStatusCode());
+        } finally {
+            $this->restoreEnv('throttle.capacity', $prev);
+        }
+    }
+
+    public function testZeroCapacityDisablesThrottling(): void
+    {
+        $ip   = '203.0.113.8';
+        $prev = $this->captureEnv('throttle.capacity');
+
+        $this->putEnv('throttle.capacity', '0');
+
+        try {
+            for ($i = 0; $i < 10; $i++) {
+                $result = $this->filter->before($this->makeRequest('POST', $ip, "z{$i}"));
+                $this->assertNull($result, "Attempt {$i} should not be throttled when disabled");
+            }
+        } finally {
+            $this->restoreEnv('throttle.capacity', $prev);
+        }
+    }
+
+    public function testInvalidCapacityFallsBackToDefault(): void
+    {
+        // A non-numeric value must fall back to the default (5), not disable.
+        $ip   = '203.0.113.9';
+        $prev = $this->captureEnv('throttle.capacity');
+
+        $this->putEnv('throttle.capacity', 'five');
+
+        try {
+            for ($i = 0; $i < 5; $i++) {
+                $this->assertNull($this->filter->before($this->makeRequest('POST', $ip, "v{$i}")));
+            }
+
+            // 6th attempt exceeds the default capacity of 5.
+            $result = $this->filter->before($this->makeRequest('POST', $ip, 'v6'));
+            $this->assertNotNull($result);
+            $this->assertSame(429, $result->getStatusCode());
+        } finally {
+            $this->restoreEnv('throttle.capacity', $prev);
+        }
+    }
+
+    private function captureEnv(string $key): array
+    {
+        return [
+            'putenv'  => getenv($key),
+            'hasENV'  => array_key_exists($key, $_ENV),
+            'ENV'     => $_ENV[$key] ?? null,
+            'hasSRV'  => array_key_exists($key, $_SERVER),
+            'SERVER'  => $_SERVER[$key] ?? null,
+        ];
+    }
+
+    private function putEnv(string $key, string $value): void
+    {
+        putenv("{$key}={$value}");
+        $_ENV[$key]    = $value;
+        $_SERVER[$key] = $value;
+    }
+
+    private function restoreEnv(string $key, array $prev): void
+    {
+        if ($prev['putenv'] === false) {
+            putenv($key);
+        } else {
+            putenv("{$key}={$prev['putenv']}");
+        }
+
+        if ($prev['hasENV']) {
+            $_ENV[$key] = $prev['ENV'];
+        } else {
+            unset($_ENV[$key]);
+        }
+
+        if ($prev['hasSRV']) {
+            $_SERVER[$key] = $prev['SERVER'];
+        } else {
+            unset($_SERVER[$key]);
+        }
+    }
+}
diff --git a/tests/Libraries/Barcode_libTest.php b/tests/Libraries/Barcode_libTest.php
new file mode 100644
index 000000000..4e424d4a9
--- /dev/null
+++ b/tests/Libraries/Barcode_libTest.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Tests\Libraries;
+
+use App\Libraries\Barcode_lib;
+use CodeIgniter\Test\CIUnitTestCase;
+
+class Barcode_libTest extends CIUnitTestCase
+{
+    private Barcode_lib $barcodeLib;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->barcodeLib = new Barcode_lib();
+    }
+
+    private function baseBarcodeConfig(string $layout): array
+    {
+        return [
+            'company'                    => 'Test Co',
+            'barcode_content'            => 'id',
+            'barcode_type'               => 'C128',
+            'barcode_font'               => 'inconsolata.ttf',
+            'barcode_font_size'          => 10,
+            'barcode_height'             => 40,
+            'barcode_width'              => 2,
+            'barcode_first_row'          => $layout,
+            'barcode_second_row'         => 'none',
+            'barcode_third_row'          => 'none',
+            'barcode_num_in_row'         => 1,
+            'barcode_page_width'         => 8,
+            'barcode_page_cellspacing'   => 1,
+            'barcode_generate_if_empty'  => 0,
+            'barcode_formats'            => [],
+        ];
+    }
+
+    public function testNamePayloadIsEscaped(): void
+    {
+        $item = [
+            'name'    => '<svg onload=alert(document.domain)>',
+            'item_id' => '1',
+        ];
+
+        $result = $this->barcodeLib->display_barcode($item, $this->baseBarcodeConfig('name'));
+
+        $this->assertStringNotContainsString('<svg onload', $result);
+        $this->assertStringContainsString('&lt;svg', $result);
+    }
+
+    public function testItemCodeIdPayloadIsEscaped(): void
+    {
+        $item = [
+            'name'    => 'Item Name',
+            'item_id' => 'KIT 1<svg onload=alert(document.domain)>',
+        ];
+
+        $config = $this->baseBarcodeConfig('item_code');
+        $config['barcode_content'] = 'id';
+
+        $result = $this->barcodeLib->display_barcode($item, $config);
+
+        $this->assertStringNotContainsString('<svg onload', $result);
+        $this->assertStringContainsString('&lt;svg', $result);
+    }
+
+    public function testItemCodeNumberPayloadIsEscaped(): void
+    {
+        $item = [
+            'name'        => 'Item Name',
+            'item_id'     => '1',
+            'item_number' => 'KIT 1<svg onload=alert(document.domain)>',
+        ];
+
+        $config = $this->baseBarcodeConfig('item_code');
+        $config['barcode_content'] = 'item_number';
+
+        $result = $this->barcodeLib->display_barcode($item, $config);
+
+        $this->assertStringNotContainsString('<svg onload', $result);
+        $this->assertStringContainsString('&lt;svg', $result);
+    }
+
+    public function testCategoryPayloadIsEscaped(): void
+    {
+        $item = [
+            'name'     => 'Item Name',
+            'item_id'  => '1',
+            'category' => '<svg onload=alert(document.domain)>',
+        ];
+
+        $result = $this->barcodeLib->display_barcode($item, $this->baseBarcodeConfig('category'));
+
+        $this->assertStringNotContainsString('<svg onload', $result);
+        $this->assertStringContainsString('&lt;svg', $result);
+    }
+
+    public function testCompanyNamePayloadIsEscaped(): void
+    {
+        $item = [
+            'name'    => 'Item Name',
+            'item_id' => '1',
+        ];
+
+        $config = $this->baseBarcodeConfig('company_name');
+        $config['company'] = '<svg onload=alert(document.domain)>';
+
+        $result = $this->barcodeLib->display_barcode($item, $config);
+
+        $this->assertStringNotContainsString('<svg onload', $result);
+        $this->assertStringContainsString('&lt;svg', $result);
+    }
+
+    public function testCleanNameIsUnaffected(): void
+    {
+        $item = [
+            'name'    => 'Widget A',
+            'item_id' => '1',
+        ];
+
+        $result = $this->barcodeLib->display_barcode($item, $this->baseBarcodeConfig('name'));
+
+        $this->assertStringContainsString('Widget A', $result);
+    }
+}
diff --git a/tests/Libraries/Sale_libPaymentTest.php b/tests/Libraries/Sale_libPaymentTest.php
new file mode 100644
index 000000000..1059ce2ca
--- /dev/null
+++ b/tests/Libraries/Sale_libPaymentTest.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace Tests\Libraries;
+
+use App\Libraries\Sale_lib;
+use App\Models\Attribute;
+use App\Models\Customer;
+use App\Models\Dinner_table;
+use App\Models\Item;
+use App\Models\Item_kit_items;
+use App\Models\Item_quantity;
+use App\Models\Item_taxes;
+use App\Models\Sale;
+use App\Models\Stock_location;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\OSPOS;
+
+class Sale_libPaymentTest extends CIUnitTestCase
+{
+    private Sale_lib $saleLib;
+
+    protected int $priorBcscale;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // The app sets a global bcscale() from app config on config load
+        // (see app/Events/Load_config.php), and whichever value a prior test
+        // class triggered leaks into bcadd/bcmul here. Pin a known scale so the
+        // accumulation math in these tests is deterministic regardless of suite
+        // order; restore it in tearDown.
+        $this->priorBcscale = bcscale();
+        bcscale(0);
+
+        // Inject mock OSPOS config so Sale_lib constructor and helpers don't need real settings
+        $ospos           = new OSPOS();
+        $ospos->settings = [
+            'cash_rounding_code' => '',
+            'cash_decimals'      => 2,
+            'currency_decimals'  => 2,
+            'tax_decimals'       => 2,
+            'quantity_decimals'  => 2,
+        ];
+        Factories::injectMock('config', OSPOS::class, $ospos);
+
+        // Inject stub models so model() calls in Sale_lib::__construct() skip DB
+        $stubMethods = ['__construct'];
+        foreach ([
+            Attribute::class,
+            Customer::class,
+            Dinner_table::class,
+            Item::class,
+            Item_kit_items::class,
+            Item_quantity::class,
+            Item_taxes::class,
+            Sale::class,
+            Stock_location::class,
+        ] as $modelClass) {
+            $mock = $this->getMockBuilder($modelClass)
+                ->disableOriginalConstructor()
+                ->getMock();
+            Factories::injectMock('models', $modelClass, $mock);
+        }
+
+        session()->destroy();
+        $this->saleLib = new Sale_lib();
+    }
+
+    protected function tearDown(): void
+    {
+        bcscale($this->priorBcscale);
+        Factories::reset();
+        parent::tearDown();
+    }
+
+    // ========== getPayments / setPayments ==========
+
+    public function testGetPaymentsReturnsEmptyArrayInitially(): void
+    {
+        $payments = $this->saleLib->getPayments();
+        $this->assertIsArray($payments);
+        $this->assertEmpty($payments);
+    }
+
+    public function testSetPaymentsPersistsToSession(): void
+    {
+        $data = [
+            'cash' => [
+                'payment_type'    => 'cash',
+                'payment_amount'  => '10.00',
+                'cash_refund'     => 0,
+                'cash_adjustment' => CASH_ADJUSTMENT_FALSE,
+                'reference_code'  => null,
+            ]
+        ];
+        $this->saleLib->setPayments($data);
+        $this->assertSame($data, $this->saleLib->getPayments());
+    }
+
+    // ========== addPayment ==========
+
+    public function testAddPaymentCreatesNewEntry(): void
+    {
+        $this->saleLib->addPayment('credit', '25.00', 'ABC123');
+
+        $payments = $this->saleLib->getPayments();
+        $this->assertArrayHasKey('credit', $payments);
+        $this->assertSame('credit', $payments['credit']['payment_type']);
+        $this->assertSame('25.00', $payments['credit']['payment_amount']);
+        $this->assertSame(0, $payments['credit']['cash_refund']);
+        $this->assertSame(CASH_ADJUSTMENT_FALSE, $payments['credit']['cash_adjustment']);
+    }
+
+    public function testAddPaymentStoresReferenceCode(): void
+    {
+        $this->saleLib->addPayment('debit', '50.00', 'REF9876');
+
+        $payments = $this->saleLib->getPayments();
+        $this->assertSame('REF9876', $payments['debit']['reference_code']);
+    }
+
+    public function testAddPaymentNullReferenceCodeStoredAsNull(): void
+    {
+        $this->saleLib->addPayment('cash', '15.00');
+
+        $payments = $this->saleLib->getPayments();
+        $this->assertNull($payments['cash']['reference_code']);
+    }
+
+    public function testAddPaymentAccumulatesAmountForExistingId(): void
+    {
+        $this->saleLib->addPayment('credit', '10.00', 'REF001');
+        $this->saleLib->addPayment('credit', '5.00', 'REF001');
+
+        $payments = $this->saleLib->getPayments();
+        // bcadd strips trailing zeros: '10.00' + '5.00' = '15'
+        $this->assertSame('15', $payments['credit']['payment_amount']);
+    }
+
+    public function testAddPaymentCashAdjustmentFlagStored(): void
+    {
+        $this->saleLib->addPayment('cash_adjustment', '0.05', null, CASH_ADJUSTMENT_TRUE);
+
+        $payments = $this->saleLib->getPayments();
+        $this->assertSame(CASH_ADJUSTMENT_TRUE, $payments['cash_adjustment']['cash_adjustment']);
+    }
+
+    public function testAddPaymentMultipleDistinctTypesAllStored(): void
+    {
+        $this->saleLib->addPayment('credit', '30.00', 'REF1');
+        $this->saleLib->addPayment('debit', '20.00', 'REF2');
+
+        $payments = $this->saleLib->getPayments();
+        $this->assertCount(2, $payments);
+        $this->assertArrayHasKey('credit', $payments);
+        $this->assertArrayHasKey('debit', $payments);
+    }
+
+    // ========== edit_payment ==========
+
+    public function testEditPaymentUpdatesAmount(): void
+    {
+        $this->saleLib->addPayment('credit', '10.00', 'REF001');
+        $result = $this->saleLib->edit_payment('credit', 99.99);
+
+        $this->assertTrue($result);
+        $payments = $this->saleLib->getPayments();
+        $this->assertSame(99.99, $payments['credit']['payment_amount']);
+    }
+
+    public function testEditPaymentReturnsFalseForMissingId(): void
+    {
+        $result = $this->saleLib->edit_payment('nonexistent', 10.00);
+        $this->assertFalse($result);
+    }
+
+    // ========== delete_payment ==========
+
+    public function testDeletePaymentRemovesEntry(): void
+    {
+        $this->saleLib->addPayment('credit', '25.00', 'REF999');
+        $this->saleLib->delete_payment('credit');
+
+        $payments = $this->saleLib->getPayments();
+        $this->assertArrayNotHasKey('credit', $payments);
+    }
+
+    public function testDeletePaymentLeavesOtherEntriesIntact(): void
+    {
+        $this->saleLib->addPayment('credit', '25.00', 'REF1');
+        $this->saleLib->addPayment('debit', '10.00', 'REF2');
+        $this->saleLib->delete_payment('credit');
+
+        $payments = $this->saleLib->getPayments();
+        $this->assertArrayNotHasKey('credit', $payments);
+        $this->assertArrayHasKey('debit', $payments);
+    }
+}
diff --git a/tests/Libraries/Token_libTest.php b/tests/Libraries/Token_libTest.php
new file mode 100644
index 000000000..96cd80a41
--- /dev/null
+++ b/tests/Libraries/Token_libTest.php
@@ -0,0 +1,314 @@
+<?php
+
+namespace Tests\Libraries;
+
+use App\Libraries\Token_lib;
+use CodeIgniter\Test\CIUnitTestCase;
+
+class Token_libTest extends CIUnitTestCase
+{
+    private Token_lib $tokenLib;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->tokenLib = new Token_lib();
+    }
+
+    public function testRenderReturnsInputStringWhenNoTokens(): void
+    {
+        $input = 'Hello World';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertEquals('Hello World', $result);
+    }
+
+    public function testRenderHandlesStringWithPercentNotInDateFormat(): void
+    {
+        $input = 'Discount: 50%';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertStringContainsString('50%', $result);
+        $this->assertNotEmpty($result);
+    }
+
+    public function testRenderHandlesInvalidDateFormatPercentDashPercent(): void
+    {
+        $input = '%-%-%';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertSame('%-%-%', $result);
+    }
+
+    public function testRenderHandlesInvalidDateFormatPercentYPercentQPercentBad(): void
+    {
+        $input = '%Y-%q-%bad';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/\d{4}-%q-[A-Za-z]{3}ad/', $result);
+    }
+
+    public function testRenderHandlesStringWithPercentAPercent(): void
+    {
+        $input = '%a%';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/^[A-Za-z]{3}%$/', $result);
+    }
+
+    public function testRenderHandlesExtremelyLongString(): void
+    {
+        $input = str_repeat('a', 10000);
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertEquals(str_repeat('a', 10000), $result);
+    }
+
+    public function testRenderHandlesStringWithMultiplePercentSymbols(): void
+    {
+        $input = 'Sale: 25% off, then another 10%';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertStringContainsString('25%', $result);
+        $this->assertStringContainsString('10%', $result);
+    }
+
+    public function testRenderHandlesStringWithOnlyPercentSymbol(): void
+    {
+        $input = '%';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertEquals('%', $result);
+    }
+
+    public function testRenderPreservesTextWithValidDateTokensAndNoOtherTokens(): void
+    {
+        $input = 'Date: %Y-%m-%d';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertStringContainsString('Date:', $result);
+    }
+
+    public function testRenderHandlesEmptyString(): void
+    {
+        $input = '';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertEquals('', $result);
+    }
+
+    public function testScanExtractsTokens(): void
+    {
+        $result = $this->tokenLib->scan('Hello {customer} and {invoice}');
+        $this->assertArrayHasKey('customer', $result);
+        $this->assertArrayHasKey('invoice', $result);
+    }
+
+    public function testScanExtractsTokensWithLength(): void
+    {
+        $result = $this->tokenLib->scan('Invoice: {invoice:10}');
+        $this->assertArrayHasKey('invoice', $result);
+        $this->assertArrayHasKey('10', $result['invoice']);
+    }
+
+    public function testScanReturnsEmptyArrayForNoTokens(): void
+    {
+        $result = $this->tokenLib->scan('Hello World');
+        $this->assertEmpty($result);
+    }
+
+    public function testRenderHandlesConsecutivePercentSigns(): void
+    {
+        $input = 'Progress: 100%% complete';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertSame('Progress: 100% complete', $result);
+    }
+
+    public function testRenderHandlesEscapedPercentSigns(): void
+    {
+        $input = 'Value: %%';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertSame('Value: %', $result);
+    }
+
+    public function testRenderHandlesUnclosedBraces(): void
+    {
+        $input = "Invoice {CO Date: %Y-%m-%d";
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/Invoice \{CO Date: \d{4}-\d{2}-\d{2}/', $result);
+    }
+
+    public function testRenderHandlesUnopenedBraces(): void
+    {
+        $input = "Invoice CO} Date: %Y-%m-%d";
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/Invoice CO\} Date: \d{4}-\d{2}-\d{2}/', $result);
+    }
+
+    public function testRenderHandlesVeryLongStringWithDate(): void
+    {
+        $input = str_repeat('buffer ', 500) . '%Y-%m-%d Invoice' . str_repeat('buffer ', 500);
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/buffer.*\d{4}-\d{2}-\d{2} Invoice.*buffer/', $result);
+    }
+
+    public function testRenderHandlesMultipleDates(): void
+    {
+        $input = '%Y-%m-%d Invoice - %Y-%m-%d';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/\d{4}-\d{2}-\d{2} Invoice - \d{4}-\d{2}-\d{2}/', $result);
+    }
+
+    public function testRenderHandlesValidYearFormat(): void
+    {
+        $input = 'Year: %Y';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/Year: \d{4}/', $result);
+    }
+
+    public function testRenderHandlesValidMonthFormat(): void
+    {
+        $input = 'Month: %m';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/Month: \d{2}/', $result);
+    }
+
+    public function testRenderHandlesValidDayFormat(): void
+    {
+        $input = 'Day: %d';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/Day: \d{2}/', $result);
+    }
+
+    public function testRenderHandlesFullDateFormat(): void
+    {
+        $input = 'Date: %Y-%m-%d';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertMatchesRegularExpression('/Date: \d{4}-\d{2}-\d{2}/', $result);
+    }
+
+    public function testRenderHandlesPercentB(): void
+    {
+        $input = 'Month: %B';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringContainsString('Month:', $result);
+        $this->assertNotEquals('Month: %B', $result);
+    }
+
+    public function testRenderHandlesPercentA(): void
+    {
+        $input = 'Day: %A';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringContainsString('Day:', $result);
+        $this->assertNotEquals('Day: %A', $result);
+    }
+
+    public function testRenderHandlesComplexPercentFormat(): void
+    {
+        $input = 'Report: %Y-%m-%d at %H:%M:%S';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringContainsString('Report:', $result);
+    }
+
+    public function testRenderDoesNotReplaceInvalidFormatSpecifiers(): void
+    {
+        $input = 'Test: %q invalid %j valid';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertStringContainsString('%q', $result);
+        $this->assertStringContainsString('invalid', $result);
+    }
+
+    public function testRenderReplacesTimezoneFormat(): void
+    {
+        $input = 'Timezone: %z';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringContainsString('Timezone:', $result);
+    }
+
+    public function testScanWorksWithMixedContent(): void
+    {
+        $result = $this->tokenLib->scan('Text {token1} more %Y-%m-%d text {token2:5} end');
+        $this->assertArrayHasKey('token1', $result);
+        $this->assertArrayHasKey('token2', $result);
+    }
+
+    public function testRenderReplacesCompositeDirectivePercentF(): void
+    {
+        $input = 'Date: %F';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%F', $result);
+        $this->assertMatchesRegularExpression('/Date: \d{4}-\d{2}-\d{2}/', $result);
+    }
+
+    public function testRenderReplacesCompositeDirectivePercentD(): void
+    {
+        $input = 'Date: %D';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%D', $result);
+        $this->assertMatchesRegularExpression('/Date: \d{2}\/\d{2}\/\d{2}/', $result);
+    }
+
+    public function testRenderHandlesPercentT(): void
+    {
+        $input = 'Time: %T';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%T', $result);
+        $this->assertMatchesRegularExpression('/Time: \d{2}:\d{2}:\d{2}/', $result);
+    }
+
+    public function testRenderHandlesPercentR(): void
+    {
+        $input = 'Time: %R';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%R', $result);
+        $this->assertMatchesRegularExpression('/Time: \d{2}:\d{2}/', $result);
+    }
+
+    public function testRenderHandlesPercentC(): void
+    {
+        $input = 'Century: %C';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%C', $result);
+        $this->assertMatchesRegularExpression('/Century: \d{2}/', $result);
+    }
+
+    public function testRenderHandlesLowercasePercentC(): void
+    {
+        $input = 'DateTime: %c';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%c', $result);
+        $this->assertMatchesRegularExpression('/DateTime: \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $result);
+    }
+
+    public function testRenderHandlesPercentN(): void
+    {
+        $input = "Line1%nLine2";
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertSame("Line1\nLine2", $result);
+    }
+
+    public function testRenderHandlesLowercasePercentT(): void
+    {
+        $input = "Col1%tCol2";
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertSame("Col1\tCol2", $result);
+    }
+
+    public function testRenderHandlesPercentX(): void
+    {
+        $input = 'Date: %x';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%x', $result);
+        $this->assertMatchesRegularExpression('/Date: \d{4}-\d{2}-\d{2}/', $result);
+    }
+
+    public function testRenderHandlesPercentH(): void
+    {
+        $input = 'Month: %h';
+        $result = $this->tokenLib->render($input, [], false);
+        $this->assertNotEmpty($result);
+        $this->assertStringNotContainsString('%h', $result);
+        $this->assertMatchesRegularExpression('/Month: [A-Za-z]{3}/', $result);
+    }
+}
\ No newline at end of file
diff --git a/tests/Models/CustomerRewardPointsTest.php b/tests/Models/CustomerRewardPointsTest.php
new file mode 100644
index 000000000..7e89a29d4
--- /dev/null
+++ b/tests/Models/CustomerRewardPointsTest.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Tests\Models;
+
+use App\Models\Customer;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Config\Database;
+use Tests\Support\ConcurrentDbRaceTrait;
+
+/**
+ * Regression tests: adjustRewardPoints() must apply
+ * its balance check and its write in a single atomic UPDATE, so that two
+ * concurrent reward-point spends against the same customer can never both
+ * read the same stale balance and double-spend it.
+ */
+class CustomerRewardPointsTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use ConcurrentDbRaceTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    public static function setUpBeforeClass(): void
+    {
+        $seeder = Database::seeder('tests');
+        $seeder->call('TestDatabaseBootstrapSeeder');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function createCustomerWithPoints(int $points): int
+    {
+        $db = \Config\Database::connect();
+
+        $db->table('people')->insert([
+            'first_name'   => 'Reward',
+            'last_name'    => 'Customer',
+            'phone_number' => '555-0100',
+            'email'        => 'reward-customer-' . uniqid() . '@test.com',
+            'address_1'    => '',
+            'address_2'    => '',
+            'city'         => '',
+            'state'        => '',
+            'zip'          => '',
+            'country'      => '',
+            'comments'     => '',
+        ]);
+        $personId = (int) $db->insertID();
+
+        $db->table('customers')->insert([
+            'person_id'   => $personId,
+            'employee_id' => 1,
+            'points'      => $points,
+        ]);
+
+        return $personId;
+    }
+
+    protected function getCustomerPoints(int $personId): int
+    {
+        $row = \Config\Database::connect()->table('customers')
+            ->where('person_id', $personId)
+            ->get()
+            ->getRow();
+
+        return (int) $row->points;
+    }
+
+    public function testAdjustRewardPointsIncrementSucceeds(): void
+    {
+        $personId      = $this->createCustomerWithPoints(10);
+        $customerModel = model(Customer::class);
+
+        $result = $customerModel->adjustRewardPoints($personId, 5);
+
+        $this->assertTrue($result);
+        $this->assertSame(15, $this->getCustomerPoints($personId));
+    }
+
+    public function testAdjustRewardPointsDecrementSucceedsWithSufficientPoints(): void
+    {
+        $personId      = $this->createCustomerWithPoints(100);
+        $customerModel = model(Customer::class);
+
+        $result = $customerModel->adjustRewardPoints($personId, -40);
+
+        $this->assertTrue($result);
+        $this->assertSame(60, $this->getCustomerPoints($personId));
+    }
+
+    public function testAdjustRewardPointsDecrementFailsWithInsufficientPoints(): void
+    {
+        $personId      = $this->createCustomerWithPoints(20);
+        $customerModel = model(Customer::class);
+
+        $result = $customerModel->adjustRewardPoints($personId, -40);
+
+        $this->assertFalse($result);
+        $this->assertSame(20, $this->getCustomerPoints($personId));
+    }
+
+    public function testAdjustRewardPointsDecrementExactBalanceSucceeds(): void
+    {
+        $personId      = $this->createCustomerWithPoints(40);
+        $customerModel = model(Customer::class);
+
+        $result = $customerModel->adjustRewardPoints($personId, -40);
+
+        $this->assertTrue($result);
+        $this->assertSame(0, $this->getCustomerPoints($personId));
+    }
+
+    public function testAdjustRewardPointsConcurrentDecrementsOneWins(): void
+    {
+        $personId = $this->createCustomerWithPoints(100);
+
+        [$result1, $result2] = $this->raceTwoProcesses(
+            'rewardPoints',
+            [$personId, -60],
+            [$personId, -60]
+        );
+
+        $this->assertSame(1, (int) $result1 + (int) $result2);
+        $this->assertSame(40, $this->getCustomerPoints($personId));
+    }
+}
diff --git a/tests/Models/EmployeeTest.php b/tests/Models/EmployeeTest.php
index 7f188c7be..4ff2f05a8 100644
--- a/tests/Models/EmployeeTest.php
+++ b/tests/Models/EmployeeTest.php
@@ -5,14 +5,16 @@ namespace Tests\Models;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use App\Models\Employee;
+use Tests\Support\EmployeeFixtureTrait;
 
 class EmployeeTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
+    use EmployeeFixtureTrait;
 
     protected $migrate     = true;
     protected $migrateOnce = true;
-    protected $refresh     = true;
+    protected $refresh     = false;
     protected $namespace    = null;
 
     protected function setUp(): void
@@ -23,9 +25,9 @@ class EmployeeTest extends CIUnitTestCase
     public function testIsAdminReturnsTrueForPersonId1(): void
     {
         $employeeModel = model(Employee::class);
-        
+
         $result = $employeeModel->isAdmin(1);
-        
+
         $this->assertTrue($result);
     }
 
@@ -34,12 +36,12 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['has_grant'])
             ->getMock();
-        
+
         $employeeModel->method('has_grant')
             ->willReturn(true);
-        
+
         $result = $employeeModel->isAdmin(2);
-        
+
         $this->assertTrue($result);
     }
 
@@ -48,14 +50,14 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['has_grant'])
             ->getMock();
-        
+
         $employeeModel->method('has_grant')
             ->willReturnCallback(function($permissionId, $personId) {
                 return $permissionId !== 'config';
             });
-        
+
         $result = $employeeModel->isAdmin(3);
-        
+
         $this->assertFalse($result);
     }
 
@@ -64,12 +66,12 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['isAdmin'])
             ->getMock();
-        
+
         $employeeModel->method('isAdmin')
             ->willReturn(false);
-        
+
         $result = $employeeModel->canModifyEmployee(1, 1);
-        
+
         $this->assertTrue($result);
     }
 
@@ -78,12 +80,12 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['isAdmin'])
             ->getMock();
-        
+
         $employeeModel->method('isAdmin')
             ->willReturn(true);
-        
+
         $result = $employeeModel->canModifyEmployee(1, 1);
-        
+
         $this->assertTrue($result);
     }
 
@@ -92,14 +94,14 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['isAdmin'])
             ->getMock();
-        
+
         $employeeModel->method('isAdmin')
             ->willReturnCallback(function($personId) {
                 return $personId === 1;
             });
-        
+
         $result = $employeeModel->canModifyEmployee(1, 2);
-        
+
         $this->assertFalse($result);
     }
 
@@ -108,14 +110,14 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['isAdmin'])
             ->getMock();
-        
+
         $employeeModel->method('isAdmin')
             ->willReturnCallback(function($personId) {
                 return $personId === 1;
             });
-        
+
         $result = $employeeModel->canModifyEmployee(2, 1);
-        
+
         $this->assertTrue($result);
     }
 
@@ -124,12 +126,12 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['isAdmin'])
             ->getMock();
-        
+
         $employeeModel->method('isAdmin')
             ->willReturn(false);
-        
+
         $result = $employeeModel->canModifyEmployee(2, 3);
-        
+
         $this->assertTrue($result);
     }
 
@@ -138,32 +140,119 @@ class EmployeeTest extends CIUnitTestCase
         $employeeModel = $this->getMockBuilder(Employee::class)
             ->onlyMethods(['isAdmin'])
             ->getMock();
-        
+
         $employeeModel->method('isAdmin')
             ->willReturnCallback(function($personId) {
                 return $personId === 1;
             });
-        
+
         $result = $employeeModel->canModifyEmployee(1, 2);
-        
+
         $this->assertFalse($result);
     }
 
     public function testHasGrantReturnsTrueForActualGrant(): void
     {
         $employeeModel = model(Employee::class);
-        
+
         $result = $employeeModel->has_grant('employees', 1);
-        
+
         $this->assertTrue($result);
     }
 
     public function testHasGrantReturnsFalseForMissingGrant(): void
     {
         $employeeModel = model(Employee::class);
-        
+
         $result = $employeeModel->has_grant('nonexistent_permission', 1);
-        
+
         $this->assertFalse($result);
     }
-}
\ No newline at end of file
+
+    public function testExistingEmployeeKeepsOriginalGrantsWhenGrantChangeDisallowed(): void
+    {
+        $employeeId = $this->createEmployee(
+            first_name: 'Grant',
+            last_name:  'Tester',
+            grants: [
+                ['permission_id' => 'customers', 'menu_group' => 'home']
+            ],
+        );
+
+        $originalDisallowGrantChange = getenv('DISALLOW_GRANT_CHANGE');
+        putenv('DISALLOW_GRANT_CHANGE=true');
+
+        try {
+            $employeeModel = model(Employee::class);
+            $personData = ['first_name' => 'Grant', 'last_name' => 'Tester', 'email' => "granttester_upd_{$employeeId}@test.com"];
+            $employeeData = ['username' => "granttester_upd_{$employeeId}", 'language_code' => 'en', 'language' => 'english'];
+            $newGrantsData = [['permission_id' => 'sales', 'menu_group' => 'home']];
+
+            $saveEmployeeResult = $employeeModel->save_employee($personData, $employeeData, $newGrantsData, $employeeId);
+            $this->assertTrue($saveEmployeeResult);
+
+            $this->assertTrue($employeeModel->has_grant('customers', $employeeId));
+            $this->assertFalse($employeeModel->has_grant('sales', $employeeId));
+        } finally {
+            $originalDisallowGrantChange === false
+                ? putenv('DISALLOW_GRANT_CHANGE')
+                : putenv("DISALLOW_GRANT_CHANGE={$originalDisallowGrantChange}");
+        }
+    }
+
+    public function testNewEmployeeCreationWithGrantsRejectedWhenGrantChangeDisallowed(): void
+    {
+        $originalDisallowGrantChange = getenv('DISALLOW_GRANT_CHANGE');
+        putenv('DISALLOW_GRANT_CHANGE=true');
+
+        try {
+            $result = $this->createEmployeeExpectingFailure(
+                first_name: 'Rejected',
+                last_name:  'Tester',
+                grants: [
+                    ['permission_id' => 'customers', 'menu_group' => 'home']
+                ],
+            );
+
+            $this->assertFalse($result);
+        } finally {
+            $originalDisallowGrantChange === false
+                ? putenv('DISALLOW_GRANT_CHANGE')
+                : putenv("DISALLOW_GRANT_CHANGE={$originalDisallowGrantChange}");
+        }
+    }
+
+    public function testExistingEmployeeGrantsUpdateWhenGrantChangeAllowed(): void
+    {
+        $employeeId = $this->createEmployee(
+            first_name: 'Grant',
+            last_name:  'Tester',
+            grants: [
+                ['permission_id' => 'customers', 'menu_group' => 'home']
+            ],
+        );
+
+        $employeeModel = model(Employee::class);
+        $personData = ['first_name' => 'Grant', 'last_name' => 'Tester', 'email' => "granttester_upd_{$employeeId}@test.com"];
+        $employeeData = ['username' => "granttester_upd_{$employeeId}", 'language_code' => 'en', 'language' => 'english'];
+        $newGrantsData = [['permission_id' => 'sales', 'menu_group' => 'home']];
+
+        $employeeModel->save_employee($personData, $employeeData, $newGrantsData, $employeeId);
+
+        $this->assertFalse($employeeModel->has_grant('customers', $employeeId));
+        $this->assertTrue($employeeModel->has_grant('sales', $employeeId));
+    }
+
+    public function testNewEmployeeCreationWithGrantsSucceedsWhenGrantChangeAllowed(): void
+    {
+        $result = $this->createEmployeeExpectingFailure(
+            first_name: 'Granted',
+            last_name:  'Tester',
+            grants: [
+                ['permission_id' => 'customers', 'menu_group' => 'home']
+            ],
+        );
+
+        $this->assertTrue((bool) $result);
+    }
+}
diff --git a/tests/Models/GiftcardTest.php b/tests/Models/GiftcardTest.php
new file mode 100644
index 000000000..d097cd673
--- /dev/null
+++ b/tests/Models/GiftcardTest.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Tests\Models;
+
+use App\Models\Giftcard;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Config\Database;
+use Tests\Support\ConcurrentDbRaceTrait;
+
+/**
+ * Regression tests: decrementGiftcardValue() must
+ * apply its balance check and its write in a single atomic UPDATE, so that
+ * two concurrent decrements against the same gift card can never both read
+ * the same stale balance and double-spend it.
+ */
+class GiftcardTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use ConcurrentDbRaceTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    public static function setUpBeforeClass(): void
+    {
+        $seeder = Database::seeder('tests');
+        $seeder->call('TestDatabaseBootstrapSeeder');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function createGiftcard(float $value): int
+    {
+        $giftcardNumber = random_int(1000000, 9999999);
+
+        \Config\Database::connect()->table('giftcards')->insert([
+            'giftcard_number' => $giftcardNumber,
+            'value'           => $value,
+            'deleted'         => 0,
+            'person_id'       => null,
+        ]);
+
+        return $giftcardNumber;
+    }
+
+    protected function getGiftcardValue(int $giftcardNumber): float
+    {
+        $row = \Config\Database::connect()->table('giftcards')
+            ->where('giftcard_number', $giftcardNumber)
+            ->get()
+            ->getRow();
+
+        return (float) $row->value;
+    }
+
+    public function testDecrementGiftcardValueSucceedsWithSufficientBalance(): void
+    {
+        $giftcardNumber = $this->createGiftcard(100.00);
+        $giftcardModel  = model(Giftcard::class);
+
+        $result = $giftcardModel->decrementGiftcardValue((string) $giftcardNumber, 60.00);
+
+        $this->assertTrue($result);
+        $this->assertEqualsWithDelta(40.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testDecrementGiftcardValueFailsWithInsufficientBalance(): void
+    {
+        $giftcardNumber = $this->createGiftcard(50.00);
+        $giftcardModel  = model(Giftcard::class);
+
+        $result = $giftcardModel->decrementGiftcardValue((string) $giftcardNumber, 60.00);
+
+        $this->assertFalse($result);
+        $this->assertEqualsWithDelta(50.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testDecrementGiftcardValueRejectsNegativeAmount(): void
+    {
+        $giftcardNumber = $this->createGiftcard(100.00);
+        $giftcardModel  = model(Giftcard::class);
+
+        $result = $giftcardModel->decrementGiftcardValue((string) $giftcardNumber, -500.00);
+
+        $this->assertFalse($result);
+        $this->assertEqualsWithDelta(100.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testDecrementGiftcardValueRejectsZeroAmount(): void
+    {
+        $giftcardNumber = $this->createGiftcard(100.00);
+        $giftcardModel  = model(Giftcard::class);
+
+        $result = $giftcardModel->decrementGiftcardValue((string) $giftcardNumber, 0.00);
+
+        $this->assertFalse($result);
+        $this->assertEqualsWithDelta(100.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testDecrementGiftcardValueExactBalanceSucceeds(): void
+    {
+        $giftcardNumber = $this->createGiftcard(60.00);
+        $giftcardModel  = model(Giftcard::class);
+
+        $result = $giftcardModel->decrementGiftcardValue((string) $giftcardNumber, 60.00);
+
+        $this->assertTrue($result);
+        $this->assertEqualsWithDelta(0.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testDecrementGiftcardValueFailsWhenDeleted(): void
+    {
+        $giftcardNumber = $this->createGiftcard(100.00);
+
+        \Config\Database::connect()->table('giftcards')
+            ->where('giftcard_number', $giftcardNumber)
+            ->update(['deleted' => 1]);
+
+        $giftcardModel = model(Giftcard::class);
+
+        $result = $giftcardModel->decrementGiftcardValue((string) $giftcardNumber, 60.00);
+
+        $this->assertFalse($result);
+        $this->assertEqualsWithDelta(100.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testDecrementGiftcardValueConcurrentDecrementsOneWins(): void
+    {
+        $giftcardNumber = $this->createGiftcard(100.00);
+
+        [$result1, $result2] = $this->raceTwoProcesses(
+            'giftcard',
+            [$giftcardNumber, 60.00],
+            [$giftcardNumber, 60.00]
+        );
+
+        $this->assertSame(1, (int) $result1 + (int) $result2);
+        $this->assertEqualsWithDelta(40.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+}
diff --git a/tests/Models/ItemBulkUpdateTest.php b/tests/Models/ItemBulkUpdateTest.php
new file mode 100644
index 000000000..4e1cdcb5a
--- /dev/null
+++ b/tests/Models/ItemBulkUpdateTest.php
@@ -0,0 +1,353 @@
+<?php
+
+namespace Tests\Models;
+
+use App\Models\Item;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+/**
+ * Regression coverage for mass assignment in bulk edit.
+ *
+ * Item::update_multiple() writes through the Query Builder, which bypasses the
+ * model's $allowedFields, so these assertions go straight to the items table.
+ */
+class ItemBulkUpdateTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    /**
+     * The schema is taken as it stands rather than migrated, so these tests run
+     * against an existing test database without dropping it. Every row created
+     * here is rolled back in tearDown().
+     */
+    protected $migrate   = false;
+    protected $refresh   = false;
+    protected $namespace = null;
+
+    protected Item $item;
+
+    /** @var list<int> */
+    private array $createdItemIds = [];
+
+    /** @var list<int> */
+    private array $createdSupplierPersonIds = [];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->item = model(Item::class);
+    }
+
+    protected function tearDown(): void
+    {
+        if ($this->createdItemIds !== []) {
+            $this->db->table('items')->whereIn('item_id', $this->createdItemIds)->delete();
+            $this->createdItemIds = [];
+        }
+
+        if ($this->createdSupplierPersonIds !== []) {
+            $this->db->table('suppliers')->whereIn('person_id', $this->createdSupplierPersonIds)->delete();
+            $this->db->table('people')->whereIn('person_id', $this->createdSupplierPersonIds)->delete();
+            $this->createdSupplierPersonIds = [];
+        }
+
+        parent::tearDown();
+    }
+
+    /**
+     * Creates an item directly and returns its id.
+     */
+    private function createItem(array $overrides = []): int
+    {
+        $itemData = array_merge([
+            'name'                  => 'Bulk Edit Fixture',
+            'category'              => 'Fixtures',
+            'cost_price'            => 10.00,
+            'unit_price'            => 20.00,
+            'reorder_level'         => 1,
+            'description'           => 'fixture',
+            'allow_alt_description' => 0,
+            'is_serialized'         => 0,
+            'deleted'               => 0,
+            'item_type'             => 0,
+            'stock_type'            => 0,
+            'hsn_code'              => ''
+        ], $overrides);
+
+        $this->item->save_value($itemData);
+
+        $itemId = (int)$itemData['item_id'];
+        $this->createdItemIds[] = $itemId;
+
+        return $itemId;
+    }
+
+    /**
+     * Creates a supplier (people + suppliers rows, to satisfy the items FK chain)
+     * and returns its person_id.
+     */
+    private function createSupplier(): int
+    {
+        $this->db->table('people')->insert([
+            'first_name'   => 'Bulk',
+            'last_name'    => 'Supplier',
+            'phone_number' => '555-0100',
+            'email'        => 'bulk.supplier@example.test',
+            'address_1'    => '1 Fixture Way',
+            'address_2'    => '',
+            'city'         => 'Testville',
+            'state'        => 'TS',
+            'zip'          => '00000',
+            'country'      => 'US',
+            'comments'     => 'fixture'
+        ]);
+
+        $personId = (int)$this->db->insertID();
+
+        $this->db->table('suppliers')->insert([
+            'person_id'    => $personId,
+            'company_name' => 'Bulk Edit Supplies',
+            'agency_name'  => '',
+            'category'     => 0
+        ]);
+
+        $this->createdSupplierPersonIds[] = $personId;
+
+        return $personId;
+    }
+
+    private function fetchItem(int $itemId): array
+    {
+        return (array)$this->db->table('items')
+            ->where('item_id', $itemId)
+            ->get()
+            ->getRow();
+    }
+
+    public function testUpdateMultipleIgnoresNonWhitelistedColumns(): void
+    {
+        $itemId = $this->createItem();
+
+        $result = $this->item->updateMultiple([
+            'unit_price' => 25.00,   // legitimate
+            'deleted'    => 1,       // injected — would hide the item
+            'item_type'  => 2,       // injected — would change item semantics
+            'stock_type' => 1        // injected
+        ], (string)$itemId);
+
+        $this->assertTrue($result, 'The legitimate field should still be applied');
+
+        $row = $this->fetchItem($itemId);
+
+        $this->assertEquals(25.00, (float)$row['unit_price'], 'Whitelisted field should be updated');
+        $this->assertEquals(0, (int)$row['deleted'], 'Injected deleted must be ignored');
+        $this->assertEquals(0, (int)$row['item_type'], 'Injected item_type must be ignored');
+        $this->assertEquals(0, (int)$row['stock_type'], 'Injected stock_type must be ignored');
+    }
+
+    public function testUpdateMultipleWithOnlyNonWhitelistedColumnsIsNoOp(): void
+    {
+        $itemId = $this->createItem();
+
+        $result = $this->item->updateMultiple(['deleted' => 1], (string)$itemId);
+
+        $this->assertFalse($result, 'An update of only disallowed columns should not run');
+        $this->assertEquals(0, (int)$this->fetchItem($itemId)['deleted'], 'Item must not be soft deleted');
+    }
+
+    public function testUpdateMultipleAppliesToEveryColonSeparatedId(): void
+    {
+        $first  = $this->createItem();
+        $second = $this->createItem();
+
+        $this->item->updateMultiple(['category' => 'Regrouped'], "$first:$second");
+
+        $this->assertEquals('Regrouped', $this->fetchItem($first)['category']);
+        $this->assertEquals('Regrouped', $this->fetchItem($second)['category']);
+    }
+
+    public function testUpdateMultipleClearsSupplierWhenPassedNull(): void
+    {
+        $supplierId = $this->createSupplier();
+        $itemId     = $this->createItem(['supplier_id' => $supplierId]);
+
+        $this->assertEquals(
+            $supplierId,
+            (int)$this->fetchItem($itemId)['supplier_id'],
+            'precondition: the item must start with a supplier'
+        );
+
+        $filtered = Item::filterBulkEditFields(['supplier_id' => Item::CLEAR_SUPPLIER_OPTION]);
+        $this->item->updateMultiple($filtered, (string)$itemId);
+
+        $this->assertNull($this->fetchItem($itemId)['supplier_id'], 'supplier_id should be cleared');
+    }
+
+    public function testBulkEditWhitelistExcludesSensitiveColumns(): void
+    {
+        foreach (['deleted', 'item_type', 'stock_type', 'item_number', 'pic_filename', 'tax_category_id'] as $column) {
+            $this->assertNotContains(
+                $column,
+                Item::ALLOWED_BULK_EDIT_FIELDS,
+                "Sensitive column should not be bulk editable: $column"
+            );
+        }
+    }
+
+    public function testBulkEditWhitelistFieldsAreAllRealColumns(): void
+    {
+        foreach (Item::ALLOWED_BULK_EDIT_FIELDS as $field) {
+            $this->assertContains(
+                $field,
+                $this->db->getFieldNames('items'),
+                "Whitelisted bulk edit field must exist on the items table: $field"
+            );
+        }
+    }
+
+    // ========== Item::filterBulkEditFields() — the controller's input filter ==========
+
+    public function testFilterBulkEditFieldsDropsInjectedColumns(): void
+    {
+        $filtered = Item::filterBulkEditFields([
+            'item_ids'   => '1',
+            'unit_price' => '25.00',
+            'deleted'    => '1',
+            'item_type'  => '2',
+            'stock_type' => '1'
+        ]);
+
+        $this->assertSame(['unit_price' => 25.0], $filtered);
+    }
+
+    public function testFilterBulkEditFieldsOmitsAbsentSupplier(): void
+    {
+        $filtered = Item::filterBulkEditFields(['unit_price' => '30.00']);
+
+        $this->assertArrayNotHasKey(
+            'supplier_id',
+            $filtered,
+            'An absent supplier_id must not be written, or bulk edits would clear suppliers'
+        );
+    }
+
+    public function testFilterBulkEditFieldsTreatsEmptySupplierAsDoNothing(): void
+    {
+        $filtered = Item::filterBulkEditFields(['supplier_id' => '', 'unit_price' => '30.00']);
+
+        $this->assertArrayNotHasKey('supplier_id', $filtered, 'An empty supplier_id means do nothing');
+    }
+
+    public function testFilterBulkEditFieldsClearsSupplierWithSentinel(): void
+    {
+        $filtered = Item::filterBulkEditFields(['supplier_id' => Item::CLEAR_SUPPLIER_OPTION]);
+
+        $this->assertArrayHasKey('supplier_id', $filtered);
+        $this->assertNull($filtered['supplier_id'], 'The sentinel should become a NULL write');
+    }
+
+    public function testFilterBulkEditFieldsKeepsSelectedSupplier(): void
+    {
+        $filtered = Item::filterBulkEditFields(['supplier_id' => '7']);
+
+        $this->assertSame(['supplier_id' => 7], $filtered);
+    }
+
+    public function testFilterBulkEditFieldsSkipsEmptyValuesForEveryField(): void
+    {
+        $input = array_fill_keys(Item::ALLOWED_BULK_EDIT_FIELDS, '');
+
+        $this->assertSame([], Item::filterBulkEditFields($input), 'An untouched form should update nothing');
+    }
+
+    public function testFilterBulkEditFieldsAcceptsEveryWhitelistedField(): void
+    {
+        $input = [
+            'name'                  => 'Renamed',
+            'category'              => 'Regrouped',
+            'supplier_id'           => '7',
+            'cost_price'            => '1.50',
+            'unit_price'            => '2.50',
+            'reorder_level'         => '3',
+            'description'           => 'described',
+            'allow_alt_description' => '1',
+            'is_serialized'         => '1'
+        ];
+
+        $this->assertSame(
+            Item::ALLOWED_BULK_EDIT_FIELDS,
+            array_keys(Item::filterBulkEditFields($input)),
+            'Every whitelisted field should still be editable'
+        );
+    }
+
+    public function testFilterBulkEditFieldsDropsArrayValues(): void
+    {
+        $input = array_fill_keys(Item::ALLOWED_BULK_EDIT_FIELDS, ['x']);
+
+        $this->assertSame([], Item::filterBulkEditFields($input), 'Array values must never reach the update');
+    }
+
+    public function testFilterBulkEditFieldsDropsNonNumericPricesAndQuantities(): void
+    {
+        $filtered = Item::filterBulkEditFields([
+            'cost_price'    => 'abc',
+            'unit_price'    => 'DROP TABLE',
+            'reorder_level' => 'lots',
+            'name'          => 'Renamed'
+        ]);
+
+        $this->assertSame(['name' => 'Renamed'], $filtered, 'Unparseable numbers must be omitted');
+    }
+
+    public function testFilterBulkEditFieldsDropsInvalidBooleanValues(): void
+    {
+        $filtered = Item::filterBulkEditFields([
+            'allow_alt_description' => '2',
+            'is_serialized'         => 'yes'
+        ]);
+
+        $this->assertSame([], $filtered, 'Booleans other than 0/1 must be omitted');
+    }
+
+    public function testFilterBulkEditFieldsDropsNonNumericSupplier(): void
+    {
+        $filtered = Item::filterBulkEditFields(['supplier_id' => '7; DROP TABLE items']);
+
+        $this->assertSame([], $filtered, 'A non-numeric supplier_id other than the sentinel must be omitted');
+    }
+
+    public function testFilterBulkEditFieldsAcceptsZeroValues(): void
+    {
+        $filtered = Item::filterBulkEditFields(['allow_alt_description' => '0', 'is_serialized' => '0']);
+
+        $this->assertSame(['allow_alt_description' => '0', 'is_serialized' => '0'], $filtered);
+    }
+
+    public function testFilterBulkEditFieldsOutputIsSafeForUpdateMultiple(): void
+    {
+        $itemId = $this->createItem();
+
+        $filtered = Item::filterBulkEditFields([
+            'item_ids' => (string)$itemId,
+            'deleted'  => '1',
+            'name'     => 'Renamed'
+        ]);
+
+        $this->item->updateMultiple($filtered, (string)$itemId);
+
+        $row = $this->fetchItem($itemId);
+        $this->assertEquals('Renamed', $row['name']);
+        $this->assertEquals(0, (int)$row['deleted'], 'Injected deleted must never reach the table');
+    }
+
+    public function testClearSupplierSentinelCannotCollideWithAPersonId(): void
+    {
+        $this->assertFalse(
+            is_numeric(Item::CLEAR_SUPPLIER_OPTION),
+            'The clear-supplier sentinel must be non-numeric so it cannot match a person_id'
+        );
+    }
+}
diff --git a/tests/Models/ItemQuantityTest.php b/tests/Models/ItemQuantityTest.php
new file mode 100644
index 000000000..8ca38a267
--- /dev/null
+++ b/tests/Models/ItemQuantityTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\Models;
+
+use App\Models\Item_quantity;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Config\Database;
+use Tests\Support\ConcurrentDbRaceTrait;
+use Tests\Support\ItemFixtureTrait;
+
+/**
+ * Regression tests: changeQuantity() must apply
+ * its write in a single atomic upsert, so that two concurrent sales of the
+ * same item/location can never both read the same stale quantity and
+ * oversell stock. Unlike the gift card and reward point spends, there is
+ * deliberately no floor guard here (see the fix's scope note) — negative
+ * stock is allowed today and this fix does not change that.
+ */
+class ItemQuantityTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use ConcurrentDbRaceTrait;
+    use ItemFixtureTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    private const LOCATION_ID = 1;
+
+    public static function setUpBeforeClass(): void
+    {
+        $seeder = Database::seeder('tests');
+        $seeder->call('TestDatabaseBootstrapSeeder');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function createItemQuantityRow(int $itemId, float $quantity): void
+    {
+        \Config\Database::connect()->table('item_quantities')->insert([
+            'item_id'     => $itemId,
+            'location_id' => self::LOCATION_ID,
+            'quantity'    => $quantity,
+        ]);
+    }
+
+    public function testDecrementQuantitySucceeds(): void
+    {
+        $itemId = $this->createTestItem();
+        $this->createItemQuantityRow($itemId, 10);
+        $itemQuantityModel = model(Item_quantity::class);
+
+        $result = $itemQuantityModel->changeQuantity($itemId, self::LOCATION_ID, -3);
+
+        $this->assertTrue($result);
+        $this->assertEqualsWithDelta(7.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+    }
+
+    public function testDecrementQuantityAllowsGoingNegative(): void
+    {
+        $itemId = $this->createTestItem();
+        $this->createItemQuantityRow($itemId, 5);
+        $itemQuantityModel = model(Item_quantity::class);
+
+        $result = $itemQuantityModel->changeQuantity($itemId, self::LOCATION_ID, -8);
+
+        $this->assertTrue($result);
+        $this->assertEqualsWithDelta(-3.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+    }
+
+    public function testDecrementQuantityConcurrentDecrementsBothApply(): void
+    {
+        $itemId = $this->createTestItem();
+        $this->createItemQuantityRow($itemId, 10);
+
+        [$result1, $result2] = $this->raceTwoProcesses(
+            'itemQuantity',
+            [$itemId, self::LOCATION_ID, -3.0],
+            [$itemId, self::LOCATION_ID, -3.0]
+        );
+
+        $this->assertTrue($result1);
+        $this->assertTrue($result2);
+        $this->assertEqualsWithDelta(4.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+    }
+}
diff --git a/tests/Models/ItemSearchTest.php b/tests/Models/ItemSearchTest.php
new file mode 100644
index 000000000..fdf20bd10
--- /dev/null
+++ b/tests/Models/ItemSearchTest.php
@@ -0,0 +1,468 @@
+<?php
+
+namespace Tests\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use App\Models\Item;
+use Config\Database;
+use Config\OSPOS;
+use Tests\Support\ItemSearchFixtureTrait;
+
+class ItemSearchTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use ItemSearchFixtureTrait;
+
+    protected $migrate = true;
+    protected $migrateOnce = true;
+    protected $seed = '';
+    protected $seedOnce = true;
+    protected $refresh = true;
+    protected $namespace = null;
+
+    protected $item;
+
+    public static function setUpBeforeClass(): void
+    {
+        $seeder = Database::seeder('tests');
+        $seeder->call('TestDatabaseBootstrapSeeder');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->item = model(Item::class);
+
+        // OSPOS's app_config cache can go stale mid-suite and fall back to defaults with
+        // no 'dateformat' key, so set it directly rather than depending on that cache.
+        config(OSPOS::class)->settings['dateformat'] = 'm/d/Y';
+        config(OSPOS::class)->settings['number_locale'] = 'en_US';
+        config(OSPOS::class)->settings['currency_decimals'] = 2;
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+    }
+
+    public function testSearchReturnsMatchingItemByName(): void
+    {
+        $uniqueName = 'Findable Widget ' . uniqid();
+        $this->createSearchableItem([
+            'name'       => $uniqueName,
+            'cost_price' => 12.50,
+            'unit_price' => 24.99,
+        ]);
+
+        $results = $this->item->search($uniqueName, $this->defaultSearchFilters())->getResult();
+
+        $this->assertCount(1, $results);
+        $this->assertEquals($uniqueName, $results[0]->name);
+        $this->assertEquals(12.50, (float) $results[0]->cost_price);
+        $this->assertEquals(24.99, (float) $results[0]->unit_price);
+    }
+
+    public function testSearchExcludesNonMatchingItems(): void
+    {
+        $matchingName = 'Matching Gadget ' . uniqid();
+        $this->createSearchableItem(['name' => $matchingName]);
+        $this->createSearchableItem(['name' => 'Unrelated Thing ' . uniqid()]);
+
+        $results = $this->item->search($matchingName, $this->defaultSearchFilters())->getResult();
+
+        $this->assertCount(1, $results);
+        $this->assertEquals($matchingName, $results[0]->name);
+    }
+
+    public function testGetFoundRowsMatchesActualCount(): void
+    {
+        $sharedCategory = 'Shared Category ' . uniqid();
+        $this->createSearchableItem(['category' => $sharedCategory]);
+        $this->createSearchableItem(['category' => $sharedCategory]);
+        $this->createSearchableItem(['category' => $sharedCategory]);
+
+        $filters = $this->defaultSearchFilters();
+
+        $foundRows = $this->item->get_found_rows($sharedCategory, $filters);
+        $actualRows = $this->item->search($sharedCategory, $filters)->getResultArray();
+
+        $this->assertEquals(3, $foundRows);
+        $this->assertCount($foundRows, $actualRows);
+    }
+
+    public function testSearchPaginationRowsAndLimitFrom(): void
+    {
+        $sharedCategory = 'Paginated Category ' . uniqid();
+        $this->createSearchableItem(['name' => 'A Item ' . uniqid(), 'category' => $sharedCategory]);
+        $this->createSearchableItem(['name' => 'B Item ' . uniqid(), 'category' => $sharedCategory]);
+        $this->createSearchableItem(['name' => 'C Item ' . uniqid(), 'category' => $sharedCategory]);
+
+        $results = $this->item->search(
+            $sharedCategory,
+            $this->defaultSearchFilters(),
+            1,
+            1,
+            'items.name',
+            'asc'
+        )->getResult();
+
+        $this->assertCount(1, $results);
+        $this->assertStringStartsWith('B Item', $results[0]->name);
+    }
+
+    public function testSearchOrderPreservedAfterPhaseBJoin(): void
+    {
+        $sharedCategory = 'Ordered Category ' . uniqid();
+        $this->createSearchableItem(['name' => 'Alpha Item ' . uniqid(), 'category' => $sharedCategory]);
+        $this->createSearchableItem(['name' => 'Beta Item ' . uniqid(), 'category' => $sharedCategory]);
+        $this->createSearchableItem(['name' => 'Gamma Item ' . uniqid(), 'category' => $sharedCategory]);
+
+        $results = $this->item->search(
+            $sharedCategory,
+            $this->defaultSearchFilters(),
+            0,
+            0,
+            'items.name',
+            'desc'
+        )->getResult();
+
+        $names = array_map(static fn ($item) => $item->name, $results);
+        $sorted = $names;
+        rsort($sorted);
+
+        $this->assertSame($sorted, $names);
+    }
+
+    public function testSearchNoMatchesReturnsEmptyResultNotError(): void
+    {
+        $results = $this->item->search('no-such-item-' . uniqid(), $this->defaultSearchFilters())->getResult();
+
+        $this->assertIsArray($results);
+        $this->assertCount(0, $results);
+    }
+
+    public function testSearchExcludesDeletedItemsByDefault(): void
+    {
+        $deletedName = 'Deleted Item ' . uniqid();
+        $this->createSearchableItem(['name' => $deletedName, 'deleted' => 1]);
+
+        $results = $this->item->search($deletedName, $this->defaultSearchFilters(['is_deleted' => false]))->getResult();
+
+        $this->assertCount(0, $results);
+    }
+
+    public function testSearchIncludesDeletedWhenFilterSet(): void
+    {
+        $deletedName = 'Deleted Item ' . uniqid();
+        $this->createSearchableItem(['name' => $deletedName, 'deleted' => 1]);
+
+        $results = $this->item->search($deletedName, $this->defaultSearchFilters(['is_deleted' => true]))->getResult();
+
+        $this->assertCount(1, $results);
+        $this->assertEquals($deletedName, $results[0]->name);
+    }
+
+    public function testSearchStockLocationFilter(): void
+    {
+        $locationAName = 'Location A Item ' . uniqid();
+        $itemId = $this->createSearchableItem(['name' => $locationAName]);
+        $this->addItemQuantity($itemId, 1, 10);
+
+        $resultsAtLocation1 = $this->item->search(
+            $locationAName,
+            $this->defaultSearchFilters(['stock_location_id' => 1])
+        )->getResult();
+
+        $resultsAtLocation2 = $this->item->search(
+            $locationAName,
+            $this->defaultSearchFilters(['stock_location_id' => 2])
+        )->getResult();
+
+        $this->assertCount(1, $resultsAtLocation1);
+        $this->assertCount(0, $resultsAtLocation2);
+    }
+
+    public function testSearchTemporaryFilter(): void
+    {
+        $tempName = 'Temp Item ' . uniqid();
+        $this->createSearchableItem(['name' => $tempName, 'item_type' => ITEM_TEMP]);
+
+        $resultsWhenTemporary = $this->item->search(
+            $tempName,
+            $this->defaultSearchFilters(['temporary' => true])
+        )->getResult();
+
+        $resultsWhenNotTemporary = $this->item->search(
+            $tempName,
+            $this->defaultSearchFilters(['temporary' => false])
+        )->getResult();
+
+        $this->assertCount(1, $resultsWhenTemporary);
+        $this->assertCount(0, $resultsWhenNotTemporary);
+    }
+
+    public function testSearchSortByQuantitySumsAcrossLocationsWithoutMultiplication(): void
+    {
+        $itemId = $this->createSearchableItem(['name' => 'Multi Location Item ' . uniqid()]);
+
+        // createSearchableItem already inserts one inventory row; add two more
+        // inventory transactions so a naive SUM-after-join (which multiplies
+        // item_quantities rows by the inventory join) would triple-count.
+        $this->addInventoryRecord($itemId, 1);
+        $this->addInventoryRecord($itemId, 1);
+
+        $this->addItemQuantity($itemId, 1, 10);
+        $this->addItemQuantity($itemId, 2, 5);
+
+        $results = $this->item->search(
+            '',
+            $this->defaultSearchFilters(),
+            0,
+            0,
+            'quantity',
+            'desc'
+        )->getResult();
+
+        $match = array_values(array_filter($results, static fn ($r) => (int) $r->item_id === $itemId));
+
+        $this->assertCount(1, $match);
+        $this->assertEquals(15, (float) $match[0]->quantity);
+    }
+
+    public function testSearchByNamedAttributeSyntax(): void
+    {
+        $colorDefinitionId = $this->createAttributeDefinition('Color ' . uniqid());
+        $sizeDefinitionId = $this->createAttributeDefinition('Size ' . uniqid());
+        $blueValue = 'Blue' . uniqid();
+        $redValue = 'Red' . uniqid();
+        $largeValue = 'Large' . uniqid();
+
+        $matchingId = $this->createSearchableItem(['name' => 'Named Attr Match ' . uniqid()]);
+        $this->linkAttributeValue($matchingId, $colorDefinitionId, $blueValue);
+        $this->linkAttributeValue($matchingId, $sizeDefinitionId, $largeValue);
+
+        $wrongColorId = $this->createSearchableItem(['name' => 'Named Attr WrongColor ' . uniqid()]);
+        $this->linkAttributeValue($wrongColorId, $colorDefinitionId, $redValue);
+        $this->linkAttributeValue($wrongColorId, $sizeDefinitionId, $largeValue);
+
+        $filters = $this->defaultSearchFilters([
+            'search_custom'  => true,
+            'definition_ids' => [$colorDefinitionId, $sizeDefinitionId],
+        ]);
+
+        $colorAttrName = $this->getDefinitionName($colorDefinitionId);
+        $sizeAttrName = $this->getDefinitionName($sizeDefinitionId);
+
+        $results = $this->item->search("{$colorAttrName}:{$blueValue} {$sizeAttrName}:{$largeValue}", $filters)->getResult();
+        $ids = array_map(static fn ($item) => (int) $item->item_id, $results);
+
+        $this->assertContains($matchingId, $ids);
+        $this->assertNotContains($wrongColorId, $ids);
+    }
+
+    public function testSearchByNamedAttributeSyntaxWithCommaSeparator(): void
+    {
+        // parseAttributeSearch() treats a bare comma between name:value pairs as an implicit
+        // separator (like AND/OR), so "color:blue, size:large" must parse both attributes.
+        $colorDefinitionId = $this->createAttributeDefinition('Color ' . uniqid());
+        $sizeDefinitionId = $this->createAttributeDefinition('Size ' . uniqid());
+        $blueValue = 'Blue' . uniqid();
+        $largeValue = 'Large' . uniqid();
+
+        $matchingId = $this->createSearchableItem(['name' => 'Comma Sep Match ' . uniqid()]);
+        $this->linkAttributeValue($matchingId, $colorDefinitionId, $blueValue);
+        $this->linkAttributeValue($matchingId, $sizeDefinitionId, $largeValue);
+
+        $filters = $this->defaultSearchFilters([
+            'search_custom'  => true,
+            'definition_ids' => [$colorDefinitionId, $sizeDefinitionId],
+        ]);
+
+        $colorAttrName = $this->getDefinitionName($colorDefinitionId);
+        $sizeAttrName = $this->getDefinitionName($sizeDefinitionId);
+
+        $results = $this->item->search("{$colorAttrName}:{$blueValue}, {$sizeAttrName}:{$largeValue}", $filters)->getResult();
+        $ids = array_map(static fn ($item) => (int) $item->item_id, $results);
+
+        $this->assertContains($matchingId, $ids);
+    }
+
+    public function testSearchByNamedAttributeCombinedWithFreeText(): void
+    {
+        // When search_custom is on, the free-text remainder matches attribute values
+        // (not item name/category/etc) - see the customAttributeSearch branch of search().
+        // An item can only have one attribute_links row per definition_id (attribute_links_uq3),
+        // so the name:value attribute and the free-text-matched attribute must be different
+        // definitions.
+        $colorDefinitionId = $this->createAttributeDefinition('Color ' . uniqid());
+        $materialDefinitionId = $this->createAttributeDefinition('Material ' . uniqid());
+        $greenValue = 'Green' . uniqid();
+        $freeTextValue = 'Cotton' . uniqid();
+
+        $matchingId = $this->createSearchableItem(['name' => 'Combo Search Widget ' . uniqid()]);
+        $this->linkAttributeValue($matchingId, $colorDefinitionId, $greenValue);
+        $this->linkAttributeValue($matchingId, $materialDefinitionId, $freeTextValue);
+
+        $wrongFreeTextId = $this->createSearchableItem(['name' => 'Combo Search Other ' . uniqid()]);
+        $this->linkAttributeValue($wrongFreeTextId, $colorDefinitionId, $greenValue);
+
+        $filters = $this->defaultSearchFilters([
+            'search_custom'  => true,
+            'definition_ids' => [$colorDefinitionId, $materialDefinitionId],
+        ]);
+
+        $colorAttrName = $this->getDefinitionName($colorDefinitionId);
+
+        $results = $this->item->search("{$colorAttrName}:{$greenValue} {$freeTextValue}", $filters)->getResult();
+        $ids = array_map(static fn ($item) => (int) $item->item_id, $results);
+
+        $this->assertContains($matchingId, $ids);
+        $this->assertNotContains($wrongFreeTextId, $ids);
+    }
+
+    public function testPlainFreeTextSearchUnaffectedByAttributeParsing(): void
+    {
+        // search_custom is off here, so this exercises the plain by-name search path -
+        // parseAttributeSearch() is never even called in this branch of search().
+        $uniqueName = 'Plain Search Widget ' . uniqid();
+        $this->createSearchableItem(['name' => $uniqueName]);
+
+        $results = $this->item->search($uniqueName, $this->defaultSearchFilters())->getResult();
+
+        $this->assertCount(1, $results);
+        $this->assertEquals($uniqueName, $results[0]->name);
+    }
+
+    public function testSearchCustomWithoutNamedAttributeSyntaxMatchesAttributeValueAsBefore(): void
+    {
+        // No "name:value" syntax present, so parseAttributeSearch() finds no attributes and
+        // $freeTextSearch falls back to the raw $search - this is the pre-Feature-C behavior
+        // for search_custom, unaffected by the new named-attribute join.
+        $definitionId = $this->createAttributeDefinition('Material ' . uniqid());
+        $searchValue = 'Cotton' . uniqid();
+
+        $matchingId = $this->createSearchableItem(['name' => 'Search Custom Widget ' . uniqid()]);
+        $this->linkAttributeValue($matchingId, $definitionId, $searchValue);
+
+        $filters = $this->defaultSearchFilters([
+            'search_custom'  => true,
+            'definition_ids' => [$definitionId],
+        ]);
+
+        $results = $this->item->search($searchValue, $filters)->getResult();
+        $ids = array_map(static fn ($item) => (int) $item->item_id, $results);
+
+        $this->assertContains($matchingId, $ids);
+    }
+
+    public function testSearchByNamedAttributeMatchesDecimalAttribute(): void
+    {
+        $priceDefinitionId = $this->createAttributeDefinition('Price ' . uniqid(), DECIMAL);
+
+        $matchingId = $this->createSearchableItem(['name' => 'Decimal Attr Match ' . uniqid()]);
+        $this->linkTypedAttributeValue($matchingId, $priceDefinitionId, '19.99', DECIMAL);
+
+        $otherId = $this->createSearchableItem(['name' => 'Decimal Attr Other ' . uniqid()]);
+        $this->linkTypedAttributeValue($otherId, $priceDefinitionId, '5.00', DECIMAL);
+
+        $filters = $this->defaultSearchFilters([
+            'search_custom'  => true,
+            'definition_ids' => [$priceDefinitionId],
+        ]);
+
+        $priceAttrName = $this->getDefinitionName($priceDefinitionId);
+
+        $results = $this->item->search("{$priceAttrName}:19.99", $filters)->getResult();
+        $ids = array_map(static fn ($item) => (int) $item->item_id, $results);
+
+        $this->assertContains($matchingId, $ids);
+        $this->assertNotContains($otherId, $ids);
+    }
+
+    public function testSearchByNamedAttributeMatchesDateAttribute(): void
+    {
+        config(OSPOS::class)->settings['dateformat'] = 'm/d/Y';
+
+        $expiryDefinitionId = $this->createAttributeDefinition('Expiry ' . uniqid(), DATE);
+
+        $matchingId = $this->createSearchableItem(['name' => 'Date Attr Match ' . uniqid()]);
+        $this->linkTypedAttributeValue($matchingId, $expiryDefinitionId, '01/15/2027', DATE);
+
+        $otherId = $this->createSearchableItem(['name' => 'Date Attr Other ' . uniqid()]);
+        $this->linkTypedAttributeValue($otherId, $expiryDefinitionId, '02/20/2027', DATE);
+
+        $filters = $this->defaultSearchFilters([
+            'search_custom'  => true,
+            'definition_ids' => [$expiryDefinitionId],
+        ]);
+
+        $expiryAttrName = $this->getDefinitionName($expiryDefinitionId);
+
+        $results = $this->item->search("{$expiryAttrName}:01/15/2027", $filters)->getResult();
+        $ids = array_map(static fn ($item) => (int) $item->item_id, $results);
+
+        $this->assertContains($matchingId, $ids);
+        $this->assertNotContains($otherId, $ids);
+    }
+
+    public function testSearchByNamedAttributeDecimalRespectsLocaleDecimalSeparator(): void
+    {
+        $config = config(OSPOS::class);
+        $originalLocale = $config->settings['number_locale'];
+        $originalDecimals = $config->settings['currency_decimals'];
+        $config->settings['number_locale'] = 'de_DE';
+        $config->settings['currency_decimals'] = 2;
+
+        try {
+            $priceDefinitionId = $this->createAttributeDefinition('LocalePrice ' . uniqid(), DECIMAL);
+
+            $matchingId = $this->createSearchableItem(['name' => 'Locale Decimal Match ' . uniqid()]);
+            $this->linkTypedAttributeValue($matchingId, $priceDefinitionId, '19.99', DECIMAL);
+
+            $filters = $this->defaultSearchFilters([
+                'search_custom'  => true,
+                'definition_ids' => [$priceDefinitionId],
+            ]);
+
+            $priceAttrName = $this->getDefinitionName($priceDefinitionId);
+
+            // Comma decimal separator, matching the de_DE locale, should parse and match.
+            $commaResults = $this->item->search("{$priceAttrName}:19,99", $filters)->getResult();
+            $commaIds = array_map(static fn ($item) => (int) $item->item_id, $commaResults);
+            $this->assertContains($matchingId, $commaIds);
+        } finally {
+            $config->settings['number_locale'] = $originalLocale;
+            $config->settings['currency_decimals'] = $originalDecimals;
+        }
+    }
+
+    public function testSearchByUnknownNamedAttributeDoesNotReturnAllItems(): void
+    {
+        $definitionId = $this->createAttributeDefinition('Known ' . uniqid());
+        $knownAttrName = $this->getDefinitionName($definitionId);
+
+        $this->createSearchableItem(['name' => 'Unrelated Item ' . uniqid()]);
+        $this->createSearchableItem(['name' => 'Another Unrelated Item ' . uniqid()]);
+
+        $filters = $this->defaultSearchFilters([
+            'search_custom'  => true,
+            'definition_ids' => [$definitionId],
+        ]);
+
+        $results = $this->item->search("{$knownAttrName}:nomatch nosuchattr:{$knownAttrName}", $filters)->getResult();
+
+        $this->assertCount(0, $results);
+    }
+
+    private function getDefinitionName(int $definitionId): string
+    {
+        return db_connect()->table('attribute_definitions')
+            ->select('definition_name')
+            ->where('definition_id', $definitionId)
+            ->get()
+            ->getRow()
+            ->definition_name;
+    }
+}
diff --git a/tests/Models/ItemTaxesMultipleTest.php b/tests/Models/ItemTaxesMultipleTest.php
new file mode 100644
index 000000000..e820d005f
--- /dev/null
+++ b/tests/Models/ItemTaxesMultipleTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Tests\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use App\Models\Item_taxes;
+use Config\Database;
+use Tests\Support\ItemSearchFixtureTrait;
+
+class ItemTaxesMultipleTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use ItemSearchFixtureTrait;
+
+    protected $migrate = true;
+    protected $migrateOnce = true;
+    protected $seed = '';
+    protected $seedOnce = true;
+    protected $refresh = true;
+    protected $namespace = null;
+
+    protected $item_taxes;
+
+    public static function setUpBeforeClass(): void
+    {
+        $seeder = Database::seeder('tests');
+        $seeder->call('TestDatabaseBootstrapSeeder');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->item_taxes = model(Item_taxes::class);
+    }
+
+    public function testGetInfoMultipleReturnsTaxesGroupedByItemId(): void
+    {
+        $itemOneId = $this->createSearchableItem();
+        $itemTwoId = $this->createSearchableItem();
+
+        $itemOneTaxes = [['name' => 'VAT', 'percent' => 20]];
+        $itemTwoTaxes = [['name' => 'GST', 'percent' => 10]];
+
+        $this->item_taxes->save_value($itemOneTaxes, $itemOneId);
+        $this->item_taxes->save_value($itemTwoTaxes, $itemTwoId);
+
+        $result = $this->item_taxes->getInfoMultiple([$itemOneId, $itemTwoId]);
+
+        $this->assertArrayHasKey($itemOneId, $result);
+        $this->assertArrayHasKey($itemTwoId, $result);
+        $this->assertCount(1, $result[$itemOneId]);
+        $this->assertCount(1, $result[$itemTwoId]);
+        $this->assertEquals('VAT', $result[$itemOneId][0]['name']);
+        $this->assertEquals('GST', $result[$itemTwoId][0]['name']);
+    }
+
+    public function testGetInfoMultipleItemWithNoTaxesOmittedFromResult(): void
+    {
+        $itemWithTaxesId = $this->createSearchableItem();
+        $itemWithoutTaxesId = $this->createSearchableItem();
+
+        $taxes = [['name' => 'VAT', 'percent' => 20]];
+        $this->item_taxes->save_value($taxes, $itemWithTaxesId);
+
+        $result = $this->item_taxes->getInfoMultiple([$itemWithTaxesId, $itemWithoutTaxesId]);
+
+        $this->assertArrayHasKey($itemWithTaxesId, $result);
+        $this->assertArrayNotHasKey($itemWithoutTaxesId, $result);
+    }
+
+    public function testGetInfoMultipleEmptyItemIdsReturnsEmptyArray(): void
+    {
+        $result = $this->item_taxes->getInfoMultiple([]);
+
+        $this->assertSame([], $result);
+    }
+}
diff --git a/tests/Models/ItemTest.php b/tests/Models/ItemTest.php
new file mode 100644
index 000000000..4e50567e9
--- /dev/null
+++ b/tests/Models/ItemTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Tests\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use App\Models\Item;
+
+class ItemTest extends CIUnitTestCase
+{
+    public function testSuggestionsColumnValidationRejectsSQLInjection(): void
+    {
+        // These malicious values should not be in the allowed columns list
+        $malicious_columns = [
+            'name, SLEEP(5)',
+            'name; DROP TABLE items',
+            "name' OR '1'='1",
+            'name UNION SELECT * FROM users',
+            'name--comment'
+        ];
+
+        foreach ($malicious_columns as $malicious) {
+            $this->assertNotContains($malicious, Item::ALLOWED_SUGGESTIONS_COLUMNS,
+                "Malicious input should not be in allowed columns: $malicious");
+        }
+    }
+
+    public function testSuggestionsColumnValidationAcceptsValidColumns(): void
+    {
+        // Valid columns should be preserved
+        $valid_columns = ['name', 'item_number', 'description', 'cost_price', 'unit_price'];
+
+        foreach ($valid_columns as $column) {
+            $this->assertContains($column, Item::ALLOWED_SUGGESTIONS_COLUMNS,
+                "Valid column should be in allowed list: $column");
+        }
+    }
+
+    public function testSuggestionsColumnValidationHandlesEmptyString(): void
+    {
+        // Empty string should only be allowed for second and third columns
+        $this->assertContains('', Item::ALLOWED_SUGGESTIONS_COLUMNS_WITH_EMPTY,
+            'Empty string should be allowed for optional columns');
+    }
+
+    public function testSuggestionsColumnValidationConstantsAreConsistent(): void
+    {
+        // Ensure the constants are properly defined
+        $this->assertCount(5, Item::ALLOWED_SUGGESTIONS_COLUMNS,
+            'Should have exactly 5 allowed columns');
+        $this->assertCount(6, Item::ALLOWED_SUGGESTIONS_COLUMNS_WITH_EMPTY,
+            'Should have exactly 6 allowed columns including empty');
+
+        // Ensure empty string is only in WITH_EMPTY variant
+        $this->assertNotContains('', Item::ALLOWED_SUGGESTIONS_COLUMNS,
+            'Empty string should not be in required columns list');
+    }
+}
diff --git a/tests/Models/ReceivingTest.php b/tests/Models/ReceivingTest.php
new file mode 100644
index 000000000..318727b09
--- /dev/null
+++ b/tests/Models/ReceivingTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Tests\Models;
+
+use App\Models\Receiving;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\EmployeeFixtureTrait;
+use Tests\Support\ItemFixtureTrait;
+
+/**
+ * Regression tests: Receiving::delete_value() must
+ * correctly reverse the stock quantity change it applied via
+ * Item_quantity::changeQuantity(), using the same atomic upsert as the
+ * sale-checkout and sale-cancel paths.
+ */
+class ReceivingTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use EmployeeFixtureTrait;
+    use ItemFixtureTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $refresh     = true;
+    protected $namespace   = null;
+
+    private const LOCATION_ID = 1;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function createSupplier(): int
+    {
+        $db = \Config\Database::connect();
+
+        $db->table('people')->insert([
+            'first_name'   => 'Test',
+            'last_name'    => 'Supplier',
+            'phone_number' => '555-0400',
+            'email'        => 'supplier-' . uniqid() . '@test.com',
+            'address_1'    => '',
+            'address_2'    => '',
+            'city'         => '',
+            'state'        => '',
+            'zip'          => '',
+            'country'      => '',
+            'comments'     => '',
+        ]);
+        $personId = (int) $db->insertID();
+
+        $db->table('suppliers')->insert([
+            'person_id' => $personId,
+            'deleted'   => 0,
+        ]);
+
+        return $personId;
+    }
+
+    protected function buildReceivingLine(int $itemId, float $quantity, float $costPrice): array
+    {
+        return [
+            0 => [
+                'item_id'            => $itemId,
+                'line'               => 0,
+                'description'        => 'Test Item',
+                'serialnumber'       => '',
+                'quantity'           => $quantity,
+                'receiving_quantity' => 1,
+                'discount'           => 0,
+                'discount_type'      => 0,
+                'price'              => $costPrice,
+                'item_location'      => self::LOCATION_ID,
+            ],
+        ];
+    }
+
+    public function testDeleteValueRestoresStockAfterReceiving(): void
+    {
+        $employeeId = $this->createEmployee();
+        $supplierId = $this->createSupplier();
+        $itemId     = $this->createTestItem(HAS_STOCK);
+
+        // Deliberately no pre-existing item_quantities row for this item/location.
+
+        $receivingModel = model(Receiving::class);
+        $items          = $this->buildReceivingLine($itemId, 5, 1.00);
+
+        $receivingId = $receivingModel->save_value(
+            $items,
+            $supplierId,
+            $employeeId,
+            'test receiving',
+            'REF-' . uniqid(),
+            'Cash'
+        );
+
+        $this->assertGreaterThan(0, $receivingId);
+        $this->assertEqualsWithDelta(5.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+
+        $deleteResult = $receivingModel->delete_value($receivingId, $employeeId, true);
+
+        $this->assertTrue($deleteResult);
+        $this->assertEqualsWithDelta(0.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+    }
+}
diff --git a/tests/Models/Reports/Summary_taxes_test.php b/tests/Models/Reports/Summary_taxes_test.php
new file mode 100644
index 000000000..ddbb43cb5
--- /dev/null
+++ b/tests/Models/Reports/Summary_taxes_test.php
@@ -0,0 +1,282 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Models\Reports;
+
+use App\Models\Reports\Summary_taxes;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+class Summary_taxes_test extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected $migrate = true;
+    protected $migrateOnce = true;
+    protected $refresh = false;
+    protected $namespace = null;
+
+    private array $seededSaleIds = [];
+    private array $seededItemIds = [];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->seedTestData();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->cleanupTestData();
+        parent::tearDown();
+    }
+
+    private function seedTestData(): void
+    {
+        $db = \Config\Database::connect();
+        $prefix = $db->DBPrefix;
+
+        $now = date('Y-m-d H:i:s');
+
+        $itemData = [
+            ['name' => 'Test Item Tax Test 1', 'category' => 'Test', 'supplier_id' => 1, 'item_number' => 'TEST001', 'description' => 'Test item for tax report', 'cost_price' => 10.00, 'unit_price' => 100.00, 'reorder_level' => 0, 'receiving_quantity' => 1, 'stock_type' => 0, 'item_type' => 0, 'tax_category_id' => 1, 'deleted' => 0],
+            ['name' => 'Test Item Tax Test 2', 'category' => 'Test', 'supplier_id' => 1, 'item_number' => 'TEST002', 'description' => 'Test item for tax report', 'cost_price' => 20.00, 'unit_price' => 200.00, 'reorder_level' => 0, 'receiving_quantity' => 1, 'stock_type' => 0, 'item_type' => 0, 'tax_category_id' => 1, 'deleted' => 0],
+        ];
+
+        foreach ($itemData as $item) {
+            $db->table($prefix . 'items')->insert($item);
+            $this->seededItemIds[] = $db->insertID();
+        }
+
+        $saleData = [
+            ['sale_time' => $now, 'customer_id' => 1, 'employee_id' => 1, 'comment' => 'Test sale 1', 'sale_status' => 1, 'invoice_number' => 'TEST-INV-001', 'sale_type' => 0],
+            ['sale_time' => $now, 'customer_id' => 1, 'employee_id' => 1, 'comment' => 'Test sale 2', 'sale_status' => 1, 'invoice_number' => 'TEST-INV-002', 'sale_type' => 0],
+            ['sale_time' => $now, 'customer_id' => 1, 'employee_id' => 1, 'comment' => 'Test sale 3', 'sale_status' => 1, 'invoice_number' => 'TEST-INV-003', 'sale_type' => 0],
+        ];
+
+        foreach ($saleData as $sale) {
+            $db->table($prefix . 'sales')->insert($sale);
+            $this->seededSaleIds[] = $db->insertID();
+        }
+
+        $salesItemsData = [
+            ['sale_id' => $this->seededSaleIds[0], 'item_id' => $this->seededItemIds[0], 'line' => 1, 'description' => 'Item 1', 'quantity_purchased' => 1, 'item_unit_price' => 100.00, 'discount' => 0, 'discount_type' => 0, 'item_cost_price' => 50.00],
+            ['sale_id' => $this->seededSaleIds[0], 'item_id' => $this->seededItemIds[1], 'line' => 2, 'description' => 'Item 2', 'quantity_purchased' => 2, 'item_unit_price' => 50.00, 'discount' => 0, 'discount_type' => 0, 'item_cost_price' => 25.00],
+            ['sale_id' => $this->seededSaleIds[1], 'item_id' => $this->seededItemIds[0], 'line' => 1, 'description' => 'Item 1', 'quantity_purchased' => 1, 'item_unit_price' => 110.00, 'discount' => 10, 'discount_type' => 0, 'item_cost_price' => 55.00],
+            ['sale_id' => $this->seededSaleIds[2], 'item_id' => $this->seededItemIds[1], 'line' => 1, 'description' => 'Item 2', 'quantity_purchased' => 1, 'item_unit_price' => 200.00, 'discount' => 0, 'discount_type' => 0, 'item_cost_price' => 100.00],
+        ];
+
+        foreach ($salesItemsData as $item) {
+            $db->table($prefix . 'sales_items')->insert($item);
+        }
+
+        $salesItemsTaxesData = [
+            ['sale_id' => $this->seededSaleIds[0], 'item_id' => $this->seededItemIds[0], 'line' => 1, 'name' => 'VAT', 'percent' => 10.00, 'item_tax_amount' => 10.00],
+            ['sale_id' => $this->seededSaleIds[0], 'item_id' => $this->seededItemIds[1], 'line' => 2, 'name' => 'VAT', 'percent' => 10.00, 'item_tax_amount' => 10.00],
+            ['sale_id' => $this->seededSaleIds[1], 'item_id' => $this->seededItemIds[0], 'line' => 1, 'name' => 'VAT', 'percent' => 10.00, 'item_tax_amount' => 11.00],
+            ['sale_id' => $this->seededSaleIds[2], 'item_id' => $this->seededItemIds[1], 'line' => 1, 'name' => 'Sales Tax', 'percent' => 8.00, 'item_tax_amount' => 16.00],
+        ];
+
+        foreach ($salesItemsTaxesData as $tax) {
+            $db->table($prefix . 'sales_items_taxes')->insert($tax);
+        }
+    }
+
+    private function cleanupTestData(): void
+    {
+        $db = \Config\Database::connect();
+        $prefix = $db->DBPrefix;
+
+        if (!empty($this->seededSaleIds)) {
+            $db->table($prefix . 'sales_items_taxes')
+                ->whereIn('sale_id', $this->seededSaleIds)
+                ->delete();
+            $db->table($prefix . 'sales_items')
+                ->whereIn('sale_id', $this->seededSaleIds)
+                ->delete();
+            $db->table($prefix . 'sales')
+                ->whereIn('sale_id', $this->seededSaleIds)
+                ->delete();
+        }
+
+        if (!empty($this->seededItemIds)) {
+            $db->table($prefix . 'items')
+                ->whereIn('item_id', $this->seededItemIds)
+                ->delete();
+        }
+
+        $this->seededSaleIds = [];
+        $this->seededItemIds = [];
+    }
+
+    public function testGetDataReturnsArray(): void
+    {
+        $model = model(Summary_taxes::class);
+        $inputs = $this->getTestInputs();
+
+        $result = $model->getData($inputs);
+
+        $this->assertIsArray($result);
+    }
+
+    public function testGetDataHasExpectedColumns(): void
+    {
+        $model = model(Summary_taxes::class);
+        $inputs = $this->getTestInputs();
+
+        $result = $model->getData($inputs);
+
+        $this->assertGreaterThan(0, count($result), 'Should have tax data from seeded sales');
+
+        $row = $result[0];
+        $this->assertArrayHasKey('name', $row);
+        $this->assertArrayHasKey('percent', $row);
+        $this->assertArrayHasKey('count', $row);
+        $this->assertArrayHasKey('subtotal', $row);
+        $this->assertArrayHasKey('tax', $row);
+        $this->assertArrayHasKey('total', $row);
+    }
+
+    public function testGetSummaryDataReturnsArray(): void
+    {
+        $model = model(Summary_taxes::class);
+        $inputs = $this->getTestInputs();
+
+        $result = $model->getSummaryData($inputs);
+
+        $this->assertIsArray($result);
+    }
+
+    public function testGetSummaryDataHasExpectedKeys(): void
+    {
+        $model = model(Summary_taxes::class);
+        $inputs = $this->getTestInputs();
+
+        $result = $model->getSummaryData($inputs);
+
+        $this->assertArrayHasKey('subtotal', $result);
+        $this->assertArrayHasKey('tax', $result);
+        $this->assertArrayHasKey('total', $result);
+        $this->assertArrayHasKey('count', $result);
+    }
+
+    public function testSummaryDataMatchesSumOfDataRows(): void
+    {
+        $model = model(Summary_taxes::class);
+        $inputs = $this->getTestInputs();
+
+        $data = $model->getData($inputs);
+        $summary = $model->getSummaryData($inputs);
+
+        $this->assertGreaterThan(0, count($data), 'Should have tax data from seeded sales');
+
+        $subtotalSum = 0;
+        $taxSum = 0;
+        $totalSum = 0;
+        $countSum = 0;
+
+        foreach ($data as $row) {
+            $subtotalSum += (float) $row['subtotal'];
+            $taxSum += (float) $row['tax'];
+            $totalSum += (float) $row['total'];
+            $countSum += (int) $row['count'];
+        }
+
+        $decimals = 2;
+
+        $this->assertEqualsWithDelta(
+            round($subtotalSum, $decimals),
+            $summary['subtotal'],
+            0.01,
+            'Summary subtotal should equal sum of row subtotals'
+        );
+
+        $this->assertEqualsWithDelta(
+            round($taxSum, $decimals),
+            $summary['tax'],
+            0.01,
+            'Summary tax should equal sum of row taxes'
+        );
+
+        $this->assertEqualsWithDelta(
+            round($totalSum, $decimals),
+            $summary['total'],
+            0.01,
+            'Summary total should equal sum of row totals'
+        );
+
+        $this->assertEquals(
+            $countSum,
+            $summary['count'],
+            'Summary count should equal sum of row counts'
+        );
+    }
+
+    public function testRowSubtotalPlusTaxEqualsTotal(): void
+    {
+        $model = model(Summary_taxes::class);
+        $inputs = $this->getTestInputs();
+
+        $data = $model->getData($inputs);
+
+        $this->assertGreaterThan(0, count($data), 'Should have tax data from seeded sales');
+
+        foreach ($data as $row) {
+            $subtotal = (float) $row['subtotal'];
+            $tax = (float) $row['tax'];
+            $total = (float) $row['total'];
+            $calculatedTotal = round($subtotal + $tax, 2);
+
+            $this->assertEqualsWithDelta(
+                $total,
+                $calculatedTotal,
+                0.01,
+                "Row subtotal + tax should equal total for tax {$row['name']} ({$row['percent']}): subtotal={$subtotal}, tax={$tax}, total={$total}"
+            );
+        }
+    }
+
+    public function testGetDataColumnsReturnsExpectedStructure(): void
+    {
+        $model = model(Summary_taxes::class);
+
+        $columns = $model->getDataColumns();
+
+        $this->assertIsArray($columns);
+        $this->assertCount(6, $columns);
+
+        $expectedKeys = ['tax_name', 'tax_percent', 'report_count', 'subtotal', 'tax', 'total'];
+        foreach ($columns as $index => $column) {
+            $key = array_key_first($column);
+            $this->assertEquals($expectedKeys[$index], $key);
+        }
+    }
+
+    public function testTaxDataIsGroupedByTaxNameAndPercent(): void
+    {
+        $model = model(Summary_taxes::class);
+        $inputs = $this->getTestInputs();
+
+        $data = $model->getData($inputs);
+
+        $this->assertGreaterThan(0, count($data), 'Should have tax data from seeded sales');
+
+        $taxGroups = [];
+        foreach ($data as $row) {
+            $key = $row['name'] . '|' . $row['percent'];
+            $this->assertArrayNotHasKey($key, $taxGroups, "Each tax name+percent combination should appear only once in results");
+            $taxGroups[$key] = true;
+        }
+    }
+
+    private function getTestInputs(): array
+    {
+        return [
+            'start_date' => date('Y-m-d', strtotime('-1 day')),
+            'end_date' => date('Y-m-d', strtotime('+1 day')),
+            'sale_type' => 'complete',
+            'location_id' => 'all'
+        ];
+    }
+}
\ No newline at end of file
diff --git a/tests/Models/SaleTest.php b/tests/Models/SaleTest.php
new file mode 100644
index 000000000..aff3b79c5
--- /dev/null
+++ b/tests/Models/SaleTest.php
@@ -0,0 +1,437 @@
+<?php
+
+namespace Tests\Models;
+
+use App\Models\Sale;
+use CodeIgniter\Database\Config;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\EmployeeFixtureTrait;
+use Tests\Support\ItemFixtureTrait;
+
+/**
+ * Regression tests: Sale::save_value() must reject
+ * (and roll back) a payment that would overdraw a gift card or a customer's
+ * reward points, instead of silently applying a stale/negative balance.
+ */
+class SaleTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use EmployeeFixtureTrait;
+    use ItemFixtureTrait;
+
+    protected $migrate     = true;
+    protected $migrateOnce = true;
+    protected $seedOnce    = true;
+    protected $refresh     = false;
+    protected $namespace   = null;
+
+    private static bool $doneBootstrap = false;
+
+    private const LOCATION_ID = 1;
+
+    protected function setUp(): void
+    {
+        if (self::$doneBootstrap === false) {
+            Config::seeder($this->DBGroup)->call('App\Database\Seeds\TestDatabaseBootstrapSeeder');
+            Config::connect($this->DBGroup)->close();
+
+            self::$doneBootstrap = true;
+        }
+
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+    }
+
+    protected function createGiftcard(float $value): int
+    {
+        $giftcardNumber = random_int(1000000, 9999999);
+
+        \Config\Database::connect()->table('giftcards')->insert([
+            'giftcard_number' => $giftcardNumber,
+            'value'           => $value,
+            'deleted'         => 0,
+            'person_id'       => null,
+        ]);
+
+        return $giftcardNumber;
+    }
+
+    protected function createCustomerWithPoints(int $points): int
+    {
+        $db = \Config\Database::connect();
+
+        $db->table('people')->insert([
+            'first_name'   => 'Reward',
+            'last_name'    => 'Customer',
+            'phone_number' => '555-0300',
+            'email'        => 'customer-' . uniqid() . '@test.com',
+            'address_1'    => '',
+            'address_2'    => '',
+            'city'         => '',
+            'state'        => '',
+            'zip'          => '',
+            'country'      => '',
+            'comments'     => '',
+        ]);
+        $personId = (int) $db->insertID();
+
+        $db->table('customers')->insert([
+            'person_id'   => $personId,
+            'employee_id' => 1,
+            'points'      => $points,
+        ]);
+
+        return $personId;
+    }
+
+    protected function buildCartLine(int $itemId, float $quantity, float $price): array
+    {
+        return [
+            0 => [
+                'item_id'       => $itemId,
+                'line'          => 0,
+                'description'   => 'Test Item',
+                'serialnumber'  => '',
+                'quantity'      => $quantity,
+                'discount'      => 0,
+                'discount_type' => 0,
+                'cost_price'    => 1.00,
+                'price'         => $price,
+                'item_location' => self::LOCATION_ID,
+                'print_option'  => 0,
+            ],
+        ];
+    }
+
+    protected function countSalesRows(): int
+    {
+        return \Config\Database::connect()->table('sales')->countAllResults();
+    }
+
+    protected function getGiftcardValue(int $giftcardNumber): float
+    {
+        $row = \Config\Database::connect()->table('giftcards')
+            ->where('giftcard_number', $giftcardNumber)
+            ->get()
+            ->getRow();
+
+        return (float) $row->value;
+    }
+
+    protected function getCustomerPoints(int $personId): int
+    {
+        $row = \Config\Database::connect()->table('customers')
+            ->where('person_id', $personId)
+            ->get()
+            ->getRow();
+
+        return (int) $row->points;
+    }
+
+    public function testSaveValueSucceedsWithSufficientGiftcardBalance(): void
+    {
+        $employeeId     = $this->createEmployee();
+        $giftcardNumber = $this->createGiftcard(100.00);
+        $itemId         = $this->createTestItem(HAS_NO_STOCK);
+
+        $saleModel  = model(Sale::class);
+        $saleStatus = COMPLETED;
+        $items      = $this->buildCartLine($itemId, 1, 60.00);
+        $payments   = [
+            0 => [
+                'payment_type'    => lang('Sales.giftcard') . ':' . $giftcardNumber,
+                'payment_amount'  => 60.00,
+                'cash_refund'     => 0,
+                'cash_adjustment' => 0,
+                'reference_code'  => null,
+            ],
+        ];
+        $salesTaxes = [[], []];
+
+        $result = $saleModel->save_value(
+            NEW_ENTRY,
+            $saleStatus,
+            $items,
+            NEW_ENTRY,
+            $employeeId,
+            'test sale',
+            null,
+            null,
+            null,
+            SALE_TYPE_POS,
+            $payments,
+            null,
+            $salesTaxes
+        );
+
+        $this->assertGreaterThan(0, $result);
+        $this->assertEqualsWithDelta(40.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testSaveValueDoesNotMatchGiftcardSinkOnSubstringOnly(): void
+    {
+        $employeeId     = $this->createEmployee();
+        $giftcardNumber = $this->createGiftcard(100.00);
+        $itemId         = $this->createTestItem(HAS_NO_STOCK);
+
+        $saleModel  = model(Sale::class);
+        $saleStatus = COMPLETED;
+        $items      = $this->buildCartLine($itemId, 1, 60.00);
+        $payments   = [
+            0 => [
+                'payment_type'    => 'Foo ' . lang('Sales.giftcard') . ':' . $giftcardNumber,
+                'payment_amount'  => 60.00,
+                'cash_refund'     => 0,
+                'cash_adjustment' => 0,
+                'reference_code'  => null,
+            ],
+        ];
+        $salesTaxes = [[], []];
+
+        $result = $saleModel->save_value(
+            NEW_ENTRY,
+            $saleStatus,
+            $items,
+            NEW_ENTRY,
+            $employeeId,
+            'test sale',
+            null,
+            null,
+            null,
+            SALE_TYPE_POS,
+            $payments,
+            null,
+            $salesTaxes
+        );
+
+        $this->assertGreaterThan(0, $result);
+        $this->assertEqualsWithDelta(100.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+    }
+
+    public function testSaveValueReturnsInsufficientGiftcardBalanceSentinel(): void
+    {
+        $employeeId     = $this->createEmployee();
+        $giftcardNumber = $this->createGiftcard(50.00);
+        $itemId         = $this->createTestItem(HAS_NO_STOCK);
+
+        $salesCountBefore = $this->countSalesRows();
+
+        $saleModel  = model(Sale::class);
+        $saleStatus = COMPLETED;
+        $items      = $this->buildCartLine($itemId, 1, 60.00);
+        $payments   = [
+            0 => [
+                'payment_type'    => lang('Sales.giftcard') . ':' . $giftcardNumber,
+                'payment_amount'  => 60.00,
+                'cash_refund'     => 0,
+                'cash_adjustment' => 0,
+                'reference_code'  => null,
+            ],
+        ];
+        $salesTaxes = [[], []];
+
+        $result = $saleModel->save_value(
+            NEW_ENTRY,
+            $saleStatus,
+            $items,
+            NEW_ENTRY,
+            $employeeId,
+            'test sale',
+            null,
+            null,
+            null,
+            SALE_TYPE_POS,
+            $payments,
+            null,
+            $salesTaxes
+        );
+
+        $this->assertSame(INSUFFICIENT_GIFTCARD_BALANCE, $result);
+        $this->assertEqualsWithDelta(50.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+        $this->assertSame($salesCountBefore, $this->countSalesRows());
+    }
+
+    public function testSaveValueReturnsInsufficientRewardPointsSentinel(): void
+    {
+        $employeeId = $this->createEmployee();
+        $customerId = $this->createCustomerWithPoints(20);
+        $itemId     = $this->createTestItem(HAS_NO_STOCK);
+
+        $salesCountBefore = $this->countSalesRows();
+
+        $saleModel  = model(Sale::class);
+        $saleStatus = COMPLETED;
+        $items      = $this->buildCartLine($itemId, 1, 60.00);
+        $payments   = [
+            0 => [
+                'payment_type'    => lang('Sales.rewards'),
+                'payment_amount'  => 40.00,
+                'cash_refund'     => 0,
+                'cash_adjustment' => 0,
+                'reference_code'  => null,
+            ],
+        ];
+        $salesTaxes = [[], []];
+
+        $result = $saleModel->save_value(
+            NEW_ENTRY,
+            $saleStatus,
+            $items,
+            $customerId,
+            $employeeId,
+            'test sale',
+            null,
+            null,
+            null,
+            SALE_TYPE_POS,
+            $payments,
+            null,
+            $salesTaxes
+        );
+
+        $this->assertSame(INSUFFICIENT_REWARD_POINTS, $result);
+        $this->assertSame(20, $this->getCustomerPoints($customerId));
+        $this->assertSame($salesCountBefore, $this->countSalesRows());
+    }
+
+    public function testSaveValueDecrementsStockOnCompletedSale(): void
+    {
+        $employeeId = $this->createEmployee();
+        $itemId     = $this->createTestItem(HAS_STOCK);
+
+        \Config\Database::connect()->table('item_quantities')->insert([
+            'item_id'     => $itemId,
+            'location_id' => self::LOCATION_ID,
+            'quantity'    => 10,
+        ]);
+
+        $saleModel  = model(Sale::class);
+        $saleStatus = COMPLETED;
+        $items      = $this->buildCartLine($itemId, 3, 5.00);
+        $payments   = [
+            0 => [
+                'payment_type'    => lang('Sales.cash'),
+                'payment_amount'  => 15.00,
+                'cash_refund'     => 0,
+                'cash_adjustment' => 0,
+                'reference_code'  => null,
+            ],
+        ];
+        $salesTaxes = [[], []];
+
+        $result = $saleModel->save_value(
+            NEW_ENTRY,
+            $saleStatus,
+            $items,
+            NEW_ENTRY,
+            $employeeId,
+            'test sale',
+            null,
+            null,
+            null,
+            SALE_TYPE_POS,
+            $payments,
+            null,
+            $salesTaxes
+        );
+
+        $this->assertGreaterThan(0, $result);
+        $this->assertEqualsWithDelta(7.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+    }
+
+    public function testSaveValueDecrementsStockOnCompletedSaleWhenNoQuantityRowExists(): void
+    {
+        $employeeId = $this->createEmployee();
+        $itemId     = $this->createTestItem(HAS_STOCK);
+
+        // Deliberately no item_quantities row inserted for this item/location.
+
+        $saleModel  = model(Sale::class);
+        $saleStatus = COMPLETED;
+        $items      = $this->buildCartLine($itemId, 3, 5.00);
+        $payments   = [
+            0 => [
+                'payment_type'    => lang('Sales.cash'),
+                'payment_amount'  => 15.00,
+                'cash_refund'     => 0,
+                'cash_adjustment' => 0,
+                'reference_code'  => null,
+            ],
+        ];
+        $salesTaxes = [[], []];
+
+        $result = $saleModel->save_value(
+            NEW_ENTRY,
+            $saleStatus,
+            $items,
+            NEW_ENTRY,
+            $employeeId,
+            'test sale',
+            null,
+            null,
+            null,
+            SALE_TYPE_POS,
+            $payments,
+            null,
+            $salesTaxes
+        );
+
+        $this->assertGreaterThan(0, $result);
+        $this->assertEqualsWithDelta(-3.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+    }
+
+    public function testDeleteRestoresStockOnCanceledSale(): void
+    {
+        $employeeId = $this->createEmployee();
+        $itemId     = $this->createTestItem(HAS_STOCK);
+
+        \Config\Database::connect()->table('item_quantities')->insert([
+            'item_id'     => $itemId,
+            'location_id' => self::LOCATION_ID,
+            'quantity'    => 10,
+        ]);
+
+        $saleModel  = model(Sale::class);
+        $saleStatus = COMPLETED;
+        $items      = $this->buildCartLine($itemId, 3, 5.00);
+        $payments   = [
+            0 => [
+                'payment_type'    => lang('Sales.cash'),
+                'payment_amount'  => 15.00,
+                'cash_refund'     => 0,
+                'cash_adjustment' => 0,
+                'reference_code'  => null,
+            ],
+        ];
+        $salesTaxes = [[], []];
+
+        $saleId = $saleModel->save_value(
+            NEW_ENTRY,
+            $saleStatus,
+            $items,
+            NEW_ENTRY,
+            $employeeId,
+            'test sale',
+            null,
+            null,
+            null,
+            SALE_TYPE_POS,
+            $payments,
+            null,
+            $salesTaxes
+        );
+
+        $this->assertGreaterThan(0, $saleId);
+        $this->assertEqualsWithDelta(7.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+
+        $deleteResult = $saleModel->delete($saleId, false, true, $employeeId);
+
+        $this->assertTrue($deleteResult);
+        $this->assertEqualsWithDelta(10.0, $this->getItemQuantity($itemId, self::LOCATION_ID), 0.001);
+    }
+}
diff --git a/tests/Support/ConcurrentDbRaceTrait.php b/tests/Support/ConcurrentDbRaceTrait.php
new file mode 100644
index 000000000..e0c236091
--- /dev/null
+++ b/tests/Support/ConcurrentDbRaceTrait.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace Tests\Support;
+
+use RuntimeException;
+
+/**
+ * Races two raw SQL statements against each other over two independent
+ * mysqli connections, using MYSQLI_ASYNC so both are in flight before either
+ * resolves. This exercises real database row-level locking instead of
+ * simulating concurrency with two sequential calls on one connection.
+ */
+trait ConcurrentDbRaceTrait
+{
+    /**
+     * @return array{0: int, 1: int} affected_rows for [sql1, sql2]
+     */
+    protected function raceTwoUpdates(string $sql1, string $sql2): array
+    {
+        $config = config('Database')->tests;
+
+        $link1 = mysqli_connect($config['hostname'], $config['username'], $config['password'], $config['database'], $config['port']);
+        $link2 = mysqli_connect($config['hostname'], $config['username'], $config['password'], $config['database'], $config['port']);
+
+        mysqli_query($link1, $sql1, MYSQLI_ASYNC);
+        mysqli_query($link2, $sql2, MYSQLI_ASYNC);
+
+        try {
+            $pending  = [$link1, $link2];
+            $deadline = hrtime(true) + 10_000_000_000;
+
+            while ($pending !== []) {
+                if (hrtime(true) >= $deadline) {
+                    throw new RuntimeException('mysqli_poll failed to resolve pending queries before deadline');
+                }
+
+                $read = $pending;
+                $error = $pending;
+                $reject = $pending;
+
+                $ready = mysqli_poll($read, $error, $reject, 5);
+
+                if ($ready === false) {
+                    throw new RuntimeException('mysqli_poll returned false');
+                }
+
+                foreach (array_merge($read, $error, $reject) as $link) {
+                    if (mysqli_reap_async_query($link) === false) {
+                        throw new RuntimeException('mysqli_reap_async_query failed: ' . mysqli_error($link));
+                    }
+
+                    $pending = array_filter($pending, static fn ($pendingLink) => $pendingLink !== $link);
+                }
+            }
+
+            $affectedRows1 = mysqli_affected_rows($link1);
+            $affectedRows2 = mysqli_affected_rows($link2);
+        } finally {
+            mysqli_close($link1);
+            mysqli_close($link2);
+        }
+
+        return [$affectedRows1, $affectedRows2];
+    }
+
+    /**
+     * Races two model-method invocations against each other by running each
+     * in its own PHP CLI process (tests/Support/RaceWorker.php), so the two
+     * calls hit the database over genuinely separate connections at the same
+     * time instead of running sequentially on one connection.
+     *
+     * @return array{0: bool, 1: bool} return value of the model method for [call1, call2]
+     */
+    protected function raceTwoProcesses(string $method, array $args1, array $args2): array
+    {
+        $workerScript = __DIR__ . '/RaceWorker.php';
+        $php          = PHP_BINARY;
+
+        $descriptorSpec = [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+        ];
+
+        $command1 = array_merge([$php, $workerScript, $method], array_map('strval', $args1));
+        $command2 = array_merge([$php, $workerScript, $method], array_map('strval', $args2));
+
+        $readyFile1 = tempnam(sys_get_temp_dir(), 'race_ready_');
+        $readyFile2 = tempnam(sys_get_temp_dir(), 'race_ready_');
+        $goFile     = tempnam(sys_get_temp_dir(), 'race_go_');
+        unlink($readyFile1);
+        unlink($readyFile2);
+        unlink($goFile);
+
+        $baseEnv = array_filter($_SERVER, static fn ($value) => is_scalar($value));
+        $env1    = array_merge($baseEnv, ['RACE_READY_FILE' => $readyFile1, 'RACE_GO_FILE' => $goFile]);
+        $env2    = array_merge($baseEnv, ['RACE_READY_FILE' => $readyFile2, 'RACE_GO_FILE' => $goFile]);
+
+        $process1 = proc_open($command1, $descriptorSpec, $pipes1, ROOTPATH, $env1);
+        $process2 = proc_open($command2, $descriptorSpec, $pipes2, ROOTPATH, $env2);
+
+        fclose($pipes1[0]);
+        fclose($pipes2[0]);
+
+        stream_set_blocking($pipes1[1], false);
+        stream_set_blocking($pipes1[2], false);
+        stream_set_blocking($pipes2[1], false);
+        stream_set_blocking($pipes2[2], false);
+
+        try {
+            $deadline = microtime(true) + 5.0;
+
+            while (!file_exists($readyFile1) || !file_exists($readyFile2)) {
+                if (microtime(true) >= $deadline) {
+                    $status1 = proc_get_status($process1);
+                    $status2 = proc_get_status($process2);
+
+                    if ($status1['running']) {
+                        proc_terminate($process1);
+                    }
+
+                    if ($status2['running']) {
+                        proc_terminate($process2);
+                    }
+
+                    fclose($pipes1[1]);
+                    fclose($pipes1[2]);
+                    fclose($pipes2[1]);
+                    fclose($pipes2[2]);
+                    proc_close($process1);
+                    proc_close($process2);
+
+                    $waiting = array_filter([
+                        !file_exists($readyFile1) ? 'call 1' : null,
+                        !file_exists($readyFile2) ? 'call 2' : null,
+                    ]);
+
+                    throw new RuntimeException('race_worker.php failed to reach readiness barrier: ' . implode(', ', $waiting));
+                }
+
+                usleep(1000);
+            }
+
+            file_put_contents($goFile, '1');
+
+            $output1 = '';
+            $error1  = '';
+            $output2 = '';
+            $error2  = '';
+
+            $drain = static function () use ($pipes1, $pipes2, &$output1, &$error1, &$output2, &$error2): void {
+                $output1 .= stream_get_contents($pipes1[1]);
+                $error1  .= stream_get_contents($pipes1[2]);
+                $output2 .= stream_get_contents($pipes2[1]);
+                $error2  .= stream_get_contents($pipes2[2]);
+            };
+
+            $completionDeadline = microtime(true) + 10.0;
+            $exitCode1          = null;
+            $exitCode2          = null;
+
+            while (true) {
+                $drain();
+
+                $status1 = proc_get_status($process1);
+                $status2 = proc_get_status($process2);
+
+                if (!$status1['running'] && $exitCode1 === null) {
+                    $exitCode1 = $status1['exitcode'];
+                }
+
+                if (!$status2['running'] && $exitCode2 === null) {
+                    $exitCode2 = $status2['exitcode'];
+                }
+
+                if (!$status1['running'] && !$status2['running']) {
+                    $drain();
+                    break;
+                }
+
+                if (microtime(true) >= $completionDeadline) {
+                    if ($status1['running']) {
+                        proc_terminate($process1);
+                    }
+
+                    if ($status2['running']) {
+                        proc_terminate($process2);
+                    }
+
+                    fclose($pipes1[1]);
+                    fclose($pipes1[2]);
+                    fclose($pipes2[1]);
+                    fclose($pipes2[2]);
+                    proc_close($process1);
+                    proc_close($process2);
+
+                    $exitCode1 ??= -1;
+                    $exitCode2 ??= -1;
+
+                    $stillRunning = array_filter([
+                        $status1['running'] ? 'call 1' : null,
+                        $status2['running'] ? 'call 2' : null,
+                    ]);
+
+                    throw new RuntimeException('race_worker.php failed to complete before deadline: ' . implode(', ', $stillRunning));
+                }
+
+                usleep(1000);
+            }
+
+            fclose($pipes1[1]);
+            fclose($pipes1[2]);
+            proc_close($process1);
+
+            fclose($pipes2[1]);
+            fclose($pipes2[2]);
+            proc_close($process2);
+        } finally {
+            foreach ([$readyFile1, $readyFile2, $goFile] as $file) {
+                if (file_exists($file)) {
+                    unlink($file);
+                }
+            }
+        }
+
+        if ($exitCode1 !== 0) {
+            throw new RuntimeException("race_worker.php (call 1) exited with {$exitCode1}: {$error1}");
+        }
+
+        if ($exitCode2 !== 0) {
+            throw new RuntimeException("race_worker.php (call 2) exited with {$exitCode2}: {$error2}");
+        }
+
+        return [trim($output1) === '1', trim($output2) === '1'];
+    }
+}
diff --git a/tests/Support/EmployeeFixtureTrait.php b/tests/Support/EmployeeFixtureTrait.php
new file mode 100644
index 000000000..09279d2f7
--- /dev/null
+++ b/tests/Support/EmployeeFixtureTrait.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Employee;
+
+/**
+ * Shared factory for creating employees in test fixtures.
+ *
+ * All employees created via this trait route through
+ * {@see Employee::save_employee()}, which is the same code path the
+ * application itself uses. That keeps fixtures exercising the real
+ * validation and grant-handling logic instead of raw DB inserts.
+ *
+ * Every employee gets a unique email and username by default (uniqueness
+ * required because tests do not always run against a freshly-reset DB —
+ * see opensourcepos/opensourcepos#4626 for the root-cause history).
+ *
+ * Usage:
+ *
+ *   use Tests\Support\EmployeeFixtureTrait;
+ *
+ *   class FooTest extends CIUnitTestCase
+ *   {
+ *       use EmployeeFixtureTrait;
+ *
+ *       public function testSomething(): void
+ *       {
+ *           $personId = $this->createEmployee(
+ *               first_name: 'Cashier',
+ *               last_name:  'NoReports',
+ *               email:      'cashier.' . uniqid() . '@test.com',
+ *               username:   'cashier_' . uniqid(),
+ *               grants: [
+ *                   ['permission_id' => 'sales', 'menu_group' => 'home'],
+ *               ],
+ *           );
+ *       }
+ *   }
+ */
+trait EmployeeFixtureTrait
+{
+    /**
+     * Create a new employee (person + employee row + grants) via the
+     * application's own code path ({@see Employee::save_employee()}).
+     *
+     * @param string $first_name
+     * @param string $last_name
+     * @param null|string $email   unique email (auto-generated if omitted)
+     * @param null|string $username unique username (auto-generated if omitted)
+     * @param null|string $phone_number
+     * @param array $grants list of ['permission_id' => ..., 'menu_group' => ...]
+     * @param array $employee extra ospos_employees row overrides
+     *
+     * @return int the new person_id
+     */
+    protected function createEmployee(
+        string $first_name = 'Temp',
+        string $last_name = 'Employee',
+        ?string $email = null,
+        ?string $username = null,
+        ?string $phone_number = null,
+        array $grants = [],
+        array $employee = []
+    ): int {
+        if ($email === null) {
+            $email = 'employee.' . uniqid() . '@test.com';
+        }
+        if ($username === null) {
+            $username = 'employee_' . uniqid();
+        }
+        if ($phone_number === null) {
+            $phone_number = '';
+        }
+
+        $personData = [
+            'first_name'   => $first_name,
+            'last_name'    => $last_name,
+            'email'        => $email,
+            'phone_number' => $phone_number,
+        ];
+
+        $employeeData = array_merge([
+            'username'      => $username,
+            'password'      => password_hash('password123', PASSWORD_DEFAULT),
+            'hash_version'  => 2,
+            'language_code' => 'en',
+            'language'      => 'english',
+        ], $employee);
+
+        $model = model(Employee::class);
+        $this->assertTrue(
+            $model->save_employee($personData, $employeeData, $grants, NEW_ENTRY),
+            'createEmployee: save_employee() failed'
+        );
+        $this->assertArrayHasKey('person_id', $personData);
+
+        return (int) $personData['person_id'];
+    }
+
+    /**
+     * Variant of {@see self::createEmployee()} for tests that expect the
+     * save to fail (e.g. new-employee creation when DISALLOW_GRANT_CHANGE
+     * is true). Returns the raw save_employee() result without asserting.
+     */
+    protected function createEmployeeExpectingFailure(
+        string $first_name = 'Rejected',
+        string $last_name = 'Tester',
+        ?string $email = null,
+        ?string $username = null,
+        ?string $phone_number = null,
+        array $grants = [],
+        array $employee = []
+    ): bool {
+        if ($email === null) {
+            $email = 'employee.' . uniqid() . '@test.com';
+        }
+        if ($username === null) {
+            $username = 'employee_' . uniqid();
+        }
+        if ($phone_number === null) {
+            $phone_number = '';
+        }
+
+        $personData = [
+            'first_name'   => $first_name,
+            'last_name'    => $last_name,
+            'email'        => $email,
+            'phone_number' => $phone_number,
+        ];
+        $employeeData = array_merge([
+            'username'      => $username,
+            'password'      => password_hash('password123', PASSWORD_DEFAULT),
+            'hash_version'  => 2,
+            'language_code' => 'en',
+            'language'      => 'english',
+        ], $employee);
+
+        return model(Employee::class)->save_employee($personData, $employeeData, $grants, NEW_ENTRY);
+    }
+}
diff --git a/tests/Support/ItemFixtureTrait.php b/tests/Support/ItemFixtureTrait.php
new file mode 100644
index 000000000..90a9d23d7
--- /dev/null
+++ b/tests/Support/ItemFixtureTrait.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Item;
+use Config\Database;
+
+trait ItemFixtureTrait
+{
+    protected function createTestItem(int $stockType = HAS_STOCK): int
+    {
+        $itemData = [
+            'item_id'               => null,
+            'name'                  => 'Test Item',
+            'description'           => 'Test Item',
+            'category'              => 'Test Category',
+            'cost_price'            => 1.00,
+            'unit_price'            => 5.00,
+            'reorder_level'         => 0,
+            'item_number'           => 'TEST-' . uniqid(),
+            'allow_alt_description' => 0,
+            'is_serialized'         => 0,
+            'stock_type'            => $stockType,
+            'deleted'               => 0,
+        ];
+
+        $itemModel = model(Item::class);
+        $itemModel->save_value($itemData);
+
+        return (int) $itemData['item_id'];
+    }
+
+    protected function getItemQuantity(int $itemId, int $locationId): float
+    {
+        $row = Database::connect()->table('item_quantities')
+            ->where('item_id', $itemId)
+            ->where('location_id', $locationId)
+            ->get()
+            ->getRow();
+
+        return $row === null ? 0.0 : (float) $row->quantity;
+    }
+}
diff --git a/tests/Support/ItemSearchFixtureTrait.php b/tests/Support/ItemSearchFixtureTrait.php
new file mode 100644
index 000000000..b8a5e6b33
--- /dev/null
+++ b/tests/Support/ItemSearchFixtureTrait.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Attribute;
+use App\Models\Inventory;
+use App\Models\Item;
+use App\Models\Item_quantity;
+
+trait ItemSearchFixtureTrait
+{
+    protected function createSearchableItem(array $overrides = []): int
+    {
+        $itemData = array_merge([
+            'item_id'               => null,
+            'name'                  => 'Searchable Item ' . uniqid(),
+            'category'              => 'Test Category',
+            'cost_price'            => 1.00,
+            'unit_price'            => 5.00,
+            'reorder_level'         => 0,
+            'item_number'           => 'SEARCH-' . uniqid(),
+            'allow_alt_description' => 0,
+            'is_serialized'         => 0,
+            'item_type'             => ITEM,
+            'deleted'               => 0,
+        ], $overrides);
+
+        $itemModel = model(Item::class);
+        $itemModel->save_value($itemData);
+
+        $itemId = (int) $itemData['item_id'];
+
+        $this->addInventoryRecord($itemId);
+
+        return $itemId;
+    }
+
+    protected function addInventoryRecord(int $itemId, int $locationId = 1): void
+    {
+        $inventoryModel = model(Inventory::class);
+        $inventoryModel->insert([
+            'trans_items'     => $itemId,
+            'trans_user'      => 1,
+            'trans_comment'   => 'Test fixture',
+            'trans_inventory' => 0,
+            'trans_location'  => $locationId,
+        ]);
+    }
+
+    protected function ensureStockLocation(int $locationId): void
+    {
+        $db = db_connect();
+        $exists = $db->table('stock_locations')->where('location_id', $locationId)->get()->getRow();
+        if ($exists === null) {
+            $db->query(
+                'INSERT INTO ' . $db->prefixTable('stock_locations') . ' (location_id, location_name, deleted) VALUES (?, ?, 0)',
+                [$locationId, 'Test Location ' . $locationId]
+            );
+        }
+    }
+
+    protected function addItemQuantity(int $itemId, int $locationId, float $quantity): void
+    {
+        $this->ensureStockLocation($locationId);
+
+        $itemQuantityModel = model(Item_quantity::class);
+        $itemQuantityModel->save_value(
+            [
+                'item_id'     => $itemId,
+                'location_id' => $locationId,
+                'quantity'    => $quantity,
+            ],
+            $itemId,
+            $locationId
+        );
+    }
+
+    protected function defaultSearchFilters(array $overrides = []): array
+    {
+        return array_merge([
+            'start_date'        => '2000-01-01',
+            'end_date'          => '2100-01-01',
+            'stock_location_id' => -1,
+            'empty_upc'         => false,
+            'low_inventory'     => false,
+            'is_serialized'     => false,
+            'no_description'    => false,
+            'search_custom'     => false,
+            'is_deleted'        => false,
+            'temporary'         => false,
+            'definition_ids'    => [],
+        ], $overrides);
+    }
+
+    protected function createAttributeDefinition(string $name, string $type = TEXT, int $flags = 1): int
+    {
+        $db = db_connect();
+        $db->table('attribute_definitions')->insert([
+            'definition_name' => $name,
+            'definition_type' => $type,
+            'definition_flags' => $flags,
+            'deleted' => 0,
+        ]);
+
+        return (int) $db->insertID();
+    }
+
+    protected function linkAttributeValue(int $itemId, int $definitionId, string $value): void
+    {
+        $db = db_connect();
+
+        // attribute_value is unique: reuse the existing attribute_id if this value already exists
+        $existing = $db->table('attribute_values')->select('attribute_id')->where('attribute_value', $value)->get()->getRow();
+        if ($existing !== null) {
+            $attributeId = (int) $existing->attribute_id;
+        } else {
+            $db->table('attribute_values')->insert(['attribute_value' => $value]);
+            $attributeId = (int) $db->insertID();
+        }
+
+        $db->table('attribute_links')->insert([
+            'definition_id' => $definitionId,
+            'attribute_id'  => $attributeId,
+            'item_id'       => $itemId,
+        ]);
+    }
+
+    protected function linkTypedAttributeValue(int $itemId, int $definitionId, string $value, string $definitionType): void
+    {
+        $attributeModel = model(Attribute::class);
+        $attributeModel->saveAttributeValue($value, $definitionId, $itemId, false, $definitionType);
+    }
+}
diff --git a/tests/Support/RaceWorker.php b/tests/Support/RaceWorker.php
new file mode 100644
index 000000000..7fb8cd8d9
--- /dev/null
+++ b/tests/Support/RaceWorker.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Standalone CLI worker used by ConcurrentDbRaceTrait::raceTwoProcesses().
+ * Bootstraps CodeIgniter in its own process so the model method call below
+ * runs on a genuinely separate DB connection from any sibling worker,
+ * exercising real concurrent access instead of simulating it sequentially.
+ *
+ * Usage: php RaceWorker.php <method> <arg> [<arg> ...]
+ */
+
+chdir(dirname(__DIR__, 2));
+
+require __DIR__ . '/../../vendor/codeigniter4/framework/system/Test/bootstrap.php';
+
+$method = $argv[1];
+$args   = array_slice($argv, 2);
+
+$readyFile = getenv('RACE_READY_FILE');
+$goFile    = getenv('RACE_GO_FILE');
+
+file_put_contents($readyFile, '1');
+
+while (!file_exists($goFile)) {
+    usleep(1000);
+}
+
+$result = match ($method) {
+    'giftcard' => model(App\Models\Giftcard::class)
+        ->decrementGiftcardValue((string) $args[0], (float) $args[1]),
+    'rewardPoints' => model(App\Models\Customer::class)
+        ->adjustRewardPoints((int) $args[0], (float) $args[1]),
+    'itemQuantity' => model(App\Models\Item_quantity::class)
+        ->changeQuantity((int) $args[0], (int) $args[1], (float) $args[2]),
+    default => throw new InvalidArgumentException("Unknown race method: {$method}"),
+};
+
+echo $result ? '1' : '0';
diff --git a/tests/Support/SaleFixtureTrait.php b/tests/Support/SaleFixtureTrait.php
new file mode 100644
index 000000000..6b29600a6
--- /dev/null
+++ b/tests/Support/SaleFixtureTrait.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Sale;
+use Config\Database;
+
+trait SaleFixtureTrait
+{
+    /**
+     * Inserts a minimal completed sale row directly, bypassing Sale::save_value()
+     * (which requires a full cart/inventory/tax pipeline unrelated to authorization
+     * checks). Sale::get_info() inner-joins sales_items, so a matching item/
+     * sales_items row is required for the sale to be found.
+     */
+    protected function createSale(int $employeeId): int
+    {
+        $unique = uniqid();
+        $db = Database::connect();
+
+        $db->table('items')->insert([
+            'name'        => "Test Item $unique",
+            'category'    => 'Test',
+            'description' => 'Test item',
+            'cost_price'  => 1,
+            'unit_price'  => 1,
+            'item_number' => "TEST-$unique",
+        ]);
+        $itemId = (int) $db->insertID();
+
+        $db->table('sales')->insert([
+            'sale_time'      => date('Y-m-d H:i:s'),
+            'customer_id'    => null,
+            'employee_id'    => $employeeId,
+            'comment'        => 'test sale',
+            'invoice_number' => null,
+        ]);
+        $saleId = (int) $db->insertID();
+
+        $db->table('sales_items')->insert([
+            'sale_id'            => $saleId,
+            'item_id'            => $itemId,
+            'line'               => 1,
+            'quantity_purchased' => 1,
+            'item_cost_price'    => 1,
+            'item_unit_price'    => 1,
+            'item_location'      => 1,
+        ]);
+
+        return $saleId;
+    }
+
+    /**
+     * Same as createSale(), but flips the sale to SUSPENDED afterward so
+     * postUnsuspend's status check can be exercised.
+     */
+    protected function createSuspendedSale(int $employeeId): int
+    {
+        $saleId = $this->createSale($employeeId);
+
+        model(Sale::class)->update_sale_status($saleId, SUSPENDED);
+
+        return $saleId;
+    }
+}
diff --git a/tests/helpers/GetItemDataRowTest.php b/tests/helpers/GetItemDataRowTest.php
new file mode 100644
index 000000000..89ae14729
--- /dev/null
+++ b/tests/helpers/GetItemDataRowTest.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Tests\Helpers;
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\OSPOS;
+use stdClass;
+
+class GetItemDataRowTest extends CIUnitTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('tabular');
+
+        $this->injectSettings();
+    }
+
+    protected function injectSettings(array $overrides = []): void
+    {
+        $config = new OSPOS();
+        $config->settings = array_merge([
+            'multi_pack_enabled'        => 0,
+            'use_destination_based_tax' => 0,
+            'number_locale'             => 'en_US',
+            'currency_decimals'         => 2,
+            'quantity_decimals'         => 0,
+            'thousands_separator'       => 1,
+            'currency_symbol'           => '$',
+        ], $overrides);
+
+        Factories::injectMock('config', OSPOS::class, $config);
+    }
+
+    protected function makeItem(array $overrides = []): stdClass
+    {
+        $item = new stdClass();
+
+        $defaults = [
+            'item_id'      => 1,
+            'item_number'  => 'ITEM-001',
+            'name'         => 'Test Item',
+            'category'     => 'Test Category',
+            'company_name' => 'Test Supplier',
+            'cost_price'   => 10.00,
+            'unit_price'   => 20.00,
+            'quantity'     => 5,
+            'pic_filename' => null,
+            'pack_name'    => null,
+            'tax_category_id' => null,
+        ];
+
+        foreach (array_merge($defaults, $overrides) as $key => $value) {
+            $item->$key = $value;
+        }
+
+        return $item;
+    }
+
+    public function testTaxPercentsPulledFromPassedMapNotQueried(): void
+    {
+        $item = $this->makeItem(['item_id' => 42]);
+
+        $columns = getItemDataRow($item, [], [42 => '20.00%']);
+
+        $this->assertEquals('20.00%', $columns['tax_percents']);
+    }
+
+    public function testTaxPercentsDefaultsToDashWhenItemIdMissingFromMap(): void
+    {
+        $item = $this->makeItem(['item_id' => 99]);
+
+        $columns = getItemDataRow($item, [], []);
+
+        $this->assertEquals('-', $columns['tax_percents']);
+    }
+
+    public function testDefinitionNamesPassedThroughToExpandAttributeValues(): void
+    {
+        $item = $this->makeItem(['item_id' => 7]);
+        $item->attribute_values = '3_Red';
+        $item->attribute_dtvalues = '';
+        $item->attribute_dvalues = '';
+
+        $definitionNames = [
+            3 => ['name' => 'Color', 'type' => TEXT],
+        ];
+
+        $columns = getItemDataRow($item, $definitionNames, []);
+
+        $this->assertArrayHasKey(3, $columns);
+        $this->assertEquals('Red', $columns[3]);
+    }
+
+    public function testPackNameAppendedToItemName(): void
+    {
+        $this->injectSettings(['multi_pack_enabled' => 1]);
+
+        $item = $this->makeItem(['name' => 'Base Item', 'pack_name' => 'Pack of 6']);
+
+        $columns = getItemDataRow($item, [], []);
+
+        $this->assertEquals('Base Item' . NAME_SEPARATOR . 'Pack of 6', $columns['name']);
+    }
+}
diff --git a/tests/helpers/LocaleHelperTest.php b/tests/helpers/LocaleHelperTest.php
new file mode 100644
index 000000000..a76dcf00c
--- /dev/null
+++ b/tests/helpers/LocaleHelperTest.php
@@ -0,0 +1,59 @@
+<?php
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\OSPOS;
+
+class LocaleHelperTest extends CIUnitTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        require_once __DIR__ . '/../../app/Helpers/locale_helper.php';
+
+        $config           = new OSPOS();
+        $config->settings = ['dateformat' => 'Y-m-d'];
+        Factories::injectMock('config', OSPOS::class, $config);
+    }
+
+    public function testValidDateReturnsTrue(): void
+    {
+        $this->assertTrue(isValidDate('2024-06-10'));
+    }
+
+    public function testInvalidDateFormatReturnsFalse(): void
+    {
+        $this->assertFalse(isValidDate('10/06/2024'));
+    }
+
+    public function testImpossibleDateReturnsFalse(): void
+    {
+        $this->assertFalse(isValidDate('2024-13-01'));
+    }
+
+    public function testPhpDateOverflowReturnsFalse(): void
+    {
+        // PHP silently overflows Feb 30 → Mar 1; the format()===candidate check catches this
+        $this->assertFalse(isValidDate('2024-02-30'));
+    }
+
+    public function testEmptyStringReturnsFalse(): void
+    {
+        $this->assertFalse(isValidDate(''));
+    }
+
+    public function testLeapDayValidReturnsTrue(): void
+    {
+        $this->assertTrue(isValidDate('2024-02-29'));
+    }
+
+    public function testLeapDayInvalidYearReturnsFalse(): void
+    {
+        $this->assertFalse(isValidDate('2023-02-29'));
+    }
+
+    public function testPartialDateReturnsFalse(): void
+    {
+        $this->assertFalse(isValidDate('2024-06'));
+    }
+}
diff --git a/tests/helpers/security_helperTest.php b/tests/helpers/security_helperTest.php
new file mode 100644
index 000000000..42a9d7699
--- /dev/null
+++ b/tests/helpers/security_helperTest.php
@@ -0,0 +1,697 @@
+<?php
+
+use App\Libraries\CI3SecretConverter;
+use App\Models\Appconfig;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Encryption as EncryptionConfig;
+use Config\Services;
+
+/**
+ * The filesystem-touching helpers read their target paths from the shared
+ * Config\SecurityEnv instance. setUp()/tearDown() redirect all three
+ * (envPath / backupPath / lockPath) to a unique per-run sandbox under
+ * sys_get_temp_dir() and tear that sandbox down afterwards, so the tests never
+ * read or write the repository's real .env / writable backup. The
+ * config('Encryption')->key and throttle.key mutations are captured and
+ * restored here too — do not remove those safeguards.
+ */
+class security_helperTest extends CIUnitTestCase
+{
+    private string $sandbox;
+    private string $envPath;
+    private string $backupPath;
+    private string $lockPath;
+    private string $encryptionKeyBefore;
+    private ?string $throttleKeyBefore;
+    private bool $hadThrottleServer = false;
+    private ?string $throttleServerBefore = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        require_once __DIR__ . '/../../app/Helpers/security_helper.php';
+
+        // Redirect all filesystem-touching helpers to a unique per-run sandbox.
+        $this->sandbox    = sys_get_temp_dir() . '/ospos_sech_' . getmypid() . '_' . bin2hex(random_bytes(4));
+        $this->envPath    = $this->sandbox . '/.env';
+        $this->backupPath = $this->sandbox . '/backup/.env.bak';
+        $this->lockPath   = $this->sandbox . '/.env.lock';
+
+        if (!is_dir($this->sandbox)) {
+            mkdir($this->sandbox, 0700, true);
+        }
+        if (!is_dir(dirname($this->backupPath))) {
+            mkdir(dirname($this->backupPath), 0700, true);
+        }
+        // Seed .env so initializeEnvFile() treats it as already present (no-op).
+        file_put_contents($this->envPath, "# OSPOS Configuration\n\n");
+
+        $se                  = config('SecurityEnv');
+        $se->envPath         = $this->envPath;
+        $se->backupPath      = $this->backupPath;
+        $se->lockPath        = $this->lockPath;
+
+        // Read-back so the helper and the assertions observe the same instance.
+        $this->assertSame($this->envPath, config('SecurityEnv')->envPath);
+
+        $this->encryptionKeyBefore  = (string) config('Encryption')->key;
+        $this->throttleKeyBefore   = (string) env('throttle.key', '');
+        $this->hadThrottleServer   = array_key_exists('throttle.key', $_SERVER);
+        $this->throttleServerBefore = $this->hadThrottleServer ? (string) $_SERVER['throttle.key'] : null;
+    }
+
+    protected function tearDown(): void
+    {
+        // Restore the shared config defaults so no other test sees the sandbox.
+        $se                  = config('SecurityEnv');
+        $se->envPath         = ROOTPATH . '.env';
+        $se->backupPath      = WRITEPATH . '/backup/.env.bak';
+        $se->lockPath        = ROOTPATH . '.env.lock';
+
+        $this->removeTree($this->sandbox);
+
+        config('Encryption')->key = $this->encryptionKeyBefore;
+
+        $this->restoreThrottleKey();
+
+        parent::tearDown();
+    }
+
+    /**
+     * Recursively removes a sandbox directory and everything beneath it.
+     * No-op when $dir does not exist.
+     */
+    private function removeTree(string $dir): void
+    {
+        if (!is_dir($dir)) {
+            return;
+        }
+
+        $items = scandir($dir) ?: [];
+        foreach ($items as $item) {
+            if ($item === '.' || $item === '..') {
+                continue;
+            }
+            $path   = $dir . '/' . $item;
+            $isTree = is_dir($path) && !is_link($path);
+            if ($isTree) {
+                $this->removeTree($path);
+            } else {
+                @unlink($path);
+            }
+        }
+
+        @rmdir($dir);
+    }
+
+    private function restoreThrottleKey(): void
+    {
+        putenv('throttle.key');
+        unset($_ENV['throttle.key'], $_SERVER['throttle.key']);
+
+        if ($this->throttleKeyBefore !== '') {
+            putenv("throttle.key={$this->throttleKeyBefore}");
+            $_ENV['throttle.key']     = $this->throttleKeyBefore;
+            $_SERVER['throttle.key']  = $this->throttleKeyBefore;
+        } elseif ($this->hadThrottleServer) {
+            $_SERVER['throttle.key']  = $this->throttleServerBefore;
+        }
+    }
+
+    /**
+     * Fakes the ospos_app_config rows so CI3SecretConverter can decrypt/verify
+     * without a real database, and captures the payload passed to saveAll().
+     *
+     * @param array<string,string> $values column => CI3 ciphertext
+     * @return Appconfig with a public $saved prop recording saveAll()
+     */
+    private function fakeAppconfig(array $values): Appconfig
+    {
+        $fake = new class($values) extends Appconfig {
+            /** @var array<string,string>|null last payload passed to saveAll() */
+            public ?array $saved = null;
+
+            public function __construct(
+                private array $vals
+            ) {
+                parent::__construct();
+            }
+
+            public function get_value(string $key, string $default = ''): string
+            {
+                return $this->vals[$key] ?? $default;
+            }
+
+            public function batch_save(array $data): bool
+            {
+                $this->saved = $data;
+
+                return true;
+            }
+        };
+
+        return $fake;
+    }
+
+    /**
+     * Same as fakeAppconfig(), but batch_save() fails (returns false) so
+     * that CI3SecretConverter::saveAll() throws. Used to exercise the
+     * abortEncryptionConversion() rollback path when the DB write fails
+     * after the key has already been rotated.
+     *
+     * @param array<string,string> $values column => CI3 ciphertext
+     * @return Appconfig
+     */
+    private function failingFakeAppconfig(array $values): Appconfig
+    {
+        $fake = new class($values) extends Appconfig {
+            public function __construct(
+                private array $vals
+            ) {
+                parent::__construct();
+            }
+
+            public function get_value(string $key, string $default = ''): string
+            {
+                return $this->vals[$key] ?? $default;
+            }
+
+            public function batch_save(array $data): bool
+            {
+                return false;
+            }
+        };
+
+        return $fake;
+    }
+
+    /**
+     * Encodes $plaintext with the CI3-era cipher under $ci3Key, producing
+     * the same ciphertext the real converter decrypts.
+     */
+    private function ci3Encrypt(string $plaintext, string $ci3Key): string
+    {
+        $cfg                 = new EncryptionConfig();
+        $cfg->driver         = 'OpenSSL';
+        $cfg->digest         = 'SHA512';
+        $cfg->key            = $ci3Key;
+        $cfg->cipher         = 'AES-128-CBC';
+        $cfg->rawData        = false;
+        $cfg->encryptKeyInfo = 'encryption';
+        $cfg->authKeyInfo    = 'authentication';
+        $cfg->previousKeys   = [];
+
+        return Services::encrypter($cfg)->encrypt($plaintext);
+    }
+
+    // -- applyEnvKeyReplacement() — pure function, no I/O --
+
+    public function testApplyEnvKeyReplacementReplacesExistingKey(): void
+    {
+        $configFile = "foo='bar'\nencryption.key='old'\nbaz='qux'\n";
+
+        $result = applyEnvKeyReplacement($configFile, 'encryption.key', 'new');
+
+        $this->assertSame("foo='bar'\nencryption.key='new'\nbaz='qux'\n", $result);
+    }
+
+    public function testApplyEnvKeyReplacementInsertsAfterEncryptionKey(): void
+    {
+        $configFile = "encryption.key='abc'\nfoo='bar'\n";
+
+        $result = applyEnvKeyReplacement($configFile, 'throttle.key', 'xyz');
+
+        $this->assertSame("encryption.key='abc'\nthrottle.key='xyz'\nfoo='bar'\n", $result);
+    }
+
+    public function testApplyEnvKeyReplacementAppendsWhenNoEncryptionKey(): void
+    {
+        $configFile = "foo='bar'\n";
+
+        $result = applyEnvKeyReplacement($configFile, 'throttle.key', 'xyz');
+
+        $this->assertSame("foo='bar'\n\nthrottle.key='xyz'\n", $result);
+    }
+
+    public function testApplyEnvKeyReplacementEscapesBackslashAndDollar(): void
+    {
+        $configFile = "encryption.key='old'\n";
+
+        $result = applyEnvKeyReplacement($configFile, 'encryption.key', 'a\\b$c');
+
+        $this->assertSame("encryption.key='a\\\\b\\\$c'\n", $result);
+    }
+
+    public function testApplyEnvKeyReplacementInsertEscapesBackslashAndDollar(): void
+    {
+        $configFile = "encryption.key='abc'\nfoo='bar'\n";
+
+        $result = applyEnvKeyReplacement($configFile, 'throttle.key', 'a\\b$c');
+
+        $this->assertSame("encryption.key='abc'\nthrottle.key='a\\\\b\\\$c'\nfoo='bar'\n", $result);
+    }
+
+    public function testApplyEnvKeyReplacementAppendEscapesBackslashAndDollar(): void
+    {
+        $configFile = "foo='bar'\n";
+
+        $result = applyEnvKeyReplacement($configFile, 'throttle.key', 'a\\b$c');
+
+        $this->assertSame("foo='bar'\n\nthrottle.key='a\\\\b\\\$c'\n", $result);
+    }
+
+    // -- writeEnvKey() / atomicWriteFile() — real filesystem --
+
+    public function testWriteEnvKeyReplacesExistingKeyOnDisk(): void
+    {
+        file_put_contents($this->envPath, "encryption.key='old'\nfoo='bar'\n");
+
+        $result = writeEnvKey('encryption.key', 'newvalue');
+
+        $this->assertTrue($result);
+        $this->assertStringContainsString("encryption.key='newvalue'", file_get_contents($this->envPath));
+    }
+
+    public function testWriteEnvKeyInsertsNewKeyOnDisk(): void
+    {
+        file_put_contents($this->envPath, "encryption.key='abc'\n");
+
+        $result = writeEnvKey('throttle.key', 'newvalue');
+
+        $this->assertTrue($result);
+        $this->assertStringContainsString("throttle.key='newvalue'", file_get_contents($this->envPath));
+    }
+
+    public function testAtomicWriteFileWritesContentsAndLeavesNoTempFile(): void
+    {
+        $result = atomicWriteFile($this->envPath, 'hello world');
+
+        $this->assertTrue($result);
+        $this->assertSame('hello world', file_get_contents($this->envPath));
+        $this->assertSame([], glob($this->envPath . '.tmp.*'));
+    }
+
+    // -- envFileIsWritable() --
+
+    public function testEnvFileIsWritableReturnsTrueWhenFileIsWritable(): void
+    {
+        file_put_contents($this->envPath, "encryption.key='abc'\n");
+        chmod($this->envPath, 0644);
+
+        $this->assertTrue(envFileIsWritable());
+    }
+
+    public function testEnvFileIsWritableReturnsFalseWhenLockFileIsReadOnly(): void
+    {
+        $this->skipIfRoot();
+        file_put_contents($this->envPath, "# tmp\n");
+        file_put_contents($this->lockPath, "");
+        chmod($this->lockPath, 0444);
+
+        try {
+            $this->assertFalse(envFileIsWritable());
+        } finally {
+            @unlink($this->lockPath);
+        }
+    }
+
+    public function testEnvFileIsWritableReturnsFalseWhenDirectoryIsNotWritable(): void
+    {
+        $this->skipIfRoot();
+        file_put_contents($this->envPath, "# tmp\n");
+        chmod($this->sandbox, 0500);
+
+        try {
+            $this->assertFalse(envFileIsWritable());
+        } finally {
+            chmod($this->sandbox, 0700);
+        }
+    }
+
+    // -- checkEncryption() --
+
+    public function testCheckEncryptionPassesWhenKeyValid(): void
+    {
+        $validKey = bin2hex(random_bytes(32));
+        config('Encryption')->key = $validKey;
+        file_put_contents($this->envPath, "encryption.key='$validKey'\n");
+
+        $result = checkEncryption();
+
+        $this->assertTrue($result);
+        $this->assertSame($validKey, config('Encryption')->key);
+    }
+
+    public function testCheckEncryptionProvisionsWhenKeyEmptyAndEnvWritable(): void
+    {
+        config('Encryption')->key = '';
+        file_put_contents($this->envPath, "encryption.key=''\n");
+
+        $result = checkEncryption();
+
+        $this->assertTrue($result);
+        $newKey = (string) config('Encryption')->key;
+        $this->assertGreaterThanOrEqual(64, strlen($newKey), 'checkEncryption should provision a valid key');
+        $this->assertStringContainsString("encryption.key='$newKey'", file_get_contents($this->envPath));
+    }
+
+    public function testCheckEncryptionThrowsWhenKeyEmptyAndEnvNotWritable(): void
+    {
+        $this->skipIfRoot();
+        config('Encryption')->key = '';
+        file_put_contents($this->envPath, "encryption.key=''\n");
+        file_put_contents($this->lockPath, "");
+        chmod($this->lockPath, 0444);
+
+        try {
+            $this->expectException(RuntimeException::class);
+            $this->expectExceptionMessage('provisioned');
+            checkEncryption();
+        } finally {
+            @unlink($this->lockPath);
+        }
+    }
+
+    public function testCheckEncryptionConvertsCi3ShortKeyWhenEnvWritable(): void
+    {
+        // Seed CI3-era ciphertexts under a short CI3 key so the short-key
+        // branch runs. A fake Appconfig model (injected via CI3SecretConverter)
+        // stands in for the DB so no real database is required.
+        $oldKey     = bin2hex(random_bytes(16)); // < 64 chars -> CI3 era
+        $plaintext  = ['smtp_pass' => 's3cr3t-smtp', 'mailchimp_api_key' => 'mc-abc-123'];
+        $ciphertext = array_map(fn ($v) => $this->ci3Encrypt($v, $oldKey), $plaintext);
+
+        $fake = $this->fakeAppconfig($ciphertext);
+        $conv = new CI3SecretConverter($fake);
+
+        config('Encryption')->key = $oldKey;
+        file_put_contents($this->envPath, "encryption.key='$oldKey'\n");
+
+        $result = checkEncryption($conv);
+
+        $this->assertTrue($result);
+
+        // A fresh CI4 key was generated and is now the *active* encryption.key
+        // (the old short key remains only as a commented backup line).
+        $newKey = (string) config('Encryption')->key;
+        $this->assertNotSame($oldKey, $newKey);
+        $this->assertGreaterThanOrEqual(64, strlen($newKey));
+
+        $contents = file_get_contents($this->envPath);
+        preg_match("/^encryption\.key\s*=\s*'(.*?)'/m", $contents, $m);
+        $this->assertSame($newKey, $m[1] ?? '', 'the active .env encryption.key must be the new CI4 key');
+
+        // The saved payloads are CI4 ciphertext (not plain) and verify back.
+        $this->assertNotEmpty($fake->saved);
+        $this->assertSame($plaintext['smtp_pass'],         $conv->verifyAll($fake->saved)['smtp_pass'],         'smtp_pass round-trip');
+        $this->assertSame($plaintext['mailchimp_api_key'], $conv->verifyAll($fake->saved)['mailchimp_api_key'], 'mailchimp_api_key round-trip');
+        $this->assertNotSame($plaintext['smtp_pass'],         $fake->saved['smtp_pass'],         'saveAll() must receive ciphertext, not plain');
+        $this->assertNotSame($plaintext['mailchimp_api_key'], $fake->saved['mailchimp_api_key'], 'saveAll() must receive ciphertext, not plain');
+    }
+
+    public function testCheckEncryptionRollsBackWhenSaveAllFails(): void
+    {
+        // If the post-rotation saveAll() fails, the rotated key must be rolled
+        // back so the original CI3 ciphertext stays decryptable. A failing fake
+        // Appconfig (injected via CI3SecretConverter) makes saveAll() throw.
+        $oldKey     = bin2hex(random_bytes(16)); // < 64 chars -> CI3 era
+        $plaintext  = ['smtp_pass' => 'keep-me-safe'];
+        $ciphertext = array_map(fn ($v) => $this->ci3Encrypt($v, $oldKey), $plaintext);
+
+        $failingFake = $this->failingFakeAppconfig($ciphertext);
+        $conv        = new CI3SecretConverter($failingFake);
+
+        config('Encryption')->key = $oldKey;
+        $originalContents = "encryption.key='$oldKey'\n";
+        file_put_contents($this->envPath, $originalContents);
+
+        $threw = false;
+
+        try {
+            checkEncryption($conv);
+        } catch (RuntimeException $e) {
+            $threw = true;
+        }
+
+        $this->assertTrue($threw, 'checkEncryption() must throw when saveAll() fails');
+        $this->assertSame(
+            $originalContents,
+            (string) file_get_contents($this->envPath),
+            'on saveAll() failure the freshly rotated .env key must be rolled back from the backup'
+        );
+    }
+
+    // -- checkThrottleEncryption() --
+
+    public function testCheckThrottleEncryptionReturnsWhenKeyPresent(): void
+    {
+        $key = bin2hex(random_bytes(32));
+        putenv("throttle.key=$key");
+        $_ENV['throttle.key']   = $key;
+        $_SERVER['throttle.key'] = $key;
+
+        $result = checkThrottleEncryption();
+
+        $this->assertSame($key, $result);
+    }
+
+    public function testCheckThrottleEncryptionProvisionsWhenKeyMissingAndEnvWritable(): void
+    {
+        putenv('throttle.key');
+        unset($_ENV['throttle.key'], $_SERVER['throttle.key']);
+        file_put_contents($this->envPath, "encryption.key='abc'\n");
+
+        $result = checkThrottleEncryption();
+
+        $this->assertNotSame('', $result);
+        $this->assertStringContainsString("throttle.key='$result'", file_get_contents($this->envPath));
+        $this->assertSame($result, $_ENV['throttle.key']);
+    }
+
+    public function testCheckThrottleEncryptionThrowsWhenKeyMissingAndEnvNotWritable(): void
+    {
+        $this->skipIfRoot();
+        putenv('throttle.key');
+        unset($_ENV['throttle.key'], $_SERVER['throttle.key']);
+        file_put_contents($this->envPath, "encryption.key='abc'\n");
+        file_put_contents($this->lockPath, "");
+        chmod($this->lockPath, 0444);
+
+        try {
+            $this->expectException(RuntimeException::class);
+            $this->expectExceptionMessage('provisioned');
+            checkThrottleEncryption();
+        } finally {
+            @unlink($this->lockPath);
+        }
+    }
+
+    public function testCheckThrottleEncryptionFallsBackToThrottleKeyEnvVar(): void
+    {
+        $throttleKey = bin2hex(random_bytes(32));
+
+        // Clear the dot-notation throttle.key so the THROTTLE_KEY fallback is
+        // exercised, and leave a .env with no throttle.key so any accidental
+        // provisioning would be visible in the file assertion below.
+        putenv('throttle.key');
+        unset($_ENV['throttle.key'], $_SERVER['throttle.key']);
+        file_put_contents($this->envPath, "# tmp\n");
+
+        $previous = getenv('THROTTLE_KEY');
+        putenv("THROTTLE_KEY=$throttleKey");
+
+        try {
+            $result = checkThrottleEncryption();
+
+            $this->assertSame($throttleKey, $result);
+            $this->assertStringNotContainsString('throttle.key=', file_get_contents($this->envPath), 'the THROTTLE_KEY fallback must not trigger provisioning/write');
+        } finally {
+            if ($previous === false) {
+                putenv('THROTTLE_KEY');
+            } else {
+                putenv("THROTTLE_KEY=$previous");
+            }
+        }
+    }
+
+    public function testCheckThrottleEncryptionPrefersThrottleKeyOverEnvVar(): void
+    {
+        $explicit = bin2hex(random_bytes(32));
+        $fallback = bin2hex(random_bytes(32));
+
+        putenv("throttle.key=$explicit");
+        $_ENV['throttle.key']    = $explicit;
+        $_SERVER['throttle.key'] = $explicit;
+
+        $previous = getenv('THROTTLE_KEY');
+        putenv("THROTTLE_KEY=$fallback");
+
+        try {
+            $result = checkThrottleEncryption();
+
+            $this->assertSame($explicit, $result, 'an explicit throttle.key must take precedence over the THROTTLE_KEY fallback');
+        } finally {
+            if ($previous === false) {
+                putenv('THROTTLE_KEY');
+            } else {
+                putenv("THROTTLE_KEY=$previous");
+            }
+        }
+    }
+
+    // -- rotateEncryptionKey() — provisioning path, does write --
+
+    public function testRotateEncryptionKeyPersistsNewKey(): void
+    {
+        file_put_contents($this->envPath, "encryption.key='tooshort'\n");
+        config('Encryption')->key = 'tooshort';
+
+        $newKey = rotateEncryptionKey('tooshort');
+
+        $this->assertNotSame('tooshort', $newKey);
+        $this->assertGreaterThanOrEqual(64, strlen($newKey));
+        $this->assertSame($newKey, config('Encryption')->key);
+        $this->assertStringContainsString("encryption.key='$newKey'", file_get_contents($this->envPath));
+    }
+
+    public function testRotateEncryptionKeyLeavesOldKeyAsCommentedBackup(): void
+    {
+        file_put_contents($this->envPath, "encryption.key='tooshort'\n");
+        config('Encryption')->key = 'tooshort';
+
+        rotateEncryptionKey('tooshort');
+
+        $this->assertStringContainsString("# encryption.key='tooshort'", file_get_contents($this->envPath));
+    }
+
+    public function testRotateEncryptionKeyNoBackupWhenOldKeyEmpty(): void
+    {
+        file_put_contents($this->envPath, "# blank\n");
+        config('Encryption')->key = '';
+
+        $newKey = rotateEncryptionKey(null);
+
+        $this->assertGreaterThanOrEqual(64, strlen($newKey));
+        $this->assertStringContainsString("encryption.key='$newKey'", file_get_contents($this->envPath));
+        $this->assertStringNotContainsString("# encryption.key=''", file_get_contents($this->envPath));
+    }
+
+    public function testRotateEncryptionKeyThrowsWhenEnvPathIsDirectory(): void
+    {
+        @unlink($this->envPath);
+        mkdir($this->envPath);
+
+        try {
+            $this->expectException(RuntimeException::class);
+            rotateEncryptionKey(null);
+        } finally {
+            @rmdir($this->envPath);
+        }
+    }
+
+    // -- provisionThrottleKey() — idempotent, does write --
+
+    public function testProvisionThrottleKeyGeneratesAndPersistsWhenMissing(): void
+    {
+        putenv('throttle.key');
+        unset($_ENV['throttle.key'], $_SERVER['throttle.key']);
+        file_put_contents($this->envPath, "encryption.key='abc'\n");
+
+        $key = provisionThrottleKey();
+
+        $this->assertNotSame('', $key);
+        $this->assertStringContainsString("throttle.key='$key'", file_get_contents($this->envPath));
+        $this->assertSame($key, $_ENV['throttle.key'] ?? '');
+    }
+
+    public function testProvisionThrottleKeyIdempotentWhenPresent(): void
+    {
+        $existing = bin2hex(random_bytes(32));
+        file_put_contents($this->envPath, "encryption.key='abc'\n");
+        // Simulate .env already has the key; ensure the function prefers the file value.
+        file_put_contents($this->envPath, "encryption.key='abc'\nthrottle.key='$existing'\n");
+
+        $key = provisionThrottleKey();
+
+        $this->assertSame($existing, $key);
+        $contents = file_get_contents($this->envPath);
+        $this->assertStringContainsString("throttle.key='$existing'", $contents);
+        // Should still be a single line
+        $this->assertSame(substr_count($contents, "throttle.key="), 1);
+    }
+
+    // -- abortEncryptionConversion() / removeBackup() --
+
+    public function testAbortEncryptionConversionRestoresFromBackup(): void
+    {
+        if (!is_dir(dirname($this->backupPath))) {
+            mkdir(dirname($this->backupPath), 0750, true);
+        }
+
+        file_put_contents($this->envPath, "encryption.key='new'\n");
+        file_put_contents($this->backupPath, "encryption.key='old'\n");
+
+        abortEncryptionConversion();
+
+        $this->assertSame("encryption.key='old'\n", file_get_contents($this->envPath));
+    }
+
+    public function testAbortEncryptionConversionThrowsWhenBackupUnreadable(): void
+    {
+        // Force a failed backup read: file_exists() is true (it is a directory)
+        // but file_get_contents() returns false. The restore must then throw
+        // instead of silently writing an empty .env and destroying the active key.
+        if (!is_dir(dirname($this->backupPath))) {
+            mkdir(dirname($this->backupPath), 0750, true);
+        }
+        @unlink($this->backupPath);
+        mkdir($this->backupPath);
+
+        file_put_contents($this->envPath, "encryption.key='new'\n");
+        $before = (string) file_get_contents($this->envPath);
+
+        $threw = false;
+
+        try {
+            abortEncryptionConversion();
+        } catch (RuntimeException $e) {
+            $threw = true;
+        } finally {
+            @rmdir($this->backupPath);
+        }
+
+        $this->assertTrue($threw, 'a failed backup read must throw instead of failing silently');
+        $this->assertSame($before, (string) file_get_contents($this->envPath), '.env must be left untouched when the backup is unreadable');
+    }
+
+    public function testRemoveBackupDeletesBackupFile(): void
+    {
+        if (!is_dir(dirname($this->backupPath))) {
+            mkdir(dirname($this->backupPath), 0750, true);
+        }
+
+        file_put_contents($this->backupPath, "encryption.key='old'\n");
+
+        removeBackup();
+
+        $this->assertFileDoesNotExist($this->backupPath);
+    }
+
+    /**
+     * When PHPUnit runs as root, is_writable() reports 0444 files as writable
+     * (and root bypasses directory permission bits), so the "not writable"
+     * fixtures cannot be faked reliably. Skip those tests under root.
+     */
+    private function skipIfRoot(): void
+    {
+        $isRoot = false;
+        if (function_exists('posix_geteuid')) {
+            $isRoot = posix_geteuid() === 0;
+        } elseif (function_exists('get_current_user')) {
+            $isRoot = in_array(get_current_user(), ['root', '0'], true);
+        }
+        if ($isRoot) {
+            $this->markTestSkipped('is_writable() is bypassed when running as root; cannot fake a non-writable fixture');
+        }
+    }
+}
diff --git a/tests/libraries/CI3SecretConverterTest.php b/tests/libraries/CI3SecretConverterTest.php
new file mode 100644
index 000000000..354e564a5
--- /dev/null
+++ b/tests/libraries/CI3SecretConverterTest.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace Tests\Libraries;
+
+use App\Libraries\CI3SecretConverter;
+use App\Models\Appconfig;
+use CodeIgniter\Encryption\EncrypterInterface;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Encryption as EncryptionConfig;
+use Config\Services;
+
+/**
+ * Tests for CI3SecretConverter.
+ *
+ * The converter performs no DB I/O of its own except saveAll(); the Appconfig
+ * model is injectable so we can fake get_value()/batch_save() with an anonymous
+ * subclass. decryptAll() is the only path that touches the real cipher, so we
+ * verify it by encrypting a known plaintext with the *CI3 cipher* and asserting
+ * the converter decrypts it back.
+ */
+final class CI3SecretConverterTest extends CIUnitTestCase
+{
+    private string $oldKey;
+    private array  $plain;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Make sure the app Encryption config has a valid key so CI4 default
+        // cipher (encryptAll/verifyAll) works in this test process.
+        $env = config('Encryption');
+        if (empty($env->key) || strlen((string) $env->key) < 64) {
+            $env->key = bin2hex(random_bytes(32));
+        }
+
+        // The CI3-era key this test uses to seed fake legacy ciphertext.
+        $this->oldKey = bin2hex(random_bytes(16));
+
+        $this->plain = [
+            'clcdesq_api_key'   => 'capi-1234567890abcdef',
+            'clcdesq_api_url'   => 'https://ci3.example.org/api',
+            'mailchimp_api_key' => 'mc-abc-123',
+            'mailchimp_list_id' => 'list-5a6b7c',
+            'smtp_pass'         => 's3cr3t-smtp',
+        ];
+    }
+
+    /**
+     * Build the CI3 ciphertext the same way the converter decrypts it, so we
+     * have a known round-trip fixture without depending on a DB row.
+     */
+    private function ci3Encrypt(string $plaintext): string
+    {
+        $cfg                = new EncryptionConfig();
+        $cfg->driver        = 'OpenSSL';
+        $cfg->digest        = 'SHA512';
+        $cfg->key           = $this->oldKey;
+        $cfg->cipher        = 'AES-128-CBC';
+        $cfg->rawData       = false;
+        $cfg->encryptKeyInfo = 'encryption';
+        $cfg->authKeyInfo   = 'authentication';
+        $cfg->previousKeys  = [];
+
+        return Services::encrypter($cfg)->encrypt($plaintext);
+    }
+
+    /**
+     * @return array<string,string>
+     */
+    private function ci3Ciphertexts(): array
+    {
+        return array_map(
+            fn ($v) => $v === '' ? '' : $this->ci3Encrypt($v),
+            $this->plain
+        );
+    }
+
+    private function fake(array $values, bool $saveSucceeds = true): Appconfig
+    {
+        return new class($values, $saveSucceeds) extends Appconfig {
+            public function __construct(
+                private array $vals,
+                private bool $ok
+            ) {
+                parent::__construct();
+            }
+
+            public function get_value(string $key, string $default = ''): string
+            {
+                return $this->vals[$key] ?? $default;
+            }
+
+            public function batch_save(array $data): bool
+            {
+                return $this->ok;
+            }
+        };
+    }
+
+    public function testDecryptAllRoundTripWithCi3Cipher(): void
+    {
+        $conv  = new CI3SecretConverter($this->fake($this->ci3Ciphertexts()));
+        $plain = $conv->decryptAll($this->oldKey);
+
+        foreach ($this->plain as $k => $v) {
+            $this->assertSame($v, $plain[$k], "decryptAll mismatch for {$k}");
+        }
+    }
+
+    public function testDecryptAllEmptyRowsStayEmpty(): void
+    {
+        $ct = $this->ci3Ciphertexts();
+        $ct['mailchimp_api_key'] = '';
+        $ct['mailchimp_list_id'] = '';
+
+        $plain = (new CI3SecretConverter($this->fake($ct)))->decryptAll($this->oldKey);
+
+        $this->assertSame('capi-1234567890abcdef', $plain['clcdesq_api_key']);
+        $this->assertSame('',                       $plain['mailchimp_api_key']);
+        $this->assertSame('',                       $plain['mailchimp_list_id']);
+    }
+
+    public function testEncryptVerifyRoundTripWithCi4Cipher(): void
+    {
+        $conv = new CI3SecretConverter($this->fake([]));
+
+        $enc = $conv->encryptAll($this->plain);
+        foreach ($this->plain as $k => $v) {
+            $this->assertNotSame($v, $enc[$k], "encryptAll must change {$k}");
+        }
+
+        $this->assertSame($this->plain, $conv->verifyAll($enc));
+    }
+
+    public function testEncryptAllKeepsEmptyValuesEmpty(): void
+    {
+        $conv = new CI3SecretConverter($this->fake([]));
+        $in   = $this->plain;
+        $in['smtp_pass'] = '';
+
+        $enc = $conv->encryptAll($in);
+        $this->assertSame('', $enc['smtp_pass']);
+        $this->assertNotSame('', $enc['clcdesq_api_key']);
+    }
+
+    public function testCI3BranchSavesCiphertextNotPlaintext(): void
+    {
+        // Regression guard for the env:provision CI3 branch (mirrored by the
+        // ConvertToCI4 migration): after decryptAll() with the legacy CI3 key,
+        // the command must persist encryptAll()'s CI4 *ciphertext* -- never the
+        // decrypted plaintext. A payload equal to $plain would mean secrets were
+        // written to ospos_app_config in the clear.
+        $conv    = new CI3SecretConverter($this->fake($this->ci3Ciphertexts()));
+        $plain   = $conv->decryptAll($this->oldKey);
+        $payload = $conv->encryptAll($plain); // <- exactly what run() passes to saveAll()
+
+        // saveAll() must receive the ciphertext form, i.e. a value that differs
+        // from every plaintext secret yet round-trips to it under the CI4 cipher.
+        foreach ($this->plain as $col => $secret) {
+            $this->assertNotSame($secret, $payload[$col], "saveAll() payload for {$col} must be ciphertext, not the plain secret");
+        }
+        $this->assertSame($plain, $conv->verifyAll($payload), 'persisted ciphertext must verify back to the original plaintext');
+    }
+
+    public function testHasLegacyDataTrueWhenAnyPresent(): void
+    {
+        $conv = new CI3SecretConverter($this->fake($this->ci3Ciphertexts()));
+        $this->assertTrue($conv->hasLegacyData($this->oldKey));
+    }
+
+    public function testHasLegacyDataFalseWhenAllEmpty(): void
+    {
+        $conv = new CI3SecretConverter($this->fake([]));
+        $this->assertFalse($conv->hasLegacyData($this->oldKey));
+    }
+
+    public function testSaveAllPersistsAndReturnsTrue(): void
+    {
+        $conv = new CI3SecretConverter($this->fake([], true));
+        $this->assertTrue($conv->saveAll(['x' => 'y']));
+    }
+
+    public function testSaveAllThrowsWhenModelFails(): void
+    {
+        $conv = new CI3SecretConverter($this->fake([], false));
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Failed to save converted encryption data');
+        $conv->saveAll(['x' => 'y']);
+    }
+
+    public function testLegacyKeysConstantExposesExpectedSet(): void
+    {
+        $expected = [
+            'clcdesq_api_key',
+            'clcdesq_api_url',
+            'mailchimp_api_key',
+            'mailchimp_list_id',
+            'smtp_pass',
+        ];
+        $this->assertSame($expected, CI3SecretConverter::LEGACY_KEYS);
+    }
+}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index e2f4ebe69..000000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap = "../vendor/autoload.php"
-    backupGlobals               = "false"
-    colors                      = "true"
-    processIsolation            = "false"
-    stopOnFailure               = "false">
-
-<testsuites>
-    <testsuite name="Helpers">
-        <directory>helpers</directory>
-    </testsuite>
-    <testsuite name="Libraries">
-        <directory>Libraries</directory>
-    </testsuite>
-    <testsuite name="Models">
-        <directory>Models</directory>
-    </testsuite>
-    <testsuite name="Controllers">
-        <directory>Controllers</directory>
-    </testsuite>
-</testsuites>
-
-</phpunit>