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

Fix info on tooltip

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-18 16:27:25 +02:00
parent b64b4abf07
commit d81398e72d
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/card.php
View File

@ -1001,7 +1001,7 @@ if ($object->id > 0)
$sql.= ', f.tva as total_tva'; $sql.= ', f.tva as total_tva';
$sql.= ', f.total_ttc'; $sql.= ', f.total_ttc';
$sql.= ', f.datec as dc'; $sql.= ', f.datec as dc';
$sql.= ', f.date_last_gen'; $sql.= ', f.date_last_gen, f.date_when';
$sql.= ', f.frequency'; $sql.= ', f.frequency';
$sql.= ', f.unit_frequency'; $sql.= ', f.unit_frequency';
$sql.= ', f.suspended as suspended'; $sql.= ', f.suspended as suspended';
@ -1044,6 +1044,8 @@ if ($object->id > 0)
$invoicetemplate->total_ht = $objp->total_ht; $invoicetemplate->total_ht = $objp->total_ht;
$invoicetemplate->total_tva = $objp->total_tva; $invoicetemplate->total_tva = $objp->total_tva;
$invoicetemplate->total_ttc = $objp->total_ttc; $invoicetemplate->total_ttc = $objp->total_ttc;
$invoicetemplate->date_last_gen = $objp->date_last_gen;
$invoicetemplate->date_when = $objp->date_when;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="nowrap">'; print '<td class="nowrap">';

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

@ -1118,7 +1118,21 @@ class FactureRec extends CommonInvoice
global $langs; global $langs;
$result=''; $result='';
$label=$langs->trans("ShowInvoice").': '.$this->ref;
$label = '<u>' . $langs->trans("ShowInvoice") . '</u>';
if (! empty($this->ref))
$label .= '<br><b>'.$langs->trans('Ref') . ':</b> ' . $this->ref;
if (! empty($this->date_last_gen))
$label .= '<br><b>'.$langs->trans('DateLastGeneration') . ':</b> ' . dol_print_date($this->date_last_gen, 'dayhour');
if ($this->frequency > 0)
{
if (! empty($this->date_when))
{
$label .= '<br><b>'.$langs->trans('NextDateToExecution') . ':</b> ';
$label .= (empty($this->suspended)?'':'<strike>'). dol_print_date($this->date_when, 'day').(empty($this->suspended)?'':'</strike>'); // No hour for this property
if (! empty($this->suspended)) $label .= ' ('.$langs->trans("Disabled").')';
}
}
$url = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?facid='.$this->id; $url = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?facid='.$this->id;