merge main

This commit is contained in:
2025-08-06 17:39:16 +01:00
9 changed files with 58 additions and 24 deletions
@@ -133,7 +133,7 @@ public class JTicketsBagShared extends JTicketsBag {
m_App.getAppUserView().getUser().getName(),
"Void",
"Ticket Deleted",
(Object) 0.0
0.0
});
m_sCurrentTicket = null;
@@ -245,7 +245,7 @@ public class JTicketsBagShared extends JTicketsBag {
m_jListTickets.setText("");
newTicket();
} else {
showList = (Boolean) m_App.getAppUserView().getUser().hasPermission("sales.ShowList");
showList = m_App.getAppUserView().getUser().hasPermission("sales.ShowList");
if (showList) {
m_jListTickets.doClick();
}
@@ -500,7 +500,7 @@ public class JTicketsBagShared extends JTicketsBag {
if (m_sCurrentTicket != null) {
if (m_App.getProperties().getProperty("override.check").equals("true")) {
Integer secret = (Integer) Integer.parseInt(m_App.getProperties().getProperty("override.pin"));
Integer secret = Integer.parseInt(m_App.getProperties().getProperty("override.pin"));
Integer iValue = JNumberPop.showEditNumber(this, AppLocal.getIntString("title.override.enterpin"));
if (iValue == null ? secret == null : iValue.equals(secret)) {