';
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 0c8f8717aea..462115f6cf7 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2016 Laurent Destailleur
+/* Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2016 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 41784fa57b5..bbb5ef58c36 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -160,7 +160,7 @@ if ($resql)
print '
';
// Nb of sending products for this line of order
$qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
print $qtyAlreadyShipped;
print '
';
if ($year) print ''.$year.'';
else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
print '
';
- print '
'.$val['nb'].'
';
- /*print '
'.price(price2num($val['total'],'MT'),1).'
';
- print '
'.price(price2num($val['avg'],'MT'),1).'
';*/
+ print '
'.$val['nb'].'
';
+ /*print '
'.price(price2num($val['total'],'MT'),1).'
';
+ print '
'.price(price2num($val['avg'],'MT'),1).'
';*/
print '
';
$oldyear=$year;
}
@@ -307,7 +307,7 @@ print '
';
// Show graphs
-print '
';
+print '
';
if ($mesg) { print $mesg; }
else {
print $px1->show();
@@ -329,8 +329,8 @@ dol_fiche_end();
// TODO USe code similar to commande/stats/index.php instead of this one.
/*
print '
';
-print '
'.$langs->trans("Year").'
';
-print '
'.$langs->trans("NbOfSendings").'
';
+print '
'.$langs->trans("Year").'
';
+print '
'.$langs->trans("NbOfSendings").'
';
$sql = "SELECT count(*) as nb, date_format(date_expedition,'%Y') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition";
@@ -349,7 +349,7 @@ if ($resql)
$nbproduct = $row[0];
$year = $row[1];
print "
';
$i++;
}
}
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 7f00effc574..5c448198980 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2009 Laurent Destailleur
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville
+ * Copyright (C) 2004-2009 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -53,22 +53,21 @@ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=expeditionstats&file=expediti
$px = new DolGraph();
$mesg = $px->isGraphKo();
-if (! $mesg)
-{
+if (! $mesg) {
$px->SetData($data);
$px->SetMaxValue($px->GetCeilMaxValue());
$px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT);
- $px->SetYLabel($langs->trans("NbOfOrders"));
+ $px->SetYLabel($langs->trans("NbOfSendings"));
$px->SetShading(3);
- $px->SetHorizTickIncrement(1);
- $px->SetPrecisionY(0);
+ $px->SetHorizTickIncrement(1);
+ $px->SetPrecisionY(0);
$px->draw($filename, $fileurl);
}
print '
';
-print '
Nombre d expedition par mois
';
-print '
';
+print '
'.$langs->trans("NbOfSendingsByMonth").'
';
+print '
';
print $px->show();
print '
';
print '
';
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index f1eb3289b99..5bfc81c642a 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2014 Marcos García
+/* Copyright (C) 2012 Regis Houssin
+ * Copyright (C) 2014 Marcos García
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -49,14 +49,14 @@ foreach($linkedObjectBlock as $key => $objectlink)