#224 [ODT] add: missing ref object on filename

Evarisk · Feb 22, 2023 · 7ed73cf · 7ed73cf
1 parent fb170e9
commit 7ed73cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/...eet/dolimeetdocuments/trainingsessiondocument/doc_attendancesheetdocument_odt.modules.php b/...eet/dolimeetdocuments/trainingsessiondocument/doc_attendancesheetdocument_odt.modules.php
@@ -200,7 +200,7 @@ public function write_file(SessionDocument $objectDocument, Translate $outputlan
 
         $objectDocument->fetch($objectDocumentID);
 
-        $objectref = dol_sanitizeFileName($objectDocument->ref);
+        $objectDocumentRef = dol_sanitizeFileName($objectDocument->ref);
         if ($moreparam['specimen'] == 0 || $moreparam['zone'] == 'private') {
             $dir = $conf->dolimeet->multidir_output[$object->entity ?? 1] . '/' . $object->type . 'document/' . $object->ref;
         } else {
@@ -221,10 +221,9 @@ public function write_file(SessionDocument $objectDocument, Translate $outputlan
             $societyname = preg_replace('/\./', '_', $conf->global->MAIN_INFO_SOCIETE_NOM);
 
 			$date = dol_print_date(dol_now(),'dayxcard');
-            if ($moreparam['specimen'] == 0) {
-                $newfiletmp = $objectref . '_' . $date . '_' . $newfiletmp . '_' . $societyname;
-            } else {
-                $newfiletmp = $newfiletmp . '_specimen';
+            $newfiletmp = $date . '_' . $object->ref . '_' . $objectDocumentRef .'_' . $newfiletmp . '_' . $societyname;
+            if ($moreparam['specimen'] == 1) {
+                $newfiletmp .= '_specimen';
             }
 
             $objectDocument->last_main_doc = $newfiletmp;

diff --git a/...limeetdocuments/trainingsessiondocument/doc_completioncertificatedocument_odt.modules.php b/...limeetdocuments/trainingsessiondocument/doc_completioncertificatedocument_odt.modules.php
@@ -200,7 +200,7 @@ public function write_file(SessionDocument $objectDocument, Translate $outputlan
 
         $objectDocument->fetch($objectDocumentID);
 
-        $objectref = dol_sanitizeFileName($objectDocument->ref);
+        $objectDocumentRef = dol_sanitizeFileName($objectDocument->ref);
         if ($moreparam['specimen'] == 0 || $moreparam['zone'] == 'private') {
             $dir = $conf->dolimeet->multidir_output[$object->entity ?? 1] . '/' . $object->type . 'document/' . $object->ref;
         } else {
@@ -227,10 +227,9 @@ public function write_file(SessionDocument $objectDocument, Translate $outputlan
             }
 
             $date = dol_print_date(dol_now(),'dayxcard');
-            if ($moreparam['specimen'] == 0) {
-                $newfiletmp = $objectref . '_' . $date . '_' . $newfiletmp . '_' . $attandent . '_' . $societyname;
-            } else {
-                $newfiletmp = $newfiletmp . '_' . $attandent . '_specimen';
+            $newfiletmp = $date . '_' . $object->ref . '_' . $objectDocumentRef .'_' . $newfiletmp . '_' . $societyname;
+            if ($moreparam['specimen'] == 1) {
+                $newfiletmp .= '_specimen';
             }
 
             $objectDocument->last_main_doc = $newfiletmp;