formating

don't need to track these
2026-04-14 21:26:50 +01:00 · 2026-04-13 21:13:08 +01:00
41 changed files with 2964 additions and 3848 deletions
@@ -7,8 +7,7 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
 .classpath
 .project
 .factorypath
-.settings
+.settings/
 .project
@@ -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.
@@ -4,7 +4,7 @@
  <groupId>com.unicenta</groupId>
  <artifactId>unicentaopos</artifactId>
-  <version>5.5.0-SNAPSHOT</version>
+  <version>5.4.0</version>
  <packaging>jar</packaging>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -361,7 +361,7 @@
    <dependency>
      <groupId>com.unicenta</groupId>
      <artifactId>unicenta-plugins</artifactId>
-      <version>1.4.0-SNAPSHOT</version>
+      <version>1.3.1</version>
    </dependency>
    <dependency>
      <groupId>com.gluonhq</groupId>
@@ -34,6 +34,7 @@ import java.util.regex.Pattern;
@Slf4j
 public class StaticSentence extends JDBCSentence {
    private ISQLBuilderStatic iSQLBuilder;
    /**
@@ -135,13 +136,13 @@ public class StaticSentence extends JDBCSentence {
                return sqliteSQL.toString();
            }
-    } catch (Exception e) {
+        }
        catch (Exception e) {
            log.error("Error fixing sql for sqlite {}", e.getMessage());
            return sql;
        }
        return sql;
    }
    /**
     * @param params
     * @return
@@ -155,10 +156,8 @@ public class StaticSentence extends JDBCSentence {
        closeExec();
        try {
-      // follow this to find the create category bug when importing a product csv
+
-      // https://unicenta.atlassian.net/browse/UOCL-317
+            String sentence = fixSqliteDate(iSQLBuilder.getSQL(m_SerWrite, params));
      String sql = iSQLBuilder.getSQL(m_SerWrite, params);
      String sentence = fixSqliteDate(sql);
            //String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
            statement = session.getConnection().createStatement();
@@ -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}
        );   
@@ -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>
@@ -52,12 +52,9 @@ public class PeopleView extends JPanel implements EditorRecord {
    private final ComboBoxValModel m_ReasonModel;        
-  /**
+    /** Creates new form PeopleEditor
   * Creates new form PeopleEditor
   * 
     * @param dlAdmin
-   * @param dirty
+     * @param dirty */
   */
    public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
        initComponents();
@@ -80,7 +77,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        webCBSecurity.setModel(m_ReasonModel);
    taxIdTextField.getDocument().addDocumentListener(dirty);
        writeValueEOF();
    }
@@ -96,7 +92,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jVisible.setSelected(false);
        m_jcard.setText(null);
        m_jImage.setImage(null);
    taxIdTextField.setText(null);
        m_jName.setEnabled(false);
        m_jRole.setEnabled(false);
        m_jVisible.setEnabled(false);
@@ -104,7 +99,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jImage.setEnabled(false);
        jButton1.setEnabled(false);
        webCBSecurity.setEnabled(false);
    taxIdTextField.setEnabled(false);
    }
    /**
@@ -119,7 +113,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jVisible.setSelected(true);
        m_jcard.setText(null);
        m_jImage.setImage(null);
    taxIdTextField.setText(null);
        m_jName.setEnabled(true);
        m_jRole.setEnabled(true);
        m_jVisible.setEnabled(true);
@@ -127,7 +120,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jImage.setEnabled(true);
        jButton1.setEnabled(true);
        webCBSecurity.setEnabled(true);        
    taxIdTextField.setEnabled(true);
    }
    /**
@@ -144,7 +136,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
        m_jcard.setText(Formats.STRING.formatValue(people[5]));
        m_jImage.setImage((BufferedImage) people[6]);
    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
        m_jName.setEnabled(false);
        m_jRole.setEnabled(false);
@@ -153,7 +144,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jImage.setEnabled(false);        
        jButton1.setEnabled(false);
        webCBSecurity.setEnabled(false);        
    taxIdTextField.setEnabled(false);
    }
    /**
@@ -170,13 +160,13 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
        m_jcard.setText(Formats.STRING.formatValue(people[5]));
        m_jImage.setImage((BufferedImage) people[6]);
-    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
+        
        if (m_jcard.getText().length() == 16) {
            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
        } else {
            jLblCardID.setText(AppLocal.getIntString("label.card"));            
        }
-    // System.out.println(m_jcard.getText().length());
+        System.out.println(m_jcard.getText().length());        
        m_jName.setEnabled(true);
        m_jRole.setEnabled(true);
@@ -185,7 +175,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jImage.setEnabled(true);
        jButton1.setEnabled(true);
        webCBSecurity.setEnabled(true);        
    taxIdTextField.setEnabled(true);
    }
    /**
@@ -195,7 +184,7 @@ public class PeopleView extends JPanel implements EditorRecord {
     */
    @Override
    public Object createValue() throws BasicException {
-    Object[] people = new Object[8];
+        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);
@@ -203,7 +192,6 @@ public class PeopleView extends JPanel implements EditorRecord {
        people[4] = m_jVisible.isSelected();
        people[5] = Formats.STRING.parseValue(m_jcard.getText());
        people[6] = m_jImage.getImage();
    people[7] = Formats.STRING.parseValue(taxIdTextField.getText());
        return people;
    }
@@ -226,6 +214,7 @@ public class PeopleView extends JPanel implements EditorRecord {
        m_jRole.setModel(m_RoleModel);
    }
    /**
     *
     */
@@ -233,15 +222,12 @@ public class PeopleView extends JPanel implements EditorRecord {
    public void refresh() {
    }
-  /**
+    /** This method is called from within the constructor to
   * This method is called from within the constructor to
     * initialize the form.
     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
-  // <editor-fold defaultstate="collapsed" desc="Generated
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
  // <editor-fold defaultstate="collapsed" desc="Generated
  // Code">//GEN-BEGIN:initComponents
    private void initComponents() {
        jLabel1 = new javax.swing.JLabel();
@@ -255,10 +241,8 @@ public class PeopleView extends JPanel implements EditorRecord {
        jLabel2 = new javax.swing.JLabel();
        m_jcard = new javax.swing.JTextField();
        jLblCardID = new javax.swing.JLabel();
-    webCBSecurity = new javax.swing.JComboBox();
+        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
-    passwordLabel = new javax.swing.JLabel();
+        jLabel6 = new javax.swing.JLabel();
    taxIdTextField = new javax.swing.JTextField();
    taxIdLabel = new javax.swing.JLabel();
        setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
        setPreferredSize(new java.awt.Dimension(500, 500));
@@ -315,11 +299,10 @@ public class PeopleView extends JPanel implements EditorRecord {
        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
-    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.setModel(new javax.swing.DefaultComboBoxModel(
        new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
        webCBSecurity.setSelectedIndex(0);
        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -327,15 +310,9 @@ public class PeopleView extends JPanel implements EditorRecord {
            }
        });
-    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
+        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
-    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+        jLabel6.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);
@@ -345,95 +322,63 @@ public class PeopleView extends JPanel implements EditorRecord {
                .addContainerGap()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .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,
                                javax.swing.GroupLayout.PREFERRED_SIZE))))
                .addContainerGap(50, Short.MAX_VALUE)));
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                .addGap(18, 18, 18)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    .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
    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
@@ -448,12 +393,14 @@ public class PeopleView extends JPanel implements EditorRecord {
    private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
        if(webCBSecurity.getSelectedIndex() == 0){
            if (JOptionPane.showConfirmDialog(this, 
                AppLocal.getIntString("message.cardnew"), 
                AppLocal.getIntString("title.editor"), 
                JOptionPane.YES_NO_OPTION, 
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
            {  
                m_jcard.setText("C" + StringUtils.getCardNumber());
                m_Dirty.setDirty(true);
            }        
@@ -464,7 +411,8 @@ public class PeopleView extends JPanel implements EditorRecord {
                AppLocal.getIntString("message.cardremove"), 
                AppLocal.getIntString("title.editor"), 
                JOptionPane.YES_NO_OPTION, 
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
            {  
                m_jcard.setText(null);
                m_Dirty.setDirty(true);
            }
@@ -499,22 +447,21 @@ public class PeopleView extends JPanel implements EditorRecord {
        }
    }//GEN-LAST:event_jLabel1MouseClicked
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton jButton1;
    private javax.swing.JLabel jLabel1;
    private javax.swing.JLabel jLabel2;
    private javax.swing.JLabel jLabel3;
    private javax.swing.JLabel jLabel4;
    private javax.swing.JLabel jLabel6;
    private javax.swing.JLabel jLblCardID;
    private com.unicenta.data.gui.JImageEditor m_jImage;
    private javax.swing.JTextField m_jName;
    private javax.swing.JComboBox m_jRole;
    private javax.swing.JCheckBox m_jVisible;
    private javax.swing.JTextField m_jcard;
-  private javax.swing.JLabel passwordLabel;
+    private com.alee.laf.combobox.WebComboBox webCBSecurity;
  private javax.swing.JLabel taxIdLabel;
  private javax.swing.JTextField taxIdTextField;
  private javax.swing.JComboBox webCBSecurity;
    // End of variables declaration//GEN-END:variables
 }
@@ -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,7 +199,7 @@ 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) {
@@ -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 {
    }
  }
 }
@@ -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);
@@ -28,12 +28,10 @@ public class PaymentInfoCash extends PaymentInfo {
    private double m_dTotal;
    private double m_dTendered;
    private String m_dCardName =null;
  private String m_sName = "cash";
 //    private double m_dTip;    
    /**
     * Creates a new instance of PaymentInfoCash
   * 
     * @param dTotal
     * @param dPaid
     * @param dTendered
@@ -46,7 +44,6 @@ public class PaymentInfoCash extends PaymentInfo {
    /**
     * Creates a new instance of PaymentInfoCash
   * 
     * @param dTotal
     * @param dPaid
     * @param dTendered
@@ -57,12 +54,9 @@ public class PaymentInfoCash extends PaymentInfo {
        this.prePayAmount = prePayAmount;
    }
-  /**
+    /** Creates a new instance of PaymentInfoCash
   * Creates a new instance of PaymentInfoCash
   * 
     * @param dTotal
-   * @param dPaid
+     * @param dPaid */
   */
    public PaymentInfoCash(double dTotal, double dPaid) {
        m_dTotal = dTotal;
        m_dPaid = dPaid;
@@ -83,12 +77,10 @@ public class PaymentInfoCash extends PaymentInfo {
    public String getName() {
        return "cash";
    }
    @Override
    public double getTotal() {
        return m_dTotal;
    }
 //    public double getTip() {
 //        return m_dTip;
 //    }
@@ -126,11 +118,9 @@ public class PaymentInfoCash extends PaymentInfo {
    public String printTendered() {
       return Formats.CURRENCY.formatValue(m_dTendered);
   }    
    public String printPaid() {
        return Formats.CURRENCY.formatValue(m_dPaid);
    }
    public String printChange() {
        return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
    }
@@ -31,15 +31,11 @@ public class PaymentInfoCash_original extends PaymentInfo {
    private final double m_dTotal;
    private double m_dTendered;    
    private final String m_dCardName =null;
  private String m_sName = "cash";
 //    private double m_dTip;    
-  /**
+    /** Creates a new instance of PaymentInfoCash
   * Creates a new instance of PaymentInfoCash
   * 
     * @param dTotal
-   * @param dPaid
+     * @param dPaid */
   */
    public PaymentInfoCash_original(double dTotal, double dPaid) {
        m_dTotal = dTotal;
        m_dPaid = dPaid;
@@ -59,17 +55,13 @@ public class PaymentInfoCash_original extends PaymentInfo {
    public String getName() {
        return "cash";
    }   
    @Override
    public double getTotal() {
        return m_dTotal;
    }   
-
+/**    public double getTip() {
-  /**
+        return m_dTip;
-   * public double getTip() {
+    }
   * return m_dTip;
   * }
   * 
     * @return 
 */
    @Override
@@ -91,11 +83,9 @@ public class PaymentInfoCash_original extends PaymentInfo {
   public String getCardName() {
       return m_dCardName;
   }
    public String printPaid() {
        return Formats.CURRENCY.formatValue(m_dPaid);
    }   
    public String printChange() {
        return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
    }
@@ -21,7 +21,6 @@ package com.unicenta.pos.payment;
 public class PaymentInfoMagcard extends PaymentInfo {
  private String m_sName = "creditcard";
    protected double m_dTotal;
    protected double m_dTip;
    protected String m_sHolderName;
@@ -45,7 +44,6 @@ public class PaymentInfoMagcard extends PaymentInfo {
    /**
     * Creates a new instance of PaymentInfoMagcard
   * 
     * @param sHolderName
     * @param sCardNumber
     * @param sExpirationDate
@@ -71,6 +69,7 @@ public class PaymentInfoMagcard extends PaymentInfo {
        m_sTransactionID = sTransactionID;
        m_dTotal = dTotal;
        m_sAuthorization = null;
        m_sErrorMessage = null;
        m_sReturnMessage = null;
@@ -78,7 +77,6 @@ public class PaymentInfoMagcard extends PaymentInfo {
    /**
     * Creates a new instance of PaymentInfoMagcard
   * 
     * @param sHolderName
     * @param sCardNumber
     * @param sExpirationDate
@@ -158,8 +156,7 @@ public class PaymentInfoMagcard extends PaymentInfo {
        return encryptionKey;
    }
-  /**
+    /** @param sCardNumber
   * @param sCardNumber
     * @return
     */
    public String getCardType(String sCardNumber){
@@ -254,6 +251,7 @@ public class PaymentInfoMagcard extends PaymentInfo {
        throw new UnsupportedOperationException("Not supported yet.");
    }
    public void setIsProcessed(boolean value) {
        throw new UnsupportedOperationException("Not supported yet.");
    }
@@ -26,7 +26,6 @@ import com.alee.extended.time.WebClock;
 import com.alee.managers.notification.NotificationIcon;
 import com.alee.managers.notification.NotificationManager;
 import com.alee.managers.notification.WebNotification;
 import com.google.gson.Gson;
 import com.unicenta.basic.BasicException;
 import com.unicenta.beans.JNumberPop;
 import com.unicenta.data.gui.ComboBoxValModel;
@@ -75,6 +74,7 @@ import java.util.*;
 import static java.awt.Window.getWindows;
 /**
 * @author JG uniCenta
 */
@@ -155,6 +155,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
  private Integer oCount = 0;
  private Boolean pinOK;
  /**
   * Creates new form JTicketView
   */
@@ -181,8 +182,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
    dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
-    /*
+
-     * uniCenta Feb 2018
+    /* uniCenta Feb 2018
     * Changed for 4.3
     * Set up main toolbar area with two rows to add cater for additional scripts
     * else over-crowding and some dynamic buttons off screen/not visible
@@ -190,8 +191,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     * Resources>Menu.Root
     */
-    // Set Configuration>General>Tickets toolbar simple : standard : restaurant
+// Set Configuration>General>Tickets toolbar simple : standard : restaurant option
    // option
    m_ticketsbag = getJTicketsBag();
    m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
    add(m_ticketsbag.getNullComponent(), "null");
@@ -327,6 +327,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
      }
    }
  }
  @Override
@@ -817,8 +818,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 //        if (m_App.getProperties().getProperty("override.check").equals("true")) {
    if (!m_oTicket.getLine(i).getUpdated()) {
-      JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.deletelinesent"),
+      JOptionPane.showMessageDialog(this
-          AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
+              , AppLocal.getIntString("message.deletelinesent")
              , AppLocal.getIntString("label.deleteline")
              , JOptionPane.WARNING_MESSAGE);
    } else {
      if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
        String ticketID = Integer.toString(m_oTicket.getTicketId());
@@ -832,7 +835,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                        m_oTicket.getLine(i).getProductID(),
                        m_oTicket.getLine(i).getProductName(),
                        m_oTicket.getLine(i).getMultiply()
-            });
+                }
        );
        if (m_oTicket.getLine(i).isProductCom()) {
          m_oTicket.removeLine(i);
@@ -842,8 +846,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
            if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
              int input = JOptionPane.showConfirmDialog(this,
-                  AppLocal.getIntString("message.deletelineyes"), AppLocal.getIntString("label.deleteline"),
+                      AppLocal.getIntString("message.deletelineyes")
-                  JOptionPane.YES_NO_OPTION);
+                      , AppLocal.getIntString("label.deleteline"), JOptionPane.YES_NO_OPTION);
              if (input == 0) {
                m_oTicket.removeLine(i);
@@ -851,8 +855,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
              }
            } else {
              JOptionPane.showMessageDialog(this,
-                  AppLocal.getIntString("message.deletelineno"), AppLocal.getIntString("label.deleteline"),
+                      AppLocal.getIntString("message.deletelineno")
-                  JOptionPane.WARNING_MESSAGE);
+                      , AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
            }
          } else {
            m_oTicket.removeLine(i);
@@ -907,6 +911,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    return dValue / (1.0 + dTaxRate);
  }
  private double getInputValue() {
    try {
      return Double.parseDouble(m_jPrice.getText());
@@ -1068,9 +1073,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
        } else if (sCode.startsWith(";")) {
          stateToZero();
          // START OF BARCODE PARSING
-          /*
+          /*  This block is deliberately verbose and is base for future scanner handling
           * This block is deliberately verbose and is base for future scanner handling
           *  Some scanners inject a CR+LF... some don't...
           *  stateTransition() must allow for this as these add characters to .length()
           *  First 3 digits are GS1 CountryCode OR Retailer internal use
@@ -1164,8 +1169,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
              }
              TaxInfo tax = taxeslogic                                // get the TaxRate for the product
-                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); // calculate if ticket has a
+                      .getTaxInfo(oProduct.getTaxCategoryID()
-                                                                                     // Customer
+                              , m_oTicket.getCustomer());                         // calculate if ticket has a Customer
              switch (sVariableTypePrefix) {
 //  PRICE - Assign var's
@@ -1174,28 +1179,32 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                          / (1.0 + tax.getRate());                    // selling price with tax
                  dUnits = (Double.parseDouble(sVariableNum)
                          / 100) / oProduct.getPriceSellTax(tax);     // Units as proportion of selling price
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell())); // push to screen
+                  oProduct.setProperty("product.price"
                          , Double.toString(oProduct.getPriceSell())); // push to screen
                  break;
                case "20":                                          // as above
                  dPriceSell = oProduct.getPriceSellTax(tax)
                          / (1.0 + tax.getRate());
                  dUnits = (Double.parseDouble(sVariableNum)
                          / 100) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSellTax(tax)));
+                  oProduct.setProperty("product.price"
                          , Double.toString(oProduct.getPriceSellTax(tax)));
                  break;
                case "21":
                  dPriceSell = oProduct.getPriceSellTax(tax)
                          / (1.0 + tax.getRate());
                  dUnits = (Double.parseDouble(sVariableNum)
                          / 10) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
+                  oProduct.setProperty("product.price"
                          , Double.toString(oProduct.getPriceSell()));
                  break;
                case "22":
                  dPriceSell = oProduct.getPriceSellTax(tax)
                          / (1.0 + tax.getRate());
                  dUnits = (Double.parseDouble(sVariableNum)
                          / 1) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
+                  oProduct.setProperty("product.price"
                          , Double.toString(oProduct.getPriceSell()));
                  break;
 // WEIGHT - Assign variable to Unit
@@ -1203,22 +1212,28 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                  weight = Double.parseDouble(sVariableNum)
                          / 1000;                                     // 3 decimals = 01.049 kg
                  dUnits = weight;                                // which represents 1gramme Units
-                  oProduct.setProperty("product.weight", Double.toString(weight));
+                  oProduct.setProperty("product.weight"
-                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                          , Double.toString(weight));
                  oProduct.setProperty("product.price"
                          , Double.toString(dPriceSell));
                  break;
                case "24":
                  weight = Double.parseDouble(sVariableNum)
                          / 100;                                      // 2 decimals = 010.49 kg
                  dUnits = weight;                                // which represents 10gramme Units
-                  oProduct.setProperty("product.weight", Double.toString(weight));
+                  oProduct.setProperty("product.weight"
-                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                          , Double.toString(weight));
                  oProduct.setProperty("product.price"
                          , Double.toString(dPriceSell));
                  break;
                case "25":
                  weight = Double.parseDouble(sVariableNum)
                          / 10;                                       // 1 decimal = 0104.9 kg
                  dUnits = weight;                                // which represents 100gramme Units
-                  oProduct.setProperty("product.weight", Double.toString(weight));
+                  oProduct.setProperty("product.weight"
-                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                          , Double.toString(weight));
                  oProduct.setProperty("product.price"
                          , Double.toString(dPriceSell));
                  break;
 /*
@@ -1226,25 +1241,27 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 *  Use this section to add more case statements but these are not mandatory
 *  If you have your own internal or other barcode schema then...
 *  Example:
-                 * case "28":
+        case "28":
-                 * {
+        {
-                 * // price has tax. Remove it from sPriceSell
+        // price has tax. Remove it from sPriceSell
-                 * TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(),
+            TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
-                 * m_oTicket.getCustomer());
+            dPriceSell /= (1.0 + tax.getRate());
-                 * dPriceSell /= (1.0 + tax.getRate());
+            oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                 * oProduct.setProperty("product.price", Double.toString(dPriceSell));
+            weight = -1.0;
-                 * weight = -1.0;
+        break;
                 * break;
 */
                default:
                  break;
              }
              if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct, dUnits // weight
+                addTicketLine(oProduct
                        , dUnits //weight
                        , dPriceSell = oProduct.getPriceSellTax(tax));
              } else {
-                addTicketLine(oProduct, dUnits, dPriceSell);
+                addTicketLine(oProduct
                        , dUnits
                        , dPriceSell);
              }
            }
          } catch (BasicException eData) {
@@ -1253,15 +1270,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
          }
 // UPC-A
-          /*
+/* Note: if begins 02 then its a standard
-           * Note: if begins 02 then its a standard
+// UPC-A max value limitation is 4 digit price
-           * // UPC-A max value limitation is 4 digit price
+// UPC-A Extended uses State digit to give 5 digit price
-           * // UPC-A Extended uses State digit to give 5 digit price
+// uniCenta oPOS does not support UPC-A Extended at this time
-           * // uniCenta oPOS does not support UPC-A Extended at this time
+// Identifier   Prod    State   Cost    CheckCode
-           * // Identifier Prod State Cost CheckCode
+// I            PPPPP   S       CCCC    K
-           * // I PPPPP S CCCC K
+// 1            23456   7       8901    2
-           * // 1 23456 7 8901 2
+
           * 
 *    0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
 *    1 = Reserved
 *    2 = Random-weight items (fruits, vegetables, meats, etc.)
@@ -1279,7 +1295,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                && (sCode.length() == 12)) {
          try {
-            ProductInfoExt oProduct = dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
+            ProductInfoExt oProduct
                    = dlSales.getProductInfoByUShortCode(sCode);            // Return only UPC product
            if (oProduct == null) {
              Toolkit.getDefaultToolkit().beep();
@@ -1296,7 +1313,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
              String sVariableNum = sCode.substring(7, 11);           // grab the value from the code only using 4 digit price
              TaxInfo tax = taxeslogic                                // get the TaxRate for the product
-                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
+                      .getTaxInfo(oProduct.getTaxCategoryID()
                              , m_oTicket.getCustomer());
              if (oProduct.getPriceSell() != 0.0) {                       // we have a weight barcode
                weight = Double.parseDouble(sVariableNum) / 100;        // 2 decimals (e.g. 10.49 kg)
@@ -1318,9 +1336,13 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
              }
              if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct, dUnits, dPriceSell);
+                addTicketLine(oProduct
                        , dUnits
                        , dPriceSell);
              } else {
-                addTicketLine(oProduct, dUnits, dPriceSell / (1.0 + tax.getRate()));
+                addTicketLine(oProduct
                        , dUnits
                        , dPriceSell / (1.0 + tax.getRate()));
              }
            }
          } catch (BasicException eData) {
@@ -1373,6 +1395,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
          m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
        }
      } else if (cTrans == '.'
              && m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
        m_jPrice.setText("0.");
@@ -1762,6 +1785,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    }
  }
  private Window getActiveWindow() {
    for (Window window: getWindows()) {
      if (window instanceof JRootFrame) {
@@ -1825,24 +1849,17 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                m_config.setLastTicket(lastTicketNumber, lastTicketType);
              } catch (BasicException eData) {
-                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"),
+                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData);
                    eData);
                msg.show(this);
              } catch (IOException ex) {
                log.error(ex.getMessage());
              }
-              // Digital Receipt
+
-              if (m_config.getProperty("till.digital-receipt") != null
+              if (m_config.getProperty("till.digital-receipt") != null && m_config.getProperty("till.digital-receipt").equals("true")){
                  && m_config.getProperty("till.digital-receipt").equals("true")) {
                log.debug("Send digital receipt");
                String xml = dlSystem.getResourceAsXML("Printer.Ticket");
                new Application().sendReceipt(ticket, xml, getActiveWindow());
              }
              // EFR
              if (m_config.getProperty("till.efr") != null && m_config.getProperty("till.efr").equals("true")) {
                log.info("Send to efr");
                new Application().sendEFR(ticket);
              }
              executeEvent(ticket, ticketext, "ticket.close",
                      new ScriptArg("print", paymentdialog.isPrintSelected()));
@@ -1856,8 +1873,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
              if ("restaurant".equals(m_App.getProperties()
                      .getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
-                /*
+                /* Deliberately Explicit to allow for reassignments - future
                 * Deliberately Explicit to allow for reassignments - future
                 * even though we could do a single SQL statment sweep for reset
                 */
                restDB.clearCustomerNameInTable(ticketext.toString());
@@ -1916,6 +1932,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    return (tmpPickupId);
  }
  private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
    String sresource = dlSystem.getResourceAsXML(sresourcename);
@@ -2015,6 +2032,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
        }
      }
      Map reportparams = new HashMap();
      try {
@@ -2027,8 +2045,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
      reportfields.put("TICKET", ticket);
      reportfields.put("PLACE", ticketext);
-      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams,
+      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams, new JRMapArrayDataSource(new Object[]{reportfields}));
          new JRMapArrayDataSource(new Object[] { reportfields }));
      PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
@@ -2107,6 +2124,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    }
  }
  private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
    String resource = m_jbtnconfig.getEvent(eventkey);
@@ -2245,6 +2263,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
              "<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
              "<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
      JFrame frame = new JFrame();
      JOptionPane.showMessageDialog(frame,
              content,
@@ -2348,14 +2367,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    }
  }
  /**
   * This method is called from within the constructor to
   * initialize the form.
   * WARNING: Do NOT modify this code. The content of this method is
   * always regenerated by the FormEditor.
   */
-  // <editor-fold defaultstate="collapsed" desc="Generated
+  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
  // Code">//GEN-BEGIN:initComponents
  private void initComponents() {
    m_jPanContainer = new javax.swing.JPanel();
@@ -2382,8 +2401,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    jCheckStock = new javax.swing.JButton();
    m_jPanelCentral = new javax.swing.JPanel();
    jPanel4 = new javax.swing.JPanel();
-    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0),
+    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 32767));
        new java.awt.Dimension(5, 32767));
    m_jTicketId = new javax.swing.JLabel();
    m_jPanTotals = new javax.swing.JPanel();
    m_jLblTotalEuros3 = new javax.swing.JLabel();
@@ -2528,32 +2546,26 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
            m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(m_jButtonsLayout.createSequentialGroup()
                            .addContainerGap()
-                .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            .addComponent(jBtnCustomer, 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.RELATED)
-                .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                    javax.swing.GroupLayout.PREFERRED_SIZE)
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            .addComponent(j_btnRemotePrt, 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.RELATED)
-                .addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            .addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+    );
    m_jButtonsLayout.setVerticalGroup(
            m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(m_jButtonsLayout.createSequentialGroup()
                            .addGap(5, 5, 5)
                            .addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING,
+                                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING,
+                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+    );
                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
    m_jPanelBag.add(m_jButtons);
@@ -2796,9 +2808,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
    m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
    m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(
+    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
        javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)),
        javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
    m_jPrice.setOpaque(true);
    m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
    m_jPrice.setRequestFocusEnabled(false);
@@ -2848,46 +2858,36 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                    .addGroup(jPanel9Layout.createSequentialGroup()
                            .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                    .addComponent(m_jPor)
-                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                            .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                    .addGroup(jPanel9Layout.createSequentialGroup()
-                        .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                            .addGap(7, 7, 7)
-                        .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128,
+                                            .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
                                    .addGroup(jPanel9Layout.createSequentialGroup()
-                        .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                            .addGap(5, 5, 5)))
-                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71,
+                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addContainerGap())
-                .addContainerGap()));
+    );
    jPanel9Layout.setVerticalGroup(
            jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(jPanel9Layout.createSequentialGroup()
-                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                    javax.swing.GroupLayout.PREFERRED_SIZE)
                            .addGap(0, 0, Short.MAX_VALUE))
                    .addGroup(jPanel9Layout.createSequentialGroup()
-                .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44,
+                            .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)
                    javax.swing.GroupLayout.PREFERRED_SIZE)
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                            .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING,
+                                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
                        javax.swing.GroupLayout.PREFERRED_SIZE)))
                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
                            .addComponent(m_jPor)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
+                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1,
+    );
                    javax.swing.GroupLayout.PREFERRED_SIZE)));
    m_jPanEntries.add(jPanel9);
@@ -3298,7 +3298,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
      CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
      if (dialog.getSelectedCustomer() != null) {
        try {
-          m_oTicket.setCustomer(dlSales.loadCustomerExt(dialog.getSelectedCustomer().getId()));
+          m_oTicket.setCustomer(dlSales.loadCustomerExt
                  (dialog.getSelectedCustomer().getId()));
        } catch (BasicException ex) {
          log.error(ex.getMessage());
        }
@@ -3316,10 +3317,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
        if (finder.getSelectedCustomer() != null) {
          try {
-            m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
+            m_oTicket.setCustomer(dlSales.loadCustomerExt
                    (finder.getSelectedCustomer().getId()));
            if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-              restDB.setCustomerNameInTableByTicketId(
+              restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
-                  dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+                      (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
            }
            checkCustomer();
@@ -3350,10 +3352,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
          if (finder.getSelectedCustomer() != null) {
            try {
-              m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
+              m_oTicket.setCustomer(dlSales.loadCustomerExt
                      (finder.getSelectedCustomer().getId()));
              if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-                restDB.setCustomerNameInTableByTicketId(
+                restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
-                    dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+                        (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
              }
              checkCustomer();
@@ -3429,10 +3432,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
  private javax.swing.JButton m_jbtnScale;
  // End of variables declaration//GEN-END:variables
-  /*
+/* Remote Orders Display
-   * Remote Orders Display
+    We only know about uniCenta oPOS orders and won't try and handle any
-   * We only know about uniCenta oPOS orders and won't try and handle any
+    that are injected from an external source
   * that are injected from an external source
 */
  public void remoteOrderDisplay() {
@@ -3490,23 +3492,29 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
          }
        }
-        dlSystem.addOrder(getPickupString(m_oTicket), (int) m_oTicket.getLine(i).getMultiply(),
+        dlSystem.addOrder(getPickupString(m_oTicket)
-            m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductAttSetInstDesc(),
+                , (int) m_oTicket.getLine(i).getMultiply()
-            m_oTicket.getLine(i).getProperty("notes"), id, null, display, null, null);
+                , m_oTicket.getLine(i).getProductName()
                , m_oTicket.getLine(i).getProductAttSetInstDesc()
                , m_oTicket.getLine(i).getProperty("notes")
                , id
                , null
                , display
                , null
                , null);
-        /*
+/* this block for future - right now we're deleting all ticketlines
-         * this block for future - right now we're deleting all ticketlines
+    and resending for consistency with actual ticketlines
-         * and resending for consistency with actual ticketlines
+                dlSystem.updateOrder(getPickupString(m_oTicket)
-         * dlSystem.updateOrder(getPickupString(m_oTicket)
+                        , (int) m_oTicket.getLine(i).getMultiply()
-         * , (int) m_oTicket.getLine(i).getMultiply()
+                        , m_oTicket.getLine(i).getProductName()
-         * , m_oTicket.getLine(i).getProductName()
+                        , m_oTicket.getLine(i).getProductAttSetInstDesc()
-         * , m_oTicket.getLine(i).getProductAttSetInstDesc()
+                        , m_oTicket.getLine(i).getProperty("notes")
-         * , m_oTicket.getLine(i).getProperty("notes")
+                        , id
-         * , id
+                        , null
-         * , null
+                        , display
-         * , display
+                        , null
-         * , null
+                        , null);
         * , null);
 */
      } catch (BasicException ex) {
@@ -112,7 +112,6 @@ public final class TicketInfo implements SerializableRead, Externalizable {
        m_isProcessed = false;
        m_locked = null;
        ticketstatus = 0;        
    m_sHost = String.valueOf(config.getProperty("machine.hostname"));
    }
    @Override
@@ -213,7 +212,6 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    public int getTicketType() {
        return tickettype;
    }
    public void setTicketType(int tickettype) {
        this.tickettype = tickettype;
    }
@@ -221,7 +219,6 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    public int getTicketId() {
        return m_iTicketId;
    }
    public void setTicketId(int iTicketId) {
        m_iTicketId = iTicketId;
    }
@@ -229,7 +226,6 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    public int getTicketStatus() {
        return ticketstatus;
    }
    public void setTicketStatus(int ticketstatus) {
        if (m_iTicketId >0) {
            this.ticketstatus = m_iTicketId;
@@ -407,7 +403,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    public double getSubTotal() {
        double sum = 0.0;
-    sum = m_aLines.stream().map((line) -> line.getSubValue()).reduce(sum, (accumulator, _item) -> accumulator + _item);
+        sum = m_aLines.stream().map((line) -> 
                line.getSubValue()).reduce(sum, (accumulator, _item) -> 
                        accumulator + _item);
        return sum;
    }
@@ -420,7 +418,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
                nsum = sum;
            }
        } else {
-      sum = m_aLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
+            sum = m_aLines.stream().map((line) -> 
                    line.getTax()).reduce(sum, (accumulator, _item) -> 
                            accumulator + _item);
            }
        return sum;
    }
@@ -437,8 +437,10 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    public double getTotalPaid() {
        double sum = 0.0;
-    sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
+        sum = payments.stream().filter((p) -> 
-        (accumulator, _item) -> accumulator + _item);
+                (!"debtpaid".equals(p.getName()))).map((p) -> 
                        p.getTotal()).reduce(sum, (accumulator, _item) -> 
                                accumulator + _item);
        return sum;
          }
@@ -569,6 +571,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
        return m_sHost;
       }
 // Added JDL 28.05.13 for loyalty card functions
    /**
@@ -639,7 +642,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    }
    public String getTicketHeaderFooterData(String data) {
-    AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
+        AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
                , AppLocal.APP_ID + ".properties"));        
        m_config.load();
        String row =(m_config.getProperty("tkt."+data));
@@ -29,25 +29,15 @@ public class UserInfo implements Serializable {
    private static final long serialVersionUID = 7537578737839L;
    private String m_sId;
    private String m_sName;
  private String taxId;
-  /**
+    /** Creates a new instance of UserInfoBasic
   * Creates a new instance of UserInfoBasic
   * 
     * @param id
-   * @param name
+     * @param name */
   */
    public UserInfo(String id, String name) {
        m_sId = id;
        m_sName = name;
    }
  public UserInfo(String id, String name, String taxId) {
    m_sId = id;
    m_sName = name;
    this.taxId = taxId;
  }
    /**
     *
     * @return
@@ -63,8 +53,4 @@ public class UserInfo implements Serializable {
    public String getName() {
        return m_sName;
    }
  public String getTaxID() {
    return taxId;
  }
 }
@@ -19,6 +19,7 @@
 package com.unicenta.pos.transfer;
 import com.unicenta.basic.BasicException;
 import com.unicenta.data.gui.JMessageDialog;
 import com.unicenta.data.gui.MessageInf;
@@ -224,6 +225,7 @@ public final class Transfer extends JPanel implements JPanelView {
  }
  /**
   * @return
   */
@@ -1063,18 +1065,19 @@ public final class Transfer extends JPanel implements JPanelView {
          while (rs.next()) {
            SQL = "INSERT INTO people("
-                + "ID, NAME, APPPASSWORD, TAXID, CARD, ROLE, VISIBLE, IMAGE)"
+                    + "ID, NAME, APPPASSWORD, CARD, "
-                + "VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+                    + "ROLE, VISIBLE, IMAGE) "
                    + "VALUES (?, ?, ?, ?, "
                    + "?, ?, ?)";
            pstmt = con_target.prepareStatement(SQL);
            pstmt.setString(1, rs.getString("ID"));
            pstmt.setString(2, rs.getString("NAME"));
            pstmt.setString(3, rs.getString("APPPASSWORD"));
-            pstmt.setString(4, rs.getString("TAXID"));
+            pstmt.setString(4, rs.getString("CARD"));
-            pstmt.setString(5, rs.getString("CARD"));
+            pstmt.setString(5, rs.getString("ROLE"));
-            pstmt.setString(6, rs.getString("ROLE"));
+            pstmt.setBoolean(6, rs.getBoolean("VISIBLE"));
-            pstmt.setBoolean(7, rs.getBoolean("VISIBLE"));
+            pstmt.setBytes(7, rs.getBytes("IMAGE"));
            pstmt.setBytes(8, rs.getBytes("IMAGE"));
            pstmt.executeUpdate();
          }
@@ -1101,8 +1104,7 @@ public final class Transfer extends JPanel implements JPanelView {
          } else {
            txtOut.append("Pickup Number... skipped" + "\n");
          }
-          // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10
+// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence
          // sequence
          if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) {
            Dbtname = "pickup_number";
            rs = con_source.getMetaData().getTables(null, null, Dbtname, null);
@@ -1925,8 +1927,7 @@ public final class Transfer extends JPanel implements JPanelView {
          } else {
            txtOut.append("Ticket Payment... skipped" + "\n");
          }
-          // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10
+// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence                 
          // sequence
          if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) {
            Dbtname = "ticketsnum_payment";
            rs = con_source.getMetaData().getTables(null, null, Dbtname, null);
@@ -1967,8 +1968,7 @@ public final class Transfer extends JPanel implements JPanelView {
          } else {
            txtOut.append("Ticket Refund... skipped" + "\n");
          }
-          // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10
+// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence
          // sequence
          if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) {
            Dbtname = "ticketsnum_payment";
            rs = con_source.getMetaData().getTables(null, null, Dbtname, null);
@@ -2052,8 +2052,10 @@ public final class Transfer extends JPanel implements JPanelView {
          }
 // Add ForeignKeys                   
-          JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.transfercomplete"),
+          JOptionPane.showMessageDialog(this
-              AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE);
+                  , AppLocal.getIntString("message.transfercomplete")
                  , AppLocal.getIntString("message.transfermessage")
                  , JOptionPane.WARNING_MESSAGE);
          FKeys();
          txtOut.append("Data Transfer Complete" + "\n");
@@ -2062,8 +2064,10 @@ public final class Transfer extends JPanel implements JPanelView {
          webPBar.setBgBottom(Color.GREEN);
          jbtnTransfer.setEnabled(true);
-          JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.indexcomplete"),
+          JOptionPane.showMessageDialog(this
-              AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE);
+                  , AppLocal.getIntString("message.indexcomplete")
                  , AppLocal.getIntString("message.transfermessage")
                  , JOptionPane.WARNING_MESSAGE);
        } catch (SQLException | HeadlessException e) {
          session_source.close();
@@ -2072,8 +2076,10 @@ public final class Transfer extends JPanel implements JPanelView {
        }
      } else {
        JFrame frame = new JFrame();
-        JOptionPane.showMessageDialog(frame, AppLocal.getIntString("message.transfernotsupported"),
+        JOptionPane.showMessageDialog(frame
-            AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE);
+                , AppLocal.getIntString("message.transfernotsupported")
                , AppLocal.getIntString("message.transfermessage")
                , JOptionPane.WARNING_MESSAGE);
      }
      SQL = "COMMIT;\n" +
@@ -2087,8 +2093,7 @@ public final class Transfer extends JPanel implements JPanelView {
  }
  public void fillSchema() {
-    /*
+    /* Use existing session credentials but declare new session and connection
     * Use existing session credentials but declare new session and connection
     * to keep separated from current session instance as database could
     * be a different server
     */
@@ -2112,7 +2117,8 @@ public final class Transfer extends JPanel implements JPanelView {
      });
      DriverManager.registerDriver(
-          new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance()));
+              new DriverWrapper((Driver)
                      Class.forName(driver, true, cloader).newInstance()));
      Session session1 = new Session(url, user, password);
@@ -2163,8 +2169,7 @@ public final class Transfer extends JPanel implements JPanelView {
   * WARNING: Do NOT modify this code. The content of this method is always
   * regenerated by the Form Editor.
   */
-  // <editor-fold defaultstate="collapsed" desc="Generated
+  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
  // Code">//GEN-BEGIN:initComponents
  private void initComponents() {
    jLabel5 = new javax.swing.JLabel();
@@ -2503,105 +2508,70 @@ public final class Transfer extends JPanel implements JPanelView {
                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                    .addGroup(jTransferPanelLayout.createSequentialGroup()
                                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                                    .addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                    .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE,
                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                            .addGap(7, 7, 7)
-                        .addGroup(
+                                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
                            jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
                                                    .addGroup(jTransferPanelLayout.createSequentialGroup()
-                                    .addComponent(jlblVersion, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                            .addComponent(jlblVersion, 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.RELATED)
-                                    .addComponent(jLabel11, javax.swing.GroupLayout.PREFERRED_SIZE, 100,
+                                                            .addComponent(jLabel11, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        javax.swing.GroupLayout.PREFERRED_SIZE)
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                    .addComponent(jlblDBSize, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                            .addComponent(jlblDBSize, 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(jTransferPanelLayout.createSequentialGroup()
-                                    .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                            .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
+                                                            .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                    .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addGroup(jTransferPanelLayout.createSequentialGroup()
-                        .addGroup(
+                                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                            jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                                    .addGroup(jTransferPanelLayout.createSequentialGroup()
-                                    .addComponent(jLabel13, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                                            .addComponent(jLabel13, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                    .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                            .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                                    .addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                                .addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE,
                                    javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(
+                                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                            jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                                                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
                                .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125,
                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                                    .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)))
                                    .addGroup(jTransferPanelLayout.createSequentialGroup()
-                        .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                            .addContainerGap())
-                .addContainerGap()));
+    );
    jTransferPanelLayout.setVerticalGroup(
            jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(jTransferPanelLayout.createSequentialGroup()
                            .addContainerGap()
                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel15, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    .addComponent(jLabel15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    .addComponent(jLabel13, 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(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jlblVersion, javax.swing.GroupLayout.Alignment.TRAILING,
+                                    .addComponent(jlblVersion, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                    .addComponent(jLabel11, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel11, javax.swing.GroupLayout.Alignment.TRAILING,
+                                    .addComponent(jlblDBSize, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
                        javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.TRAILING,
                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
                        javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addComponent(jlblDBSize, javax.swing.GroupLayout.Alignment.TRAILING,
                        javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
                        javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                            .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                    .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                        .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            .addComponent(jbtnTransfer, 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(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            .addContainerGap())
-                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+    );
                    .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addContainerGap()));
    jbtnReset.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
    jbtnReset.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/reload.png"))); // NOI18N
@@ -2632,170 +2602,115 @@ public final class Transfer extends JPanel implements JPanelView {
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                                    .addGroup(layout.createSequentialGroup()
-                                .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                            .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                            .addComponent(cbSource, 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()
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                                                    .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                                    .addComponent(jLabel12, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jLabel12, javax.swing.GroupLayout.DEFAULT_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.DEFAULT_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                                                    .addGroup(layout.createSequentialGroup()
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jLabel18, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                                                    .addComponent(jLabel18, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                                                    .addGroup(layout.createSequentialGroup()
-                                        .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                            .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                            javax.swing.GroupLayout.DEFAULT_SIZE,
                                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                        .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                            .addComponent(jbtnDbDriverLib, 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()
                                                                            .addGap(366, 366, 366)
-                                        .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                            .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
                                            javax.swing.GroupLayout.DEFAULT_SIZE,
                                            javax.swing.GroupLayout.PREFERRED_SIZE))))
                                                    .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)
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                                    .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .addComponent(jbtnConnect, 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(txtDbUser, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                                                            .addComponent(txtDbUser, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                            javax.swing.GroupLayout.DEFAULT_SIZE,
                                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                        .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.RELATED)
-                                .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                            .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                                    .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                            .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE,
                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 202,
+                                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 202, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, 316,
+                                            .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, 316, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, 278, javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, 278,
                        javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 125,
+                                            .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 109,
+                                            .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.PREFERRED_SIZE)
                                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                                    .addGroup(layout.createSequentialGroup()
                                            .addGap(18, 18, 18)
-                        .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                            .addContainerGap())))
-                        .addContainerGap()))));
+    );
    layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                            .addContainerGap()
                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 32,
+                                            .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            javax.swing.GroupLayout.PREFERRED_SIZE)
+                                            .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                        .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.TRAILING,
                            javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
                            javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            .addComponent(jLabel16, 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.RELATED)
                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                                    .addGroup(layout.createSequentialGroup()
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                                                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                                        .addComponent(jLabel18, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                            .addComponent(jLabel18, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            javax.swing.GroupLayout.DEFAULT_SIZE,
+                                                                            .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                                            javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                                    .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                        .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
                                            javax.swing.GroupLayout.DEFAULT_SIZE,
                                            javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .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(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .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)
+                                                                    .addComponent(txtDbUser, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(txtDbUser, 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)
+                                                                    .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                    .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE,
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                                    .addComponent(jbtnConnect, 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(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                                    .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                                    .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                            .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE,
                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                            .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                            .addGap(0, 0, Short.MAX_VALUE))
-                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE,
+                                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                            .addContainerGap())
-                .addContainerGap()));
+    );
    jLabel1.getAccessibleContext().setAccessibleName("DBDriver");
  }// </editor-fold>//GEN-END:initComponents
@@ -2857,13 +2772,13 @@ public final class Transfer extends JPanel implements JPanelView {
        });
        DriverManager.registerDriver(
-            new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance()));
+                new DriverWrapper((Driver)
                        Class.forName(driver, true, cloader).newInstance()));
        Session session_source = new Session(url, user, password);
        Connection connection = session_source.getConnection();
        boolean isValid = (connection == null)
-            ? false
+                ? false : connection.isValid(1000);
            : connection.isValid(1000);
        if (isValid) {
          if (!"Derby".equals(cbSource.getSelectedItem())) {
@@ -2882,7 +2797,8 @@ public final class Transfer extends JPanel implements JPanelView {
          JOptionPane.showMessageDialog(this,
                  AppLocal.getIntString("message.databaseconnectsuccess"),
-              "Connection Test", JOptionPane.INFORMATION_MESSAGE);
+                  "Connection Test"
                  , JOptionPane.INFORMATION_MESSAGE);
        } else {
          reset();
@@ -2907,8 +2823,10 @@ public final class Transfer extends JPanel implements JPanelView {
                new MessageInf(MessageInf.SGN_WARNING, "Unknown exception", e));
      }
    } else {
-      JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.transfercheck"),
+      JOptionPane.showMessageDialog(this
-          AppLocal.getIntString("message.transfertitle"), JOptionPane.WARNING_MESSAGE);
+              , AppLocal.getIntString("message.transfercheck")
              , AppLocal.getIntString("message.transfertitle")
              , JOptionPane.WARNING_MESSAGE);
      jtxtDbName.setText("");
    }
@@ -2923,19 +2841,23 @@ public final class Transfer extends JPanel implements JPanelView {
    dirname = dirname == null ? "./" : dirname;
    if ("Derby".equals(cbSource.getSelectedItem())) {
-      jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/derby-10.10.2.0.jar").getAbsolutePath());
+      jtxtDbDriverLib.setText(new File(new File(dirname)
              , "/lib/derby-10.10.2.0.jar").getAbsolutePath());
      jtxtDbDriver.setText("org.apache.derby.jdbc.EmbeddedDriver");
      jtxtDbType.setText("jdbc:derby:");
-      jtxtDbServerPort.setText("" + new File(new File(System.getProperty("user.home")), ""));
+      jtxtDbServerPort.setText("" + new File(new File(System.getProperty("user.home"))
              , ""));
      jtxtDbParams.setText("");
    } else if ("PostgreSQL".equals(cbSource.getSelectedItem())) {
-      jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/postgresql-9.4-1208.jdbc4.jar").getAbsolutePath());
+      jtxtDbDriverLib.setText(new File(new File(dirname)
              , "/lib/postgresql-9.4-1208.jdbc4.jar").getAbsolutePath());
      jtxtDbDriver.setText("org.postgresql.Driver");
      jtxtDbType.setText("jdbc:postgresql://");
      jtxtDbServerPort.setText("localhost:5432/");
      jtxtDbParams.setText("");
    } else {
-      jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/mysql-connector-java-5.1.39.jar").getAbsolutePath());
+      jtxtDbDriverLib.setText(new File(new File(dirname)
              , "/lib/mysql-connector-java-5.1.39.jar").getAbsolutePath());
      jtxtDbDriver.setText("com.mysql.jdbc.Driver");
      jtxtDbType.setText("jdbc:mysql://");
      jtxtDbServerPort.setText("localhost:3306/");
@@ -2980,7 +2902,8 @@ public final class Transfer extends JPanel implements JPanelView {
      });
      DriverManager.registerDriver(
-          new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance()));
+              new DriverWrapper((Driver)
                      Class.forName(driver, true, cloader).newInstance()));
      Session session_source1 = new Session(url, user, password);
      Connection connection = session_source1.getConnection();
@@ -24,7 +24,6 @@ import com.unicenta.data.loader.DataRead;
 import com.unicenta.data.loader.IKeyed;
 import com.unicenta.data.loader.SerializerRead;
 public class VoucherInfo implements IKeyed {
  private String id;
  private String voucherNumber;
@@ -40,8 +39,7 @@ public class VoucherInfo implements IKeyed {
      String voucherNumber,
      String customerName,
      double amount,
-        String status) 
+      String status) {
    {
    this.id = id;
    this.voucherNumber = voucherNumber;
    this.customerName = customerName;
@@ -49,7 +47,6 @@ public class VoucherInfo implements IKeyed {
    this.status = status;
  }
  @Override
  public Object getKey() {
    return getId();
@@ -111,7 +108,6 @@ public class VoucherInfo implements IKeyed {
    this.amount = amount;
  }
  @Override
  public String toString() {
    return voucherNumber;
@@ -132,8 +128,7 @@ public class VoucherInfo implements IKeyed {
  }
  public static SerializerRead getSerializerRead() {
-        return new SerializerRead() 
+    return new SerializerRead() {
        {
      @Override
      public Object readValues(DataRead dr) throws BasicException {
        return new VoucherInfo(
@@ -142,6 +137,7 @@ public class VoucherInfo implements IKeyed {
            dr.getString(3),
            dr.getDouble(4),
            dr.getString(5));
-        }};
+      }
    };
  }
 }
@@ -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,
@@ -1,3 +1 @@
 ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
 --ALTER TABLE people ADD COLUMN taxId VARCHAR(100);
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
@@ -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,
@@ -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;
@@ -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,
@@ -1,3 +1,62 @@
-ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
+-- CLEAR THE DECKS
-UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
+DELETE FROM sharedtickets;
 -- Switch OFF table foreign key relationships
 set foreign_key_checks = 0;
 -- RECREATE applications table
 DROP TABLE `applications`;
 CREATE TABLE IF NOT EXISTS `applications` (
 	`id` varchar(255) NOT NULL,
 	`name` varchar(255) NOT NULL,
 	`version` varchar(255) NOT NULL,
 	`instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	PRIMARY KEY  ( `id` )
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact;
 -- SYSTEM
 DELETE FROM resources WHERE name = 'script.posapps';
 DELETE FROM resources WHERE id = '0';
 DELETE FROM resources WHERE id = '00';
 INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt});
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons';
 COMMIT;
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket';
 COMMIT;
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close';
 COMMIT;
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close';
 COMMIT;
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created';
 COMMIT;
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted';
 COMMIT;
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated';
 COMMIT;
 -- ROLES
 DELETE FROM roles WHERE id = '0';
 INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} );
 DELETE FROM roles WHERE id = '1';
 INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} );
 DELETE FROM roles WHERE id = '2';
 INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} );
 -- Switch ON table foreign key relationships
 set foreign_key_checks = 1;
 INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1');
 COMMIT;
@@ -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
@@ -662,4 +662,3 @@ transpayment.slip=Slip
 transpayment.voucherin=Note Input
 transpayment.voucherout=Note Output
 Visor.Title=uniCenta oPOS
 label.peopletaxid=Tax ID
@@ -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
@@ -1008,4 +1008,3 @@ transpayment.ccardrefund=Kort tilbagef\u00f8rsel
 transpayment.ticket=Salgskvittering
 transpayment.voucher=Gavekort
 Visor.Title=uniCenta oPOS
 label.peopletaxid=Tax ID
@@ -902,4 +902,3 @@ transpayment.voucher=Gutschein
 transpayment.voucherin=Gutschein Eingabe
 transpayment.voucherout=Gutschein Ausgabe
 Visor.Title=uniCenta oPOS
 label.peopletaxid=Tax ID
@@ -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
@@ -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
@@ -1188,4 +1188,3 @@ message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h
 label.find=Buscar
 label.create=Crear
 label.cancel=Cancelar
 label.peopletaxid=ID de impuesto
@@ -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
@@ -469,5 +469,3 @@ transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
 message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.3 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
 label.peopletaxid=Identificador de taxi
@@ -502,4 +502,3 @@ transpayment.ccardrefund=Kaardimakse tagastus
 transpayment.voucherin=Kupongimakse
 transpayment.voucherout=Kupong v\u00e4lja
 Visor.Title=uniCenta oPOS
 label.peopletaxid=Tax ID
@@ -1083,4 +1083,3 @@ label.add=Ajouter
 label.cancel=Annuler
 label.create=Cr\u00e9er
 label.find=Trouver
 label.peopletaxid=Tax ID
@@ -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
@@ -753,4 +753,3 @@ transpayment.ticket=Fattura
 transpayment.voucherin=Nota Ingresso
 transpayment.voucherout=Nota Uscita
 Visor.Title=uniCenta oPOS
 label.peopletaxid=Tax ID
@@ -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
@@ -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
@@ -404,4 +404,3 @@ transpayment.ticket=Cupom
 transpayment.voucherin=Nota entrada
 transpayment.voucherout=Nota sa\u00edda
 Visor.Title=uniCenta POS
 label.peopletaxid=Tax ID
Author	SHA1	Message	Date
hugh	94d587705c	formating	2026-04-14 21:26:50 +01:00
hugh	aa6c87ab90	don't need to track these	2026-04-13 21:13:08 +01:00