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

FIX setup of member module

Browse Source 
FIX generation of business cards
This commit is contained in:
Laurent Destailleur 2022-02-18 14:14:34 +01:00
parent 694ea8830b
commit 61e91656e0
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/adherents/admin/member.php
View File

@ -429,6 +429,14 @@ print '</table>';
print '</div>'; print '</div>';
/*
TODO Use a global form instead of embeded form into table
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="updateall">';
*/
/* /*
* Edit info of model document * Edit info of model document
*/ */
@ -467,6 +475,7 @@ $helptext .= '__YEAR__, __MONTH__, __DAY__';
form_constantes($constantes, 0, $helptext); form_constantes($constantes, 0, $helptext);
//print '</form>';
print "<br>"; print "<br>";

3
htdocs/core/class/commonobject.class.php
View File

@ -5292,8 +5292,7 @@ abstract class CommonObject
$sav_charset_output = $outputlangs->charset_output; $sav_charset_output = $outputlangs->charset_output;
if (in_array(get_class($this), array('Adherent'))) { if (in_array(get_class($this), array('Adherent'))) {
$arrayofrecords = array(); // The write_file of templates of adherent class need this var $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, 'tmp_cards', $moreparams);
$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
} else { } else {
$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams); $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
} }

5
htdocs/core/lib/admin.lib.php
View File

@ -1627,6 +1627,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
if (empty($strictw3c)) { if (empty($strictw3c)) {
print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="page_y" value="'.newToken().'">';
} }
print '<tr class="oddeven">'; print '<tr class="oddeven">';
@ -1733,7 +1734,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
// Submit // Submit
if (empty($strictw3c)) { if (empty($strictw3c)) {
print '<td class="center">'; print '<td class="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">'; print '<input type="submit" class="button small reposition" value="'.$langs->trans("Update").'" name="update">';
print "</td>"; print "</td>";
} }
@ -1748,7 +1749,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
print '</div>'; print '</div>';
if (!empty($strictw3c) && $strictw3c == 1) { if (!empty($strictw3c) && $strictw3c == 1) {
print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>'; print '<div align="center"><input type="submit" class="button small reposition" value="'.$langs->trans("Update").'" name="update"></div>';
print "</form>\n"; print "</form>\n";
} }
} }

6
htdocs/core/modules/member/doc/pdf_standard.class.php
View File

@ -50,14 +50,14 @@ class pdf_standard extends CommonStickerGenerator
global $conf, $langs, $mysoc; global $conf, $langs, $mysoc;
// Translations // Translations
$langs->loadLangs(array("main", "bills")); $langs->loadLangs(array("main", "admin"));
$this->db = $db; $this->db = $db;
$this->name = "standard"; $this->name = "standard";
$this->description = $langs->trans('PDFStandard'); $this->description = $langs->trans('TemplateforBusinessCards');
//$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template //$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
$this->type = 'html'; $this->type = 'pdf-various-sizes';
} }
/** /**

3
htdocs/langs/en_US/admin.lang
View File

@ -2218,4 +2218,5 @@ API_DISABLE_COMPRESSION=Disable compression of API responses
EachTerminalHasItsOwnCounter=Each terminal use its own counter. EachTerminalHasItsOwnCounter=Each terminal use its own counter.
FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
PreviousHash=Previous hash PreviousHash=Previous hash
LateWarningAfter="Late" warning after LateWarningAfter="Late" warning after
TemplateforBusinessCards=Template for a business card in different size