Debug v16
This commit is contained in:
parent
e040363b81
commit
e991c614d3
@ -919,15 +919,19 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||||||
|
|
||||||
$massactionbutton = '';
|
$massactionbutton = '';
|
||||||
$arrayofmassactions = array();
|
$arrayofmassactions = array();
|
||||||
if ($projectstatic->usage_bill_time) {
|
|
||||||
$arrayofmassactions = array(
|
if ($projectstatic->id > 0) {
|
||||||
'generateinvoice'=>$langs->trans("GenerateBill"),
|
// If we are on a given project.
|
||||||
//'builddoc'=>$langs->trans("PDFMerge"),
|
if ($projectstatic->usage_bill_time) {
|
||||||
);
|
$arrayofmassactions = array(
|
||||||
}
|
'generateinvoice'=>$langs->trans("GenerateBill"),
|
||||||
if ( ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
|
//'builddoc'=>$langs->trans("PDFMerge"),
|
||||||
$langs->load("interventions");
|
);
|
||||||
$arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
|
}
|
||||||
|
if ( ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
|
||||||
|
$langs->load("interventions");
|
||||||
|
$arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
|
//if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
|
||||||
if (in_array($massaction, array('presend', 'predelete', 'generateinvoice', 'generateinter'))) {
|
if (in_array($massaction, array('presend', 'predelete', 'generateinvoice', 'generateinter'))) {
|
||||||
@ -1251,7 +1255,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||||||
print '<input type="hidden" name="massaction" value="confirm_createinter">';
|
print '<input type="hidden" name="massaction" value="confirm_createinter">';
|
||||||
|
|
||||||
if ($projectstatic->thirdparty->id > 0) {
|
if ($projectstatic->thirdparty->id > 0) {
|
||||||
print '<table class="noborder" width="100%" >';
|
print '<table class="noborder centpercent">';
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td class="titlefield">';
|
print '<td class="titlefield">';
|
||||||
print $langs->trans('InterToUse');
|
print $langs->trans('InterToUse');
|
||||||
@ -1569,7 +1573,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (!empty($allprojectforuser)) {
|
if (!empty($allprojectforuser)) {
|
||||||
print '<td></td>';
|
print '<td class="liste_titre"></td>';
|
||||||
}
|
}
|
||||||
// Task
|
// Task
|
||||||
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
|
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user