removing github references.

adding gnu gpl3 license
5.5.0 release
2026-07-06 14:56:59 +01:00 · 2026-07-06 14:54:51 +01:00 · 2026-06-15 16:57:51 +01:00 · 2026-06-15 16:48:30 +01:00 · 2026-04-13 21:13:08 +01:00
48 changed files with 4613 additions and 4061 deletions
@@ -1,18 +0,0 @@
 name: Java CI with Maven
 on: [workflow_dispatch]
 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: Set up JDK 11
        uses: actions/setup-java@v3
        with:
          java-version: '11'
          distribution: 'adopt'
          cache: maven
      - name: Build with Maven
        run: mvn -B package --file pom.xml
@@ -7,8 +7,8 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
 .classpath
 .project
 .factorypath
-.settings
+.settings/
 .project
 AGENTS.md
@@ -1,729 +0,0 @@
 # Unicenta oPOS - C4 Architecture Diagram
 ## Overview
 Unicenta oPOS (v5.4.0) is an enterprise-level Point of Sale system built with Java. It provides comprehensive sales, inventory, customer, and reporting management capabilities with support for multiple operating systems (Windows, Linux, macOS).
 ---
 ## Level 1: System Context Diagram
 ```mermaid
 graph TB
    user["👤 POS Operators/Staff"]
    system["📱 Unicenta oPOS System<br/>Java Desktop Application<br/>v5.4.0"]
    devices["🖨️ Peripheral Devices<br/>Printer • Scale<br/>Barcode Scanner<br/>Card Reader"]
    db["💾 Database<br/>MySQL • Derby<br/>SQLite • PostgreSQL"]
    fs["📂 File System<br/>Reports • Templates<br/>Locales • Config"]
    user -->|interacts| system
    system -->|controls| devices
    system -->|reads/writes| db
    system -->|reads/writes| fs
    devices -.->|feedback| system
    style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
    style user fill:#50C878,stroke:#2D7A4A,color:#fff
    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style db fill:#FFB84D,stroke:#8B6914,color:#fff
    style fs fill:#9B59B6,stroke:#5B2C6F,color:#fff
 ```
 ---
 ## Level 2: Container Architecture
 ```mermaid
 graph TB
    subgraph app["🏗️ UNICENTA oPOS APPLICATION"]
        subgraph ui["PRESENTATION LAYER<br/>(Swing/JavaFX)"]
            ui1["StartPOS Entry Point"]
            ui2["Sales Screens<br/>Simple • Restaurant<br/>Shared Modes"]
            ui3["Admin Panels<br/>User Mgmt • Settings"]
            ui4["Forms & Dialogs<br/>Customers • Suppliers<br/>Inventory"]
            ui5["Reporting Dashboards<br/>JFreeChart"]
        end
        subgraph service["SERVICE LAYER<br/>(Business Logic)"]
            svc1["Sales Service"]
            svc2["Inventory Service"]
            svc3["Customer Service"]
            svc4["Payment Service"]
            svc5["Reporting Service"]
            svc6["Config/Admin Service"]
        end
        subgraph dao["DATA ACCESS LAYER<br/>(DAOs)"]
            dao1["ProductDAO"]
            dao2["TicketDAO"]
            dao3["CustomerDAO"]
            dao4["EmployeeDAO"]
            dao5["CompanyDAO"]
            dao6["SupplierDAO"]
        end
        subgraph peripheral["PERIPHERAL INTEGRATION<br/>(Drivers & APIs)"]
            per1["Printer Drivers<br/>ESC-POS • JavaPOS"]
            per2["Scale Reader<br/>Serial Comm"]
            per3["Barcode Scanner<br/>ZXing"]
            per4["Card Reader<br/>USB/Serial"]
        end
        subgraph utils["UTILITIES & SUPPORT"]
            util1["Logging<br/>Logback"]
            util2["Formatting<br/>Date • Currency"]
            util3["Localization<br/>i18n"]
            util4["Reporting<br/>JasperReports"]
            util5["Scripting<br/>BeanShell"]
            util6["Plugins"]
        end
    end
    subgraph external["📦 EXTERNAL SYSTEMS"]
        extdb["💾 Database<br/>MySQL/Derby/SQLite<br/>PostgreSQL"]
        extfs["📂 File System<br/>Configs • Templates<br/>Locales • Reports"]
        devices["🖨️ Physical Devices<br/>Printers • Scales<br/>Scanners • Card Readers"]
    end
    ui -->|calls| service
    service -->|uses| dao
    service -->|uses| peripheral
    service -->|uses| utils
    ui -->|uses| utils
    dao -->|reads/writes| extdb
    peripheral -->|controls| devices
    service -->|reads/writes| extfs
    ui -->|reads/writes| extfs
    style app fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
    style ui fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style service fill:#50C878,stroke:#2D7A4A,color:#fff
    style dao fill:#FF9F43,stroke:#B8690F,color:#fff
    style peripheral fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style utils fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style external fill:#F0F0F0,stroke:#666
    style extdb fill:#FFB84D,stroke:#8B6914,color:#fff
    style extfs fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
 ```
 ---
 ## Level 3: Component Architecture
 ### Sales Module
 ```mermaid
 graph LR
    subgraph sales["com.unicenta.pos.sales"]
        simple["simple/<br/>Simple POS Mode"]
        restaurant["restaurant/<br/>Table/Order Mode"]
        shared["shared/<br/>Shared Ticket Logic"]
    end
    simple -.-> shared
    restaurant -.-> shared
    style sales fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style simple fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style restaurant fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style shared fill:#6BB3E0,stroke:#2E5C8A,color:#fff
 ```
 ### Inventory & Catalog Modules
 ```mermaid
 graph TB
    subgraph inventory["com.unicenta.pos.inventory"]
        inv_prod["Product Management"]
        inv_stock["Stock Tracking"]
        inv_cat["Category Management"]
    end
    subgraph catalog["com.unicenta.pos.catalog"]
        cat_prod["Product Categorization"]
        cat_search["Product Search/Filter"]
        cat_display["Display Management"]
    end
    inv_prod ---|shared data| cat_prod
    inv_cat ---|manages| cat_display
    style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
    style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
    style inv_prod fill:#68D989,stroke:#2D7A4A,color:#fff
    style inv_stock fill:#68D989,stroke:#2D7A4A,color:#fff
    style inv_cat fill:#68D989,stroke:#2D7A4A,color:#fff
    style cat_prod fill:#68D989,stroke:#2D7A4A,color:#fff
    style cat_search fill:#68D989,stroke:#2D7A4A,color:#fff
    style cat_display fill:#68D989,stroke:#2D7A4A,color:#fff
 ```
 ### Ticket & Payment Processing
 ```mermaid
 graph TB
    subgraph ticket["com.unicenta.pos.ticket"]
        ticket_create["Ticket Creation"]
        ticket_items["Line Items Mgmt"]
        ticket_lifecycle["Lifecycle Management"]
    end
    subgraph payment["com.unicenta.pos.payment"]
        pay_method["Payment Methods"]
        pay_process["Payment Processing"]
        pay_card["Card Integration"]
    end
    ticket_create -->|on completion| pay_method
    ticket_items -->|on finalize| pay_process
    pay_process -->|if card| pay_card
    style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
    style payment fill:#FF9F43,stroke:#B8690F,color:#fff
    style ticket_create fill:#FDB44B,stroke:#B8690F,color:#fff
    style ticket_items fill:#FDB44B,stroke:#B8690F,color:#fff
    style ticket_lifecycle fill:#FDB44B,stroke:#B8690F,color:#fff
    style pay_method fill:#FDB44B,stroke:#B8690F,color:#fff
    style pay_process fill:#FDB44B,stroke:#B8690F,color:#fff
    style pay_card fill:#FDB44B,stroke:#B8690F,color:#fff
 ```
 ### Reporting & Administration
 ```mermaid
 graph TB
    subgraph reports["com.unicenta.pos.reports"]
        report_gen["Report Generation"]
        report_chart["Chart Generation<br/>JFreeChart"]
        report_export["PDF/Excel Export"]
    end
    subgraph admin["com.unicenta.pos.admin"]
        admin_user["User Management"]
        admin_config["System Configuration"]
        admin_security["Access Control"]
    end
    report_gen -->|uses| report_chart
    report_chart -->|renders to| report_export
    admin_user -->|applies| admin_security
    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style report_gen fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style report_chart fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style report_export fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style admin_user fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style admin_config fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style admin_security fill:#B76AC2,stroke:#5B2C6F,color:#fff
 ```
 ### Printer System
 ```mermaid
 graph LR
    subgraph printer["com.unicenta.pos.printer"]
        escpos["escpos/<br/>ESC-POS Driver"]
        javapos["javapos/<br/>JavaPOS Driver"]
        screen["screen/<br/>Screen Preview"]
    end
    reports["JasperReports<br/>JFreeChart"]
    reports -->|routes to| escpos
    reports -->|routes to| javapos
    reports -->|routes to| screen
    style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style escpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style javapos fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style screen fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
 ```
 ### Communication & Integration
 ```mermaid
 graph TB
    subgraph comm["com.unicenta.pos.comm"]
        serial["Serial Communication<br/>RXTX • jSerialComm"]
        usb["USB Communication<br/>USB4Java"]
    end
    scale["Scale Reader"]
    scanner["Barcode Scanner<br/>ZXing"]
    reader["Card Reader"]
    serial -->|reads| scale
    serial -->|reads| scanner
    usb -->|reads| reader
    style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style serial fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style usb fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style scale fill:#D9534F,stroke:#A53D3D,color:#fff
    style scanner fill:#D9534F,stroke:#A53D3D,color:#fff
    style reader fill:#D9534F,stroke:#A53D3D,color:#fff
 ```
 ---
 ## Level 4: Data Flow Diagrams
 ### Sales Transaction Flow
 ```mermaid
 sequenceDiagram
    actor User as POS Operator
    participant UI as Sales Screen
    participant Service as Sales Service
    participant DAO as TicketDAO
    participant DB as Database
    participant Payment as Payment Service
    participant Printer as Printer Service
    User->>UI: Create/Edit Ticket
    UI->>Service: Process Ticket
    Service->>DAO: Save Ticket
    DAO->>DB: INSERT/UPDATE
    DB-->>DAO: Confirm
    DAO-->>Service: Ticket ID
    User->>UI: Process Payment
    UI->>Service: Payment Request
    Service->>Payment: Process Payment
    Payment-->>Service: Payment Confirmed
    Service->>Printer: Print Receipt
    Printer-->>Service: Print Complete
    Service-->>UI: Transaction Complete
    UI-->>User: Display Confirmation
 ```
 ### Product Lookup Flow
 ```mermaid
 sequenceDiagram
    actor Device as Barcode Scanner
    participant UI as Sales Screen
    participant DAO as ProductDAO
    participant DB as Database
    Device->>UI: Scan Barcode
    UI->>DAO: Query Product
    DAO->>DB: SELECT Product
    DB-->>DAO: Product Data
    DAO-->>UI: Product Details
    UI-->>Device: Display Product Info
 ```
 ### Report Generation Flow
 ```mermaid
 sequenceDiagram
    actor User as Admin/Manager
    participant UI as Admin Panel
    participant Service as Reporting Service
    participant JasperReports as JasperReports Engine
    participant DB as Database
    participant FileSystem as File System
    User->>UI: Request Report
    UI->>Service: Generate Report
    Service->>DB: Query Data
    DB-->>Service: Report Data
    Service->>JasperReports: Render Report
    JasperReports->>FileSystem: Generate PDF/Excel
    FileSystem-->>JasperReports: File Path
    JasperReports-->>Service: Report Ready
    Service-->>UI: Display/Download
    UI-->>User: Provide Report
 ```
 ---
 ## Level 5: Package Structure
 ```mermaid
 graph TB
    com["com.unicenta"]
    com -->|core| basic["basic<br/>Exception Handling<br/>Logging"]
    com -->|ui| beans["beans<br/>Custom UI Components<br/>Dialogs • Date Pickers<br/>Number Pads"]
    com -->|ui| orderpop["orderpop<br/>Order Popup Module"]
    com -->|plugins| plugins["plugins<br/>Plugin Architecture<br/>Metrics System"]
    pos["com.unicenta.pos"]
    com -->|main| pos
    pos -->|sales| sales["sales<br/>Simple • Restaurant<br/>Shared Modes"]
    pos -->|inventory| inventory["inventory<br/>Products • Stock<br/>Categories"]
    pos -->|customers| customers["customers<br/>Customer Management<br/>Loyalty Programs"]
    pos -->|catalog| catalog["catalog<br/>Product Catalog<br/>Display Management"]
    pos -->|ticket| ticket["ticket<br/>Ticket Lifecycle<br/>Line Items"]
    pos -->|payment| payment["payment<br/>Payment Methods<br/>Card Integration<br/>Cash Handling"]
    pos -->|reports| reports["reports<br/>JasperReports<br/>JFreeChart<br/>PDF/Excel Export"]
    pos -->|admin| admin["admin<br/>User Management<br/>System Configuration<br/>Access Control"]
    pos -->|printer| printer["printer<br/>ESC-POS • JavaPOS<br/>Screen Preview"]
    pos -->|comm| comm["comm<br/>Serial • USB<br/>Scale • Scanner<br/>Card Reader"]
    pos -->|scripting| scripting["scripting<br/>BeanShell<br/>Custom Logic"]
    pos -->|forms| forms["forms<br/>Main UI<br/>Data Entry Forms"]
    pos -->|config| config["config<br/>Configuration Mgmt<br/>Settings"]
    pos -->|instance| instance["instance<br/>Instance Management<br/>Singleton Patterns"]
    pos -->|mant| mant["mant<br/>Maintenance<br/>Utilities"]
    style com fill:#E8F4F8,stroke:#2E5C8A
    style pos fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style basic fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style beans fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style orderpop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style plugins fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style sales fill:#50C878,stroke:#2D7A4A,color:#fff
    style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
    style customers fill:#50C878,stroke:#2D7A4A,color:#fff
    style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
    style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
    style payment fill:#FF9F43,stroke:#B8690F,color:#fff
    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style scripting fill:#FFB84D,stroke:#8B6914,color:#fff
    style forms fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style config fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style instance fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style mant fill:#4A90E2,stroke:#2E5C8A,color:#fff
 ```
 ---
 ## Level 6: Database Schema Overview
 ```mermaid
 graph TB
    subgraph core["CORE ENTITIES"]
        company["COMPANY<br/>company_id<br/>name<br/>code"]
        location["LOCATION<br/>location_id<br/>name<br/>address"]
        products["PRODUCTS<br/>product_id<br/>name<br/>code<br/>price"]
        categories["CATEGORIES<br/>category_id<br/>name<br/>description"]
    end
    subgraph transactions["TRANSACTION ENTITIES"]
        tickets["TICKETS<br/>ticket_id<br/>number<br/>date<br/>customer_id"]
        lines["TICKETLINES<br/>line_id<br/>ticket_id<br/>product_id<br/>qty"]
        payments["PAYMENTS<br/>payment_id<br/>ticket_id<br/>method<br/>amount"]
    end
    subgraph master["MASTER DATA"]
        customers["CUSTOMERS<br/>customer_id<br/>name<br/>email<br/>phone"]
        suppliers["SUPPLIERS<br/>supplier_id<br/>name<br/>contact<br/>products"]
        employees["EMPLOYEES<br/>employee_id<br/>name<br/>role<br/>access_level"]
        taxes["TAXCATEGORIES<br/>tax_id<br/>name<br/>rate"]
    end
    subgraph inventory["INVENTORY ENTITIES"]
        stock["STOCK<br/>stock_id<br/>product_id<br/>location_id<br/>quantity"]
        movements["STOCKMOVEMENTS<br/>movement_id<br/>product_id<br/>qty<br/>type"]
    end
    company -->|operates| location
    location -->|manages| products
    products -->|in| categories
    location -->|in| stock
    products -->|in| stock
    customers -->|creates| tickets
    employees -->|processes| tickets
    products -->|in| lines
    tickets -->|contains| lines
    tickets -->|has| payments
    tickets -->|has| taxes
    products -->|from| suppliers
    stock -->|tracks| movements
    style core fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style transactions fill:#FF9F43,stroke:#B8690F,color:#fff
    style master fill:#50C878,stroke:#2D7A4A,color:#fff
    style inventory fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style company fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style location fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style products fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style categories fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style tickets fill:#FDB44B,stroke:#B8690F,color:#fff
    style lines fill:#FDB44B,stroke:#B8690F,color:#fff
    style payments fill:#FDB44B,stroke:#B8690F,color:#fff
    style customers fill:#68D989,stroke:#2D7A4A,color:#fff
    style suppliers fill:#68D989,stroke:#2D7A4A,color:#fff
    style employees fill:#68D989,stroke:#2D7A4A,color:#fff
    style taxes fill:#68D989,stroke:#2D7A4A,color:#fff
    style stock fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style movements fill:#B76AC2,stroke:#5B2C6F,color:#fff
 ```
 ---
 ## Technology Stack
 ```mermaid
 graph TB
    subgraph frontend["FRONTEND"]
        swing["Swing<br/>Traditional UI"]
        javafx["JavaFX<br/>Modern UI"]
        flatlaf["FlatLAF<br/>Modern Look & Feel"]
    end
    subgraph backend["BACKEND"]
        java["Java 8+<br/>Core Logic"]
        lombok["Lombok<br/>Boilerplate Reduction"]
        beanshell["BeanShell<br/>Dynamic Scripting"]
    end
    subgraph data["DATA & PERSISTENCE"]
        jdbc["JDBC<br/>Database Abstraction"]
        mysql["MySQL<br/>Primary Database"]
        derby["Derby<br/>Embedded DB"]
        sqlite["SQLite<br/>Lightweight DB"]
        postgres["PostgreSQL<br/>Enterprise DB"]
    end
    subgraph reporting["REPORTING & ANALYTICS"]
        jasper["JasperReports<br/>Report Generation"]
        jfreechart["JFreeChart<br/>Charts & Graphs"]
        poi["Apache POI<br/>Excel Export"]
        itext["iText<br/>PDF Generation"]
    end
    subgraph devices["DEVICE INTEGRATION"]
        rxtx["RXTX/jSerialComm<br/>Serial Communication"]
        usb4j["USB4Java<br/>USB Communication"]
        zxing["ZXing<br/>Barcode Processing"]
        jpos["JavaPOS<br/>POS Device Standard"]
    end
    subgraph support["SUPPORT LIBRARIES"]
        logback["Logback<br/>Logging"]
        gson["GSON<br/>JSON Processing"]
        xstream["XStream<br/>XML Serialization"]
        velocity["Apache Velocity<br/>Template Engine"]
    end
    style frontend fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style backend fill:#50C878,stroke:#2D7A4A,color:#fff
    style data fill:#FF9F43,stroke:#B8690F,color:#fff
    style reporting fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style support fill:#FFB84D,stroke:#8B6914,color:#fff
    style swing fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style javafx fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style flatlaf fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style java fill:#68D989,stroke:#2D7A4A,color:#fff
    style lombok fill:#68D989,stroke:#2D7A4A,color:#fff
    style beanshell fill:#68D989,stroke:#2D7A4A,color:#fff
    style jdbc fill:#FDB44B,stroke:#B8690F,color:#fff
    style mysql fill:#FDB44B,stroke:#B8690F,color:#fff
    style derby fill:#FDB44B,stroke:#B8690F,color:#fff
    style sqlite fill:#FDB44B,stroke:#B8690F,color:#fff
    style postgres fill:#FDB44B,stroke:#B8690F,color:#fff
    style jasper fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style jfreechart fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style poi fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style itext fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style rxtx fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style usb4j fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style zxing fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style jpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
    style logback fill:#F5B041,stroke:#8B6914,color:#fff
    style gson fill:#F5B041,stroke:#8B6914,color:#fff
    style xstream fill:#F5B041,stroke:#8B6914,color:#fff
    style velocity fill:#F5B041,stroke:#8B6914,color:#fff
 ```
 ---
 ## Key Architectural Patterns
 ```mermaid
 graph TB
    subgraph patterns["DESIGN PATTERNS"]
        dao_pat["📋 DAO Pattern<br/>Data Abstraction"]
        service_pat["🔧 Service Pattern<br/>Business Logic"]
        singleton_pat["🎯 Singleton Pattern<br/>Resource Management"]
        factory_pat["🏭 Factory Pattern<br/>Object Creation"]
        plugin_pat["🔌 Plugin Pattern<br/>Extensibility"]
    end
    subgraph layers["ARCHITECTURAL LAYERS"]
        presentation["📱 Presentation<br/>UI Components"]
        business["💼 Business Logic<br/>Services"]
        data["💾 Data Access<br/>DAOs & Queries"]
        external["🔌 External Integration<br/>Devices & Files"]
    end
    subgraph principles["DESIGN PRINCIPLES"]
        sep_concern["Separation of Concerns<br/>Distinct responsibilities"]
        loose_coupling["Loose Coupling<br/>Independent modules"]
        high_cohesion["High Cohesion<br/>Related functionality"]
        abstraction["Abstraction<br/>Hide complexity"]
    end
    presentation -->|calls| business
    business -->|uses| data
    business -->|uses| external
    dao_pat -->|implements| data
    service_pat -->|implements| business
    singleton_pat -->|ensures| resource_management["Resource<br/>Management"]
    factory_pat -->|creates| objects["Objects"]
    plugin_pat -->|enables| extensions["Extensions"]
    style patterns fill:#4A90E2,stroke:#2E5C8A,color:#fff
    style layers fill:#50C878,stroke:#2D7A4A,color:#fff
    style principles fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style dao_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style service_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style singleton_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style factory_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style plugin_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style presentation fill:#68D989,stroke:#2D7A4A,color:#fff
    style business fill:#68D989,stroke:#2D7A4A,color:#fff
    style data fill:#68D989,stroke:#2D7A4A,color:#fff
    style external fill:#68D989,stroke:#2D7A4A,color:#fff
    style sep_concern fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style loose_coupling fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style high_cohesion fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style abstraction fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style resource_management fill:#FFB84D,stroke:#8B6914,color:#fff
    style objects fill:#FFB84D,stroke:#8B6914,color:#fff
    style extensions fill:#FFB84D,stroke:#8B6914,color:#fff
 ```
 ---
 ## Core Features Architecture
 ```mermaid
 graph TB
    system["🏪 Unicenta oPOS<br/>Enterprise POS System"]
    system -->|Sales Management| sales_feat["Sales Processing<br/>Multiple modes<br/>Ticket management<br/>Payment handling"]
    system -->|Inventory Management| inventory_feat["Product Management<br/>Stock tracking<br/>Category organization<br/>Quantity monitoring"]
    system -->|Customer Management| customer_feat["Customer Database<br/>Transaction history<br/>Loyalty programs<br/>Communication"]
    system -->|Supplier Management| supplier_feat["Supplier Directory<br/>Purchase orders<br/>Product sourcing<br/>Vendor info"]
    system -->|Employee Management| employee_feat["User Accounts<br/>Access Control<br/>Role Assignment<br/>Activity Logging"]
    system -->|Reporting & Analytics| reporting_feat["Sales Reports<br/>Inventory Reports<br/>Financial Reports<br/>Charts & Graphs"]
    system -->|Device Integration| device_feat["Thermal Printers<br/>Barcode Scanners<br/>Weight Scales<br/>Card Readers"]
    system -->|Multi-platform| platform_feat["Windows Support<br/>Linux Support<br/>macOS Support<br/>Cross-platform UI"]
    style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
    style sales_feat fill:#50C878,stroke:#2D7A4A,color:#fff
    style inventory_feat fill:#50C878,stroke:#2D7A4A,color:#fff
    style customer_feat fill:#50C878,stroke:#2D7A4A,color:#fff
    style supplier_feat fill:#50C878,stroke:#2D7A4A,color:#fff
    style employee_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style reporting_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
    style device_feat fill:#FF6B6B,stroke:#A53D3D,color:#fff
    style platform_feat fill:#FFB84D,stroke:#8B6914,color:#fff
 ```
 ---
 ## Deployment Architecture
 ```mermaid
 graph TB
    subgraph client["CLIENT TIER"]
        desktop["💻 Desktop Machine<br/>Windows • Linux • macOS<br/>Java Runtime (JRE 8+)"]
    end
    subgraph app_tier["APPLICATION TIER"]
        jar["📦 unicentaopos.jar<br/>Version 5.4.0<br/>Java Swing/JavaFX"]
    end
    subgraph data_tier["DATA TIER"]
        db_choice["Database Engine<br/>MySQL 5.x<br/>Derby<br/>SQLite<br/>PostgreSQL"]
        db_instance["Database Instance<br/>Schema: unicentaopos<br/>Tables & Indexes"]
    end
    subgraph files["FILE STORAGE"]
        reports_dir["📁 Reports Directory<br/>Generated PDFs<br/>Excel Files"]
        config_dir["📁 Config Directory<br/>Application Settings<br/>User Preferences"]
        templates["📁 Templates<br/>Report Templates<br/>Print Layouts"]
        locales["📁 Localization<br/>Language Files<br/>i18n Resources"]
    end
    desktop -->|runs| jar
    jar -->|connects to| db_choice
    db_choice -->|manages| db_instance
    jar -->|reads/writes| reports_dir
    jar -->|reads/writes| config_dir
    jar -->|reads| templates
    jar -->|reads| locales
    style client fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
    style app_tier fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:2px
    style data_tier fill:#FF9F43,stroke:#B8690F,color:#fff,stroke-width:2px
    style files fill:#9B59B6,stroke:#5B2C6F,color:#fff,stroke-width:2px
    style desktop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style jar fill:#5BA3D0,stroke:#2E5C8A,color:#fff
    style db_choice fill:#FDB44B,stroke:#B8690F,color:#fff
    style db_instance fill:#FDB44B,stroke:#B8690F,color:#fff
    style reports_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style config_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style templates fill:#B76AC2,stroke:#5B2C6F,color:#fff
    style locales fill:#B76AC2,stroke:#5B2C6F,color:#fff
 ```
 ---
 ## Quick Start
 ### Prerequisites
 - Java 8+ (JRE)
 - MySQL 5.x (or Derby/SQLite/PostgreSQL)
 - Create database schema: `unicentaopos`
 ### Build
 ```bash
 mvn clean package
 ```
 ### Run
 ```bash
 java -jar ./target/unicentaopos.jar
 ```
 ### Platform Support
 - ✅ Windows
 - ✅ Linux
 - ✅ macOS
 ---
 ## Summary
 **Unicenta oPOS** is a layered, modular Java desktop application with clear separation between:
 1. **Presentation Layer** - Swing/JavaFX UI
 2. **Service Layer** - Business logic & orchestration
 3. **Data Access Layer** - DAO pattern for database abstraction
 4. **Peripheral Integration** - Hardware device drivers
 5. **Support Layer** - Utilities, logging, plugins
 The architecture supports **multi-database backends**, **multiple POS sales modes** (simple, restaurant), **comprehensive reporting**, and **extensive peripheral device integration**, making it a flexible, enterprise-grade point-of-sale system.
@@ -0,0 +1,674 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -0,0 +1,674 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.unicenta</groupId>
  <artifactId>unicentaopos</artifactId>
-  <version>5.5.0-SNAPSHOT</version>
+  <version>5.5.0</version>
  <packaging>jar</packaging>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -116,7 +115,6 @@
      <artifactId>poi</artifactId>
      <version>3.17</version>
    </dependency>
    <dependency>
      <groupId>org.apache.poi</groupId>
      <artifactId>poi-ooxml</artifactId>
@@ -181,7 +179,6 @@
          <artifactId>slf4j-api</artifactId>
        </exclusion>
      </exclusions>
    </dependency>
    <dependency>
      <groupId>org.swinglabs.swingx</groupId>
@@ -255,11 +252,11 @@
      <artifactId>derbytools</artifactId>
      <version>${derby.version}</version>
    </dependency>
-<!--    <dependency>-->
+    <!--    <dependency>-->
-<!--      <groupId>org.apache.derby</groupId>-->
+    <!--      <groupId>org.apache.derby</groupId>-->
-<!--      <artifactId>derbyshared</artifactId>-->
+    <!--      <artifactId>derbyshared</artifactId>-->
-<!--      <version>${derby.version}</version>-->
+    <!--      <version>${derby.version}</version>-->
-<!--    </dependency>-->
+    <!--    </dependency>-->
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
@@ -293,7 +290,6 @@
      <artifactId>DynamicJasper-core-fonts</artifactId>
      <version>2.0</version>
    </dependency>
    <dependency>
      <groupId>org.eclipse.jdt.core.compiler</groupId>
      <artifactId>ecj</artifactId>
@@ -361,7 +357,7 @@
    <dependency>
      <groupId>com.unicenta</groupId>
      <artifactId>unicenta-plugins</artifactId>
-      <version>1.4.0-SNAPSHOT</version>
+      <version>1.3.2-SNAPSHOT</version>
    </dependency>
    <dependency>
      <groupId>com.gluonhq</groupId>
@@ -450,7 +446,6 @@
      <version>4.2.0</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
@@ -34,192 +34,191 @@ import java.util.regex.Pattern;
@Slf4j
 public class StaticSentence extends JDBCSentence {
  private ISQLBuilderStatic iSQLBuilder;
-  /**
+    private ISQLBuilderStatic iSQLBuilder;
   *
   */
  protected SerializerWrite m_SerWrite = null;
-  /**
+    /**
-   *
+     *
-   */
+     */
-  protected SerializerRead m_SerRead = null;
+    protected SerializerWrite m_SerWrite = null;
-  // Estado
+    /**
-  private Statement statement;
+     *
     */
    protected SerializerRead m_SerRead = null;
-  /**
+    // Estado
-   * Creates a new instance of StaticSentence
+    private Statement statement;
   *
   * @param s
   * @param sentence
   * @param serread
   * @param serwrite
   */
  public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
    super(s);
    iSQLBuilder = sentence;
    m_SerWrite = serwrite;
    m_SerRead = serread;
    statement = null;
  }
-  /**
+    /**
-   * Creates a new instance of StaticSentence
+     * Creates a new instance of StaticSentence
-   *
+     *
-   * @param s
+     * @param s
-   * @param sentence
+     * @param sentence
-   */
+     * @param serread
-  public StaticSentence(Session s, ISQLBuilderStatic sentence) {
+     * @param serwrite
-    this(s, sentence, null, null);
+     */
-  }
+    public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
-
+        super(s);
-  /**
+        iSQLBuilder = sentence;
-   * Creates a new instance of StaticSentence
+        m_SerWrite = serwrite;
-   *
+        m_SerRead = serread;
   * @param s
   * @param sentence
   * @param serwrite
   */
  public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
    this(s, sentence, serwrite, null);
  }
  /**
   * Creates a new instance of StaticSentence
   *
   * @param s
   * @param sentence
   * @param serread
   * @param serwrite
   */
  public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
    this(s, new NormalBuilder(sentence), serwrite, serread);
  }
  /**
   * Creates a new instance of StaticSentence
   *
   * @param s
   * @param sentence
   * @param serwrite
   */
  public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
    this(s, new NormalBuilder(sentence), serwrite, null);
  }
  /**
   * Creates a new instance of StaticSentence
   *
   * @param s
   * @param sentence
   */
  public StaticSentence(Session s, String sentence) {
    this(s, new NormalBuilder(sentence), null, null);
  }
  public String fixSqliteDate(String sql) {
    try {
      if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
        StringBuilder sqliteSQL = new StringBuilder();
        Pattern date = Pattern.compile("(?<=ts ).*(?=})");
        Matcher matchPattern = date.matcher(sql);
        if (matchPattern.find()) {
          sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
        }
        return sqliteSQL.toString();
      }
    } catch (Exception e) {
      log.error("Error fixing sql for sqlite {}", e.getMessage());
      return sql;
    }
    return sql;
  }
  /**
   * @param params
   * @return
   * @throws BasicException
   */
  @Override
  public DataResultSet openExec(Object params) throws BasicException {
    // true -> un resultset
    // false -> un updatecount (si -1 entonces se acabo)
    closeExec();
    try {
      // follow this to find the create category bug when importing a product csv
      // https://unicenta.atlassian.net/browse/UOCL-317
      String sql = iSQLBuilder.getSQL(m_SerWrite, params);
      String sentence = fixSqliteDate(sql);
      // String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
      statement = session.getConnection().createStatement();
      log.debug("Executing static SQL: {}", sentence);
      if (statement.execute(sentence)) {
        return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
      } else {
        int iUC = statement.getUpdateCount();
        if (iUC < 0) {
          return null;
        } else {
          return new SentenceUpdateResultSet(iUC);
        }
      }
    } catch (SQLException eSQL) {
      throw new BasicException(eSQL);
    }
  }
  /**
   * @throws BasicException
   */
  @Override
  public void closeExec() throws BasicException {
    if (statement != null) {
      try {
        statement.close();
      } catch (SQLException eSQL) {
        throw new BasicException(eSQL);
      } finally {
        statement = null;
      }
    }
  }
-  /**
+    /**
-   * @return
+     * Creates a new instance of StaticSentence
-   * @throws BasicException
+     *
-   */
+     * @param s
-  @Override
+     * @param sentence
-  public DataResultSet moreResults() throws BasicException {
+     */
    public StaticSentence(Session s, ISQLBuilderStatic sentence) {
        this(s, sentence, null, null);
    }
    /**
     * Creates a new instance of StaticSentence
     *
     * @param s
     * @param sentence
     * @param serwrite
     */
    public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
        this(s, sentence, serwrite, null);
    }
    /**
     * Creates a new instance of StaticSentence
     *
     * @param s
     * @param sentence
     * @param serread
     * @param serwrite
     */
    public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
        this(s, new NormalBuilder(sentence), serwrite, serread);
    }
    /**
     * Creates a new instance of StaticSentence
     *
     * @param s
     * @param sentence
     * @param serwrite
     */
    public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
        this(s, new NormalBuilder(sentence), serwrite, null);
    }
    /**
     * Creates a new instance of StaticSentence
     *
     * @param s
     * @param sentence
     */
    public StaticSentence(Session s, String sentence) {
        this(s, new NormalBuilder(sentence), null, null);
    }
    public String fixSqliteDate(String sql) {
        try {
            if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
                StringBuilder sqliteSQL = new StringBuilder();
                Pattern date = Pattern.compile("(?<=ts ).*(?=})");
                Matcher matchPattern = date.matcher(sql);
                if (matchPattern.find()) {
                    sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
                }
                return sqliteSQL.toString();
            }
    try {
      if (statement.getMoreResults()) {
        // tenemos resultset
        return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
      } else {
        // tenemos updatecount o si devuelve -1 ya no hay mas
        int iUC = statement.getUpdateCount();
        if (iUC < 0) {
          return null;
        } else {
          return new SentenceUpdateResultSet(iUC);
        }
-      }
+        catch (Exception e) {
-    } catch (SQLException eSQL) {
+            log.error("Error fixing sql for sqlite {}", e.getMessage());
-      throw new BasicException(eSQL);
+            return sql;
        }
        return sql;
    }
    /**
     * @param params
     * @return
     * @throws BasicException
     */
    @Override
    public DataResultSet openExec(Object params) throws BasicException {
        // true -> un resultset
        // false -> un updatecount (si -1 entonces se acabo)
        closeExec();
        try {
            String sentence = fixSqliteDate(iSQLBuilder.getSQL(m_SerWrite, params));
            //String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
            statement = session.getConnection().createStatement();
            log.debug("Executing static SQL: {}", sentence);
            if (statement.execute(sentence)) {
                return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
            } else {
                int iUC = statement.getUpdateCount();
                if (iUC < 0) {
                    return null;
                } else {
                    return new SentenceUpdateResultSet(iUC);
                }
            }
        } catch (SQLException eSQL) {
            throw new BasicException(eSQL);
        }
    }
    /**
     * @throws BasicException
     */
    @Override
    public void closeExec() throws BasicException {
        if (statement != null) {
            try {
                statement.close();
            } catch (SQLException eSQL) {
                throw new BasicException(eSQL);
            } finally {
                statement = null;
            }
        }
    }
    /**
     * @return
     * @throws BasicException
     */
    @Override
    public DataResultSet moreResults() throws BasicException {
        try {
            if (statement.getMoreResults()) {
                // tenemos resultset
                return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
            } else {
                // tenemos updatecount o si devuelve -1 ya no hay mas
                int iUC = statement.getUpdateCount();
                if (iUC < 0) {
                    return null;
                } else {
                    return new SentenceUpdateResultSet(iUC);
                }
            }
        } catch (SQLException eSQL) {
            throw new BasicException(eSQL);
        }
    }
  }
 }
@@ -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>
@@ -42,479 +42,426 @@ import javax.swing.*;
 */
 public class PeopleView extends JPanel implements EditorRecord {
-  private Object m_oId;
+    private Object m_oId;
-  private String m_sPassword;
+    private String m_sPassword;
    private final DirtyManager m_Dirty;
    private final SentenceList m_sentrole;
    private ComboBoxValModel m_RoleModel;  
    private final ComboBoxValModel m_ReasonModel;        
    /** Creates new form PeopleEditor
     * @param dlAdmin
     * @param dirty */
    public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
-  private final DirtyManager m_Dirty;
+        initComponents();
        // El modelo de roles
        m_sentrole = dlAdmin.getRolesList();
        m_RoleModel = new ComboBoxValModel();
        m_Dirty = dirty;
        m_jName.getDocument().addDocumentListener(dirty);
        m_jRole.addActionListener(dirty);
        m_jVisible.addActionListener(dirty);
        m_jImage.addPropertyChangeListener("image", dirty);
        m_jcard.getDocument().addDocumentListener(dirty);
-  private final SentenceList m_sentrole;
+        m_ReasonModel = new ComboBoxValModel();
-  private ComboBoxValModel m_RoleModel;
+        m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
-
+        m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));              
-  private final ComboBoxValModel m_ReasonModel;
+        m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));                      
-
+        
-  /**
+        webCBSecurity.setModel(m_ReasonModel);
-   * Creates new form PeopleEditor
+        
-   * 
+        writeValueEOF();
   * @param dlAdmin
   * @param dirty
   */
  public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
    initComponents();
    // El modelo de roles
    m_sentrole = dlAdmin.getRolesList();
    m_RoleModel = new ComboBoxValModel();
    m_Dirty = dirty;
    m_jName.getDocument().addDocumentListener(dirty);
    m_jRole.addActionListener(dirty);
    m_jVisible.addActionListener(dirty);
    m_jImage.addPropertyChangeListener("image", dirty);
    m_jcard.getDocument().addDocumentListener(dirty);
    m_ReasonModel = new ComboBoxValModel();
    m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
    m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
    m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
    webCBSecurity.setModel(m_ReasonModel);
    taxIdTextField.getDocument().addDocumentListener(dirty);
    writeValueEOF();
  }
  /**
   *
   */
  @Override
  public void writeValueEOF() {
    m_oId = null;
    m_jName.setText(null);
    m_sPassword = null;
    m_RoleModel.setSelectedKey(null);
    m_jVisible.setSelected(false);
    m_jcard.setText(null);
    m_jImage.setImage(null);
    taxIdTextField.setText(null);
    m_jName.setEnabled(false);
    m_jRole.setEnabled(false);
    m_jVisible.setEnabled(false);
    m_jcard.setEnabled(false);
    m_jImage.setEnabled(false);
    jButton1.setEnabled(false);
    webCBSecurity.setEnabled(false);
    taxIdTextField.setEnabled(false);
  }
  /**
   *
   */
  @Override
  public void writeValueInsert() {
    m_oId = null;
    m_jName.setText(null);
    m_sPassword = null;
    m_RoleModel.setSelectedKey(null);
    m_jVisible.setSelected(true);
    m_jcard.setText(null);
    m_jImage.setImage(null);
    taxIdTextField.setText(null);
    m_jName.setEnabled(true);
    m_jRole.setEnabled(true);
    m_jVisible.setEnabled(true);
    m_jcard.setEnabled(true);
    m_jImage.setEnabled(true);
    jButton1.setEnabled(true);
    webCBSecurity.setEnabled(true);
    taxIdTextField.setEnabled(true);
  }
  /**
   *
   * @param value
   */
  @Override
  public void writeValueDelete(Object value) {
    Object[] people = (Object[]) value;
    m_oId = people[0];
    m_jName.setText(Formats.STRING.formatValue(people[1]));
    m_sPassword = Formats.STRING.formatValue(people[2]);
    m_RoleModel.setSelectedKey(people[3]);
    m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
    m_jcard.setText(Formats.STRING.formatValue(people[5]));
    m_jImage.setImage((BufferedImage) people[6]);
    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
    m_jName.setEnabled(false);
    m_jRole.setEnabled(false);
    m_jVisible.setEnabled(false);
    m_jcard.setEnabled(false);
    m_jImage.setEnabled(false);
    jButton1.setEnabled(false);
    webCBSecurity.setEnabled(false);
    taxIdTextField.setEnabled(false);
  }
  /**
   *
   * @param value
   */
  @Override
  public void writeValueEdit(Object value) {
    Object[] people = (Object[]) value;
    m_oId = people[0];
    m_jName.setText(Formats.STRING.formatValue(people[1]));
    m_sPassword = Formats.STRING.formatValue(people[2]);
    m_RoleModel.setSelectedKey(people[3]);
    m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
    m_jcard.setText(Formats.STRING.formatValue(people[5]));
    m_jImage.setImage((BufferedImage) people[6]);
    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
    if (m_jcard.getText().length() == 16) {
      jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
    } else {
      jLblCardID.setText(AppLocal.getIntString("label.card"));
    }
    // System.out.println(m_jcard.getText().length());
-    m_jName.setEnabled(true);
+    /**
-    m_jRole.setEnabled(true);
+     *
-    m_jVisible.setEnabled(true);
+     */
-    m_jcard.setEnabled(true);
+    @Override
-    m_jImage.setEnabled(true);
+    public void writeValueEOF() {
-    jButton1.setEnabled(true);
+        m_oId = null;
-    webCBSecurity.setEnabled(true);
+        m_jName.setText(null);
-    taxIdTextField.setEnabled(true);
+        m_sPassword = null;
-  }
+        m_RoleModel.setSelectedKey(null);
        m_jVisible.setSelected(false);
        m_jcard.setText(null);
        m_jImage.setImage(null);
        m_jName.setEnabled(false);
        m_jRole.setEnabled(false);
        m_jVisible.setEnabled(false);
        m_jcard.setEnabled(false);
        m_jImage.setEnabled(false);
        jButton1.setEnabled(false);
        webCBSecurity.setEnabled(false);
    }
    /**
     *
     */
    @Override
    public void writeValueInsert() {
        m_oId = null;
        m_jName.setText(null);
        m_sPassword = null;
        m_RoleModel.setSelectedKey(null);
        m_jVisible.setSelected(true);
        m_jcard.setText(null);
        m_jImage.setImage(null);
        m_jName.setEnabled(true);
        m_jRole.setEnabled(true);
        m_jVisible.setEnabled(true);
        m_jcard.setEnabled(true);
        m_jImage.setEnabled(true);
        jButton1.setEnabled(true);
        webCBSecurity.setEnabled(true);        
    }
    /**
     *
     * @param value
     */
    @Override
    public void writeValueDelete(Object value) {
        Object[] people = (Object[]) value;
        m_oId = people[0];
        m_jName.setText(Formats.STRING.formatValue(people[1]));
        m_sPassword = Formats.STRING.formatValue(people[2]);
        m_RoleModel.setSelectedKey(people[3]);
        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
        m_jcard.setText(Formats.STRING.formatValue(people[5]));
        m_jImage.setImage((BufferedImage) people[6]);
        m_jName.setEnabled(false);
        m_jRole.setEnabled(false);
        m_jVisible.setEnabled(false);
        m_jcard.setEnabled(false);
        m_jImage.setEnabled(false);        
        jButton1.setEnabled(false);
        webCBSecurity.setEnabled(false);        
    }
-  /**
+    /**
-   *
+     *
-   * @return
+     * @param value
-   * @throws BasicException
+     */
-   */
+    @Override
-  @Override
+    public void writeValueEdit(Object value) {
-  public Object createValue() throws BasicException {
+        Object[] people = (Object[]) value;
-    Object[] people = new Object[8];
+        m_oId = people[0];
-    people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
-    people[1] = Formats.STRING.parseValue(m_jName.getText());
+        m_sPassword = Formats.STRING.formatValue(people[2]);
-    people[2] = Formats.STRING.parseValue(m_sPassword);
+        m_RoleModel.setSelectedKey(people[3]);
-    people[3] = m_RoleModel.getSelectedKey();
+        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
-    people[4] = m_jVisible.isSelected();
+        m_jcard.setText(Formats.STRING.formatValue(people[5]));
-    people[5] = Formats.STRING.parseValue(m_jcard.getText());
+        m_jImage.setImage((BufferedImage) people[6]);
-    people[6] = m_jImage.getImage();
+        
-    people[7] = Formats.STRING.parseValue(taxIdTextField.getText());
+        if (m_jcard.getText().length() == 16) {
-    return people;
+            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-  }
+        } else {
            jLblCardID.setText(AppLocal.getIntString("label.card"));            
        }
        System.out.println(m_jcard.getText().length());        
        m_jName.setEnabled(true);
        m_jRole.setEnabled(true);
        m_jVisible.setEnabled(true);
        m_jcard.setEnabled(true);
        m_jImage.setEnabled(true);
        jButton1.setEnabled(true);
        webCBSecurity.setEnabled(true);        
    }
    /**
     *
     * @return
     * @throws BasicException
     */
    @Override
    public Object createValue() throws BasicException {
        Object[] people = new Object[7];
        people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
        people[1] = Formats.STRING.parseValue(m_jName.getText());
        people[2] = Formats.STRING.parseValue(m_sPassword);
        people[3] = m_RoleModel.getSelectedKey();
        people[4] = m_jVisible.isSelected();
        people[5] = Formats.STRING.parseValue(m_jcard.getText());
        people[6] = m_jImage.getImage();
        return people;
    }
-  /**
+    /**
-   *
+     *
-   * @return
+     * @return
-   */
+     */
-  @Override
+    @Override
-  public Component getComponent() {
+    public Component getComponent() {
-    return this;
+        return this;
-  }
+    }
-  /**
+    /**
-   *
+     *
-   * @throws BasicException
+     * @throws BasicException
-   */
+     */
-  public void activate() throws BasicException {
+    public void activate() throws BasicException {
        m_RoleModel = new ComboBoxValModel(m_sentrole.list());
        m_jRole.setModel(m_RoleModel);
    }
    /**
     *
     */
    @Override
    public void refresh() {
    }
    /** This method is called from within the constructor to
     * initialize the form.
     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
    private void initComponents() {
-    m_RoleModel = new ComboBoxValModel(m_sentrole.list());
+        jLabel1 = new javax.swing.JLabel();
-    m_jRole.setModel(m_RoleModel);
+        m_jName = new javax.swing.JTextField();
-  }
+        m_jVisible = new javax.swing.JCheckBox();
        jLabel3 = new javax.swing.JLabel();
        jLabel4 = new javax.swing.JLabel();
        m_jImage = new com.unicenta.data.gui.JImageEditor();
        jButton1 = new javax.swing.JButton();
        m_jRole = new javax.swing.JComboBox();
        jLabel2 = new javax.swing.JLabel();
        m_jcard = new javax.swing.JTextField();
        jLblCardID = new javax.swing.JLabel();
        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
        jLabel6 = new javax.swing.JLabel();
-  /**
+        setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-   *
+        setPreferredSize(new java.awt.Dimension(500, 500));
   */
  @Override
  public void refresh() {
  }
-  /**
+        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-   * This method is called from within the constructor to
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-   * initialize the form.
+        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-   * WARNING: Do NOT modify this code. The content of this method is
+        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
-   * always regenerated by the Form Editor.
+        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
-   */
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
-  // <editor-fold defaultstate="collapsed" desc="Generated
+                jLabel1MouseClicked(evt);
-  // <editor-fold defaultstate="collapsed" desc="Generated
+            }
-  // Code">//GEN-BEGIN:initComponents
+        });
  private void initComponents() {
-    jLabel1 = new javax.swing.JLabel();
+        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jName = new javax.swing.JTextField();
+        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
    m_jVisible = new javax.swing.JCheckBox();
    jLabel3 = new javax.swing.JLabel();
    jLabel4 = new javax.swing.JLabel();
    m_jImage = new com.unicenta.data.gui.JImageEditor();
    jButton1 = new javax.swing.JButton();
    m_jRole = new javax.swing.JComboBox();
    jLabel2 = new javax.swing.JLabel();
    m_jcard = new javax.swing.JTextField();
    jLblCardID = new javax.swing.JLabel();
    webCBSecurity = new javax.swing.JComboBox();
    passwordLabel = new javax.swing.JLabel();
    taxIdTextField = new javax.swing.JTextField();
    taxIdLabel = new javax.swing.JLabel();
-    setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    setPreferredSize(new java.awt.Dimension(500, 500));
+        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
-    jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-    jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
    jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
    jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
      public void mouseClicked(java.awt.event.MouseEvent evt) {
        jLabel1MouseClicked(evt);
      }
    });
-    m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
+        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
-    m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
-    jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
-    jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
+        jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
        jButton1.setToolTipText("");
        jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
        jButton1.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                jButton1ActionPerformed(evt);
            }
        });
-    jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+        m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
    jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
-    m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
+        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
-    jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
+        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
    jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
    jButton1.setToolTipText("");
    jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
    jButton1.addActionListener(new java.awt.event.ActionListener() {
      public void actionPerformed(java.awt.event.ActionEvent evt) {
        jButton1ActionPerformed(evt);
      }
    });
-    m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
-    jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
-    jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+        webCBSecurity.setSelectedIndex(0);
-    jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
+        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                webCBSecurityActionPerformed(evt);
            }
        });
-    m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
+        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
-    jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-    jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+        this.setLayout(layout);
-    jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
+        layout.setHorizontalGroup(
-
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
    webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(
        new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
    webCBSecurity.setSelectedIndex(0);
    webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
    webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
    webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
      public void actionPerformed(java.awt.event.ActionEvent evt) {
        webCBSecurityActionPerformed(evt);
      }
    });
    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
    taxIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
    taxIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
    taxIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
    taxIdLabel.setText("Tax ID");
    javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
    this.setLayout(layout);
    layout.setHorizontalGroup(
        layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addContainerGap()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                        .addGap(18, 18, 18)
-                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207,
+                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
                            javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
                            javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
                            javax.swing.GroupLayout.PREFERRED_SIZE)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(webCBSecurity, 0, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addGroup(layout.createSequentialGroup()
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addComponent(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                            .addComponent(taxIdLabel))
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                .addContainerGap())
-                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+        );
-                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+        layout.setVerticalGroup(
-                                javax.swing.GroupLayout.PREFERRED_SIZE))))
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                .addContainerGap(50, Short.MAX_VALUE)));
    layout.setVerticalGroup(
        layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                .addGap(18, 18, 18)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
                        javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
+                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                    .addComponent(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addComponent(taxIdLabel))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
+                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                        javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE,
                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
                        javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
                        javax.swing.GroupLayout.PREFERRED_SIZE))
                .addGap(15, 15, 15)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
+                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                        javax.swing.GroupLayout.PREFERRED_SIZE))
+        );
-                .addContainerGap(110, Short.MAX_VALUE)));
+    }// </editor-fold>//GEN-END:initComponents
  }// </editor-fold>//GEN-END:initComponents
-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
+    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
-    String sNewPassword = Hashcypher.changePassword(this);
+        String sNewPassword = Hashcypher.changePassword(this);
-    if (sNewPassword != null) {
+        if (sNewPassword != null) {
-      m_sPassword = sNewPassword;
+            m_sPassword = sNewPassword;
-      m_Dirty.setDirty(true);
+            m_Dirty.setDirty(true);
-    }
+        }
-  }// GEN-LAST:event_jButton1ActionPerformed
+    }//GEN-LAST:event_jButton1ActionPerformed
-  private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
+    private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
    if (webCBSecurity.getSelectedIndex() == 0) {
      if (JOptionPane.showConfirmDialog(this,
          AppLocal.getIntString("message.cardnew"),
          AppLocal.getIntString("title.editor"),
          JOptionPane.YES_NO_OPTION,
          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
        m_jcard.setText("C" + StringUtils.getCardNumber());
        m_Dirty.setDirty(true);
      }
    }
-    if (webCBSecurity.getSelectedIndex() == 1) {
+        if(webCBSecurity.getSelectedIndex() == 0){
-      if (JOptionPane.showConfirmDialog(this,
+            if (JOptionPane.showConfirmDialog(this, 
-          AppLocal.getIntString("message.cardremove"),
+                AppLocal.getIntString("message.cardnew"), 
-          AppLocal.getIntString("title.editor"),
+                AppLocal.getIntString("title.editor"), 
-          JOptionPane.YES_NO_OPTION,
+                JOptionPane.YES_NO_OPTION, 
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
-        m_jcard.setText(null);
+            {  
-        m_Dirty.setDirty(true);
+                m_jcard.setText("C" + StringUtils.getCardNumber());
-      }
+                m_Dirty.setDirty(true);
-    }
+            }        
        }         
-    if (webCBSecurity.getSelectedIndex() == 2) {
+        if(webCBSecurity.getSelectedIndex() == 1){
-      if (JOptionPane.showConfirmDialog(this,
+            if (JOptionPane.showConfirmDialog(this, 
-          AppLocal.getIntString("message.ibuttonassign"),
+                AppLocal.getIntString("message.cardremove"), 
-          AppLocal.getIntString("title.editor"),
+                AppLocal.getIntString("title.editor"), 
-          JOptionPane.OK_CANCEL_OPTION,
+                JOptionPane.YES_NO_OPTION, 
-          JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
            {  
                m_jcard.setText(null);
                m_Dirty.setDirty(true);
            }
        }
        if(webCBSecurity.getSelectedIndex() == 2){
            if (JOptionPane.showConfirmDialog(this, 
                AppLocal.getIntString("message.ibuttonassign"), 
                AppLocal.getIntString("title.editor"), 
                JOptionPane.OK_CANCEL_OPTION, 
                JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) 
-      {
+            {  
-        m_jcard.setText(uOWWatch.getibuttonid());
+                m_jcard.setText( uOWWatch.getibuttonid() );
-        jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-        m_Dirty.setDirty(true);
+                m_Dirty.setDirty(true);
-      }
+            }
-    }
+        }                
-
+               
-  }// GEN-LAST:event_webCBSecurityActionPerformed
+    }//GEN-LAST:event_webCBSecurityActionPerformed
  private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_jLabel1MouseClicked
    if (evt.getClickCount() == 2) {
      String uuidString = m_oId.toString();
      StringSelection stringSelection = new StringSelection(uuidString);
      Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
      clpbrd.setContents(stringSelection, null);
      JOptionPane.showMessageDialog(null,
          AppLocal.getIntString("message.uuidcopy"));
    }
  }// GEN-LAST:event_jLabel1MouseClicked
  // Variables declaration - do not modify//GEN-BEGIN:variables
  private javax.swing.JButton jButton1;
  private javax.swing.JLabel jLabel1;
  private javax.swing.JLabel jLabel2;
  private javax.swing.JLabel jLabel3;
  private javax.swing.JLabel jLabel4;
  private javax.swing.JLabel jLblCardID;
  private com.unicenta.data.gui.JImageEditor m_jImage;
  private javax.swing.JTextField m_jName;
  private javax.swing.JComboBox m_jRole;
  private javax.swing.JCheckBox m_jVisible;
  private javax.swing.JTextField m_jcard;
  private javax.swing.JLabel passwordLabel;
  private javax.swing.JLabel taxIdLabel;
  private javax.swing.JTextField taxIdTextField;
  private javax.swing.JComboBox webCBSecurity;
  // End of variables declaration//GEN-END:variables
    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
        if (evt.getClickCount() == 2) {
            String uuidString = m_oId.toString();
            StringSelection stringSelection = new StringSelection(uuidString);
            Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
            clpbrd.setContents(stringSelection, null);
            JOptionPane.showMessageDialog(null, 
                AppLocal.getIntString("message.uuidcopy"));
        }
    }//GEN-LAST:event_jLabel1MouseClicked
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton jButton1;
    private javax.swing.JLabel jLabel1;
    private javax.swing.JLabel jLabel2;
    private javax.swing.JLabel jLabel3;
    private javax.swing.JLabel jLabel4;
    private javax.swing.JLabel jLabel6;
    private javax.swing.JLabel jLblCardID;
    private com.unicenta.data.gui.JImageEditor m_jImage;
    private javax.swing.JTextField m_jName;
    private javax.swing.JComboBox m_jRole;
    private javax.swing.JCheckBox m_jVisible;
    private javax.swing.JTextField m_jcard;
    private com.alee.laf.combobox.WebComboBox webCBSecurity;
    // End of variables declaration//GEN-END:variables
 }
@@ -53,6 +53,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
        initPayments("external", new ConfigPaymentPanelEmpty());
        initPayments("PaymentSense",  new ConfigPaymentPanelEmpty());
        initPayments("Teya",  new ConfigPaymentPanelEmpty());
        initPayments("MediaPayments",  new ConfigPaymentPanelEmpty());
        // Lector de tarjetas.
        jcboCardReader.addItem("Not defined");
@@ -91,9 +92,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
        jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader"));
        jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway"));
-        urlValue.setText(config.getProperty("payment.URL"));
+
-        deviceIdValue.setText(config.getProperty("payment.device-id"));
+        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
-        securityKeyValue.setText(config.getProperty("payment.security-key"));
+        if ("MediaPayments".equals(gateway)) {
            urlValue.setText(config.getProperty("media-payments.pdq"));
            deviceIdValue.setText(config.getProperty("media-payments.api-key"));
            securityKeyValue.setText(config.getProperty("media-payments.secret"));
        } else {
            urlValue.setText(config.getProperty("payment.URL"));
            deviceIdValue.setText(config.getProperty("payment.device-id"));
            securityKeyValue.setText(config.getProperty("payment.security-key"));
        }
        paymentConfiguration.loadProperties(config);
        dirty.setDirty(false);
    }
@@ -107,9 +116,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
        config.setProperty("payment.magcardreader", comboValue(jcboCardReader.getSelectedItem()));
        config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem()));
-        config.setProperty("payment.URL", urlValue.getText());
+
-        config.setProperty("payment.device-id", deviceIdValue.getText());
+        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
-        config.setProperty("payment.security-key", securityKeyValue.getText());
+        if ("MediaPayments".equals(gateway)) {
            config.setProperty("media-payments.pdq", urlValue.getText());
            config.setProperty("media-payments.api-key", deviceIdValue.getText());
            config.setProperty("media-payments.secret", securityKeyValue.getText());
        } else {
            config.setProperty("payment.URL", urlValue.getText());
            config.setProperty("payment.device-id", deviceIdValue.getText());
            config.setProperty("payment.security-key", securityKeyValue.getText());
        }
        paymentConfiguration.saveProperties(config);
        dirty.setDirty(false);
    }
@@ -275,6 +292,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
        paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem()));
        if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) {
            urlLabel.setText("URL");
            deviceIdLabel.setText("Device ID");
            securityKeyLabel.setText("Security Key");
            emvConfigPanel.setVisible(Boolean.TRUE);
            jcboCardReader.setSelectedItem("EMV");
            jcboCardReader.setEnabled(Boolean.FALSE);
@@ -285,7 +305,18 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
            jcboCardReader.setSelectedItem("EMV");
            jcboCardReader.setEnabled(Boolean.FALSE);
        }
        else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("MediaPayments")) {
            urlLabel.setText("Terminal ID");
            deviceIdLabel.setText("API Key");
            securityKeyLabel.setText("Security Key");
            emvConfigPanel.setVisible(Boolean.TRUE);
            jcboCardReader.setSelectedItem("EMV");
            jcboCardReader.setEnabled(Boolean.FALSE);
        }
        else {
            urlLabel.setText("URL");
            deviceIdLabel.setText("Device ID");
            securityKeyLabel.setText("Security Key");
            emvConfigPanel.setVisible(Boolean.FALSE);
            jcboCardReader.setEnabled(Boolean.TRUE);
        }
@@ -55,7 +55,6 @@ public class AppUser {
  private final Icon m_Icon;
  private Set<String> m_apermissions;
  private String taxId;
  static {
    initOldClasses();
@@ -71,7 +70,7 @@ public class AppUser {
   * @param icon
   * @param role
   */
-  public AppUser(String id, String name, String password, String card, String role, Icon icon, String taxId) {
+  public AppUser(String id, String name, String password, String card, String role, Icon icon) {
    m_sId = id;
    m_sName = name;
    m_sPassword = password;
@@ -79,7 +78,6 @@ public class AppUser {
    m_sRole = role;
    m_Icon = icon;
    m_apermissions = null;
    this.taxId = taxId;
  }
  /**
@@ -201,14 +199,14 @@ public class AppUser {
   * @return
   */
  public UserInfo getUserInfo() {
-    return new UserInfo(m_sId, m_sName, this.taxId);
+    return new UserInfo(m_sId, m_sName);
  }
  private static String mapNewClass(String classname) {
    String newclass = m_oldclasses.get(classname);
    return newclass == null
-        ? classname
+            ? classname
-        : newclass;
+            : newclass;
  }
  private static void initOldClasses() {
@@ -224,8 +222,7 @@ public class AppUser {
    m_oldclasses.put("Menu.StockManagement", "com.unicenta.pos.forms.MenuStockManagement");
    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsPanel", "com.unicenta.pos.inventory.ProductsPanel");
-    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel",
+    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel", "com.unicenta.pos.inventory.ProductsWarehousePanel");
        "com.unicenta.pos.inventory.ProductsWarehousePanel");
    m_oldclasses.put("net.adrianromero.tpv.inventory.CategoriesPanel", "com.unicenta.pos.inventory.CategoriesPanel");
    m_oldclasses.put("net.adrianromero.tpv.panels.JPanelTax", "com.unicenta.pos.inventory.TaxPanel");
    m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel");
@@ -303,4 +300,5 @@ public class AppUser {
    }
  }
 }
@@ -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);
@@ -40,10 +40,6 @@
                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
                          <Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
                      </Group>
                      <Group type="102" alignment="0" attributes="0">
                          <EmptySpace max="-2" attributes="0"/>
                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
                      </Group>
                  </Group>
                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
              </Group>
@@ -87,9 +83,7 @@
                      <Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
                      <Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
                  </Group>
-                  <EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
                  <Component id="jButton1" min="-2" max="-2" attributes="0"/>
                  <EmptySpace max="-2" attributes="0"/>
              </Group>
          </Group>
        </DimensionLayout>
@@ -166,43 +160,43 @@
            </Property>
          </Properties>
        </Component>
-        <Component class="com.alee.laf.label.WebLabel" name="webLblCustomer">
+        <Component class="javax.swing.JLabel" name="webLblCustomer">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
            </Property>
            <Property name="toolTipText" type="java.lang.String" value=""/>
            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
              <Font name="Arial" size="18" style="1"/>
            </Property>
            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[100, 30]"/>
            </Property>
          </Properties>
        </Component>
        <Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
            </Property>
            <Property name="toolTipText" type="java.lang.String" value=""/>
            <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="[100, 30]"/>
            </Property>
          </Properties>
        </Component>
-        <Component class="com.alee.laf.label.WebLabel" name="voucherStatus">
+        <Component class="javax.swing.JLabel" name="webLblcustomerName">
          <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" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
            </Property>
            <Property name="toolTipText" type="java.lang.String" value=""/>
            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[100, 30]"/>
            </Property>
          </Properties>
        </Component>
        <Component class="javax.swing.JLabel" name="voucherStatus">
          <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" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/>
            </Property>
            <Property name="toolTipText" type="java.lang.String" value=""/>
            <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="[100, 30]"/>
            </Property>
@@ -224,14 +218,6 @@
            </Property>
          </Properties>
        </Component>
        <Component class="javax.swing.JButton" name="jButton1">
          <Properties>
            <Property name="text" type="java.lang.String" value="jButton1"/>
          </Properties>
          <Events>
            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
          </Events>
        </Component>
      </SubComponents>
    </Container>
    <Container class="javax.swing.JPanel" name="jPanel11">
@@ -183,154 +183,141 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
   * WARNING: Do NOT modify this code. The content of this method is
   * always regenerated by the Form Editor.
   */
-  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-  private void initComponents() {
+    private void initComponents() {
-    jPanel4 = new javax.swing.JPanel();
+        jPanel4 = new javax.swing.JPanel();
-    jLabel5 = new javax.swing.JLabel();
+        jLabel5 = new javax.swing.JLabel();
-    m_jVoucher = new javax.swing.JComboBox();
+        m_jVoucher = new javax.swing.JComboBox();
-    jLabel1 = new javax.swing.JLabel();
+        jLabel1 = new javax.swing.JLabel();
-    m_jMoneyEuros = new javax.swing.JLabel();
+        m_jMoneyEuros = new javax.swing.JLabel();
-    webLblCustomer = new com.alee.laf.label.WebLabel();
+        webLblCustomer = new javax.swing.JLabel();
-    webLblcustomerName = new com.alee.laf.label.WebLabel();
+        webLblcustomerName = new javax.swing.JLabel();
-    voucherStatus = new com.alee.laf.label.WebLabel();
+        voucherStatus = new javax.swing.JLabel();
-    jLabel6 = new javax.swing.JLabel();
+        jLabel6 = new javax.swing.JLabel();
-    jButton1 = new javax.swing.JButton();
+        jPanel11 = new javax.swing.JPanel();
-    jPanel11 = new javax.swing.JPanel();
+        jPanel12 = new javax.swing.JPanel();
-    jPanel12 = new javax.swing.JPanel();
+        m_jKeys = new com.unicenta.editor.JEditorKeys();
-    m_jKeys = new com.unicenta.editor.JEditorKeys();
+        jPanel1 = new javax.swing.JPanel();
-    jPanel1 = new javax.swing.JPanel();
+        m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
    m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
-    setLayout(new java.awt.BorderLayout());
+        setLayout(new java.awt.BorderLayout());
-    jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    jLabel5.setLabelFor(m_jVoucher);
+        jLabel5.setLabelFor(m_jVoucher);
-    jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
+        jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
-    jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
+        jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
-    m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
+        m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
-    m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
+        m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
-        m_jVoucherActionPerformed(evt);
+                m_jVoucherActionPerformed(evt);
-      }
+            }
-    });
+        });
-    jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
+        jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
-    jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
+        jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
-    m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
+        m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
-    m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
+        m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
-    m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
+        m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
-    m_jMoneyEuros.setOpaque(true);
+        m_jMoneyEuros.setOpaque(true);
-    m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
+        m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
-    webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
+        webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
-    webLblCustomer.setToolTipText("");
+        webLblCustomer.setToolTipText("");
-    webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
+        webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
-    webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
+        webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
-    webLblcustomerName.setToolTipText("");
+        webLblcustomerName.setToolTipText("");
-    webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
+        webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
-    voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
+        voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
-    voucherStatus.setToolTipText("");
+        voucherStatus.setToolTipText("");
-    voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
+        voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
-    jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    jLabel6.setLabelFor(m_jVoucher);
+        jLabel6.setLabelFor(m_jVoucher);
-    jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
+        jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
-    jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
+        jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
-    jButton1.setText("jButton1");
+        javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
-    jButton1.addActionListener(new java.awt.event.ActionListener() {
+        jPanel4.setLayout(jPanel4Layout);
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jPanel4Layout.setHorizontalGroup(
        jButton1ActionPerformed(evt);
      }
    });
    javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
    jPanel4.setLayout(jPanel4Layout);
    jPanel4Layout.setHorizontalGroup(
            jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(jPanel4Layout.createSequentialGroup()
                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addGroup(jPanel4Layout.createSequentialGroup()
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addGap(10, 10, 10)
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
+                        .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addGap(10, 10, 10)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                            .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addGroup(jPanel4Layout.createSequentialGroup()
                                            .addContainerGap()
                                            .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                            .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addGroup(jPanel4Layout.createSequentialGroup()
                                            .addContainerGap()
                                            .addComponent(jButton1)))
                            .addGap(0, 0, Short.MAX_VALUE))
                    .addGroup(jPanel4Layout.createSequentialGroup()
-                            .addContainerGap()
+                        .addContainerGap()
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                            .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGap(0, 0, Short.MAX_VALUE))
-                                            .addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+            .addGroup(jPanel4Layout.createSequentialGroup()
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
+                .addContainerGap()
-                                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                    .addGroup(jPanel4Layout.createSequentialGroup()
-                                            .addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+                        .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-    );
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-    jPanel4Layout.setVerticalGroup(
+                        .addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                    .addGroup(jPanel4Layout.createSequentialGroup()
                        .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                        .addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
        );
        jPanel4Layout.setVerticalGroup(
            jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel4Layout.createSequentialGroup()
+            .addGroup(jPanel4Layout.createSequentialGroup()
-                            .addContainerGap()
+                .addContainerGap()
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .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)
-                                    .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                                    .addComponent(jLabel6, 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(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addGap(33, 33, 33)
+                .addGap(241, 241, 241))
-                            .addComponent(jButton1)
+        );
                            .addContainerGap())
    );
-    add(jPanel4, java.awt.BorderLayout.CENTER);
+        add(jPanel4, java.awt.BorderLayout.CENTER);
-    jPanel11.setLayout(new java.awt.BorderLayout());
+        jPanel11.setLayout(new java.awt.BorderLayout());
-    jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
+        jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
-    jPanel12.add(m_jKeys);
+        jPanel12.add(m_jKeys);
-    jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
-    jPanel1.setLayout(new java.awt.BorderLayout());
+        jPanel1.setLayout(new java.awt.BorderLayout());
-    m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
+        m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
-    jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
+        jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
-    jPanel12.add(jPanel1);
+        jPanel12.add(jPanel1);
-    jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH);
+        jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH);
-    add(jPanel11, java.awt.BorderLayout.EAST);
+        add(jPanel11, java.awt.BorderLayout.EAST);
-  }// </editor-fold>//GEN-END:initComponents
+    }// </editor-fold>//GEN-END:initComponents
  private void m_jVoucherActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jVoucherActionPerformed
@@ -365,27 +352,22 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
    }
  }//GEN-LAST:event_m_jVoucherActionPerformed
  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
-  }//GEN-LAST:event_jButton1ActionPerformed
+    // Variables declaration - do not modify//GEN-BEGIN:variables
-
+    private javax.swing.JLabel jLabel1;
-
+    private javax.swing.JLabel jLabel5;
-  // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel jLabel6;
-  private javax.swing.JButton jButton1;
+    private javax.swing.JPanel jPanel1;
-  private javax.swing.JLabel jLabel1;
+    private javax.swing.JPanel jPanel11;
-  private javax.swing.JLabel jLabel5;
+    private javax.swing.JPanel jPanel12;
-  private javax.swing.JLabel jLabel6;
+    private javax.swing.JPanel jPanel4;
-  private javax.swing.JPanel jPanel1;
+    private com.unicenta.editor.JEditorKeys m_jKeys;
-  private javax.swing.JPanel jPanel11;
+    private javax.swing.JLabel m_jMoneyEuros;
-  private javax.swing.JPanel jPanel12;
+    private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
-  private javax.swing.JPanel jPanel4;
+    private javax.swing.JComboBox m_jVoucher;
-  private com.unicenta.editor.JEditorKeys m_jKeys;
+    private javax.swing.JLabel voucherStatus;
-  private javax.swing.JLabel m_jMoneyEuros;
+    private javax.swing.JLabel webLblCustomer;
-  private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
+    private javax.swing.JLabel webLblcustomerName;
-  private javax.swing.JComboBox m_jVoucher;
+    // End of variables declaration//GEN-END:variables
  private com.alee.laf.label.WebLabel voucherStatus;
  private com.alee.laf.label.WebLabel webLblCustomer;
  private com.alee.laf.label.WebLabel webLblcustomerName;
  // End of variables declaration//GEN-END:variables
 }
@@ -41,6 +41,8 @@ public class PaymentGatewayFac {
                return new PaymentGatewayPaymentSense();
            case "Teya":
                return new PaymentGatewayTeya();
            case "MediaPayments":
                return new PaymentGatewayMediaPayments();
            default:
                return null;
        }
@@ -0,0 +1,97 @@
 //    uniCenta oPOS  - Touch Friendly Point Of Sale
 //    Copyright (c) 2009-2018 uniCenta & previous Openbravo POS works
 //    https://unicenta.com
 //
 //    This file is part of uniCenta oPOS
 //
 //    uniCenta oPOS is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
 //    the Free Software Foundation, either version 3 of the License, or
 //    (at your option) any later version.
 //
 //   uniCenta oPOS is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //    GNU General Public License for more details.
 //
 //    You should have received a copy of the GNU General Public License
 //    along with uniCenta oPOS.  If not, see <http://www.gnu.org/licenses/>.
 package com.unicenta.pos.payment;
 import com.unicenta.plugins.Application;
 import com.unicenta.plugins.common.AppContext;
 import com.unicenta.pos.util.RoundUtils;
 import lombok.extern.slf4j.Slf4j;
 import java.awt.*;
 import java.util.ArrayList;
@Slf4j
 public class PaymentGatewayMediaPayments implements PaymentGateway {
  public PaymentGatewayMediaPayments() {
  }
  Window getPaymentWindow(double amount) {
    if (amount > 0) {
      ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
      for (Window window : Window.getWindows()) {
        if (window instanceof JPaymentSelectReceipt) {
          paymentWindows.add((JPaymentSelectReceipt) window);
        }
      }
      return paymentWindows.get(paymentWindows.size() - 1);
    } else {
      ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
      for (Window window : Window.getWindows()) {
        if (window instanceof JPaymentSelectRefund) {
          paymentWindows.add((JPaymentSelectRefund) window);
        }
      }
      return paymentWindows.get(paymentWindows.size() - 1);
    }
  }
  @Override
  public void execute(PaymentInfoMagcard payinfo) {
    int timer = 0;
    int timeout = 180;
    double roundedValue = RoundUtils.round(payinfo.getTotal());
    new Application().mediaPaymentsTransaction(roundedValue, getPaymentWindow(roundedValue),
        payinfo.getTransactionID().length() > 12 ? payinfo.getTransactionID() : null);
    while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
      try {
        log.info("uniCenta-oPos: waiting for payment to complete ....");
        Thread.sleep(1000);
        timer += 1;
        if (timer > timeout)
          break;
      } catch (InterruptedException e) {
        log.error(e.getMessage());
      }
    }
    if (AppContext.getMediaPaymentsPaymentResult() == null) {
      payinfo.paymentError("Transaction Error! Please try again", "No Response");
    } else if ("APPROVED".equals(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus())) {
      payinfo.setCardName(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getCard().getType());
      payinfo
          .setVerification(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getVerificationMethod());
      payinfo.setChipAndPin(true);
      payinfo.paymentOK(
          AppContext.getMediaPaymentsPaymentResult().getAdditionalInformation().getRequestId(),
          AppContext.getMediaPaymentsPaymentResult().getTransactionDetails().getId(),
          AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus());
    } else {
      String errorMsg = AppContext.getMediaPaymentsPaymentResult().getErrorMessage();
      if (errorMsg == null) {
        errorMsg = AppContext.getMediaPaymentsPaymentResult().getMessage();
      }
      payinfo.paymentError("Transaction Error! Please try again", errorMsg);
    }
  }
 }
@@ -23,121 +23,111 @@ import com.unicenta.format.Formats;
 public class PaymentInfoCash extends PaymentInfo {
-  private double prePayAmount = 0.0;
+    private double prePayAmount = 0.0;
-  private double m_dPaid;
+    private double m_dPaid;
-  private double m_dTotal;
+    private double m_dTotal;
-  private double m_dTendered;
+    private double m_dTendered;
-  private String m_dCardName = null;
+    private String m_dCardName =null;
-  private String m_sName = "cash";
+//    private double m_dTip;    
-  // private double m_dTip;
+    
-
+    /**
-  /**
+     * Creates a new instance of PaymentInfoCash
-   * Creates a new instance of PaymentInfoCash
+     * @param dTotal
-   * 
+     * @param dPaid
-   * @param dTotal
+     * @param dTendered
-   * @param dPaid
+     */
-   * @param dTendered
+    public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
-   */
+        m_dTotal = dTotal;
-  public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
+        m_dPaid = dPaid;
-    m_dTotal = dTotal;
+        m_dTendered = dTendered;
    m_dPaid = dPaid;
    m_dTendered = dTendered;
  }
  /**
   * Creates a new instance of PaymentInfoCash
   * 
   * @param dTotal
   * @param dPaid
   * @param dTendered
   * @param prePayAmount
   */
  public PaymentInfoCash(double dTotal, double dPaid, double dTendered, double prePayAmount) {
    this(dTotal, dTendered, dPaid);
    this.prePayAmount = prePayAmount;
  }
  /**
   * Creates a new instance of PaymentInfoCash
   * 
   * @param dTotal
   * @param dPaid
   */
  public PaymentInfoCash(double dTotal, double dPaid) {
    m_dTotal = dTotal;
    m_dPaid = dPaid;
  }
  @Override
  public PaymentInfo copyPayment() {
    return new PaymentInfoCash(m_dTotal, m_dPaid, m_dTendered, prePayAmount);
    // return new PaymentInfoCash(m_dTotal, m_dPaid, prePayAmount);
  }
  @Override
  public String getTransactionID() {
    return "no ID";
  }
  @Override
  public String getName() {
    return "cash";
  }
  @Override
  public double getTotal() {
    return m_dTotal;
  }
  // public double getTip() {
  // return m_dTip;
  // }
  @Override
  public double getPaid() {
    return m_dPaid;
  }
  @Override
  public double getTendered() {
    return m_dTendered;
  }
  @Override
  public double getChange() {
    return m_dPaid - m_dTotal;
  }
  @Override
  public String getCardName() {
    return m_dCardName;
  }
  public boolean hasPrePay() {
    if (prePayAmount > 0) {
      return true;
    }
    return false;
  }
-  public double getPrePaid() {
+    /**
-    return prePayAmount;
+     * Creates a new instance of PaymentInfoCash
-  }
+     * @param dTotal
     * @param dPaid
     * @param dTendered
     * @param prePayAmount
     */
    public PaymentInfoCash(double dTotal, double dPaid, double dTendered, double prePayAmount) {
        this(dTotal, dTendered, dPaid);
        this.prePayAmount = prePayAmount;
    }
    /** Creates a new instance of PaymentInfoCash
     * @param dTotal
     * @param dPaid */
    public PaymentInfoCash(double dTotal, double dPaid) {
        m_dTotal = dTotal;
        m_dPaid = dPaid;
    }
    @Override
    public PaymentInfo copyPayment() {
       return new PaymentInfoCash(m_dTotal, m_dPaid, m_dTendered, prePayAmount);
 //        return new PaymentInfoCash(m_dTotal, m_dPaid, prePayAmount);        
    }
-  public String printTendered() {
+    @Override
-    return Formats.CURRENCY.formatValue(m_dTendered);
+    public String getTransactionID() {
-  }
+        return "no ID";
    }
    @Override
    public String getName() {
        return "cash";
    }
    @Override
    public double getTotal() {
        return m_dTotal;
    }
 //    public double getTip() {
 //        return m_dTip;
 //    }
    @Override
    public double getPaid() {
        return m_dPaid;
    }
-  public String printPaid() {
+    @Override
-    return Formats.CURRENCY.formatValue(m_dPaid);
+    public double getTendered() {
-  }
+        return m_dTendered;
    }
-  public String printChange() {
+    @Override
-    return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
+   public double getChange(){
-  }
+       return m_dPaid - m_dTotal;
   }
-  @Override
+    @Override
-  public String getVoucher() {
+    public String getCardName() {
-    return null;
+       return m_dCardName;
-  }
+   }     
    public boolean hasPrePay() {
        if (prePayAmount > 0) {
            return true;
        }
        return false;
    }
    public double getPrePaid() {
        return prePayAmount;
    }
    public String printTendered() {
       return Formats.CURRENCY.formatValue(m_dTendered);
   }    
    public String printPaid() {
        return Formats.CURRENCY.formatValue(m_dPaid);
    }
    public String printChange() {
        return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
    }
    @Override
    public String getVoucher() {
        return null;
    }    
 }
@@ -26,83 +26,73 @@ import com.unicenta.format.Formats;
 * @author JG uniCenta
 */
 public class PaymentInfoCash_original extends PaymentInfo {
    private final double m_dPaid;
    private final double m_dTotal;
    private double m_dTendered;    
    private final String m_dCardName =null;
 //    private double m_dTip;    
    /** Creates a new instance of PaymentInfoCash
     * @param dTotal
     * @param dPaid */
    public PaymentInfoCash_original(double dTotal, double dPaid) {
        m_dTotal = dTotal;
        m_dPaid = dPaid;
    }
    @Override
    public PaymentInfo copyPayment(){
        return new PaymentInfoCash_original(m_dTotal, m_dPaid);
    }
    @Override
    public String getTransactionID(){
        return "no ID";
    }
-  private final double m_dPaid;
+    @Override
-  private final double m_dTotal;
+    public String getName() {
-  private double m_dTendered;
+        return "cash";
-  private final String m_dCardName = null;
+    }   
-  private String m_sName = "cash";
+    @Override
-  // private double m_dTip;
+    public double getTotal() {
        return m_dTotal;
    }   
 /**    public double getTip() {
        return m_dTip;
    }
     * @return 
 */
    @Override
    public double getPaid() {
        return m_dPaid;
    }
-  /**
+    @Override
-   * Creates a new instance of PaymentInfoCash
+    public double getTendered() {
-   * 
+        return m_dTendered;
-   * @param dTotal
+    }
   * @param dPaid
   */
  public PaymentInfoCash_original(double dTotal, double dPaid) {
    m_dTotal = dTotal;
    m_dPaid = dPaid;
  }
-  @Override
+    @Override
-  public PaymentInfo copyPayment() {
+    public double getChange(){
-    return new PaymentInfoCash_original(m_dTotal, m_dPaid);
+       return m_dPaid - m_dTotal;
-  }
+   }
-  @Override
+    @Override
-  public String getTransactionID() {
+   public String getCardName() {
-    return "no ID";
+       return m_dCardName;
-  }
+   }
-
+    public String printPaid() {
-  @Override
+        return Formats.CURRENCY.formatValue(m_dPaid);
-  public String getName() {
+    }   
-    return "cash";
+    public String printChange() {
-  }
+        return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
-
+    }
  @Override
  public double getTotal() {
    return m_dTotal;
  }
  /**
   * public double getTip() {
   * return m_dTip;
   * }
   * 
   * @return
   */
  @Override
  public double getPaid() {
    return m_dPaid;
  }
  @Override
  public double getTendered() {
    return m_dTendered;
  }
  @Override
  public double getChange() {
    return m_dPaid - m_dTotal;
  }
  @Override
  public String getCardName() {
    return m_dCardName;
  }
  public String printPaid() {
    return Formats.CURRENCY.formatValue(m_dPaid);
  }
  public String printChange() {
    return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
  }
  @Override
  public String getVoucher() {
    return null;
  }
    @Override
    public String getVoucher() {
        return null;
    }
 }
@@ -21,292 +21,290 @@ package com.unicenta.pos.payment;
 public class PaymentInfoMagcard extends PaymentInfo {
-  private String m_sName = "creditcard";
+    protected double m_dTotal;
-  protected double m_dTotal;
+    protected double m_dTip;
-  protected double m_dTip;
+    protected String m_sHolderName;
-  protected String m_sHolderName;
+    protected String m_sCardNumber;
-  protected String m_sCardNumber;
+    protected String m_sExpirationDate;
-  protected String m_sExpirationDate;
+    protected String track1;
-  protected String track1;
+    protected String track2;
-  protected String track2;
+    protected String track3;
-  protected String track3;
+    protected String m_sTransactionID;
-  protected String m_sTransactionID;
+    protected String m_sAuthorization;
-  protected String m_sAuthorization;
+    protected String m_sErrorMessage;
-  protected String m_sErrorMessage;
+    protected String m_sReturnMessage;
-  protected String m_sReturnMessage;
+    //JG Jan 2018 
-  // JG Jan 2018
+    protected String encryptedTrack;
-  protected String encryptedTrack;
+    protected String encryptionKey;
-  protected String encryptionKey;
+    protected String m_dCardName =null;
  protected String m_dCardName = null;
-  protected Boolean chipAndPin = Boolean.FALSE;
+    protected Boolean chipAndPin = Boolean.FALSE;
-  protected String verification;
+    protected String verification;
-  protected String lastFourDigits;
+    protected String lastFourDigits;
-  /**
+    /**
-   * Creates a new instance of PaymentInfoMagcard
+     * Creates a new instance of PaymentInfoMagcard
-   * 
+     * @param sHolderName
-   * @param sHolderName
+     * @param sCardNumber
-   * @param sCardNumber
+     * @param sExpirationDate
-   * @param sExpirationDate
+     * @param track1
-   * @param track1
+     * @param track2
-   * @param track2
+     * @param track3
-   * @param track3
+     * @param encryptedCard
-   * @param encryptedCard
+     * @param encryptKey
-   * @param encryptKey
+     * @param sTransactionID
-   * @param sTransactionID
+     * @param dTotal
-   * @param dTotal
+     */
-   */
+    public PaymentInfoMagcard(String sHolderName, String sCardNumber,
-  public PaymentInfoMagcard(String sHolderName, String sCardNumber,
+                              String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
-      String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
+                              String sTransactionID, double dTotal) {
-      String sTransactionID, double dTotal) {
+        m_sHolderName = sHolderName;
-    m_sHolderName = sHolderName;
+        m_sCardNumber = sCardNumber;
-    m_sCardNumber = sCardNumber;
+        m_sExpirationDate = sExpirationDate;
-    m_sExpirationDate = sExpirationDate;
+        this.track1 = track1;
-    this.track1 = track1;
+        this.track2 = track2;
-    this.track2 = track2;
+        this.track3 = track3;
-    this.track3 = track3;
+        encryptedTrack = encryptedCard;
-    encryptedTrack = encryptedCard;
+        encryptionKey = encryptKey;
-    encryptionKey = encryptKey;
+        m_sTransactionID = sTransactionID;
-    m_sTransactionID = sTransactionID;
+        m_dTotal = dTotal;
    m_dTotal = dTotal;
    m_sAuthorization = null;
    m_sErrorMessage = null;
    m_sReturnMessage = null;
  }
-  /**
+        m_sAuthorization = null;
-   * Creates a new instance of PaymentInfoMagcard
+        m_sErrorMessage = null;
-   * 
+        m_sReturnMessage = null;
   * @param sHolderName
   * @param sCardNumber
   * @param sExpirationDate
   * @param sTransactionID
   * @param dTotal
   */
  public PaymentInfoMagcard(String sHolderName, String sCardNumber,
      String sExpirationDate, String sTransactionID, double dTotal) {
    this(sHolderName, sCardNumber, sExpirationDate,
        null, null, null, null, null, sTransactionID, dTotal);
  }
  @Override
  public PaymentInfo copyPayment() {
    PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
        m_sCardNumber, m_sExpirationDate, track1, track2,
        track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
    p.m_sAuthorization = m_sAuthorization;
    p.m_sErrorMessage = m_sErrorMessage;
    return p;
  }
  public String getName() {
    // return "magcard";
    return "ccard";
  }
  @Override
  public double getTotal() {
    return m_dTotal;
  }
  public double getTip() {
    return m_dTip;
  }
  public boolean isPaymentOK() {
    return m_sAuthorization != null;
  }
  public String getHolderName() {
    return m_sHolderName;
  }
  @Override
  public String getCardName() {
    if (chipAndPin) {
      return m_dCardName;
    }
    return getCardType(m_sCardNumber);
  }
-  public String getCardNumber() {
+    /**
-    return m_sCardNumber;
+     * Creates a new instance of PaymentInfoMagcard
-  }
+     * @param sHolderName
-
+     * @param sCardNumber
-  public String getExpirationDate() {
+     * @param sExpirationDate
-    return m_sExpirationDate;
+     * @param sTransactionID
-  }
+     * @param dTotal
-
+     */
-  @Override
+    public PaymentInfoMagcard(String sHolderName, String sCardNumber,
-  public String getTransactionID() {
+                              String sExpirationDate, String sTransactionID, double dTotal) {
-    return m_sTransactionID;
+        this(sHolderName, sCardNumber, sExpirationDate,
-  }
+                null, null, null, null, null, sTransactionID, dTotal);
  /**
   * Get tracks of magnetic card. Framing characters: - start sentinel (SS) -
   * end sentinel (ES) - LRC
   *
   * @return tracks of the magnetic card
   */
  public String getEncryptedCardData() {
    return encryptedTrack;
  }
  public String getEncryptionKey() {
    return encryptionKey;
  }
  /**
   * @param sCardNumber
   * @return
   */
  public String getCardType(String sCardNumber) {
    String c = "UNKNOWN";
    if (sCardNumber.startsWith("4")) {
      c = "VISA";
    } else if (sCardNumber.startsWith("6")) {
      c = "DISC";
    } else if (sCardNumber.startsWith("5")) {
      c = "MAST";
    } else if (sCardNumber.startsWith("34") || sCardNumber.startsWith("37")) {
      c = "AMEX";
    } else if (sCardNumber.startsWith("3528") || sCardNumber.startsWith("3589")) {
      c = "JCB";
    } else if (sCardNumber.startsWith("3")) {
      c = "DINE";
    }
    m_sCardNumber = c;
    return c;
  }
-  public String getTrack1(boolean framingChar) {
+    @Override
-    return (framingChar)
+    public PaymentInfo copyPayment() {
-        ? track1
+        PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
-        : track1.substring(1, track1.length() - 2);
+                m_sCardNumber, m_sExpirationDate, track1, track2,
-  }
+                track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
-
+        p.m_sAuthorization = m_sAuthorization;
-  public String getTrack2(boolean framingChar) {
+        p.m_sErrorMessage = m_sErrorMessage;
-    return (framingChar)
+        return p;
        ? track2
        : track2.substring(1, track2.length() - 2);
  }
  public String getTrack3(boolean framingChar) {
    return (framingChar)
        ? track3
        : track3.substring(1, track3.length() - 2);
  }
  public String getAuthorization() {
    return m_sAuthorization;
  }
  public String getMessage() {
    return m_sErrorMessage;
  }
  public void paymentError(String sMessage, String moreInfo) {
    m_sAuthorization = null;
    m_sErrorMessage = sMessage + "\n" + moreInfo;
  }
  public void setReturnMessage(String returnMessage) {
    m_sReturnMessage = returnMessage;
  }
  public String getReturnMessage() {
    return m_sReturnMessage;
  }
  public void paymentOK(String sAuthorization, String sTransactionId, String sReturnMessage) {
    m_sAuthorization = sAuthorization;
    m_sTransactionID = sTransactionId;
    m_sReturnMessage = sReturnMessage;
    m_sErrorMessage = null;
  }
  public String printCardNumber() {
    System.out.println(m_sCardNumber);
    if (m_sCardNumber.length() > 4) {
      return m_sCardNumber.substring(0, m_sCardNumber.length() - 4).replaceAll("\\.", "*")
          + m_sCardNumber.substring(m_sCardNumber.length() - 4);
    } else {
      return "****";
    }
  }
-  public String printExpirationDate() {
+    public String getName() {
-    return m_sExpirationDate;
+//        return "magcard";
-  }
+        return "ccard";
    }
-  public String printAuthorization() {
+    @Override
-    return m_sAuthorization;
+    public double getTotal() {
-  }
+        return m_dTotal;
    }
-  public String printTransactionID() {
+    public double getTip() {
-    return m_sTransactionID;
+        return m_dTip;
-  }
+    }
-  public boolean getIsProcessed() {
+    public boolean isPaymentOK() {
-    throw new UnsupportedOperationException("Not supported yet.");
+        return m_sAuthorization != null;
-  }
+    }
-  public void setIsProcessed(boolean value) {
+    public String getHolderName() {
-    throw new UnsupportedOperationException("Not supported yet.");
+        return m_sHolderName;
-  }
+    }
-  @Override
+    @Override
-  public double getPaid() {
+    public String getCardName() {
-    return (0.0);
+        if (chipAndPin){
-  }
+            return m_dCardName;
        }
        return getCardType(m_sCardNumber);
    }
-  @Override
+    public String getCardNumber() {
-  public double getChange() {
+        return m_sCardNumber;
-    return 0.00;
+    }
  }
-  @Override
+    public String getExpirationDate() {
-  public double getTendered() {
+        return m_sExpirationDate;
-    return 0.00;
+    }
  }
-  @Override
+    @Override
-  public String getVoucher() {
+    public String getTransactionID() {
-    return null;
+        return m_sTransactionID;
-  }
+    }
-  public void setCardName(String m_dCardName) {
+    /**
-    this.m_dCardName = m_dCardName;
+     * Get tracks of magnetic card. Framing characters: - start sentinel (SS) -
-  }
+     * end sentinel (ES) - LRC
     *
     * @return tracks of the magnetic card
     */
    public String getEncryptedCardData() {
        return encryptedTrack;
    }
-  public Boolean isChipAndPin() {
+    public String getEncryptionKey() {
-    return chipAndPin;
+        return encryptionKey;
-  }
+    }
-  public void setChipAndPin(Boolean chipAndPin) {
+    /** @param sCardNumber
-    this.chipAndPin = chipAndPin;
+     * @return
-  }
+     */
    public String getCardType(String sCardNumber){
        String c = "UNKNOWN";
-  public String printVerification() {
+        if (sCardNumber.startsWith("4")) {
-    return verification;
+            c = "VISA";
-  }
+        } else if (sCardNumber.startsWith("6")) {
            c = "DISC";
        } else if (sCardNumber.startsWith("5")) {
            c = "MAST";
        } else if (sCardNumber.startsWith("34") || sCardNumber.startsWith("37")) {
            c = "AMEX";
        } else if (sCardNumber.startsWith("3528") || sCardNumber.startsWith("3589")) {
            c = "JCB";
        } else if (sCardNumber.startsWith("3")) {
            c = "DINE";
        }
        m_sCardNumber = c;
        return c;
    }
-  public void setVerification(String verification) {
+    public String getTrack1(boolean framingChar) {
-    this.verification = verification;
+        return (framingChar)
-  }
+                ? track1
                : track1.substring(1, track1.length() - 2);
    }
-  public String getLastFourDigits() {
+    public String getTrack2(boolean framingChar) {
-    return lastFourDigits;
+        return (framingChar)
-  }
+                ? track2
                : track2.substring(1, track2.length() - 2);
    }
-  public String printLastFourDigits() {
+    public String getTrack3(boolean framingChar) {
-    return lastFourDigits;
+        return (framingChar)
-  }
+                ? track3
                : track3.substring(1, track3.length() - 2);
    }
-  public void setLastFourDigits(String lastFourDigits) {
+    public String getAuthorization() {
-    this.lastFourDigits = lastFourDigits;
+        return m_sAuthorization;
-  }
+    }
-}
+
    public String getMessage() {
        return m_sErrorMessage;
    }
    public void paymentError(String sMessage, String moreInfo) {
        m_sAuthorization = null;
        m_sErrorMessage = sMessage + "\n" + moreInfo;
    }
    public void setReturnMessage(String returnMessage) {
        m_sReturnMessage = returnMessage;
    }
    public String getReturnMessage() {
        return m_sReturnMessage;
    }
    public void paymentOK(String sAuthorization, String sTransactionId, String sReturnMessage) {
        m_sAuthorization = sAuthorization;
        m_sTransactionID = sTransactionId;
        m_sReturnMessage = sReturnMessage;
        m_sErrorMessage = null;
    }
    public String printCardNumber() {
        System.out.println(m_sCardNumber);
        if (m_sCardNumber.length() > 4) {
            return m_sCardNumber.substring(0, m_sCardNumber.length() - 4).replaceAll("\\.", "*")
                    + m_sCardNumber.substring(m_sCardNumber.length() - 4);
        } else {
            return "****";
        }
    }
    public String printExpirationDate() {
        return m_sExpirationDate;
    }
    public String printAuthorization() {
        return m_sAuthorization;
    }
    public String printTransactionID() {
        return m_sTransactionID;
    }
    public boolean getIsProcessed() {
        throw new UnsupportedOperationException("Not supported yet.");
    }
    public void setIsProcessed(boolean value) {
        throw new UnsupportedOperationException("Not supported yet.");
    }
    @Override
    public double getPaid() {
        return (0.0);
    }
    @Override
    public double getChange(){
        return 0.00;
    }
    @Override
    public double getTendered() {
        return 0.00;
    }
    @Override
    public String getVoucher() {
        return null;
    }
    public void setCardName(String m_dCardName){
        this.m_dCardName = m_dCardName;
    }
    public Boolean isChipAndPin() {
        return chipAndPin;
    }
    public void setChipAndPin(Boolean chipAndPin) {
        this.chipAndPin = chipAndPin;
    }
    public String printVerification() {
        return verification;
    }
    public void setVerification(String verification) {
        this.verification = verification;
    }
    public String getLastFourDigits() {
        return lastFourDigits;
    }
    public String printLastFourDigits() {
        return lastFourDigits;
    }
    public void setLastFourDigits(String lastFourDigits) {
        this.lastFourDigits = lastFourDigits;
    }
 }
@@ -26,45 +26,31 @@ import java.io.Serializable;
 */
 public class UserInfo implements Serializable {
-  private static final long serialVersionUID = 7537578737839L;
+    private static final long serialVersionUID = 7537578737839L;
-  private String m_sId;
+    private String m_sId;
-  private String m_sName;
+    private String m_sName;
  private String taxId;
-  /**
+    /** Creates a new instance of UserInfoBasic
-   * Creates a new instance of UserInfoBasic
+     * @param id
-   * 
+     * @param name */
-   * @param id
+    public UserInfo(String id, String name) {
-   * @param name
+        m_sId = id;
-   */
+        m_sName = name;
-  public UserInfo(String id, String name) {
+    }
    m_sId = id;
    m_sName = name;
  }
-  public UserInfo(String id, String name, String taxId) {
+    /**
-    m_sId = id;
+     *
-    m_sName = name;
+     * @return
-    this.taxId = taxId;
+     */
-  }
+    public String getId() {
        return m_sId;
    }
-  /**
+    /**
-   *
+     *
-   * @return
+     * @return
-   */
+     */
-  public String getId() {
+    public String getName() {
-    return m_sId;
+        return m_sName;
-  }
+    }
  /**
   *
   * @return
   */
  public String getName() {
    return m_sName;
  }
  public String getTaxID() {
    return taxId;
  }
 }
@@ -24,124 +24,132 @@ import com.unicenta.data.loader.DataRead;
 import com.unicenta.data.loader.IKeyed;
 import com.unicenta.data.loader.SerializerRead;
 import lombok.extern.slf4j.Slf4j;
@Slf4j
 public class VoucherInfo implements IKeyed {
-    private String id;
+  private String id;
-    private String voucherNumber;
+  private String voucherNumber;
-    private String customerName;
+  private String customerName;
-    private double amount;
+  private double amount;
-    private String status;
+  private String status;
-    public VoucherInfo() {
+  public VoucherInfo() {
-    }
+  }
-    public VoucherInfo(
+  public VoucherInfo(
-        String id, 
+      String id,
-        String voucherNumber, 
+      String voucherNumber,
-        String customerName,
+      String customerName,
-        double amount, 
+      double amount,
-        String status) 
+      String status) {
-    {
+    this.id = id;
-        this.id = id;
+    this.voucherNumber = voucherNumber;
-        this.voucherNumber = voucherNumber;
+    this.customerName = customerName;
-        this.customerName = customerName;
+    this.amount = amount;
-        this.amount = amount;
+    this.status = status;
-        this.status = status;
+  }
    }
-    @Override
+  @Override
-    public Object getKey() {
+  public Object getKey() {
-        return getId();
+    return getId();
-    }
+  }
-    /**
+  /**
-     * @return the id
+   * @return the id
-     */
+   */
-    public String getId() {
+  public String getId() {
-        return id;
+    return id;
-    }
+  }
-    /**
+  /**
-     * @param id the id to set
+   * @param id the id to set
-     */
+   */
-    public void setId(String id) {
+  public void setId(String id) {
-        this.id = id;
+    this.id = id;
-    }
+  }
-    /**
+  /**
-     * @return the voucherNumber
+   * @return the voucherNumber
-     */
+   */
-    public String getVoucherNumber() {
+  public String getVoucherNumber() {
-        return voucherNumber;
+    return voucherNumber;
-    }
+  }
-    /**
+  /**
-     * @param voucherNumber the voucherNumber to set
+   * @param voucherNumber the voucherNumber to set
-     */
+   */
-    public void setVoucherNumber(String voucherNumber) {
+  public void setVoucherNumber(String voucherNumber) {
-        this.voucherNumber = voucherNumber;
+    this.voucherNumber = voucherNumber;
-    }
+  }
    /**
     * @return the customerName
     */
    public String getCustomerName() {
        return customerName;
    }
-    /**
+  /**
-     * @param customerName the customerName to set
+   * @return the customerName
-     */
+   */
-    public void setCustomerName(String customerName) {
+  public String getCustomerName() {
-        this.customerName = customerName;
+    return customerName;
-    }
+  }
-    /**
+  /**
-     * @return the amount
+   * @param customerName the customerName to set
-     */
+   */
-    public double getAmount() {
+  public void setCustomerName(String customerName) {
-        return amount;
+    this.customerName = customerName;
-    }
+  }
-    /**
+  /**
-     * @param amount the amount to set
+   * @return the amount
-     */
+   */
-    public void setAmount(double amount) {
+  public double getAmount() {
-        this.amount = amount;
+    return amount;
-    }
+  }
     @Override
    public String toString() {
        return voucherNumber;
    }
    /**
     * @return the status
     */
    public String getStatus() {
        return status;
    }
-    /**
+  /**
-     * @param status the status to set
+   * @param amount the amount to set
-     */
+   */
-    public void setStatus(String status) {
+  public void setAmount(double amount) {
-        this.status = status;
+    this.amount = amount;
-    }
+  }
-    public static SerializerRead getSerializerRead() {
+  @Override
-        return new SerializerRead() 
+  public String toString() {
-        {
+    return voucherNumber;
-            @Override
+  }
-        public Object readValues(DataRead dr) throws BasicException {
+
-            return new VoucherInfo(
+  /**
-                    dr.getString(1), 
+   * @return the status
-                    dr.getString(2), 
+   */
-                    dr.getString(3),
+  public String getStatus() {
-                    dr.getDouble(4),
+    return status;
-                    dr.getString(5));            
+  }
-        }};
+
-    }    
+  /**
   * @param status the status to set
   */
  public void setStatus(String status) {
    this.status = status;
  }
  public static SerializerRead getSerializerRead() {
    return new SerializerRead() {
      @Override
      public Object readValues(DataRead dr) throws BasicException {
        VoucherInfo voucherInfo = null;
        try {
          voucherInfo = new VoucherInfo(
              dr.getString(1),
              dr.getString(2),
              dr.getString(3),
              dr.getDouble(4),
              dr.getString(5));
        } catch (Exception e) {
          log.error("Error reading voucher info: {}", e.getMessage());
          log.error(dr.getString(2));
        }
        return voucherInfo;
      }
    };
  }
 }
@@ -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;
+UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
 --ALTER TABLE people ADD COLUMN taxId VARCHAR(100);
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
@@ -271,7 +271,6 @@ CREATE TABLE `people` (
 	`id` varchar(255) NOT NULL,
 	`name` varchar(255) NOT NULL,
 	`apppassword` varchar(255) default NULL,
 	`taxId` varchar(255) default NULL,
 	`card` varchar(255) default NULL,
 	`role` varchar(255) NOT NULL,
 	`visible` bit(1) NOT NULL,
@@ -1001,4 +1000,4 @@ INSERT INTO ticketsnum_refund VALUES(1);
 INSERT INTO ticketsnum_payment VALUES(1);
 -- ADD APPLICATION VERSION
-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
@@ -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,
@@ -976,4 +975,4 @@ INSERT INTO ticketsnum_refund VALUES(1);
 INSERT INTO ticketsnum_payment VALUES(1);
 -- ADD APPLICATION VERSION
-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
@@ -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
@@ -1187,5 +1187,4 @@ label.csvclear=Diario de importaci\u00f3n
 message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 4.5 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
 label.find=Buscar
 label.create=Crear
-label.cancel=Cancelar
+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
@@ -468,6 +468,4 @@ transpayment.ticket=Ticket
 transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
-message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.3 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.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	68341cf1b6	removing github references.	2026-07-06 14:56:59 +01:00
hugh	1c2196d0d2	adding gnu gpl3 license	2026-07-06 14:54:51 +01:00
hugh	2234f32e68	5.5.0 release	2026-06-15 16:57:51 +01:00
hugh	d095908e42	Squash merge 5.5.0-development into main	2026-06-15 16:48:30 +01:00
hugh	aa6c87ab90	don't need to track these	2026-04-13 21:13:08 +01:00