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

Look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-04 14:36:52 +02:00
parent bcd028c040
commit 2182e7fd54
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -50,8 +50,7 @@ $confirm = GETPOST('confirm', 'alpha');
$cancel = GETPOST('cancel', 'alpha'); $cancel = GETPOST('cancel', 'alpha');
$toselect = GETPOST('toselect', 'array'); $toselect = GETPOST('toselect', 'array');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
$optioncss = GETPOST('optioncss', 'alpha');
$socid = GETPOST('socid', 'int');
$socid = GETPOST('socid', 'int'); $socid = GETPOST('socid', 'int');
@ -394,7 +393,7 @@ if ($resql) {
if ($search_payment_term != '') { if ($search_payment_term != '') {
$param .= '&search_payment_term='.urlencode($search_payment_term); $param .= '&search_payment_term='.urlencode($search_payment_term);
} }
if ($search_recurring != '' && $search_recurrning != '-1') { if ($search_recurring != '' && $search_recurring != '-1') {
$param .= '&search_recurring='.urlencode($search_recurring); $param .= '&search_recurring='.urlencode($search_recurring);
} }
if ($search_frequency > 0) { if ($search_frequency > 0) {
@ -570,7 +569,7 @@ if ($resql) {
if (!empty($arrayfields['s.nom']['checked'])) { if (!empty($arrayfields['s.nom']['checked'])) {
print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder); print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder);
} }
if (!empty($arrayfields['f.total_total']['checked'])) { if (!empty($arrayfields['f.total_ht']['checked'])) {
print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], "f.total_ht", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], "f.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
} }
if (!empty($arrayfields['f.total_tva']['checked'])) { if (!empty($arrayfields['f.total_tva']['checked'])) {
@ -789,12 +788,13 @@ if ($resql) {
} }
} }
// Action column // Action column
print '<td class="center">'; print '<td class="center tdoverflowmax125">';
if ($user->rights->facture->creer && empty($invoicerectmp->suspended)) { if ($user->rights->facture->creer && empty($invoicerectmp->suspended)) {
if ($invoicerectmp->isMaxNbGenReached()) { if ($invoicerectmp->isMaxNbGenReached()) {
print $langs->trans("MaxNumberOfGenerationReached"); print $langs->trans("MaxNumberOfGenerationReached");
} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) { } elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) {
print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">'; print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
print img_picto($langs->trans("CreateBill"), 'add', 'class="paddingrightonly"');
print $langs->trans("CreateBill").'</a>'; print $langs->trans("CreateBill").'</a>';
} else { } else {
print $form->textwithpicto('', $langs->trans("DateIsNotEnough")); print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));