jvm 17 wip

.gitignore

@@ -7,7 +7,4 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
-.settings/
+
-.classpath
-.factorypath
-.project

.mvn/wrapper/MavenWrapperDownloader.java

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

.mvn/wrapper/maven-wrapper.properties

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

mvnw

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

mvnw.cmd

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

pom.xml

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

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

@@ -19,10 +19,93 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
   </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="separate" max="-2" attributes="0"/>
+                      <Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="webCBSecurity" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                          <Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="1" attributes="0">
+              <EmptySpace type="separate" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="2" attributes="0">
+                  <Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" 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"/>
+                  <Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
+                  <Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
   <SubComponents>
-    <Component class="javax.swing.JLabel" name="nameLabel">
+    <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -38,10 +121,10 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JTextField" name="nameTextField">
+    <Component class="javax.swing.JTextField" name="m_jName">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -51,7 +134,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="isVisible">
+    <Component class="javax.swing.JCheckBox" name="m_jVisible">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -61,7 +144,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="visiableLabel">
+    <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -74,7 +157,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="imageLabel">
+    <Component class="javax.swing.JLabel" name="jLabel4">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -87,7 +170,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
+    <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -127,7 +210,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="roleLabel">
+    <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -140,7 +223,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="cardIdTextField">
+    <Component class="javax.swing.JTextField" name="m_jcard">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -150,7 +233,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="cardIdLabel">
+    <Component class="javax.swing.JLabel" name="jLblCardID">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -163,7 +246,33 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="passwordLabel">
+    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="3">
+            <StringItem index="0" value="Generate new key"/>
+            <StringItem index="1" value="Delete exisitng key"/>
+            <StringItem index="2" value="Use iButton ID"/>
+          </StringArray>
+        </Property>
+        <Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="0" type="code"/>
+        </Property>
+        <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>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
+      </Events>
+    </Component>
+    <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"/>
@@ -176,12 +285,5 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="taxIdLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Tax ID"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JTextField" name="taxIdTextField">
-    </Component>
   </SubComponents>
 </Form>

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

@@ -42,368 +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 DirtyManager m_Dirty;
     
-  private final SentenceList m_sentrole;
+    private final SentenceList m_sentrole;
-  private ComboBoxValModel m_RoleModel;
+    private ComboBoxValModel m_RoleModel;  
     
-  private final ComboBoxValModel m_ReasonModel;
+    private final ComboBoxValModel m_ReasonModel;        
     
-  /**
+    /** Creates new form PeopleEditor
-   * Creates new form PeopleEditor
+     * @param dlAdmin
-   * 
+     * @param dirty */
-   * @param dlAdmin
+    public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
-   * @param dirty
-   */
-  public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
-    initComponents();
+        initComponents();
                 
-    // El modelo de roles
+        // El modelo de roles
-    m_sentrole = dlAdmin.getRolesList();
+        m_sentrole = dlAdmin.getRolesList();
-    m_RoleModel = new ComboBoxValModel();
+        m_RoleModel = new ComboBoxValModel();
         
-    m_Dirty = dirty;
+        m_Dirty = dirty;
-    nameTextField.getDocument().addDocumentListener(dirty);
+        m_jName.getDocument().addDocumentListener(dirty);
-    m_jRole.addActionListener(dirty);
+        m_jRole.addActionListener(dirty);
-    isVisible.addActionListener(dirty);
+        m_jVisible.addActionListener(dirty);
-    imageEditor.addPropertyChangeListener("image", dirty);
+        m_jImage.addPropertyChangeListener("image", dirty);
-    cardIdTextField.getDocument().addDocumentListener(dirty);
+        m_jcard.getDocument().addDocumentListener(dirty);
 
-    m_ReasonModel = new ComboBoxValModel();
+        m_ReasonModel = new ComboBoxValModel();
-    m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
+        m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
-    m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
+        m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));              
-    m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
+        m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));                      
         
-    webCBSecurity.setModel(m_ReasonModel);
+        webCBSecurity.setModel(m_ReasonModel);
         
-    writeValueEOF();
+        writeValueEOF();
-  }
-
-  /**
-   *
-   */
-  @Override
-  public void writeValueEOF() {
-    m_oId = null;
-    nameTextField.setText(null);
-    m_sPassword = null;
-    m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(false);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(false);
-    m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
-    jButton1.setEnabled(false);
-    webCBSecurity.setEnabled(false);
-  }
-
-  /**
-   *
-   */
-  @Override
-  public void writeValueInsert() {
-    m_oId = null;
-    nameTextField.setText(null);
-    m_sPassword = null;
-    m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(true);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(true);
-    m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.setEnabled(true);
-    jButton1.setEnabled(true);
-    webCBSecurity.setEnabled(true);
-  }
-
-  /**
-   *
-   * @param value
-   */
-  @Override
-  public void writeValueDelete(Object value) {
-    Object[] people = (Object[]) value;
-    m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
-    m_sPassword = Formats.STRING.formatValue(people[2]);
-    m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
-
-    nameTextField.setEnabled(false);
-    m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
-    jButton1.setEnabled(false);
-    webCBSecurity.setEnabled(false);
-  }
-
-  /**
-   *
-   * @param value
-   */
-  @Override
-  public void writeValueEdit(Object value) {
-    Object[] people = (Object[]) value;
-    m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
-    m_sPassword = Formats.STRING.formatValue(people[2]);
-    m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
-
-    if (cardIdTextField.getText().length() == 16) {
-      cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
-    } else {
-      cardIdLabel.setText(AppLocal.getIntString("label.card"));
-    }
-    System.out.println(cardIdTextField.getText().length());
-
-    nameTextField.setEnabled(true);
-    m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.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(nameTextField.getText());
-    people[2] = Formats.STRING.parseValue(m_sPassword);
-    people[3] = m_RoleModel.getSelectedKey();
-    people[4] = isVisible.isSelected();
-    people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
-    people[6] = imageEditor.getImage();
-    return people;
-  }
-
-  /**
-   *
-   * @return
-   */
-  @Override
-  public Component getComponent() {
-    return this;
-  }
-
-  /**
-   *
-   * @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() {
-
-    nameLabel = new javax.swing.JLabel();
-    nameTextField = new javax.swing.JTextField();
-    isVisible = new javax.swing.JCheckBox();
-    visiableLabel = new javax.swing.JLabel();
-    imageLabel = new javax.swing.JLabel();
-    imageEditor = new com.unicenta.data.gui.JImageEditor();
-    jButton1 = new javax.swing.JButton();
-    m_jRole = new javax.swing.JComboBox();
-    roleLabel = new javax.swing.JLabel();
-    cardIdTextField = new javax.swing.JTextField();
-    cardIdLabel = new javax.swing.JLabel();
-    passwordLabel = new javax.swing.JLabel();
-    taxIdLabel = new javax.swing.JLabel();
-    taxIdTextField = new javax.swing.JTextField();
-
-    setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    setPreferredSize(new java.awt.Dimension(500, 500));
-
-    nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-    nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-    nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
-      public void mouseClicked(java.awt.event.MouseEvent evt) {
-        nameLabelMouseClicked(evt);
-      }
-    });
-    add(nameLabel);
-
-    nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(nameTextField);
-
-    isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(isVisible);
-
-    visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-    visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(visiableLabel);
-
-    imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-    imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(imageLabel);
-
-    imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
-    add(imageEditor);
-
-    jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
-    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);
-      }
-    });
-    add(jButton1);
-
-    m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(m_jRole);
-
-    roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
-    roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(roleLabel);
-
-    cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(cardIdTextField);
-
-    cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
-    cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(cardIdLabel);
-
-    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));
-    add(passwordLabel);
-
-    taxIdLabel.setText("Tax ID");
-    add(taxIdLabel);
-    add(taxIdTextField);
-  }// </editor-fold>//GEN-END:initComponents
-
-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
-
-    String sNewPassword = Hashcypher.changePassword(this);
-    if (sNewPassword != null) {
-      m_sPassword = sNewPassword;
-      m_Dirty.setDirty(true);
     }
 
-  }// GEN-LAST:event_jButton1ActionPerformed
+    /**
-
+     *
-  private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
+     */
-
+    @Override
-    if (webCBSecurity.getSelectedIndex() == 0) {
+    public void writeValueEOF() {
-      if (JOptionPane.showConfirmDialog(this,
+        m_oId = null;
-          AppLocal.getIntString("message.cardnew"),
+        m_jName.setText(null);
-          AppLocal.getIntString("title.editor"),
+        m_sPassword = null;
-          JOptionPane.YES_NO_OPTION,
+        m_RoleModel.setSelectedKey(null);
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+        m_jVisible.setSelected(false);
-        cardIdTextField.setText("C" + StringUtils.getCardNumber());
+        m_jcard.setText(null);
-        m_Dirty.setDirty(true);
+        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);
     }
     
-    if (webCBSecurity.getSelectedIndex() == 1) {
+    /**
-      if (JOptionPane.showConfirmDialog(this,
+     *
-          AppLocal.getIntString("message.cardremove"),
+     */
-          AppLocal.getIntString("title.editor"),
+    @Override
-          JOptionPane.YES_NO_OPTION,
+    public void writeValueInsert() {
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+        m_oId = null;
-        cardIdTextField.setText(null);
+        m_jName.setText(null);
-        m_Dirty.setDirty(true);
+        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);        
     }
     
-    if (webCBSecurity.getSelectedIndex() == 2) {
+    /**
-      if (JOptionPane.showConfirmDialog(this,
+     *
-          AppLocal.getIntString("message.ibuttonassign"),
+     * @param value
-          AppLocal.getIntString("title.editor"),
+     */
-          JOptionPane.OK_CANCEL_OPTION,
+    @Override
-          JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
+    public void writeValueDelete(Object value) {
-
+        Object[] people = (Object[]) value;
-      {
+        m_oId = people[0];
-        cardIdTextField.setText(uOWWatch.getibuttonid());
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
-        cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+        m_sPassword = Formats.STRING.formatValue(people[2]);
-        m_Dirty.setDirty(true);
+        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);        
     }
 
-  }// GEN-LAST:event_webCBSecurityActionPerformed
+    /**
+     *
+     * @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]);
         
-  private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
+        if (m_jcard.getText().length() == 16) {
-    if (evt.getClickCount() == 2) {
+            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-      String uuidString = m_oId.toString();
+        } else {
-      StringSelection stringSelection = new StringSelection(uuidString);
+            jLblCardID.setText(AppLocal.getIntString("label.card"));            
-      Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
+        }
-      clpbrd.setContents(stringSelection, null);
+        System.out.println(m_jcard.getText().length());        
         
-      JOptionPane.showMessageDialog(null,
+        m_jName.setEnabled(true);
-          AppLocal.getIntString("message.uuidcopy"));
+        m_jRole.setEnabled(true);
+        m_jVisible.setEnabled(true);
+        m_jcard.setEnabled(true);
+        m_jImage.setEnabled(true);
+        jButton1.setEnabled(true);
+        webCBSecurity.setEnabled(true);        
     }
-  }// GEN-LAST:event_nameLabelMouseClicked
     
-  // Variables declaration - do not modify//GEN-BEGIN:variables
+    /**
-  private javax.swing.JLabel cardIdLabel;
+     *
-  private javax.swing.JTextField cardIdTextField;
+     * @return
-  private com.unicenta.data.gui.JImageEditor imageEditor;
+     * @throws BasicException
-  private javax.swing.JLabel imageLabel;
+     */
-  private javax.swing.JCheckBox isVisible;
+    @Override
-  private javax.swing.JButton jButton1;
+    public Object createValue() throws BasicException {
-  private javax.swing.JComboBox m_jRole;
+        Object[] people = new Object[7];
-  private javax.swing.JLabel nameLabel;
+        people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
-  private javax.swing.JTextField nameTextField;
+        people[1] = Formats.STRING.parseValue(m_jName.getText());
-  private javax.swing.JLabel passwordLabel;
+        people[2] = Formats.STRING.parseValue(m_sPassword);
-  private javax.swing.JLabel roleLabel;
+        people[3] = m_RoleModel.getSelectedKey();
-  private javax.swing.JLabel taxIdLabel;
+        people[4] = m_jVisible.isSelected();
-  private javax.swing.JTextField taxIdTextField;
+        people[5] = Formats.STRING.parseValue(m_jcard.getText());
-  private javax.swing.JLabel visiableLabel;
+        people[6] = m_jImage.getImage();
-  private com.alee.laf.combobox.WebComboBox webCBSecurity;
+        return people;
-  // End of variables declaration//GEN-END:variables
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Override
+    public Component getComponent() {
+        return this;
+    }
+
+    /**
+     *
+     * @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() {
+
+        jLabel1 = new javax.swing.JLabel();
+        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));
+
+        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+        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
+        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
+
+        jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
+        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
+        m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
+        webCBSecurity.setSelectedIndex(0);
+        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
+        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
+        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                webCBSecurityActionPerformed(evt);
+            }
+        });
+
+        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
+        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        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, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(18, 18, 18)
+                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jLabel1, 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))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addGap(18, 18, 18)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jButton1, 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(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(15, 15, 15)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+
+        String sNewPassword = Hashcypher.changePassword(this);
+        if (sNewPassword != null) {
+            m_sPassword = sNewPassword;
+            m_Dirty.setDirty(true);
+        }
+
+    }//GEN-LAST:event_jButton1ActionPerformed
+
+    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 (JOptionPane.showConfirmDialog(this, 
+                AppLocal.getIntString("message.cardremove"), 
+                AppLocal.getIntString("title.editor"), 
+                JOptionPane.YES_NO_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() );
+                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+                m_Dirty.setDirty(true);
+            }
+
+        }                
+               
+    }//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 jLabel6;
+    private javax.swing.JLabel jLblCardID;
+    private com.unicenta.data.gui.JImageEditor m_jImage;
+    private javax.swing.JTextField m_jName;
+    private javax.swing.JComboBox m_jRole;
+    private javax.swing.JCheckBox m_jVisible;
+    private javax.swing.JTextField m_jcard;
+    private com.alee.laf.combobox.WebComboBox webCBSecurity;
+    // End of variables declaration//GEN-END:variables
     
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -44,8 +44,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
 /**
@@ -82,7 +80,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
 
     protected SaveProvider spr;
  
-    private String category;
+    private String Category;
     private String categoryName;
     private String categoryParentid;
     private Integer categoryCatorder;
@@ -294,7 +292,6 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
      * the UI responsiveness.
     */
     private void setWorker() {
-        ExecutorService customExecutor = Executors.newCachedThreadPool();
         progress = 0;
         webPBar.setStringPainted(true);
 
@@ -323,8 +320,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 }    
             }
         };
-        //pbWorker.execute();
+        pbWorker.execute();
-        customExecutor.submit(pbWorker);
     }
 
     /**
@@ -374,7 +370,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 String SellPrice = products.get((String) jComboSell.getSelectedItem());
                 productTax = products.get((String) jComboTax.getSelectedItem());                
                 
-                category = products.get((String) jComboCategory.getSelectedItem());
+                Category = products.get((String) jComboCategory.getSelectedItem());
                 Supplier = products.get((String) jComboSupplier.getSelectedItem());                
                 
                 currentRecord++;
@@ -518,17 +514,17 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
     private String getCategory() {
 
         if (jComboCategory.getSelectedItem() != category_default) {
-            String cat = (String) cat_list.get(category);
+            String cat = (String) cat_list.get(Category);
 
             if (cat != null) {
                 return (cat);
             }
         }
 
-        if (!category.equals("")) {
+        if (!Category.equals("")) {
             Object[] newcat = new Object[3];
             newcat[0] = UUID.randomUUID().toString();
-            newcat[1] = category;
+            newcat[1] = Category;
             newcat[2] = true;
 
             try {
@@ -539,15 +535,15 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                     m_CategoryModel.setSelectedItem(category);
                     cat_list.put(category.toString(), m_CategoryModel.getSelectedKey().toString());
                 }
-                    String cat = (String) cat_list.get(category);
+                    String cat = (String) cat_list.get(Category);
                     return (cat);
                 } catch (BasicException ex) {
                 log.error(ex.getMessage());
                 }
             }
 
-        if (!badCategories.contains(category)) {
+        if (!badCategories.contains(Category)) {
-            badCategories.add(category.trim());                                 // Save a list of the bad categories
+            badCategories.add(Category.trim());                                 // Save a list of the bad categories
         }
         return ((jComboDefaultCategory.getSelectedItem() 
                 == reject_bad_category) 
@@ -968,7 +964,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
         myprod[7] = productSellPrice;                                           // Sell price
         myprod[8] = previousBuy;                                                // Previous Buy price double
         myprod[9] = previousSell;                                               // Previous Sell price double
-        myprod[10] = category;                                                  // Category
+        myprod[10] = Category;                                                  // Category
         myprod[11] = productTax;                                                // Tax
         myprod[12] = Supplier;                                                  // Supplier
         try {

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

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

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

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

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

@@ -39,8 +39,6 @@ import javax.imageio.ImageIO;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
-import com.unicenta.pos.util.QRCode;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -105,7 +103,7 @@ public class TicketParser extends DefaultHandler {
      */
     public void printTicket(String sIn, TicketInfo ticket) throws TicketPrinterException {
 //       cUser=ticket.getUser().getName();
-        cUser=ticket.getName();
+       cUser=ticket.getName();        
         ticketId=Integer.toString(ticket.getTicketId()); 
         pickupId=Integer.toString(ticket.getPickupId());
         
@@ -177,156 +175,153 @@ public class TicketParser extends DefaultHandler {
         Date dNow = new Date();
         
         switch (m_iOutputType) {
-            case OUTPUT_NONE:
+        case OUTPUT_NONE:
+        switch (qName) {
+            case "opendrawer":
+                m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1")).openDrawer();
+                // Cashdrawer has been activated record the data in the table
+                try {
+                    m_system.execDrawerOpened(
+                            //new Object[] {df.format(dNow),cUser,ticketId});
+                             new Object[] {cUser,ticketId});
+                } catch (BasicException ex) {}
+                break;
+            case "play":
+                text = new StringBuilder();
+                break;
+            case "ticket":
+                m_iOutputType = OUTPUT_TICKET;
+                m_oOutputPrinter = m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1"));
+                m_oOutputPrinter.beginReceipt();
+                break;
+            case "display":
+                m_iOutputType = OUTPUT_DISPLAY;
+                String animation = attributes.getValue("animation");
+                if ("scroll".equals(animation)) {
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_SCROLL;
+                } else if ("flyer".equals(animation)) {
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_FLYER;
+                } else if ("blink".equals(animation)) {
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_BLINK;
+                } else if ("curtain".equals(animation)) {
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_CURTAIN;
+                } else { // "none"
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
+                }
+                m_sVisorLine1 = null;
+                m_sVisorLine2 = null;                
+                m_oOutputPrinter = null;
+                break;
+            case "fiscalreceipt":
+                m_iOutputType = OUTPUT_FISCAL;
+                m_printer.getFiscalPrinter().beginReceipt();
+                break;
+            case "fiscalzreport":
+                m_printer.getFiscalPrinter().printZReport();
+                break;
+            case "fiscalxreport":
+                m_printer.getFiscalPrinter().printXReport();
+                break;
+        }
+            break;
+        case OUTPUT_TICKET:
+            if (null != qName)switch (qName) {
+            case "logo":
+                text = new StringBuilder();
+                break;
+            case "image":
+                text = new StringBuilder();
+                break;
+            case "barcode":
+                text = new StringBuilder();
+                bctype = attributes.getValue("type");
+                bcposition = attributes.getValue("position");
+                break;
+            case "line":
+                m_oOutputPrinter.beginLine(parseInt(attributes.getValue("size"), DevicePrinter.SIZE_0));
+                break;
+            case "text":
+                text = new StringBuilder();
+                m_iTextStyle = ("true".equals(attributes.getValue("bold")) 
+                        ? DevicePrinter.STYLE_BOLD : DevicePrinter.STYLE_PLAIN)
+                        | ("true".equals(attributes.getValue("underline")) 
+                        ? DevicePrinter.STYLE_UNDERLINE : DevicePrinter.STYLE_PLAIN);
+                String sAlign = attributes.getValue("align");
+                if (null == sAlign) {
+                    m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                } else switch (sAlign) {
+            case "right":
+                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
+                break;
+            case "center":
+                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
+                break;
+            default:
+                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                break;
+        }
+                m_iTextLength = parseInt(attributes.getValue("length"), 0);
+                break;
+            default:
+                break;
+        }
+            break;
+        case OUTPUT_DISPLAY:
+            if (null != qName) switch (qName) {
+            case "line":
+                // line 1 or 2 of the display
+                m_sVisorLine = new StringBuilder();
+                break;
+            case "line1":
+                // linea 1 del visor
+                m_sVisorLine = new StringBuilder();
+                break;
+            case "line2":
+                // linea 2 del visor
+                m_sVisorLine = new StringBuilder();
+                break;
+            case "text":
+                text = new StringBuilder();
+                String sAlign = attributes.getValue("align");
+                if (null == sAlign) {
+                    m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                } else switch (sAlign) {
+            case "right":
+                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
+                break;
+            case "center":
+                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
+                break;
+            default:
+                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                break;
+        }
+                m_iTextLength = parseInt(attributes.getValue("length"));
+                break;
+            default:
+                break;
+        }
+            break;
+        case OUTPUT_FISCAL:
+            if (null != qName) 
                 switch (qName) {
-                    case "opendrawer":
-                        m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1")).openDrawer();
-                        // Cashdrawer has been activated record the data in the table
-                        try {
-                            m_system.execDrawerOpened(
-                                    //new Object[] {df.format(dNow),cUser,ticketId});
-                                    new Object[] {cUser,ticketId});
-                        } catch (BasicException ex) {}
-                        break;
-                    case "play":
-                        text = new StringBuilder();
-                        break;
-                    case "ticket":
-                        m_iOutputType = OUTPUT_TICKET;
-                        m_oOutputPrinter = m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1"));
-                        m_oOutputPrinter.beginReceipt();
-                        break;
-                    case "display":
-                        m_iOutputType = OUTPUT_DISPLAY;
-                        String animation = attributes.getValue("animation");
-                        if ("scroll".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_SCROLL;
-                        } else if ("flyer".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_FLYER;
-                        } else if ("blink".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_BLINK;
-                        } else if ("curtain".equals(animation)) {
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_CURTAIN;
-                        } else { // "none"
-                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
-                        }
-                        m_sVisorLine1 = null;
-                        m_sVisorLine2 = null;
-                        m_oOutputPrinter = null;
-                        break;
-                    case "fiscalreceipt":
-                        m_iOutputType = OUTPUT_FISCAL;
-                        m_printer.getFiscalPrinter().beginReceipt();
-                        break;
-                    case "fiscalzreport":
-                        m_printer.getFiscalPrinter().printZReport();
-                        break;
-                    case "fiscalxreport":
-                        m_printer.getFiscalPrinter().printXReport();
-                        break;
-                }
-                break;
-            case OUTPUT_TICKET:
-                if (null != qName)switch (qName) {
-                    case "logo":
-                        text = new StringBuilder();
-                        break;
-                    case "image":
-                        text = new StringBuilder();
-                        break;
-                    case "barcode":
-                        text = new StringBuilder();
-                        bctype = attributes.getValue("type");
-                        bcposition = attributes.getValue("position");
-                        break;
-                    case "qr-code":
-                        text = new StringBuilder();
-                        break;
                     case "line":   
-                        m_oOutputPrinter.beginLine(parseInt(attributes.getValue("size"), DevicePrinter.SIZE_0));
-                        break;
-                    case "text":
                         text = new StringBuilder();
-                        m_iTextStyle = ("true".equals(attributes.getValue("bold"))
+                        m_dValue1 = parseDouble(attributes.getValue("price"));
-                                ? DevicePrinter.STYLE_BOLD : DevicePrinter.STYLE_PLAIN)
+                        m_dValue2 = parseDouble(attributes.getValue("units"), 1.0);
-                                | ("true".equals(attributes.getValue("underline"))
+                        attribute3 = parseInt(attributes.getValue("tax"));
-                                ? DevicePrinter.STYLE_UNDERLINE : DevicePrinter.STYLE_PLAIN);
+                        break; 
-                        String sAlign = attributes.getValue("align");
+                    case "message":
-                        if (null == sAlign) {
+                        text = new StringBuilder();
-                            m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                        break;
-                        } else switch (sAlign) {
+                    case "total":    
-                            case "right":
+                        text = new StringBuilder();
-                                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
+                        m_dValue1 = parseDouble(attributes.getValue("paid"));
-                                break;
-                            case "center":
-                                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
-                                break;
-                            default:
-                                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                                break;
-                        }
-                        m_iTextLength = parseInt(attributes.getValue("length"), 0);
                         break;
                     default:
                         break;
                 }
-                break;
+            break;
-            case OUTPUT_DISPLAY:
-                if (null != qName) switch (qName) {
-                    case "line":
-                        // line 1 or 2 of the display
-                        m_sVisorLine = new StringBuilder();
-                        break;
-                    case "line1":
-                        // linea 1 del visor
-                        m_sVisorLine = new StringBuilder();
-                        break;
-                    case "line2":
-                        // linea 2 del visor
-                        m_sVisorLine = new StringBuilder();
-                        break;
-                    case "text":
-                        text = new StringBuilder();
-                        String sAlign = attributes.getValue("align");
-                        if (null == sAlign) {
-                            m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                        } else switch (sAlign) {
-                            case "right":
-                                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
-                                break;
-                            case "center":
-                                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
-                                break;
-                            default:
-                                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                                break;
-                        }
-                        m_iTextLength = parseInt(attributes.getValue("length"));
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            case OUTPUT_FISCAL:
-                if (null != qName)
-                    switch (qName) {
-                        case "line":
-                            text = new StringBuilder();
-                            m_dValue1 = parseDouble(attributes.getValue("price"));
-                            m_dValue2 = parseDouble(attributes.getValue("units"), 1.0);
-                            attribute3 = parseInt(attributes.getValue("tax"));
-                            break;
-                        case "message":
-                            text = new StringBuilder();
-                            break;
-                        case "total":
-                            text = new StringBuilder();
-                            m_dValue1 = parseDouble(attributes.getValue("paid"));
-                            break;
-                        default:
-                            break;
-                    }
-                break;
         }
     } 
     
@@ -334,126 +329,122 @@ public class TicketParser extends DefaultHandler {
     public void endElement(String uri, String localName, String qName) throws SAXException {
 
         switch (m_iOutputType) {
-            case OUTPUT_NONE:
+        case OUTPUT_NONE:
-                if ("play".equals(qName)) {
+            if ("play".equals(qName)) {
-                    try {
+                try { 
-                        AudioClip oAudio = Applet.newAudioClip(getClass().getClassLoader().getResource(text.toString()));
+                    AudioClip oAudio = Applet.newAudioClip(getClass().getClassLoader().getResource(text.toString()));
-                        oAudio.play();
+                    oAudio.play();        
-                    } catch (Exception fnfe) {
+                } catch (Exception fnfe) {
-                        //throw new ResourceNotFoundException( fnfe.getMessage() );
+                    //throw new ResourceNotFoundException( fnfe.getMessage() );
-                    }
-                    text = null;
                 }
-                break;
+                text = null;
+            } 
+            break;    
             
 // Added 23.05.13 used by star TSP700 to print stored logo image JDL            
-            case OUTPUT_TICKET:
+        case OUTPUT_TICKET:
-                if ("logo".equals(qName)){
+            if ("logo".equals(qName)){
                     m_oOutputPrinter.printLogo();
-                    // }
+                  // }        
-                }
+            }else if ("image".equals(qName)){
-                if ("image".equals(qName)){
+                try {
-                    try {
 //                    BufferedImage image = ImageIO.read(getClass().getClassLoader().getResourceAsStream(text.toString()));
-                        BufferedImage image = m_system.getResourceAsImage(text.toString());
+                    BufferedImage image = m_system.getResourceAsImage(text.toString());
 
-                        if (image == null) {
+                    if (image == null) {
-                            image = decodeToImage(text.toString());
+                        image = decodeToImage(text.toString());
-                        }
+                    }
-                        if (image != null) {
+                    if (image != null) {
-                            m_oOutputPrinter.printImage(image);
+                        m_oOutputPrinter.printImage(image);
-                        }
+                    }
                     
-                    } catch (Exception fnfe) {
+                } catch (Exception fnfe) {
-                        //throw new ResourceNotFoundException( fnfe.getMessage() );
+                    //throw new ResourceNotFoundException( fnfe.getMessage() );
-                    }
-                    text = null;
-                } else if ("qr-code".equals(qName)) {
-                    m_oOutputPrinter.printImage(QRCode.printQRCode(text.toString()));
                 }
-                else if ("barcode".equals(qName)) {
+                text = null;
-                    m_oOutputPrinter.printBarCode(bctype, bcposition, text.toString());
+            } else if ("barcode".equals(qName)) {
-                    text = null;
+                m_oOutputPrinter.printBarCode(bctype, bcposition, text.toString());
-                } else if ("text".equals(qName)) {
+                text = null;
-                    if (m_iTextLength > 0) {
+            } else if ("text".equals(qName)) {
-                        switch(m_iTextAlign) {
+                if (m_iTextLength > 0) {
-                            case DevicePrinter.ALIGN_RIGHT:
+                    switch(m_iTextAlign) {
-                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignRight(text.toString(), m_iTextLength));
+                    case DevicePrinter.ALIGN_RIGHT:
-                                break;
+                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignRight(text.toString(), m_iTextLength));
-                            case DevicePrinter.ALIGN_CENTER:
+                        break;
-                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+                    case DevicePrinter.ALIGN_CENTER:
-                                break;
+                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignCenter(text.toString(), m_iTextLength));
-                            default: // DevicePrinter.ALIGN_LEFT
+                        break;
-                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                    default: // DevicePrinter.ALIGN_LEFT
-                                break;
+                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignLeft(text.toString(), m_iTextLength));
-                        }
+                        break;
-                    } else {
-                        m_oOutputPrinter.printText(m_iTextStyle, text.toString());
                     }
-                    text = null;
+                } else {
-                } else if ("line".equals(qName)) {
+                    m_oOutputPrinter.printText(m_iTextStyle, text.toString());
-                    m_oOutputPrinter.endLine();
-                } else if ("ticket".equals(qName)) {
-                    m_oOutputPrinter.endReceipt();
-                    m_iOutputType = OUTPUT_NONE;
-                    m_oOutputPrinter = null;
                 }
-                break;
+                text = null;
-            case OUTPUT_DISPLAY:
+            } else if ("line".equals(qName)) {
-                if ("line".equals(qName)) { // line 1 or 2 of the display
+                m_oOutputPrinter.endLine();
-                    if (m_sVisorLine1 == null) {
+            } else if ("ticket".equals(qName)) {
-                        m_sVisorLine1 = m_sVisorLine.toString();
+                m_oOutputPrinter.endReceipt();
-                    } else {
+                m_iOutputType = OUTPUT_NONE;
-                        m_sVisorLine2 = m_sVisorLine.toString();
+                m_oOutputPrinter = null;
-                    }
+            }
-                    m_sVisorLine = null;
+            break;
-                } else if ("line1".equals(qName)) { // linea 1 del visor
+        case OUTPUT_DISPLAY:
+            if ("line".equals(qName)) { // line 1 or 2 of the display
+                if (m_sVisorLine1 == null) {
                     m_sVisorLine1 = m_sVisorLine.toString();
-                    m_sVisorLine = null;
+                } else {
-                } else if ("line2".equals(qName)) { // linea 2 del visor
                     m_sVisorLine2 = m_sVisorLine.toString();
-                    m_sVisorLine = null;
+                }
-                } else if ("text".equals(qName)) {
+                m_sVisorLine = null;
-                    if (m_iTextLength > 0) {
+            } else if ("line1".equals(qName)) { // linea 1 del visor
-                        switch(m_iTextAlign) {
+                m_sVisorLine1 = m_sVisorLine.toString();
-                            case DevicePrinter.ALIGN_RIGHT:
+                m_sVisorLine = null;
-                                m_sVisorLine.append(DeviceTicket.alignRight(text.toString(), m_iTextLength));
+            } else if ("line2".equals(qName)) { // linea 2 del visor
-                                break;
+                m_sVisorLine2 = m_sVisorLine.toString();
-                            case DevicePrinter.ALIGN_CENTER:
+                m_sVisorLine = null;
-                                m_sVisorLine.append(DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+            } else if ("text".equals(qName)) {
-                                break;
+                if (m_iTextLength > 0) {
-                            default: // DevicePrinter.ALIGN_LEFT
+                    switch(m_iTextAlign) {
-                                m_sVisorLine.append(DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                    case DevicePrinter.ALIGN_RIGHT:
-                                break;
+                        m_sVisorLine.append(DeviceTicket.alignRight(text.toString(), m_iTextLength));
-                        }
+                        break;
-                    } else {
+                    case DevicePrinter.ALIGN_CENTER:
-                        m_sVisorLine.append(text);
+                        m_sVisorLine.append(DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+                        break;
+                    default: // DevicePrinter.ALIGN_LEFT
+                        m_sVisorLine.append(DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                        break;
                     }
-                    text = null;
+                } else {
-                } else if ("display".equals(qName)) {
+                    m_sVisorLine.append(text);
-                    m_printer.getDeviceDisplay().writeVisor(m_iVisorAnimation, m_sVisorLine1, m_sVisorLine2);
-                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
-                    m_sVisorLine1 = null;
-                    m_sVisorLine2 = null;
-                    m_iOutputType = OUTPUT_NONE;
-                    m_oOutputPrinter = null;
                 }
-                break;
+                text = null;
-            case OUTPUT_FISCAL:
+            } else if ("display".equals(qName)) {
-                if ("fiscalreceipt".equals(qName)) {
+                m_printer.getDeviceDisplay().writeVisor(m_iVisorAnimation, m_sVisorLine1, m_sVisorLine2);        
-                    m_printer.getFiscalPrinter().endReceipt();
+                m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;                
-                    m_iOutputType = OUTPUT_NONE;
+                m_sVisorLine1 = null;
-                } else if ("line".equals(qName)) {
+                m_sVisorLine2 = null;
-                    m_printer.getFiscalPrinter().printLine(text.toString(), m_dValue1, m_dValue2, attribute3);
+                m_iOutputType = OUTPUT_NONE;
-                    text = null;
+                m_oOutputPrinter = null;
-                } else if ("message".equals(qName)) {
+            }
-                    m_printer.getFiscalPrinter().printMessage(text.toString());
+            break;
-                    text = null;
+        case OUTPUT_FISCAL:
-                } else if ("total".equals(qName)) {
+            if ("fiscalreceipt".equals(qName)) {
-                    m_printer.getFiscalPrinter().printTotal(text.toString(), m_dValue1);
+                m_printer.getFiscalPrinter().endReceipt();
-                    text = null;
+                m_iOutputType = OUTPUT_NONE;
-                }
+            } else if ("line".equals(qName)) {
-                break;
+                m_printer.getFiscalPrinter().printLine(text.toString(), m_dValue1, m_dValue2, attribute3);
+                text = null;               
+            } else if ("message".equals(qName)) {
+                m_printer.getFiscalPrinter().printMessage(text.toString());
+                text = null;               
+            } else if ("total".equals(qName)) {
+                m_printer.getFiscalPrinter().printTotal(text.toString(), m_dValue1);
+                text = null;               
+            }
+            break;
         }          
     }
     

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

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

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

@@ -38,329 +38,347 @@ import java.util.List;
  */
 public class DataLogicReceipts extends BeanFactoryDataSingle {
     
-  private Session s;
+    private Session s;
     
-  /** Creates a new instance of DataLogicReceipts */
+    /** Creates a new instance of DataLogicReceipts */
-  public DataLogicReceipts() {
+    public DataLogicReceipts() {
-  }
-
-  /**
-   *
-   * @param s
-   */
-  @Override
-  public void init(Session s) {
-    this.s = s;
-  }
-
-  /**
-   *
-   * @param Id
-   * @return
-   * @throws BasicException
-   */
-  public final TicketInfo getSharedTicket(String Id) throws BasicException {
-
-    if (Id == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-              Datas.SERIALIZABLE }))
-          .find(Id);
-      return record == null ? null : (TicketInfo) record[0];
     }
-  }
     
-  /**
+    /**
-   *
+     *
-   * @param pickupId
+     * @param s
-   * @return
+     */
-   * @throws BasicException
+    @Override
-   */
+    public void init(Session s){
-  public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
+        this.s = s;
-
-    if (pickupId == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-              Datas.SERIALIZABLE }))
-          .find(pickupId);
-      return record == null ? null : (TicketInfo) record[0];
     }
-  }
      
-  /**
+    /**
-   * JG Dec 14 Administrator and Manager Roles always have access to ALL
+     *
-   * SHAREDtickets
+     * @param Id
-   * 
+     * @return
-   * @return
+     * @throws BasicException
-   * @throws BasicException
+     */
-   */
+    public final TicketInfo getSharedTicket(String Id) throws BasicException {
-  public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
         
-    return (List<SharedTicketInfo>) new StaticSentence(s
+        if (Id == null) {
-    // , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
+            return null; 
-    // ORDER BY ID"
+        } else {
-        , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+            Object[]record = (Object[]) new StaticSentence(s
-            + "FROM sharedtickets ORDER BY PICKUPID",
+                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
-        null, new SerializerReadClass(SharedTicketInfo.class)).list();
+                    , SerializerWriteString.INSTANCE
-  }
+                    , new SerializerReadBasic(new Datas[] {
-
+                        Datas.SERIALIZABLE})).find(Id);
-  /**
+            return record == null ? null : (TicketInfo) record[0];
-   * Return only current APPUSER SHAREDtickets
+        }
-   * 
-   * @param appuser
-   * @return
-   * @throws BasicException
-   */
-  public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
-    String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
-        + "FROM sharedtickets "
-        + "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
-
-    return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
-        .list();
-  }
-
-  /**
-   * For Standard View
-   * 
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo().getId(),
-        pickupid
-
-    };
-    Datas[] datas;
-    datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-
-    };
-    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-        + "ID, "
-        + "NAME, "
-        + "CONTENT, "
-        + "APPUSER, "
-        + "PICKUPID) "
-        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-  }
-
-  /**
-   *
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo().getId(),
-        pickupid
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "NAME = ?, "
-        + "CONTENT = ?, "
-        + "APPUSER = ?, "
-        + "PICKUPID = ? "
-        + "WHERE ID = ?",
-        new SerializerWriteBasicExt(datas,
-            new int[] {
-                1, 2, 3, 4, 0 }))
-        .exec(values);
-  }
-
-  /**
-   *
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void updateRSharedTicket(
-      final String id,
-      final TicketInfo ticket,
-      int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        pickupid
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.INT
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "NAME = ?, "
-        + "CONTENT = ?, "
-        + "PICKUPID = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
-  }
-
-  /**
-   * In place for multi-purposing like containing data from elsewhere and/or
-   * using Place and User for Notifications
-   * 
-   * @param id
-   * @param locked
-   * @throws BasicException
-   */
-  public final void lockSharedTicket(final String id, final String locked) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        locked
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "LOCKED = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-  }
-
-  /**
-   * In place for multi-purposing like flushing locks from elsewhere and/or
-   * using Place and User for Notifications
-   * 
-   * @param id
-   * @param unlocked
-   * @throws BasicException
-   */
-  public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        unlocked
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "LOCKED = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-  }
-
-  /**
-   * For Restaurant View
-   * 
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void insertRSharedTicket(
-      final String id,
-      final TicketInfo ticket,
-      int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo(),
-        ticket.getPickupId(),
-        ticket.getHost()
-    };
-    Datas[] datas;
-    datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-
-    };
-    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-        + "ID, "
-        + "NAME, "
-        + "CONTENT, "
-        + "APPUSER, "
-        + "PICKUPID) "
-        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-  }
-
-  /**
-   * 
-   * @param id
-   * @throws BasicException
-   */
-  public final void deleteSharedTicket(final String id) throws BasicException {
-
-    new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
-  }
-
-  /**
-   *
-   * @param Id
-   * @return
-   * @throws BasicException
-   */
-  public final Integer getPickupId(String Id) throws BasicException {
-
-    if (Id == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
-      return record == null ? 0 : (Integer) record[0];
     }
-  }
     
-  public final String getUserId(final String id) throws BasicException {
+        /**
-    Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
+     *
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
+     * @param pickupId
-    if (userID == null) {
+     * @return
-      return null;
+     * @throws BasicException
-    } else {
+     */
-      return (String) userID[0];
+    public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
+        
+        if (pickupId == null) {
+            return null; 
+        } else {
+            Object[]record = (Object[]) new StaticSentence(s
+                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
+                    , SerializerWriteString.INSTANCE
+                    , new SerializerReadBasic(new Datas[] {
+                        Datas.SERIALIZABLE})).find(pickupId);
+            return record == null ? null : (TicketInfo) record[0];
+        }
     } 
-  }
 
-  public final String getLockState(final String id, String lockState) throws BasicException {
+    /**
-    Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
+     * JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
+     * @return
+     * @throws BasicException
+     */
+    public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
+        
+        return (List<SharedTicketInfo>) new StaticSentence(s
+//                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
+                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+                        + "FROM sharedtickets ORDER BY PICKUPID" 
+                , null
+                , new SerializerReadClass(SharedTicketInfo.class)).list();
+    }
+    
+    /**
+     * Return only current APPUSER SHAREDtickets
+     * @param appuser
+     * @return
+     * @throws BasicException
+     */
+    public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
+        String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED " 
+                + "FROM sharedtickets "
+                + "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
+        
+            return (List<SharedTicketInfo>) new StaticSentence(s
+            , sql
+            , null
+            , new SerializerReadClass(SharedTicketInfo.class)).list();
+    }
+    
+    /**
+     * For Standard View
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+        
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket,
+            ticket.getUser().getId(),
+            pickupid
+
+        };
+        Datas[] datas;
+        datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,            
+            Datas.INT
+
+        };
+        new PreparedSentence(s
+            , "INSERT INTO sharedtickets ("
+                + "ID, "
+                + "NAME, "
+                + "CONTENT, "
+                + "APPUSER, "                    
+                + "PICKUPID) "
+                + "VALUES (?, ?, ?, ?, ?)"                
+            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
+    }
+    
+    /**
+     *
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket, 
+            ticket.getUser().getId(),
+            pickupid
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,
+            Datas.INT
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "NAME = ?, "
+                + "CONTENT = ?, "
+                + "APPUSER = ?, "                        
+                + "PICKUPID = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, 
+                        new int[] {
+                            1, 2, 3, 4, 0})).exec(values);
+    }
+
+    /**
+     *
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void updateRSharedTicket(
+            final String id, 
+            final TicketInfo ticket, 
+            int pickupid) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket, 
+            pickupid
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.INT
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "NAME = ?, "
+                + "CONTENT = ?, "
+                + "PICKUPID = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);                
+    }
+    
+     /**
+     * In place for multi-purposing like containing data from elsewhere and/or
+     * using Place and User for Notifications
+     * @param id
+     * @param locked
+     * @throws BasicException
+     */
+    public final void lockSharedTicket(final String id, final String locked) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            locked
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
             Datas.STRING
-        })).find(id);
+        };
-    return (String) state[0];
+        new PreparedSentence(s
-  }
+                , "UPDATE sharedtickets SET "
+                + "LOCKED = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
+    }
 
-  public final String getServer(final String id, String user) throws BasicException {
+     /**
-    Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
+     * In place for multi-purposing like flushing locks from elsewhere and/or
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
+     * using Place and User for Notifications
+     * @param id
+     * @param unlocked
+     * @throws BasicException
+     */
+    public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            unlocked
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
             Datas.STRING
-        })).find(id);
+        };
-    return (String) server[0];
+        new PreparedSentence(s
-  }
+                , "UPDATE sharedtickets SET "
+                + "LOCKED = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
+    }    
+    
+    /**
+     * For Restaurant View
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void insertRSharedTicket(
+            final String id, 
+            final TicketInfo ticket, 
+            int pickupid) throws BasicException {
+        
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket,
+            ticket.getUser(),
+            ticket.getPickupId(),
+            ticket.getHost()                          
+        };
+        Datas[] datas;
+        datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,            
+            Datas.INT
+
+        };
+        new PreparedSentence(s
+            , "INSERT INTO sharedtickets ("
+                + "ID, "
+                + "NAME, "
+                + "CONTENT, "
+                + "APPUSER, "                    
+                + "PICKUPID) "
+                + "VALUES (?, ?, ?, ?, ?)"                
+            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
+    }    
+
+    /**
+     * 
+     * @param id
+     * @throws BasicException
+     */
+    public final void deleteSharedTicket(final String id) throws BasicException {
+
+        new StaticSentence(s
+            , "DELETE FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE).exec(id);      
+    }
+
+    /**
+     *
+     * @param Id
+     * @return
+     * @throws BasicException
+     */
+    public final Integer getPickupId(String Id) throws BasicException {
+        
+        if (Id == null) {
+            return null; 
+        } else {
+            Object[]record = (Object[]) new StaticSentence(s
+                    , "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
+                    , SerializerWriteString.INSTANCE
+                    , new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
+            return record == null ? 0 : (Integer)record[0];
+        }
+    } 
+
+
+    public final String getUserId(final String id) throws BasicException {
+        Object[] userID = (Object []) new StaticSentence(s
+            , "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
+            if( userID == null ) {
+                return null;
+            } else {
+                return (String) userID[0];
+        }
+    }
+    
+    public final String getLockState(final String id, String lockState) throws BasicException {
+        Object[] state = (Object[]) new StaticSentence(s
+            , "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {
+                Datas.STRING
+            })).find(id);
+                return (String) state[0];
+    }
+
+    public final String getServer(final String id, String user) throws BasicException {
+        Object[] server = (Object[]) new StaticSentence(s
+            , "SELECT appuser FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {
+                Datas.STRING
+            })).find(id);
+                return (String) server[0];
+    }    
 }

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

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

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

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

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

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

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

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

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

@@ -37,509 +37,455 @@ import java.util.Properties;
  */
 public class TicketLineInfo implements SerializableWrite, SerializableRead, Serializable {
 
-  private static final long serialVersionUID = 6608012948284450199L;
+    private static final long serialVersionUID = 6608012948284450199L;
-  private String m_sTicket;
+    private String m_sTicket;
-  private int m_iLine;
+    private int m_iLine;
-  private double multiply;
+    private double multiply;
 
-  @Override
+    @Override
-  public String toString() {
+    public String toString() {
-    return new Gson().toJson(this);
+        return new Gson().toJson(this);
-  }
-
-  private double price;
-  private TaxInfo tax;
-  private Properties attributes;
-  private String productid;
-  private String attsetinstid;
-  private Boolean updated = false;
-
-  private double newprice = 0.0;
-
-  /**
-   * Creates new TicketLineInfo
-   * 
-   * @param productid
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   * @param props
-   */
-  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
-    init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   * @param productid
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
-    init(productid, null, dMultiply, dPrice, tax, new Properties());
-  }
-
-  /**
-   * Example: Call from script.TotalDiscount event
-   * 
-   * @param productid
-   * @param productname
-   * @param producttaxcategory
-   * @param productprinter
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
-      double dMultiply, double dPrice, TaxInfo tax) {
-    Properties props = new Properties();
-    props.setProperty("product.name", productname);
-    props.setProperty("product.taxcategoryid", producttaxcategory);
-    props.setProperty("product.printer", productprinter); // added to props as may introduce printer redirect
-
-    init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   * Example: Call from script.LineDiscount event
-   * 
-   * @param productname
-   * @param producttaxcategory
-   * @param productprinter     //added to props as may introduce printer redirect
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
-      double dPrice, TaxInfo tax) {
-
-    Properties props = new Properties();
-    props.setProperty("product.name", productname);
-    props.setProperty("product.taxcategoryid", producttaxcategory);
-    props.setProperty("product.printer", productprinter);
-
-    init(null, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   */
-  public TicketLineInfo() {
-    init(null, null, 0.0, 0.0, null, new Properties());
-  }
-
-  /**
-   *
-   * @param product
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   * @param attributes
-   */
-  public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
-
-    String pid;
-
-    if (product == null) {
-      pid = null;
-      tax = null;
-    } else {
-      pid = product.getID();
-      attributes.setProperty("product.name", product.getName());
-      attributes.setProperty("product.reference", product.getReference());
-      attributes.setProperty("product.code", product.getCode());
-
-      if (product.getMemoDate() == null) {
-        attributes.setProperty("product.memodate", "1900-01-01 00:00:01");
-      } else {
-        attributes.setProperty("product.memodate", product.getMemoDate());
-      }
-
-      attributes.setProperty("product.com", product.isCom() ? "true" : "false");
-      attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
-
-      if (product.getPrinter() != null) {
-        attributes.setProperty("product.printer", product.getPrinter());
-      } else {
-        attributes.setProperty("product.printer", "1");
-      }
-
-      attributes.setProperty("product.service", product.isService() ? "true" : "false");
-      attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
-      attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
-
-      if (product.getTextTip() != null) {
-        attributes.setProperty("product.texttip", product.getTextTip());
-      }
-
-      attributes.setProperty("product.warranty", product.getWarranty() ? "true" : "false");
-
-      if (product.getAttributeSetID() != null) {
-        attributes.setProperty("product.attsetid", product.getAttributeSetID());
-      }
-
-      attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
-
-      if (product.getCategoryID() != null) {
-        attributes.setProperty("product.categoryid", product.getCategoryID());
-      }
-
-      if ("true".equals(attributes.getProperty("ticket.updated"))) {
-        attributes.setProperty("ticket.updated", "false");
-      } else {
-        attributes.setProperty("ticket.updated", "true");
-      }
     }
 
-    init(pid, null, dMultiply, dPrice, tax, attributes);
+    private double price;
-  }
+    private TaxInfo tax;
+    private Properties attributes;
+    private String productid;
+    private String attsetinstid;
+    private Boolean updated = false;
     
-  /**
+    private double newprice = 0.0;
-   *
-   * @param oProduct
-   * @param dPrice
-   * @param tax
-   * @param attributes
-   */
-  public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
-    this(oProduct, 1.0, dPrice, tax, attributes);
-  }
     
-  /**
+    /** Creates new TicketLineInfo
-   *
+     * @param productid
-   * @param line
+     * @param dMultiply
-   */
+     * @param dPrice
-  public TicketLineInfo(TicketLineInfo line) {
+     * @param tax
-    init(line.productid, line.attsetinstid, line.multiply, line.price,
+     * @param props */
-        line.tax, (Properties) line.attributes.clone());
+    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
-  }
+        init(productid, null, dMultiply, dPrice, tax, props);
-
-  private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
-      Properties attributes) {
-
-    this.productid = productid;
-    this.attsetinstid = attsetinstid;
-    multiply = dMultiply;
-    price = dPrice;
-    this.tax = tax;
-    this.attributes = attributes;
-
-    m_sTicket = null;
-    m_iLine = -1;
-  }
-
-  void setTicket(String ticket, int line) {
-    m_sTicket = ticket;
-    m_iLine = line;
-  }
-
-  /**
-   *
-   * @param dp
-   * @throws BasicException
-   */
-  @Override
-  public void writeValues(DataWrite dp) throws BasicException {
-    dp.setString(1, m_sTicket);
-    dp.setInt(2, m_iLine);
-    dp.setString(3, productid);
-    dp.setString(4, attsetinstid);
-    dp.setDouble(5, multiply);
-    dp.setDouble(6, price);
-    dp.setString(7, tax.getId());
-
-    try {
-      ByteArrayOutputStream o = new ByteArrayOutputStream();
-      attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
-      dp.setBytes(8, o.toByteArray());
-    } catch (IOException e) {
-      dp.setBytes(8, null);
     }
-  }
 
-  /**
+    /**
-   *
+     *
-   * @param dr
+     * @param productid
-   * @throws BasicException
+     * @param dMultiply
-   */
+     * @param dPrice
-  @Override
+     * @param tax
-  public void readValues(DataRead dr) throws BasicException {
+     */
-    m_sTicket = dr.getString(1);
+    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
-    m_iLine = dr.getInt(2);
+        init(productid, null, dMultiply, dPrice, tax, new Properties());
-    productid = dr.getString(3);
-    attsetinstid = dr.getString(4);
-    multiply = dr.getDouble(5);
-    price = dr.getDouble(6);
-    tax = new TaxInfo(
-        dr.getString(7),
-        dr.getString(8),
-        dr.getString(9),
-        dr.getString(10),
-        dr.getString(11),
-        dr.getDouble(12),
-        dr.getBoolean(13),
-        dr.getInt(14));
-    attributes = new Properties();
-
-    try {
-      byte[] img = dr.getBytes(15);
-      if (img != null) {
-        attributes.loadFromXML(new ByteArrayInputStream(img));
-      }
-    } catch (IOException e) {
     }
-  }
 
-  /**
+    /**
-   *
+     * Example: Call from script.TotalDiscount event
-   * @return
+     * @param productid
-   */
+     * @param productname
-  public TicketLineInfo copyTicketLine() {
+     * @param producttaxcategory
-    TicketLineInfo l = new TicketLineInfo();
+     * @param productprinter
-    l.productid = productid;
+     * @param dMultiply
-    l.attsetinstid = attsetinstid;
+     * @param dPrice
-    l.multiply = multiply;
+     * @param tax
-    l.price = price;
+     */
-    l.tax = tax;
+    public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
-    l.attributes = (Properties) attributes.clone();
+        Properties props = new Properties();
+        props.setProperty("product.name", productname);
+        props.setProperty("product.taxcategoryid", producttaxcategory);
+        props.setProperty("product.printer", productprinter);   //added to props as may introduce printer redirect
         
-    return l;
+        init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   * @return
-   */
-  public int getTicketLine() {
-    return m_iLine;
-  }
-
-  // These are the Lookups
-  public String getProductID() {
-    return productid;
-  }
-
-  public String getProductCategoryID() {
-    return (attributes.getProperty("product.categoryid"));
-  }
-
-  public String getProductAttSetId() {
-    return attributes.getProperty("product.attsetid");
-  }
-
-  public String getProductAttSetInstId() {
-    return attsetinstid;
-  }
-
-  public String getProductAttSetInstDesc() {
-    return attributes.getProperty("product.attsetdesc", "");
-  }
-
-  public String getProductTaxCategoryID() {
-    return (attributes.getProperty("product.taxcategoryid"));
-  }
-
-  public String getTicketUpdated() {
-    return (attributes.getProperty("ticket.updated"));
-  }
-
-  public TaxInfo getTaxInfo() {
-    return tax;
-  }
-
-  public void setTaxInfo(TaxInfo oTaxInfo) {
-    tax = oTaxInfo;
-  }
-
-  // These appear on Printed TicketLine
-  public String getProductName() {
-    return attributes.getProperty("product.name");
-  }
-
-  public String getProductMemoDate() {
-    return attributes.getProperty("product.memodate");
-  }
-
-  public double getPrice() {
-    return price;
-  }
-
-  public double getMultiply() {
-    return multiply;
-  }
-
-  public double getTaxRate() {
-    return tax == null ? 0.0 : tax.getRate();
-  }
-
-  public double getNewPrice() {
-    newprice = price * (1.0 + getTaxRate());
-    return price;
-  }
-
-  public String getProductPrinter() {
-    return attributes.getProperty("product.printer");
-  }
-
-  // These are the Summaries
-  public double getPriceTax() {
-    return price * (1.0 + getTaxRate());
-  }
-
-  public Properties getProperties() {
-    return attributes;
-  }
-
-  public String getProperty(String key) {
-    return attributes.getProperty(key);
-  }
-
-  public String getProperty(String key, String defaultvalue) {
-    return attributes.getProperty(key, defaultvalue);
-  }
-
-  // These are Ticket Totals
-  public double getTax() {
-    return price * multiply * getTaxRate();
-  }
-
-  public double getValue() {
-    return price * multiply * (1.0 + getTaxRate());
-  }
-
-  public double getSubValue() {
-    return price * multiply;
-  }
-
-  // SETTERS
-  public void setPrice(double dValue) {
-    price = dValue;
-  }
-
-  public void setPriceTax(double dValue) {
-    price = dValue / (1.0 + getTaxRate());
-  }
-
-  public void setMultiply(double dValue) {
-    multiply = dValue;
-  }
-
-  public void setProperty(String key, String value) {
-    attributes.setProperty(key, value);
-  }
-
-  public void setProductTaxCategoryID(String taxID) {
-    attributes.setProperty("product.taxcategoryid", taxID);
-  }
-
-  public void setProductAttSetInstId(String value) {
-    attsetinstid = value;
-  }
-
-  public void setProductAttSetInstDesc(String value) {
-    if (value == null) {
-      attributes.remove(value);
-    } else {
-      attributes.setProperty("product.attsetdesc", value);
     }
-  }
 
-  public void setTicketUpdated(String key, String value) {
+    /**
-    attributes.setProperty("ticket.updated", value);
+     * Example: Call from script.LineDiscount event
-  }
+     * @param productname
+     * @param producttaxcategory
+     * @param productprinter    //added to props as may introduce printer redirect
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     */
+    public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
 
-  public void setProductPrinter(String value) {
+        Properties props = new Properties();
-    if (value == null) {
+        props.setProperty("product.name", productname);
-      attributes.remove(value);
+        props.setProperty("product.taxcategoryid", producttaxcategory);
-    } else {
+        props.setProperty("product.printer", productprinter);
-      attributes.setProperty("product.printer", value);
+        
+        init(null, null, dMultiply, dPrice, tax, props);
     }
-  }
 
-  /**
+    /**
-   *
+     *
-   * @return
+     */
-   */
+    public TicketLineInfo() {
-  // Print to actual ${ticketline
+        init(null, null, 0.0, 0.0, null, new Properties());
-  public String printReference() {
+    }
-    return StringUtils.encodeXML(attributes.getProperty("product.reference"));
-  }
 
-  public String printCode() {
+    /**
-    return StringUtils.encodeXML(attributes.getProperty("product.code"));
+     *
-  }
+     * @param product
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     * @param attributes
+     */
+    public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
 
-  public String printName() {
+        String pid;
-    return StringUtils.encodeXML(attributes.getProperty("product.name"));
-  }
 
-  public String printProductMemoDate() {
+        if (product == null) {
-    return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
+            pid = null;
-  }
+            tax = null;
+        } else {
+            pid = product.getID();
+            attributes.setProperty("product.name", product.getName());
+            attributes.setProperty("product.reference", product.getReference());
+            attributes.setProperty("product.code", product.getCode());
 
-  public String printPrice() {
+            if (product.getMemoDate() == null) {
-    return Formats.CURRENCY.formatValue(getPrice());
+                attributes.setProperty("product.memodate", "1900-01-01 00:00:01");                
-  }
+            } else {
+                attributes.setProperty("product.memodate", product.getMemoDate());                
+            }
          
-  public String printPriceTax() {
+            attributes.setProperty("product.com", product.isCom() ? "true" : "false");
-    return Formats.CURRENCY.formatValue(getPriceTax());
+            attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
-  }
 
-  public String printMultiply() {
+            if (product.getPrinter() != null) {
-    return Formats.DOUBLE.formatValue(multiply);
+                attributes.setProperty("product.printer", product.getPrinter());
-  }
+            } else {
+                attributes.setProperty("product.printer", "1");
+            }    
             
-  public String printValue() {
+            attributes.setProperty("product.service", product.isService() ? "true" : "false");
-    return Formats.CURRENCY.formatValue(getValue());
+            attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
-  }
+            attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
 
-  public String printTaxRate() {
+            if (product.getTextTip() != null) {
-    return Formats.PERCENT.formatValue(getTaxRate());
+                attributes.setProperty("product.texttip", product.getTextTip());
-  }
+            }
  
-  public String printSubValue() {
+            attributes.setProperty("product.warranty", product.getWarranty()? "true" : "false");        
-    return Formats.CURRENCY.formatValue(getSubValue());
-  }
        
-  public String printTax() {
+            if (product.getAttributeSetID() != null) {
-    return Formats.CURRENCY.formatValue(getTax());
+                attributes.setProperty("product.attsetid", product.getAttributeSetID());
-  }
+            }
             
-  public String printTextTip() {
+            attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
-    return attributes.getProperty("product.texttip");
-  }
         
-  public String printPrinter() {
+            if (product.getCategoryID() != null) {
-    return StringUtils.encodeXML(attributes.getProperty("product.printer"));
+                attributes.setProperty("product.categoryid", product.getCategoryID());
-  }
+            }
 
-  public boolean isProductCom() {
+            if ("true".equals(attributes.getProperty("ticket.updated"))) {
-    return "true".equals(attributes.getProperty("product.com"));
+                attributes.setProperty("ticket.updated", "false");                
-  }
+            } else {
+                attributes.setProperty("ticket.updated", "true");                
+            }
+        }
 
-  public boolean isProductService() {
+        init(pid, null, dMultiply, dPrice, tax, attributes);
-    return "true".equals(attributes.getProperty("product.service"));
+    }
-  }
 
-  public boolean isProductVprice() {
+    /**
-    return "true".equals(attributes.getProperty("product.vprice"));
+     *
-  }
+     * @param oProduct
+     * @param dPrice
+     * @param tax
+     * @param attributes
+     */
+    public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
+        this(oProduct, 1.0, dPrice, tax, attributes);
+    }
 
-  public boolean isProductVerpatrib() {
+    /**
-    return "true".equals(attributes.getProperty("product.verpatrib"));
+     *
-  }
+     * @param line
+     */
+    public TicketLineInfo(TicketLineInfo line) {
+        init(line.productid, line.attsetinstid, line.multiply, line.price, 
+            line.tax, (Properties) line.attributes.clone());
+    }
 
-  public boolean isProductWarranty() {
+    private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
-    return "true".equals(attributes.getProperty("product.warranty"));
-  }
 
-  public boolean getUpdated() {
+        this.productid = productid;
-    return "true".equals(attributes.getProperty("ticket.updated"));
+        this.attsetinstid = attsetinstid;
-  }
+        multiply = dMultiply;
+        price = dPrice;
+        this.tax = tax;  
+        this.attributes = attributes;
     
-  public void setUpdated(Boolean value) {
+        m_sTicket = null;
-    updated = value;
+        m_iLine = -1;
-  }
+    }
+
+    void setTicket(String ticket, int line) {
+        m_sTicket = ticket;
+        m_iLine = line;
+    }
+
+    /**
+     *
+     * @param dp
+     * @throws BasicException
+     */
+    @Override
+    public void writeValues(DataWrite dp) throws BasicException {
+        dp.setString(1, m_sTicket);
+        dp.setInt(2, m_iLine);
+        dp.setString(3, productid);
+        dp.setString(4, attsetinstid);
+        dp.setDouble(5, multiply);
+        dp.setDouble(6, price);
+        dp.setString(7, tax.getId());
+
+        try {
+            ByteArrayOutputStream o = new ByteArrayOutputStream();
+            attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
+            dp.setBytes(8, o.toByteArray());
+        } catch (IOException e) {
+            dp.setBytes(8, null);
+        }
+    }
+
+    /**
+     *
+     * @param dr
+     * @throws BasicException
+     */
+    @Override
+    public void readValues(DataRead dr) throws BasicException {
+        m_sTicket = dr.getString(1);
+        m_iLine = dr.getInt(2);
+        productid = dr.getString(3);
+        attsetinstid = dr.getString(4);
+        multiply = dr.getDouble(5);
+        price = dr.getDouble(6);
+        tax = new TaxInfo(
+            dr.getString(7), 
+            dr.getString(8), 
+            dr.getString(9), 
+            dr.getString(10), 
+            dr.getString(11), 
+            dr.getDouble(12), 
+            dr.getBoolean(13), 
+            dr.getInt(14));
+        attributes = new Properties();
+
+        try {
+            byte[] img = dr.getBytes(15);
+            if (img != null) {
+                attributes.loadFromXML(new ByteArrayInputStream(img));
+            }
+        } catch (IOException e) {
+        }
+    }
+
+    /**
+     *
+     * @return
+     */
+    public TicketLineInfo copyTicketLine() {
+        TicketLineInfo l = new TicketLineInfo();
+        l.productid = productid;
+        l.attsetinstid = attsetinstid;
+        l.multiply = multiply;
+        l.price = price;
+        l.tax = tax; 
+        l.attributes = (Properties) attributes.clone();
+
+        return l;
+    }
+
+    /**
+     *
+     * @return
+     */
+    public int getTicketLine() {
+        return m_iLine;
+    }
+// These are the Lookups   
+    public String getProductID() {
+        return productid;
+    }
+    public String getProductCategoryID() {
+        return (attributes.getProperty("product.categoryid"));
+    }
+    public String getProductAttSetId() {
+        return attributes.getProperty("product.attsetid");
+    }
+    public String getProductAttSetInstId() {
+        return attsetinstid;
+    }    
+    public String getProductAttSetInstDesc() {
+        return attributes.getProperty("product.attsetdesc", "");
+    }
+    public String getProductTaxCategoryID() {
+        return (attributes.getProperty("product.taxcategoryid"));
+    }
+    public String getTicketUpdated() {
+        return (attributes.getProperty("ticket.updated"));
+    }
+    public TaxInfo getTaxInfo() {
+        return tax;
+    }    
+    public void setTaxInfo(TaxInfo oTaxInfo) {
+        tax = oTaxInfo;
+    }     
+        
+// These appear on Printed TicketLine
+    public String getProductName() {
+        return attributes.getProperty("product.name");
+    }
+    public String getProductMemoDate() {
+        return attributes.getProperty("product.memodate");
+    }
+    public double getPrice() {
+        return price;
+    }
+    public double getMultiply() {
+        return multiply;
+    }
+    public double getTaxRate() {
+        return tax == null ? 0.0 : tax.getRate();
+    }
+    public double getNewPrice() {
+        newprice = price * (1.0 + getTaxRate());
+        return price;
+    }
+    public String getProductPrinter() {
+        return attributes.getProperty("product.printer");
+    }    
+
+// These are the Summaries    
+    public double getPriceTax() {
+        return price * (1.0 + getTaxRate());
+    }
+
+    public Properties getProperties() {
+        return attributes;
+    }
+    public String getProperty(String key) {
+        return attributes.getProperty(key);
+    }
+    public String getProperty(String key, String defaultvalue) {
+        return attributes.getProperty(key, defaultvalue);
+    }
+
+// These are Ticket Totals    
+    public double getTax() {
+        return price * multiply * getTaxRate();
+    }
+    public double getValue() {
+        return price * multiply * (1.0 + getTaxRate());
+    }
+    public double getSubValue() {
+        return price * multiply;
+    }    
+
+// SETTERS
+    public void setPrice(double dValue) {
+        price = dValue;
+    }
+    public void setPriceTax(double dValue) {
+        price = dValue / (1.0 + getTaxRate());               
+    }
+    public void setMultiply(double dValue) {
+        multiply = dValue;
+    }
+    public void setProperty(String key, String value) {
+        attributes.setProperty(key, value);
+    }    
+    public void setProductTaxCategoryID(String taxID){
+        attributes.setProperty("product.taxcategoryid",taxID);
+    }
+    public void setProductAttSetInstId(String value) {
+        attsetinstid = value;
+    }
+    public void setProductAttSetInstDesc(String value) {
+        if (value == null) {
+            attributes.remove(value);
+        } else {
+            attributes.setProperty("product.attsetdesc", value);
+        }
+    }
+    public void setTicketUpdated(String key, String value){
+        attributes.setProperty("ticket.updated",value);
+    }
+    public void setProductPrinter(String value) {
+        if (value == null) {
+            attributes.remove(value);
+        } else {
+            attributes.setProperty("product.printer", value);
+        }
+    }    
+    
+    /**
+     *
+     * @return
+     */
+    // Print to actual ${ticketline
+    public String printReference() {
+        return StringUtils.encodeXML(attributes.getProperty("product.reference"));
+    }
+    public String printCode() {
+        return StringUtils.encodeXML(attributes.getProperty("product.code"));
+    }
+    public String printName() {
+        return StringUtils.encodeXML(attributes.getProperty("product.name"));
+    }
+    public String printProductMemoDate() {
+        return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
+    }         
+    public String printPrice() {
+        return Formats.CURRENCY.formatValue(getPrice());
+    }
+    public String printPriceTax() {
+        return Formats.CURRENCY.formatValue(getPriceTax());
+    }
+    public String printMultiply() {
+        return Formats.DOUBLE.formatValue(multiply);
+    }
+    public String printValue() {
+        return Formats.CURRENCY.formatValue(getValue());
+    }
+    public String printTaxRate() {
+        return Formats.PERCENT.formatValue(getTaxRate());
+    }
+    public String printSubValue() {
+        return Formats.CURRENCY.formatValue(getSubValue());
+    }
+    public String printTax() {
+        return Formats.CURRENCY.formatValue(getTax());
+    }
+    public String printTextTip() {
+	return attributes.getProperty("product.texttip");
+    }
+    public String printPrinter() {
+        return StringUtils.encodeXML(attributes.getProperty("product.printer"));
+    }      
+    public boolean isProductCom() {
+       return "true".equals(attributes.getProperty("product.com"));
+    }
+    public boolean isProductService() {
+	return "true".equals(attributes.getProperty("product.service"));
+    }
+    public boolean isProductVprice() {
+	return "true".equals(attributes.getProperty("product.vprice"));
+    }
+    public boolean isProductVerpatrib() {
+	return "true".equals(attributes.getProperty("product.verpatrib"));
+    }
+    public boolean isProductWarranty() {
+	return "true".equals(attributes.getProperty("product.warranty"));
+    }    
+    public boolean getUpdated() {
+        return "true".equals(attributes.getProperty("ticket.updated"));
+    }
+    public void setUpdated(Boolean value) {
+        updated = value;
+    }
    
 }

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

@@ -43,8 +43,6 @@ import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 
 /**
@@ -285,7 +283,7 @@ public final class Transfer extends JPanel implements JPanelView {
     try {
       txtOut.append("Adding Foreign Keys" + "\n");
       webPBar.setString("Adding Keys...");
-      webPBar.setBgBottom(Color.MAGENTA);
+      //webPBar.setBgBottom(Color.MAGENTA);
       BatchSentence bsentence = new BatchSentenceResource(session_target, targetFKadd);
 
       java.util.List l = bsentence.list();
@@ -2061,7 +2059,7 @@ public final class Transfer extends JPanel implements JPanelView {
           txtOut.append("Data Transfer Complete" + "\n");
 
           webPBar.setString("Finished!");
-          webPBar.setBgBottom(Color.GREEN);
+          //webPBar.setBgBottom(Color.GREEN);
           jbtnTransfer.setEnabled(true);
 
           JOptionPane.showMessageDialog(this
@@ -2206,7 +2204,7 @@ public final class Transfer extends JPanel implements JPanelView {
     jlblDBSize = new javax.swing.JLabel();
     jtxtDbName = new com.alee.laf.text.WebTextField();
     jbtnTransfer = new javax.swing.JButton();
-    webMemoryBar = new com.alee.extended.statusbar.WebMemoryBar();
+    //webMemoryBar = new com.alee.extended.statusbar.WebMemoryBar();
     jLabel10 = new javax.swing.JLabel();
     jLabel15 = new javax.swing.JLabel();
     jbtnSet = new javax.swing.JButton();
@@ -2354,9 +2352,9 @@ public final class Transfer extends JPanel implements JPanelView {
     });
 
     webPBar.setFont(new java.awt.Font("Arial", 0, 13)); // NOI18N
-    webPBar.setHighlightDarkWhite(new java.awt.Color(204, 0, 0));
+    //webPBar.setHighlightDarkWhite(new java.awt.Color(204, 0, 0));
     webPBar.setPreferredSize(new java.awt.Dimension(240, 30));
-    webPBar.setProgressBottomColor(new java.awt.Color(0, 153, 255));
+    //webPBar.setProgressBottomColor(new java.awt.Color(0, 153, 255));
 
     jtxtDbServerPort.setForeground(new java.awt.Color(51, 51, 51));
     jtxtDbServerPort.setToolTipText(bundle.getString("tootltip.servernameport")); // NOI18N
@@ -2452,13 +2450,13 @@ public final class Transfer extends JPanel implements JPanelView {
       }
     });
 
-    webMemoryBar.setBackground(new java.awt.Color(153, 153, 153));
+    //webMemoryBar.setBackground(new java.awt.Color(153, 153, 153));
-    webMemoryBar.setText("Text");
+    //webMemoryBar.setText("Text");
-    webMemoryBar.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    //webMemoryBar.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    webMemoryBar.setPreferredSize(new java.awt.Dimension(150, 30));
+    //webMemoryBar.setPreferredSize(new java.awt.Dimension(150, 30));
-    webMemoryBar.setUsedBorderColor(new java.awt.Color(0, 204, 204));
+    //webMemoryBar.setUsedBorderColor(new java.awt.Color(0, 204, 204));
-    webMemoryBar.setUsedFillColor(new java.awt.Color(0, 204, 255));
+    //webMemoryBar.setUsedFillColor(new java.awt.Color(0, 204, 255));
-
+//
     jLabel10.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     jLabel10.setForeground(new java.awt.Color(102, 102, 102));
     jLabel10.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
@@ -2533,7 +2531,7 @@ public final class Transfer extends JPanel implements JPanelView {
                                                     .addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                             .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                                                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                    .addComponent(null, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
                                                     .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)))
                                     .addGroup(jTransferPanelLayout.createSequentialGroup()
                                             .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -2552,7 +2550,7 @@ public final class Transfer extends JPanel implements JPanelView {
                             .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                                     .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                     .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(null, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                             .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                                     .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -2723,7 +2721,6 @@ public final class Transfer extends JPanel implements JPanelView {
             JOptionPane.YES_NO_OPTION,
             JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
 
-      ExecutorService customExecutor = Executors.newCachedThreadPool();
       SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 
         @Override
@@ -2734,8 +2731,7 @@ public final class Transfer extends JPanel implements JPanelView {
         }
       };
 
-      //worker.execute();
+      worker.execute();
-      customExecutor.submit(worker);
 
     }
     System.gc();
@@ -3015,7 +3011,7 @@ public final class Transfer extends JPanel implements JPanelView {
   private com.alee.laf.text.WebPasswordField txtDbPass;
   private com.alee.laf.text.WebTextField txtDbUser;
   private javax.swing.JTextArea txtOut;
-  private com.alee.extended.statusbar.WebMemoryBar webMemoryBar;
+  //private com.alee.extended.statusbar.WebMemoryBar webMemoryBar;
   private com.alee.laf.progressbar.WebProgressBar webPBar;
   // End of variables declaration//GEN-END:variables
 

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

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

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

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

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

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

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

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

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

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

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

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

src/main/resources/pos_messages.properties

@@ -881,7 +881,7 @@ message.email=Desktop email app' not found
 message.emptycustomer=Customer cannot be empty
 message.emptynumber=Number cannot be empty
 message.enterbuyprice=Enter new Buy Price
-message.eolupdate=<html><center><h2>Version 5.4.0 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 and above click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
+message.eolupdate=<html><center><h2>Version 5.3 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.2 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.2 first<br><br/>
 message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK 
 message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
 message.ibuttonnotfound=No iButton adapter found.  Key fobs will be disabled.

src/main/resources/pos_messages_es.properties

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

src/main/resources/pos_messages_es_MX.properties

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

src/main/resources/pos_messages_nl.properties

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

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

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