diff --git a/pom.xml b/pom.xml index b6769bb..1522801 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.unicenta unicentaopos - 5.3.2 + 5.3.1 jar UTF-8 @@ -111,42 +111,11 @@ itext 2.1.7 - - - net.sf.jasperreports - jasperreports - 6.15.0 - - - com.lowagie - itext - - - - - net.sf.jasperreports - jasperreports-fonts - 6.15.0 - - org.apache.poi poi - 3.17 + 3.10.1 - - - org.apache.poi - poi-ooxml - 3.17 - - - - org.apache.xmlbeans - xmlbeans - 5.1.1 - - net.sf.barcode4j barcode4j @@ -297,7 +266,22 @@ fop 2.3 - + + net.sf.jasperreports + jasperreports + 6.12.2 + + + com.lowagie + itext + + + + + net.sf.jasperreports + jasperreports-fonts + 6.0.0 + ar.com.fdvs DynamicJasper-core-fonts diff --git a/src/main/java/com/unicenta/pos/forms/AppLocal.java b/src/main/java/com/unicenta/pos/forms/AppLocal.java index 75a66d0..e4b7557 100644 --- a/src/main/java/com/unicenta/pos/forms/AppLocal.java +++ b/src/main/java/com/unicenta/pos/forms/AppLocal.java @@ -30,7 +30,7 @@ public class AppLocal { public static final String APP_NAME = "uniCenta oPOS"; public static final String APP_ID = "unicentaopos"; - public static final String APP_VERSION = "5.3.2"; + public static final String APP_VERSION = "5.3.1"; private static final LocaleResources m_resources; diff --git a/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java b/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java index 3242413..8fe269b 100644 --- a/src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java +++ b/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(); - customExecutor.submit(pbWorker); + pbWorker.execute(); } /** diff --git a/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java b/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java index 95edf35..348cc65 100644 --- a/src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java +++ b/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; /** @@ -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(); - customExecutor.submit(pbWorker); + pbWorker.execute(); } /** diff --git a/src/main/java/com/unicenta/pos/imports/StockQtyImport.java b/src/main/java/com/unicenta/pos/imports/StockQtyImport.java index 9b6c8a6..9eb914b 100644 --- a/src/main/java/com/unicenta/pos/imports/StockQtyImport.java +++ b/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(); - customExecutor.submit(pbWorker); + pbWorker.execute(); } /** diff --git a/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java b/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java index a908d93..6e08809 100644 --- a/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java +++ b/src/main/java/com/unicenta/pos/payment/JPaymentSelect.java @@ -749,7 +749,7 @@ public abstract class JPaymentSelect extends javax.swing.JDialog }; //worker.execute(); - customExecutor.submit(worker); + customExecutor.execute(worker); } catch (Exception ex) { System.out.println(ex.getMessage()); diff --git a/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java b/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java index 8fe5884..ed97a35 100644 --- a/src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java +++ b/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.*; /** @@ -80,7 +78,6 @@ public class JTicketsBagShared extends JTicketsBag { log.debug("Loading Sales screen! "+this.getClass()); - ExecutorService customExecutor = Executors.newCachedThreadPool(); SwingWorker reloadLayaway = new SwingWorker<>() { @Override protected String doInBackground() throws Exception { @@ -94,8 +91,7 @@ public class JTicketsBagShared extends JTicketsBag { } }; - //reloadLayaway.execute(); - customExecutor.submit(reloadLayaway); + reloadLayaway.execute(); m_sCurrentTicket = null; diff --git a/src/main/java/com/unicenta/pos/transfer/Transfer.java b/src/main/java/com/unicenta/pos/transfer/Transfer.java index 6d95309..3901ec9 100644 --- a/src/main/java/com/unicenta/pos/transfer/Transfer.java +++ b/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; /** @@ -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 worker = new SwingWorker() { @Override @@ -2734,8 +2731,7 @@ public final class Transfer extends JPanel implements JPanelView { } }; - //worker.execute(); - customExecutor.submit(worker); + worker.execute(); } System.gc(); diff --git a/src/main/resources/pos_messages.properties b/src/main/resources/pos_messages.properties index 03c48ca..c32bde3 100644 --- a/src/main/resources/pos_messages.properties +++ b/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=

Version 5.3.2 Upgrade!


Your current database version is {0}


For version 5.3 click YES

For any other version click NO and get to 5.3 first

+message.eolupdate=

Version 5.3.1 Upgrade!


Your current database version is {0}


For version 5.3 click YES

For any other version click NO and get to 5.3 first

message.ibuttonassign=
Get the iButton ID
Place iButton onto the reader then click OK message.ibuttonnotassign=
The iButton used is not yet assigned to anyone message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.