diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 06df81646ae..3c1abb8e350 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -687,7 +687,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
$vat_rate=$_POST['tva_tx'];
$vat_rate=eregi_replace('\*','',$vat_rate);
- // On vérifie que le prix minimum est respecté
+ // On v�rifie que le prix minimum est respect�
$productid = $_POST['productid'] ;
if ($productid)
{
@@ -1093,55 +1093,43 @@ if ($_GET['propalid'] > 0)
}
print '';
- // Projet
+ // Project
if ($conf->projet->enabled)
{
$langs->load("projects");
print '
';
print '| ';
print $langs->trans('Project').' | ';
- $numprojet = $societe->has_projects();
- if (! $numprojet)
+ if ($propal->statut == 0 && $user->rights->propale->creer)
{
- print ' ';
- print ' | ';
- print $langs->trans("NoProject").' | ';
- print 'id.'&action=create>'.$langs->trans('AddProject').'';
- print ' | ';
- }
- else
- {
- if ($propal->statut == 0 && $user->rights->propale->creer)
+ if ($_GET['action'] != 'classer' && $propal->brouillon) print ''.img_edit($langs->trans('SetProject')).' | ';
+ print '
';
+ print '';
+ if ($_GET['action'] == 'classer')
{
- if ($_GET['action'] != 'classer' && $propal->brouillon) print ' | '.img_edit($langs->trans('SetProject')).' | ';
- print '';
- print '';
- if ($_GET['action'] == 'classer')
- {
- $html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->projetidp, 'projetidp');
- }
- else
- {
- $html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->projetidp, 'none');
- }
- print ' | ';
+ $html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->projetidp, 'projetidp');
}
else
{
- print '';
- if (!empty($propal->projetidp))
- {
- print '';
- $proj = new Project($db);
- $proj->fetch($propal->projetidp);
- print '';
- print $proj->title;
- print '';
- print ' | ';
- }
- else {
- print ' | ';
- }
+ $html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->projetidp, 'none');
+ }
+ print '';
+ }
+ else
+ {
+ print '';
+ if (!empty($propal->projetidp))
+ {
+ print '';
+ $proj = new Project($db);
+ $proj->fetch($propal->projetidp);
+ print '';
+ print $proj->title;
+ print '';
+ print ' | ';
+ }
+ else {
+ print ' | ';
}
}
print '';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 56053652d91..1f8118a03ca 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2458,7 +2458,7 @@ else
print '| '.$langs->trans('Status').' | ';
print ''.($fac->getLibStatut(4,$totalpaye)).' |
';
- // Projet
+ // Project
if ($conf->projet->enabled)
{
$langs->load('projects');
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index eeaf9c1a10b..62389850695 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -40,7 +40,7 @@ if ($conf->facture->enabled) $langs->load("bills");
if ($conf->commande->enabled) $langs->load("orders");
if ($conf->propal->enabled) $langs->load("propal");
-// Sécurité accés client
+// S�curit� acc�s client
$projetid='';
if ($_GET["id"]) { $projetid=$_GET["id"]; }
@@ -123,6 +123,7 @@ foreach ($listofreferent as $key => $value)
print ''.$langs->trans("Ref").' | ';
print ''.$langs->trans("Date").' | ';
print ''.$langs->trans("Amount").' | ';
+ print ''.$langs->trans("Status").' | ';
print '';
$elementarray = $projet->get_element_list($key);
if (sizeof($elementarray)>0 && is_array($elementarray))
@@ -143,13 +144,15 @@ foreach ($listofreferent as $key => $value)
if (empty($date)) $date=$element->datep;
print ''.dolibarr_print_date($date,'day').' | ';
print ''.price($element->total_ht).' | ';
- print '';
+ print ''.$element->getLibStatut(5).' | ';
+ print '';
$total = $total + $element->total_ht;
}
- print '| '.$i.' '.$langs->trans("Bills").' | ';
+ print '
| '.$langs->trans("Number").': '.$i.' | ';
print ''.$langs->trans("TotalHT").' : '.price($total).' | ';
+ print ' | ';
print '
';
}
print "";
@@ -189,7 +192,7 @@ foreach ($listofreferent as $key => $value)
}
}
-// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
+// Juste pour �viter bug IE qui r�organise mal div pr�c�dents si celui-ci absent
print '';
print '
';