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

Colonne supplmentaire pour saisir le prix unitaire TTC au lieu de HT sur facture fournisseur

Browse Source
This commit is contained in:
marc_ocebo 2005-05-01 01:06:35 +00:00
parent be97c53273
commit 346b3023c1
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,14 +134,21 @@ if ($_POST["action"] == 'add' && $user->rights->fournisseur->facture->creer)
{ {
$label = "label$i"; $label = "label$i";
$amount = "amount$i"; $amount = "amount$i";
$amountttc = "amountttc$i";
$tauxtva = "tauxtva$i"; $tauxtva = "tauxtva$i";
$qty = "qty$i"; $qty = "qty$i";
if (strlen($_POST["$label"]) > 0 && $_POST["$amount"] > 0) if (strlen($_POST[$label]) > 0 && !empty($_POST[$amount]))
{ {
$atleastoneline=1; $atleastoneline=1;
$facfou->addline($_POST["$label"], $_POST["$amount"], $_POST["$tauxtva"], $_POST["$qty"], 1); $facfou->addline($_POST["$label"], $_POST["$amount"], $_POST["$tauxtva"], $_POST["$qty"], 1);
} }
else if (strlen($_POST[$label]) > 0 && empty($_POST[$amount]))
{
$ht = $_POST[$amountttc] / (1 + ($_POST[$tauxtva] / 100));
$atleastoneline=1;
$facfou->addline($_POST[$label], $ht, $_POST[$tauxtva], $_POST[$qty], 1);
}
} }
$db->commit(); $db->commit();
@ -173,8 +180,13 @@ if ($_GET["action"] == 'add_ligne')
{ {
$facfou = new FactureFournisseur($db,"", $_GET["facid"]); $facfou = new FactureFournisseur($db,"", $_GET["facid"]);
$facfou->addline($_POST["label"], $_POST["amount"], $_POST["tauxtva"], $_POST["qty"]); if (strlen($_POST["label"]) > 0 && $_POST["amount"] > 0)
$facfou->addline($_POST["label"], $_POST["amount"], $_POST["tauxtva"], $_POST["qty"]);
else
{
$ht = $_POST['amountttc'] / (1 + ($_POST['tauxtva'] / 100));
$facfou->addline($_POST["label"], $ht, $_POST["tauxtva"], $_POST["qty"]);
}
$_GET["action"] = "edit"; $_GET["action"] = "edit";
} }
@ -264,7 +276,13 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
print "</table><br>"; print "</table><br>";
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr class="liste_titre"><td>&nbsp;</td><td>'.$langs->trans("Label").'</td><td align="center">'.$langs->trans("PriceUHT").'</td><td align="center">'.$langs->trans("Qty").'</td><td align="center">'.$langs->trans("VATRate").'</td></tr>'; print '<tr class="liste_titre">';
print '<td>&nbsp;</td><td>'.$langs->trans("Label").'</td>';
print '<td align="center">'.$langs->trans("PriceUHT").'</td>';
print '<td align="center">'.$langs->trans("Qty").'</td>';
print '<td align="center">'.$langs->trans("VATRate").'</td>';
print '<td align="center">'.$langs->trans("PriceUTTC").'</td>';
print '</tr>';
for ($i = 1 ; $i < 9 ; $i++) for ($i = 1 ; $i < 9 ; $i++)
{ {
@ -281,9 +299,11 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
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><td align="center">'; print '<td align="center"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td>';
print '<td align="center">';
$html->select_tva("tauxtva".$i); $html->select_tva("tauxtva".$i);
print '</td></tr>'; print '</td>';
print '<td align="center"><input type="text" size="8" name="amountttc'.$i.'" value=""></td></tr>';
} }
print "</table>"; print "</table>";
@ -372,6 +392,7 @@ else
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Label").'</td>'; print '<tr class="liste_titre"><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("PriceUTTC").'</td>';
print '<td align="center">'.$langs->trans("Qty").'</td>'; print '<td align="center">'.$langs->trans("Qty").'</td>';
print '<td align="center">'.$langs->trans("TotalHT").'</td>'; print '<td align="center">'.$langs->trans("TotalHT").'</td>';
print '<td align="center">'.$langs->trans("VATRate").'</td>'; print '<td align="center">'.$langs->trans("VATRate").'</td>';
@ -381,6 +402,7 @@ else
{ {
print "<tr $bc[1]>".'<td>'.$fac->lignes[$i][0]."</td>"; print "<tr $bc[1]>".'<td>'.$fac->lignes[$i][0]."</td>";
print '<td align="center">'.price($fac->lignes[$i][1])."</td>"; print '<td align="center">'.price($fac->lignes[$i][1])."</td>";
print '<td align="center">'.price($fac->lignes[$i][1] * (1+($fac->lignes[$i][2]/100)))."</td>";
print '<td align="center">'.$fac->lignes[$i][3]."</td>"; print '<td align="center">'.$fac->lignes[$i][3]."</td>";
print '<td align="center">'.price($fac->lignes[$i][4])."</td>"; print '<td align="center">'.price($fac->lignes[$i][4])."</td>";
print '<td align="center">'.$fac->lignes[$i][2]."</td>"; print '<td align="center">'.$fac->lignes[$i][2]."</td>";
@ -400,6 +422,9 @@ else
print '<input size="8" name="amount" type="text">'; print '<input size="8" name="amount" type="text">';
print '</td>'; print '</td>';
print '<td align="center">'; print '<td align="center">';
print '<input size="8" name="amountttc" type="text">';
print '</td>';
print '<td align="center">';
print '<input size="2" name="qty" type="text" value="1">'; print '<input size="2" name="qty" type="text" value="1">';
print '</td>'; print '</td>';
print '<td align="center">-</td>'; print '<td align="center">-</td>';

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

@ -129,6 +129,7 @@ Price=Price
UnitPrice=Unit price UnitPrice=Unit price
PriceU=U.P. PriceU=U.P.
PriceUHT=U.P. HT PriceUHT=U.P. HT
PriceUTTC=U.P. w/ tax
Amount=Amount Amount=Amount
AmountHT=Amount&nbsp;HT AmountHT=Amount&nbsp;HT
AmountTTC=Amount&nbsp;TTC AmountTTC=Amount&nbsp;TTC

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

@ -129,6 +129,7 @@ Price=Prix
UnitPrice=Prix unitaire UnitPrice=Prix unitaire
PriceU=P.U. PriceU=P.U.
PriceUHT=P.U. HT PriceUHT=P.U. HT
PriceUTTC=P.U. TTC
Amount=Montant Amount=Montant
AmountHT=Montant&nbsp;HT AmountHT=Montant&nbsp;HT
AmountTTC=Montant&nbsp;TTC AmountTTC=Montant&nbsp;TTC