lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug doc templates of ODF

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-20 03:41:45 +02:00
parent 6e27ae6029
commit ce818d4f44
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
View File

@ -175,7 +175,7 @@ class doc_generic_mo_odt extends ModelePDFMo
$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">'; $texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
// Show list of found files // Show list of found files
foreach ($listoffiles as $file) { foreach ($listoffiles as $file) {
$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=mrps&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>'; $texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mrps/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
} }
$texte .= '</div>'; $texte .= '</div>';
} }
@ -284,7 +284,7 @@ class doc_generic_mo_odt extends ModelePDFMo
//print "file=".$file; //print "file=".$file;
//print "conf->societe->dir_temp=".$conf->societe->dir_temp; //print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->bom->dir_temp); dol_mkdir($conf->mrp->dir_temp);
// If CUSTOMER contact defined on order, we use it // If CUSTOMER contact defined on order, we use it
@ -379,14 +379,15 @@ class doc_generic_mo_odt extends ModelePDFMo
foreach ($tmparray as $key => $value) { foreach ($tmparray as $key => $value) {
try { try {
if (preg_match('/logo$/', $key)) { // Image if (preg_match('/logo$/', $key)) {
// Image
if (file_exists($value)) { if (file_exists($value)) {
$odfHandler->setImage($key, $value); $odfHandler->setImage($key, $value);
} else { } else {
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8'); $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
} }
} else // Text } else {
{ // Text
$odfHandler->setVars($key, $value, true, 'UTF-8'); $odfHandler->setVars($key, $value, true, 'UTF-8');
} }
} catch (OdfException $e) { } catch (OdfException $e) {

19
htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
View File

@ -86,7 +86,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
$this->marge_basse = 0; $this->marge_basse = 0;
$this->option_logo = 1; // Affiche logo $this->option_logo = 1; // Affiche logo
$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION $this->option_tva = 0; // Gere option tva
$this->option_modereg = 0; // Affiche mode reglement $this->option_modereg = 0; // Affiche mode reglement
$this->option_condreg = 0; // Affiche conditions reglement $this->option_condreg = 0; // Affiche conditions reglement
$this->option_codeproduitservice = 0; // Affiche code produit-service $this->option_codeproduitservice = 0; // Affiche code produit-service
@ -135,7 +135,8 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
$tmpdir = trim($tmpdir); $tmpdir = trim($tmpdir);
$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir); $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
if (!$tmpdir) { if (!$tmpdir) {
unset($listofdir[$key]); continue; unset($listofdir[$key]);
continue;
} }
if (!is_dir($tmpdir)) { if (!is_dir($tmpdir)) {
$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0); $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
@ -173,7 +174,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
if ($nbofiles) { if ($nbofiles) {
$texte .= '<div id="div_'.get_class($this).'" class="hidden">'; $texte .= '<div id="div_'.get_class($this).'" class="hidden">';
foreach ($listoffiles as $file) { foreach ($listoffiles as $file) {
$texte .= $file['name'].'<br>'; $texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
} }
$texte .= '</div>'; $texte .= '</div>';
} }
@ -195,7 +196,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
/** /**
* Function to build a document on disk using the generic odt module. * Function to build a document on disk using the generic odt module.
* *
* @param Commande $object Object source to build document * @param MyObject $object Object source to build document
* @param Translate $outputlangs Lang output object * @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file * @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int $hidedetails Do not show line details * @param int $hidedetails Do not show line details
@ -229,11 +230,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
$outputlangs->loadLangs(array("main", "dict", "companies", "bills")); $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->commande->dir_output) { if ($conf->mymodule->dir_output) {
// If $object is id instead of object // If $object is id instead of object
if (!is_object($object)) { if (!is_object($object)) {
$id = $object; $id = $object;
$object = new Commande($this->db); $object = new MyObject($this->db);
$result = $object->fetch($id); $result = $object->fetch($id);
if ($result < 0) { if ($result < 0) {
dol_print_error($this->db, $object->error); dol_print_error($this->db, $object->error);
@ -241,7 +242,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
} }
} }
$dir = $conf->commande->multidir_output[isset($object->entity) ? $object->entity : 1]; $object->fetch_thirdparty();
$dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1];
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
if (!preg_match('/specimen/i', $objectref)) { if (!preg_match('/specimen/i', $objectref)) {
$dir .= "/".$objectref; $dir .= "/".$objectref;
@ -331,7 +334,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
$odfHandler = new odf( $odfHandler = new odf(
$srctemplatepath, $srctemplatepath,
array( array(
'PATH_TO_TMP' => $conf->commande->dir_temp, 'PATH_TO_TMP' => $conf->mymodule->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{', 'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}' 'DELIMITER_RIGHT' => '}'