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

add freetextsubstitutionexclude parameter

Browse Source
This commit is contained in:
Christophe Battarel 2019-04-16 16:21:32 +02:00
parent 502b1e4d31
commit c157cfad74
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/contract.php
View File

@ -467,6 +467,7 @@ print "</tr>\n";
// free text // free text
$freetexttitle = $langs->trans("FreeLegalTextOnContracts"); $freetexttitle = $langs->trans("FreeLegalTextOnContracts");
$freetextvar = "CONTRACT_FREE_TEXT"; $freetextvar = "CONTRACT_FREE_TEXT";
$freetextsubstitutionexclude = array('objectamount');
require_once(DOL_DOCUMENT_ROOT.'/core/tpl/admin_freetext.tpl.php'); require_once(DOL_DOCUMENT_ROOT.'/core/tpl/admin_freetext.tpl.php');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';

1
htdocs/admin/holiday.php
View File

@ -474,6 +474,7 @@ print "</tr>\n";
// free text // free text
$freetexttitle = $langs->trans("FreeLegalTextOnHolidays"); $freetexttitle = $langs->trans("FreeLegalTextOnHolidays");
$freetextvar = "HOLIDAY_FREE_TEXT"; $freetextvar = "HOLIDAY_FREE_TEXT";
$freetextsubstitutionexclude = array('objectamount');
require_once(DOL_DOCUMENT_ROOT.'/core/tpl/admin_freetext.tpl.php'); require_once(DOL_DOCUMENT_ROOT.'/core/tpl/admin_freetext.tpl.php');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';

3
htdocs/core/tpl/admin_freetext.tpl.php
View File

@ -23,6 +23,7 @@
* $conf, $langs, $db * $conf, $langs, $db
* The following vars may also be defined: * The following vars may also be defined:
* $freetextlang * $freetextlang
* $freetextsubstitutionexclude
*/ */
// Protection to avoid direct call of template // Protection to avoid direct call of template
@ -32,7 +33,7 @@ if (empty($conf) || ! is_object($conf))
exit; exit;
} }
$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2); $substitutionarray=pdf_getSubstitutionArray($langs, $freetextsubstitutionexclude, null, 2);
$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation"); $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>'; $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
foreach($substitutionarray as $key => $val) $htmltext.=$key.'<br>'; foreach($substitutionarray as $key => $val) $htmltext.=$key.'<br>';