Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v16

Browse Source
This commit is contained in:
Laurent Destailleur
2022-07-24 18:59:07 +02:00
parent fe7346a9c6
commit e465c0f34b
30 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
View File

@@ -898,8 +898,8 @@ class pdf_standard_myobject extends ModelePDFMyObject
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
// Show Draft Watermark
if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
if ($object->statut == $object::STATUS_DRAFT && getDolGlobalString('MYMODULE_DRAFT_WATERMARK')) {
pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', dol_escape_htmltag(getDolGlobalString('MYMODULE_DRAFT_WATERMARK')));
}
$pdf->SetTextColor(0, 0, 60);

4
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
View File

@@ -79,7 +79,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject
// Parametrage du prefix
$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->MYMODULE_MYOBJECT_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.getDolGlobalString('MYMODULE_MYOBJECT_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" name="Button"></td>';
$texte .= '</tr>';
@@ -130,7 +130,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
// We get cursor rule
$mask = $conf->global->MYMODULE_MYOBJECT_ADVANCED_MASK;
$mask = getDolGlobalString('MYMODULE_MYOBJECT_ADVANCED_MASK');
if (!$mask) {
$this->error = 'NotConfigured';