lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debut debuggage gestion des commandes fournisseurs

Browse Source
This commit is contained in:
Laurent Destailleur 2005-10-09 23:07:09 +00:00
parent 46fbace85d
commit c762c7cb27
6 changed files with 210 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

341
htdocs/fourn/commande/fiche.php
View File

@ -226,7 +226,7 @@ if ($_GET["id"] > 0)
$h = 0; $h = 0;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$commande->id;
$head[$h][1] = $langs->trans("Order").": $commande->ref"; $head[$h][1] = $langs->trans("OrderCard");
$a = $h; $a = $h;
$h++; $h++;
@ -235,10 +235,11 @@ if ($_GET["id"] > 0)
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/history.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/history.php?id='.$commande->id;
$head[$h][1] = $langs->trans("History"); $head[$h][1] = $langs->trans("OrderFollow");
$h++; $h++;
dolibarr_fiche_head($head, $a, $soc->nom); $title=$langs->trans("Order").": $commande->ref";
dolibarr_fiche_head($head, $a, $title);
/* /*
* Confirmation de la suppression de la commande * Confirmation de la suppression de la commande
@ -297,211 +298,187 @@ if ($_GET["id"] > 0)
"Envoi de la commande","Etes-vous sûr de vouloir confirmer cette commande en date du ".strftime("%d/%m/%Y",$date_com)." ?","confirm_commande"); "Envoi de la commande","Etes-vous sûr de vouloir confirmer cette commande en date du ".strftime("%d/%m/%Y",$date_com)." ?","confirm_commande");
print '<br />'; print '<br />';
} }
/*
* Commande
*/
print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Supplier")."</td>";
print '<td colspan="2">';
print '<b><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '<td width="50%" colspan="3">'; /*
print '<img src="statut'.$commande->statut.'.png">&nbsp;'; * Commande
print $commande->statuts[$commande->statut]; */
print "</td></tr>"; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Supplier")."</td>";
print '<td colspan="5">';
print '<b><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '</tr>';
if ($commande->methode_commande_id > 0) print '<tr>';
{ print '<td>'.$langs->trans("Status").'</td>';
print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">'; print '<td width="50%" colspan="5">';
print '<img src="statut'.$commande->statut.'.png">&nbsp;';
print $commande->statuts[$commande->statut];
print "</td></tr>";
if ($commande->date_commande) if ($commande->methode_commande_id > 0)
{ {
print dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n"; print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">';
}
print '</td><td width="50%" colspan="3">'; if ($commande->date_commande)
if ($commande->methode_commande) {
{ print dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n";
print "Méthode : " .$commande->methode_commande; }
}
print "</td></tr>";
}
print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">'.$author->fullname.'</td>'; print '</td><td width="50%" colspan="3">';
print '<td colspan="3">'; if ($commande->methode_commande)
print "&nbsp;</td></tr>"; {
print "Méthode : " .$commande->methode_commande;
}
print "</td></tr>";
}
// Ligne de 3 colonnes // Auteur
print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">'.$author->fullname.'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; print '<td colspan="3" width="50%">';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>'; print "&nbsp;</td></tr>";
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; // Ligne de 3 colonnes
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>'; print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
if ($commande->note) print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
{ print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("Note").'</td><td colspan="5">'.nl2br($commande->note)."</td></tr>";
}
print "</table>"; if ($commande->note)
{
print '<tr><td>'.$langs->trans("Note").'</td><td colspan="5">'.nl2br($commande->note)."</td></tr>";
}
/* print "</table>";
* Lignes de commandes
*
*/
print '<br><table class="noborder" width="100%">';
$sql = "SELECT l.ref, l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice"; /*
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l "; * Lignes de commandes
$sql .= " WHERE l.fk_commande = $commande->id ORDER BY l.rowid"; */
print '<br><table class="noborder" width="100%">';
$resql = $db->query($sql); $sql = "SELECT l.ref, l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice";
if ($resql) $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
{ $sql.= " WHERE l.fk_commande = $commande->id";
$num_lignes = $db->num_rows($resql); $sql.= " ORDER BY l.rowid";
$i = 0; $total = 0;
if ($num_lignes)
{
print '<tr class="liste_titre">';
print '<td width="8%" align="left">'.$langs->trans("Ref").'</td>';
print '<td width="46%">'.$langs->trans("Description").'</td>';
print '<td width="8%" align="center">'.$langs->trans("VAT").'</td>';
print '<td width="8%" align="center">'.$langs->trans("Qty").'</td>';
print '<td width="7%" align="right">'.$langs->trans("Discount").'</td>';
print '<td width="10%" align="right">'.$langs->trans("PriceU").'</td>';
print '<td width="5%">&nbsp;</td><td width="10%">&nbsp;</td>';
print "</tr>\n";
}
$var=True;
while ($i < $num_lignes)
{
$objp = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<td>".$objp->ref."</td>\n";
if ($objp->fk_product > 0)
{
print '<td>';
print '<a href="'.DOL_URL_ROOT.'/fourn/product/fiche.php?id='.$objp->fk_product.'">'.stripslashes(nl2br($objp->description)).'</a></td>';
}
else
{
print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
}
print '<td align="center">'.$objp->tva_tx.'%</td>';
print '<td align="center">'.$objp->qty.'</td>';
if ($objp->remise_percent > 0)
{
print '<td align="right">'.$objp->remise_percent." %</td>\n";
}
else
{
print '<td>&nbsp;</td>';
}
print '<td align="right">'.price($objp->subprice)."</td>\n";
if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer && $_GET["action"] <> 'valid')
{
print '<td>&nbsp;</td><td align="right"><a href="fiche.php?id='.$commande->id.'&amp;action=deleteline&amp;lineid='.$objp->rowid.'">';
print img_delete();
print '</a></td>';
}
else
{
print '<td>&nbsp;</td><td>&nbsp;</td>';
}
print "</tr>";
if ($_GET["action"] == 'editline' && $_GET["rowid"] == $objp->rowid)
{
print "<form action=\"fiche.php?id=$commande->id\" method=\"post\">";
print '<input type="hidden" name="action" value="updateligne">';
print '<input type="hidden" name="elrowid" value="'.$_GET["rowid"].'">';
print "<tr $bc[$var]>";
print '<td colspan="3"><textarea name="eldesc" cols="60" rows="2">'.stripslashes($objp->description).'</textarea></td>';
print '<td align="center"><input size="4" type="text" name="elqty" value="'.$objp->qty.'"></TD>';
print '<td align="right"><input size="3" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">&nbsp;%</td>';
print '<td align="right"><input size="8" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
print '<td align="right" colspan="2"><input type="submit" value="'.$langs->trans("Save").'"></td>';
print '</tr>' . "\n";
print "</form>\n";
}
$i++;
$var=!$var;
}
$db->free();
}
else
{
print $db->error();
}
/*
* Ajouter une ligne
*
*/
if ($_GET["action"] <> 'valid' && $commande->statut == 0 && $user->rights->fournisseur->commande->creer)
{
$sql = "SELECT p.rowid,p.label,p.ref ";
$sql .=" , (pf.price / pf.quantity) as priceunit";
$sql .= " FROM ".MAIN_DB_PREFIX."product as p ";
$sql .= " , ".MAIN_DB_PREFIX."product_fournisseur_price as pf ";
$sql .= " WHERE p.rowid = pf.fk_product AND pf.fk_soc = ".$commande->fourn_id;
$sql .= " ORDER BY p.ref ";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$opt = '<option value="0" selected="true"></option>'; $num_lignes = $db->num_rows($resql);
if ($resql) $i = 0; $total = 0;
if ($num_lignes)
{ {
$num = $db->num_rows($resql); print '<tr class="liste_titre">';
$i = 0; print '<td align="left">'.$langs->trans("Ref").'</td>';
while ($i < $num) print '<td>'.$langs->trans("Description").'</td>';
{ print '<td align="center">'.$langs->trans("VAT").'</td>';
$objp = $db->fetch_object($resql); print '<td align="center">'.$langs->trans("Qty").'</td>';
$opt .= "<option value=\"$objp->rowid\">[$objp->ref] $objp->label : $objp->priceunit</option>\n"; print '<td align="right">'.$langs->trans("Discount").'</td>';
$i++; print '<td align="right">'.$langs->trans("PriceU").'</td>';
} print '<td>&nbsp;</td><td width="10%">&nbsp;</td>';
print "</tr>\n";
} }
$db->free($resql); $var=false;
while ($i < $num_lignes)
{
$objp = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<td>".$objp->ref."</td>\n";
if ($objp->fk_product > 0)
{
print '<td>';
print '<a href="'.DOL_URL_ROOT.'/fourn/product/fiche.php?id='.$objp->fk_product.'">'.stripslashes(nl2br($objp->description)).'</a></td>';
}
else
{
print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
}
print '<td align="center">'.$objp->tva_tx.'%</td>';
print '<td align="center">'.$objp->qty.'</td>';
if ($objp->remise_percent > 0)
{
print '<td align="right">'.$objp->remise_percent."%</td>\n";
}
else
{
print '<td>&nbsp;</td>';
}
print '<td align="right">'.price($objp->subprice)."</td>\n";
if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer && $_GET["action"] <> 'valid')
{
print '<td>&nbsp;</td><td align="right"><a href="fiche.php?id='.$commande->id.'&amp;action=deleteline&amp;lineid='.$objp->rowid.'">';
print img_delete();
print '</a></td>';
}
else
{
print '<td>&nbsp;</td><td>&nbsp;</td>';
}
print "</tr>";
if ($_GET["action"] == 'editline' && $_GET["rowid"] == $objp->rowid)
{
print "<form action=\"fiche.php?id=$commande->id\" method=\"post\">";
print '<input type="hidden" name="action" value="updateligne">';
print '<input type="hidden" name="elrowid" value="'.$_GET["rowid"].'">';
print "<tr $bc[$var]>";
print '<td colspan="3"><textarea name="eldesc" cols="60" rows="2">'.stripslashes($objp->description).'</textarea></td>';
print '<td align="center"><input size="4" type="text" name="elqty" value="'.$objp->qty.'"></td>';
print '<td align="right"><input size="3" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">&nbsp;%</td>';
print '<td align="right"><input size="8" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
print '<td align="right" colspan="2"><input type="submit" value="'.$langs->trans("Save").'"></td>';
print '</tr>' . "\n";
print "</form>\n";
}
$i++;
$var=!$var;
}
$db->free();
} }
else else
{ {
dolibarr_print_error($db); print $db->error();
} }
print '<form action="fiche.php?id='.$commande->id.'" method="post">'; /*
print '<input type="hidden" name="action" value="addligne">'; * Ajouter une ligne
*/
if ($_GET["action"] <> 'valid' && $commande->statut == 0 && $user->rights->fournisseur->commande->creer)
{
print '<form action="fiche.php?id='.$commande->id.'" method="post">';
print '<input type="hidden" name="action" value="addligne">';
print "<tr class=\"liste_titre\">"; print '<tr class="liste_titre">';
print '<td colspan="2" width="54%">'.$langs->trans("Description").'</td>'; print '<td colspan="2">'.$langs->trans("Description").'</td>';
print '<td width="8%" align="center">'.$langs->trans("VAT").'</td>'; print '<td align="center">'.$langs->trans("VAT").'</td>';
print '<td width="8%" align="center">'.$langs->trans("Qty").'</td>'; print '<td align="center">'.$langs->trans("Qty").'</td>';
print '<td width="8%" align="right">'.$langs->trans("Discount").'</td>'; print '<td align="right">'.$langs->trans("Discount").'</td>';
print '<td width="12%" align="right">'.$langs->trans("PriceU").'</td>'; print '<td align="right">'.$langs->trans("PriceU").'</td>';
print '<td>&nbsp;</td><td>&nbsp;</td>'."</tr>\n"; print '<td>&nbsp;</td><td>&nbsp;</td>'."</tr>\n";
$var=!$var; $var=false;
print "<tr $bc[$var]>".'<td colspan="3"><select name="p_idprod">'.$opt.'</select></td>'; print "<tr $bc[$var]>".'<td colspan="3">';
print '<td align="center"><input type="text" size="2" name="pqty" value="1"></td>'; $html->select_produits_fournisseurs($commande->fourn_id,'','p_idprod',$filtre);
print '<td align="right"><input type="text" size="4" name="premise" value="0"> %</td>'; print '</td>';
print '<td>&nbsp;</td>'; print '<td align="center"><input type="text" size="2" name="pqty" value="1"></td>';
print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>'; print '<td align="right"><input type="text" size="4" name="premise" value="0"> %</td>';
print "</tr>\n"; print '<td>&nbsp;</td>';
print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
print "</tr>\n";
print "</form>"; print "</form>";
} }
print "</table><br>"; print "</table>";
/* print '</div>';
* Fin Ajout ligne
*
*/
print '</div>';
/*
* Boutons actions
*/
if ($user->societe_id == 0 && $commande->statut < 3 && $_GET["action"] <> 'valid') if ($user->societe_id == 0 && $commande->statut < 3 && $_GET["action"] <> 'valid')
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
@ -525,7 +502,7 @@ if ($_GET["id"] > 0)
{ {
print '<a class="butAction" href="fiche.php?id='.$commande->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>'; print '<a class="butAction" href="fiche.php?id='.$commande->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
print '<a class="butActionRefuse" href="fiche.php?id='.$commande->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>'; print '<a class="butActionDelete" href="fiche.php?id='.$commande->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
} }
} }
@ -533,7 +510,7 @@ if ($_GET["id"] > 0)
{ {
if ($user->rights->fournisseur->commande->approuver) if ($user->rights->fournisseur->commande->approuver)
{ {
print '<a class="butActionRefuse" href="fiche.php?id='.$commande->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>'; print '<a class="butActionDelete" href="fiche.php?id='.$commande->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
} }
} }

20
htdocs/fourn/commande/history.php
View File

@ -64,7 +64,7 @@ if ($_GET["id"] > 0)
$h = 0; $h = 0;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$commande->id;
$head[$h][1] = $langs->trans("Order").": $commande->ref"; $head[$h][1] = $langs->trans("OrderCard");
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$commande->id;
@ -72,12 +72,13 @@ if ($_GET["id"] > 0)
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/history.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/history.php?id='.$commande->id;
$head[$h][1] = $langs->trans("History"); $head[$h][1] = $langs->trans("OrderFollow");
$a = $h; $a = $h;
$h++; $h++;
dolibarr_fiche_head($head, $a, $soc->nom); $title=$langs->trans("Order").": $commande->ref";
dolibarr_fiche_head($head, $a, $title);
/* /*
@ -85,11 +86,12 @@ if ($_GET["id"] > 0)
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Supplier")."</td>"; print '<tr><td width="20%">'.$langs->trans("Supplier")."</td>";
print '<td colspan="2">'; print '<td colspan="3">';
print '<b><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>'; print '<b><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '</tr>';
print '<td width="50%">'; print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
print '<img src="statut'.$commande->statut.'.png">&nbsp;'; print '<img src="statut'.$commande->statut.'.png">&nbsp;';
print $commande->statuts[$commande->statut]; print $commande->statuts[$commande->statut];
print "</td></tr>"; print "</td></tr>";
@ -102,9 +104,9 @@ if ($_GET["id"] > 0)
print "</td></tr>"; print "</td></tr>";
} }
// Auteur
print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">'.$author->fullname.'</td>'; print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">'.$author->fullname.'</td>';
print '<td width="50%">&nbsp;</td></tr>';
print '<td>&nbsp;</td></tr>';
print "</table>\n"; print "</table>\n";
@ -133,7 +135,7 @@ if ($_GET["id"] > 0)
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td width="20%">'.strftime("%a %d %B %Y %H:%M:%S",$obj->dl)."</td>\n"; print '<td width="20%">'.dolibarr_print_date($obj->dl,"%a %d %b %Y %H:%M:%S")."</td>\n";
print '<td width="10%"><img src="statut'.$obj->fk_statut.'.png">&nbsp;'; print '<td width="10%"><img src="statut'.$obj->fk_statut.'.png">&nbsp;';

26
htdocs/fourn/commande/note.php
View File

@ -76,7 +76,7 @@ if ($_GET["id"] > 0)
$h = 0; $h = 0;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$commande->id;
$head[$h][1] = $langs->trans("Order").": $commande->ref"; $head[$h][1] = $langs->trans("OrderCard");
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$commande->id;
@ -85,10 +85,11 @@ if ($_GET["id"] > 0)
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/history.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/history.php?id='.$commande->id;
$head[$h][1] = $langs->trans("History"); $head[$h][1] = $langs->trans("OrderFollow");
$h++; $h++;
dolibarr_fiche_head($head, $a, $soc->nom); $title=$langs->trans("Order").": $commande->ref";
dolibarr_fiche_head($head, $a, $title);
/* /*
@ -98,11 +99,14 @@ if ($_GET["id"] > 0)
print '<input type="hidden" name="action" value="updatenote">'; print '<input type="hidden" name="action" value="updatenote">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Supplier")."</td>"; print '<tr><td width="20%">'.$langs->trans("Supplier").'</td>';
print '<td colspan="2">'; print '<td colspan="3">';
print '<b><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>'; print '<b><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '</tr>';
print '<td width="50%">'; print '<tr>';
print '<td>'.$langs->trans("Status").'</td>';
print '<td colspan="3">';
print '<img src="statut'.$commande->statut.'.png">&nbsp;'; print '<img src="statut'.$commande->statut.'.png">&nbsp;';
print $commande->statuts[$commande->statut]; print $commande->statuts[$commande->statut];
print "</td></tr>"; print "</td></tr>";
@ -124,8 +128,10 @@ if ($_GET["id"] > 0)
} }
print "</td></tr>"; print "</td></tr>";
} }
// Auteur
print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">'.$author->fullname.'</td>'; print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">'.$author->fullname.'</td>';
print '<td>'; print '<td width="50%">';
print "&nbsp;</td></tr>"; print "&nbsp;</td></tr>";
// Ligne de 3 colonnes // Ligne de 3 colonnes
@ -134,15 +140,15 @@ if ($_GET["id"] > 0)
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<td valign="top">&nbsp;</td></tr>'; print '<td valign="top">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>'; print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>';
if ($user->rights->fournisseur->commande->creer) if ($user->rights->fournisseur->commande->creer)
{ {
print '<tr><td>'.$langs->trans("Note").'</td><td colspan="3"><textarea cols="60" rows="10" name="note">'.nl2br($commande->note)."</textarea></td></tr>"; print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="3"><textarea cols="60" rows="10" name="note">'.nl2br($commande->note)."</textarea></td></tr>";
print '<tr><td colspan="4" align="center"><input type="submit" class="button"></td></tr>'; print '<tr><td colspan="4" align="center"><input type="submit" class="button"></td></tr>';
} }
else else

18
htdocs/fourn/product/fiche.php
View File

@ -143,7 +143,6 @@ if ($_POST["action"] == 'add_fourn' && $_POST["cancel"] <> $langs->trans("Cancel
if ($product->add_fournisseur($user, $_POST["id_fourn"], $_POST["ref_fourn"]) > 0) if ($product->add_fournisseur($user, $_POST["id_fourn"], $_POST["ref_fourn"]) > 0)
{ {
$action = ''; $action = '';
$mesg = $langs->trans("SupplierAdded");
} }
else else
{ {
@ -426,7 +425,6 @@ else
} }
print "</table><br>\n"; print "</table><br>\n";
// Liste des fournisseurs // Liste des fournisseurs
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'; print '<tr class="liste_titre"><td>';
@ -466,10 +464,10 @@ else
print '<td align="center">'.$objp->quantity.'</td></tr>'; print '<td align="center">'.$objp->quantity.'</td></tr>';
$i++; $i++;
} }
$db->free(); $db->free();
} }
print '</table>'; print '</table>';
print "<br></div>\n"; print "</div>\n";
/* /*
@ -515,9 +513,7 @@ else
} }
/* /*
*
* Fiche en mode edition * Fiche en mode edition
*
*/ */
if (($_GET["action"] == 'edit' || $_GET["action"] == 're-edit') && $user->rights->produit->creer) if (($_GET["action"] == 'edit' || $_GET["action"] == 're-edit') && $user->rights->produit->creer)
{ {
@ -525,7 +521,7 @@ else
print_fiche_titre('Edition de la fiche '.$types[$product->type].' : '.$product->ref, ""); print_fiche_titre('Edition de la fiche '.$types[$product->type].' : '.$product->ref, "");
if ($mesg) { if ($mesg) {
print '<br><div class="error">'.$mesg.'</div><br>'; print '<br><div class="error">'.$mesg.'</div><br>';
} }
print "<form action=\"fiche.php\" method=\"post\">\n"; print "<form action=\"fiche.php\" method=\"post\">\n";
@ -536,7 +532,7 @@ else
print '<td>'.$langs->trans("Label").'</td><td colspan="2"><input name="libelle" size="40" value="'.$product->libelle.'"></td></tr>'; print '<td>'.$langs->trans("Label").'</td><td colspan="2"><input name="libelle" size="40" value="'.$product->libelle.'"></td></tr>';
if ($product->type == 0 && defined("MAIN_MODULE_STOCK")) if ($product->type == 0 && $conf->stock->enabled)
{ {
print "<tr>".'<td>Seuil stock</td><td colspan="2">'; print "<tr>".'<td>Seuil stock</td><td colspan="2">';
print '<input name="seuil_stock_alerte" size="4" value="'.$product->seuil_stock_alerte.'">'; print '<input name="seuil_stock_alerte" size="4" value="'.$product->seuil_stock_alerte.'">';
@ -573,6 +569,8 @@ else
} }
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* Barre d'action */ /* Barre d'action */
@ -619,5 +617,5 @@ else
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

1
htdocs/langs/en_US/orders.lang
View File

@ -2,6 +2,7 @@
OrdersArea=Orders area OrdersArea=Orders area
Order=Order Order=Order
Orders=Orders Orders=Orders
OrderFollow=Follow up
OrderDate=Date commande OrderDate=Date commande
NewOrder=New order NewOrder=New order
SupplierOrder=Supplier order SupplierOrder=Supplier order

1
htdocs/langs/fr_FR/orders.lang
View File

@ -2,6 +2,7 @@
OrdersArea=Espace commandes OrdersArea=Espace commandes
Order=Commande Order=Commande
Orders=Commandes Orders=Commandes
OrderFollow=Suivi
OrderDate=Date commande OrderDate=Date commande
NewOrder=Nouvelle commande NewOrder=Nouvelle commande
SupplierOrder=Commande fournisseur SupplierOrder=Commande fournisseur