wip

* orders

* woocommerce support

* working with MariaDB + Derby

.gitignore

@@ -8,3 +8,7 @@ nbactions.xml
 docker.sock
 .DS_Store
 
+.classpath
+.project
+.factorypath
+.settings

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

C4_ARCHITECTURE.md

@@ -0,0 +1,729 @@
+# Unicenta oPOS - C4 Architecture Diagram
+
+## Overview
+
+Unicenta oPOS (v5.4.0) is an enterprise-level Point of Sale system built with Java. It provides comprehensive sales, inventory, customer, and reporting management capabilities with support for multiple operating systems (Windows, Linux, macOS).
+
+---
+
+## Level 1: System Context Diagram
+
+```mermaid
+graph TB
+    user["👤 POS Operators/Staff"]
+
+    system["📱 Unicenta oPOS System<br/>Java Desktop Application<br/>v5.4.0"]
+
+    devices["🖨️ Peripheral Devices<br/>Printer • Scale<br/>Barcode Scanner<br/>Card Reader"]
+
+    db["💾 Database<br/>MySQL • Derby<br/>SQLite • PostgreSQL"]
+
+    fs["📂 File System<br/>Reports • Templates<br/>Locales • Config"]
+
+    user -->|interacts| system
+    system -->|controls| devices
+    system -->|reads/writes| db
+    system -->|reads/writes| fs
+    devices -.->|feedback| system
+
+    style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
+    style user fill:#50C878,stroke:#2D7A4A,color:#fff
+    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style db fill:#FFB84D,stroke:#8B6914,color:#fff
+    style fs fill:#9B59B6,stroke:#5B2C6F,color:#fff
+```
+
+---
+
+## Level 2: Container Architecture
+
+```mermaid
+graph TB
+    subgraph app["🏗️ UNICENTA oPOS APPLICATION"]
+        subgraph ui["PRESENTATION LAYER<br/>(Swing/JavaFX)"]
+            ui1["StartPOS Entry Point"]
+            ui2["Sales Screens<br/>Simple • Restaurant<br/>Shared Modes"]
+            ui3["Admin Panels<br/>User Mgmt • Settings"]
+            ui4["Forms & Dialogs<br/>Customers • Suppliers<br/>Inventory"]
+            ui5["Reporting Dashboards<br/>JFreeChart"]
+        end
+
+        subgraph service["SERVICE LAYER<br/>(Business Logic)"]
+            svc1["Sales Service"]
+            svc2["Inventory Service"]
+            svc3["Customer Service"]
+            svc4["Payment Service"]
+            svc5["Reporting Service"]
+            svc6["Config/Admin Service"]
+        end
+
+        subgraph dao["DATA ACCESS LAYER<br/>(DAOs)"]
+            dao1["ProductDAO"]
+            dao2["TicketDAO"]
+            dao3["CustomerDAO"]
+            dao4["EmployeeDAO"]
+            dao5["CompanyDAO"]
+            dao6["SupplierDAO"]
+        end
+
+        subgraph peripheral["PERIPHERAL INTEGRATION<br/>(Drivers & APIs)"]
+            per1["Printer Drivers<br/>ESC-POS • JavaPOS"]
+            per2["Scale Reader<br/>Serial Comm"]
+            per3["Barcode Scanner<br/>ZXing"]
+            per4["Card Reader<br/>USB/Serial"]
+        end
+
+        subgraph utils["UTILITIES & SUPPORT"]
+            util1["Logging<br/>Logback"]
+            util2["Formatting<br/>Date • Currency"]
+            util3["Localization<br/>i18n"]
+            util4["Reporting<br/>JasperReports"]
+            util5["Scripting<br/>BeanShell"]
+            util6["Plugins"]
+        end
+    end
+
+    subgraph external["📦 EXTERNAL SYSTEMS"]
+        extdb["💾 Database<br/>MySQL/Derby/SQLite<br/>PostgreSQL"]
+        extfs["📂 File System<br/>Configs • Templates<br/>Locales • Reports"]
+        devices["🖨️ Physical Devices<br/>Printers • Scales<br/>Scanners • Card Readers"]
+    end
+
+    ui -->|calls| service
+    service -->|uses| dao
+    service -->|uses| peripheral
+    service -->|uses| utils
+    ui -->|uses| utils
+
+    dao -->|reads/writes| extdb
+    peripheral -->|controls| devices
+    service -->|reads/writes| extfs
+    ui -->|reads/writes| extfs
+
+    style app fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
+    style ui fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style service fill:#50C878,stroke:#2D7A4A,color:#fff
+    style dao fill:#FF9F43,stroke:#B8690F,color:#fff
+    style peripheral fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style utils fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style external fill:#F0F0F0,stroke:#666
+    style extdb fill:#FFB84D,stroke:#8B6914,color:#fff
+    style extfs fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
+```
+
+---
+
+## Level 3: Component Architecture
+
+### Sales Module
+
+```mermaid
+graph LR
+    subgraph sales["com.unicenta.pos.sales"]
+        simple["simple/<br/>Simple POS Mode"]
+        restaurant["restaurant/<br/>Table/Order Mode"]
+        shared["shared/<br/>Shared Ticket Logic"]
+    end
+
+    simple -.-> shared
+    restaurant -.-> shared
+
+    style sales fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style simple fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style restaurant fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style shared fill:#6BB3E0,stroke:#2E5C8A,color:#fff
+```
+
+### Inventory & Catalog Modules
+
+```mermaid
+graph TB
+    subgraph inventory["com.unicenta.pos.inventory"]
+        inv_prod["Product Management"]
+        inv_stock["Stock Tracking"]
+        inv_cat["Category Management"]
+    end
+
+    subgraph catalog["com.unicenta.pos.catalog"]
+        cat_prod["Product Categorization"]
+        cat_search["Product Search/Filter"]
+        cat_display["Display Management"]
+    end
+
+    inv_prod ---|shared data| cat_prod
+    inv_cat ---|manages| cat_display
+
+    style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
+    style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inv_prod fill:#68D989,stroke:#2D7A4A,color:#fff
+    style inv_stock fill:#68D989,stroke:#2D7A4A,color:#fff
+    style inv_cat fill:#68D989,stroke:#2D7A4A,color:#fff
+    style cat_prod fill:#68D989,stroke:#2D7A4A,color:#fff
+    style cat_search fill:#68D989,stroke:#2D7A4A,color:#fff
+    style cat_display fill:#68D989,stroke:#2D7A4A,color:#fff
+```
+
+### Ticket & Payment Processing
+
+```mermaid
+graph TB
+    subgraph ticket["com.unicenta.pos.ticket"]
+        ticket_create["Ticket Creation"]
+        ticket_items["Line Items Mgmt"]
+        ticket_lifecycle["Lifecycle Management"]
+    end
+
+    subgraph payment["com.unicenta.pos.payment"]
+        pay_method["Payment Methods"]
+        pay_process["Payment Processing"]
+        pay_card["Card Integration"]
+    end
+
+    ticket_create -->|on completion| pay_method
+    ticket_items -->|on finalize| pay_process
+    pay_process -->|if card| pay_card
+
+    style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
+    style payment fill:#FF9F43,stroke:#B8690F,color:#fff
+    style ticket_create fill:#FDB44B,stroke:#B8690F,color:#fff
+    style ticket_items fill:#FDB44B,stroke:#B8690F,color:#fff
+    style ticket_lifecycle fill:#FDB44B,stroke:#B8690F,color:#fff
+    style pay_method fill:#FDB44B,stroke:#B8690F,color:#fff
+    style pay_process fill:#FDB44B,stroke:#B8690F,color:#fff
+    style pay_card fill:#FDB44B,stroke:#B8690F,color:#fff
+```
+
+### Reporting & Administration
+
+```mermaid
+graph TB
+    subgraph reports["com.unicenta.pos.reports"]
+        report_gen["Report Generation"]
+        report_chart["Chart Generation<br/>JFreeChart"]
+        report_export["PDF/Excel Export"]
+    end
+
+    subgraph admin["com.unicenta.pos.admin"]
+        admin_user["User Management"]
+        admin_config["System Configuration"]
+        admin_security["Access Control"]
+    end
+
+    report_gen -->|uses| report_chart
+    report_chart -->|renders to| report_export
+    admin_user -->|applies| admin_security
+
+    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style report_gen fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style report_chart fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style report_export fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style admin_user fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style admin_config fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style admin_security fill:#B76AC2,stroke:#5B2C6F,color:#fff
+```
+
+### Printer System
+
+```mermaid
+graph LR
+    subgraph printer["com.unicenta.pos.printer"]
+        escpos["escpos/<br/>ESC-POS Driver"]
+        javapos["javapos/<br/>JavaPOS Driver"]
+        screen["screen/<br/>Screen Preview"]
+    end
+
+    reports["JasperReports<br/>JFreeChart"]
+
+    reports -->|routes to| escpos
+    reports -->|routes to| javapos
+    reports -->|routes to| screen
+
+    style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style escpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style javapos fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style screen fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
+```
+
+### Communication & Integration
+
+```mermaid
+graph TB
+    subgraph comm["com.unicenta.pos.comm"]
+        serial["Serial Communication<br/>RXTX • jSerialComm"]
+        usb["USB Communication<br/>USB4Java"]
+    end
+
+    scale["Scale Reader"]
+    scanner["Barcode Scanner<br/>ZXing"]
+    reader["Card Reader"]
+
+    serial -->|reads| scale
+    serial -->|reads| scanner
+    usb -->|reads| reader
+
+    style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style serial fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style usb fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style scale fill:#D9534F,stroke:#A53D3D,color:#fff
+    style scanner fill:#D9534F,stroke:#A53D3D,color:#fff
+    style reader fill:#D9534F,stroke:#A53D3D,color:#fff
+```
+
+---
+
+## Level 4: Data Flow Diagrams
+
+### Sales Transaction Flow
+
+```mermaid
+sequenceDiagram
+    actor User as POS Operator
+    participant UI as Sales Screen
+    participant Service as Sales Service
+    participant DAO as TicketDAO
+    participant DB as Database
+    participant Payment as Payment Service
+    participant Printer as Printer Service
+
+    User->>UI: Create/Edit Ticket
+    UI->>Service: Process Ticket
+    Service->>DAO: Save Ticket
+    DAO->>DB: INSERT/UPDATE
+    DB-->>DAO: Confirm
+    DAO-->>Service: Ticket ID
+    User->>UI: Process Payment
+    UI->>Service: Payment Request
+    Service->>Payment: Process Payment
+    Payment-->>Service: Payment Confirmed
+    Service->>Printer: Print Receipt
+    Printer-->>Service: Print Complete
+    Service-->>UI: Transaction Complete
+    UI-->>User: Display Confirmation
+```
+
+### Product Lookup Flow
+
+```mermaid
+sequenceDiagram
+    actor Device as Barcode Scanner
+    participant UI as Sales Screen
+    participant DAO as ProductDAO
+    participant DB as Database
+
+    Device->>UI: Scan Barcode
+    UI->>DAO: Query Product
+    DAO->>DB: SELECT Product
+    DB-->>DAO: Product Data
+    DAO-->>UI: Product Details
+    UI-->>Device: Display Product Info
+```
+
+### Report Generation Flow
+
+```mermaid
+sequenceDiagram
+    actor User as Admin/Manager
+    participant UI as Admin Panel
+    participant Service as Reporting Service
+    participant JasperReports as JasperReports Engine
+    participant DB as Database
+    participant FileSystem as File System
+
+    User->>UI: Request Report
+    UI->>Service: Generate Report
+    Service->>DB: Query Data
+    DB-->>Service: Report Data
+    Service->>JasperReports: Render Report
+    JasperReports->>FileSystem: Generate PDF/Excel
+    FileSystem-->>JasperReports: File Path
+    JasperReports-->>Service: Report Ready
+    Service-->>UI: Display/Download
+    UI-->>User: Provide Report
+```
+
+---
+
+## Level 5: Package Structure
+
+```mermaid
+graph TB
+    com["com.unicenta"]
+
+    com -->|core| basic["basic<br/>Exception Handling<br/>Logging"]
+    com -->|ui| beans["beans<br/>Custom UI Components<br/>Dialogs • Date Pickers<br/>Number Pads"]
+    com -->|ui| orderpop["orderpop<br/>Order Popup Module"]
+    com -->|plugins| plugins["plugins<br/>Plugin Architecture<br/>Metrics System"]
+
+    pos["com.unicenta.pos"]
+    com -->|main| pos
+
+    pos -->|sales| sales["sales<br/>Simple • Restaurant<br/>Shared Modes"]
+    pos -->|inventory| inventory["inventory<br/>Products • Stock<br/>Categories"]
+    pos -->|customers| customers["customers<br/>Customer Management<br/>Loyalty Programs"]
+    pos -->|catalog| catalog["catalog<br/>Product Catalog<br/>Display Management"]
+    pos -->|ticket| ticket["ticket<br/>Ticket Lifecycle<br/>Line Items"]
+    pos -->|payment| payment["payment<br/>Payment Methods<br/>Card Integration<br/>Cash Handling"]
+    pos -->|reports| reports["reports<br/>JasperReports<br/>JFreeChart<br/>PDF/Excel Export"]
+    pos -->|admin| admin["admin<br/>User Management<br/>System Configuration<br/>Access Control"]
+    pos -->|printer| printer["printer<br/>ESC-POS • JavaPOS<br/>Screen Preview"]
+    pos -->|comm| comm["comm<br/>Serial • USB<br/>Scale • Scanner<br/>Card Reader"]
+    pos -->|scripting| scripting["scripting<br/>BeanShell<br/>Custom Logic"]
+    pos -->|forms| forms["forms<br/>Main UI<br/>Data Entry Forms"]
+    pos -->|config| config["config<br/>Configuration Mgmt<br/>Settings"]
+    pos -->|instance| instance["instance<br/>Instance Management<br/>Singleton Patterns"]
+    pos -->|mant| mant["mant<br/>Maintenance<br/>Utilities"]
+
+    style com fill:#E8F4F8,stroke:#2E5C8A
+    style pos fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style basic fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style beans fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style orderpop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style plugins fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style sales fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
+    style customers fill:#50C878,stroke:#2D7A4A,color:#fff
+    style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
+    style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
+    style payment fill:#FF9F43,stroke:#B8690F,color:#fff
+    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style scripting fill:#FFB84D,stroke:#8B6914,color:#fff
+    style forms fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style config fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style instance fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style mant fill:#4A90E2,stroke:#2E5C8A,color:#fff
+```
+
+---
+
+## Level 6: Database Schema Overview
+
+```mermaid
+graph TB
+    subgraph core["CORE ENTITIES"]
+        company["COMPANY<br/>company_id<br/>name<br/>code"]
+        location["LOCATION<br/>location_id<br/>name<br/>address"]
+        products["PRODUCTS<br/>product_id<br/>name<br/>code<br/>price"]
+        categories["CATEGORIES<br/>category_id<br/>name<br/>description"]
+    end
+
+    subgraph transactions["TRANSACTION ENTITIES"]
+        tickets["TICKETS<br/>ticket_id<br/>number<br/>date<br/>customer_id"]
+        lines["TICKETLINES<br/>line_id<br/>ticket_id<br/>product_id<br/>qty"]
+        payments["PAYMENTS<br/>payment_id<br/>ticket_id<br/>method<br/>amount"]
+    end
+
+    subgraph master["MASTER DATA"]
+        customers["CUSTOMERS<br/>customer_id<br/>name<br/>email<br/>phone"]
+        suppliers["SUPPLIERS<br/>supplier_id<br/>name<br/>contact<br/>products"]
+        employees["EMPLOYEES<br/>employee_id<br/>name<br/>role<br/>access_level"]
+        taxes["TAXCATEGORIES<br/>tax_id<br/>name<br/>rate"]
+    end
+
+    subgraph inventory["INVENTORY ENTITIES"]
+        stock["STOCK<br/>stock_id<br/>product_id<br/>location_id<br/>quantity"]
+        movements["STOCKMOVEMENTS<br/>movement_id<br/>product_id<br/>qty<br/>type"]
+    end
+
+    company -->|operates| location
+    location -->|manages| products
+    products -->|in| categories
+    location -->|in| stock
+    products -->|in| stock
+
+    customers -->|creates| tickets
+    employees -->|processes| tickets
+    products -->|in| lines
+    tickets -->|contains| lines
+    tickets -->|has| payments
+    tickets -->|has| taxes
+
+    products -->|from| suppliers
+    stock -->|tracks| movements
+
+    style core fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style transactions fill:#FF9F43,stroke:#B8690F,color:#fff
+    style master fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inventory fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style company fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style location fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style products fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style categories fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style tickets fill:#FDB44B,stroke:#B8690F,color:#fff
+    style lines fill:#FDB44B,stroke:#B8690F,color:#fff
+    style payments fill:#FDB44B,stroke:#B8690F,color:#fff
+    style customers fill:#68D989,stroke:#2D7A4A,color:#fff
+    style suppliers fill:#68D989,stroke:#2D7A4A,color:#fff
+    style employees fill:#68D989,stroke:#2D7A4A,color:#fff
+    style taxes fill:#68D989,stroke:#2D7A4A,color:#fff
+    style stock fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style movements fill:#B76AC2,stroke:#5B2C6F,color:#fff
+```
+
+---
+
+## Technology Stack
+
+```mermaid
+graph TB
+    subgraph frontend["FRONTEND"]
+        swing["Swing<br/>Traditional UI"]
+        javafx["JavaFX<br/>Modern UI"]
+        flatlaf["FlatLAF<br/>Modern Look & Feel"]
+    end
+
+    subgraph backend["BACKEND"]
+        java["Java 8+<br/>Core Logic"]
+        lombok["Lombok<br/>Boilerplate Reduction"]
+        beanshell["BeanShell<br/>Dynamic Scripting"]
+    end
+
+    subgraph data["DATA & PERSISTENCE"]
+        jdbc["JDBC<br/>Database Abstraction"]
+        mysql["MySQL<br/>Primary Database"]
+        derby["Derby<br/>Embedded DB"]
+        sqlite["SQLite<br/>Lightweight DB"]
+        postgres["PostgreSQL<br/>Enterprise DB"]
+    end
+
+    subgraph reporting["REPORTING & ANALYTICS"]
+        jasper["JasperReports<br/>Report Generation"]
+        jfreechart["JFreeChart<br/>Charts & Graphs"]
+        poi["Apache POI<br/>Excel Export"]
+        itext["iText<br/>PDF Generation"]
+    end
+
+    subgraph devices["DEVICE INTEGRATION"]
+        rxtx["RXTX/jSerialComm<br/>Serial Communication"]
+        usb4j["USB4Java<br/>USB Communication"]
+        zxing["ZXing<br/>Barcode Processing"]
+        jpos["JavaPOS<br/>POS Device Standard"]
+    end
+
+    subgraph support["SUPPORT LIBRARIES"]
+        logback["Logback<br/>Logging"]
+        gson["GSON<br/>JSON Processing"]
+        xstream["XStream<br/>XML Serialization"]
+        velocity["Apache Velocity<br/>Template Engine"]
+    end
+
+    style frontend fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style backend fill:#50C878,stroke:#2D7A4A,color:#fff
+    style data fill:#FF9F43,stroke:#B8690F,color:#fff
+    style reporting fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style support fill:#FFB84D,stroke:#8B6914,color:#fff
+
+    style swing fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style javafx fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style flatlaf fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style java fill:#68D989,stroke:#2D7A4A,color:#fff
+    style lombok fill:#68D989,stroke:#2D7A4A,color:#fff
+    style beanshell fill:#68D989,stroke:#2D7A4A,color:#fff
+    style jdbc fill:#FDB44B,stroke:#B8690F,color:#fff
+    style mysql fill:#FDB44B,stroke:#B8690F,color:#fff
+    style derby fill:#FDB44B,stroke:#B8690F,color:#fff
+    style sqlite fill:#FDB44B,stroke:#B8690F,color:#fff
+    style postgres fill:#FDB44B,stroke:#B8690F,color:#fff
+    style jasper fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style jfreechart fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style poi fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style itext fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style rxtx fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style usb4j fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style zxing fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style jpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style logback fill:#F5B041,stroke:#8B6914,color:#fff
+    style gson fill:#F5B041,stroke:#8B6914,color:#fff
+    style xstream fill:#F5B041,stroke:#8B6914,color:#fff
+    style velocity fill:#F5B041,stroke:#8B6914,color:#fff
+```
+
+---
+
+## Key Architectural Patterns
+
+```mermaid
+graph TB
+    subgraph patterns["DESIGN PATTERNS"]
+        dao_pat["📋 DAO Pattern<br/>Data Abstraction"]
+        service_pat["🔧 Service Pattern<br/>Business Logic"]
+        singleton_pat["🎯 Singleton Pattern<br/>Resource Management"]
+        factory_pat["🏭 Factory Pattern<br/>Object Creation"]
+        plugin_pat["🔌 Plugin Pattern<br/>Extensibility"]
+    end
+
+    subgraph layers["ARCHITECTURAL LAYERS"]
+        presentation["📱 Presentation<br/>UI Components"]
+        business["💼 Business Logic<br/>Services"]
+        data["💾 Data Access<br/>DAOs & Queries"]
+        external["🔌 External Integration<br/>Devices & Files"]
+    end
+
+    subgraph principles["DESIGN PRINCIPLES"]
+        sep_concern["Separation of Concerns<br/>Distinct responsibilities"]
+        loose_coupling["Loose Coupling<br/>Independent modules"]
+        high_cohesion["High Cohesion<br/>Related functionality"]
+        abstraction["Abstraction<br/>Hide complexity"]
+    end
+
+    presentation -->|calls| business
+    business -->|uses| data
+    business -->|uses| external
+
+    dao_pat -->|implements| data
+    service_pat -->|implements| business
+    singleton_pat -->|ensures| resource_management["Resource<br/>Management"]
+    factory_pat -->|creates| objects["Objects"]
+    plugin_pat -->|enables| extensions["Extensions"]
+
+    style patterns fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style layers fill:#50C878,stroke:#2D7A4A,color:#fff
+    style principles fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style dao_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style service_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style singleton_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style factory_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style plugin_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style presentation fill:#68D989,stroke:#2D7A4A,color:#fff
+    style business fill:#68D989,stroke:#2D7A4A,color:#fff
+    style data fill:#68D989,stroke:#2D7A4A,color:#fff
+    style external fill:#68D989,stroke:#2D7A4A,color:#fff
+    style sep_concern fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style loose_coupling fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style high_cohesion fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style abstraction fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style resource_management fill:#FFB84D,stroke:#8B6914,color:#fff
+    style objects fill:#FFB84D,stroke:#8B6914,color:#fff
+    style extensions fill:#FFB84D,stroke:#8B6914,color:#fff
+```
+
+---
+
+## Core Features Architecture
+
+```mermaid
+graph TB
+    system["🏪 Unicenta oPOS<br/>Enterprise POS System"]
+
+    system -->|Sales Management| sales_feat["Sales Processing<br/>Multiple modes<br/>Ticket management<br/>Payment handling"]
+
+    system -->|Inventory Management| inventory_feat["Product Management<br/>Stock tracking<br/>Category organization<br/>Quantity monitoring"]
+
+    system -->|Customer Management| customer_feat["Customer Database<br/>Transaction history<br/>Loyalty programs<br/>Communication"]
+
+    system -->|Supplier Management| supplier_feat["Supplier Directory<br/>Purchase orders<br/>Product sourcing<br/>Vendor info"]
+
+    system -->|Employee Management| employee_feat["User Accounts<br/>Access Control<br/>Role Assignment<br/>Activity Logging"]
+
+    system -->|Reporting & Analytics| reporting_feat["Sales Reports<br/>Inventory Reports<br/>Financial Reports<br/>Charts & Graphs"]
+
+    system -->|Device Integration| device_feat["Thermal Printers<br/>Barcode Scanners<br/>Weight Scales<br/>Card Readers"]
+
+    system -->|Multi-platform| platform_feat["Windows Support<br/>Linux Support<br/>macOS Support<br/>Cross-platform UI"]
+
+    style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
+    style sales_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inventory_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style customer_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style supplier_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style employee_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style reporting_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style device_feat fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style platform_feat fill:#FFB84D,stroke:#8B6914,color:#fff
+```
+
+---
+
+## Deployment Architecture
+
+```mermaid
+graph TB
+    subgraph client["CLIENT TIER"]
+        desktop["💻 Desktop Machine<br/>Windows • Linux • macOS<br/>Java Runtime (JRE 8+)"]
+    end
+
+    subgraph app_tier["APPLICATION TIER"]
+        jar["📦 unicentaopos.jar<br/>Version 5.4.0<br/>Java Swing/JavaFX"]
+    end
+
+    subgraph data_tier["DATA TIER"]
+        db_choice["Database Engine<br/>MySQL 5.x<br/>Derby<br/>SQLite<br/>PostgreSQL"]
+        db_instance["Database Instance<br/>Schema: unicentaopos<br/>Tables & Indexes"]
+    end
+
+    subgraph files["FILE STORAGE"]
+        reports_dir["📁 Reports Directory<br/>Generated PDFs<br/>Excel Files"]
+        config_dir["📁 Config Directory<br/>Application Settings<br/>User Preferences"]
+        templates["📁 Templates<br/>Report Templates<br/>Print Layouts"]
+        locales["📁 Localization<br/>Language Files<br/>i18n Resources"]
+    end
+
+    desktop -->|runs| jar
+    jar -->|connects to| db_choice
+    db_choice -->|manages| db_instance
+    jar -->|reads/writes| reports_dir
+    jar -->|reads/writes| config_dir
+    jar -->|reads| templates
+    jar -->|reads| locales
+
+    style client fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
+    style app_tier fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:2px
+    style data_tier fill:#FF9F43,stroke:#B8690F,color:#fff,stroke-width:2px
+    style files fill:#9B59B6,stroke:#5B2C6F,color:#fff,stroke-width:2px
+    style desktop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style jar fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style db_choice fill:#FDB44B,stroke:#B8690F,color:#fff
+    style db_instance fill:#FDB44B,stroke:#B8690F,color:#fff
+    style reports_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style config_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style templates fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style locales fill:#B76AC2,stroke:#5B2C6F,color:#fff
+```
+
+---
+
+## Quick Start
+
+### Prerequisites
+
+- Java 8+ (JRE)
+- MySQL 5.x (or Derby/SQLite/PostgreSQL)
+- Create database schema: `unicentaopos`
+
+### Build
+
+```bash
+mvn clean package
+```
+
+### Run
+
+```bash
+java -jar ./target/unicentaopos.jar
+```
+
+### Platform Support
+
+- ✅ Windows
+- ✅ Linux
+- ✅ macOS
+
+---
+
+## Summary
+
+**Unicenta oPOS** is a layered, modular Java desktop application with clear separation between:
+
+1. **Presentation Layer** - Swing/JavaFX UI
+2. **Service Layer** - Business logic & orchestration
+3. **Data Access Layer** - DAO pattern for database abstraction
+4. **Peripheral Integration** - Hardware device drivers
+5. **Support Layer** - Utilities, logging, plugins
+
+The architecture supports **multi-database backends**, **multiple POS sales modes** (simple, restaurant), **comprehensive reporting**, and **extensive peripheral device integration**, making it a flexible, enterprise-grade point-of-sale system.

mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -4,13 +4,13 @@
 
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.3.2</version>
+  <version>5.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.target>1.8</maven.compiler.target>
-    <derby.version>10.15.2.0</derby.version>
+    <derby.version>10.14.2.0</derby.version>
   </properties>
   <dependencies>
     <dependency>
@@ -111,24 +111,6 @@
       <artifactId>itext</artifactId>
       <version>2.1.7</version>
     </dependency>
-
-    <dependency>
-      <groupId>net.sf.jasperreports</groupId>
-      <artifactId>jasperreports</artifactId>
-      <version>6.15.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.lowagie</groupId>
-          <artifactId>itext</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jasperreports</groupId>
-      <artifactId>jasperreports-fonts</artifactId>
-      <version>6.15.0</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
@@ -140,13 +122,6 @@
       <artifactId>poi-ooxml</artifactId>
       <version>3.17</version>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
-      <artifactId>xmlbeans</artifactId>
-      <version>5.1.1</version>
-    </dependency>
-
     <dependency>
       <groupId>net.sf.barcode4j</groupId>
       <artifactId>barcode4j</artifactId>
@@ -280,11 +255,11 @@
       <artifactId>derbytools</artifactId>
       <version>${derby.version}</version>
     </dependency>
-    <dependency>
+<!--    <dependency>-->
-      <groupId>org.apache.derby</groupId>
+<!--      <groupId>org.apache.derby</groupId>-->
-      <artifactId>derbyshared</artifactId>
+<!--      <artifactId>derbyshared</artifactId>-->
-      <version>${derby.version}</version>
+<!--      <version>${derby.version}</version>-->
-    </dependency>
+<!--    </dependency>-->
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
@@ -297,7 +272,22 @@
       <artifactId>fop</artifactId>
       <version>2.3</version>
     </dependency>
-
+    <dependency>
+      <groupId>net.sf.jasperreports</groupId>
+      <artifactId>jasperreports</artifactId>
+      <version>6.12.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.lowagie</groupId>
+          <artifactId>itext</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jasperreports</groupId>
+      <artifactId>jasperreports-fonts</artifactId>
+      <version>6.0.0</version>
+    </dependency>
     <dependency>
       <groupId>ar.com.fdvs</groupId>
       <artifactId>DynamicJasper-core-fonts</artifactId>
@@ -371,7 +361,7 @@
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.2.7</version>
+      <version>1.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>

src/main/java/com/unicenta/data/loader/StaticSentence.java

@@ -34,7 +34,6 @@ import java.util.regex.Pattern;
 @Slf4j
 public class StaticSentence extends JDBCSentence {
 
-
   private ISQLBuilderStatic iSQLBuilder;
 
   /**
@@ -136,13 +135,13 @@ public class StaticSentence extends JDBCSentence {
         return sqliteSQL.toString();
       }
 
-        }
+    } catch (Exception e) {
-        catch (Exception e) {
       log.error("Error fixing sql for sqlite {}", e.getMessage());
       return sql;
     }
     return sql;
   }
+
   /**
    * @param params
    * @return
@@ -156,8 +155,10 @@ public class StaticSentence extends JDBCSentence {
     closeExec();
 
     try {
-
+      // follow this to find the create category bug when importing a product csv
-            String sentence = fixSqliteDate(iSQLBuilder.getSQL(m_SerWrite, params));
+      // https://unicenta.atlassian.net/browse/UOCL-317
+      String sql = iSQLBuilder.getSQL(m_SerWrite, params);
+      String sentence = fixSqliteDate(sql);
       // String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
 
       statement = session.getConnection().createStatement();

src/main/java/com/unicenta/pos/admin/DataLogicAdmin.java

@@ -50,10 +50,12 @@ public class DataLogicAdmin extends BeanFactoryDataSingle {
         
         m_tpeople = new TableDefinition(s,
             "people"
-            , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE"}
+            , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE", "TAXID"}
-            , new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"), AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"), AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage")}
+            , new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"),
-            , new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE}
+                AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"),
-            , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL}
+                AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage"), "tax ID"}
+            , new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE, Datas.STRING}
+            , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL, Formats.STRING}
             , new int[] {0}
         );   
                         

src/main/java/com/unicenta/pos/admin/PeopleView.form

@@ -52,16 +52,18 @@
                   <Group type="102" alignment="0" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                          <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="passwordLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="taxIdLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="taxIdTextField" min="-2" pref="180" max="-2" attributes="0"/>
                           <Component id="jButton1" min="-2" max="-2" attributes="0"/>
                           <Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
                       </Group>
                   </Group>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace pref="50" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -75,10 +77,15 @@
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="2" attributes="0">
-                  <Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="passwordLabel" alignment="2" min="-2" max="-2" attributes="0"/>
                   <Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="taxIdTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="taxIdLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="2" attributes="0">
                   <Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
                   <Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
@@ -99,7 +106,7 @@
                   <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
                   <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace pref="110" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -246,8 +253,11 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+    <Component class="javax.swing.JComboBox" name="webCBSecurity">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Arial" size="14" style="0"/>
+        </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="3">
             <StringItem index="0" value="Generate new key"/>
@@ -261,9 +271,6 @@
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&quot;tooltip.peoplesecurity&quot;)"/>
         </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Arial" size="14" style="0"/>
-        </Property>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[140, 45]"/>
         </Property>
@@ -272,7 +279,7 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel6">
+    <Component class="javax.swing.JLabel" name="passwordLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -285,5 +292,23 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JTextField" name="taxIdTextField">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Arial" size="14" style="0"/>
+        </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[0, 30]"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="taxIdLabel">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Arial" size="14" style="0"/>
+        </Property>
+        <Property name="text" type="java.lang.String" value="Tax ID"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>

src/main/java/com/unicenta/pos/admin/PeopleView.java

@@ -52,9 +52,12 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   private final ComboBoxValModel m_ReasonModel;
 
-    /** Creates new form PeopleEditor
+  /**
+   * Creates new form PeopleEditor
+   * 
    * @param dlAdmin
-     * @param dirty */
+   * @param dirty
+   */
   public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
     initComponents();
@@ -77,6 +80,7 @@ public class PeopleView extends JPanel implements EditorRecord {
 
     webCBSecurity.setModel(m_ReasonModel);
 
+    taxIdTextField.getDocument().addDocumentListener(dirty);
     writeValueEOF();
   }
 
@@ -92,6 +96,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jVisible.setSelected(false);
     m_jcard.setText(null);
     m_jImage.setImage(null);
+    taxIdTextField.setText(null);
     m_jName.setEnabled(false);
     m_jRole.setEnabled(false);
     m_jVisible.setEnabled(false);
@@ -99,6 +104,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jImage.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
+    taxIdTextField.setEnabled(false);
   }
 
   /**
@@ -113,6 +119,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jVisible.setSelected(true);
     m_jcard.setText(null);
     m_jImage.setImage(null);
+    taxIdTextField.setText(null);
     m_jName.setEnabled(true);
     m_jRole.setEnabled(true);
     m_jVisible.setEnabled(true);
@@ -120,6 +127,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jImage.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
+    taxIdTextField.setEnabled(true);
   }
 
   /**
@@ -136,6 +144,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
     m_jcard.setText(Formats.STRING.formatValue(people[5]));
     m_jImage.setImage((BufferedImage) people[6]);
+    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
 
     m_jName.setEnabled(false);
     m_jRole.setEnabled(false);
@@ -144,6 +153,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jImage.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
+    taxIdTextField.setEnabled(false);
   }
 
   /**
@@ -160,13 +170,13 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
     m_jcard.setText(Formats.STRING.formatValue(people[5]));
     m_jImage.setImage((BufferedImage) people[6]);
-        
+    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
     if (m_jcard.getText().length() == 16) {
       jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
     } else {
       jLblCardID.setText(AppLocal.getIntString("label.card"));
     }
-        System.out.println(m_jcard.getText().length());        
+    // System.out.println(m_jcard.getText().length());
 
     m_jName.setEnabled(true);
     m_jRole.setEnabled(true);
@@ -175,6 +185,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jImage.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
+    taxIdTextField.setEnabled(true);
   }
 
   /**
@@ -184,7 +195,7 @@ public class PeopleView extends JPanel implements EditorRecord {
    */
   @Override
   public Object createValue() throws BasicException {
-        Object[] people = new Object[7];
+    Object[] people = new Object[8];
     people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
     people[1] = Formats.STRING.parseValue(m_jName.getText());
     people[2] = Formats.STRING.parseValue(m_sPassword);
@@ -192,6 +203,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     people[4] = m_jVisible.isSelected();
     people[5] = Formats.STRING.parseValue(m_jcard.getText());
     people[6] = m_jImage.getImage();
+    people[7] = Formats.STRING.parseValue(taxIdTextField.getText());
     return people;
   }
 
@@ -214,7 +226,6 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jRole.setModel(m_RoleModel);
   }
 
-   
   /**
    *
    */
@@ -222,12 +233,15 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void refresh() {
   }
 
-    /** This method is called from within the constructor to
+  /**
+   * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
     jLabel1 = new javax.swing.JLabel();
@@ -241,8 +255,10 @@ public class PeopleView extends JPanel implements EditorRecord {
     jLabel2 = new javax.swing.JLabel();
     m_jcard = new javax.swing.JTextField();
     jLblCardID = new javax.swing.JLabel();
-        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
+    webCBSecurity = new javax.swing.JComboBox();
-        jLabel6 = new javax.swing.JLabel();
+    passwordLabel = new javax.swing.JLabel();
+    taxIdTextField = new javax.swing.JTextField();
+    taxIdLabel = new javax.swing.JLabel();
 
     setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
     setPreferredSize(new java.awt.Dimension(500, 500));
@@ -299,10 +315,11 @@ public class PeopleView extends JPanel implements EditorRecord {
     jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
     jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
 
-        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
+    webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(
+        new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
     webCBSecurity.setSelectedIndex(0);
     webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
-        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
     webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
       public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -310,9 +327,15 @@ public class PeopleView extends JPanel implements EditorRecord {
       }
     });
 
-        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
+    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
-        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
+    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+
+    taxIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    taxIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+
+    taxIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    taxIdLabel.setText("Tax ID");
 
     javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
     this.setLayout(layout);
@@ -322,63 +345,95 @@ public class PeopleView extends JPanel implements EditorRecord {
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addGap(18, 18, 18)
-                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207,
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(webCBSecurity, 0, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
-                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(taxIdLabel))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
-                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                                javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap())
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
-        );
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                                javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap(50, Short.MAX_VALUE)));
     layout.setVerticalGroup(
         layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addGap(18, 18, 18)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(taxIdLabel))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
-                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addGap(15, 15, 15)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-        );
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(110, Short.MAX_VALUE)));
   }// </editor-fold>//GEN-END:initComponents
 
   private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
@@ -393,14 +448,12 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
 
-
     if (webCBSecurity.getSelectedIndex() == 0) {
       if (JOptionPane.showConfirmDialog(this,
           AppLocal.getIntString("message.cardnew"),
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            {  
         m_jcard.setText("C" + StringUtils.getCardNumber());
         m_Dirty.setDirty(true);
       }
@@ -411,8 +464,7 @@ public class PeopleView extends JPanel implements EditorRecord {
           AppLocal.getIntString("message.cardremove"),
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            {  
         m_jcard.setText(null);
         m_Dirty.setDirty(true);
       }
@@ -447,21 +499,22 @@ public class PeopleView extends JPanel implements EditorRecord {
     }
   }// GEN-LAST:event_jLabel1MouseClicked
 
-    
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private javax.swing.JButton jButton1;
   private javax.swing.JLabel jLabel1;
   private javax.swing.JLabel jLabel2;
   private javax.swing.JLabel jLabel3;
   private javax.swing.JLabel jLabel4;
-    private javax.swing.JLabel jLabel6;
   private javax.swing.JLabel jLblCardID;
   private com.unicenta.data.gui.JImageEditor m_jImage;
   private javax.swing.JTextField m_jName;
   private javax.swing.JComboBox m_jRole;
   private javax.swing.JCheckBox m_jVisible;
   private javax.swing.JTextField m_jcard;
-    private com.alee.laf.combobox.WebComboBox webCBSecurity;
+  private javax.swing.JLabel passwordLabel;
+  private javax.swing.JLabel taxIdLabel;
+  private javax.swing.JTextField taxIdTextField;
+  private javax.swing.JComboBox webCBSecurity;
   // End of variables declaration//GEN-END:variables
 
 }

src/main/java/com/unicenta/pos/forms/AppLocal.java

@@ -30,7 +30,7 @@ public class AppLocal {
 
     public static final String APP_NAME = "uniCenta oPOS";
     public static final String APP_ID = "unicentaopos";
-    public static final String APP_VERSION = "5.3.2";
+    public static final String APP_VERSION = "5.4.0";
 
     private static final LocaleResources m_resources;
 

src/main/java/com/unicenta/pos/forms/AppUser.java

@@ -55,6 +55,7 @@ public class AppUser {
   private final Icon m_Icon;
 
   private Set<String> m_apermissions;
+  private String taxId;
 
   static {
     initOldClasses();
@@ -70,7 +71,7 @@ public class AppUser {
    * @param icon
    * @param role
    */
-  public AppUser(String id, String name, String password, String card, String role, Icon icon) {
+  public AppUser(String id, String name, String password, String card, String role, Icon icon, String taxId) {
     m_sId = id;
     m_sName = name;
     m_sPassword = password;
@@ -78,6 +79,7 @@ public class AppUser {
     m_sRole = role;
     m_Icon = icon;
     m_apermissions = null;
+    this.taxId = taxId;
   }
 
   /**
@@ -199,7 +201,7 @@ public class AppUser {
    * @return
    */
   public UserInfo getUserInfo() {
-    return new UserInfo(m_sId, m_sName);
+    return new UserInfo(m_sId, m_sName, this.taxId);
   }
 
   private static String mapNewClass(String classname) {
@@ -222,7 +224,8 @@ public class AppUser {
 
     m_oldclasses.put("Menu.StockManagement", "com.unicenta.pos.forms.MenuStockManagement");
     m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsPanel", "com.unicenta.pos.inventory.ProductsPanel");
-    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel", "com.unicenta.pos.inventory.ProductsWarehousePanel");
+    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel",
+        "com.unicenta.pos.inventory.ProductsWarehousePanel");
     m_oldclasses.put("net.adrianromero.tpv.inventory.CategoriesPanel", "com.unicenta.pos.inventory.CategoriesPanel");
     m_oldclasses.put("net.adrianromero.tpv.panels.JPanelTax", "com.unicenta.pos.inventory.TaxPanel");
     m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel");
@@ -300,5 +303,4 @@ public class AppUser {
     }
   }
 
-
 }

src/main/java/com/unicenta/pos/forms/DataLogicSales.java

@@ -197,7 +197,7 @@ public class DataLogicSales extends BeanFactoryDataSingle {
                 , new SerializerWriteBasic(new Datas[]{
                 Datas.STRING,
                 Datas.STRING,
-                Datas.BOOLEAN})
+                Datas.INT})
         );
 
         m_createSupp = new StaticSentence(s,
@@ -635,6 +635,22 @@ public class DataLogicSales extends BeanFactoryDataSingle {
 
     }
 
+    public final CategoryInfo getCategoryInfoByName(String name) throws BasicException {
+        return (CategoryInfo) new PreparedSentence(s
+          , "SELECT "
+          + "ID, "
+          + "NAME, "
+          + "IMAGE, "
+          + "TEXTTIP, "
+          + "CATSHOWNAME, "
+          + "CATORDER "
+          + "FROM categories "
+          + "WHERE NAME = ? "
+          + "ORDER BY CATORDER, NAME"
+          , SerializerWriteString.INSTANCE
+          , CategoryInfo.getSerializerRead()).find(name);
+    }
+
     /**
      *
      * @param id

src/main/java/com/unicenta/pos/forms/DataLogicSystem.java

@@ -121,7 +121,8 @@ public class DataLogicSystem extends BeanFactoryDataSingle {
                 dr.getString(3),
                 dr.getString(4),
                 dr.getString(5),
-                new ImageIcon(tnb.getThumbNail(ImageUtils.readImage(dr.getBytes(6)))));
+                new ImageIcon(tnb.getThumbNail(ImageUtils.readImage(dr.getBytes(6)))),
+          dr.getString(7));
    
 // START OF PRODUCT ************************************************************      
         productIdRead =(DataRead dr) -> (                       
@@ -208,12 +209,12 @@ public class DataLogicSystem extends BeanFactoryDataSingle {
  // END OF CUSTOMER ******************************************************************      
        
         m_peoplevisible = new StaticSentence(s
-            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
+            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
             , null
             , peopleread);
 
         m_peoplebycard = new PreparedSentence(s
-            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE()
+            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE()
             , SerializerWriteString.INSTANCE
             , peopleread);
          

src/main/java/com/unicenta/pos/forms/JPrincipalApp.form

@@ -21,7 +21,7 @@
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
   <SubComponents>
-    <Container class="javax.swing.JPanel" name="jPanel1">
+    <Container class="javax.swing.JPanel" name="mainMenuJPanel">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
           <BorderConstraints direction="Before"/>
@@ -73,7 +73,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="1" attributes="0">
                       <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
-                      <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                      <Component id="showMainMenuButton" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
               </Group>
@@ -81,15 +81,15 @@
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
-                      <EmptySpace pref="88" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
-                      <Component id="jButton1" pref="33" max="32767" attributes="0"/>
+                      <Component id="showMainMenuButton" pref="120" max="32767" attributes="0"/>
-                      <EmptySpace pref="188" max="32767" attributes="0"/>
+                      <EmptySpace pref="95" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
           </Layout>
           <SubComponents>
-            <Component class="javax.swing.JButton" name="jButton1">
+            <Component class="javax.swing.JButton" name="showMainMenuButton">
               <Properties>
                 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString(&quot;tooltip.menu&quot;)"/>
@@ -112,14 +112,14 @@
                 <Property name="requestFocusEnabled" type="boolean" value="false"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="showMainMenuButtonActionPerformed"/>
               </Events>
             </Component>
           </SubComponents>
         </Container>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="m_jPanelRight">
+    <Container class="javax.swing.JPanel" name="salesScreenJPanel">
       <Properties>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[200, 40]"/>
@@ -133,7 +133,7 @@
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
       <SubComponents>
-        <Container class="javax.swing.JPanel" name="m_jPanelTitle">
+        <Container class="javax.swing.JPanel" name="salesScreenTitlePanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
               <BorderConstraints direction="North"/>
@@ -142,7 +142,7 @@
 
           <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
           <SubComponents>
-            <Component class="javax.swing.JLabel" name="m_jTitle">
+            <Component class="javax.swing.JLabel" name="salesScreenTitleLabel">
               <Properties>
                 <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
                   <Font name="Arial" size="14" style="1"/>

src/main/java/com/unicenta/pos/forms/JPrincipalApp.java

@@ -101,20 +101,16 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
     m_principalnotificator.setText(m_appuser.getName());
     m_principalnotificator.setIcon(m_appuser.getIcon());
 
-    if (jButton1.getComponentOrientation().isLeftToRight()) {
+    if (showMainMenuButton.getComponentOrientation().isLeftToRight()) {
-      menu_open = new javax.swing.ImageIcon(getClass().getResource(
+      menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
-              "/com/unicenta/images/menu-right.png"));
+      menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
-      menu_close = new javax.swing.ImageIcon(getClass().getResource(
-              "/com/unicenta/images/menu-left.png"));
     } else {
-      menu_open = new javax.swing.ImageIcon(getClass().getResource(
+      menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
-              "/com/unicenta/images/menu-left.png"));
+      menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
-      menu_close = new javax.swing.ImageIcon(getClass().getResource(
-              "/com/unicenta/images/menu-right.png"));
     }
     assignMenuButtonIcon();
 
-    m_jPanelTitle.setVisible(false);
+    salesScreenTitlePanel.setVisible(false);
     m_jPanelContainer.add(new JPanel(), "<NULL>");
 
     showView("<NULL>");
@@ -146,9 +142,7 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
   }
 
   private void assignMenuButtonIcon() {
-    jButton1.setIcon(m_jPanelLeft.isVisible()
+    showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open);
-            ? menu_close
-            : menu_open);
   }
 
   /**
@@ -490,12 +484,13 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
         m_jLastView = m_jMyView;
 
         setMenuVisible(getBounds().width > 800);
+        setMenuVisible(getBounds().height > 600);
         setMenuVisible(false);
 
         showView(sTaskClass);
         String sTitle = m_jMyView.getTitle();
-        m_jPanelTitle.setVisible(sTitle != null);
+        salesScreenTitlePanel.setVisible(sTitle != null);
-        m_jTitle.setText(sTitle);
+        salesScreenTitleLabel.setText(sTitle);
       }
     } else {
 
@@ -548,41 +543,41 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-    jPanel1 = new javax.swing.JPanel();
+        mainMenuJPanel = new javax.swing.JPanel();
         m_jPanelLeft = new javax.swing.JScrollPane();
         jPanel2 = new javax.swing.JPanel();
-    jButton1 = new javax.swing.JButton();
+        showMainMenuButton = new javax.swing.JButton();
-    m_jPanelRight = new javax.swing.JPanel();
+        salesScreenJPanel = new javax.swing.JPanel();
-    m_jPanelTitle = new javax.swing.JPanel();
+        salesScreenTitlePanel = new javax.swing.JPanel();
-    m_jTitle = new javax.swing.JLabel();
+        salesScreenTitleLabel = new javax.swing.JLabel();
         m_jPanelContainer = new javax.swing.JPanel();
 
         setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         setLayout(new java.awt.BorderLayout());
 
-    jPanel1.setLayout(new java.awt.BorderLayout());
+        mainMenuJPanel.setLayout(new java.awt.BorderLayout());
 
         m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
         m_jPanelLeft.setBorder(null);
         m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
-    jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
+        mainMenuJPanel.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
 
         jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
         jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
 
-    jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
+        showMainMenuButton.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
-    jButton1.setFocusPainted(false);
+        showMainMenuButton.setFocusPainted(false);
-    jButton1.setFocusable(false);
+        showMainMenuButton.setFocusable(false);
-    jButton1.setIconTextGap(0);
+        showMainMenuButton.setIconTextGap(0);
-    jButton1.setMargin(new java.awt.Insets(10, 2, 10, 2));
+        showMainMenuButton.setMargin(new java.awt.Insets(10, 2, 10, 2));
-    jButton1.setMaximumSize(new java.awt.Dimension(45, 32224661));
+        showMainMenuButton.setMaximumSize(new java.awt.Dimension(45, 32224661));
-    jButton1.setMinimumSize(new java.awt.Dimension(32, 32));
+        showMainMenuButton.setMinimumSize(new java.awt.Dimension(32, 32));
-    jButton1.setPreferredSize(new java.awt.Dimension(36, 45));
+        showMainMenuButton.setPreferredSize(new java.awt.Dimension(36, 45));
-    jButton1.setRequestFocusEnabled(false);
+        showMainMenuButton.setRequestFocusEnabled(false);
-    jButton1.addActionListener(new java.awt.event.ActionListener() {
+        showMainMenuButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-        jButton1ActionPerformed(evt);
+                showMainMenuButtonActionPerformed(evt);
             }
         });
 
@@ -592,59 +587,59 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
                 .addGap(0, 0, 0)
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(showMainMenuButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
         jPanel2Layout.setVerticalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel2Layout.createSequentialGroup()
-                            .addContainerGap(88, Short.MAX_VALUE)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE)
+                .addComponent(showMainMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
-                            .addContainerGap(188, Short.MAX_VALUE))
+                .addContainerGap(95, Short.MAX_VALUE))
         );
 
-    jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END);
+        mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END);
 
-    add(jPanel1, java.awt.BorderLayout.LINE_START);
+        add(mainMenuJPanel, java.awt.BorderLayout.LINE_START);
 
-    m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40));
+        salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40));
-    m_jPanelRight.setLayout(new java.awt.BorderLayout());
+        salesScreenJPanel.setLayout(new java.awt.BorderLayout());
 
-    m_jPanelTitle.setLayout(new java.awt.BorderLayout());
+        salesScreenTitlePanel.setLayout(new java.awt.BorderLayout());
 
-    m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
+        salesScreenTitleLabel.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
-    m_jTitle.setForeground(new java.awt.Color(0, 168, 223));
+        salesScreenTitleLabel.setForeground(new java.awt.Color(0, 168, 223));
-    m_jTitle.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)));
+        salesScreenTitleLabel.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)));
-    m_jTitle.setMaximumSize(new java.awt.Dimension(100, 35));
+        salesScreenTitleLabel.setMaximumSize(new java.awt.Dimension(100, 35));
-    m_jTitle.setMinimumSize(new java.awt.Dimension(30, 25));
+        salesScreenTitleLabel.setMinimumSize(new java.awt.Dimension(30, 25));
-    m_jTitle.setPreferredSize(new java.awt.Dimension(100, 35));
+        salesScreenTitleLabel.setPreferredSize(new java.awt.Dimension(100, 35));
-    m_jPanelTitle.add(m_jTitle, java.awt.BorderLayout.NORTH);
+        salesScreenTitlePanel.add(salesScreenTitleLabel, java.awt.BorderLayout.NORTH);
 
-    m_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
+        salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH);
 
         m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         m_jPanelContainer.setLayout(new java.awt.CardLayout());
-    m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER);
+        salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER);
 
-    add(m_jPanelRight, java.awt.BorderLayout.CENTER);
+        add(salesScreenJPanel, java.awt.BorderLayout.CENTER);
     }// </editor-fold>//GEN-END:initComponents
 
-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+  private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed
 
     setMenuVisible(!m_jPanelLeft.isVisible());
 
-  }//GEN-LAST:event_jButton1ActionPerformed
+  }//GEN-LAST:event_showMainMenuButtonActionPerformed
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-  private javax.swing.JButton jButton1;
-  private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JPanel m_jPanelContainer;
     private javax.swing.JScrollPane m_jPanelLeft;
-  private javax.swing.JPanel m_jPanelRight;
+    private javax.swing.JPanel mainMenuJPanel;
-  private javax.swing.JPanel m_jPanelTitle;
+    private javax.swing.JPanel salesScreenJPanel;
-  private javax.swing.JLabel m_jTitle;
+    private javax.swing.JLabel salesScreenTitleLabel;
+    private javax.swing.JPanel salesScreenTitlePanel;
+    private javax.swing.JButton showMainMenuButton;
     // End of variables declaration//GEN-END:variables
 
 }

src/main/java/com/unicenta/pos/forms/JRootApp.java

@@ -1021,7 +1021,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
     jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
     m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START);
 
-    add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
+    //add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
 
     m_jPanelContainer.setLayout(new java.awt.CardLayout());
 

src/main/java/com/unicenta/pos/forms/StartPOS.java

@@ -129,7 +129,7 @@ public class StartPOS {
         metrics.setUniCentaVersion(AppLocal.APP_VERSION);
         Application application = new Application();
         application.postMetrics(metrics);
-        application.startEventListener(host, jRootApp);
+        application.startEventListener(host, jRootApp, null);
       } catch (Exception e) {
         log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
       }

src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java

@@ -82,7 +82,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
 
     protected SaveProvider spr;
  
-    private String Category;
+    private String category;
     private String categoryName;
     private String categoryParentid;
     private Integer categoryCatorder;
@@ -374,7 +374,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 String SellPrice = products.get((String) jComboSell.getSelectedItem());
                 productTax = products.get((String) jComboTax.getSelectedItem());                
                 
-                Category = products.get((String) jComboCategory.getSelectedItem());
+                category = products.get((String) jComboCategory.getSelectedItem());
                 Supplier = products.get((String) jComboSupplier.getSelectedItem());                
                 
                 currentRecord++;
@@ -518,17 +518,17 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
     private String getCategory() {
 
         if (jComboCategory.getSelectedItem() != category_default) {
-            String cat = (String) cat_list.get(Category);
+            String cat = (String) cat_list.get(category);
 
             if (cat != null) {
                 return (cat);
             }
         }
 
-        if (!Category.equals("")) {
+        if (!category.equals("")) {
             Object[] newcat = new Object[3];
             newcat[0] = UUID.randomUUID().toString();
-            newcat[1] = Category;
+            newcat[1] = category;
             newcat[2] = true;
 
             try {
@@ -539,15 +539,15 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                     m_CategoryModel.setSelectedItem(category);
                     cat_list.put(category.toString(), m_CategoryModel.getSelectedKey().toString());
                 }
-                    String cat = (String) cat_list.get(Category);
+                    String cat = (String) cat_list.get(category);
                     return (cat);
                 } catch (BasicException ex) {
                 log.error(ex.getMessage());
                 }
             }
 
-        if (!badCategories.contains(Category)) {
+        if (!badCategories.contains(category)) {
-            badCategories.add(Category.trim());                                 // Save a list of the bad categories
+            badCategories.add(category.trim());                                 // Save a list of the bad categories
         }
         return ((jComboDefaultCategory.getSelectedItem() 
                 == reject_bad_category) 
@@ -968,7 +968,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
         myprod[7] = productSellPrice;                                           // Sell price
         myprod[8] = previousBuy;                                                // Previous Buy price double
         myprod[9] = previousSell;                                               // Previous Sell price double
-        myprod[10] = Category;                                                  // Category
+        myprod[10] = category;                                                  // Category
         myprod[11] = productTax;                                                // Tax
         myprod[12] = Supplier;                                                  // Supplier
         try {

src/main/java/com/unicenta/pos/payment/PaymentInfoCash.java

@@ -28,10 +28,12 @@ public class PaymentInfoCash extends PaymentInfo {
   private double m_dTotal;
   private double m_dTendered;
   private String m_dCardName = null;
+  private String m_sName = "cash";
   // private double m_dTip;
 
   /**
    * Creates a new instance of PaymentInfoCash
+   * 
    * @param dTotal
    * @param dPaid
    * @param dTendered
@@ -44,6 +46,7 @@ public class PaymentInfoCash extends PaymentInfo {
 
   /**
    * Creates a new instance of PaymentInfoCash
+   * 
    * @param dTotal
    * @param dPaid
    * @param dTendered
@@ -54,9 +57,12 @@ public class PaymentInfoCash extends PaymentInfo {
     this.prePayAmount = prePayAmount;
   }
 
-    /** Creates a new instance of PaymentInfoCash
+  /**
+   * Creates a new instance of PaymentInfoCash
+   * 
    * @param dTotal
-     * @param dPaid */
+   * @param dPaid
+   */
   public PaymentInfoCash(double dTotal, double dPaid) {
     m_dTotal = dTotal;
     m_dPaid = dPaid;
@@ -77,10 +83,12 @@ public class PaymentInfoCash extends PaymentInfo {
   public String getName() {
     return "cash";
   }
+
   @Override
   public double getTotal() {
     return m_dTotal;
   }
+
   // public double getTip() {
   // return m_dTip;
   // }
@@ -118,9 +126,11 @@ public class PaymentInfoCash extends PaymentInfo {
   public String printTendered() {
     return Formats.CURRENCY.formatValue(m_dTendered);
   }
+
   public String printPaid() {
     return Formats.CURRENCY.formatValue(m_dPaid);
   }
+
   public String printChange() {
     return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
   }

src/main/java/com/unicenta/pos/payment/PaymentInfoCash_original.java

@@ -31,11 +31,15 @@ public class PaymentInfoCash_original extends PaymentInfo {
   private final double m_dTotal;
   private double m_dTendered;
   private final String m_dCardName = null;
+  private String m_sName = "cash";
   // private double m_dTip;
 
-    /** Creates a new instance of PaymentInfoCash
+  /**
+   * Creates a new instance of PaymentInfoCash
+   * 
    * @param dTotal
-     * @param dPaid */
+   * @param dPaid
+   */
   public PaymentInfoCash_original(double dTotal, double dPaid) {
     m_dTotal = dTotal;
     m_dPaid = dPaid;
@@ -55,13 +59,17 @@ public class PaymentInfoCash_original extends PaymentInfo {
   public String getName() {
     return "cash";
   }
+
   @Override
   public double getTotal() {
     return m_dTotal;
   }
-/**    public double getTip() {
+
-        return m_dTip;
+  /**
-    }
+   * public double getTip() {
+   * return m_dTip;
+   * }
+   * 
    * @return
    */
   @Override
@@ -83,9 +91,11 @@ public class PaymentInfoCash_original extends PaymentInfo {
   public String getCardName() {
     return m_dCardName;
   }
+
   public String printPaid() {
     return Formats.CURRENCY.formatValue(m_dPaid);
   }
+
   public String printChange() {
     return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
   }

src/main/java/com/unicenta/pos/payment/PaymentInfoMagcard.java

@@ -21,6 +21,7 @@ package com.unicenta.pos.payment;
 
 public class PaymentInfoMagcard extends PaymentInfo {
 
+  private String m_sName = "creditcard";
   protected double m_dTotal;
   protected double m_dTip;
   protected String m_sHolderName;
@@ -44,6 +45,7 @@ public class PaymentInfoMagcard extends PaymentInfo {
 
   /**
    * Creates a new instance of PaymentInfoMagcard
+   * 
    * @param sHolderName
    * @param sCardNumber
    * @param sExpirationDate
@@ -69,7 +71,6 @@ public class PaymentInfoMagcard extends PaymentInfo {
     m_sTransactionID = sTransactionID;
     m_dTotal = dTotal;
 
-
     m_sAuthorization = null;
     m_sErrorMessage = null;
     m_sReturnMessage = null;
@@ -77,6 +78,7 @@ public class PaymentInfoMagcard extends PaymentInfo {
 
   /**
    * Creates a new instance of PaymentInfoMagcard
+   * 
    * @param sHolderName
    * @param sCardNumber
    * @param sExpirationDate
@@ -156,7 +158,8 @@ public class PaymentInfoMagcard extends PaymentInfo {
     return encryptionKey;
   }
 
-    /** @param sCardNumber
+  /**
+   * @param sCardNumber
    * @return
    */
   public String getCardType(String sCardNumber) {
@@ -251,7 +254,6 @@ public class PaymentInfoMagcard extends PaymentInfo {
     throw new UnsupportedOperationException("Not supported yet.");
   }
 
-
   public void setIsProcessed(boolean value) {
     throw new UnsupportedOperationException("Not supported yet.");
   }

src/main/java/com/unicenta/pos/sales/JPanelTicket.java

@@ -26,6 +26,7 @@ import com.alee.extended.time.WebClock;
 import com.alee.managers.notification.NotificationIcon;
 import com.alee.managers.notification.NotificationManager;
 import com.alee.managers.notification.WebNotification;
+import com.google.gson.Gson;
 import com.unicenta.basic.BasicException;
 import com.unicenta.beans.JNumberPop;
 import com.unicenta.data.gui.ComboBoxValModel;
@@ -74,7 +75,6 @@ import java.util.*;
 
 import static java.awt.Window.getWindows;
 
-
 /**
  * @author JG uniCenta
  */
@@ -155,7 +155,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
   private Integer oCount = 0;
   private Boolean pinOK;
 
-
   /**
    * Creates new form JTicketView
    */
@@ -182,8 +181,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
     dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
 
-
+    /*
-    /* uniCenta Feb 2018
+     * uniCenta Feb 2018
      * Changed for 4.3
      * Set up main toolbar area with two rows to add cater for additional scripts
      * else over-crowding and some dynamic buttons off screen/not visible
@@ -191,7 +190,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
      * Resources>Menu.Root
      */
 
-// Set Configuration>General>Tickets toolbar simple : standard : restaurant option
+    // Set Configuration>General>Tickets toolbar simple : standard : restaurant
+    // option
     m_ticketsbag = getJTicketsBag();
     m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
     add(m_ticketsbag.getNullComponent(), "null");
@@ -327,7 +327,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       }
     }
 
-
   }
 
   @Override
@@ -818,10 +817,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
     // if (m_App.getProperties().getProperty("override.check").equals("true")) {
     if (!m_oTicket.getLine(i).getUpdated()) {
-      JOptionPane.showMessageDialog(this
+      JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.deletelinesent"),
-              , AppLocal.getIntString("message.deletelinesent")
+          AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
-              , AppLocal.getIntString("label.deleteline")
-              , JOptionPane.WARNING_MESSAGE);
     } else {
       if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
         String ticketID = Integer.toString(m_oTicket.getTicketId());
@@ -835,8 +832,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                 m_oTicket.getLine(i).getProductID(),
                 m_oTicket.getLine(i).getProductName(),
                 m_oTicket.getLine(i).getMultiply()
-                }
+            });
-        );
 
         if (m_oTicket.getLine(i).isProductCom()) {
           m_oTicket.removeLine(i);
@@ -846,8 +842,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
             if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
               int input = JOptionPane.showConfirmDialog(this,
-                      AppLocal.getIntString("message.deletelineyes")
+                  AppLocal.getIntString("message.deletelineyes"), AppLocal.getIntString("label.deleteline"),
-                      , AppLocal.getIntString("label.deleteline"), JOptionPane.YES_NO_OPTION);
+                  JOptionPane.YES_NO_OPTION);
 
               if (input == 0) {
                 m_oTicket.removeLine(i);
@@ -855,8 +851,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
             } else {
               JOptionPane.showMessageDialog(this,
-                      AppLocal.getIntString("message.deletelineno")
+                  AppLocal.getIntString("message.deletelineno"), AppLocal.getIntString("label.deleteline"),
-                      , AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
+                  JOptionPane.WARNING_MESSAGE);
             }
           } else {
             m_oTicket.removeLine(i);
@@ -911,7 +907,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     return dValue / (1.0 + dTaxRate);
   }
 
-
   private double getInputValue() {
     try {
       return Double.parseDouble(m_jPrice.getText());
@@ -1073,9 +1068,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         } else if (sCode.startsWith(";")) {
           stateToZero();
 
-
           // START OF BARCODE PARSING
-          /*  This block is deliberately verbose and is base for future scanner handling
+          /*
+           * This block is deliberately verbose and is base for future scanner handling
            * Some scanners inject a CR+LF... some don't...
            * stateTransition() must allow for this as these add characters to .length()
            * First 3 digits are GS1 CountryCode OR Retailer internal use
@@ -1169,8 +1164,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
 
               TaxInfo tax = taxeslogic // get the TaxRate for the product
-                      .getTaxInfo(oProduct.getTaxCategoryID()
+                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); // calculate if ticket has a
-                              , m_oTicket.getCustomer());                         // calculate if ticket has a Customer
+                                                                                     // Customer
 
               switch (sVariableTypePrefix) {
                 // PRICE - Assign var's
@@ -1179,32 +1174,28 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                       / (1.0 + tax.getRate()); // selling price with tax
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 100) / oProduct.getPriceSellTax(tax); // Units as proportion of selling price
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell())); // push to screen
-                          , Double.toString(oProduct.getPriceSell())); // push to screen
                   break;
                 case "20": // as above
                   dPriceSell = oProduct.getPriceSellTax(tax)
                       / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 100) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSellTax(tax)));
-                          , Double.toString(oProduct.getPriceSellTax(tax)));
                   break;
                 case "21":
                   dPriceSell = oProduct.getPriceSellTax(tax)
                       / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 10) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
-                          , Double.toString(oProduct.getPriceSell()));
                   break;
                 case "22":
                   dPriceSell = oProduct.getPriceSellTax(tax)
                       / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                       / 1) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price"
+                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
-                          , Double.toString(oProduct.getPriceSell()));
                   break;
 
                 // WEIGHT - Assign variable to Unit
@@ -1212,28 +1203,22 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                   weight = Double.parseDouble(sVariableNum)
                       / 1000; // 3 decimals = 01.049 kg
                   dUnits = weight; // which represents 1gramme Units
-                  oProduct.setProperty("product.weight"
+                  oProduct.setProperty("product.weight", Double.toString(weight));
-                          , Double.toString(weight));
+                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                  oProduct.setProperty("product.price"
-                          , Double.toString(dPriceSell));
                   break;
                 case "24":
                   weight = Double.parseDouble(sVariableNum)
                       / 100; // 2 decimals = 010.49 kg
                   dUnits = weight; // which represents 10gramme Units
-                  oProduct.setProperty("product.weight"
+                  oProduct.setProperty("product.weight", Double.toString(weight));
-                          , Double.toString(weight));
+                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                  oProduct.setProperty("product.price"
-                          , Double.toString(dPriceSell));
                   break;
                 case "25":
                   weight = Double.parseDouble(sVariableNum)
                       / 10; // 1 decimal = 0104.9 kg
                   dUnits = weight; // which represents 100gramme Units
-                  oProduct.setProperty("product.weight"
+                  oProduct.setProperty("product.weight", Double.toString(weight));
-                          , Double.toString(weight));
+                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                  oProduct.setProperty("product.price"
-                          , Double.toString(dPriceSell));
                   break;
 
                 /*
@@ -1241,27 +1226,25 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                  * Use this section to add more case statements but these are not mandatory
                  * If you have your own internal or other barcode schema then...
                  * Example:
-        case "28":
+                 * case "28":
-        {
+                 * {
-        // price has tax. Remove it from sPriceSell
+                 * // price has tax. Remove it from sPriceSell
-            TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
+                 * TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(),
-            dPriceSell /= (1.0 + tax.getRate());
+                 * m_oTicket.getCustomer());
-            oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                 * dPriceSell /= (1.0 + tax.getRate());
-            weight = -1.0;
+                 * oProduct.setProperty("product.price", Double.toString(dPriceSell));
-        break;
+                 * weight = -1.0;
+                 * break;
                  */
                 default:
                   break;
               }
 
               if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits // weight
-                        , dUnits //weight
                     , dPriceSell = oProduct.getPriceSellTax(tax));
               } else {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits, dPriceSell);
-                        , dUnits
-                        , dPriceSell);
               }
             }
           } catch (BasicException eData) {
@@ -1270,14 +1253,15 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           }
 
           // UPC-A
-/* Note: if begins 02 then its a standard
+          /*
-// UPC-A max value limitation is 4 digit price
+           * Note: if begins 02 then its a standard
-// UPC-A Extended uses State digit to give 5 digit price
+           * // UPC-A max value limitation is 4 digit price
-// uniCenta oPOS does not support UPC-A Extended at this time
+           * // UPC-A Extended uses State digit to give 5 digit price
-// Identifier   Prod    State   Cost    CheckCode
+           * // uniCenta oPOS does not support UPC-A Extended at this time
-// I            PPPPP   S       CCCC    K
+           * // Identifier Prod State Cost CheckCode
-// 1            23456   7       8901    2
+           * // I PPPPP S CCCC K
-
+           * // 1 23456 7 8901 2
+           * 
            * 0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
            * 1 = Reserved
            * 2 = Random-weight items (fruits, vegetables, meats, etc.)
@@ -1295,8 +1279,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
             && (sCode.length() == 12)) {
 
           try {
-            ProductInfoExt oProduct
+            ProductInfoExt oProduct = dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
-                    = dlSales.getProductInfoByUShortCode(sCode);            // Return only UPC product
 
             if (oProduct == null) {
               Toolkit.getDefaultToolkit().beep();
@@ -1313,8 +1296,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               String sVariableNum = sCode.substring(7, 11); // grab the value from the code only using 4 digit price
 
               TaxInfo tax = taxeslogic // get the TaxRate for the product
-                      .getTaxInfo(oProduct.getTaxCategoryID()
+                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
-                              , m_oTicket.getCustomer());
 
               if (oProduct.getPriceSell() != 0.0) { // we have a weight barcode
                 weight = Double.parseDouble(sVariableNum) / 100; // 2 decimals (e.g. 10.49 kg)
@@ -1336,13 +1318,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
 
               if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits, dPriceSell);
-                        , dUnits
-                        , dPriceSell);
               } else {
-                addTicketLine(oProduct
+                addTicketLine(oProduct, dUnits, dPriceSell / (1.0 + tax.getRate()));
-                        , dUnits
-                        , dPriceSell / (1.0 + tax.getRate()));
               }
             }
           } catch (BasicException eData) {
@@ -1395,7 +1373,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
         }
 
-
       } else if (cTrans == '.'
           && m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
         m_jPrice.setText("0.");
@@ -1785,7 +1762,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
-
   private Window getActiveWindow() {
     for (Window window : getWindows()) {
       if (window instanceof JRootFrame) {
@@ -1849,17 +1825,24 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                 m_config.setLastTicket(lastTicketNumber, lastTicketType);
 
               } catch (BasicException eData) {
-                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData);
+                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"),
+                    eData);
                 msg.show(this);
               } catch (IOException ex) {
                 log.error(ex.getMessage());
               }
-
+              // Digital Receipt
-              if (m_config.getProperty("till.digital-receipt") != null && m_config.getProperty("till.digital-receipt").equals("true")){
+              if (m_config.getProperty("till.digital-receipt") != null
+                  && m_config.getProperty("till.digital-receipt").equals("true")) {
                 log.debug("Send digital receipt");
                 String xml = dlSystem.getResourceAsXML("Printer.Ticket");
                 new Application().sendReceipt(ticket, xml, getActiveWindow());
               }
+              // EFR
+              if (m_config.getProperty("till.efr") != null && m_config.getProperty("till.efr").equals("true")) {
+                log.info("Send to efr");
+                new Application().sendEFR(ticket);
+              }
 
               executeEvent(ticket, ticketext, "ticket.close",
                   new ScriptArg("print", paymentdialog.isPrintSelected()));
@@ -1873,7 +1856,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
               if ("restaurant".equals(m_App.getProperties()
                   .getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
-                /* Deliberately Explicit to allow for reassignments - future
+                /*
+                 * Deliberately Explicit to allow for reassignments - future
                  * even though we could do a single SQL statment sweep for reset
                  */
                 restDB.clearCustomerNameInTable(ticketext.toString());
@@ -1932,7 +1916,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     return (tmpPickupId);
   }
 
-
   private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
 
     String sresource = dlSystem.getResourceAsXML(sresourcename);
@@ -2032,7 +2015,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         }
       }
 
-
       Map reportparams = new HashMap();
 
       try {
@@ -2045,7 +2027,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       reportfields.put("TICKET", ticket);
       reportfields.put("PLACE", ticketext);
 
-      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams, new JRMapArrayDataSource(new Object[]{reportfields}));
+      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams,
+          new JRMapArrayDataSource(new Object[] { reportfields }));
 
       PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
 
@@ -2124,7 +2107,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
-
   private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
 
     String resource = m_jbtnconfig.getEvent(eventkey);
@@ -2221,13 +2203,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
         if (checkProduct != null) {
 
-          if (checkProduct.getUnits() <= 0) {
+          if (checkProduct.getUnits() != null && checkProduct.getUnits() <= 0) {
             jCheckStock.setForeground(Color.magenta);
           } else {
             jCheckStock.setForeground(Color.darkGray);
           }
 
-          double dUnits = checkProduct.getUnits();
+          double dUnits = checkProduct.getUnits() == null ? 0.0 : checkProduct.getUnits();
+
           int iUnits;
           iUnits = (int) dUnits;
           jCheckStock.setText(Integer.toString(iUnits));
@@ -2262,7 +2245,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           "<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
           "<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
 
-
       JFrame frame = new JFrame();
       JOptionPane.showMessageDialog(frame,
           content,
@@ -2366,14 +2348,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
-
   /**
    * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the FormEditor.
    */
-  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
     m_jPanContainer = new javax.swing.JPanel();
@@ -2400,7 +2382,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     jCheckStock = new javax.swing.JButton();
     m_jPanelCentral = new javax.swing.JPanel();
     jPanel4 = new javax.swing.JPanel();
-    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 32767));
+    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0),
+        new java.awt.Dimension(5, 32767));
     m_jTicketId = new javax.swing.JLabel();
     m_jPanTotals = new javax.swing.JPanel();
     m_jLblTotalEuros3 = new javax.swing.JLabel();
@@ -2545,26 +2528,32 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(m_jButtonsLayout.createSequentialGroup()
                 .addContainerGap()
-                            .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE,
+                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE,
+                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
-    );
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
     m_jButtonsLayout.setVerticalGroup(
         m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(m_jButtonsLayout.createSequentialGroup()
                 .addGap(5, 5, 5)
                 .addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE,
-                                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING,
-                                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING,
-    );
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
 
     m_jPanelBag.add(m_jButtons);
 
@@ -2807,7 +2796,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
     m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
     m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
+    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(
+        javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)),
+        javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
     m_jPrice.setOpaque(true);
     m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
     m_jPrice.setRequestFocusEnabled(false);
@@ -2857,36 +2848,46 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
             .addGroup(jPanel9Layout.createSequentialGroup()
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                     .addComponent(m_jPor)
-                                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel9Layout.createSequentialGroup()
-                                            .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addGap(7, 7, 7)
-                                            .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
                     .addGroup(jPanel9Layout.createSequentialGroup()
-                                            .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addGap(5, 5, 5)))
-                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71,
-                            .addContainerGap())
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
-    );
+                .addContainerGap()));
     jPanel9Layout.setVerticalGroup(
         jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel9Layout.createSequentialGroup()
-                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, Short.MAX_VALUE))
             .addGroup(jPanel9Layout.createSequentialGroup()
-                            .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING,
-                                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                        javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE)))
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
                 .addComponent(m_jPor)
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
-                            .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-    );
+                .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1,
+                    javax.swing.GroupLayout.PREFERRED_SIZE)));
 
     m_jPanEntries.add(jPanel9);
 
@@ -3297,8 +3298,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
       if (dialog.getSelectedCustomer() != null) {
         try {
-          m_oTicket.setCustomer(dlSales.loadCustomerExt
+          m_oTicket.setCustomer(dlSales.loadCustomerExt(dialog.getSelectedCustomer().getId()));
-                  (dialog.getSelectedCustomer().getId()));
         } catch (BasicException ex) {
           log.error(ex.getMessage());
         }
@@ -3316,11 +3316,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
         if (finder.getSelectedCustomer() != null) {
           try {
-            m_oTicket.setCustomer(dlSales.loadCustomerExt
+            m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
-                    (finder.getSelectedCustomer().getId()));
             if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-              restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
+              restDB.setCustomerNameInTableByTicketId(
-                      (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+                  dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
             }
 
             checkCustomer();
@@ -3351,11 +3350,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
           if (finder.getSelectedCustomer() != null) {
             try {
-              m_oTicket.setCustomer(dlSales.loadCustomerExt
+              m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
-                      (finder.getSelectedCustomer().getId()));
               if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-                restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
+                restDB.setCustomerNameInTableByTicketId(
-                        (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+                    dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
               }
 
               checkCustomer();
@@ -3431,9 +3429,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
   private javax.swing.JButton m_jbtnScale;
   // End of variables declaration//GEN-END:variables
 
-/* Remote Orders Display
+  /*
-    We only know about uniCenta oPOS orders and won't try and handle any
+   * Remote Orders Display
-    that are injected from an external source
+   * We only know about uniCenta oPOS orders and won't try and handle any
+   * that are injected from an external source
    */
 
   public void remoteOrderDisplay() {
@@ -3491,29 +3490,23 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           }
         }
 
-        dlSystem.addOrder(getPickupString(m_oTicket)
+        dlSystem.addOrder(getPickupString(m_oTicket), (int) m_oTicket.getLine(i).getMultiply(),
-                , (int) m_oTicket.getLine(i).getMultiply()
+            m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductAttSetInstDesc(),
-                , m_oTicket.getLine(i).getProductName()
+            m_oTicket.getLine(i).getProperty("notes"), id, null, display, null, null);
-                , m_oTicket.getLine(i).getProductAttSetInstDesc()
-                , m_oTicket.getLine(i).getProperty("notes")
-                , id
-                , null
-                , display
-                , null
-                , null);
 
-/* this block for future - right now we're deleting all ticketlines
+        /*
-    and resending for consistency with actual ticketlines
+         * this block for future - right now we're deleting all ticketlines
-                dlSystem.updateOrder(getPickupString(m_oTicket)
+         * and resending for consistency with actual ticketlines
-                        , (int) m_oTicket.getLine(i).getMultiply()
+         * dlSystem.updateOrder(getPickupString(m_oTicket)
-                        , m_oTicket.getLine(i).getProductName()
+         * , (int) m_oTicket.getLine(i).getMultiply()
-                        , m_oTicket.getLine(i).getProductAttSetInstDesc()
+         * , m_oTicket.getLine(i).getProductName()
-                        , m_oTicket.getLine(i).getProperty("notes")
+         * , m_oTicket.getLine(i).getProductAttSetInstDesc()
-                        , id
+         * , m_oTicket.getLine(i).getProperty("notes")
-                        , null
+         * , id
-                        , display
+         * , null
-                        , null
+         * , display
-                        , null);
+         * , null
+         * , null);
          */
 
       } catch (BasicException ex) {

src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java

@@ -23,6 +23,8 @@ import com.unicenta.pos.catalog.CatalogSelector;
 import com.unicenta.pos.catalog.JCatalog;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.ticket.ProductInfoExt;
+import lombok.extern.slf4j.Slf4j;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -34,6 +36,7 @@ import javax.swing.event.ListSelectionListener;
  *
  * @author JG uniCenta
  */
+@Slf4j
 public class JPanelTicketSales extends JPanelTicket {
 
     private CatalogSelector m_cat;
@@ -95,6 +98,7 @@ public class JPanelTicketSales extends JPanelTicket {
      */
     @Override
     protected JTicketsBag getJTicketsBag() {
+        log.debug("Get JTickets Bag");
         return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
     }
     

src/main/java/com/unicenta/pos/sales/restaurant/RestaurantDBUtils.java

@@ -7,6 +7,8 @@ package com.unicenta.pos.sales.restaurant;
 import com.unicenta.data.loader.Session;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.DataLogicSystem;
+import lombok.extern.slf4j.Slf4j;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -18,7 +20,7 @@ import java.sql.Timestamp;
  *
  * @author JDL
  */
-
+@Slf4j
 public class RestaurantDBUtils {
     private Session s;
     private Connection con;  
@@ -304,10 +306,10 @@ public class RestaurantDBUtils {
             rs = stmt.executeQuery(SQL);
         
             if (rs.next()){
-                String customer =rs.getString("TICKETID");
+              return(rs.getString("TICKETID"));
-                return(customer);
             }    
         }catch(SQLException e){
+          log.error("Error running SQL: {}{}", SQL, e.getMessage());
         }
 
         return "";
@@ -553,6 +555,21 @@ public class RestaurantDBUtils {
         return "";
     }
 
+    public String getTableId (String nameOfTable){
+      try{
+        SQL = "SELECT ID FROM places WHERE NAME='"+ nameOfTable + "'";
+        stmt = con.createStatement();
+        rs = stmt.executeQuery(SQL);
+
+        if (rs.next()){
+          return(rs.getString("ID"));
+        }
+      }catch(SQLException e){
+        log.error("Error running SQL: {}{}", SQL, e.getMessage());
+      }
+      return "";
+    }
+
     /**
      *
      * @param tableID

src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java

@@ -53,6 +53,7 @@ public class JTicketsBagShared extends JTicketsBag {
     private DataLogicSales dlSales = null;  
     private final DataLogicSystem dlSystem;    
     private Boolean showList;
+    private int existingOrderCount;
    
     
     /** Creates new form JTicketsBagShared
@@ -81,7 +82,7 @@ public class JTicketsBagShared extends JTicketsBag {
         log.debug("Loading Sales screen! "+this.getClass());
 
         ExecutorService customExecutor = Executors.newCachedThreadPool();
-        SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
+        SwingWorker<String, String> reloadLayaway = new SwingWorker() {
             @Override
             protected String doInBackground() throws Exception {
                 while (true) {
@@ -140,12 +141,26 @@ public class JTicketsBagShared extends JTicketsBag {
     }
 
     public void updateCount() {
+
+        /*
+        1. Need to get / set  the existing count
+        2. When count increases show dialog
+         */
         try {
             List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
             int count = l.size();
 
+            if (count > existingOrderCount) {
+                log.info("New Order Received from the API!");
+                // show Order Window
+//                List<ReprintTicketInfo> ticketInfoList= dlSales.getReprintTicketList();
+//                JTicketsReprintList listDialog = JTicketsReprintList.newJDialog(JTicketsBagShared.this);
+//                String id = listDialog.showTicketsList(ticketInfoList, dlSales);
+            }
+            
             if (count > 0) {
                 m_jListTickets.setText(Integer.toString(count));
+                existingOrderCount = count;
             } else {
                 m_jListTickets.setText("");
             }
@@ -427,6 +442,10 @@ public class JTicketsBagShared extends JTicketsBag {
         ((JRootApp)m_App).closeAppView();
     }//GEN-LAST:event_m_jHoldActionPerformed
 
+    private void showOrderWindow() {
+
+    }
+
     private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
         SwingUtilities.invokeLater(new Runnable() {
             @Override

src/main/java/com/unicenta/pos/ticket/TicketInfo.java

@@ -112,6 +112,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     m_isProcessed = false;
     m_locked = null;
     ticketstatus = 0;
+    m_sHost = String.valueOf(config.getProperty("machine.hostname"));
   }
 
   @Override
@@ -212,6 +213,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public int getTicketType() {
     return tickettype;
   }
+
   public void setTicketType(int tickettype) {
     this.tickettype = tickettype;
   }
@@ -219,6 +221,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public int getTicketId() {
     return m_iTicketId;
   }
+
   public void setTicketId(int iTicketId) {
     m_iTicketId = iTicketId;
   }
@@ -226,6 +229,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public int getTicketStatus() {
     return ticketstatus;
   }
+
   public void setTicketStatus(int ticketstatus) {
     if (m_iTicketId > 0) {
       this.ticketstatus = m_iTicketId;
@@ -403,9 +407,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getSubTotal() {
     double sum = 0.0;
-        sum = m_aLines.stream().map((line) -> 
+    sum = m_aLines.stream().map((line) -> line.getSubValue()).reduce(sum, (accumulator, _item) -> accumulator + _item);
-                line.getSubValue()).reduce(sum, (accumulator, _item) -> 
-                        accumulator + _item);
     return sum;
   }
 
@@ -418,9 +420,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         nsum = sum;
       }
     } else {
-            sum = m_aLines.stream().map((line) -> 
+      sum = m_aLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
-                    line.getTax()).reduce(sum, (accumulator, _item) -> 
-                            accumulator + _item);
     }
     return sum;
   }
@@ -437,10 +437,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getTotalPaid() {
     double sum = 0.0;
-        sum = payments.stream().filter((p) -> 
+    sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
-                (!"debtpaid".equals(p.getName()))).map((p) -> 
+        (accumulator, _item) -> accumulator + _item);
-                        p.getTotal()).reduce(sum, (accumulator, _item) -> 
-                                accumulator + _item);
     return sum;
   }
 
@@ -571,7 +569,6 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     return m_sHost;
   }
 
-    
   // Added JDL 28.05.13 for loyalty card functions
 
   /**
@@ -642,8 +639,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String getTicketHeaderFooterData(String data) {
-        AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
+    AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
-                , AppLocal.APP_ID + ".properties"));        
     m_config.load();
     String row = (m_config.getProperty("tkt." + data));
 

src/main/java/com/unicenta/pos/ticket/UserInfo.java

@@ -29,15 +29,25 @@ public class UserInfo implements Serializable {
   private static final long serialVersionUID = 7537578737839L;
   private String m_sId;
   private String m_sName;
+  private String taxId;
 
-    /** Creates a new instance of UserInfoBasic
+  /**
+   * Creates a new instance of UserInfoBasic
+   * 
    * @param id
-     * @param name */
+   * @param name
+   */
   public UserInfo(String id, String name) {
     m_sId = id;
     m_sName = name;
   }
 
+  public UserInfo(String id, String name, String taxId) {
+    m_sId = id;
+    m_sName = name;
+    this.taxId = taxId;
+  }
+
   /**
    *
    * @return
@@ -53,4 +63,8 @@ public class UserInfo implements Serializable {
   public String getName() {
     return m_sName;
   }
+
+  public String getTaxID() {
+    return taxId;
+  }
 }

src/main/java/com/unicenta/pos/transfer/Transfer.java

@@ -19,7 +19,6 @@
 
 package com.unicenta.pos.transfer;
 
-
 import com.unicenta.basic.BasicException;
 import com.unicenta.data.gui.JMessageDialog;
 import com.unicenta.data.gui.MessageInf;
@@ -225,7 +224,6 @@ public final class Transfer extends JPanel implements JPanelView {
 
   }
 
-
   /**
    * @return
    */
@@ -1065,19 +1063,18 @@ public final class Transfer extends JPanel implements JPanelView {
 
           while (rs.next()) {
             SQL = "INSERT INTO people("
-                    + "ID, NAME, APPPASSWORD, CARD, "
+                + "ID, NAME, APPPASSWORD, TAXID, CARD, ROLE, VISIBLE, IMAGE)"
-                    + "ROLE, VISIBLE, IMAGE) "
+                + "VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
-                    + "VALUES (?, ?, ?, ?, "
-                    + "?, ?, ?)";
 
             pstmt = con_target.prepareStatement(SQL);
             pstmt.setString(1, rs.getString("ID"));
             pstmt.setString(2, rs.getString("NAME"));
             pstmt.setString(3, rs.getString("APPPASSWORD"));
-            pstmt.setString(4, rs.getString("CARD"));
+            pstmt.setString(4, rs.getString("TAXID"));
-            pstmt.setString(5, rs.getString("ROLE"));
+            pstmt.setString(5, rs.getString("CARD"));
-            pstmt.setBoolean(6, rs.getBoolean("VISIBLE"));
+            pstmt.setString(6, rs.getString("ROLE"));
-            pstmt.setBytes(7, rs.getBytes("IMAGE"));
+            pstmt.setBoolean(7, rs.getBoolean("VISIBLE"));
+            pstmt.setBytes(8, rs.getBytes("IMAGE"));
 
             pstmt.executeUpdate();
           }
@@ -1104,7 +1101,8 @@ public final class Transfer extends JPanel implements JPanelView {
           } else {
             txtOut.append("Pickup Number... skipped" + "\n");
           }
-// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence
+          // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10
+          // sequence
           if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) {
             Dbtname = "pickup_number";
             rs = con_source.getMetaData().getTables(null, null, Dbtname, null);
@@ -1927,7 +1925,8 @@ public final class Transfer extends JPanel implements JPanelView {
           } else {
             txtOut.append("Ticket Payment... skipped" + "\n");
           }
-// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence                 
+          // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10
+          // sequence
           if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) {
             Dbtname = "ticketsnum_payment";
             rs = con_source.getMetaData().getTables(null, null, Dbtname, null);
@@ -1968,7 +1967,8 @@ public final class Transfer extends JPanel implements JPanelView {
           } else {
             txtOut.append("Ticket Refund... skipped" + "\n");
           }
-// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence
+          // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10
+          // sequence
           if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) {
             Dbtname = "ticketsnum_payment";
             rs = con_source.getMetaData().getTables(null, null, Dbtname, null);
@@ -2052,10 +2052,8 @@ public final class Transfer extends JPanel implements JPanelView {
           }
 
           // Add ForeignKeys
-          JOptionPane.showMessageDialog(this
+          JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.transfercomplete"),
-                  , AppLocal.getIntString("message.transfercomplete")
+              AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE);
-                  , AppLocal.getIntString("message.transfermessage")
-                  , JOptionPane.WARNING_MESSAGE);
 
           FKeys();
           txtOut.append("Data Transfer Complete" + "\n");
@@ -2064,10 +2062,8 @@ public final class Transfer extends JPanel implements JPanelView {
           webPBar.setBgBottom(Color.GREEN);
           jbtnTransfer.setEnabled(true);
 
-          JOptionPane.showMessageDialog(this
+          JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.indexcomplete"),
-                  , AppLocal.getIntString("message.indexcomplete")
+              AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE);
-                  , AppLocal.getIntString("message.transfermessage")
-                  , JOptionPane.WARNING_MESSAGE);
 
         } catch (SQLException | HeadlessException e) {
           session_source.close();
@@ -2076,10 +2072,8 @@ public final class Transfer extends JPanel implements JPanelView {
         }
       } else {
         JFrame frame = new JFrame();
-        JOptionPane.showMessageDialog(frame
+        JOptionPane.showMessageDialog(frame, AppLocal.getIntString("message.transfernotsupported"),
-                , AppLocal.getIntString("message.transfernotsupported")
+            AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE);
-                , AppLocal.getIntString("message.transfermessage")
-                , JOptionPane.WARNING_MESSAGE);
       }
 
       SQL = "COMMIT;\n" +
@@ -2093,7 +2087,8 @@ public final class Transfer extends JPanel implements JPanelView {
   }
 
   public void fillSchema() {
-    /* Use existing session credentials but declare new session and connection
+    /*
+     * Use existing session credentials but declare new session and connection
      * to keep separated from current session instance as database could
      * be a different server
      */
@@ -2117,8 +2112,7 @@ public final class Transfer extends JPanel implements JPanelView {
       });
 
       DriverManager.registerDriver(
-              new DriverWrapper((Driver)
+          new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance()));
-                      Class.forName(driver, true, cloader).newInstance()));
 
       Session session1 = new Session(url, user, password);
 
@@ -2169,7 +2163,8 @@ public final class Transfer extends JPanel implements JPanelView {
    * WARNING: Do NOT modify this code. The content of this method is always
    * regenerated by the Form Editor.
    */
-  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
     jLabel5 = new javax.swing.JLabel();
@@ -2508,70 +2503,105 @@ public final class Transfer extends JPanel implements JPanelView {
                 .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jTransferPanelLayout.createSequentialGroup()
                         .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                    .addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE,
-                                                    .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                         .addGap(7, 7, 7)
-                                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+                        .addGroup(
+                            jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
                                 .addGroup(jTransferPanelLayout.createSequentialGroup()
-                                                            .addComponent(jlblVersion, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jlblVersion, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                                            .addComponent(jLabel11, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel11, javax.swing.GroupLayout.PREFERRED_SIZE, 100,
+                                        javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                                            .addComponent(jlblDBSize, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(jlblDBSize, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addGroup(jTransferPanelLayout.createSequentialGroup()
-                                                            .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                                            .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                            .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(jTransferPanelLayout.createSequentialGroup()
-                                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                        .addGroup(
+                            jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                 .addGroup(jTransferPanelLayout.createSequentialGroup()
-                                                            .addComponent(jLabel13, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel13, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                                            .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                    .addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                        .addGroup(
-                                                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                                .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)))
                     .addGroup(jTransferPanelLayout.createSequentialGroup()
-                                            .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                            .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                        .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE,
-                            .addContainerGap())
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-    );
+                .addContainerGap()));
     jTransferPanelLayout.setVerticalGroup(
         jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jTransferPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(jLabel15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel15, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                    .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                    .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                    .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jlblVersion, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jlblVersion, javax.swing.GroupLayout.Alignment.TRAILING,
-                                    .addComponent(jLabel11, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                                    .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(jlblDBSize, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jLabel11, javax.swing.GroupLayout.Alignment.TRAILING,
+                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.TRAILING,
+                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jlblDBSize, javax.swing.GroupLayout.Alignment.TRAILING,
+                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                            .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                            .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                    .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addContainerGap())
+                        .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE,
-    );
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap()));
 
     jbtnReset.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
     jbtnReset.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/reload.png"))); // NOI18N
@@ -2602,115 +2632,170 @@ public final class Transfer extends JPanel implements JPanelView {
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(layout.createSequentialGroup()
-                                                            .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                                            .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(layout.createSequentialGroup()
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                                    .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE,
-                                                                    .addComponent(jLabel12, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel12, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                             .addGroup(layout.createSequentialGroup()
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                                    .addComponent(jLabel18, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel18, javax.swing.GroupLayout.DEFAULT_SIZE,
-                                                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                                    .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addGroup(layout.createSequentialGroup()
-                                                                            .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                        .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                                                            .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            javax.swing.GroupLayout.PREFERRED_SIZE))
                                     .addGroup(layout.createSequentialGroup()
                                         .addGap(366, 366, 366)
-                                                                            .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                                        .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            javax.swing.GroupLayout.PREFERRED_SIZE))))
                             .addGroup(layout.createSequentialGroup()
-                                                            .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                                                                    .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addGroup(layout.createSequentialGroup()
-                                                                            .addComponent(txtDbUser, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                        .addComponent(txtDbUser, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                                                            .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            javax.swing.GroupLayout.PREFERRED_SIZE)))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                                            .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                    .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                     .addGroup(layout.createSequentialGroup()
-                                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 202, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 202,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                            .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, 316, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, 316,
-                                    .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, 278, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, 278,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                                            .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 125,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                            .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 109,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                     .addGroup(layout.createSequentialGroup()
                         .addGap(18, 18, 18)
-                                            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE,
-                                            .addContainerGap())))
+                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-    );
+                        .addContainerGap()))));
     layout.setVerticalGroup(
         layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                     .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                            .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 32,
-                                            .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                    .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.TRAILING,
+                            javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                                            .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(layout.createSequentialGroup()
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                                    .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                                                                            .addComponent(jLabel18, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                        .addComponent(jLabel18, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                            .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                            javax.swing.GroupLayout.DEFAULT_SIZE,
-                                                                    .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                            javax.swing.GroupLayout.PREFERRED_SIZE)
+                                        .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                                                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(txtDbUser, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                                                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(txtDbUser, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                                                    .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                                                    .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                                    .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                            .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                            .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addGap(0, 0, Short.MAX_VALUE))
-                                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE,
-                            .addContainerGap())
+                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-    );
+                .addContainerGap()));
 
     jLabel1.getAccessibleContext().setAccessibleName("DBDriver");
   }// </editor-fold>//GEN-END:initComponents
@@ -2772,13 +2857,13 @@ public final class Transfer extends JPanel implements JPanelView {
         });
 
         DriverManager.registerDriver(
-                new DriverWrapper((Driver)
+            new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance()));
-                        Class.forName(driver, true, cloader).newInstance()));
 
         Session session_source = new Session(url, user, password);
         Connection connection = session_source.getConnection();
         boolean isValid = (connection == null)
-                ? false : connection.isValid(1000);
+            ? false
+            : connection.isValid(1000);
 
         if (isValid) {
           if (!"Derby".equals(cbSource.getSelectedItem())) {
@@ -2797,8 +2882,7 @@ public final class Transfer extends JPanel implements JPanelView {
 
           JOptionPane.showMessageDialog(this,
               AppLocal.getIntString("message.databaseconnectsuccess"),
-                  "Connection Test"
+              "Connection Test", JOptionPane.INFORMATION_MESSAGE);
-                  , JOptionPane.INFORMATION_MESSAGE);
         } else {
           reset();
 
@@ -2823,10 +2907,8 @@ public final class Transfer extends JPanel implements JPanelView {
             new MessageInf(MessageInf.SGN_WARNING, "Unknown exception", e));
       }
     } else {
-      JOptionPane.showMessageDialog(this
+      JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.transfercheck"),
-              , AppLocal.getIntString("message.transfercheck")
+          AppLocal.getIntString("message.transfertitle"), JOptionPane.WARNING_MESSAGE);
-              , AppLocal.getIntString("message.transfertitle")
-              , JOptionPane.WARNING_MESSAGE);
 
       jtxtDbName.setText("");
     }
@@ -2841,23 +2923,19 @@ public final class Transfer extends JPanel implements JPanelView {
     dirname = dirname == null ? "./" : dirname;
 
     if ("Derby".equals(cbSource.getSelectedItem())) {
-      jtxtDbDriverLib.setText(new File(new File(dirname)
+      jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/derby-10.10.2.0.jar").getAbsolutePath());
-              , "/lib/derby-10.10.2.0.jar").getAbsolutePath());
       jtxtDbDriver.setText("org.apache.derby.jdbc.EmbeddedDriver");
       jtxtDbType.setText("jdbc:derby:");
-      jtxtDbServerPort.setText("" + new File(new File(System.getProperty("user.home"))
+      jtxtDbServerPort.setText("" + new File(new File(System.getProperty("user.home")), ""));
-              , ""));
       jtxtDbParams.setText("");
     } else if ("PostgreSQL".equals(cbSource.getSelectedItem())) {
-      jtxtDbDriverLib.setText(new File(new File(dirname)
+      jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/postgresql-9.4-1208.jdbc4.jar").getAbsolutePath());
-              , "/lib/postgresql-9.4-1208.jdbc4.jar").getAbsolutePath());
       jtxtDbDriver.setText("org.postgresql.Driver");
       jtxtDbType.setText("jdbc:postgresql://");
       jtxtDbServerPort.setText("localhost:5432/");
       jtxtDbParams.setText("");
     } else {
-      jtxtDbDriverLib.setText(new File(new File(dirname)
+      jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/mysql-connector-java-5.1.39.jar").getAbsolutePath());
-              , "/lib/mysql-connector-java-5.1.39.jar").getAbsolutePath());
       jtxtDbDriver.setText("com.mysql.jdbc.Driver");
       jtxtDbType.setText("jdbc:mysql://");
       jtxtDbServerPort.setText("localhost:3306/");
@@ -2902,8 +2980,7 @@ public final class Transfer extends JPanel implements JPanelView {
       });
 
       DriverManager.registerDriver(
-              new DriverWrapper((Driver)
+          new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance()));
-                      Class.forName(driver, true, cloader).newInstance()));
 
       Session session_source1 = new Session(url, user, password);
       Connection connection = session_source1.getConnection();

src/main/resources/com/unicenta/pos/scripts/Derby-create.sql

@@ -205,6 +205,7 @@ CREATE TABLE people (
 	 id varchar(255) NOT NULL,
 	 name varchar(255) NOT NULL,
 	 apppassword varchar(255) default NULL,
+	 taxId varchar(255) default NULL,
 	 card varchar(255) default NULL,
 	 role varchar(255) NOT NULL,
 	 visible smallint NOT NULL,

src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql

@@ -1 +1,3 @@
+ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
+--ALTER TABLE people ADD COLUMN taxId VARCHAR(100);
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};

src/main/resources/com/unicenta/pos/scripts/MariaDB-create.sql

@@ -271,6 +271,7 @@ CREATE TABLE `people` (
 	`id` varchar(255) NOT NULL,
 	`name` varchar(255) NOT NULL,
 	`apppassword` varchar(255) default NULL,
+	`taxId` varchar(255) default NULL,
 	`card` varchar(255) default NULL,
 	`role` varchar(255) NOT NULL,
 	`visible` bit(1) NOT NULL,

src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql

@@ -1,2 +1,3 @@
+ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
 COMMIT;

src/main/resources/com/unicenta/pos/scripts/MySQL-create.sql

@@ -246,6 +246,7 @@ CREATE TABLE `people` (
 	`id` varchar(255) NOT NULL,
 	`name` varchar(255) NOT NULL,
 	`apppassword` varchar(255) default NULL,
+	`taxId` varchar(255) default NULL,
 	`card` varchar(255) default NULL,
 	`role` varchar(255) NOT NULL,
 	`visible` bit(1) NOT NULL,

src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql

@@ -1,2 +1,3 @@
+ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
 COMMIT;

src/main/resources/pos_messages.properties

@@ -881,7 +881,7 @@ message.email=Desktop email app' not found
 message.emptycustomer=Customer cannot be empty
 message.emptynumber=Number cannot be empty
 message.enterbuyprice=Enter new Buy Price
-message.eolupdate=<html><center><h2>Version 5.3.2 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
+message.eolupdate=<html><center><h2>Version 5.4.0 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 and above click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
 message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK 
 message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
 message.ibuttonnotfound=No iButton adapter found.  Key fobs will be disabled.
@@ -1207,3 +1207,4 @@ tooltip.config.db.databaseset1=<html><center>Set the optional secondary DB 2 dat
 tooltip.config.db.reset=<html><center>Clear the settings of the main DB 1 Database Server
 tooltip.config.db.reset1=<html><center>Clear the settings of the optional DB 2 Database Server\t
 label.pickupcurrent=Current Pickup Number
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_al_SQ.properties

@@ -662,3 +662,4 @@ transpayment.slip=Slip
 transpayment.voucherin=Note Input
 transpayment.voucherout=Note Output
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_ar.properties

@@ -542,3 +542,4 @@ label.department=\u0642\u0633\u0645\u060c \u0623\u0642\u0633\u0627\u0645
 message.resetpickup=\u0647\u0644 \u062a\u0631\u064a\u062f \u062d\u0642\u0627 \u0623\u0646 \u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628 \u0639\u062f\u062f \u0628\u064a\u0643 \u0623\u0628 0\u061f
 label.currentstock=\u0645\u062a\u0627\u062d
 Menu.CSVStockQty=<html>Products<br><b>Scanner Import
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_da.properties

@@ -1008,3 +1008,4 @@ transpayment.ccardrefund=Kort tilbagef\u00f8rsel
 transpayment.ticket=Salgskvittering
 transpayment.voucher=Gavekort
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_de.properties

@@ -902,3 +902,4 @@ transpayment.voucher=Gutschein
 transpayment.voucherin=Gutschein Eingabe
 transpayment.voucherout=Gutschein Ausgabe
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_el.properties

@@ -548,3 +548,4 @@ transpayment.ticket=\u0391\u03c0\u03cc\u03b4\u03b5\u03b9\u03be\u03b7
 transpayment.voucherin=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
 transpayment.voucherout=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_en_US.properties

@@ -1116,3 +1116,4 @@ label.override=Use Override?
 title.override.enterpin=Enter PIN Number
 message.override.badpin=<html><center><h4>PIN Number Incorrect
 Menu.CustomersExport=Customer Export
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_es.properties

@@ -1188,3 +1188,4 @@ message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h
 label.find=Buscar
 label.create=Crear
 label.cancel=Cancelar
+label.peopletaxid=ID de impuesto

src/main/resources/pos_messages_es_AR.properties

@@ -484,3 +484,4 @@ transpayment.ccardrefund=Devoluci\u00f3n con tarjeta
 transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_es_MX.properties

@@ -469,3 +469,5 @@ transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
 message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.3 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+label.peopletaxid=Identificador de taxi
+

src/main/resources/pos_messages_et.properties

@@ -502,3 +502,4 @@ transpayment.ccardrefund=Kaardimakse tagastus
 transpayment.voucherin=Kupongimakse
 transpayment.voucherout=Kupong v\u00e4lja
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_fr.properties

@@ -1083,3 +1083,4 @@ label.add=Ajouter
 label.cancel=Annuler
 label.create=Cr\u00e9er
 label.find=Trouver
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_hr.properties

@@ -482,3 +482,4 @@ transpayment.ccardrefund=Povrat kartice
 transpayment.voucherin=Bilje\u0161ka - ulaz
 transpayment.voucherout=Bilje\u0161ka - izlaz
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_it.properties

@@ -753,3 +753,4 @@ transpayment.ticket=Fattura
 transpayment.voucherin=Nota Ingresso
 transpayment.voucherout=Nota Uscita
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_nl.properties

@@ -1175,3 +1175,4 @@ button.setTransfer=SET
 message.transfersamedatabase=<html><center><h4>Not able to transfer database into itself
 label.configURL=Click this link to see how to create a Database Schema
 tooltip.pickupbarcode=Find Pickup ID
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_pt.properties

@@ -462,3 +462,4 @@ transpayment.ticket=Recibo
 transpayment.voucherin=Entrada de nota
 transpayment.voucherout=Sa\u00edda de nota
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_pt_BR.properties

@@ -404,3 +404,4 @@ transpayment.ticket=Cupom
 transpayment.voucherin=Nota entrada
 transpayment.voucherout=Nota sa\u00edda
 Visor.Title=uniCenta POS
+label.peopletaxid=Tax ID

src/test/java/com/unicenta/pos/util/QRCodeTest.java

@@ -4,7 +4,6 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
-import org.junit.Ignore;
 import org.junit.jupiter.api.Test;
 
 import javax.imageio.ImageIO;
@@ -14,8 +13,9 @@ import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
 import static org.junit.jupiter.api.Assertions.*;
-@Ignore
+
 class QRCodeTest {
+
     @Test
     void shouldPrintQRCode() throws Exception {
         // Name
@@ -66,12 +66,8 @@ class QRCodeTest {
 
         BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
 
-        String fileName = "output/test-output.jpg";
+        File outputfile = new File("test.jpg");
-        File outputFile = new File(fileName);
+        assert  ImageIO.write(bufferedImage, "jpg", outputfile);
-
-        // Create the parent directories if they don't exist
-        outputFile.getParentFile().mkdirs();
-        assert  ImageIO.write(bufferedImage, "jpg", outputFile);
 
     }
 }