jvm 17 wip

.gitignore

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

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,117 +0,0 @@
-/*
- * 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

@@ -1,2 +0,0 @@
-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

@@ -1,729 +0,0 @@
-# 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

@@ -1,310 +0,0 @@
-#!/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

@@ -1,182 +0,0 @@
-@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,25 +4,14 @@
 
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.5.0-SNAPSHOT</version>
+  <version>5.3</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
-    <derby.version>10.14.2.0</derby.version>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>com.google.zxing</groupId>
-      <artifactId>core</artifactId>
-      <version>3.3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.zxing</groupId>
-      <artifactId>javase</artifactId>
-      <version>3.3.0</version>
-    </dependency>
     <!-- sqlite-jdbc -->
     <dependency>
       <groupId>org.xerial</groupId>
@@ -114,13 +103,7 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
-      <version>3.17</version>
+      <version>3.10.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-ooxml</artifactId>
-      <version>3.17</version>
     </dependency>
     <dependency>
       <groupId>net.sf.barcode4j</groupId>
@@ -248,18 +231,8 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
+      <version>10.14.2.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbytools</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
-<!--    <dependency>-->
-<!--      <groupId>org.apache.derby</groupId>-->
-<!--      <artifactId>derbyshared</artifactId>-->
-<!--      <version>${derby.version}</version>-->
-<!--    </dependency>-->
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
@@ -270,12 +243,12 @@
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>fop</artifactId>
-      <version>2.3</version>
+      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>net.sf.jasperreports</groupId>
       <artifactId>jasperreports</artifactId>
-      <version>6.12.2</version>
+      <version>6.4.0</version>
       <exclusions>
         <exclusion>
           <groupId>com.lowagie</groupId>
@@ -329,7 +302,7 @@
       <artifactId>reflections</artifactId>
       <version>0.9.12</version>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/de.sciss/weblaf -->
+    <!-- https://mvnrepository.com/artifact/de.sciss/weblaf
     <dependency>
       <groupId>de.sciss</groupId>
       <artifactId>weblaf</artifactId>
@@ -347,21 +320,27 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-simple</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>com.thoughtworks.xstream</groupId>
-          <artifactId>xstream</artifactId>
-        </exclusion>
       </exclusions>
-    </dependency>
+    </dependency>-->
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.4.11</version>
-    </dependency>
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.4.0-SNAPSHOT</version>
+      <version>1.2.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>de.sciss</groupId>
+          <artifactId>weblaf</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>de.sciss</groupId>
+          <artifactId>weblaf-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>de.sciss</groupId>
+          <artifactId>weblaf-ui</artifactId>
+        </exclusion>
+
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>
@@ -419,13 +398,12 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.28</version>
+      <version>9.4.1208</version>
     </dependency>
     <dependency>
-      <groupId>de.sciss</groupId>
+      <groupId>com.weblookandfeel</groupId>
       <artifactId>weblaf-ui</artifactId>
-      <version>2.1.3</version>
+      <version>1.2.14</version>
-      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>

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

@@ -34,192 +34,191 @@ import java.util.regex.Pattern;
 @Slf4j
 public class StaticSentence extends JDBCSentence {
 
-  private ISQLBuilderStatic iSQLBuilder;
 
-  /**
+    private ISQLBuilderStatic iSQLBuilder;
-   *
-   */
-  protected SerializerWrite m_SerWrite = null;
 
-  /**
+    /**
-   *
+     *
-   */
+     */
-  protected SerializerRead m_SerRead = null;
+    protected SerializerWrite m_SerWrite = null;
 
-  // Estado
+    /**
-  private Statement statement;
+     *
+     */
+    protected SerializerRead m_SerRead = null;
 
-  /**
+    // Estado
-   * Creates a new instance of StaticSentence
+    private Statement statement;
-   *
-   * @param s
-   * @param sentence
-   * @param serread
-   * @param serwrite
-   */
-  public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
-    super(s);
-    iSQLBuilder = sentence;
-    m_SerWrite = serwrite;
-    m_SerRead = serread;
-    statement = null;
-  }
 
-  /**
+    /**
-   * Creates a new instance of StaticSentence
+     * Creates a new instance of StaticSentence
-   *
+     *
-   * @param s
+     * @param s
-   * @param sentence
+     * @param sentence
-   */
+     * @param serread
-  public StaticSentence(Session s, ISQLBuilderStatic sentence) {
+     * @param serwrite
-    this(s, sentence, null, null);
+     */
-  }
+    public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
-
+        super(s);
-  /**
+        iSQLBuilder = sentence;
-   * Creates a new instance of StaticSentence
+        m_SerWrite = serwrite;
-   *
+        m_SerRead = serread;
-   * @param s
-   * @param sentence
-   * @param serwrite
-   */
-  public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
-    this(s, sentence, serwrite, null);
-  }
-
-  /**
-   * Creates a new instance of StaticSentence
-   *
-   * @param s
-   * @param sentence
-   * @param serread
-   * @param serwrite
-   */
-  public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
-    this(s, new NormalBuilder(sentence), serwrite, serread);
-  }
-
-  /**
-   * Creates a new instance of StaticSentence
-   *
-   * @param s
-   * @param sentence
-   * @param serwrite
-   */
-  public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
-    this(s, new NormalBuilder(sentence), serwrite, null);
-  }
-
-  /**
-   * Creates a new instance of StaticSentence
-   *
-   * @param s
-   * @param sentence
-   */
-  public StaticSentence(Session s, String sentence) {
-    this(s, new NormalBuilder(sentence), null, null);
-  }
-
-  public String fixSqliteDate(String sql) {
-
-    try {
-      if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
-        StringBuilder sqliteSQL = new StringBuilder();
-
-        Pattern date = Pattern.compile("(?<=ts ).*(?=})");
-        Matcher matchPattern = date.matcher(sql);
-
-        if (matchPattern.find()) {
-          sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
-        }
-
-        return sqliteSQL.toString();
-      }
-
-    } catch (Exception e) {
-      log.error("Error fixing sql for sqlite {}", e.getMessage());
-      return sql;
-    }
-    return sql;
-  }
-
-  /**
-   * @param params
-   * @return
-   * @throws BasicException
-   */
-  @Override
-  public DataResultSet openExec(Object params) throws BasicException {
-    // true -> un resultset
-    // false -> un updatecount (si -1 entonces se acabo)
-
-    closeExec();
-
-    try {
-      // follow this to find the create category bug when importing a product csv
-      // 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();
-
-      log.debug("Executing static SQL: {}", sentence);
-
-      if (statement.execute(sentence)) {
-        return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
-      } else {
-        int iUC = statement.getUpdateCount();
-        if (iUC < 0) {
-          return null;
-        } else {
-          return new SentenceUpdateResultSet(iUC);
-        }
-      }
-    } catch (SQLException eSQL) {
-      throw new BasicException(eSQL);
-    }
-  }
-
-  /**
-   * @throws BasicException
-   */
-  @Override
-  public void closeExec() throws BasicException {
-
-    if (statement != null) {
-      try {
-        statement.close();
-      } catch (SQLException eSQL) {
-        throw new BasicException(eSQL);
-      } finally {
         statement = null;
-      }
     }
-  }
 
-  /**
+    /**
-   * @return
+     * Creates a new instance of StaticSentence
-   * @throws BasicException
+     *
-   */
+     * @param s
-  @Override
+     * @param sentence
-  public DataResultSet moreResults() throws BasicException {
+     */
+    public StaticSentence(Session s, ISQLBuilderStatic sentence) {
+        this(s, sentence, null, null);
+    }
+
+    /**
+     * Creates a new instance of StaticSentence
+     *
+     * @param s
+     * @param sentence
+     * @param serwrite
+     */
+    public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
+        this(s, sentence, serwrite, null);
+    }
+
+    /**
+     * Creates a new instance of StaticSentence
+     *
+     * @param s
+     * @param sentence
+     * @param serread
+     * @param serwrite
+     */
+    public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
+        this(s, new NormalBuilder(sentence), serwrite, serread);
+    }
+
+    /**
+     * Creates a new instance of StaticSentence
+     *
+     * @param s
+     * @param sentence
+     * @param serwrite
+     */
+    public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
+        this(s, new NormalBuilder(sentence), serwrite, null);
+    }
+
+    /**
+     * Creates a new instance of StaticSentence
+     *
+     * @param s
+     * @param sentence
+     */
+    public StaticSentence(Session s, String sentence) {
+        this(s, new NormalBuilder(sentence), null, null);
+    }
+
+    public String fixSqliteDate(String sql) {
+
+        try {
+            if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
+                StringBuilder sqliteSQL = new StringBuilder();
+
+                Pattern date = Pattern.compile("(?<=ts ).*(?=})");
+                Matcher matchPattern = date.matcher(sql);
+
+                if (matchPattern.find()) {
+                    sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
+                }
+
+                return sqliteSQL.toString();
+            }
 
-    try {
-      if (statement.getMoreResults()) {
-        // tenemos resultset
-        return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
-      } else {
-        // tenemos updatecount o si devuelve -1 ya no hay mas
-        int iUC = statement.getUpdateCount();
-        if (iUC < 0) {
-          return null;
-        } else {
-          return new SentenceUpdateResultSet(iUC);
         }
-      }
+        catch (Exception e) {
-    } catch (SQLException eSQL) {
+            log.error("Error fixing sql for sqlite {}", e.getMessage());
-      throw new BasicException(eSQL);
+            return sql;
+        }
+        return sql;
+    }
+    /**
+     * @param params
+     * @return
+     * @throws BasicException
+     */
+    @Override
+    public DataResultSet openExec(Object params) throws BasicException {
+        // true -> un resultset
+        // false -> un updatecount (si -1 entonces se acabo)
+
+        closeExec();
+
+        try {
+
+            String sentence = fixSqliteDate(iSQLBuilder.getSQL(m_SerWrite, params));
+            //String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
+
+            statement = session.getConnection().createStatement();
+
+            log.debug("Executing static SQL: {}", sentence);
+
+            if (statement.execute(sentence)) {
+                return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
+            } else {
+                int iUC = statement.getUpdateCount();
+                if (iUC < 0) {
+                    return null;
+                } else {
+                    return new SentenceUpdateResultSet(iUC);
+                }
+            }
+        } catch (SQLException eSQL) {
+            throw new BasicException(eSQL);
+        }
+    }
+
+    /**
+     * @throws BasicException
+     */
+    @Override
+    public void closeExec() throws BasicException {
+
+        if (statement != null) {
+            try {
+                statement.close();
+            } catch (SQLException eSQL) {
+                throw new BasicException(eSQL);
+            } finally {
+                statement = null;
+            }
+        }
+    }
+
+    /**
+     * @return
+     * @throws BasicException
+     */
+    @Override
+    public DataResultSet moreResults() throws BasicException {
+
+        try {
+            if (statement.getMoreResults()) {
+                // tenemos resultset
+                return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
+            } else {
+                // tenemos updatecount o si devuelve -1 ya no hay mas
+                int iUC = statement.getUpdateCount();
+                if (iUC < 0) {
+                    return null;
+                } else {
+                    return new SentenceUpdateResultSet(iUC);
+                }
+            }
+        } catch (SQLException eSQL) {
+            throw new BasicException(eSQL);
+        }
     }
-  }
 
 }

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

@@ -50,12 +50,10 @@ public class DataLogicAdmin extends BeanFactoryDataSingle {
         
         m_tpeople = new TableDefinition(s,
             "people"
-            , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE", "TAXID"}
+            , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE"}
-            , new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"),
+            , 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")}
-                AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"),
+            , new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE}
-                AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage"), "tax ID"}
+            , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL}
-            , 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,18 +52,16 @@
                   <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="passwordLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel6" 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 pref="50" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -77,15 +75,10 @@
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="2" attributes="0">
-                  <Component id="passwordLabel" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
                   <Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace type="unrelated" 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"/>
@@ -106,7 +99,7 @@
                   <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
                   <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="110" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -253,11 +246,8 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JComboBox" name="webCBSecurity">
+    <Component class="com.alee.laf.combobox.WebComboBox" 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"/>
@@ -271,6 +261,9 @@
         <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>
@@ -279,7 +272,7 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="passwordLabel">
+    <Component class="javax.swing.JLabel" name="jLabel6">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -292,23 +285,5 @@
         </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

@@ -42,479 +42,426 @@ import javax.swing.*;
  */
 public class PeopleView extends JPanel implements EditorRecord {
 
-  private Object m_oId;
+    private Object m_oId;
-  private String m_sPassword;
+    private String m_sPassword;
+    
+    private final DirtyManager m_Dirty;
+    
+    private final SentenceList m_sentrole;
+    private ComboBoxValModel m_RoleModel;  
+    
+    private final ComboBoxValModel m_ReasonModel;        
+    
+    /** Creates new form PeopleEditor
+     * @param dlAdmin
+     * @param dirty */
+    public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
-  private final DirtyManager m_Dirty;
+        initComponents();
+                
+        // El modelo de roles
+        m_sentrole = dlAdmin.getRolesList();
+        m_RoleModel = new ComboBoxValModel();
+        
+        m_Dirty = dirty;
+        m_jName.getDocument().addDocumentListener(dirty);
+        m_jRole.addActionListener(dirty);
+        m_jVisible.addActionListener(dirty);
+        m_jImage.addPropertyChangeListener("image", dirty);
+        m_jcard.getDocument().addDocumentListener(dirty);
 
-  private final SentenceList m_sentrole;
+        m_ReasonModel = new ComboBoxValModel();
-  private ComboBoxValModel m_RoleModel;
+        m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
-
+        m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));              
-  private final ComboBoxValModel m_ReasonModel;
+        m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));                      
-
+        
-  /**
+        webCBSecurity.setModel(m_ReasonModel);
-   * Creates new form PeopleEditor
+        
-   * 
+        writeValueEOF();
-   * @param dlAdmin
-   * @param dirty
-   */
-  public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
-
-    initComponents();
-
-    // El modelo de roles
-    m_sentrole = dlAdmin.getRolesList();
-    m_RoleModel = new ComboBoxValModel();
-
-    m_Dirty = dirty;
-    m_jName.getDocument().addDocumentListener(dirty);
-    m_jRole.addActionListener(dirty);
-    m_jVisible.addActionListener(dirty);
-    m_jImage.addPropertyChangeListener("image", dirty);
-    m_jcard.getDocument().addDocumentListener(dirty);
-
-    m_ReasonModel = new ComboBoxValModel();
-    m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
-    m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
-    m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
-
-    webCBSecurity.setModel(m_ReasonModel);
-
-    taxIdTextField.getDocument().addDocumentListener(dirty);
-    writeValueEOF();
-  }
-
-  /**
-   *
-   */
-  @Override
-  public void writeValueEOF() {
-    m_oId = null;
-    m_jName.setText(null);
-    m_sPassword = null;
-    m_RoleModel.setSelectedKey(null);
-    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);
-    m_jcard.setEnabled(false);
-    m_jImage.setEnabled(false);
-    jButton1.setEnabled(false);
-    webCBSecurity.setEnabled(false);
-    taxIdTextField.setEnabled(false);
-  }
-
-  /**
-   *
-   */
-  @Override
-  public void writeValueInsert() {
-    m_oId = null;
-    m_jName.setText(null);
-    m_sPassword = null;
-    m_RoleModel.setSelectedKey(null);
-    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);
-    m_jcard.setEnabled(true);
-    m_jImage.setEnabled(true);
-    jButton1.setEnabled(true);
-    webCBSecurity.setEnabled(true);
-    taxIdTextField.setEnabled(true);
-  }
-
-  /**
-   *
-   * @param value
-   */
-  @Override
-  public void writeValueDelete(Object value) {
-    Object[] people = (Object[]) value;
-    m_oId = people[0];
-    m_jName.setText(Formats.STRING.formatValue(people[1]));
-    m_sPassword = Formats.STRING.formatValue(people[2]);
-    m_RoleModel.setSelectedKey(people[3]);
-    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);
-    m_jVisible.setEnabled(false);
-    m_jcard.setEnabled(false);
-    m_jImage.setEnabled(false);
-    jButton1.setEnabled(false);
-    webCBSecurity.setEnabled(false);
-    taxIdTextField.setEnabled(false);
-  }
-
-  /**
-   *
-   * @param value
-   */
-  @Override
-  public void writeValueEdit(Object value) {
-    Object[] people = (Object[]) value;
-    m_oId = people[0];
-    m_jName.setText(Formats.STRING.formatValue(people[1]));
-    m_sPassword = Formats.STRING.formatValue(people[2]);
-    m_RoleModel.setSelectedKey(people[3]);
-    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());
 
-    m_jName.setEnabled(true);
+    /**
-    m_jRole.setEnabled(true);
+     *
-    m_jVisible.setEnabled(true);
+     */
-    m_jcard.setEnabled(true);
+    @Override
-    m_jImage.setEnabled(true);
+    public void writeValueEOF() {
-    jButton1.setEnabled(true);
+        m_oId = null;
-    webCBSecurity.setEnabled(true);
+        m_jName.setText(null);
-    taxIdTextField.setEnabled(true);
+        m_sPassword = null;
-  }
+        m_RoleModel.setSelectedKey(null);
+        m_jVisible.setSelected(false);
+        m_jcard.setText(null);
+        m_jImage.setImage(null);
+        m_jName.setEnabled(false);
+        m_jRole.setEnabled(false);
+        m_jVisible.setEnabled(false);
+        m_jcard.setEnabled(false);
+        m_jImage.setEnabled(false);
+        jButton1.setEnabled(false);
+        webCBSecurity.setEnabled(false);
+    }
+    
+    /**
+     *
+     */
+    @Override
+    public void writeValueInsert() {
+        m_oId = null;
+        m_jName.setText(null);
+        m_sPassword = null;
+        m_RoleModel.setSelectedKey(null);
+        m_jVisible.setSelected(true);
+        m_jcard.setText(null);
+        m_jImage.setImage(null);
+        m_jName.setEnabled(true);
+        m_jRole.setEnabled(true);
+        m_jVisible.setEnabled(true);
+        m_jcard.setEnabled(true);
+        m_jImage.setEnabled(true);
+        jButton1.setEnabled(true);
+        webCBSecurity.setEnabled(true);        
+    }
+    
+    /**
+     *
+     * @param value
+     */
+    @Override
+    public void writeValueDelete(Object value) {
+        Object[] people = (Object[]) value;
+        m_oId = people[0];
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
+        m_sPassword = Formats.STRING.formatValue(people[2]);
+        m_RoleModel.setSelectedKey(people[3]);
+        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+        m_jImage.setImage((BufferedImage) people[6]);
+        
+        m_jName.setEnabled(false);
+        m_jRole.setEnabled(false);
+        m_jVisible.setEnabled(false);
+        m_jcard.setEnabled(false);
+        m_jImage.setEnabled(false);        
+        jButton1.setEnabled(false);
+        webCBSecurity.setEnabled(false);        
+    }
 
-  /**
+    /**
-   *
+     *
-   * @return
+     * @param value
-   * @throws BasicException
+     */
-   */
+    @Override
-  @Override
+    public void writeValueEdit(Object value) {
-  public Object createValue() throws BasicException {
+        Object[] people = (Object[]) value;
-    Object[] people = new Object[8];
+        m_oId = people[0];
-    people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
-    people[1] = Formats.STRING.parseValue(m_jName.getText());
+        m_sPassword = Formats.STRING.formatValue(people[2]);
-    people[2] = Formats.STRING.parseValue(m_sPassword);
+        m_RoleModel.setSelectedKey(people[3]);
-    people[3] = m_RoleModel.getSelectedKey();
+        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
-    people[4] = m_jVisible.isSelected();
+        m_jcard.setText(Formats.STRING.formatValue(people[5]));
-    people[5] = Formats.STRING.parseValue(m_jcard.getText());
+        m_jImage.setImage((BufferedImage) people[6]);
-    people[6] = m_jImage.getImage();
+        
-    people[7] = Formats.STRING.parseValue(taxIdTextField.getText());
+        if (m_jcard.getText().length() == 16) {
-    return people;
+            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-  }
+        } else {
+            jLblCardID.setText(AppLocal.getIntString("label.card"));            
+        }
+        System.out.println(m_jcard.getText().length());        
+        
+        m_jName.setEnabled(true);
+        m_jRole.setEnabled(true);
+        m_jVisible.setEnabled(true);
+        m_jcard.setEnabled(true);
+        m_jImage.setEnabled(true);
+        jButton1.setEnabled(true);
+        webCBSecurity.setEnabled(true);        
+    }
+    
+    /**
+     *
+     * @return
+     * @throws BasicException
+     */
+    @Override
+    public Object createValue() throws BasicException {
+        Object[] people = new Object[7];
+        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);
+        people[3] = m_RoleModel.getSelectedKey();
+        people[4] = m_jVisible.isSelected();
+        people[5] = Formats.STRING.parseValue(m_jcard.getText());
+        people[6] = m_jImage.getImage();
+        return people;
+    }
 
-  /**
+    /**
-   *
+     *
-   * @return
+     * @return
-   */
+     */
-  @Override
+    @Override
-  public Component getComponent() {
+    public Component getComponent() {
-    return this;
+        return this;
-  }
+    }
 
-  /**
+    /**
-   *
+     *
-   * @throws BasicException
+     * @throws BasicException
-   */
+     */
-  public void activate() throws BasicException {
+    public void activate() throws BasicException {
+        
+        m_RoleModel = new ComboBoxValModel(m_sentrole.list());
+        m_jRole.setModel(m_RoleModel);
+    }
+    
+   
+    /**
+     *
+     */
+    @Override
+    public void refresh() {
+    }
+     
+    /** 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
+    private void initComponents() {
 
-    m_RoleModel = new ComboBoxValModel(m_sentrole.list());
+        jLabel1 = new javax.swing.JLabel();
-    m_jRole.setModel(m_RoleModel);
+        m_jName = new javax.swing.JTextField();
-  }
+        m_jVisible = new javax.swing.JCheckBox();
+        jLabel3 = new javax.swing.JLabel();
+        jLabel4 = new javax.swing.JLabel();
+        m_jImage = new com.unicenta.data.gui.JImageEditor();
+        jButton1 = new javax.swing.JButton();
+        m_jRole = new javax.swing.JComboBox();
+        jLabel2 = new javax.swing.JLabel();
+        m_jcard = new javax.swing.JTextField();
+        jLblCardID = new javax.swing.JLabel();
+        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
+        jLabel6 = new javax.swing.JLabel();
 
-  /**
+        setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-   *
+        setPreferredSize(new java.awt.Dimension(500, 500));
-   */
-  @Override
-  public void refresh() {
-  }
 
-  /**
+        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-   * This method is called from within the constructor to
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-   * initialize the form.
+        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-   * WARNING: Do NOT modify this code. The content of this method is
+        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
-   * always regenerated by the Form Editor.
+        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
-   */
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
-  // <editor-fold defaultstate="collapsed" desc="Generated
+                jLabel1MouseClicked(evt);
-  // <editor-fold defaultstate="collapsed" desc="Generated
+            }
-  // Code">//GEN-BEGIN:initComponents
+        });
-  private void initComponents() {
 
-    jLabel1 = new javax.swing.JLabel();
+        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jName = new javax.swing.JTextField();
+        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
-    m_jVisible = new javax.swing.JCheckBox();
-    jLabel3 = new javax.swing.JLabel();
-    jLabel4 = new javax.swing.JLabel();
-    m_jImage = new com.unicenta.data.gui.JImageEditor();
-    jButton1 = new javax.swing.JButton();
-    m_jRole = new javax.swing.JComboBox();
-    jLabel2 = new javax.swing.JLabel();
-    m_jcard = new javax.swing.JTextField();
-    jLblCardID = new javax.swing.JLabel();
-    webCBSecurity = new javax.swing.JComboBox();
-    passwordLabel = new javax.swing.JLabel();
-    taxIdTextField = new javax.swing.JTextField();
-    taxIdLabel = new javax.swing.JLabel();
 
-    setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    setPreferredSize(new java.awt.Dimension(500, 500));
+        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-    jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
-    jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
-    jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
-      public void mouseClicked(java.awt.event.MouseEvent evt) {
-        jLabel1MouseClicked(evt);
-      }
-    });
 
-    m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
+        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
 
-    jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
-    jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
+        jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
+        jButton1.setToolTipText("");
+        jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
+        jButton1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton1ActionPerformed(evt);
+            }
+        });
 
-    jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+        m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
-    jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
+        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
+        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
-    jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
-    jButton1.setToolTipText("");
-    jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
-    jButton1.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        jButton1ActionPerformed(evt);
-      }
-    });
 
-    m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    jLabel2.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" }));
-    jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+        webCBSecurity.setSelectedIndex(0);
-    jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
+        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) {
+                webCBSecurityActionPerformed(evt);
+            }
+        });
 
-    m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
+        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
+        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-    jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+        this.setLayout(layout);
-    jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
+        layout.setHorizontalGroup(
-
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-    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.setPreferredSize(new java.awt.Dimension(140, 45));
-    webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        webCBSecurityActionPerformed(evt);
-      }
-    });
-
-    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
-    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);
-    layout.setHorizontalGroup(
-        layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(jLabel3, 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)
                         .addGap(18, 18, 18)
-                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207,
+                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel2, 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)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel4, 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)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(m_jImage, 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))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(jLblCardID, 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(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(webCBSecurity, 0, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_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(jLabel6, 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(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                            .addComponent(jButton1, 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, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                .addContainerGap())
-                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+        );
-                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+        layout.setVerticalGroup(
-                                javax.swing.GroupLayout.PREFERRED_SIZE))))
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                .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,
+                    .addComponent(jLabel1, 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))
-                    .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(passwordLabel, 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(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        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,
+                    .addComponent(jLblCardID, 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(m_jcard, 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,
+                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_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,
+                    .addComponent(jLabel2, 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))
-                    .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,
+                    .addComponent(jLabel3, 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))
-                    .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,
+                    .addComponent(m_jImage, 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(jLabel4, 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(110, Short.MAX_VALUE)));
+    }// </editor-fold>//GEN-END:initComponents
-  }// </editor-fold>//GEN-END:initComponents
 
-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
+    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
 
-    String sNewPassword = Hashcypher.changePassword(this);
+        String sNewPassword = Hashcypher.changePassword(this);
-    if (sNewPassword != null) {
+        if (sNewPassword != null) {
-      m_sPassword = sNewPassword;
+            m_sPassword = sNewPassword;
-      m_Dirty.setDirty(true);
+            m_Dirty.setDirty(true);
-    }
+        }
 
-  }// GEN-LAST:event_jButton1ActionPerformed
+    }//GEN-LAST:event_jButton1ActionPerformed
 
-  private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
+    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) {
-        m_jcard.setText("C" + StringUtils.getCardNumber());
-        m_Dirty.setDirty(true);
-      }
-    }
 
-    if (webCBSecurity.getSelectedIndex() == 1) {
+        if(webCBSecurity.getSelectedIndex() == 0){
-      if (JOptionPane.showConfirmDialog(this,
+            if (JOptionPane.showConfirmDialog(this, 
-          AppLocal.getIntString("message.cardremove"),
+                AppLocal.getIntString("message.cardnew"), 
-          AppLocal.getIntString("title.editor"),
+                AppLocal.getIntString("title.editor"), 
-          JOptionPane.YES_NO_OPTION,
+                JOptionPane.YES_NO_OPTION, 
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
-        m_jcard.setText(null);
+            {  
-        m_Dirty.setDirty(true);
+                m_jcard.setText("C" + StringUtils.getCardNumber());
-      }
+                m_Dirty.setDirty(true);
-    }
+            }        
+        }         
 
-    if (webCBSecurity.getSelectedIndex() == 2) {
+        if(webCBSecurity.getSelectedIndex() == 1){
-      if (JOptionPane.showConfirmDialog(this,
+            if (JOptionPane.showConfirmDialog(this, 
-          AppLocal.getIntString("message.ibuttonassign"),
+                AppLocal.getIntString("message.cardremove"), 
-          AppLocal.getIntString("title.editor"),
+                AppLocal.getIntString("title.editor"), 
-          JOptionPane.OK_CANCEL_OPTION,
+                JOptionPane.YES_NO_OPTION, 
-          JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+            {  
+                m_jcard.setText(null);
+                m_Dirty.setDirty(true);
+            }
+        }
+        
+        if(webCBSecurity.getSelectedIndex() == 2){
+            if (JOptionPane.showConfirmDialog(this, 
+                AppLocal.getIntString("message.ibuttonassign"), 
+                AppLocal.getIntString("title.editor"), 
+                JOptionPane.OK_CANCEL_OPTION, 
+                JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) 
 
-      {
+            {  
-        m_jcard.setText(uOWWatch.getibuttonid());
+                m_jcard.setText( uOWWatch.getibuttonid() );
-        jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-        m_Dirty.setDirty(true);
+                m_Dirty.setDirty(true);
-      }
+            }
 
-    }
+        }                
-
+               
-  }// GEN-LAST:event_webCBSecurityActionPerformed
+    }//GEN-LAST:event_webCBSecurityActionPerformed
-
-  private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_jLabel1MouseClicked
-    if (evt.getClickCount() == 2) {
-      String uuidString = m_oId.toString();
-      StringSelection stringSelection = new StringSelection(uuidString);
-      Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
-      clpbrd.setContents(stringSelection, null);
-
-      JOptionPane.showMessageDialog(null,
-          AppLocal.getIntString("message.uuidcopy"));
-    }
-  }// 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 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 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
 
+    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
+        if (evt.getClickCount() == 2) {
+            String uuidString = m_oId.toString();
+            StringSelection stringSelection = new StringSelection(uuidString);
+            Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
+            clpbrd.setContents(stringSelection, null);
+        
+            JOptionPane.showMessageDialog(null, 
+                AppLocal.getIntString("message.uuidcopy"));
+        }
+    }//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;
+    // End of variables declaration//GEN-END:variables
+    
 }

src/main/java/com/unicenta/pos/config/JPanelConfigPeripheral.java

@@ -1961,7 +1961,7 @@ public class JPanelConfigPeripheral extends javax.swing.JPanel implements PanelC
         webSlider.setSnapToTicks(true);
         webSlider.setToolTipText("");
         webSlider.setValue(5);
-        webSlider.setAnimated(false);
+        //webSlider.setAnimated(false);
         webSlider.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         webSlider.setPreferredSize(new java.awt.Dimension(270, 47));
         webSlider.addChangeListener(new javax.swing.event.ChangeListener() {

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

@@ -228,7 +228,7 @@ public class AppConfig implements AppProperties {
 
   }
 
-  private void pullLatestProperties() {
+  private void refreshProperties() {
     try {
       InputStream in = new FileInputStream(configfile);
       if (in != null) {
@@ -252,11 +252,9 @@ public class AppConfig implements AppProperties {
     }
   }
 
-  public void setLastTicket(String lastTicketNumber, String lastTicketType) throws IOException {
+  public void saveWithExistingProperties() throws IOException {
 
-    pullLatestProperties();
+    refreshProperties();
-    properties.setProperty("lastticket.number", lastTicketNumber);
-    properties.setProperty("lastticket.type", lastTicketType);
 
     OutputStream out = new FileOutputStream(configfile);
     if (out != null) {

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.4.0";
+    public static final String APP_VERSION = "5.3";
 
     private static final LocaleResources m_resources;
 

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

@@ -55,7 +55,6 @@ public class AppUser {
   private final Icon m_Icon;
 
   private Set<String> m_apermissions;
-  private String taxId;
 
   static {
     initOldClasses();
@@ -71,7 +70,7 @@ public class AppUser {
    * @param icon
    * @param role
    */
-  public AppUser(String id, String name, String password, String card, String role, Icon icon, String taxId) {
+  public AppUser(String id, String name, String password, String card, String role, Icon icon) {
     m_sId = id;
     m_sName = name;
     m_sPassword = password;
@@ -79,7 +78,6 @@ public class AppUser {
     m_sRole = role;
     m_Icon = icon;
     m_apermissions = null;
-    this.taxId = taxId;
   }
 
   /**
@@ -201,14 +199,14 @@ public class AppUser {
    * @return
    */
   public UserInfo getUserInfo() {
-    return new UserInfo(m_sId, m_sName, this.taxId);
+    return new UserInfo(m_sId, m_sName);
   }
 
   private static String mapNewClass(String classname) {
     String newclass = m_oldclasses.get(classname);
     return newclass == null
-        ? classname
+            ? classname
-        : newclass;
+            : newclass;
   }
 
   private static void initOldClasses() {
@@ -224,8 +222,7 @@ 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",
+    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel", "com.unicenta.pos.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");
@@ -303,4 +300,5 @@ 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.INT})
+                Datas.BOOLEAN})
         );
 
         m_createSupp = new StaticSentence(s,
@@ -635,22 +635,6 @@ 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,8 +121,7 @@ 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) -> (                       
@@ -209,12 +208,12 @@ public class DataLogicSystem extends BeanFactoryDataSingle {
  // END OF CUSTOMER ******************************************************************      
        
         m_peoplevisible = new StaticSentence(s
-            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
+            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
             , null
             , peopleread);
 
         m_peoplebycard = new PreparedSentence(s
-            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE()
+            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE 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="mainMenuJPanel">
+    <Container class="javax.swing.JPanel" name="jPanel1">
       <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="showMainMenuButton" min="-2" max="-2" attributes="0"/>
+                      <Component id="jButton1" 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 max="32767" attributes="0"/>
+                      <EmptySpace pref="88" max="32767" attributes="0"/>
-                      <Component id="showMainMenuButton" pref="120" max="32767" attributes="0"/>
+                      <Component id="jButton1" pref="33" max="32767" attributes="0"/>
-                      <EmptySpace pref="95" max="32767" attributes="0"/>
+                      <EmptySpace pref="188" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
           </Layout>
           <SubComponents>
-            <Component class="javax.swing.JButton" name="showMainMenuButton">
+            <Component class="javax.swing.JButton" name="jButton1">
               <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="showMainMenuButtonActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
               </Events>
             </Component>
           </SubComponents>
         </Container>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="salesScreenJPanel">
+    <Container class="javax.swing.JPanel" name="m_jPanelRight">
       <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="salesScreenTitlePanel">
+        <Container class="javax.swing.JPanel" name="m_jPanelTitle">
           <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="salesScreenTitleLabel">
+            <Component class="javax.swing.JLabel" name="m_jTitle">
               <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,16 +101,20 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
     m_principalnotificator.setText(m_appuser.getName());
     m_principalnotificator.setIcon(m_appuser.getIcon());
 
-    if (showMainMenuButton.getComponentOrientation().isLeftToRight()) {
+    if (jButton1.getComponentOrientation().isLeftToRight()) {
-      menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
+      menu_open = new javax.swing.ImageIcon(getClass().getResource(
-      menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
+              "/com/unicenta/images/menu-right.png"));
+      menu_close = new javax.swing.ImageIcon(getClass().getResource(
+              "/com/unicenta/images/menu-left.png"));
     } else {
-      menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
+      menu_open = new javax.swing.ImageIcon(getClass().getResource(
-      menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
+              "/com/unicenta/images/menu-left.png"));
+      menu_close = new javax.swing.ImageIcon(getClass().getResource(
+              "/com/unicenta/images/menu-right.png"));
     }
     assignMenuButtonIcon();
 
-    salesScreenTitlePanel.setVisible(false);
+    m_jPanelTitle.setVisible(false);
     m_jPanelContainer.add(new JPanel(), "<NULL>");
 
     showView("<NULL>");
@@ -142,7 +146,9 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
   }
 
   private void assignMenuButtonIcon() {
-    showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open);
+    jButton1.setIcon(m_jPanelLeft.isVisible()
+            ? menu_close
+            : menu_open);
   }
 
   /**
@@ -484,13 +490,12 @@ 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();
-        salesScreenTitlePanel.setVisible(sTitle != null);
+        m_jPanelTitle.setVisible(sTitle != null);
-        salesScreenTitleLabel.setText(sTitle);
+        m_jTitle.setText(sTitle);
       }
     } else {
 
@@ -540,106 +545,106 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
    * 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() {
+  private void initComponents() {
 
-        mainMenuJPanel = new javax.swing.JPanel();
+    jPanel1 = new javax.swing.JPanel();
-        m_jPanelLeft = new javax.swing.JScrollPane();
+    m_jPanelLeft = new javax.swing.JScrollPane();
-        jPanel2 = new javax.swing.JPanel();
+    jPanel2 = new javax.swing.JPanel();
-        showMainMenuButton = new javax.swing.JButton();
+    jButton1 = new javax.swing.JButton();
-        salesScreenJPanel = new javax.swing.JPanel();
+    m_jPanelRight = new javax.swing.JPanel();
-        salesScreenTitlePanel = new javax.swing.JPanel();
+    m_jPanelTitle = new javax.swing.JPanel();
-        salesScreenTitleLabel = new javax.swing.JLabel();
+    m_jTitle = new javax.swing.JLabel();
-        m_jPanelContainer = new javax.swing.JPanel();
+    m_jPanelContainer = new javax.swing.JPanel();
 
-        setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        setLayout(new java.awt.BorderLayout());
+    setLayout(new java.awt.BorderLayout());
 
-        mainMenuJPanel.setLayout(new java.awt.BorderLayout());
+    jPanel1.setLayout(new java.awt.BorderLayout());
 
-        m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
+    m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
-        m_jPanelLeft.setBorder(null);
+    m_jPanelLeft.setBorder(null);
-        m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
+    m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
-        mainMenuJPanel.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
+    jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
 
-        jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
+    jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
 
-        showMainMenuButton.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
+    jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
-        showMainMenuButton.setFocusPainted(false);
+    jButton1.setFocusPainted(false);
-        showMainMenuButton.setFocusable(false);
+    jButton1.setFocusable(false);
-        showMainMenuButton.setIconTextGap(0);
+    jButton1.setIconTextGap(0);
-        showMainMenuButton.setMargin(new java.awt.Insets(10, 2, 10, 2));
+    jButton1.setMargin(new java.awt.Insets(10, 2, 10, 2));
-        showMainMenuButton.setMaximumSize(new java.awt.Dimension(45, 32224661));
+    jButton1.setMaximumSize(new java.awt.Dimension(45, 32224661));
-        showMainMenuButton.setMinimumSize(new java.awt.Dimension(32, 32));
+    jButton1.setMinimumSize(new java.awt.Dimension(32, 32));
-        showMainMenuButton.setPreferredSize(new java.awt.Dimension(36, 45));
+    jButton1.setPreferredSize(new java.awt.Dimension(36, 45));
-        showMainMenuButton.setRequestFocusEnabled(false);
+    jButton1.setRequestFocusEnabled(false);
-        showMainMenuButton.addActionListener(new java.awt.event.ActionListener() {
+    jButton1.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
-                showMainMenuButtonActionPerformed(evt);
+        jButton1ActionPerformed(evt);
-            }
+      }
-        });
+    });
 
-        javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
+    javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
-        jPanel2.setLayout(jPanel2Layout);
+    jPanel2.setLayout(jPanel2Layout);
-        jPanel2Layout.setHorizontalGroup(
+    jPanel2Layout.setHorizontalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
-                .addGap(0, 0, 0)
+                            .addGap(0, 0, 0)
-                .addComponent(showMainMenuButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap())
+                            .addContainerGap())
-        );
+    );
-        jPanel2Layout.setVerticalGroup(
+    jPanel2Layout.setVerticalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel2Layout.createSequentialGroup()
+                    .addGroup(jPanel2Layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addContainerGap(88, Short.MAX_VALUE)
-                .addComponent(showMainMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
+                            .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE)
-                .addContainerGap(95, Short.MAX_VALUE))
+                            .addContainerGap(188, Short.MAX_VALUE))
-        );
+    );
 
-        mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END);
+    jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END);
 
-        add(mainMenuJPanel, java.awt.BorderLayout.LINE_START);
+    add(jPanel1, java.awt.BorderLayout.LINE_START);
 
-        salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40));
+    m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40));
-        salesScreenJPanel.setLayout(new java.awt.BorderLayout());
+    m_jPanelRight.setLayout(new java.awt.BorderLayout());
 
-        salesScreenTitlePanel.setLayout(new java.awt.BorderLayout());
+    m_jPanelTitle.setLayout(new java.awt.BorderLayout());
 
-        salesScreenTitleLabel.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
+    m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
-        salesScreenTitleLabel.setForeground(new java.awt.Color(0, 168, 223));
+    m_jTitle.setForeground(new java.awt.Color(0, 168, 223));
-        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.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.setMaximumSize(new java.awt.Dimension(100, 35));
+    m_jTitle.setMaximumSize(new java.awt.Dimension(100, 35));
-        salesScreenTitleLabel.setMinimumSize(new java.awt.Dimension(30, 25));
+    m_jTitle.setMinimumSize(new java.awt.Dimension(30, 25));
-        salesScreenTitleLabel.setPreferredSize(new java.awt.Dimension(100, 35));
+    m_jTitle.setPreferredSize(new java.awt.Dimension(100, 35));
-        salesScreenTitlePanel.add(salesScreenTitleLabel, java.awt.BorderLayout.NORTH);
+    m_jPanelTitle.add(m_jTitle, java.awt.BorderLayout.NORTH);
 
-        salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH);
+    m_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
 
-        m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jPanelContainer.setLayout(new java.awt.CardLayout());
+    m_jPanelContainer.setLayout(new java.awt.CardLayout());
-        salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER);
+    m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER);
 
-        add(salesScreenJPanel, java.awt.BorderLayout.CENTER);
+    add(m_jPanelRight, java.awt.BorderLayout.CENTER);
-    }// </editor-fold>//GEN-END:initComponents
+  }// </editor-fold>//GEN-END:initComponents
 
-  private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed
+  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
 
     setMenuVisible(!m_jPanelLeft.isVisible());
 
-  }//GEN-LAST:event_showMainMenuButtonActionPerformed
+  }//GEN-LAST:event_jButton1ActionPerformed
 
 
-    // Variables declaration - do not modify//GEN-BEGIN:variables
+  // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JPanel jPanel2;
+  private javax.swing.JButton jButton1;
-    private javax.swing.JPanel m_jPanelContainer;
+  private javax.swing.JPanel jPanel1;
-    private javax.swing.JScrollPane m_jPanelLeft;
+  private javax.swing.JPanel jPanel2;
-    private javax.swing.JPanel mainMenuJPanel;
+  private javax.swing.JPanel m_jPanelContainer;
-    private javax.swing.JPanel salesScreenJPanel;
+  private javax.swing.JScrollPane m_jPanelLeft;
-    private javax.swing.JLabel salesScreenTitleLabel;
+  private javax.swing.JPanel m_jPanelRight;
-    private javax.swing.JPanel salesScreenTitlePanel;
+  private javax.swing.JPanel m_jPanelTitle;
-    private javax.swing.JButton showMainMenuButton;
+  private javax.swing.JLabel m_jTitle;
-    // End of variables declaration//GEN-END:variables
+  // End of variables declaration//GEN-END:variables
 
 }

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

@@ -19,6 +19,7 @@
 
 package com.unicenta.pos.forms;
 
+//import com.alee.extended.statusbar.WebMemoryBar;
 import com.dalsemi.onewire.OneWireAccessProvider;
 import com.dalsemi.onewire.OneWireException;
 import com.dalsemi.onewire.adapter.DSPortAdapter;
@@ -194,8 +195,8 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
 
     initComponents();
     jScrollPane1.getVerticalScrollBar().setPreferredSize(new Dimension(30, 30));
-    serverMonitor.setVisible(false);
+    //serverMonitor.setVisible(false);
-    webMemoryBar1.setShowMaximumMemory(true);
+    //webMemoryBar1.setShowMaximumMemory(true);
   }
 
   private DSPortAdapter m_oneWireAdapter;
@@ -935,7 +936,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
   }
 
   private int getProgressBar() {
-    int rate = serverMonitor.getValue();
+    int rate = 1;
     return rate;
   }
 
@@ -944,7 +945,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
      * This method is for the future. Connects and will include both servers + backup server
      * Tested locally on JG machine and unicenta-server
      */
-    serverMonitor.setString("Checking...");
+    //serverMonitor.setString("Checking...");
 
     InetAddress addr = InetAddress.getByName(AppLocal.getIntString("db.ip"));
     int port = 3306;
@@ -953,8 +954,8 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
     Socket sock = new Socket();
     try {
       sock.connect(sockaddr, 2000);
-      serverMonitor.setString("Server is alive!");
+      //serverMonitor.setString("Server is alive!");
-      serverMonitor.setValue(0);
+      //serverMonitor.setValue(0);
       return true;
     } catch (IOException ex) {
       log.error(ex.getMessage());
@@ -991,8 +992,8 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
     m_jPanelDown = new javax.swing.JPanel();
     panelTask = new javax.swing.JPanel();
     m_jHost = new javax.swing.JLabel();
-    webMemoryBar1 = new com.alee.extended.statusbar.WebMemoryBar();
+    //webMemoryBar1 = new com.alee.extended.statusbar.WebMemoryBar();
-    serverMonitor = new com.alee.laf.progressbar.WebProgressBar();
+    serverMonitor = null;
     jPanel3 = new javax.swing.JPanel();
 
     setEnabled(false);
@@ -1021,7 +1022,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());
 
@@ -1152,23 +1153,23 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
     m_jHost.setText("*Hostname");
     panelTask.add(m_jHost);
 
-    webMemoryBar1.setBackground(new java.awt.Color(153, 153, 153));
+    //webMemoryBar1.setBackground(new java.awt.Color(153, 153, 153));
-    webMemoryBar1.setText("");
+    //webMemoryBar1.setText("");
-    webMemoryBar1.setFont(new java.awt.Font("Arial", 0, 11)); // NOI18N
+    //webMemoryBar1.setFont(new java.awt.Font("Arial", 0, 11)); // NOI18N
-    webMemoryBar1.setPreferredSize(new java.awt.Dimension(150, 30));
+    //webMemoryBar1.setPreferredSize(new java.awt.Dimension(150, 30));
-    webMemoryBar1.setUsedBorderColor(new java.awt.Color(0, 204, 204));
+    //webMemoryBar1.setUsedBorderColor(new java.awt.Color(0, 204, 204));
-    webMemoryBar1.setUsedFillColor(new java.awt.Color(0, 204, 255));
+    //webMemoryBar1.setUsedFillColor(new java.awt.Color(0, 204, 255));
-    panelTask.add(webMemoryBar1);
+    //panelTask.add(webMemoryBar1);
 
-    serverMonitor.setToolTipText("");
+    //serverMonitor.setToolTipText("");
-    serverMonitor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    //serverMonitor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    serverMonitor.setMaximumSize(new java.awt.Dimension(50, 18));
+    //serverMonitor.setMaximumSize(new java.awt.Dimension(50, 18));
-    serverMonitor.setPreferredSize(new java.awt.Dimension(150, 30));
+    //serverMonitor.setPreferredSize(new java.awt.Dimension(150, 30));
-    serverMonitor.setProgressBottomColor(new java.awt.Color(76, 197, 237));
+    //serverMonitor.setProgressBottomColor(new java.awt.Color(76, 197, 237));
-    serverMonitor.setRound(2);
+    //serverMonitor.setRound(2);
-    serverMonitor.setString("Keep Alive");
+    //serverMonitor.setString("Keep Alive");
-    serverMonitor.setStringPainted(true);
+    //serverMonitor.setStringPainted(true);
-    panelTask.add(serverMonitor);
+    //panelTask.add(serverMonitor);
 
     m_jPanelDown.add(panelTask, java.awt.BorderLayout.LINE_START);
     m_jPanelDown.add(jPanel3, java.awt.BorderLayout.LINE_END);
@@ -1212,6 +1213,6 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
   private javax.swing.JPanel panelTask;
   private javax.swing.JLabel poweredby;
   private com.alee.laf.progressbar.WebProgressBar serverMonitor;
-  private com.alee.extended.statusbar.WebMemoryBar webMemoryBar1;
+  //private com.alee.extended.statusbar.WebMemoryBar webMemoryBar1;
   // End of variables declaration//GEN-END:variables
 }

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, null);
+        application.startEventListener(host, jRootApp);
       } catch (Exception e) {
         log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
       }

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

@@ -41,8 +41,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
 /**
@@ -278,7 +276,6 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
-    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -307,8 +304,7 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
         }
       }
     };
-    // pbWorker.execute();
+    pbWorker.execute();
-    customExecutor.submit(pbWorker);
   }
 
   /**

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

@@ -44,8 +44,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
 /**
@@ -82,7 +80,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;
@@ -294,7 +292,6 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
      * the UI responsiveness.
     */
     private void setWorker() {
-        ExecutorService customExecutor = Executors.newCachedThreadPool();
         progress = 0;
         webPBar.setStringPainted(true);
 
@@ -323,8 +320,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 }    
             }
         };
-        //pbWorker.execute();
+        pbWorker.execute();
-        customExecutor.submit(pbWorker);
     }
 
     /**
@@ -374,7 +370,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 +514,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 +535,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 +964,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/imports/StockQtyImport.java

@@ -43,8 +43,6 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
 /**
@@ -513,7 +511,6 @@ public class StockQtyImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
-    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -542,8 +539,7 @@ public class StockQtyImport extends JPanel implements JPanelView {
         }
       }
     };
-    //pbWorker.execute();
+    pbWorker.execute();
-    customExecutor.submit(pbWorker);
   }
 
   /**

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

@@ -19,7 +19,6 @@
 
 package com.unicenta.pos.payment;
 
-import com.unicenta.basic.BasicException;
 import com.unicenta.format.Formats;
 import com.unicenta.pos.customers.CustomerInfoExt;
 import com.unicenta.pos.customers.DataLogicCustomers;
@@ -27,22 +26,19 @@ import com.unicenta.pos.forms.AppLocal;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.DataLogicSales;
 import com.unicenta.pos.forms.DataLogicSystem;
-import lombok.extern.slf4j.Slf4j;
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
+import javax.swing.JFrame;
-import java.util.concurrent.Executors;
+import javax.swing.SwingWorker;
-import javax.swing.*;
 
 /**
  *
  * @author adrianromero
  */
-@Slf4j
 public abstract class JPaymentSelect extends javax.swing.JDialog
         implements JPaymentNotifier {
 
@@ -724,37 +720,27 @@ public abstract class JPaymentSelect extends javax.swing.JDialog
 
     private void m_jButtonOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonOKActionPerformed
 
-        ExecutorService customExecutor = Executors.newCachedThreadPool();
+        SwingWorker worker = new SwingWorker() {
+            @Override
+            protected Object doInBackground() throws Exception {
+                m_jButtonOK.setEnabled(false);
+                setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment());
+                return null;
+            }
 
-        try {
+            @Override
-            SwingWorker worker = new SwingWorker() {
+            public void done() {
-
+                m_jButtonOK.setEnabled(true);
-                @Override
+                m_jButtonCancel.setEnabled(true);
-                protected Object doInBackground() {
+                if (returnPayment != null) {
-                    m_jButtonOK.setEnabled(false);
+                    m_aPaymentInfo.add(returnPayment);
-                    setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment());
+                    accepted = true;
-                    return null;
+                    dispose();
                 }
+            }
+        };
 
-                @Override
+        worker.execute();
-                public void done() {
-                    m_jButtonOK.setEnabled(true);
-                    m_jButtonCancel.setEnabled(true);
-                    if (returnPayment != null) {
-                        m_aPaymentInfo.add(returnPayment);
-                        accepted = true;
-                        dispose();
-                    }
-                }
-            };
-
-            //worker.execute();
-            customExecutor.submit(worker);
-        }
-        catch (Exception ex) {
-            System.out.println(ex.getMessage());
-        }
-
     }//GEN-LAST:event_m_jButtonOKActionPerformed
 
     private void m_jButtonCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonCancelActionPerformed

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

@@ -23,121 +23,111 @@ import com.unicenta.format.Formats;
 
 public class PaymentInfoCash extends PaymentInfo {
 
-  private double prePayAmount = 0.0;
+    private double prePayAmount = 0.0;
-  private double m_dPaid;
+    private double m_dPaid;
-  private double m_dTotal;
+    private double m_dTotal;
-  private double m_dTendered;
+    private double m_dTendered;
-  private String m_dCardName = null;
+    private String m_dCardName =null;
-  private String m_sName = "cash";
+//    private double m_dTip;    
-  // private double m_dTip;
+    
-
+    /**
-  /**
+     * Creates a new instance of PaymentInfoCash
-   * Creates a new instance of PaymentInfoCash
+     * @param dTotal
-   * 
+     * @param dPaid
-   * @param dTotal
+     * @param dTendered
-   * @param dPaid
+     */
-   * @param dTendered
+    public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
-   */
+        m_dTotal = dTotal;
-  public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
+        m_dPaid = dPaid;
-    m_dTotal = dTotal;
+        m_dTendered = dTendered;
-    m_dPaid = dPaid;
-    m_dTendered = dTendered;
-  }
-
-  /**
-   * Creates a new instance of PaymentInfoCash
-   * 
-   * @param dTotal
-   * @param dPaid
-   * @param dTendered
-   * @param prePayAmount
-   */
-  public PaymentInfoCash(double dTotal, double dPaid, double dTendered, double prePayAmount) {
-    this(dTotal, dTendered, dPaid);
-    this.prePayAmount = prePayAmount;
-  }
-
-  /**
-   * Creates a new instance of PaymentInfoCash
-   * 
-   * @param dTotal
-   * @param dPaid
-   */
-  public PaymentInfoCash(double dTotal, double dPaid) {
-    m_dTotal = dTotal;
-    m_dPaid = dPaid;
-  }
-
-  @Override
-  public PaymentInfo copyPayment() {
-    return new PaymentInfoCash(m_dTotal, m_dPaid, m_dTendered, prePayAmount);
-    // return new PaymentInfoCash(m_dTotal, m_dPaid, prePayAmount);
-  }
-
-  @Override
-  public String getTransactionID() {
-    return "no ID";
-  }
-
-  @Override
-  public String getName() {
-    return "cash";
-  }
-
-  @Override
-  public double getTotal() {
-    return m_dTotal;
-  }
-
-  // public double getTip() {
-  // return m_dTip;
-  // }
-  @Override
-  public double getPaid() {
-    return m_dPaid;
-  }
-
-  @Override
-  public double getTendered() {
-    return m_dTendered;
-  }
-
-  @Override
-  public double getChange() {
-    return m_dPaid - m_dTotal;
-  }
-
-  @Override
-  public String getCardName() {
-    return m_dCardName;
-  }
-
-  public boolean hasPrePay() {
-    if (prePayAmount > 0) {
-      return true;
     }
-    return false;
-  }
 
-  public double getPrePaid() {
+    /**
-    return prePayAmount;
+     * Creates a new instance of PaymentInfoCash
-  }
+     * @param dTotal
+     * @param dPaid
+     * @param dTendered
+     * @param prePayAmount
+     */
+    public PaymentInfoCash(double dTotal, double dPaid, double dTendered, double prePayAmount) {
+        this(dTotal, dTendered, dPaid);
+        this.prePayAmount = prePayAmount;
+    }
+    
+    /** Creates a new instance of PaymentInfoCash
+     * @param dTotal
+     * @param dPaid */
+    public PaymentInfoCash(double dTotal, double dPaid) {
+        m_dTotal = dTotal;
+        m_dPaid = dPaid;
+    }
+    
+    @Override
+    public PaymentInfo copyPayment() {
+       return new PaymentInfoCash(m_dTotal, m_dPaid, m_dTendered, prePayAmount);
+//        return new PaymentInfoCash(m_dTotal, m_dPaid, prePayAmount);        
+    }
 
-  public String printTendered() {
+    @Override
-    return Formats.CURRENCY.formatValue(m_dTendered);
+    public String getTransactionID() {
-  }
+        return "no ID";
+    }
+    
+    @Override
+    public String getName() {
+        return "cash";
+    }
+    @Override
+    public double getTotal() {
+        return m_dTotal;
+    }
+//    public double getTip() {
+//        return m_dTip;
+//    }
+    @Override
+    public double getPaid() {
+        return m_dPaid;
+    }
 
-  public String printPaid() {
+    @Override
-    return Formats.CURRENCY.formatValue(m_dPaid);
+    public double getTendered() {
-  }
+        return m_dTendered;
+    }
 
-  public String printChange() {
+    @Override
-    return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
+   public double getChange(){
-  }
+       return m_dPaid - m_dTotal;
+   }
 
-  @Override
+    @Override
-  public String getVoucher() {
+    public String getCardName() {
-    return null;
+       return m_dCardName;
-  }
+   }     
 
+    public boolean hasPrePay() {
+        if (prePayAmount > 0) {
+            return true;
+        }
+        return false;
+    }
+
+    public double getPrePaid() {
+        return prePayAmount;
+    }
+
+    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);
+    }
+
+    @Override
+    public String getVoucher() {
+        return null;
+    }    
+    
 }

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

@@ -26,83 +26,73 @@ import com.unicenta.format.Formats;
  * @author JG uniCenta
  */
 public class PaymentInfoCash_original extends PaymentInfo {
+    
+    private final double m_dPaid;
+    private final double m_dTotal;
+    private double m_dTendered;    
+    private final String m_dCardName =null;
+//    private double m_dTip;    
+    
+    /** Creates a new instance of PaymentInfoCash
+     * @param dTotal
+     * @param dPaid */
+    public PaymentInfoCash_original(double dTotal, double dPaid) {
+        m_dTotal = dTotal;
+        m_dPaid = dPaid;
+    }
+    
+    @Override
+    public PaymentInfo copyPayment(){
+        return new PaymentInfoCash_original(m_dTotal, m_dPaid);
+    }
+    
+    @Override
+    public String getTransactionID(){
+        return "no ID";
+    }
 
-  private final double m_dPaid;
+    @Override
-  private final double m_dTotal;
+    public String getName() {
-  private double m_dTendered;
+        return "cash";
-  private final String m_dCardName = null;
+    }   
-  private String m_sName = "cash";
+    @Override
-  // private double m_dTip;
+    public double getTotal() {
+        return m_dTotal;
+    }   
+/**    public double getTip() {
+        return m_dTip;
+    }
+     * @return 
+*/
+    @Override
+    public double getPaid() {
+        return m_dPaid;
+    }
 
-  /**
+    @Override
-   * Creates a new instance of PaymentInfoCash
+    public double getTendered() {
-   * 
+        return m_dTendered;
-   * @param dTotal
+    }
-   * @param dPaid
-   */
-  public PaymentInfoCash_original(double dTotal, double dPaid) {
-    m_dTotal = dTotal;
-    m_dPaid = dPaid;
-  }
 
-  @Override
+    @Override
-  public PaymentInfo copyPayment() {
+    public double getChange(){
-    return new PaymentInfoCash_original(m_dTotal, m_dPaid);
+       return m_dPaid - m_dTotal;
-  }
+   }
 
-  @Override
+    @Override
-  public String getTransactionID() {
+   public String getCardName() {
-    return "no ID";
+       return m_dCardName;
-  }
+   }
-
+    public String printPaid() {
-  @Override
+        return Formats.CURRENCY.formatValue(m_dPaid);
-  public String getName() {
+    }   
-    return "cash";
+    public String printChange() {
-  }
+        return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
-
+    }
-  @Override
-  public double getTotal() {
-    return m_dTotal;
-  }
-
-  /**
-   * public double getTip() {
-   * return m_dTip;
-   * }
-   * 
-   * @return
-   */
-  @Override
-  public double getPaid() {
-    return m_dPaid;
-  }
-
-  @Override
-  public double getTendered() {
-    return m_dTendered;
-  }
-
-  @Override
-  public double getChange() {
-    return m_dPaid - m_dTotal;
-  }
-
-  @Override
-  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);
-  }
-
-  @Override
-  public String getVoucher() {
-    return null;
-  }
 
+    @Override
+    public String getVoucher() {
+        return null;
+    }
+    
 }

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

@@ -21,292 +21,290 @@ package com.unicenta.pos.payment;
 
 public class PaymentInfoMagcard extends PaymentInfo {
 
-  private String m_sName = "creditcard";
+    protected double m_dTotal;
-  protected double m_dTotal;
+    protected double m_dTip;
-  protected double m_dTip;
+    protected String m_sHolderName;
-  protected String m_sHolderName;
+    protected String m_sCardNumber;
-  protected String m_sCardNumber;
+    protected String m_sExpirationDate;
-  protected String m_sExpirationDate;
+    protected String track1;
-  protected String track1;
+    protected String track2;
-  protected String track2;
+    protected String track3;
-  protected String track3;
+    protected String m_sTransactionID;
-  protected String m_sTransactionID;
+    protected String m_sAuthorization;
-  protected String m_sAuthorization;
+    protected String m_sErrorMessage;
-  protected String m_sErrorMessage;
+    protected String m_sReturnMessage;
-  protected String m_sReturnMessage;
+    //JG Jan 2018 
-  // JG Jan 2018
+    protected String encryptedTrack;
-  protected String encryptedTrack;
+    protected String encryptionKey;
-  protected String encryptionKey;
+    protected String m_dCardName =null;
-  protected String m_dCardName = null;
 
-  protected Boolean chipAndPin = Boolean.FALSE;
+    protected Boolean chipAndPin = Boolean.FALSE;
-  protected String verification;
+    protected String verification;
-  protected String lastFourDigits;
+    protected String lastFourDigits;
 
-  /**
+    /**
-   * Creates a new instance of PaymentInfoMagcard
+     * Creates a new instance of PaymentInfoMagcard
-   * 
+     * @param sHolderName
-   * @param sHolderName
+     * @param sCardNumber
-   * @param sCardNumber
+     * @param sExpirationDate
-   * @param sExpirationDate
+     * @param track1
-   * @param track1
+     * @param track2
-   * @param track2
+     * @param track3
-   * @param track3
+     * @param encryptedCard
-   * @param encryptedCard
+     * @param encryptKey
-   * @param encryptKey
+     * @param sTransactionID
-   * @param sTransactionID
+     * @param dTotal
-   * @param dTotal
+     */
-   */
+    public PaymentInfoMagcard(String sHolderName, String sCardNumber,
-  public PaymentInfoMagcard(String sHolderName, String sCardNumber,
+                              String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
-      String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
+                              String sTransactionID, double dTotal) {
-      String sTransactionID, double dTotal) {
+        m_sHolderName = sHolderName;
-    m_sHolderName = sHolderName;
+        m_sCardNumber = sCardNumber;
-    m_sCardNumber = sCardNumber;
+        m_sExpirationDate = sExpirationDate;
-    m_sExpirationDate = sExpirationDate;
+        this.track1 = track1;
-    this.track1 = track1;
+        this.track2 = track2;
-    this.track2 = track2;
+        this.track3 = track3;
-    this.track3 = track3;
+        encryptedTrack = encryptedCard;
-    encryptedTrack = encryptedCard;
+        encryptionKey = encryptKey;
-    encryptionKey = encryptKey;
+        m_sTransactionID = sTransactionID;
-    m_sTransactionID = sTransactionID;
+        m_dTotal = dTotal;
-    m_dTotal = dTotal;
 
-    m_sAuthorization = null;
-    m_sErrorMessage = null;
-    m_sReturnMessage = null;
-  }
 
-  /**
+        m_sAuthorization = null;
-   * Creates a new instance of PaymentInfoMagcard
+        m_sErrorMessage = null;
-   * 
+        m_sReturnMessage = null;
-   * @param sHolderName
-   * @param sCardNumber
-   * @param sExpirationDate
-   * @param sTransactionID
-   * @param dTotal
-   */
-  public PaymentInfoMagcard(String sHolderName, String sCardNumber,
-      String sExpirationDate, String sTransactionID, double dTotal) {
-    this(sHolderName, sCardNumber, sExpirationDate,
-        null, null, null, null, null, sTransactionID, dTotal);
-  }
-
-  @Override
-  public PaymentInfo copyPayment() {
-    PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
-        m_sCardNumber, m_sExpirationDate, track1, track2,
-        track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
-    p.m_sAuthorization = m_sAuthorization;
-    p.m_sErrorMessage = m_sErrorMessage;
-    return p;
-  }
-
-  public String getName() {
-    // return "magcard";
-    return "ccard";
-  }
-
-  @Override
-  public double getTotal() {
-    return m_dTotal;
-  }
-
-  public double getTip() {
-    return m_dTip;
-  }
-
-  public boolean isPaymentOK() {
-    return m_sAuthorization != null;
-  }
-
-  public String getHolderName() {
-    return m_sHolderName;
-  }
-
-  @Override
-  public String getCardName() {
-    if (chipAndPin) {
-      return m_dCardName;
     }
-    return getCardType(m_sCardNumber);
-  }
 
-  public String getCardNumber() {
+    /**
-    return m_sCardNumber;
+     * Creates a new instance of PaymentInfoMagcard
-  }
+     * @param sHolderName
-
+     * @param sCardNumber
-  public String getExpirationDate() {
+     * @param sExpirationDate
-    return m_sExpirationDate;
+     * @param sTransactionID
-  }
+     * @param dTotal
-
+     */
-  @Override
+    public PaymentInfoMagcard(String sHolderName, String sCardNumber,
-  public String getTransactionID() {
+                              String sExpirationDate, String sTransactionID, double dTotal) {
-    return m_sTransactionID;
+        this(sHolderName, sCardNumber, sExpirationDate,
-  }
+                null, null, null, null, null, sTransactionID, dTotal);
-
-  /**
-   * Get tracks of magnetic card. Framing characters: - start sentinel (SS) -
-   * end sentinel (ES) - LRC
-   *
-   * @return tracks of the magnetic card
-   */
-  public String getEncryptedCardData() {
-    return encryptedTrack;
-  }
-
-  public String getEncryptionKey() {
-    return encryptionKey;
-  }
-
-  /**
-   * @param sCardNumber
-   * @return
-   */
-  public String getCardType(String sCardNumber) {
-    String c = "UNKNOWN";
-
-    if (sCardNumber.startsWith("4")) {
-      c = "VISA";
-    } else if (sCardNumber.startsWith("6")) {
-      c = "DISC";
-    } else if (sCardNumber.startsWith("5")) {
-      c = "MAST";
-    } else if (sCardNumber.startsWith("34") || sCardNumber.startsWith("37")) {
-      c = "AMEX";
-    } else if (sCardNumber.startsWith("3528") || sCardNumber.startsWith("3589")) {
-      c = "JCB";
-    } else if (sCardNumber.startsWith("3")) {
-      c = "DINE";
     }
-    m_sCardNumber = c;
-    return c;
-  }
 
-  public String getTrack1(boolean framingChar) {
+    @Override
-    return (framingChar)
+    public PaymentInfo copyPayment() {
-        ? track1
+        PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
-        : track1.substring(1, track1.length() - 2);
+                m_sCardNumber, m_sExpirationDate, track1, track2,
-  }
+                track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
-
+        p.m_sAuthorization = m_sAuthorization;
-  public String getTrack2(boolean framingChar) {
+        p.m_sErrorMessage = m_sErrorMessage;
-    return (framingChar)
+        return p;
-        ? track2
-        : track2.substring(1, track2.length() - 2);
-  }
-
-  public String getTrack3(boolean framingChar) {
-    return (framingChar)
-        ? track3
-        : track3.substring(1, track3.length() - 2);
-  }
-
-  public String getAuthorization() {
-    return m_sAuthorization;
-  }
-
-  public String getMessage() {
-    return m_sErrorMessage;
-  }
-
-  public void paymentError(String sMessage, String moreInfo) {
-    m_sAuthorization = null;
-    m_sErrorMessage = sMessage + "\n" + moreInfo;
-  }
-
-  public void setReturnMessage(String returnMessage) {
-    m_sReturnMessage = returnMessage;
-  }
-
-  public String getReturnMessage() {
-    return m_sReturnMessage;
-  }
-
-  public void paymentOK(String sAuthorization, String sTransactionId, String sReturnMessage) {
-    m_sAuthorization = sAuthorization;
-    m_sTransactionID = sTransactionId;
-    m_sReturnMessage = sReturnMessage;
-    m_sErrorMessage = null;
-  }
-
-  public String printCardNumber() {
-    System.out.println(m_sCardNumber);
-    if (m_sCardNumber.length() > 4) {
-      return m_sCardNumber.substring(0, m_sCardNumber.length() - 4).replaceAll("\\.", "*")
-          + m_sCardNumber.substring(m_sCardNumber.length() - 4);
-    } else {
-      return "****";
     }
-  }
 
-  public String printExpirationDate() {
+    public String getName() {
-    return m_sExpirationDate;
+//        return "magcard";
-  }
+        return "ccard";
+    }
 
-  public String printAuthorization() {
+    @Override
-    return m_sAuthorization;
+    public double getTotal() {
-  }
+        return m_dTotal;
+    }
 
-  public String printTransactionID() {
+    public double getTip() {
-    return m_sTransactionID;
+        return m_dTip;
-  }
+    }
 
-  public boolean getIsProcessed() {
+    public boolean isPaymentOK() {
-    throw new UnsupportedOperationException("Not supported yet.");
+        return m_sAuthorization != null;
-  }
+    }
 
-  public void setIsProcessed(boolean value) {
+    public String getHolderName() {
-    throw new UnsupportedOperationException("Not supported yet.");
+        return m_sHolderName;
-  }
+    }
 
-  @Override
+    @Override
-  public double getPaid() {
+    public String getCardName() {
-    return (0.0);
+        if (chipAndPin){
-  }
+            return m_dCardName;
+        }
+        return getCardType(m_sCardNumber);
+    }
 
-  @Override
+    public String getCardNumber() {
-  public double getChange() {
+        return m_sCardNumber;
-    return 0.00;
+    }
-  }
 
-  @Override
+    public String getExpirationDate() {
-  public double getTendered() {
+        return m_sExpirationDate;
-    return 0.00;
+    }
-  }
 
-  @Override
+    @Override
-  public String getVoucher() {
+    public String getTransactionID() {
-    return null;
+        return m_sTransactionID;
-  }
+    }
 
-  public void setCardName(String m_dCardName) {
+    /**
-    this.m_dCardName = m_dCardName;
+     * Get tracks of magnetic card. Framing characters: - start sentinel (SS) -
-  }
+     * end sentinel (ES) - LRC
+     *
+     * @return tracks of the magnetic card
+     */
+    public String getEncryptedCardData() {
+        return encryptedTrack;
+    }
 
-  public Boolean isChipAndPin() {
+    public String getEncryptionKey() {
-    return chipAndPin;
+        return encryptionKey;
-  }
+    }
 
-  public void setChipAndPin(Boolean chipAndPin) {
+    /** @param sCardNumber
-    this.chipAndPin = chipAndPin;
+     * @return
-  }
+     */
+    public String getCardType(String sCardNumber){
+        String c = "UNKNOWN";
 
-  public String printVerification() {
+        if (sCardNumber.startsWith("4")) {
-    return verification;
+            c = "VISA";
-  }
+        } else if (sCardNumber.startsWith("6")) {
+            c = "DISC";
+        } else if (sCardNumber.startsWith("5")) {
+            c = "MAST";
+        } else if (sCardNumber.startsWith("34") || sCardNumber.startsWith("37")) {
+            c = "AMEX";
+        } else if (sCardNumber.startsWith("3528") || sCardNumber.startsWith("3589")) {
+            c = "JCB";
+        } else if (sCardNumber.startsWith("3")) {
+            c = "DINE";
+        }
+        m_sCardNumber = c;
+        return c;
+    }
 
-  public void setVerification(String verification) {
+    public String getTrack1(boolean framingChar) {
-    this.verification = verification;
+        return (framingChar)
-  }
+                ? track1
+                : track1.substring(1, track1.length() - 2);
+    }
 
-  public String getLastFourDigits() {
+    public String getTrack2(boolean framingChar) {
-    return lastFourDigits;
+        return (framingChar)
-  }
+                ? track2
+                : track2.substring(1, track2.length() - 2);
+    }
 
-  public String printLastFourDigits() {
+    public String getTrack3(boolean framingChar) {
-    return lastFourDigits;
+        return (framingChar)
-  }
+                ? track3
+                : track3.substring(1, track3.length() - 2);
+    }
 
-  public void setLastFourDigits(String lastFourDigits) {
+    public String getAuthorization() {
-    this.lastFourDigits = lastFourDigits;
+        return m_sAuthorization;
-  }
+    }
-}
+
+    public String getMessage() {
+        return m_sErrorMessage;
+    }
+
+    public void paymentError(String sMessage, String moreInfo) {
+        m_sAuthorization = null;
+        m_sErrorMessage = sMessage + "\n" + moreInfo;
+    }
+
+    public void setReturnMessage(String returnMessage) {
+        m_sReturnMessage = returnMessage;
+    }
+
+    public String getReturnMessage() {
+        return m_sReturnMessage;
+    }
+
+    public void paymentOK(String sAuthorization, String sTransactionId, String sReturnMessage) {
+        m_sAuthorization = sAuthorization;
+        m_sTransactionID = sTransactionId;
+        m_sReturnMessage = sReturnMessage;
+        m_sErrorMessage = null;
+    }
+
+    public String printCardNumber() {
+        System.out.println(m_sCardNumber);
+        if (m_sCardNumber.length() > 4) {
+            return m_sCardNumber.substring(0, m_sCardNumber.length() - 4).replaceAll("\\.", "*")
+                    + m_sCardNumber.substring(m_sCardNumber.length() - 4);
+        } else {
+            return "****";
+        }
+    }
+
+    public String printExpirationDate() {
+        return m_sExpirationDate;
+    }
+
+    public String printAuthorization() {
+        return m_sAuthorization;
+    }
+
+    public String printTransactionID() {
+        return m_sTransactionID;
+    }
+
+    public boolean getIsProcessed() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+
+    public void setIsProcessed(boolean value) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public double getPaid() {
+        return (0.0);
+    }
+
+    @Override
+    public double getChange(){
+        return 0.00;
+    }
+
+    @Override
+    public double getTendered() {
+        return 0.00;
+    }
+
+    @Override
+    public String getVoucher() {
+        return null;
+    }
+
+    public void setCardName(String m_dCardName){
+        this.m_dCardName = m_dCardName;
+    }
+
+    public Boolean isChipAndPin() {
+        return chipAndPin;
+    }
+
+    public void setChipAndPin(Boolean chipAndPin) {
+        this.chipAndPin = chipAndPin;
+    }
+
+    public String printVerification() {
+        return verification;
+    }
+
+    public void setVerification(String verification) {
+        this.verification = verification;
+    }
+
+    public String getLastFourDigits() {
+        return lastFourDigits;
+    }
+
+    public String printLastFourDigits() {
+        return lastFourDigits;
+    }
+
+    public void setLastFourDigits(String lastFourDigits) {
+        this.lastFourDigits = lastFourDigits;
+    }
+}

src/main/java/com/unicenta/pos/printer/TicketParser.java

@@ -39,8 +39,6 @@ import javax.imageio.ImageIO;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
-import com.unicenta.pos.util.QRCode;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -51,52 +49,52 @@ import org.xml.sax.helpers.DefaultHandler;
  * @author JG uniCenta
  */
 public class TicketParser extends DefaultHandler {
-
+    
     private static SAXParser m_sp = null;
-
+    
     private DeviceTicket m_printer;
     private DataLogicSystem m_system;
-
+    
     private StringBuilder text;
-
+    
     private String bctype;
     private String bcposition;
     private int m_iTextAlign;
     private int m_iTextLength;
     private int m_iTextStyle;
     private int size;
-
+    
     private StringBuilder m_sVisorLine;
     private int m_iVisorAnimation;
     private String m_sVisorLine1;
     private String m_sVisorLine2;
-
+    
     private double m_dValue1;
     private double m_dValue2;
     private int attribute3;
-
+    
     private int m_iOutputType;
     private static final int OUTPUT_NONE = 0;
     private static final int OUTPUT_DISPLAY = 1;
     private static final int OUTPUT_TICKET = 2;
     private static final int OUTPUT_FISCAL = 3;
-    private DevicePrinter m_oOutputPrinter;
+    private DevicePrinter m_oOutputPrinter;   
     private DateFormat df= new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
     private Date today;
     private String cUser;
     private String ticketId;
     private String pickupId;
-
+    
-
+    
     /** Creates a new instance of TicketParser
      * @param printer
      * @param system */
     public TicketParser(DeviceTicket printer, DataLogicSystem system) {
         m_printer = printer;
         m_system = system;
-        today = Calendar.getInstance().getTime();
+        today = Calendar.getInstance().getTime(); 
     }
-
+    
     /**
      *
      * @param sIn
@@ -105,27 +103,27 @@ public class TicketParser extends DefaultHandler {
      */
     public void printTicket(String sIn, TicketInfo ticket) throws TicketPrinterException {
 //       cUser=ticket.getUser().getName();
-        cUser=ticket.getName();
+       cUser=ticket.getName();        
-        ticketId=Integer.toString(ticket.getTicketId());
+        ticketId=Integer.toString(ticket.getTicketId()); 
         pickupId=Integer.toString(ticket.getPickupId());
-
+        
         if (ticket.getTicketId()==0){
             ticketId="No Sale";
         }
         if (ticket.getPickupId()==0){
             pickupId="No PickupId";
-        }
+        }        
         printTicket(new StringReader(sIn));
-
+        
 
     }
-
+    
     /**
      *
      * @param sIn
      * @throws TicketPrinterException
      */
-    public void printTicket(String sIn) throws TicketPrinterException {
+    public void printTicket(String sIn) throws TicketPrinterException { 
         printTicket(new StringReader(sIn));
     }
 
@@ -135,15 +133,15 @@ public class TicketParser extends DefaultHandler {
      * @throws TicketPrinterException
      */
     public void printTicket(Reader in) throws TicketPrinterException  {
-
+        
         try {
-
+            
             if (m_sp == null) {
                 SAXParserFactory spf = SAXParserFactory.newInstance();
                 m_sp = spf.newSAXParser();
             }
             m_sp.parse(new InputSource(in), this);
-
+                        
         } catch (ParserConfigurationException ePC) {
             throw new TicketPrinterException(LocalRes.getIntString("exception.parserconfig") , ePC);
         } catch (SAXException eSAX) {
@@ -151,8 +149,8 @@ public class TicketParser extends DefaultHandler {
         } catch (IOException eIO) {
             throw new TicketPrinterException(LocalRes.getIntString("exception.iofile") , eIO);
         }
-    }
+    }    
-
+    
     @Override
     public void startDocument() throws SAXException {
         // inicalizo las variables pertinentes
@@ -170,300 +168,293 @@ public class TicketParser extends DefaultHandler {
     @Override
     public void endDocument() throws SAXException {
     }
-
+    
     @Override
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException{
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException{       
         String openDate = df.format(today);
         Date dNow = new Date();
-
+        
         switch (m_iOutputType) {
-            case OUTPUT_NONE:
+        case OUTPUT_NONE:
-                switch (qName) {
+        switch (qName) {
-                    case "opendrawer":
+            case "opendrawer":
-                        m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1")).openDrawer();
+                m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1")).openDrawer();
-                        // Cashdrawer has been activated record the data in the table
+                // Cashdrawer has been activated record the data in the table
-                        try {
+                try {
-                            m_system.execDrawerOpened(
+                    m_system.execDrawerOpened(
-                                    //new Object[] {df.format(dNow),cUser,ticketId});
+                            //new Object[] {df.format(dNow),cUser,ticketId});
-                                    new Object[] {cUser,ticketId});
+                             new Object[] {cUser,ticketId});
-                        } catch (BasicException ex) {}
+                } catch (BasicException ex) {}
-                        break;
-                    case "play":
-                        text = new StringBuilder();
-                        break;
-                    case "ticket":
-                        m_iOutputType = OUTPUT_TICKET;
-                        m_oOutputPrinter = m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1"));
-                        m_oOutputPrinter.beginReceipt();
-                        break;
-                    case "display":
-                        m_iOutputType = OUTPUT_DISPLAY;
-                        String animation = attributes.getValue("animation");
-                        if ("scroll".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_SCROLL;
-                        } else if ("flyer".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_FLYER;
-                        } else if ("blink".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_BLINK;
-                        } else if ("curtain".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_CURTAIN;
-                        } else { // "none"
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
-                        }
-                        m_sVisorLine1 = null;
-                        m_sVisorLine2 = null;
-                        m_oOutputPrinter = null;
-                        break;
-                    case "fiscalreceipt":
-                        m_iOutputType = OUTPUT_FISCAL;
-                        m_printer.getFiscalPrinter().beginReceipt();
-                        break;
-                    case "fiscalzreport":
-                        m_printer.getFiscalPrinter().printZReport();
-                        break;
-                    case "fiscalxreport":
-                        m_printer.getFiscalPrinter().printXReport();
-                        break;
-                }
                 break;
-            case OUTPUT_TICKET:
+            case "play":
-                if (null != qName)switch (qName) {
+                text = new StringBuilder();
-                    case "logo":
-                        text = new StringBuilder();
-                        break;
-                    case "image":
-                        text = new StringBuilder();
-                        break;
-                    case "barcode":
-                        text = new StringBuilder();
-                        bctype = attributes.getValue("type");
-                        bcposition = attributes.getValue("position");
-                        break;
-                    case "qr-code":
-                        text = new StringBuilder();
-                        break;
-                    case "line":
-                        m_oOutputPrinter.beginLine(parseInt(attributes.getValue("size"), DevicePrinter.SIZE_0));
-                        break;
-                    case "text":
-                        text = new StringBuilder();
-                        m_iTextStyle = ("true".equals(attributes.getValue("bold"))
-                                ? DevicePrinter.STYLE_BOLD : DevicePrinter.STYLE_PLAIN)
-                                | ("true".equals(attributes.getValue("underline"))
-                                ? DevicePrinter.STYLE_UNDERLINE : DevicePrinter.STYLE_PLAIN);
-                        String sAlign = attributes.getValue("align");
-                        if (null == sAlign) {
-                            m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                        } else switch (sAlign) {
-                            case "right":
-                                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
-                                break;
-                            case "center":
-                                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
-                                break;
-                            default:
-                                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                                break;
-                        }
-                        m_iTextLength = parseInt(attributes.getValue("length"), 0);
-                        break;
-                    default:
-                        break;
-                }
                 break;
-            case OUTPUT_DISPLAY:
+            case "ticket":
-                if (null != qName) switch (qName) {
+                m_iOutputType = OUTPUT_TICKET;
-                    case "line":
+                m_oOutputPrinter = m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1"));
-                        // line 1 or 2 of the display
+                m_oOutputPrinter.beginReceipt();
-                        m_sVisorLine = new StringBuilder();
-                        break;
-                    case "line1":
-                        // linea 1 del visor
-                        m_sVisorLine = new StringBuilder();
-                        break;
-                    case "line2":
-                        // linea 2 del visor
-                        m_sVisorLine = new StringBuilder();
-                        break;
-                    case "text":
-                        text = new StringBuilder();
-                        String sAlign = attributes.getValue("align");
-                        if (null == sAlign) {
-                            m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                        } else switch (sAlign) {
-                            case "right":
-                                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
-                                break;
-                            case "center":
-                                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
-                                break;
-                            default:
-                                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                                break;
-                        }
-                        m_iTextLength = parseInt(attributes.getValue("length"));
-                        break;
-                    default:
-                        break;
-                }
                 break;
-            case OUTPUT_FISCAL:
+            case "display":
-                if (null != qName)
+                m_iOutputType = OUTPUT_DISPLAY;
-                    switch (qName) {
+                String animation = attributes.getValue("animation");
-                        case "line":
+                if ("scroll".equals(animation)) {
-                            text = new StringBuilder();
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_SCROLL;
-                            m_dValue1 = parseDouble(attributes.getValue("price"));
+                } else if ("flyer".equals(animation)) {
-                            m_dValue2 = parseDouble(attributes.getValue("units"), 1.0);
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_FLYER;
-                            attribute3 = parseInt(attributes.getValue("tax"));
+                } else if ("blink".equals(animation)) {
-                            break;
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_BLINK;
-                        case "message":
+                } else if ("curtain".equals(animation)) {
-                            text = new StringBuilder();
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_CURTAIN;
-                            break;
+                } else { // "none"
-                        case "total":
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
-                            text = new StringBuilder();
+                }
-                            m_dValue1 = parseDouble(attributes.getValue("paid"));
+                m_sVisorLine1 = null;
-                            break;
+                m_sVisorLine2 = null;                
-                        default:
+                m_oOutputPrinter = null;
-                            break;
+                break;
-                    }
+            case "fiscalreceipt":
+                m_iOutputType = OUTPUT_FISCAL;
+                m_printer.getFiscalPrinter().beginReceipt();
+                break;
+            case "fiscalzreport":
+                m_printer.getFiscalPrinter().printZReport();
+                break;
+            case "fiscalxreport":
+                m_printer.getFiscalPrinter().printXReport();
                 break;
         }
-    }
+            break;
-
+        case OUTPUT_TICKET:
+            if (null != qName)switch (qName) {
+            case "logo":
+                text = new StringBuilder();
+                break;
+            case "image":
+                text = new StringBuilder();
+                break;
+            case "barcode":
+                text = new StringBuilder();
+                bctype = attributes.getValue("type");
+                bcposition = attributes.getValue("position");
+                break;
+            case "line":
+                m_oOutputPrinter.beginLine(parseInt(attributes.getValue("size"), DevicePrinter.SIZE_0));
+                break;
+            case "text":
+                text = new StringBuilder();
+                m_iTextStyle = ("true".equals(attributes.getValue("bold")) 
+                        ? DevicePrinter.STYLE_BOLD : DevicePrinter.STYLE_PLAIN)
+                        | ("true".equals(attributes.getValue("underline")) 
+                        ? DevicePrinter.STYLE_UNDERLINE : DevicePrinter.STYLE_PLAIN);
+                String sAlign = attributes.getValue("align");
+                if (null == sAlign) {
+                    m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                } else switch (sAlign) {
+            case "right":
+                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
+                break;
+            case "center":
+                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
+                break;
+            default:
+                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                break;
+        }
+                m_iTextLength = parseInt(attributes.getValue("length"), 0);
+                break;
+            default:
+                break;
+        }
+            break;
+        case OUTPUT_DISPLAY:
+            if (null != qName) switch (qName) {
+            case "line":
+                // line 1 or 2 of the display
+                m_sVisorLine = new StringBuilder();
+                break;
+            case "line1":
+                // linea 1 del visor
+                m_sVisorLine = new StringBuilder();
+                break;
+            case "line2":
+                // linea 2 del visor
+                m_sVisorLine = new StringBuilder();
+                break;
+            case "text":
+                text = new StringBuilder();
+                String sAlign = attributes.getValue("align");
+                if (null == sAlign) {
+                    m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                } else switch (sAlign) {
+            case "right":
+                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
+                break;
+            case "center":
+                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
+                break;
+            default:
+                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                break;
+        }
+                m_iTextLength = parseInt(attributes.getValue("length"));
+                break;
+            default:
+                break;
+        }
+            break;
+        case OUTPUT_FISCAL:
+            if (null != qName) 
+                switch (qName) {
+                    case "line":   
+                        text = new StringBuilder();
+                        m_dValue1 = parseDouble(attributes.getValue("price"));
+                        m_dValue2 = parseDouble(attributes.getValue("units"), 1.0);
+                        attribute3 = parseInt(attributes.getValue("tax"));
+                        break; 
+                    case "message":
+                        text = new StringBuilder();
+                        break;
+                    case "total":    
+                        text = new StringBuilder();
+                        m_dValue1 = parseDouble(attributes.getValue("paid"));
+                        break;
+                    default:
+                        break;
+                }
+            break;
+        }
+    } 
+    
     @Override
     public void endElement(String uri, String localName, String qName) throws SAXException {
 
         switch (m_iOutputType) {
-            case OUTPUT_NONE:
+        case OUTPUT_NONE:
-                if ("play".equals(qName)) {
+            if ("play".equals(qName)) {
-                    try {
+                try { 
-                        AudioClip oAudio = Applet.newAudioClip(getClass().getClassLoader().getResource(text.toString()));
+                    AudioClip oAudio = Applet.newAudioClip(getClass().getClassLoader().getResource(text.toString()));
-                        oAudio.play();
+                    oAudio.play();        
-                    } catch (Exception fnfe) {
+                } catch (Exception fnfe) {
-                        //throw new ResourceNotFoundException( fnfe.getMessage() );
+                    //throw new ResourceNotFoundException( fnfe.getMessage() );
-                    }
-                    text = null;
                 }
-                break;
+                text = null;
-
+            } 
-// Added 23.05.13 used by star TSP700 to print stored logo image JDL
+            break;    
-            case OUTPUT_TICKET:
+            
-                if ("logo".equals(qName)){
+// Added 23.05.13 used by star TSP700 to print stored logo image JDL            
+        case OUTPUT_TICKET:
+            if ("logo".equals(qName)){
                     m_oOutputPrinter.printLogo();
-                    // }
+                  // }        
-                }
+            }else if ("image".equals(qName)){
-                if ("image".equals(qName)){
+                try {
-                    try {
 //                    BufferedImage image = ImageIO.read(getClass().getClassLoader().getResourceAsStream(text.toString()));
-                        BufferedImage image = m_system.getResourceAsImage(text.toString());
+                    BufferedImage image = m_system.getResourceAsImage(text.toString());
 
-                        if (image == null) {
+                    if (image == null) {
-                            image = decodeToImage(text.toString());
+                        image = decodeToImage(text.toString());
-                        }
-                        if (image != null) {
-                            m_oOutputPrinter.printImage(image);
-                        }
-
-                    } catch (Exception fnfe) {
-                        //throw new ResourceNotFoundException( fnfe.getMessage() );
                     }
-                    text = null;
+                    if (image != null) {
-                } else if ("qr-code".equals(qName)) {
+                        m_oOutputPrinter.printImage(image);
-                    m_oOutputPrinter.printImage(QRCode.printQRCode(text.toString()));
+                    }
+                    
+                } catch (Exception fnfe) {
+                    //throw new ResourceNotFoundException( fnfe.getMessage() );
                 }
-                else if ("barcode".equals(qName)) {
+                text = null;
-                    m_oOutputPrinter.printBarCode(bctype, bcposition, text.toString());
+            } else if ("barcode".equals(qName)) {
-                    text = null;
+                m_oOutputPrinter.printBarCode(bctype, bcposition, text.toString());
-                } else if ("text".equals(qName)) {
+                text = null;
-                    if (m_iTextLength > 0) {
+            } else if ("text".equals(qName)) {
-                        switch(m_iTextAlign) {
+                if (m_iTextLength > 0) {
-                            case DevicePrinter.ALIGN_RIGHT:
+                    switch(m_iTextAlign) {
-                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignRight(text.toString(), m_iTextLength));
+                    case DevicePrinter.ALIGN_RIGHT:
-                                break;
+                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignRight(text.toString(), m_iTextLength));
-                            case DevicePrinter.ALIGN_CENTER:
+                        break;
-                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+                    case DevicePrinter.ALIGN_CENTER:
-                                break;
+                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignCenter(text.toString(), m_iTextLength));
-                            default: // DevicePrinter.ALIGN_LEFT
+                        break;
-                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                    default: // DevicePrinter.ALIGN_LEFT
-                                break;
+                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignLeft(text.toString(), m_iTextLength));
-                        }
+                        break;
-                    } else {
-                        m_oOutputPrinter.printText(m_iTextStyle, text.toString());
                     }
-                    text = null;
+                } else {
-                } else if ("line".equals(qName)) {
+                    m_oOutputPrinter.printText(m_iTextStyle, text.toString());
-                    m_oOutputPrinter.endLine();
-                } else if ("ticket".equals(qName)) {
-                    m_oOutputPrinter.endReceipt();
-                    m_iOutputType = OUTPUT_NONE;
-                    m_oOutputPrinter = null;
                 }
-                break;
+                text = null;
-            case OUTPUT_DISPLAY:
+            } else if ("line".equals(qName)) {
-                if ("line".equals(qName)) { // line 1 or 2 of the display
+                m_oOutputPrinter.endLine();
-                    if (m_sVisorLine1 == null) {
+            } else if ("ticket".equals(qName)) {
-                        m_sVisorLine1 = m_sVisorLine.toString();
+                m_oOutputPrinter.endReceipt();
-                    } else {
+                m_iOutputType = OUTPUT_NONE;
-                        m_sVisorLine2 = m_sVisorLine.toString();
+                m_oOutputPrinter = null;
-                    }
+            }
-                    m_sVisorLine = null;
+            break;
-                } else if ("line1".equals(qName)) { // linea 1 del visor
+        case OUTPUT_DISPLAY:
+            if ("line".equals(qName)) { // line 1 or 2 of the display
+                if (m_sVisorLine1 == null) {
                     m_sVisorLine1 = m_sVisorLine.toString();
-                    m_sVisorLine = null;
+                } else {
-                } else if ("line2".equals(qName)) { // linea 2 del visor
                     m_sVisorLine2 = m_sVisorLine.toString();
-                    m_sVisorLine = null;
+                }
-                } else if ("text".equals(qName)) {
+                m_sVisorLine = null;
-                    if (m_iTextLength > 0) {
+            } else if ("line1".equals(qName)) { // linea 1 del visor
-                        switch(m_iTextAlign) {
+                m_sVisorLine1 = m_sVisorLine.toString();
-                            case DevicePrinter.ALIGN_RIGHT:
+                m_sVisorLine = null;
-                                m_sVisorLine.append(DeviceTicket.alignRight(text.toString(), m_iTextLength));
+            } else if ("line2".equals(qName)) { // linea 2 del visor
-                                break;
+                m_sVisorLine2 = m_sVisorLine.toString();
-                            case DevicePrinter.ALIGN_CENTER:
+                m_sVisorLine = null;
-                                m_sVisorLine.append(DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+            } else if ("text".equals(qName)) {
-                                break;
+                if (m_iTextLength > 0) {
-                            default: // DevicePrinter.ALIGN_LEFT
+                    switch(m_iTextAlign) {
-                                m_sVisorLine.append(DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                    case DevicePrinter.ALIGN_RIGHT:
-                                break;
+                        m_sVisorLine.append(DeviceTicket.alignRight(text.toString(), m_iTextLength));
-                        }
+                        break;
-                    } else {
+                    case DevicePrinter.ALIGN_CENTER:
-                        m_sVisorLine.append(text);
+                        m_sVisorLine.append(DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+                        break;
+                    default: // DevicePrinter.ALIGN_LEFT
+                        m_sVisorLine.append(DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                        break;
                     }
-                    text = null;
+                } else {
-                } else if ("display".equals(qName)) {
+                    m_sVisorLine.append(text);
-                    m_printer.getDeviceDisplay().writeVisor(m_iVisorAnimation, m_sVisorLine1, m_sVisorLine2);
-                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
-                    m_sVisorLine1 = null;
-                    m_sVisorLine2 = null;
-                    m_iOutputType = OUTPUT_NONE;
-                    m_oOutputPrinter = null;
                 }
-                break;
+                text = null;
-            case OUTPUT_FISCAL:
+            } else if ("display".equals(qName)) {
-                if ("fiscalreceipt".equals(qName)) {
+                m_printer.getDeviceDisplay().writeVisor(m_iVisorAnimation, m_sVisorLine1, m_sVisorLine2);        
-                    m_printer.getFiscalPrinter().endReceipt();
+                m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;                
-                    m_iOutputType = OUTPUT_NONE;
+                m_sVisorLine1 = null;
-                } else if ("line".equals(qName)) {
+                m_sVisorLine2 = null;
-                    m_printer.getFiscalPrinter().printLine(text.toString(), m_dValue1, m_dValue2, attribute3);
+                m_iOutputType = OUTPUT_NONE;
-                    text = null;
+                m_oOutputPrinter = null;
-                } else if ("message".equals(qName)) {
+            }
-                    m_printer.getFiscalPrinter().printMessage(text.toString());
+            break;
-                    text = null;
+        case OUTPUT_FISCAL:
-                } else if ("total".equals(qName)) {
+            if ("fiscalreceipt".equals(qName)) {
-                    m_printer.getFiscalPrinter().printTotal(text.toString(), m_dValue1);
+                m_printer.getFiscalPrinter().endReceipt();
-                    text = null;
+                m_iOutputType = OUTPUT_NONE;
-                }
+            } else if ("line".equals(qName)) {
-                break;
+                m_printer.getFiscalPrinter().printLine(text.toString(), m_dValue1, m_dValue2, attribute3);
-        }
+                text = null;               
+            } else if ("message".equals(qName)) {
+                m_printer.getFiscalPrinter().printMessage(text.toString());
+                text = null;               
+            } else if ("total".equals(qName)) {
+                m_printer.getFiscalPrinter().printTotal(text.toString(), m_dValue1);
+                text = null;               
+            }
+            break;
+        }          
     }
-
+    
     @Override
     public void characters(char[] ch, int start, int length) throws SAXException {
         if (text != null) {
             text.append(ch, start, length);
         }
     }
-
+    
     private int parseInt(String sValue, int iDefault) {
         try {
             return Integer.parseInt(sValue);
@@ -471,11 +462,11 @@ public class TicketParser extends DefaultHandler {
             return iDefault;
         }
     }
-
+    
     private int parseInt(String sValue) {
         return parseInt(sValue, 0);
     }
-
+    
     private double parseDouble(String sValue, double ddefault) {
         try {
             return Double.parseDouble(sValue);
@@ -483,11 +474,11 @@ public class TicketParser extends DefaultHandler {
             return ddefault;
         }
     }
-
+    
     private double parseDouble(String sValue) {
         return parseDouble(sValue, 0.0);
     }
-
+    
     private String readString(String sValue, String sDefault) {
         if (sValue == null || sValue.equals("")) {
             return sDefault;
@@ -511,5 +502,5 @@ public class TicketParser extends DefaultHandler {
         return image;
 
 
-    }
+    }    
 }

src/main/java/com/unicenta/pos/reports/PanelReportBean.java

@@ -22,7 +22,6 @@ package com.unicenta.pos.reports;
 import com.unicenta.basic.BasicException;
 import com.unicenta.data.loader.*;
 import com.unicenta.data.user.EditorCreator;
-import com.unicenta.pos.forms.AppConfig;
 import com.unicenta.pos.forms.AppLocal;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.BeanFactoryException;
@@ -198,12 +197,5 @@ public class PanelReportBean extends JPanelReport {
      */
     public void addQBFFilter(ReportEditorCreator qbff) {
         qbffilter.addEditor(qbff);
-    }
+    }    
-    public String getDBType() {
-        String url = AppConfig.getInstance().getProperty("db.URL");
-        if (url.contains("derby")) {
-            return "derby";
-        }
-        return "mysql";
-    }
 }

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

@@ -23,8 +23,6 @@ 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;
@@ -36,7 +34,6 @@ import javax.swing.event.ListSelectionListener;
  *
  * @author JG uniCenta
  */
-@Slf4j
 public class JPanelTicketSales extends JPanelTicket {
 
     private CatalogSelector m_cat;
@@ -98,7 +95,6 @@ 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,8 +7,6 @@ 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;
@@ -20,7 +18,7 @@ import java.sql.Timestamp;
  *
  * @author JDL
  */
-@Slf4j
+
 public class RestaurantDBUtils {
     private Session s;
     private Connection con;  
@@ -306,11 +304,11 @@ public class RestaurantDBUtils {
             rs = stmt.executeQuery(SQL);
         
             if (rs.next()){
-              return(rs.getString("TICKETID"));
+                String customer =rs.getString("TICKETID");
+                return(customer);
             }    
         }catch(SQLException e){
-          log.error("Error running SQL: {}{}", SQL, e.getMessage());
+        }   
-        }
 
         return "";
     }  
@@ -555,21 +553,6 @@ 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

@@ -37,8 +37,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.swing.*;
 
 /**
@@ -53,7 +51,6 @@ public class JTicketsBagShared extends JTicketsBag {
     private DataLogicSales dlSales = null;  
     private final DataLogicSystem dlSystem;    
     private Boolean showList;
-    private int existingOrderCount;
    
     
     /** Creates new form JTicketsBagShared
@@ -81,8 +78,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) {
@@ -95,8 +91,7 @@ public class JTicketsBagShared extends JTicketsBag {
             }
         };
 
-        //reloadLayaway.execute();
+        reloadLayaway.execute();
-        customExecutor.submit(reloadLayaway);
 
         
         m_sCurrentTicket = null;
@@ -141,26 +136,12 @@ 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("");
             }
@@ -442,10 +423,6 @@ 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/sales/shared/JTicketsReprintList.java

@@ -96,7 +96,7 @@ public class JTicketsReprintList extends javax.swing.JDialog {
         m_ticket = null;
         m_ticketCopy = null;        
 
-        ReprintTicketInfo m_Ticket = null;
+ReprintTicketInfo m_Ticket = null;
         
         for (ReprintTicketInfo aticket : atickets) {
             m_jtickets.add(new JButtonTicket(aticket, dlSales));

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

@@ -26,45 +26,31 @@ import java.io.Serializable;
  */
 public class UserInfo implements Serializable {
 
-  private static final long serialVersionUID = 7537578737839L;
+    private static final long serialVersionUID = 7537578737839L;
-  private String m_sId;
+    private String m_sId;
-  private String m_sName;
+    private String m_sName;
-  private String taxId;
 
-  /**
+    /** Creates a new instance of UserInfoBasic
-   * Creates a new instance of UserInfoBasic
+     * @param id
-   * 
+     * @param name */
-   * @param id
+    public UserInfo(String id, String name) {
-   * @param name
+        m_sId = id;
-   */
+        m_sName = 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;
+     * @return
-    this.taxId = taxId;
+     */
-  }
+    public String getId() {
+        return m_sId;
+    }
 
-  /**
+    /**
-   *
+     *
-   * @return
+     * @return
-   */
+     */
-  public String getId() {
+    public String getName() {
-    return m_sId;
+        return m_sName;
-  }
+    }
-
-  /**
-   *
-   * @return
-   */
-  public String getName() {
-    return m_sName;
-  }
-
-  public String getTaxID() {
-    return taxId;
-  }
 }

src/main/java/com/unicenta/pos/util/QRCode.java

@@ -1,75 +0,0 @@
-package com.unicenta.pos.util;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
-public class QRCode {
-
-    public static BufferedImage printQRCode(String data) {
-
-        String[] values = data.split(",");
-
-        try {
-            // Name
-            QRObject name = new QRObject(1,  values[0] );
-            byte nameTagByte = (byte) name.getTag();
-            byte nameLengthByte = (byte) name.getLength();
-            byte[] nameBytes = {nameTagByte, nameLengthByte};
-            String nameString = new String(nameBytes, StandardCharsets.UTF_8)+name.getValue();
-
-            //vat number
-            QRObject vat = new QRObject(2, values[1]);
-            byte vatTagByte = (byte) vat.getTag();
-            byte vatLengthByte = (byte) vat.getLength();
-            byte[] vatBytes = {vatTagByte, vatLengthByte};
-            String vatString = new String(vatBytes, StandardCharsets.UTF_8)+vat.getValue();
-
-            // date
-            QRObject date = new QRObject(3, values[2]);
-            byte dateTagByte = (byte) date.getTag();
-            byte dateLengthByte = (byte) date.getLength();
-            byte[] dateBytes = {dateTagByte, dateLengthByte};
-            String dateString = new String(dateBytes, StandardCharsets.UTF_8)+date.getValue();
-
-            // amount
-            QRObject amount = new QRObject(4, values[3]);
-            byte amountTagByte = (byte) amount.getTag();
-            byte amountLengthByte = (byte) amount.getLength();
-            byte[] amountBytes = {amountTagByte, amountLengthByte};
-            String amountString = new String(amountBytes, StandardCharsets.UTF_8)+amount.getValue();
-
-
-            // Vat amount
-            QRObject vatAmount = new QRObject(5, values[4]);
-            byte vatAmountTag = (byte) vatAmount.getTag();
-            byte vatAmountLengthByte = (byte) vatAmount.getLength();
-            byte[] vatAmountBytes = {vatAmountTag, vatAmountLengthByte};
-            String vatAmountString = new String(vatAmountBytes, StandardCharsets.UTF_8)+vatAmount.getValue();
-
-
-            //barcode
-            String barCodeString = nameString+vatString+dateString+amountString+vatAmountString;
-            String encodedBarcode = Base64.getEncoder().encodeToString(barCodeString.getBytes(StandardCharsets.UTF_8));
-
-            System.out.println(encodedBarcode);
-
-            QRCodeWriter barcodeWriter = new QRCodeWriter();
-            BitMatrix bitMatrix = barcodeWriter.encode(encodedBarcode, BarcodeFormat.QR_CODE, 200, 200);
-
-            BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
-            return MatrixToImageWriter.toBufferedImage(bitMatrix);
-        } catch (WriterException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

src/main/java/com/unicenta/pos/util/QRObject.java

@@ -1,40 +0,0 @@
-package com.unicenta.pos.util;
-
-import java.nio.charset.StandardCharsets;
-
-public class QRObject {
-
-    private int tag;
-    private int length;
-    private String value;
-
-    public QRObject(int tag, String value) {
-        this.tag = tag;
-        this.length = setLength(value);
-        this.value = value;
-    }
-
-    public int getTag() {
-        return tag;
-    }
-
-    public void setTag(int tag) {
-        this.tag = tag;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public int getLength() {
-        return length;
-    }
-
-    private static int setLength(String value) {
-        return value.getBytes(StandardCharsets.UTF_8).length;
-    }
-}

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

@@ -205,7 +205,6 @@ 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,3 +1 @@
-ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
+UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
---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,7 +271,6 @@ 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,
@@ -1001,4 +1000,4 @@ INSERT INTO ticketsnum_refund VALUES(1);
 INSERT INTO ticketsnum_payment VALUES(1);
 
 -- ADD APPLICATION VERSION
-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});

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

@@ -1,3 +1,2 @@
-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,7 +246,6 @@ 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,
@@ -976,4 +975,4 @@ INSERT INTO ticketsnum_refund VALUES(1);
 INSERT INTO ticketsnum_payment VALUES(1);
 
 -- ADD APPLICATION VERSION
-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});

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

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

src/main/resources/com/unicenta/pos/templates/Printer.Ticket.xml

@@ -254,7 +254,7 @@
         <line></line>
         #end
         #end
-        <!-- ZACAT please see release notes -->
+
     </ticket>
 
     #foreach ($paymentline in $ticket.payments)

src/main/resources/com/unicenta/pos/templates/Ticket.Buttons.xml

@@ -100,7 +100,6 @@
     <!-- ADDITIONAL FEATURES ************************************************* -->
     <!-- SET Show Change in Cash Sale (Default=ENABLED -->
         <event key="ticket.close" code="Ticket.Close"/>
-        <event key="ticket.total" code="Ticket.Total"/>
 	<event key="cash.close" code="Cash.Close"/>
 
 <!-- Execute your own scripts by EVENTS triggered by Sales Screen -->

src/main/resources/com/unicenta/reports/sales_chart_top10.bs

@@ -24,65 +24,26 @@ report.setTitleKey("Menu.Top10Sales");
 report.setReport("/com/unicenta/reports/sales_chart_top10");
 report.setResourceBundle("com/unicenta/reports/sales_messages");
 
-String maria = "SELECT \n" +
+report.setSentence(
-    "    products.NAME,\n" +
+            "SELECT " +
-    "    SUM(ticketlines.UNITS) AS UNITS, \n" +
+			"products.NAME,SUM(ticketlines.UNITS) AS UNITS, " +
-    "    products.PRICEBUY,\n" +
+			"products.PRICEBUY,products.PRICESELL, " +
-    "    products.PRICESELL, \n" +
+                        "SUM(ticketlines.PRICE * ticketlines.UNITS))AS SUBTOTAL, " +
-    "    SUM(ticketlines.PRICE * ticketlines.UNITS) AS SUBTOTAL, \n" +
+                        "SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES, " +
-    "    SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES,\n" +
+                        "SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL " +
-    "    SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL\n" +
+			"FROM ticketlines " +
-    "FROM \n" +
+			"LEFT OUTER JOIN products ON ticketlines.PRODUCT = products.ID " +
-    "    ticketlines\n" +
+			"LEFT OUTER JOIN tickets ON tickets.ID = ticketlines.TICKET " +
-    "    LEFT JOIN products ON ticketlines.PRODUCT = products.ID \n" +
+                        "LEFT OUTER JOIN receipts ON receipts.ID = tickets.ID, taxes " +
-    "    LEFT JOIN tickets ON tickets.ID = ticketlines.TICKET\n" +
+			"WHERE receipts.ID = tickets.ID " +
-    "    LEFT JOIN receipts ON receipts.ID = tickets.ID\n" +
+                        "AND tickets.ID = ticketlines.TICKET " +
-    "    LEFT JOIN taxes ON ticketlines.TAXID = taxes.ID\n" +
+                        "AND ticketlines.PRODUCT = products.ID " +
-    "WHERE \n" +
+                        "AND ticketlines.TAXID = taxes.ID " +
-    "    tickets.ID = ticketlines.TICKET\n" +
+                        "AND ?(QBF_FILTER) " +
-    "    AND ticketlines.PRODUCT = products.ID \n" +
+			"GROUP BY products.NAME,products.PRICEBUY,products.PRICESELL " +
-    "    AND ticketlines.TAXID = taxes.ID\n" +
+			"ORDER BY GROSSTOTAL DESC " +
-    "    AND ?(QBF_FILTER) " +
+			"LIMIT 10");
-    "GROUP BY \n" +
+			
-    "    products.NAME,\n" +
-    "    products.PRICEBUY,\n" +
-    "    products.PRICESELL\n" +
-    "ORDER BY \n" +
-    "    GROSSTOTAL DESC \n" +
-    "LIMIT 10";
-
-String derby = "SELECT \n" +
-    "    products.NAME,\n" +
-    "    SUM(ticketlines.UNITS) AS UNITS, \n" +
-    "    products.PRICEBUY,\n" +
-    "    products.PRICESELL, \n" +
-    "    SUM(ticketlines.PRICE * ticketlines.UNITS) AS SUBTOTAL, \n" +
-    "    SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES,\n" +
-    "    SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL\n" +
-    "FROM \n" +
-    "    ticketlines\n" +
-    "    LEFT JOIN products ON ticketlines.PRODUCT = products.ID \n" +
-    "    LEFT JOIN tickets ON tickets.ID = ticketlines.TICKET\n" +
-    "    LEFT JOIN receipts ON receipts.ID = tickets.ID\n" +
-    "    LEFT JOIN taxes ON ticketlines.TAXID = taxes.ID\n" +
-    "WHERE \n" +
-    "    tickets.ID = ticketlines.TICKET\n" +
-    "    AND ticketlines.PRODUCT = products.ID \n" +
-    "    AND ticketlines.TAXID = taxes.ID\n" +
-    "    AND ?(QBF_FILTER) " +
-    "GROUP BY \n" +
-    "    products.NAME,\n" +
-    "    products.PRICEBUY,\n" +
-    "    products.PRICESELL\n" +
-    "ORDER BY \n" +
-    "    GROSSTOTAL DESC \n" +
-    "FETCH FIRST 10 ROWS ONLY";
-
-if (report.getDBType() == "derby") {
-report.setSentence(derby);
-} else {
-report.setSentence(maria);
-}
 report.addParameter("receipts.DATENEW");
 report.addParameter("receipts.DATENEW");
 

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.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.eolupdate=<html><center><h2>Version 5.3 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.2 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.2 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,4 +1207,3 @@ 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,4 +662,3 @@ 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,4 +542,3 @@ 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,4 +1008,3 @@ 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,4 +902,3 @@ 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,4 +548,3 @@ 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,4 +1116,3 @@ 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

@@ -18,8 +18,7 @@
 #    along with uniCenta oPOS.  If not, see <http://www.gnu.org/licenses/>.
 
 button.backup=Copia seguridad realizada
-button.Cancel=Cancelar
+Button.Cancel=\ 
-Button.Cancel=Cancelar
 button.cancel=Cancelar
 button.catalogadd=A\u00f1adir al cat\u00e1logo
 button.catalogdel=Borrar del cat\u00e1logo
@@ -28,7 +27,7 @@ button.close=Cerrar
 Button.Close=Cerrar
 button.closecash=Cerrar caja
 button.closecashpreview=Cerrar Vista previa
-button.deleteticket=Borar tiquet
+button.deleteticket=Borar Tiquet
 button.discount=Descuento
 button.edit=Editar
 button.email=email
@@ -45,6 +44,8 @@ button.listtickets=Lista
 button.memberdiscount=Desc Miembro
 button.moorings=Moorings
 button.movetable=Mover
+button.newcustomer=Nuevo
+Button.newcustomer=Nuevo
 button.newcustomer=Nuevo Cliente
 Button.newcustomer=Nuevo cliente
 button.newticket=Nuevo
@@ -86,7 +87,7 @@ button.totaldiscount=Total Desc'
 button.transfer=Transferancia Base de Datos
 
 caption.split=Dividir recibo
-caption.tickets=Tiquets
+caption.tickets=Recibos
 caption.upload=Subir lista de productos
 
 cboption.clear=Borrar clave existente
@@ -118,7 +119,7 @@ filter.imgfile=Imagen (*.jpg,*.png)
 form.customertitle=Lista de clientes
 form.productslist=Lista de productos
 form.selectprintertitle=Seleccionar impresora
-form.tickettitle=Lista de tiquets
+form.tickettitle=Lista de recibos
 
 label.address=Direcci\u00f3n l\u00ednea 1
 label.address2=Direcci\u00f3n l\u00ednea 2
@@ -207,6 +208,7 @@ label.curdebt=Deuda actual
 label.currency=Moneda
 label.currencybutton=Ocultar Superposici\u00f3n texto Pagos
 label.currentstock=Disponible
+label.currentstock=Esta, existe
 label.customer=Cliente
 label.customerdate=Fecha Memorizada
 label.customerupdated=Clientes actualizados\t
@@ -214,6 +216,8 @@ label.custtaxcategory=Categor\u00eda de impuesto por cliente
 label.cvsinvalid=Productos Inv\u00e1lidos
 label.cvsnotchanged=Sin Cambios
 label.Database=Base de datos
+Label.Database=Base de datos
+Label.Database=Base de datos
 label.date=Fecha
 label.datestitle=Fechas de cierre
 label.datetime=Fecha y hora
@@ -262,6 +266,7 @@ label.inputamount=Campo de entrada por encima del teclado
 label.InputCash=Entregado
 label.integer=Entero
 label.invalidcustomers=Clientes no validos
+label.invalidcustomers=Clientes no validos
 label.invlinetotal=Linea total
 label.IP1=IP 2
 label.item=Art\u00edculo
@@ -270,7 +275,7 @@ label.javapos.drawer=Nombre del caj\u00f3n
 label.javapos.printer=Nombre de la impresora
 label.lastname=Apellidos
 label.lindediscount=Desc' %
-label.linevoids=L\u00edneas borradas y tiquets vac\u00edos
+label.linevoids=Boletos vac\u00edos
 Label.LoadError=Error de Carga
 label.LoadError=Se ha producido un error al mostrar esta funcionalidad.
 label.locale=Localizaci\u00f3n
@@ -303,10 +308,10 @@ label.maximum=M\u00e1ximo
 label.merchantcode=C\u00f3digo de comercio
 label.minimum=M\u00ednimo
 label.money=Total
-label.mooringcreatebtn=Crear Tiquet
+label.mooringcreatebtn=Crear Ticket
-label.mooringscreatefor=Crear tiquet para
+label.mooringscreatefor=Crear ticket para
 label.name=Nombre
-label.nocashsales=Aperturas de caj\u00f3n sin venta
+label.nocashsales=Sin Venta-Abrir Caj\u00f3n
 label.notes=Notas
 label.noticketstoclose=No hay tiquets por cerrar
 label.nullcategory=(Sin categor\u00eda)
@@ -338,8 +343,9 @@ label.placename=Sitio
 label.placeposition=Posici\u00f3n
 label.postal=C\u00f3digo postal
 label.prepay=Cantidad de prepago
-label.price=Base
+label.prepay=Cantidad Prepago
-label.pricetax=Base+IVA
+label.price=PVP
+label.pricetax=PVP+IVA
 label.priceupdate=Actualizaciones de precios
 label.csvnewcustomers=Nuevos Clientes
 label.priceupdate=Permitir actualizaciones de precios
@@ -363,8 +369,8 @@ label.prodname=Nombre
 label.prodnamem=<html> Nombre <font color = FB00FF> *
 label.prodorder=Orden
 label.prodpricebuy=Precio compra
-label.prodpricesell=Base
+label.prodpricesell=PVP
-label.prodpriceselltax=Base+IVA
+label.prodpriceselltax=PVP+IVA
 label.prodproperties=Propiedades
 label.prodref=Referencia
 label.prodscale=Balanza
@@ -377,13 +383,13 @@ label.prodsupplier=Proveedores
 label.prodtaxcode=Impuesto
 label.product=C\u00f3digo de barras
 label.producthtmlguide=<html>\n<div></p>Puedes personalizar la pantalla de venta de Productos aqu\u00ed. \nSi tienes algunos conocimientos de HTML puedes completar lo que aparece aqu\u00ed</p><br><br></div>\n<div>Pasa el cursor sobre el texto de la derecha para ver el c\u00f3digo HTML asociado al efecto que quieres en el Bot\u00f3n<br><br></div>\n
-label.productreceipt=Se requiere tiquet para la garant\u00eda
+label.productreceipt=Se requiere Ticket para la garant\u00eda
 label.produnits=Unidades
 label.prodvaluebuy=Valor de compra
 label.prodvaluesell=Valor de venta
 label.prodvolume=Volumen
 label.properties=Propiedades
-label.receiptprint=Desactivar Impresi\u00f3n de tiquet
+label.receiptprint=Desactivar Impresi\u00f3n Ticket
 label.receiptprinter=Impresora de recibos
 label.recorddeleted=(Registro borrado)
 label.recordeof=(No hay registros)
@@ -430,7 +436,7 @@ label.stocktaker=Entrado por
 label.storename=Nombre de tienda
 label.StripeLivePublishableKey=Clave publicable en vivo
 label.subcategorytitle=Nombre en panel
-label.subtotalcash=Total sin IVA
+label.subtotalcash=Subtotal
 label.supplierdocment=Documento
 label.suppliertaxid=La Cuenta
 label.SupplierTransactions=Actas
@@ -447,12 +453,12 @@ label.tableshowwaiterdetails=Mostrar Camarero
 label.tabletransbutton=Boton de la mesa transparente
 label.tabletransbutton=Boton de la mesa transparente
 label.tabletransbutton=Boton de la mesa transparente
-label.tax=IVA
+label.tax=Impuesto
-label.taxcash=IVA
+label.taxcash=Impuestos
 label.taxcategory=Cat. de impuesto
-label.taxes=IVA
+label.taxes=Impuestos
 label.taxid=CIF/NIF
-label.taxincluded=IVA Incluido al inicio
+label.taxincluded=Impuestos Incluidos al inicio
 label.taxparent=Impuesto padre
 label.tblProdHeaderCol1=Almac\u00e9n
 label.tblProdHeaderCol2=cantidad
@@ -465,14 +471,14 @@ label.textclourtablename=Color nombre Mesa
 label.textcolourcustomer=Color texto Cliente
 label.textcolourwaiter=Color texto Camarero
 label.texttip=Mensaje texto
-label.ticketid=Tiquet #
+label.ticketid=Ticket #
 label.Tickets=Pagos
-label.Ticketsbag=Tiquets
+label.Ticketsbag=Recibos
 Label.Ticketsbag=Tiquets
 label.ticketsetupexample=Ejemplo
-label.ticketsetupnumber=Long. m\u00edn N\u00fam Tiquet
+label.ticketsetupnumber=Long. m\u00edn N\u00fam Ticket
 label.ticketsetupprefix=Prefijo N\u00fam. Recibo
-label.tickettype=Tipo de tiquet
+label.tickettype=Tipo de boleto
 label.time=Hora
 label.tktfooter1=Pie de p\u00e1gina 1
 label.tktfooter2=Pie de p\u00e1gina 2
@@ -480,7 +486,7 @@ label.tktfooter3=Pie de p\u00e1gina 3
 label.tktfooter4=Pie de p\u00e1gina 4
 label.tktfooter5=Pie de p\u00e1gina 5
 label.tktfooter6=Pie de p\u00e1gina 6
-label.totalcash=Total PVP
+label.totalcash=Total
 label.totaldiscount=Total Desc'
 label.Transactions=Transacciones
 label.type=Tipo
@@ -490,8 +496,8 @@ label.uploadingproducts=Subiendo productos... Por favor, espere
 label.URL=URL
 label.user=Usuario
 label.ValidFrom=Validez desde
-label.value=PVP
+label.value=Importe
-label.value2=PVP
+label.value2=Precio
 label.variableprice=Precio Variable
 label.visible=Visible
 label.voucherValue=Valor
@@ -666,9 +672,9 @@ Menu.Taxes=Impuestos
 Menu.ThirdParties=Proveedores
 Menu.ThirdPartiesManagement=Gesti\u00f3n de proveedores
 
-Menu.Ticket=Vender
+Menu.Ticket=Ventas
-Menu.TicketEdit=Buscar tiquets
+Menu.TicketEdit=Editar ventas
-Menu.TicketRefund=Reembolsos
+Menu.TicketRefund=Devoluciones
 Menu.TimeSeriesProduct=Series de<br><b>tiempo
 
 Menu.Tools.Resets=Resetear Aplicaciones
@@ -681,7 +687,7 @@ Menu.Update= Actulizaci\u00f3n Manual Base de Datos
 Menu.Tools.UpdatedPrices=Cambio de Precios
 
 Menu.Users=Usuarios
-Menu.UserNoSales=Tiquet vac\u00edo
+Menu.UserNoSales=Boleto vac\u00edo
 Menu.UserSells=<html>Caja por<br><b>vendedor
 Menu.UsersReport=Usuarios
 Menu.UserTip=Consejos por usuario
@@ -712,7 +718,7 @@ message.cannotloadlists=No se han podido cargar las listas de datos.
 message.cannotloadreport=No se ha podido cargar la definici\u00f3n del informe.
 message.cannotloadreportdata=No se han podido cargar los datos del informe.
 message.cannotloadresourcedata=No se han podido cargar los recursos del informe.
-message.cannotloadticket=No se ha podido cargar el tiquet.
+message.cannotloadticket=No se ha podido cargar el recibo.
 message.CannotMove=No se puede mover a otro registro.
 message.cannotprint=No se puede imprimir el recibo.
 message.cannotprintline=No se ha podido imprimir la l\u00ednea.
@@ -757,17 +763,17 @@ message.nocustomernodebt=Este recibo no est\u00e1 asignado.\nNo puede ser pagado
 message.nopaymentgateway=Pasarela de pago sin definir.
 message.noprinters=No hay impresoras instaladas en el sistema.
 message.noproduct=No existe un producto con el c\u00f3digo introducido
-message.nosaveticket=No se ha podido guardar el tiquet.
+message.nosaveticket=No se ha podido guardar el recibo.
 message.noshift=No tienes un turno anterior
 message.nosupptranx=No hay transacciones para este proveedor
 message.notactive=Ha sucedido un error al mostrar el panel.
-message.notexiststicket=El tiquet no existe.
+message.notexiststicket=El recibo no existe.
-message.noticket=El tiquet ya no existe
+message.noticket=El recibo ya no existe
 message.notpermissions=No se le permite ejecutar esta tarea
 message.noupdatescript=<html>Se ha detectado un versi\u00f3n anterior de la base de datos pero no es posible actualizar la base de datos autom\u00e1ticamente. Openbravo POS se cerrar\u00e1 ahora.
 message.novprice=<html><center><h4>Producto de precio variable!</h2><br> Introducir precio y luego seleccionar producto
 message.noweight=No se ha podido realizar la pesada
-message.nullticket=<html>No puedes crear un tiquet vac\u00edo!<br>Por favor a\u00f1ade alg\u00fan art\u00edculo a esta venta
+message.nullticket=<html>No puedes crear un ticket vac\u00edo!<br>Por favor a\u00f1ade alg\u00fan art\u00edculo a esta venta
 message.numericamount = La cantidad debe ser un numero.
 message.paymentcashneg=Haga la devoluci\u00f3n y pulse Aceptar.
 message.paymenterror=Error de transaccion de pago!
@@ -793,11 +799,11 @@ message.restartchanges=La configuraci\u00f3n se ha guardado correctamente. Los c
 message.scannerfail=Se ha producido un error al subir la lista de productos.
 message.scannerfail2=Se ha producido un error al descargar la lista de productos.
 message.scannerok=Se ha subido con \u00e9xito la lista de productos.
-message.sharedticket=<html><center><h3>Hay tiquets aparcados</h3><br>Desafortunadamente no puedes verlos.
+message.sharedticket=<html><center><h3>Hay entradas en la pila</h3><br>Desafortunadamente no puedes verlos.
-message.sharedticketlock=El tiquet esta bloqueado! En uso en otro terminal
+message.sharedticketlock=El billete esta bloqueado! En uso en otro terminal
-message.sharedticketlockoverriden=<html><center><h4>Su tiquet fue emitido por alguien con permisos de usuario mas altos.<br>Cualquier cambio que haya hecho en su tiquet actual puede ser reemplazado
+message.sharedticketlockoverriden=<html><center><h4>Su Vale fue excedido por alguien con permisos de usuario mas altos.<br>Cualquier cambio que haya hecho en su Vale actual puede ser reemplazado
-message.sharedtickets=<html><center><h3>Hay tiquets aparcados!</h3>Completar o enviar a la papelera
+message.sharedtickets=<html><center><h3>Hay entradas en la pila!</h3>Completar o enviar a la papelera
-message.sharedtickettitle=Lista de tiquets aparcados
+message.sharedtickettitle=Lista de Vales compartidos
 message.startupText=<html>Cambiar el contenido del texto de inicio predeterminado y no declarar que se trata de un software libre infringe la GNU General Public License de Free Software Foundation GPL.
 message.supplierinvalid=Proveedor no valido
 message.systemclosecas=Producto no valido
@@ -805,12 +811,12 @@ message.systemclosecash=Mover botones Cerrar Caja
 message.tableempty=<html>El Vale de esta tabla esta siendo editado por otro usuario<br>Vuelva luego.
 message.tableempty=La mesa est\u00e1 ahora vac\u00eda.
 message.tablefull=La mesa est\u00e1 ahora vac\u00eda.
-message.ticketrefunded=<html>Este tiquet ya ha sido Reembolsado<br>Solo se permite un reembolso por tiquet
+message.ticketrefunded=<html>Este Vale ya ha sido Reembolsado<br>Solo se permite un reembolso por Vale
-message.ticketrefundedtitle=Recibo de reembolso de tiquet
+message.ticketrefundedtitle=Cheque de reembolso de Vales
 message.title.checkstock= Control de inventario
 message.title.nostocklocation=Localizaciones
 message.title=Mensaje de caja registradora
-message.transfer=<html>La transferencia puede tardar mucho tiempo dependiendo del tama\u00f1o de su base de datos<br> Estas seguro de que quieres seguir adelante?
+message.transfer=<html>La transferencia puede tardar mucho tiempo dependiendo del tama\u00c3\u00b1o de su base de datos<br> Estas seguro de que quieres seguir adelante?
 message.transfercomplete=<html>La transferencia de datos esta completa<br>Los datos se indexaran ahora
 message.transfernotsupported=Tipo de Migraci\u00f3n de Base de Datos no soportada
 message.transfertitle=Transferencia de base de datos
@@ -825,12 +831,12 @@ message.wannasave=\u00bfDesea guardar los cambios antes de salir?
 messsage.title.supplierinvalid=Proveedor no valido
 
 notify.added='Agregado'
-notify.customeradd='Cliente a\u00c3\u00b1adido a este tiquet'
+notify.customeradd='Cliente a\u00c3\u00b1adido a este ticket'
-notify.customerchange='El cliente se ha cambiado para este tiquet'
+notify.customerchange='El cliente ha cambiado por este ticket'
-notify.customerremove='El cliente se ha eliminado para este tiquet'
+notify.customerremove='El cliente ha borrado por este ticket'
 notify.deleted='Borrado'
-notify.printed='Impreso'
+notify.printed='Imprimido'
-notify.printing='Imprimiendo...'
+notify.printing='Imprimendo...'
 notify.removed='Borrado'
 notify.saved='Guardado'
 
@@ -849,24 +855,24 @@ rest.label.chairs=Personas
 rest.label.customer=Cliente
 rest.label.date=Fecha
 rest.label.notes=Notas
-rest.label.selectcustomer=Selecionar cliente
+rest.label.selectcustomer=Selecionar Persona
 rest.label.showcalendar=Ver/quitar Calendario
 
 scale.invalidvalue=La balanza devolvi\u00f3 un valor err\u00f3neo.
 scale.notdefined=La balanza no est\u00e1 definida.
 
 stock.in.movement=(entrada) Traspaso
-stock.in.purchase=(entrada) Compra
+stock.in.purchase=(entrada) compra
-stock.in.refund=(entrada) Devuelto
+stock.in.refund=(entrada) devoluci\u00f3n
-stock.out.break=(salida) Rotura
+stock.out.break=(salida) rotura
-stock.out.crossing=(entrada) Otros motivos
+stock.out.crossing=Traspaso
-stock.out.free=(salida) Regalo
+stock.out.free=Gratis
-stock.out.movement=No se usa
+stock.out.movement=(salida) Traspaso
-stock.out.refund=(salida) Retornado
+stock.out.refund=Retornar - Suprimir
-stock.out.sale=(salida) Venta
+stock.out.sale=(salida) venta
-stock.out.sample=(salida) Empleados
+stock.out.sample=Ejemplo - Salida
-stock.out.subtract=(salida) Robado
+stock.out.subtract=Sustraer
-stock.out.used=(salida) Traspaso
+stock.out.used=Usado
 
 tab.bank=Banco
 tab.cash=Caja
@@ -878,9 +884,9 @@ tab.debt=A cuenta
 tab.debt=D\u00e9bito
 tab.free=Escaso
 tab.magcard=Tarjeta
-tab.paper=Tiquet
+tab.paper=Boleto
-tab.paper=A cuenta
+tab.paper=Slip
-tab.slip=A cuenta
+tab.slip=Slip
 tab.ticket=Tiquet
 tab.voucher=Vale
 
@@ -905,7 +911,7 @@ tkt.tktheader6=Cabezal 6
 
 tooltip.=Reembolsar todo
 tooltip.addnew=<html><center><h4>Adquirir Nuevo
-tooltip.addnewticket=<html><center><h4>Aparcar tiquet
+tooltip.addnewticket=<html><center><h4>Nuevo Tiquet
 tooltip.attributes=<html><center><h4>Atributos
 tooltip.barcodetype=El valor predeterminado es EAN Barcodes. Comprobar para cambiar a codigos de barras de formato UPC
 tooltip.btn.closecash=<html><center><h4>Cerrar efectivo (tambien conocido como lectura Z)<br>Cerrar transacciones hasta este momento
@@ -940,7 +946,7 @@ tooltip.fontsize=<font size=-2>peque\u00f1o</font>
 tooltip.fontsizelarge=<html><center><h4><font size=+2>Grande</font>
 tooltip.fontsizesmall=<font size=-2>peque\u00f1o</font>
 tooltip.fontsizesmall=<html><center><h4><font size=-2>Menor</font>
-tooltip.layaway=<html><center><h4>Tiquets aparcados
+tooltip.layaway=<html><center><h4>Entradas a la espera de finalizacion
 tooltip.menu=Ver/Suprimir Menu y todo el programa
 tooltip.openfile=<html><center><h4>Seleccione el archivo necesario para este control\n
 tooltip.openfile=<html><center><h4>Seleccione el archivo necesario para este control\n
@@ -949,7 +955,7 @@ tooltip.prepay=Prepago a cuenta
 tooltip.priceupdate=Permitir actualizaciones de precios en la pantalla Ventas
 
 tooltip.printto=<html><center><h4>Seleccione esta impresora predeterminada de productos
-tooltip.printtoremote=<html><center><h4>Imprimir el tiquet a la impresora remota
+tooltip.printtoremote=<html><center><h4>Imprimir el ticket a la impresora remota
 tooltip.proddate=Utilice este campo de fecha para algo como la fecha de caducidad de un producto
 tooltip.prodhtmldisplayBold=<html><center><h4>Establezca el texto del boton en Negrita
 tooltip.prodhtmldisplayBreak=<html><center><h4>Inserta un salto de linea y se borra todo<br>(una nueva linea) para el texto del boton
@@ -964,37 +970,37 @@ tooltip.product.button.tab=<html> La pesta\u00f1a Bot\u00f3n permite mejorar el
 tooltip.product.general.tab=<html>La pesta\u00f1a General contiene la informaci\u00f3n principal de los productos. Los campos que tienen un * (asterisco) DEBEN completarse y no pueden estar vac\u00edos
 tooltip.quicklogoff=<html><center><h4>Salida rapida
 tooltip.refunditem=<html><center><h4>Reembolsar un solo articulo
-tooltip.refundline=<html><center><h4>Reembolsar una linea de tiquet
+tooltip.refundline=<html><center><h4>Reembolsar una linea de billetes
 tooltip.refundticket=<html><center><h4>Reembolsar todo
-tooltip.reprint=<html><center><h4>TIQUET REIMPRESO
+tooltip.reprint=<html><center><h4>TIQUET Reimpreso
-tooltip.reprintLastTicket=<html><center><h4>Imprimir el \u00faltimo tiquet
+tooltip.reprintLastTicket=<html><center><h4>Imprimir el ultimo Ticket
-tooltip.saleattributes=<html><center><h4>Elegir atributos del producto<br>Para la linea de transaccion actual
+tooltip.saleattributes=<html><center><h4>Elegir atributos del productobr>Para la linea de transaccion actual
 tooltip.salebarcode=<html><center><h4>Haga clic para obtener coincidencia de productos<br> Codigo de barras introducido manualmente
 tooltip.salechangetax=<html><center><h4>Cambiar impuesto para la linea de transaccion actual
-tooltip.salecheckstock=<html><center><h4>Comprobar existencias para la linea de transaccion actual<br>Doble toque para obtener m\u00e1s informaci\u00f3n
+tooltip.salecheckstock=<html><center><h4>Comprobar existencias para la linea de transaccion actual<br>Doble toque para obtener mas informacion
-tooltip.saleeditline=<html><center><h4>Editar el ultimo tiquet
+tooltip.saleeditline=<html><center><h4>Editar el ultimo Tiquet
 tooltip.saleproductfind=<html><center><h4>Buscar por producto
-tooltip.saleremoveline=<html><center><h4>Borrar l\u00ednea seleccionada
+tooltip.saleremoveline=<html><center><h4>Borrar el actual tiquet
 tooltip.salesattributes=<html><center><h4>Atributos
-tooltip.salescustomer=<html><center><h4>Seleccionar cliente<br>para este tiquet
+tooltip.salescustomer=<html><center><h4>Buscar o crear<br>Tiquet para este cliente
-tooltip.salesplit=<html><center><h4>Repartir venta
+tooltip.salesplit=<html><center><h4>Venta de Split
 tooltip.salestaxswitch=<html><center><h4>Impuesto para aplicar a<br> a la linea de transaccion actual
-tooltip.salesubtotal=<html><center><h4>Total de l\u00edneas de tiquets sin IVA
+tooltip.salesubtotal=<html><center><h4>Total de lineas de billetes sin IVA
-tooltip.saletax=<html><center><h4>Impuestos totales de las l\u00edneas de tiquets<br>El impuesto se calcula l\u00ednea por l\u00ednea
+tooltip.saletax=<html><center><h4>Impuestos totales de lineas de billetes<br>El impuesto se calcula linea por linea
-tooltip.saletotal=<html><center><h4>Total impuestos incluidos
+tooltip.saletotal=<html><center><h4>Vale total incluyendo impuestos
 tooltip.save=<html><center><h4>Guardar
 tooltip.scale=<html><center><h4>Abrir en pantalla<br>como Bascula virtual
 tooltip.supplierdocument=<html><center><h4>Introduzca la entrega de un proveedor<br>Nota o factura
 tooltip.switchtax=<html><center><h4>Impuesto de cambio de un precio introducido manualmente
 tooltip.ticketedit=<html><center><h4>Editar tiquet
 tooltip.ticketrefund=<html><center><h4>Tiquet de reembolso
-tooltip.ticketreprint=<html><center><h4>Reimprimir tiquet
+tooltip.ticketreprint=<html><center><h4>Reimprimir Tiquet
-tooltip.ticketsearch=<html><center><h4>Buscar tiquets
+tooltip.ticketsearch=<html><center><h4>Buscar Tiquets
 tooltip.transferdb=<html><center><h4>Iniciar la base de datos Proceso de transferencia
 tooltip.transferdbversion=<html><center><h4>La version uniCenta oPOS de la base de datos de transferencias
 tooltip.transferfromdb=<html><center><h4>Seleccione el tipo de base de datos a transferir desde
 tooltip.transfertxtout=<html><center><h4>Lista actualizada dinamicamente de cada proceso cuando sucede<br>\nEnumera las tablas de la base de datos de transferencia
-tooltip.vouchercustomer=<html><center><h4>Buscar o Crear nuevo<br>Cliente para este tiquet
+tooltip.vouchercustomer=<html><center><h4>Buscar o Crear nuevo<br>el Cliente de este tiquet
 tooltip.xmlheader=Utilicelo para insertar el encabezado XML correcto para su uso en los scripts de extension
 tootltip.transferclass=<html><center><h4>Dejar como predeterminado a menos que<br>Se selecciona una biblioteca de controladores diferente
 tootltip.transferdbname=<html><center><h4>Esta es la URL completa de la<br>Servidor que aloja la base de datos <br>\nEl valor predeterminado es localhost. Cambie aqui si su base de datos esta alojada en un servidor remoto
@@ -1018,7 +1024,7 @@ transpayment.debtpaid=A cuenta pagados
 transpayment.free=Sin cargo
 transpayment.ccard=Tarjeta de credito
 transpayment.ccardrefund=Devoluci\u00f3n con tarjeta
-transpayment.slip=A cuenta
+transpayment.slip=Vales
 transpayment.ticket=Tiquet
 transpayment.voucher=Vale
 transpayment.voucherin=Cupon - Redimido
@@ -1031,7 +1037,7 @@ label.DbName1=DB 2 Nombre
 label.DbPort=Port
 label.DbPort1=Port 2
 label.DbURL1=DB 2 URL
-label.discount=Descuento
+label.discount=Reembolso
 label.display=Pantalla
 label.from=De
 label.ibutton=iButton
@@ -1039,7 +1045,7 @@ label.ibuttonresponsespeed=Sensibilidad
 label.imagesize=Tama\u00f1o de la imagen 250x250 p\u00edxeles o inferior para un mejor rendimiento
 label.instance=\u00fanica instancia
 label.invline=Cambiar Precio Comprar
-label.invlinestotal=Total l\u00edneas
+label.invlinestotal=L\u00edneas Total
 label.locationplace=Almac\u00e9n
 label.customer_list=Lista
 label.customer_export=Lista de exportaci\u00f3n
@@ -1058,7 +1064,7 @@ label.prodbarcodetype=Tipo de c\u00f3digo de barras
 label.prodcategorym=<html>Categor\u00eda<font color=FB00FF> *
 label.proddefaultcategory=Predeterminado Cat'
 label.prodpricebuym=<html>Precio de compra<font color=FB00FF> *
-label.prodpriceselltaxm=<html>PVP<font color=FB00FF> *
+label.prodpriceselltaxm=<html>Precio de venta inc'<font color=FB00FF> *
 label.prodrefm=<html>Referencia<font color=FB00FF> *
 label.prodtax=Impuesto
 label.rolem=<html>Role<font color=FB00FF> *
@@ -1110,8 +1116,8 @@ form.usertitle=Lista de usuarios
 migration.warning=Advertencia
 label.warranty=Garant\u00eda
 message.deletelineno=No tienes permitido hacer esto
-message.nosharedtickets=No hay tiquets aparcados
+message.nosharedtickets=No tienes pedidos compartidas en la pila
-tooltip.customerpay.prepay=Seleccione un cliente, ingrese el importe de pago aqu\u00ed y luego haga clic en bot\u00f3n Prepago
+tooltip.customerpay.prepay=Seleccione un cliente y luego ingrese el importe de pago aqu\u00ed y luego haga clic en bot\u00f3n Prepago
 tootltip.save=Guardar
 label.configOptionRestaurant=Restaurante
 button.closecashreprint=Reimprimir
@@ -1144,13 +1150,13 @@ label.autoRefreshTableMapTimerOFF=<html> La Actualizaci\u00f3n Autom\u00e1tica e
 label.autoRefreshTableMapTimerON=<html> La Actualizaci\u00f3n Autom\u00e1tica es: <b> ON </ b>
 Menu.Closing1=<html>Caja cerrado <br /> <b> Exportaci\u00f3n
 Menu.Closing2=<html>Caja cerrado <br /> <b> Exportaci\u00f3n
-message.customernotfound=<html> Cliente no encontrado. <br> \u00bfDesea crear un nuevo cliente?
+message.customernotfound=<html> Cliente no encontrado. <br> \u00bfDesea crear un nuevo registro de cliente?
 Menu.InventoryBundles=<html>Inventario <br /><b>Paquetes
 tooltip.product.properties.tab=<html> La ficha Propiedades se utiliza junto con los scripts de recursos <br>Se utiliza para agregar m\u00e1s atributos a un producto
 tooltip.product.stock.tab=<html> La pesta\u00f1a Almac\u00e9n contiene los atributos opcionales Productos
 message.customercheck=Se requiere una clave de b\u00fasqueda y un nombre.
-message.customeradd=\u00bfA\u00f1adir cliente a este tiquet?
+message.customeradd=\u00bfA\u00f1adir al cliente a este boleto?
-message.customerchangeyn=\u00bfEst\u00e1 seguro de que desea cambiar el cliente para el tiquet actual?
+message.customerchangeyn=\u00bfEst\u00e1 seguro de que desea cambiar el cliente por el recibo actual?
 message.deletelineyes=\u00bfEstas seguro que quieres borrarlo?
 message.sharedticketlockoverride=\u00bfEst\u00e1s seguro de que quieres Over-ride?
 message.customerclear=\u00bfEst\u00e1s seguro? Cancelar borrar\u00e1 al Cliente.
@@ -1177,15 +1183,11 @@ database.ScriptWarning=Error de script de base de datos
 exception.unavailabledataset=El conjunto de datos no est\u00e1 disponible
 message.email=No se ha encontrado la aplicaci\u00f3n de correo electr\u00f3nico de escritorio
 message.enterbuyprice=Introduzca el nuevo Precio de Compra
-tooltip.edit.findticket=Introduzca n\u00ba de tiquet y valide para Buscar por n\u00famero
+tooltip.edit.findticket=Introduzca Recibo y toque para Buscar por n\u00famero
 exception.unavailablefield=Campo no definido: {0}
 exception.unavailablefields=Campos no disponibles
 cboption.find=Buscar
 button.prodhtmldisplayFont=Tipo de fuente
 button.prodhtmldisplayImage=Imagen
 label.csvclear=Diario de importaci\u00f3n
-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 4.5 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
+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.2 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.find=Buscar
-label.create=Crear
-label.cancel=Cancelar
-label.peopletaxid=ID de impuesto

src/main/resources/pos_messages_es_AR.properties

@@ -484,4 +484,3 @@ 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

@@ -468,6 +468,4 @@ transpayment.ticket=Ticket
 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
+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.2 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,4 +502,3 @@ 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,4 +1083,3 @@ 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,4 +482,3 @@ 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,4 +753,3 @@ 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

@@ -911,7 +911,7 @@ message.transfermessage=Database overdracht
 message.transfernotsupported=Database overdrachtstype wordt niet ondersteund
 message.transfertitle=Database overdracht
 message.updatedatabase=<html><center><h3>uniCenta oPOS Version {0} database gedetecteerd!</h3> De database wordt automatisch geüpgraded.<br>GEGEVENS KUNNEN VERLOREN GAAN. MAAK EERST EEN BACKUP.<br><br>Wilt u doorgaan?
-message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 5.3 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
+message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 5.2 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
 message.URL=<html>Een webpagina laten zien in het hoofdscherm . vereist de volledige URL<br />Voor een lokaal bestand begin met - <b>file://</b><br/>Voor een extern bestand gebruik <b>http://</b><br/> 
 message.uuidcopy=<html><center><h4>UUID is gekopieerd naar het klembord
 message.vipno=Klant is geen VIP
@@ -1175,4 +1175,3 @@ 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,4 +462,3 @@ 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,4 +404,3 @@ 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

@@ -1,73 +0,0 @@
-package com.unicenta.pos.util;
-
-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.jupiter.api.Test;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class QRCodeTest {
-
-    @Test
-    void shouldPrintQRCode() throws Exception {
-        // Name
-        QRObject name = new QRObject(1,  "Hugh Stevenson");
-        byte nameTagByte = (byte) name.getTag();
-        byte nameLengthByte = (byte) name.getLength();
-        byte[] nameBytes = {nameTagByte, nameLengthByte};
-        String nameString = new String(nameBytes, StandardCharsets.UTF_8)+name.getValue();
-
-        //vat number
-        QRObject vat = new QRObject(2, "1234567890");
-        byte vatTagByte = (byte) vat.getTag();
-        byte vatLengthByte = (byte) vat.getLength();
-        byte[] vatBytes = {vatTagByte, vatLengthByte};
-        String vatString = new String(vatBytes, StandardCharsets.UTF_8)+vat.getValue();
-
-        // date
-        QRObject date = new QRObject(3, "2021-11-28 09:30:00");
-        byte dateTagByte = (byte) date.getTag();
-        byte dateLengthByte = (byte) date.getLength();
-        byte[] dateBytes = {dateTagByte, dateLengthByte};
-        String dateString = new String(dateBytes, StandardCharsets.UTF_8)+date.getValue();
-
-        // amount
-        QRObject amount = new QRObject(4, "1000.00");
-        byte amountTagByte = (byte) amount.getTag();
-        byte amountLengthByte = (byte) amount.getLength();
-        byte[] amountBytes = {amountTagByte, amountLengthByte};
-        String amountString = new String(amountBytes, StandardCharsets.UTF_8)+amount.getValue();
-
-
-        // Vat amount
-        QRObject vatAmount = new QRObject(5, "150.00");
-        byte vatAmountTag = (byte) vatAmount.getTag();
-        byte vatAmountLengthByte = (byte) vatAmount.getLength();
-        byte[] vatAmountBytes = {vatAmountTag, vatAmountLengthByte};
-        String vatAmountString = new String(vatAmountBytes, StandardCharsets.UTF_8)+vatAmount.getValue();
-
-
-        //barcode
-        String barCodeString = nameString+vatString+dateString+amountString+vatAmountString;
-        String encodedBarcode = Base64.getEncoder().encodeToString(barCodeString.getBytes(StandardCharsets.UTF_8));
-
-        assert encodedBarcode != null;
-
-        QRCodeWriter barcodeWriter = new QRCodeWriter();
-        BitMatrix bitMatrix = barcodeWriter.encode(encodedBarcode, BarcodeFormat.QR_CODE, 200, 200);
-
-        BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
-
-        File outputfile = new File("test.jpg");
-        assert  ImageIO.write(bufferedImage, "jpg", outputfile);
-
-    }
-}