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

Trans frequency

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-13 20:54:00 +02:00
parent f91b98d326
commit 323f31d832
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -1245,7 +1245,7 @@ class FactureRec extends CommonInvoice
$label .= '<br><b>'.$langs->trans('Ref') . ':</b> ' . $this->ref;
}
if ($this->frequency > 0) {
$label .= '<br><b>'.$langs->trans('Frequency') . ':</b> ' . $this->frequency.$this->unit_frequency;
$label .= '<br><b>'.$langs->trans('Frequency') . ':</b> ' . $langs->trans('FrequencyPer_'.$this->unit_frequency, $this->frequency);
}
if (! empty($this->date_last_gen)) {
$label .= '<br><b>'.$langs->trans('DateLastGeneration') . ':</b> ' . dol_print_date($this->date_last_gen, 'dayhour');

20
htdocs/compta/facture/fiche-rec.php
View File

@ -154,7 +154,7 @@ if (empty($reshook))
// Create predefined invoice
if ($action == 'add')
{
if (! GETPOST('titre'))
if (! GETPOST('titre', 'nohtml'))
{
setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
$action = "create";
@ -162,15 +162,15 @@ if (empty($reshook))
}
$frequency=GETPOST('frequency', 'int');
$reyear=GETPOST('reyear');
$remonth=GETPOST('remonth');
$reday=GETPOST('reday');
$rehour=GETPOST('rehour');
$remin=GETPOST('remin');
$reyear=GETPOST('reyear', 'int');
$remonth=GETPOST('remonth', 'int');
$reday=GETPOST('reday', 'int');
$rehour=GETPOST('rehour', 'int');
$remin=GETPOST('remin', 'int');
$nb_gen_max=GETPOST('nb_gen_max', 'int');
//if (empty($nb_gen_max)) $nb_gen_max =0;
if (GETPOST('frequency'))
if (GETPOST('frequency', 'int'))
{
if (empty($reyear) || empty($remonth) || empty($reday))
{
@ -188,12 +188,12 @@ if (empty($reshook))
if (! $error)
{
$object->titre = GETPOST('titre', 'alpha'); // deprecated
$object->title = GETPOST('titre', 'alpha');
$object->titre = GETPOST('titre', 'nohtml'); // deprecated
$object->title = GETPOST('titre', 'nohtml');
$object->note_private = GETPOST('note_private', 'none');
$object->note_public = GETPOST('note_public', 'none');
$object->modelpdf = GETPOST('modelpdf', 'alpha');
$object->usenewprice = GETPOST('usenewprice');
$object->usenewprice = GETPOST('usenewprice', 'alpha');
$object->frequency = $frequency;
$object->unit_frequency = GETPOST('unit_frequency', 'alpha');