diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index a8a19582b43..3dfe5af6b48 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -263,7 +263,7 @@ print '
| '.$langs->trans("Year").' | '; -print ''.$langs->trans("NbOfSendings").' | '; +print ''.$langs->trans("NbOfSendings").' | '; /*print ''.$langs->trans("AmountTotal").' | '; print ''.$langs->trans("AmountAverage").' | ';*/ print '
| '.$year.' | '; + 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).' | ';*/ diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index 04eb75f8b51..da5eab83e9b 100755 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -263,6 +263,7 @@ delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or f delete from llx_menu where menu_handler = 'smartphone'; +update llx_expedition set date_valid = date_creation where fk_statut = 1 and date_valid IS NULL; -- Detect bad consistency between duraction_effective of a task and sum of time of tasks -- select pt.rowid, pt.duration_effective, SUM(ptt.task_duration) as y from llx_projet_task as pt, llx_projet_task_time as ptt where ptt.fk_task = pt.rowid group by pt.rowid, pt.duration_effective having pt.duration_effective <> y;