diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index cc5e770d02a..a8a19582b43 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -234,7 +234,8 @@ print '
'; // Show filter box print '
'; print ''; - print ''; + + print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -259,8 +260,8 @@ print '
'; print '

'; //} -print ''; -print ''; +print '
'; +print ''; print ''; print ''; /*print ''; @@ -268,13 +269,16 @@ print '';*/ print ''; $oldyear=0; +$var=true; foreach ($data as $val) { $year = $val['year']; while (! empty($year) && $oldyear > $year+1) { // If we have empty year $oldyear--; - print ''; + + $var=!$var; + print ''; print ''; print ''; @@ -283,7 +287,8 @@ foreach ($data as $val) print ''; } - print ''; + $var=!$var; + print ''; print ''; print ''; /*print ''; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index aa9c7c2f566..2e7c470639c 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -646,7 +646,7 @@ if ($resql) // Warehouse if (! $id > 0) { - print ''; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 8f1d77b7b6c..f4c5d871fc6 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -494,7 +494,7 @@ if ($action == 'create' && $user->rights->projet->creer) // Thirdparty if ($conf->societe->enabled) { - print ''; } - // Public - print ''; - print ''; // Opportunity probability print ''; - print ''; print '';
'.$langs->trans("Year").''.$langs->trans("NbOfSendings").''.$langs->trans("AmountTotal").''.$langs->trans("AmountAverage").'
'.$oldyear.'0
'.$year.''.$val['nb'].''.price(price2num($val['total'],'MT'),1).''; + print ''; //print ''; print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1); print '
'.$langs->trans("ThirdParty").''; + print '
'.$langs->trans("ThirdParty").''; $filteronlist=''; if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST; $text=$form->select_thirdparty_list(GETPOST('socid','int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), '', 0, 0, 'minwidth300'); @@ -517,8 +517,8 @@ if ($action == 'create' && $user->rights->projet->creer) print '
'.$langs->trans("Visibility").''; + // Visibility + print '
'.$langs->trans("Visibility").''; $array=array(); if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject"); if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject"); @@ -539,13 +539,13 @@ if ($action == 'create' && $user->rights->projet->creer) { // Opportunity status print '
'.$langs->trans("OpportunityStatus").''; + print ''; print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status')?GETPOST('opp_status'):$object->opp_status); print '
'.$langs->trans("OpportunityProbability").' %'; + print ' %'; print ''; print '