Merge origin/master

jlawyerorg · Oct 27, 2024 · 34b0163 · 34b0163
2 parents 8d1cf26 + 191b640
commit 34b0163
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/...r-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.form b/...r-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.form
@@ -176,6 +176,7 @@
           <Image iconType="3" name="/icons/edit.png"/>
         </Property>
         <Property name="text" type="java.lang.String" value="neues Dokument"/>
+        <Property name="toolTipText" type="java.lang.String" value="Neues Dokument aus Vorlage erstellen und das Ergebnis dieses Dialogs &#xfc;bergeben. &#xa;Die Vorlage ben&#xf6;tigt den Platzhalter {{INGO_TEXT}}."/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdNewDocumentActionPerformed"/>

diff --git a/...r-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.java b/...r-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.java
@@ -794,6 +794,7 @@ public void mouseReleased(java.awt.event.MouseEvent evt) {
 
         cmdNewDocument.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/edit.png"))); // NOI18N
         cmdNewDocument.setText("neues Dokument");
+        cmdNewDocument.setToolTipText("Neues Dokument aus Vorlage erstellen und das Ergebnis dieses Dialogs übergeben. \nDie Vorlage benötigt den Platzhalter {{INGO_TEXT}}.");
         cmdNewDocument.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 cmdNewDocumentActionPerformed(evt);

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java
@@ -2551,7 +2551,7 @@ private void cmdCreateInvoiceDocumentActionPerformed(java.awt.event.ActionEvent
                 }
 
                 ArchiveFileDocumentsBean invoiceDoc = this.caseView.newDocumentDialog(null, currentEntry, senderUser, this.getInvoicePositionsAsTable(this.cmbTableHeadersLanguage.getSelectedItem().toString()), timesheetPosTable, giroCode, null);
-                if (this.currentEntry != null) {
+                if (invoiceDoc!=null && this.currentEntry != null) {
                     this.save();
                     try {
                         JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(ClientSettings.getInstance().getLookupProperties());

diff --git a/...r-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/InvoiceService.java b/...r-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/InvoiceService.java
@@ -1062,18 +1062,18 @@ public byte[] getGiroCode(String senderPrincipalId, float amount, String purpose
         }
 
         if (ServerStringUtils.isEmpty(sender.getCompany())) {
-            throw new Exception("Girocode kann nicht erstellt werden - Unternehmensname des Absenders leer");
+            throw new Exception("Girocode kann nicht erstellt werden - Unternehmensname des Absenders leer. Korrektur unter 'Administration' - 'Nutzer'.");
         }
         String name=sender.getCompany().trim();
 
         if (ServerStringUtils.isEmpty(sender.getBankBic())) {
-            throw new Exception("Girocode kann nicht erstellt werden - BIC des Absenders ist leer");
+            throw new Exception("Girocode kann nicht erstellt werden - BIC des Absenders ist leer. Korrektur unter 'Administration' - 'Nutzer'.");
         }
         String bic=sender.getBankBic().trim();
         bic=bic.replace(" ", "");
 
         if (ServerStringUtils.isEmpty(sender.getBankIban())) {
-            throw new Exception("Girocode kann nicht erstellt werden - IBAN des Absenders ist leer");
+            throw new Exception("Girocode kann nicht erstellt werden - IBAN des Absenders ist leer. Korrektur unter 'Administration' - 'Nutzer'.");
         }
         String iban=sender.getBankIban().trim();
         iban=iban.replace(" ", "");

diff --git a/...-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/MailboxScannerTask.java b/...-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/MailboxScannerTask.java
@@ -1312,6 +1312,9 @@ private boolean saveToCase(Message msg, Date received, ArchiveFileBean toCase, A
 
                 // remove any extension, because of the template it might be somewhere in the middle of the new name
                 docName = docName.replace("." + extension, "");
+
+                // add back extension
+                docName = ServerFileUtils.preserveExtension(newName, docName);
 
                 if (caseSvc.doesDocumentExistUnrestricted(toCase.getId(), docName)) {
                     log.error("There is already a document '" + docName + "' in case " + toCase.getFileNumber() + " - skipping this attachment");