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

Look: Modifs mineures + Mise au format onglet des produits et services

Browse Source
This commit is contained in:
Laurent Destailleur 2004-06-09 21:25:50 +00:00
parent d11207cbcb
commit 3f62b2561d
3 changed files with 127 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/compta/facture.php
View File

@ -766,7 +766,7 @@ else
print "<td colspan=\"3\">".strftime("%A %d %B %Y",$fac->date)."</td>\n";
print "<td>Date limite de réglement : " . strftime("%d %B %Y",$fac->date_lim_reglement) ."</td></tr>";
print '<tr><td>Projet</td><td colspan="3">';
print '<tr><td height=\"10\">Projet</td><td colspan="3">';
if ($fac->projetid > 0)
{
$projet = New Project($db);
@ -777,15 +777,14 @@ else
{
print '<a href="facture.php?facid='.$fac->id.'&amp;action=classer">Classer la facture</a>';
}
print "&nbsp;</td><td>Paiements</td></tr>";
print "&nbsp;</td>";
print "<tr><td>Auteur</td><td colspan=\"3\">$author->fullname</td>";
print '<td rowspan="6" valign="top">';
print '<td rowspan="8" valign="top">';
/*
* Paiements
*/
print 'Paiements :<br>';
$sql = "SELECT ".$db->pdate("datep")." as dp, pf.amount,";
$sql .= "c.libelle as paiement_type, p.num_paiement, p.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf";
@ -806,11 +805,11 @@ else
{
$objp = $db->fetch_object( $i);
$var=!$var;
print "<TR $bc[$var]><td>";
print "<tr $bc[$var]><td>";
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_file().'</a>';
print "&nbsp;".strftime("%d %B %Y",$objp->dp)."</TD>\n";
print "<TD>$objp->paiement_type $objp->num_paiement</TD>\n";
print '<td align="right">'.price($objp->amount)."</TD><td>$_MONNAIE</td>\n";
print "&nbsp;".strftime("%d %B %Y",$objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<td align="right">'.price($objp->amount)."</td><td>".MAIN_MONNAIE."</td>\n";
print "</tr>";
$totalpaye += $objp->amount;
$i++;
@ -818,13 +817,13 @@ else
if ($fac->paye == 0)
{
print "<tr><td colspan=\"2\" align=\"right\">Total payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>$_MONNAIE</td></tr>\n";
print "<tr><td colspan=\"2\" align=\"right\">Facturé :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($fac->total_ttc)."</td><td bgcolor=\"#d0d0d0\">$_MONNAIE</td></tr>\n";
print "<tr><td colspan=\"2\" align=\"right\">Total déjà payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".MAIN_MONNAIE."</td></tr>\n";
print "<tr><td colspan=\"2\" align=\"right\">Facturé :</td><td align=\"right\" style=\"border: 1px solid;\">".price($fac->total_ttc)."</td><td>".MAIN_MONNAIE."</td></tr>\n";
$resteapayer = $fac->total_ttc - $totalpaye;
print "<tr><td colspan=\"2\" align=\"right\">Reste à payer :</td>";
print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\">$_MONNAIE</td></tr>\n";
print "<td align=\"right\" style=\"border: 1px solid;\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td>".MAIN_MONNAIE."</td></tr>\n";
}
print "</table>";
$db->free();
@ -834,23 +833,28 @@ else
print "</td></tr>";
print '<tr><td>Remise globale</td>';
print "<tr><td height=\"10\">Auteur</td><td colspan=\"3\">$author->fullname</td>";
print '<tr><td height=\"10\">Remise globale</td>';
print '<td align="right" colspan="2">'.$fac->remise_percent.'</td>';
print '<td>%</td></tr>';
print '<tr><td>Montant HT</td>';
print '<tr><td height=\"10\">Montant HT</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>'.MAIN_MONNAIE.' HT</td></tr>';
print '<tr><td>TVA</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
print '<tr><td height=\"10\">TVA</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>';
print '<tr><td>Montant TTC</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
print '<tr><td height=\"10\">Montant TTC</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
print '<td>'.MAIN_MONNAIE.' TTC</td></tr>';
print '<tr><td>Statut</td><td align="left" colspan="3">'.($fac->get_libstatut()).'</td></tr>';
print '<tr><td height=\"10\">Statut</td><td align="left" colspan="3">'.($fac->get_libstatut()).'</td></tr>';
if ($fac->note)
{
print '<tr><td colspan="5">Note : '.nl2br($fac->note)."</td></tr>";
print '<tr><td colspan="4">Note : '.nl2br($fac->note)."</td></tr>";
}
else {
print '<tr><td colspan="4">&nbsp;</td></tr>';
}
print "</table><br>";

99
htdocs/product/fiche.php
View File

@ -40,16 +40,16 @@ if ($action == 'add')
{
$product = new Product($db);
$product->ref = $HTTP_POST_VARS["ref"];
$product->libelle = $HTTP_POST_VARS["libelle"];
$product->price = $HTTP_POST_VARS["price"];
$product->tva_tx = $HTTP_POST_VARS["tva_tx"];
$product->type = $HTTP_POST_VARS["type"];
$product->envente = $HTTP_POST_VARS["statut"];
$product->description = $HTTP_POST_VARS["desc"];
$product->duration_value = $HTTP_POST_VARS["duration_value"];
$product->duration_unit = $HTTP_POST_VARS["duration_unit"];
$product->seuil_stock_alerte = $HTTP_POST_VARS["seuil_stock_alerte"];
$product->ref = $_POST["ref"];
$product->libelle = $_POST["libelle"];
$product->price = $_POST["price"];
$product->tva_tx = $_POST["tva_tx"];
$product->type = $_POST["type"];
$product->envente = $_POST["statut"];
$product->description = $_POST["desc"];
$product->duration_value = $_POST["duration_value"];
$product->duration_unit = $_POST["duration_unit"];
$product->seuil_stock_alerte = $_POST["seuil_stock_alerte"];
$id = $product->create($user);
$action = '';
@ -59,8 +59,8 @@ if ($action == 'addinpropal')
{
$propal = New Propal($db);
$propal->fetch($HTTP_POST_VARS["propalid"]);
$result = $propal->insert_product($id, $HTTP_POST_VARS["qty"], $HTTP_POST_VARS["remise_percent"]);
$propal->fetch($_POST["propalid"]);
$result = $propal->insert_product($id, $_POST["qty"], $_POST["remise_percent"]);
if ( $result < 0)
{
$mesg = "erreur $result";
@ -73,7 +73,7 @@ if ($action == 'addinpropal')
$action = '';
}
if ($HTTP_POST_VARS["action"] == 'addinfacture' &&
if ($_POST["action"] == 'addinfacture' &&
( $user->rights->facture->modifier || $user->rights->facture->creer))
{
$product = new Product($db);
@ -81,11 +81,11 @@ if ($HTTP_POST_VARS["action"] == 'addinfacture' &&
$facture = New Facture($db);
$facture->fetch($HTTP_POST_VARS["factureid"]);
$facture->addline($HTTP_POST_VARS["factureid"],
$facture->fetch($_POST["factureid"]);
$facture->addline($_POST["factureid"],
addslashes($product->libelle),
$product->price,
$HTTP_POST_VARS["qty"],
$_POST["qty"],
$product->tva_tx, $id);
$action = '';
@ -93,12 +93,12 @@ if ($HTTP_POST_VARS["action"] == 'addinfacture' &&
$mesg .= '<a href="../compta/facture.php?facid='.$facture->id.'">'.$facture->ref.'</a>';
}
if ($HTTP_POST_VARS["action"] == 'add_fourn' && $cancel <> 'Annuler')
if ($_POST["action"] == 'add_fourn' && $cancel <> 'Annuler')
{
$product = new Product($db);
if( $product->fetch($id) )
{
if ($product->add_fournisseur($user, $HTTP_POST_VARS["id_fourn"], $HTTP_POST_VARS["ref_fourn"]) > 0)
if ($product->add_fournisseur($user, $_POST["id_fourn"], $_POST["ref_fourn"]) > 0)
{
$action = '';
$mesg = 'Founisseur ajouté';
@ -112,7 +112,7 @@ if ($HTTP_POST_VARS["action"] == 'add_fourn' && $cancel <> 'Annuler')
}
if ($HTTP_POST_VARS["action"] == 'update' &&
if ($_POST["action"] == 'update' &&
$cancel <> 'Annuler' &&
( $user->rights->produit->modifier || $user->rights->produit->creer))
{
@ -120,15 +120,15 @@ if ($HTTP_POST_VARS["action"] == 'update' &&
if ($product->fetch($id))
{
$product->ref = $HTTP_POST_VARS["ref"];
$product->libelle = $HTTP_POST_VARS["libelle"];
$product->price = $HTTP_POST_VARS["price"];
$product->tva_tx = $HTTP_POST_VARS["tva_tx"];
$product->description = $HTTP_POST_VARS["desc"];
$product->envente = $HTTP_POST_VARS["statut"];
$product->seuil_stock_alerte = $HTTP_POST_VARS["seuil_stock_alerte"];
$product->duration_value = $HTTP_POST_VARS["duration_value"];
$product->duration_unit = $HTTP_POST_VARS["duration_unit"];
$product->ref = $_POST["ref"];
$product->libelle = $_POST["libelle"];
$product->price = $_POST["price"];
$product->tva_tx = $_POST["tva_tx"];
$product->description = $_POST["desc"];
$product->envente = $_POST["statut"];
$product->seuil_stock_alerte = $_POST["seuil_stock_alerte"];
$product->duration_value = $_POST["duration_value"];
$product->duration_unit = $_POST["duration_unit"];
if ($product->check())
{
@ -151,13 +151,13 @@ if ($HTTP_POST_VARS["action"] == 'update' &&
}
}
if ($HTTP_POST_VARS["action"] == 'update_price' &&
if ($_POST["action"] == 'update_price' &&
$cancel <> 'Annuler' &&
( $user->rights->produit->modifier || $user->rights->produit->creer))
{
$product = new Product($db);
$result = $product->fetch($id);
$product->price = $HTTP_POST_VARS["price"];
$product->price = $_POST["price"];
if ( $product->update_price($id, $user) > 0 )
{
@ -219,7 +219,7 @@ if ($action == 'create')
print "</textarea></td></tr>";
if ($_GET["type"] == 1)
{
print "<tr>".'<td>Durée</td><TD><input name="duration_value" size="6" maxlength="5" value="'.$product->duree.'">';
print "<tr>".'<td>Durée</td><td><input name="duration_value" size="6" maxlength="5" value="'.$product->duree.'"> &nbsp;';
print '<input name="duration_unit" type="radio" value="d">jour&nbsp;';
print '<input name="duration_unit" type="radio" value="w">semaine&nbsp;';
print '<input name="duration_unit" type="radio" value="m">mois&nbsp;';
@ -245,17 +245,30 @@ else
{
if ($action <> 'edit' && $action <> 're-edit')
{
/*
* Fiche en visu
*/
// Zone recherche
print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">';
print '<td><form action="liste.php?type='.$product->type.'" method="post">';
print '<form action="liste.php?type='.$product->type.'" method="post"><td>';
print 'Réf : <input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="go">';
print '</form></td><td><form action="liste.php" method="post">';
print '</td></form><form action="liste.php" method="post"><td>';
print 'Libellé : <input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="go">';
print '</form></td><td>&nbsp;</td></tr></table>';
print '</td></form></tr></table>';
print '<br>';
print($mesg);
$head[0][0] = DOL_URL_ROOT."$PHP_SELF?id=".$id;
$head[0][1] = 'Fiche '.$types[$product->type].' : '.$product->ref;
$h = 1;
$a = 0;
dolibarr_fiche_head($head, $a);
print_fiche_titre('Fiche '.$types[$product->type].' : '.$product->ref, $mesg);
print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
print "<tr>";
print '<td width="20%">Référence</td><td width="40%">'.$product->ref.'</td>';
@ -355,9 +368,11 @@ else
print "</table>";
}
print "<br></div>\n";
if ($action == 'edit_price' && $user->rights->produit->creer)
{
print '<br><div class="titre">Nouveau prix</div>';
print '<div class="titre">Nouveau prix</div>';
print "<form action=\"$PHP_SELF?id=$id\" method=\"post\">\n";
print '<input type="hidden" name="action" value="update_price">';
print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
@ -367,13 +382,14 @@ else
print '</table>';
print '</form>';
}
/*
* Ajouter un fournisseur
*
*/
if ($action == 'ajout_fourn' && $user->rights->produit->creer)
{
print_titre ("Ajouter un founisseur");
print_titre ("Ajouter un fournisseur");
print "<form action=\"$PHP_SELF?id=$id\" method=\"post\">\n";
print '<input type="hidden" name="action" value="add_fourn">';
print '<table class="border" width="100%" cellspacing="0" cellpadding="4"><tr>';
@ -389,7 +405,7 @@ else
while ($i < $num)
{
$obj = $db->fetch_object( $i);
print '<option value="'.$obj->idp.'">'.$obj->nom . " (".$obj->ville.")";
print '<option value="'.$obj->idp.'">'.$obj->nom . ($obj->ville?" ($obj->ville)":"");
$i++;
}
}
@ -402,6 +418,9 @@ else
}
/*
* Fiche en mode edition
*/
if (($action == 'edit' || $action == 're-edit') && $user->rights->produit->creer)
{
@ -503,7 +522,7 @@ else
/* */
/* ************************************************************************** */
print "<br><div class=\"tabsAction\">\n";
print "<div class=\"tabsAction\">\n";
if ($action == '')
{

63
htdocs/theme/eldy/eldy.css
View File

@ -21,7 +21,7 @@
/***** Style du fond *****/
body {
background-color: #F0F0F0;
background-color: #F1F1F1;
font: 13px helvetica, verdana, arial, sans-serif;
margin-top: 0;
margin-bottom: 0;
@ -128,7 +128,7 @@ td.barre_select {
* Onglets
*/
div.tabBar {
color: #436976;
color: #234046;
background: #dee7ec;
padding: 0em 1em;
margin: 0em 0em 2em 0em;
@ -185,11 +185,11 @@ a.tabAction:hover { font: helvetica, verdana, arial, sans-serif; background: #
table.border {
font: helvetica, verdana, arial, sans-serif;
border-collapse: collapse;
border: 2px white ridge;
border: 1px white ridge;
}
table.border td {
border: 2px white ridge;
border: 1px solid #6C7C8B;
}
table.noborder {
@ -214,6 +214,7 @@ border: 1px ridge
tr.liste_titre {
background: #7699A9;
color: #334444;
font: helvetica, verdana, arial, sans-serif;
font-weight: bold;
border-left: 1px solid #FFFFFF;
@ -231,12 +232,12 @@ border-left: 1px solid #000000;
}
tr.pair {
background: #c0d5dd;
background: #e2ebed;
font: helvetica, verdana, arial, sans-serif;
}
tr.impair {
background: #dde9e9;
background: #c0d5dd;
font: helvetica, verdana, arial, sans-serif;
}
@ -253,19 +254,25 @@ font: helvetica, verdana, arial, sans-serif;
* Boxes
*/
tr.box_titre {
background: #7699A9;
color: #334444;
font: helvetica, verdana, arial, sans-serif;
background: #7699A9;
font-weight: bold;
}
tr.box_pair {
font: helvetica, verdana, arial, sans-serif;
background: #c0d5dd;
border-left: 1px solid #FFFFFF;
border-right: 1px solid #FFFFFF;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
}
tr.box_impair {
background: #e2ebed;
font: helvetica, verdana, arial, sans-serif;
}
tr.box_pair {
background: #c0d5dd;
font: helvetica, verdana, arial, sans-serif;
background: #dde9e9;
}
tr.fiche {
@ -338,13 +345,35 @@ div.message {
/*
*
* Widgets standard
*/
input.flat
{
border: 0
}
background: #FDFDFD;
padding: 0em 1em;
margin: 0em 0em 2em 0em;
border: 1px solid #8C9C9B;
margin: 0em;
padding: 0em 0em;
}
input
{
background: #FDFDFD;
padding: 0em 1em;
margin: 0em 0em 2em 0em;
border: 1px solid #8C9C9B;
margin: 0em;
padding: 0em 0em;
}
textarea
{
background: #FDFDFD;
padding: 0em 1em;
margin: 0em 0em 2em 0em;
border: 1px solid #8C9C9B;
margin: 0em;
padding: 0em 0em;
}
td.valeur
{