diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index b6d4df5657f0f296167415e35a0f43a6af8f18d2..84dec7b817ed817b6d38d81cca29c5142a00d051 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -144,8 +144,26 @@ class doc_generic_order_odt extends ModelePDFCommandes $texte.= '<br></div></div>'; // Scan directories - if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $nbofiles=count($listoffiles); + if (! empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH)) + { + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=count($listoffiles); + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; + } + $texte.= '</td>'; $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">'; diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index a2ddb144e6d542b566d8908345331b936e202214..c2fcf108c10e9c4ee2cbbe5abbc01b7fc7c177fc 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -145,7 +145,24 @@ class doc_generic_shipment_odt extends ModelePdfExpedition $texte.= '<br></div></div>'; // Scan directories - if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $nbofiles=count($listoffiles); + if (! empty($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH)) + { + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=count($listoffiles); + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; + } $texte.= '</td>'; diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 6065de505c66a68ee876f58e2aebec9b61314ada..2cd392a0bd64da0cc65717440ff7932ec74ab87c 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -144,7 +144,24 @@ class doc_generic_invoice_odt extends ModelePDFFactures $texte.= '<br></div></div>'; // Scan directories - if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $nbofiles=count($listoffiles); + if (! empty($conf->global->FACTURE_ADDON_PDF_ODT_PATH)) + { + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=count($listoffiles); + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; + } $texte.= '</td>'; diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 3ea28a1bd8167bd0d38b1559ff4ca89ff5000707..b1ce455445952849802cefa1a3f28cd7bb6ac83a 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -357,7 +357,25 @@ class doc_generic_project_odt extends ModelePDFProjects $texte.= '<br></div></div>'; // Scan directories - if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $nbofiles=count($listoffiles); + if (! empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH)) + { + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=$nbofiles; + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; + } $texte.= '</td>'; diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index caebf1d78d4647ba21eefa44de81b61cb2ae74bc..a00658a98379eec3e008f503afb438282902b4a9 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -358,7 +358,25 @@ class doc_generic_task_odt extends ModelePDFTask $texte.= '<br></div></div>'; // Scan directories - if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $nbofiles=count($listoffiles); + if (! empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)) + { + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=$nbofiles; + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; + } $texte.= '</td>'; diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index f651c56e0282defd0036a28c19660e8b55acbabe..8f8a2edce9b250648230baf6c6d74d1517331caf 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -149,10 +149,25 @@ class doc_generic_proposal_odt extends ModelePDFPropales $texte.= '<br></div></div>'; // Scan directories - if (count($listofdir)) + $nbofiles=count($listoffiles); + if (! empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH)) { - $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=count($listoffiles); + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; + if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) { // Model for creation diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index 3c66bd5f11df6a45f22dfbc03db065ffb3dfb9f0..08f6372c11b849b1e67d6dc331d55abe7f3be42d 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -131,8 +131,26 @@ class doc_generic_odt extends ModeleThirdPartyDoc $texte.= '</table>'; // Scan directories - if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $nbofiles=count($listoffiles); + if (! empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH)) + { + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=$nbofiles; + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; + } + $texte.= '</td>'; $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">'; diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index ab906617b070bff203f4a50d3c5fca2567a265fd..d1386d646a5ee33e78b245de1e05c03fb781889d 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -149,9 +149,24 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal $texte.= '<br></div></div>'; // Scan directories - if (count($listofdir)) + $nbofiles=count($listoffiles); + if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH)) { - $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>'; + $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'; + //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':''; + $texte.=count($listoffiles); + //$texte.=$nbofiles?'</a>':''; + $texte.='</b>'; + } + + if ($nbofiles) + { + $texte.='<div id="div_'.get_class($this).'" class="hidden">'; + foreach($listoffiles as $file) + { + $texte.=$file['name'].'<br>'; + } + $texte.='<div id="div_'.get_class($this).'">'; if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) {