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

Look: affiche le numro de facture lors de la demande de validation

Browse Source
This commit is contained in:
marc_ocebo 2005-10-05 13:04:30 +00:00
parent ec4818c133
commit 90823bcab2
1 changed files with 100 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
htdocs/fourn/facture/fiche.php
View File

@ -231,36 +231,38 @@ if ($_GET['action'] == 'add_ligne')
* *
*/ */
if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') if ($_GET['action'] == 'create' or $_GET['action'] == 'copy')
{ {
llxHeader(); llxHeader();
print_titre($langs->trans("NewBill")); print_titre($langs->trans('NewBill'));
if ($mesg) { print "$mesg<br>"; } if ($mesg) { print $mesg.'<br>'; }
if ($_GET["action"] == 'copy') if ($_GET['action'] == 'copy')
{ {
$fac_ori = new FactureFournisseur($db); $fac_ori = new FactureFournisseur($db);
$fac_ori->fetch($_GET["facid"]); $fac_ori->fetch($_GET['facid']);
} }
print '<form action="fiche.php" method="post">'; print '<form action="fiche.php" method="post">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("Company").'</td>'; print '<tr><td>'.$langs->trans('Company').'</td>';
print '<td>';
$html->select_societes(empty($_GET['socid'])?'':$_GET['socid'],'socidp','s.fournisseur = 1');
/*
print '<td><select name="socidp">'; print '<td><select name="socidp">';
$sql = "SELECT s.nom, s.prefix_comm, s.idp"; $sql = 'SELECT s.nom, s.prefix_comm, s.idp';
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql .= " WHERE s.fournisseur = 1"; $sql .= ' WHERE s.fournisseur = 1';
if ($_GET["socid"] > 0 ) if ($_GET['socid'] > 0 )
{ {
$sql .= " AND s.idp =".$_GET["socid"]; $sql .= ' AND s.idp ='.$_GET['socid'];
} }
$sql .= " ORDER BY s.nom ASC"; $sql .= ' ORDER BY s.nom ASC';
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
@ -271,7 +273,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
$obj = $db->fetch_object(); $obj = $db->fetch_object();
print '<option value="'.$obj->idp; print '<option value="'.$obj->idp;
if ($_GET["socid"] == $obj->idp) if ($_GET['socid'] == $obj->idp)
{ {
print '" selected="true">'.$obj->nom.'</option>'; print '" selected="true">'.$obj->nom.'</option>';
} }
@ -283,41 +285,43 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
} }
} }
print '</select></td>'; print '</select></td>';
print '<td>'.$langs->trans("Comments").'</td></tr>'; */
print '</td>';
print '<td>'.$langs->trans('Comments').'</td></tr>';
print '<tr><td>'.$langs->trans("Ref").'</td><td><input name="facnumber" type="text"></td>'; print '<tr><td>'.$langs->trans('Ref').'</td><td><input name="facnumber" type="text"></td>';
print '<td rowspan="4" valign="top"><textarea name="note" wrap="soft" cols="30" rows="6"></textarea></td></tr>'; print '<td rowspan="4" valign="top"><textarea name="note" wrap="soft" cols="30" rows="6"></textarea></td></tr>';
if ($_GET["action"] == 'copy') if ($_GET['action'] == 'copy')
{ {
print '<tr><td>'.$langs->trans("Label").'</td><td><input size="30" name="libelle" value="'.$fac_ori->libelle.'" type="text"></td></tr>'; print '<tr><td>'.$langs->trans('Label').'</td><td><input size="30" name="libelle" value="'.$fac_ori->libelle.'" type="text"></td></tr>';
} }
else else
{ {
print '<tr><td>'.$langs->trans("Label").'</td><td><input size="30" name="libelle" type="text"></td></tr>'; print '<tr><td>'.$langs->trans('Label').'</td><td><input size="30" name="libelle" type="text"></td></tr>';
} }
print '<tr><td>'.$langs->trans("Date").'</td><td>'; print '<tr><td>'.$langs->trans('Date').'</td><td>';
$html->select_date(); $html->select_date();
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("DateEcheance").'</td><td>'; print '<tr><td>'.$langs->trans('DateEcheance').'</td><td>';
$html->select_date('','ech'); $html->select_date('','ech');
print '</td></tr>'; print '</td></tr>';
print "</table><br>"; print '</table><br>';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>&nbsp;</td><td>'.$langs->trans("Label").'</td>'; print '<td>&nbsp;</td><td>'.$langs->trans('Label').'</td>';
print '<td align="center">'.$langs->trans("PriceUHT").'</td>'; print '<td align="center">'.$langs->trans('PriceUHT').'</td>';
print '<td align="center">'.$langs->trans("Qty").'</td>'; print '<td align="center">'.$langs->trans('Qty').'</td>';
print '<td align="center">'.$langs->trans("VATRate").'</td>'; print '<td align="center">'.$langs->trans('VATRate').'</td>';
print '<td align="center">'.$langs->trans("PriceUTTC").'</td>'; print '<td align="center">'.$langs->trans('PriceUTTC').'</td>';
print '</tr>'; print '</tr>';
for ($i = 1 ; $i < 9 ; $i++) for ($i = 1 ; $i < 9 ; $i++)
{ {
if ($_GET["action"] == 'copy') if ($_GET['action'] == 'copy')
{ {
$value_label = $fac_ori->lignes[$i-1][0]; $value_label = $fac_ori->lignes[$i-1][0];
$value_pu = $fac_ori->lignes[$i-1][1]; $value_pu = $fac_ori->lignes[$i-1][1];
@ -325,22 +329,21 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
} }
else else
{ {
$value_qty = "1"; $value_qty = '1';
} }
print '<tr><td>'.$i.'</td>'; print '<tr><td>'.$i.'</td>';
print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>'; print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>';
print '<td align="center"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>'; print '<td align="center"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>';
print '<td align="center"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td>'; print '<td align="center"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td>';
print '<td align="center">'; print '<td align="center">';
$html->select_tva("tauxtva".$i); $html->select_tva('tauxtva'.$i);
print '</td>'; print '</td>';
print '<td align="center"><input type="text" size="8" name="amountttc'.$i.'" value=""></td></tr>'; print '<td align="center"><input type="text" size="8" name="amountttc'.$i.'" value=""></td></tr>';
} }
print "</table>"; print '</table>';
print '<p align="center"><input type="submit" value="'.$langs->trans("Save").'"></p>'; print '<p align="center"><input type="submit" value="'.$langs->trans('Save').'"></p>';
print "</form>"; print '</form>';
} }
else else
{ {
@ -487,13 +490,13 @@ else
* Confirmation de la validation * Confirmation de la validation
* *
*/ */
if ($_GET["action"] == 'valid') if ($_GET['action'] == 'valid')
{ {
$html->form_confirm("fiche.php?facid=$fac->id",$langs->trans("ValidateBill"),$langs->trans("ConfirmValidateBill"),"confirm_valid"); $html->form_confirm('fiche.php?facid='.$fac->id, $langs->trans('ValidateBill'), $langs->trans('ConfirmValidateBill', $fac->ref), 'confirm_valid');
print '<br />'; print '<br />';
} }
print "<table border=\"0\" width=\"100%\">"; print '<table border="0" width="100%">';
print '<tr><td width="50%" valign="top">'; print '<tr><td width="50%" valign="top">';
/* /*