Skip to content
Snippets Groups Projects
Commit fe3d987d authored by Rodolphe Quiedeville's avatar Rodolphe Quiedeville
Browse files

Correction URL

parent 50b81173
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/compta/commande/fiche.php
+ 33
− 39
View file @ fe3d987d
...@@ -100,17 +100,26 @@ if ($_GET["id"] > 0) ...@@ -100,17 +100,26 @@ if ($_GET["id"] > 0)
* Commande * Commande
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Order")."</td><td>".$commande->ref.'</td>';
print '<td align="center">'.$commande->statuts[$commande->statut].'</td><td>';
if ($conf->projet->enabled)
{
$langs->load("projects");
if ($commande->projet_id > 0)
{
print $langs->trans("Project").' : ';
$projet = New Project($db);
$projet->fetch($commande->projet_id);
print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$commande->projet_id.'">'.$projet->title.'</a>';
}
}
print '&nbsp;</td></tr>';
print "<tr><td>".$langs->trans("Customer")."</td>"; print "<tr><td>".$langs->trans("Customer")."</td>";
print '<td colspan="2">'; print '<td colspan="2">';
print '<b><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>'; print '<b><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '<td width="50%">';
print $commande->statuts[$commande->statut];
print "</td></tr>";
print '<tr><td>'.$langs->trans("Date").'</td>';
print "<td colspan=\"2\">".strftime("%A %d %B %Y",$commande->date)."</td>\n";
print '<td width="50%">'.$langs->trans("Source").' : ' . $commande->sources[$commande->source] ; print '<td width="50%">'.$langs->trans("Source").' : ' . $commande->sources[$commande->source] ;
if ($commande->source == 0) if ($commande->source == 0)
{ {
...@@ -121,23 +130,12 @@ if ($_GET["id"] > 0) ...@@ -121,23 +130,12 @@ if ($_GET["id"] > 0)
} }
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">'.$author->fullname.'</td>'; print '<tr><td>'.$langs->trans("Date").'</td>';
print "<td colspan=\"2\">".strftime("%A %d %B %Y",$commande->date)."</td>\n";
print '<td>'; print '<td width="50%">';
if ($conf->projet->enabled) {
print $langs->trans("Project").' : '; print $langs->trans("Author").' : '.$author->fullname.'</td></tr>';
if ($commande->projet_id > 0)
{
$projet = New Project($db);
$projet->fetch($commande->projet_id);
print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$commande->projet_id.'">'.$projet->title.'</a>';
}
else
{
print '<a href="fiche.php?id='.$commande->id.'&amp;action=classer">Classer la commande</a>';
}
}
print "&nbsp;</td></tr>";
// Ligne de 3 colonnes // Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<tr><td>'.$langs->trans("AmountHT").'</td>';
...@@ -153,8 +151,7 @@ if ($_GET["id"] > 0) ...@@ -153,8 +151,7 @@ if ($_GET["id"] > 0)
print '<td>'.$conf->monnaie.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$conf->monnaie.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
print "</table>\n";
print "</table>";
/* /*
* Lignes de commandes * Lignes de commandes
...@@ -207,12 +204,9 @@ if ($_GET["id"] > 0) ...@@ -207,12 +204,9 @@ if ($_GET["id"] > 0)
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
} }
print '<td align="right">'.price($objp->subprice)."</td>\n"; print '<td align="right">'.price($objp->subprice)."</td>\n";
print '<td>&nbsp;</td><td>&nbsp;</td>'; print '<td>&nbsp;</td><td>&nbsp;</td>';
print "</tr>"; print "</tr>";
$i++; $i++;
$var=!$var; $var=!$var;
} }
...@@ -287,7 +281,7 @@ if ($_GET["id"] > 0) ...@@ -287,7 +281,7 @@ if ($_GET["id"] > 0)
$objp = $db->fetch_object(); $objp = $db->fetch_object();
$var=!$var; $var=!$var;
print "<tr bgcolor=\"#E0E0E0\">"; print "<tr bgcolor=\"#E0E0E0\">";
print "<td><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a>"; print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>';
if ($objp->paye) if ($objp->paye)
{ {
print " (<b>pay&eacute;e</b>)"; print " (<b>pay&eacute;e</b>)";
...@@ -332,7 +326,7 @@ if ($_GET["id"] > 0) ...@@ -332,7 +326,7 @@ if ($_GET["id"] > 0)
{ {
print "<div class=\"tabsAction\">\n"; print "<div class=\"tabsAction\">\n";
if ($commande->statut <> 0 && $user->rights->facture->creer) if ($commande->statut > 0 && $user->rights->facture->creer)
{ {
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;commandeid='.$commande->id.'&amp;socidp='.$commande->soc_id.'">'.$langs->trans("GenerateBill").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;commandeid='.$commande->id.'&amp;socidp='.$commande->soc_id.'">'.$langs->trans("GenerateBill").'</a>';
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment