Qual: Removed deprecated code
This commit is contained in:
parent
d4e5647b7e
commit
61e2282cb1
@ -64,10 +64,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
@ -78,10 +78,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
@ -76,10 +76,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -172,7 +172,7 @@ if ($_GET["propalid"] > 0)
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
|
|
||||||
// Conversion du PDF en image png si fichier png non existant
|
// Conversion du PDF en image png si fichier png non existant
|
||||||
if (! file_exists($fileimage) && ! file_exists($fileimagebis))
|
if (! file_exists($fileimage) && ! file_exists($fileimagebis))
|
||||||
{
|
{
|
||||||
@ -200,7 +200,7 @@ if ($_GET["propalid"] > 0)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</td>";
|
print "</td>";
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
@ -231,7 +231,7 @@ elseif (file_exists($fileimagebis))
|
|||||||
for ($i = 0; $i < 20; $i++)
|
for ($i = 0; $i < 20; $i++)
|
||||||
{
|
{
|
||||||
$preview = $multiple.$i;
|
$preview = $multiple.$i;
|
||||||
|
|
||||||
if (file_exists($dir_output.$preview))
|
if (file_exists($dir_output.$preview))
|
||||||
{
|
{
|
||||||
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&file='.urlencode($preview).'"><p>';
|
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&file='.urlencode($preview).'"><p>';
|
||||||
@ -243,10 +243,6 @@ elseif (file_exists($fileimagebis))
|
|||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
@ -64,9 +64,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
@ -45,7 +45,7 @@ $langs->load('sendings');
|
|||||||
require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
|
||||||
|
|
||||||
if ($conf->projet->enabled)
|
if ($conf->projet->enabled)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/project.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/project.class.php");
|
||||||
}
|
}
|
||||||
@ -118,7 +118,7 @@ if ($_GET["id"] > 0) {
|
|||||||
print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
|
print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
|
||||||
}
|
}
|
||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
// Ref cde client
|
// Ref cde client
|
||||||
print '<tr><td>';
|
print '<tr><td>';
|
||||||
print '<table class="nobordernopadding" width="100%"><tr><td nowrap>';
|
print '<table class="nobordernopadding" width="100%"><tr><td nowrap>';
|
||||||
@ -174,7 +174,7 @@ if ($_GET["id"] > 0) {
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
|
|
||||||
// Conversion du PDF en image png si fichier png non existant
|
// Conversion du PDF en image png si fichier png non existant
|
||||||
if (! file_exists($fileimage) && ! file_exists($fileimagebis))
|
if (! file_exists($fileimage) && ! file_exists($fileimagebis))
|
||||||
{
|
{
|
||||||
@ -204,7 +204,7 @@ if ($_GET["id"] > 0) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
print "<tr><td>".$langs->trans("Customer")."</td>";
|
print "<tr><td>".$langs->trans("Customer")."</td>";
|
||||||
@ -258,7 +258,7 @@ elseif (file_exists($fileimagebis))
|
|||||||
for ($i = 0; $i < 20; $i++)
|
for ($i = 0; $i < 20; $i++)
|
||||||
{
|
{
|
||||||
$preview = $multiple.$i;
|
$preview = $multiple.$i;
|
||||||
|
|
||||||
if (file_exists($dir_output.$preview))
|
if (file_exists($dir_output.$preview))
|
||||||
{
|
{
|
||||||
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&file='.urlencode($preview).'"><p>';
|
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&file='.urlencode($preview).'"><p>';
|
||||||
@ -270,10 +270,6 @@ elseif (file_exists($fileimagebis))
|
|||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
@ -59,10 +59,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour eviter bug IE qui reorganise mal div precedents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
@ -63,9 +63,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
@ -40,7 +40,7 @@ $langs->load("bills");
|
|||||||
|
|
||||||
|
|
||||||
// S<>curit<69> acc<63>s client
|
// S<>curit<69> acc<63>s client
|
||||||
if ($user->societe_id > 0)
|
if ($user->societe_id > 0)
|
||||||
{
|
{
|
||||||
$action = '';
|
$action = '';
|
||||||
$socid = $user->societe_id;
|
$socid = $user->societe_id;
|
||||||
@ -77,7 +77,7 @@ if ($_GET["facid"] > 0)
|
|||||||
$author->id = $fac->user_author;
|
$author->id = $fac->user_author;
|
||||||
$author->fetch();
|
$author->fetch();
|
||||||
}
|
}
|
||||||
|
|
||||||
$head = facture_prepare_head($fac);
|
$head = facture_prepare_head($fac);
|
||||||
dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer"));
|
dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer"));
|
||||||
|
|
||||||
@ -87,7 +87,7 @@ if ($_GET["facid"] > 0)
|
|||||||
*/
|
*/
|
||||||
print '<table class="border" width="100%">';
|
print '<table class="border" width="100%">';
|
||||||
$rowspan=3;
|
$rowspan=3;
|
||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="5">'.$fac->ref.'</td></tr>';
|
print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="5">'.$fac->ref.'</td></tr>';
|
||||||
|
|
||||||
@ -254,11 +254,11 @@ if ($_GET["facid"] > 0)
|
|||||||
// Facture non trouv<75>e
|
// Facture non trouv<75>e
|
||||||
print $langs->trans("ErrorBillNotFound",$_GET["facid"]);
|
print $langs->trans("ErrorBillNotFound",$_GET["facid"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Si fichier png PDF d'1 page trouv<75>
|
// Si fichier png PDF d'1 page trouv<75>
|
||||||
if (file_exists($fileimage))
|
if (file_exists($fileimage))
|
||||||
{
|
{
|
||||||
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($relativepathimage).'">';
|
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($relativepathimage).'">';
|
||||||
}
|
}
|
||||||
// Si fichier png PDF de plus d'1 page trouv<75>
|
// Si fichier png PDF de plus d'1 page trouv<75>
|
||||||
@ -269,7 +269,7 @@ elseif (file_exists($fileimagebis))
|
|||||||
for ($i = 0; $i < 20; $i++)
|
for ($i = 0; $i < 20; $i++)
|
||||||
{
|
{
|
||||||
$preview = $multiple.$i;
|
$preview = $multiple.$i;
|
||||||
|
|
||||||
if (file_exists($dir_output.$preview))
|
if (file_exists($dir_output.$preview))
|
||||||
{
|
{
|
||||||
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($preview).'"><p>';
|
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($preview).'"><p>';
|
||||||
@ -281,11 +281,6 @@ elseif (file_exists($fileimagebis))
|
|||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -55,10 +55,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -72,10 +72,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -57,10 +57,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -38,7 +38,7 @@ $langs->load('interventions');
|
|||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php');
|
||||||
|
|
||||||
if ($conf->projet->enabled)
|
if ($conf->projet->enabled)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/project.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/project.class.php");
|
||||||
}
|
}
|
||||||
@ -148,7 +148,7 @@ if ($_GET["id"] > 0) {
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
|
|
||||||
// Conversion du PDF en image png si fichier png non existant
|
// Conversion du PDF en image png si fichier png non existant
|
||||||
if (! file_exists($fileimage) && ! file_exists($fileimagebis))
|
if (! file_exists($fileimage) && ! file_exists($fileimagebis))
|
||||||
{
|
{
|
||||||
@ -178,7 +178,7 @@ if ($_GET["id"] > 0) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
print "<tr><td>".$langs->trans("Customer")."</td>";
|
print "<tr><td>".$langs->trans("Customer")."</td>";
|
||||||
@ -221,7 +221,7 @@ elseif (file_exists($fileimagebis))
|
|||||||
for ($i = 0; $i < 20; $i++)
|
for ($i = 0; $i < 20; $i++)
|
||||||
{
|
{
|
||||||
$preview = $multiple.$i;
|
$preview = $multiple.$i;
|
||||||
|
|
||||||
if (file_exists($dir_output.$preview))
|
if (file_exists($dir_output.$preview))
|
||||||
{
|
{
|
||||||
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($preview).'"><p>';
|
print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($preview).'"><p>';
|
||||||
@ -233,11 +233,6 @@ elseif (file_exists($fileimagebis))
|
|||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -61,10 +61,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -54,10 +54,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -62,10 +62,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -701,10 +701,10 @@ if (sizeof($boxarray))
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
|
// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
|
||||||
if (empty($conf->browser->firefox))
|
/*if (empty($conf->browser->firefox))
|
||||||
{
|
{
|
||||||
print '<div class="tabsAction"> </div>';
|
print '<div class="tabsAction"> </div>';
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|||||||
@ -1022,9 +1022,8 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$
|
|||||||
* \brief Show HTML footer DIV + BODY + HTML
|
* \brief Show HTML footer DIV + BODY + HTML
|
||||||
* \remarks Close 2 div
|
* \remarks Close 2 div
|
||||||
* \param foot A text to add in HTML generated page
|
* \param foot A text to add in HTML generated page
|
||||||
* \param limitIEbug Not used
|
|
||||||
*/
|
*/
|
||||||
function llxFooter($foot='',$limitIEbug=1)
|
function llxFooter($foot='')
|
||||||
{
|
{
|
||||||
global $conf, $dolibarr_auto_user, $micro_start_time;
|
global $conf, $dolibarr_auto_user, $micro_start_time;
|
||||||
|
|
||||||
@ -1062,9 +1061,6 @@ function llxFooter($foot='',$limitIEbug=1)
|
|||||||
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_foot.js"></script>'."\n";
|
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_foot.js"></script>'."\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Juste pour eviter bug IE qui reorganise mal div precedents si celui-ci absent
|
|
||||||
//if ($limitIEbug && empty($conf->browser->firefox)) print "\n".'<div class="tabsAction"> </div>'."\n";
|
|
||||||
|
|
||||||
// If there is some logs in buffer to show
|
// If there is some logs in buffer to show
|
||||||
if (sizeof($conf->logbuffer))
|
if (sizeof($conf->logbuffer))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -101,14 +101,14 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
print $product->getLibStatut(2);
|
print $product->getLibStatut(2);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
|
|
||||||
// Graphs additionels generes pas le script product-graph.php
|
// Graphs additionels generes pas le script product-graph.php
|
||||||
$year = strftime('%Y',time());
|
$year = strftime('%Y',time());
|
||||||
$file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png";
|
$file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png";
|
||||||
if (file_exists (DOL_DATA_ROOT.'/product/temp/'.$file) )
|
if (file_exists (DOL_DATA_ROOT.'/product/temp/'.$file) )
|
||||||
{
|
{
|
||||||
print '<tr><td>Ventes</td><td>';
|
print '<tr><td>Ventes</td><td>';
|
||||||
|
|
||||||
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_product&file='.$file;
|
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_product&file='.$file;
|
||||||
print '<img src="'.$url.'" alt="Ventes">';
|
print '<img src="'.$url.'" alt="Ventes">';
|
||||||
$file = get_exdir($product->id, 3) . "ventes-".$product->id.".png";
|
$file = get_exdir($product->id, 3) . "ventes-".$product->id.".png";
|
||||||
@ -117,11 +117,11 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Choice of stats
|
// Choice of stats
|
||||||
if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$product->id.'&mode=byunit">';
|
if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$product->id.'&mode=byunit">';
|
||||||
else print img_picto('','tick').' ';
|
else print img_picto('','tick').' ';
|
||||||
@ -132,9 +132,9 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
else print img_picto('','tick').' ';
|
else print img_picto('','tick').' ';
|
||||||
print $langs->trans("StatsByNumberOfEntities");
|
print $langs->trans("StatsByNumberOfEntities");
|
||||||
if ($mode == 'byunit') print '</a>';
|
if ($mode == 'byunit') print '</a>';
|
||||||
|
|
||||||
print '<br><br>';
|
print '<br><br>';
|
||||||
|
|
||||||
print '<table width="100%">';
|
print '<table width="100%">';
|
||||||
|
|
||||||
// Generation des graphs
|
// Generation des graphs
|
||||||
@ -148,26 +148,26 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
|
$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$graphfiles=array(
|
$graphfiles=array(
|
||||||
'propal' =>array('modulepart'=>'productstats_proposals',
|
'propal' =>array('modulepart'=>'productstats_proposals',
|
||||||
'file' => $product->id.'/propal12m.png',
|
'file' => $product->id.'/propal12m.png',
|
||||||
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsProposals"):$langs->trans("NumberOfProposals"))),
|
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsProposals"):$langs->trans("NumberOfProposals"))),
|
||||||
'orders' =>array('modulepart'=>'productstats_orders',
|
'orders' =>array('modulepart'=>'productstats_orders',
|
||||||
'file' => $product->id.'/orders12m.png',
|
'file' => $product->id.'/orders12m.png',
|
||||||
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerOrders"):$langs->trans("NumberOfCustomerOrders"))),
|
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerOrders"):$langs->trans("NumberOfCustomerOrders"))),
|
||||||
'invoices' =>array('modulepart'=>'productstats_invoices',
|
'invoices' =>array('modulepart'=>'productstats_invoices',
|
||||||
'file' => $product->id.'/invoices12m.png',
|
'file' => $product->id.'/invoices12m.png',
|
||||||
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerInvoices"):$langs->trans("NumberOfCustomerInvoices"))),
|
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerInvoices"):$langs->trans("NumberOfCustomerInvoices"))),
|
||||||
'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers',
|
'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers',
|
||||||
'file' => $product->id.'/invoicessuppliers12m.png',
|
'file' => $product->id.'/invoicessuppliers12m.png',
|
||||||
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsSupplierInvoices"):$langs->trans("NumberOfSupplierInvoices"))),
|
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsSupplierInvoices"):$langs->trans("NumberOfSupplierInvoices"))),
|
||||||
|
|
||||||
// 'orderssuppliers' =>array('modulepart'=>'productstats_orderssuppliers', 'file' => $product->id.'/orderssuppliers12m.png', 'label' => $langs->trans("Nombre commande fournisseurs sur les 12 derniers mois")),
|
// 'orderssuppliers' =>array('modulepart'=>'productstats_orderssuppliers', 'file' => $product->id.'/orderssuppliers12m.png', 'label' => $langs->trans("Nombre commande fournisseurs sur les 12 derniers mois")),
|
||||||
// 'contracts' =>array('modulepart'=>'productstats_contracts', 'file' => $product->id.'/contracts12m.png', 'label' => $langs->trans("Nombre contrats sur les 12 derniers mois")),
|
// 'contracts' =>array('modulepart'=>'productstats_contracts', 'file' => $product->id.'/contracts12m.png', 'label' => $langs->trans("Nombre contrats sur les 12 derniers mois")),
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$px = new DolGraph();
|
$px = new DolGraph();
|
||||||
$mesg = $px->isGraphKo();
|
$mesg = $px->isGraphKo();
|
||||||
if (! $mesg)
|
if (! $mesg)
|
||||||
@ -175,9 +175,9 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
foreach($graphfiles as $key => $val)
|
foreach($graphfiles as $key => $val)
|
||||||
{
|
{
|
||||||
if (! $graphfiles[$key]['file']) continue;
|
if (! $graphfiles[$key]['file']) continue;
|
||||||
|
|
||||||
$graph_data = array();
|
$graph_data = array();
|
||||||
|
|
||||||
// \todo Test si deja existant et recent, on ne genere pas
|
// \todo Test si deja existant et recent, on ne genere pas
|
||||||
if ($key == 'propal') $graph_data = $product->get_nb_propal($socid,$mode);
|
if ($key == 'propal') $graph_data = $product->get_nb_propal($socid,$mode);
|
||||||
if ($key == 'orders') $graph_data = $product->get_nb_order($socid,$mode);
|
if ($key == 'orders') $graph_data = $product->get_nb_order($socid,$mode);
|
||||||
@ -203,26 +203,26 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$mesg = $langs->trans("ChartGenerated");
|
$mesg = $langs->trans("ChartGenerated");
|
||||||
|
|
||||||
// Affichage graphs
|
// Affichage graphs
|
||||||
$i=0;
|
$i=0;
|
||||||
foreach($graphfiles as $key => $val)
|
foreach($graphfiles as $key => $val)
|
||||||
{
|
{
|
||||||
if (! $graphfiles[$key]['file']) continue;
|
if (! $graphfiles[$key]['file']) continue;
|
||||||
|
|
||||||
if ($graphfiles == 'propal' && ! $user->right->propale->lire) continue;
|
if ($graphfiles == 'propal' && ! $user->right->propale->lire) continue;
|
||||||
if ($graphfiles == 'order' && ! $user->right->commande->lire) continue;
|
if ($graphfiles == 'order' && ! $user->right->commande->lire) continue;
|
||||||
if ($graphfiles == 'invoices' && ! $user->right->facture->lire) continue;
|
if ($graphfiles == 'invoices' && ! $user->right->facture->lire) continue;
|
||||||
if ($graphfiles == 'invoices_suppliers' && ! $user->right->fournisseur->facture->lire) continue;
|
if ($graphfiles == 'invoices_suppliers' && ! $user->right->fournisseur->facture->lire) continue;
|
||||||
|
|
||||||
|
|
||||||
if ($i % 2 == 0) print '<tr>';
|
if ($i % 2 == 0) print '<tr>';
|
||||||
|
|
||||||
// Show graph
|
// Show graph
|
||||||
print '<td width="50%" align="center">';
|
print '<td width="50%" align="center">';
|
||||||
|
|
||||||
print '<table class="border" width="100%">';
|
print '<table class="border" width="100%">';
|
||||||
// Label
|
// Label
|
||||||
print '<tr class="liste_titre"><td colspan="2">';
|
print '<tr class="liste_titre"><td colspan="2">';
|
||||||
@ -248,23 +248,22 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
print '<td align="center"><a href="fiche.php?id='.$product->id.'&action=recalcul&mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>';
|
print '<td align="center"><a href="fiche.php?id='.$product->id.'&action=recalcul&mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
if ($i % 2 == 1) print '</tr>';
|
if ($i % 2 == 1) print '</tr>';
|
||||||
|
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($i % 2 == 1) print '<td> </td></tr>';
|
if ($i % 2 == 1) print '<td> </td></tr>';
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent en fin de page
|
|
||||||
print '<div class="tabsAction">';
|
print '<div class="tabsAction">';
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -276,5 +275,4 @@ else
|
|||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -219,10 +219,6 @@ foreach ($listofreferent as $key => $value)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Juste pour eviter bug IE qui reorganise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date$ - $Revision$');
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|||||||
@ -63,9 +63,6 @@ print '</td></tr></table>';
|
|||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
|
|
||||||
print '<div class="tabsAction">';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user