Fix Better HTML5 compliant

This commit is contained in:
Laurent Destailleur 2017-03-10 11:22:27 +01:00
parent b3d27521cb
commit 80702e4c0a
31 changed files with 136 additions and 136 deletions

View File

@ -110,14 +110,14 @@ class box_actions extends ModeleBoxes
$label = empty($objp->label)?$objp->type_label:$objp->label;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $actionstatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
'asis' => 1,
);
@ -128,7 +128,7 @@ class box_actions extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => ($objp->percentage>= 0?$objp->percentage.'%':''),
);
@ -149,7 +149,7 @@ class box_actions extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);

View File

@ -148,19 +148,19 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("Bills")." ".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
);
$this->info_box_contents[$line][2] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
'text' => $data[$j]->nb,
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
);
$this->info_box_contents[$line][3] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
);
@ -230,19 +230,19 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("Bills")." ".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
);
$this->info_box_contents[$line][2] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
);
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
);
$totalMnt += $objp->Mnttot;
@ -260,7 +260,7 @@ class box_activity extends ModeleBoxes
);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500, 'text' => ($db->error().' sql='.$sql),
);
}
@ -323,12 +323,12 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
'td' => 'align="left"',
'td' => '',
'text' =>$langs->trans("Orders")." ".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
);
$this->info_box_contents[$line][2] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Orders")." ".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$data[$j]->fk_statut,
@ -336,7 +336,7 @@ class box_activity extends ModeleBoxes
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
);
$totalMnt += $data[$j]->Mnttot;
@ -413,12 +413,12 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut,0),
);
$this->info_box_contents[$line][2] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut,0),
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&viewstatut=".$data[$j]->fk_statut,
@ -426,7 +426,7 @@ class box_activity extends ModeleBoxes
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
);
$totalMnt += $data[$j]->Mnttot;

View File

@ -94,7 +94,7 @@ class box_bookmarks extends ModeleBoxes
'target' => $objp->target?'newtab':'',
);
$this->info_box_contents[$line][1] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->title,
'url' => $objp->url,
'tooltip' => $objp->title,
@ -117,7 +117,7 @@ class box_bookmarks extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);

View File

@ -117,13 +117,13 @@ class box_clients extends ModeleBoxes
$thirdpartystatic->logo = $objp->logo;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $thirdpartystatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datem, "day")
);
@ -140,7 +140,7 @@ class box_clients extends ModeleBoxes
$db->free($result);
}
else {
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}

View File

@ -115,33 +115,33 @@ class box_commandes extends ModeleBoxes
$societestatic->logo = $objp->logo;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $commandestatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $societestatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
'asis' => 1,
);
}
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($date,'day'),
);
@ -158,7 +158,7 @@ class box_commandes extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);

View File

@ -111,18 +111,18 @@ class box_comptes extends ModeleBoxes
$solde_total[$objp->currency_code] += $solde;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $account_static->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->number,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
);
@ -151,14 +151,14 @@ class box_comptes extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -110,19 +110,19 @@ class box_contacts extends ModeleBoxes
$societestatic->fournisseur = $objp->fournisseur;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $contactstatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datem, "day"),
);
@ -144,7 +144,7 @@ class box_contacts extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);

View File

@ -106,25 +106,25 @@ class box_contracts extends ModeleBoxes
// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $contractstatic->getNomUrl(1),
'text2'=> $late,
'asis'=>1
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $thirdpartytmp->getNomUrl(1),
'asis'=>1
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datec,'day'),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right" class="nowrap"',
'td' => 'class="nowrap right"',
'text' => $contractstatic->getLibStatut(6),
'asis'=>1,
);
@ -141,14 +141,14 @@ class box_contracts extends ModeleBoxes
$db->free($resql);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -163,7 +163,7 @@ class box_external_rss extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
'td' => 'align="left"',
'td' => '',
'text' => $title,
'url' => $href,
'tooltip' => $tooltip,

View File

@ -122,25 +122,25 @@ class box_factures extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $facturestatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $societestatic->getNomUrl(1, '', 40),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($date,'day'),
);
@ -161,7 +161,7 @@ class box_factures extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
@ -169,7 +169,7 @@ class box_factures extends ModeleBoxes
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -122,32 +122,32 @@ class box_factures_fourn extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $facturestatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->ref_supplier,
'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($date,'day'),
);
@ -171,14 +171,14 @@ class box_factures_fourn extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->transnoentities("ReadPermissionNotAllowed"),
);
}

View File

@ -119,25 +119,25 @@ class box_factures_fourn_imp extends ModeleBoxes
$tooltip = $langs->trans('SupplierInvoice') . ': ' . ($objp->ref?$objp->ref:$objp->facid) . '<br>' . $langs->trans('RefSupplier') . ': ' . $objp->ref_supplier;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $facturestatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $thirdpartytmp->getNomUrl(1, '', 40),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datelimite,'day'),
);
@ -161,14 +161,14 @@ class box_factures_fourn_imp extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -126,25 +126,25 @@ class box_factures_imp extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $facturestatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $societestatic->getNomUrl(1, '', 44),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datelimite,'day'),
);
@ -163,7 +163,7 @@ class box_factures_imp extends ModeleBoxes
else
{
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
@ -171,7 +171,7 @@ class box_factures_imp extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -98,7 +98,7 @@ class box_ficheinter extends ModeleBoxes
'logo' => $this->boximg,
'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
$this->info_box_contents[$i][1] = array('td' => '',
'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some interventions have no ref
'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
@ -106,11 +106,11 @@ class box_ficheinter extends ModeleBoxes
'logo' => 'company',
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
$this->info_box_contents[$i][3] = array('td' => '',
'text' => dol_trunc($objp->name,40),
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
$this->info_box_contents[$i][4] = array('td' => 'class="right"',
'text' => dol_print_date($datec,'day'));
$this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"',
@ -127,14 +127,14 @@ class box_ficheinter extends ModeleBoxes
}
else
{
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else
{
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

View File

@ -94,13 +94,13 @@ class box_fournisseurs extends ModeleBoxes
$thirdpartytmp->logo = $objp->logo;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $thirdpartytmp->getNomUrl(1, '', 40),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datem, "day"),
);
@ -120,14 +120,14 @@ class box_fournisseurs extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -114,18 +114,18 @@ class box_goodcustomers extends ModeleBoxes
$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $thirdpartystatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datem, "day")
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
);
@ -142,7 +142,7 @@ class box_goodcustomers extends ModeleBoxes
$db->free($result);
}
else {
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}

View File

@ -255,7 +255,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

View File

@ -252,7 +252,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

View File

@ -253,7 +253,7 @@ class box_graph_orders_permonth extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

View File

@ -252,7 +252,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

View File

@ -254,7 +254,7 @@ class box_graph_propales_permonth extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

View File

@ -117,19 +117,19 @@ class box_members extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $memberstatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $memberstatic->getFullName($langs),
'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datem, "day"),
);
@ -150,7 +150,7 @@ class box_members extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);

View File

@ -106,13 +106,13 @@ class box_produits extends ModeleBoxes
$productstatic->entity = $objp->entity;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $productstatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->label,
);
@ -139,7 +139,7 @@ class box_produits extends ModeleBoxes
}
}
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $price,
);
@ -149,7 +149,7 @@ class box_produits extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datem,'day'),
);
@ -174,14 +174,14 @@ class box_produits extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -113,13 +113,13 @@ class box_produits_alerte_stock extends ModeleBoxes
$productstatic->entity = $objp->entity;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $productstatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->label,
);
@ -148,7 +148,7 @@ class box_produits_alerte_stock extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $price,
);
@ -180,7 +180,7 @@ class box_produits_alerte_stock extends ModeleBoxes
else
{
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
@ -188,7 +188,7 @@ class box_produits_alerte_stock extends ModeleBoxes
}
else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -104,14 +104,14 @@ class box_project extends ModeleBoxes
);
$this->info_box_contents[$i][1] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->ref,
'tooltip' => $tooltip,
'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
);
$this->info_box_contents[$i][2] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->title,
);
@ -123,20 +123,20 @@ class box_project extends ModeleBoxes
if ($resultTask) {
$objTask = $db->fetch_object($resultTask);
$this->info_box_contents[$i][3] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => number_format($objTask->nb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"),
);
if ($objTask->nb > 0 )
$this->info_box_contents[$i][4] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')."%",
);
else
$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A&nbsp;");
$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
$totalnbTask += $objTask->nb;
} else {
$this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format(0, 0, ',', ' '));
$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A&nbsp;");
$this->info_box_contents[$i][3] = array('td' => 'class="right"', 'text' => number_format(0, 0, ',', ' '));
$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
}
$i++;

View File

@ -109,25 +109,25 @@ class box_propales extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $propalstatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $societestatic->getNomUrl(1,'',40),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($date,'day'),
);
@ -148,14 +148,14 @@ class box_propales extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -117,13 +117,13 @@ class box_prospect extends ModeleBoxes
$thirdpartystatic->logo = $objp->logo;
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $thirdpartystatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($datem, "day"),
);
@ -149,14 +149,14 @@ class box_prospect extends ModeleBoxes
$db->free($resql);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -155,13 +155,13 @@ class box_services_contracts extends ModeleBoxes
}
else
{
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
}
else {
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}

View File

@ -98,7 +98,7 @@ class box_services_expired extends ModeleBoxes
'logo' => $this->boximg,
'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
$this->info_box_contents[$i][1] = array('td' => '',
'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref
'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
@ -114,7 +114,7 @@ class box_services_expired extends ModeleBoxes
'text' => dol_print_date($dateline,'day'),
'text2'=> $late);
$this->info_box_contents[$i][5] = array('td' => 'align="right"',
$this->info_box_contents[$i][5] = array('td' => 'class="right"',
'text' => $objp->nb_services);
@ -131,7 +131,7 @@ class box_services_expired extends ModeleBoxes
}
else
{
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
$this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
@ -140,7 +140,7 @@ class box_services_expired extends ModeleBoxes
}
else
{
$this->info_box_contents[0][0] = array('td' => 'align="left"',
$this->info_box_contents[0][0] = array('td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}
}

View File

@ -112,25 +112,25 @@ class box_supplier_orders extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $objp->ref,
'tooltip' => $tooltip,
'url' => $urlo,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="left"',
'td' => '',
'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => dol_print_date($date,'day'),
);
@ -151,7 +151,7 @@ class box_supplier_orders extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
@ -160,7 +160,7 @@ class box_supplier_orders extends ModeleBoxes
else
{
$this->info_box_contents[0][0] = array(
'td' => 'align="left"',
'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}

View File

@ -99,19 +99,19 @@ class box_task extends ModeleBoxes
{
$objp = $db->fetch_object($result);
$this->info_box_contents[$i][] = array(
'td' => 'align="left"',
'td' => '',
'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0),
);
$this->info_box_contents[$i][] = array(
'td' => 'align="right"',
'td' => 'class="right"',
'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
);
$totalnb += $objp->nb;
$this->info_box_contents[$i][] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
$totalplannedtot += $objp->plannedtot;
$this->info_box_contents[$i][] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
$totaldurationtot += $objp->durationtot;
$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
@ -124,7 +124,7 @@ class box_task extends ModeleBoxes
// Add the sum à the bottom of the boxes
$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => 'align="left"', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));