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

Look: Modif esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-31 22:14:12 +00:00
parent feebc9f134
commit 45dc0c2c62
6 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/index.php
View File

@ -21,10 +21,10 @@
*/
/**
\file htdocs/comm/index.php
\ingroup commercial
\brief Page acceuil de la zone commercial
\version $Revision$
\file htdocs/comm/index.php
\ingroup commercial
\brief Page acceuil de la zone commercial
\version $Revision$
*/
require("./pre.inc.php");

7
htdocs/comm/prospect/index.php
View File

@ -18,13 +18,12 @@
*
* $Id$
* $Source$
*
*/
/**
\file htdocs/comm/prospect/index.php
\ingroup commercial
\brief Page acceuil de la zone prospection
\brief Page accueil de la zone prospection
\version $Revision$
*/
@ -239,10 +238,10 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
{
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]><td width=\"20%\"><a href=\"../propal.php?propalid=".$obj->rowid."\">";
print "<tr $bc[$var]><td><a href=\"../propal.php?propalid=".$obj->rowid."\">";
print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a></td>';
print "<td width=\"30%\"><a href=\"fiche.php?id=$obj->idp\">".img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom."</a></td>\n";
print "<td><a href=\"fiche.php?id=$obj->idp\">".img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom."</a></td>\n";
print "<td align=\"right\">";
print dolibarr_print_date($obj->dp)."</td>\n";
print "<td align=\"right\">".price($obj->price)."</td></tr>\n";

13
htdocs/commande/fiche.php
View File

@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -607,12 +606,12 @@ else
if ($num)
{
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Description').'</td>';
print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
print '<td align="right" width="50">'.$langs->trans('Discount').'</td>';
print '<td align="right" width="50">'.$langs->trans('AmountHT').'</td>';
print '<td>'.$langs->trans('Description').'</td>';
print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
print '<td align="right">'.$langs->trans('Discount').'</td>';
print '<td align="right">'.$langs->trans('AmountHT').'</td>';
print '<td>&nbsp;</td><td>&nbsp;</td>';
print "</tr>\n";
}

5
htdocs/commande/index.php
View File

@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -50,7 +49,9 @@ print '<table class="noborder" width="100%">';
print '<form method="post" action="liste.php">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchOrder").'</td></tr>';
print '<tr '.$bc[$var].'><td>';
print $langs->trans("Ref").'</td><td><input type="text" class="flat" name="sf_ref" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print '<tr '.$bc[$var].'><td nowrap>'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
print '</tr>';
print "</form></table><br>\n";

34
htdocs/commande/liste.php
View File

@ -18,14 +18,13 @@
*
* $Id$
* $Source$
*
*/
/**
\file htdocs/commande/liste.php
\ingroup commande
\brief Page liste des commandes
\version $Revision$
\file htdocs/commande/liste.php
\ingroup commande
\brief Page liste des commandes
\version $Revision$
*/
@ -35,17 +34,19 @@ $langs->load("orders");
if (!$user->rights->commande->lire) accessforbidden();
/*
* Sécurité accés client
*/
$socidp = $_GET["socidp"];
$sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"];
$snom=isset($_GET["snom"])?$_GET["snom"]:$_POST["snom"];
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
// Sécurité accés client
$socidp = $_GET["socidp"];
if ($user->societe_id > 0)
{
$action = '';
$socidp = $user->societe_id;
}
llxHeader();
$begin=$_GET["begin"];
@ -59,13 +60,20 @@ $limit = $conf->liste_limit;
$offset = $limit * $_GET["page"] ;
$sql = "SELECT s.nom, s.idp, c.rowid, c.ref, c.total_ht,".$db->pdate("c.date_commande")." as date_commande, c.fk_statut" ;
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c WHERE c.fk_soc = s.idp";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
$sql.= " WHERE c.fk_soc = s.idp";
if ($sref)
{
$sql .= " AND c.ref like '%".$sref."%'";
}
if ($sall)
{
$sql .= " AND (c.ref like '%".$sall."%' OR c.note like '%".$sall."%')";
}
if ($socidp)
{
$sql .= " AND s.idp = $socidp";
}
if ($_GET["month"] > 0)
{
$sql .= " AND date_format(c.date_commande, '%Y-%m') = '$year-$month'";
@ -78,12 +86,10 @@ if (isset($_GET["status"]))
{
$sql .= " AND fk_statut = ".$_GET["status"];
}
if (isset($_GET["afacturer"]))
{
$sql .= " AND c.facture = 0";
}
if (strlen($_POST["sf_ref"]) > 0)
{
$sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'";

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

@ -43,7 +43,7 @@ ConfirmCloseOrder=Are you sure you want to close this order ?
ConfirmDeleteOrder=Are you sure you want to delete this order ?
ConfirmValidateOrder=Are you sure you want to validate this order ?
ConfirmCancelOrder=Are you sure you want to cancel this order ?
GenerateBill=Generate bill
GenerateBill=Generate invoice
ClassifyBilled=Classify "Billed"
ComptaCard=Accountancy card
DraftOrders=Draft orders