diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 1f0f9d1c948..f85f21503d3 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -856,11 +856,12 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) // Projet if ($conf->projet->enabled) { + $projetid=$_POST["projetid"]?$_POST["projetid"]:$commande->projetid; print ''.$langs->trans('Project').''; $numprojet=select_projects($soc->id,$projetid,'projetid'); if ($numprojet==0) { - print '   id.'&action=create>'.$langs->trans("AddProject").''; + print '   '.$langs->trans("AddProject").''; } print ''; } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 3289b88eb68..cc3d8917f0d 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -116,7 +116,10 @@ foreach ($listofreferent as $key => $value) print ''; print ''; - print ''; + print ''; + print ''; + print ''; + print ''; $elementarray = $projet->get_element_list($key); if (sizeof($elementarray)>0 && is_array($elementarray)) { @@ -135,14 +138,15 @@ foreach ($listofreferent as $key => $value) $date=$element->date; if (empty($date)) $date=$element->datep; print ''; - print ''; + print ''; + print ''; $total = $total + $element->total_ht; } print ''; - print ''; - print ''; + print ''; + print ''; } print "
'.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("Amount").' 
'.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("Amount").'
'.dolibarr_print_date($date,'day').''.price($element->total_ht).' 
'.price($element->total_ht).'
'.$i.' '.$langs->trans("Bills").''.$langs->trans("TotalHT").' : '.price($total).''.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans("TotalHT").' : '.price($total).'
";