From 69fe2bfad6a3132454cd88f32fd671aa5bdc7ae1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 29 Oct 2016 17:16:14 +0200 Subject: [PATCH] Fix a case of corrupted data --- htdocs/expedition/stats/index.php | 7 +++++-- htdocs/install/mysql/migration/repair.sql | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) 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 '
'; print ''; print ''; print ''; -print ''; +print ''; /*print ''; print '';*/ print ''; @@ -289,7 +289,10 @@ foreach ($data as $val) $var=!$var; print ''; - print ''; + print ''; print ''; /*print ''; print '';*/ 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;
'.$langs->trans("Year").''.$langs->trans("NbOfSendings").''.$langs->trans("NbOfSendings").''.$langs->trans("AmountTotal").''.$langs->trans("AmountAverage").'
'.$year.''; + if ($year) print ''.$year.''; + else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated"); + print ''.$val['nb'].''.price(price2num($val['total'],'MT'),1).''.price(price2num($val['avg'],'MT'),1).'