diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index dfa9075793b..0a596dd0ae2 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -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"); diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index d492679751b..abb27e587fb 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -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 "rowid."\">"; + print "rowid."\">"; print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.''; - print "idp\">".img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom."\n"; + print "idp\">".img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom."\n"; print ""; print dolibarr_print_date($obj->dp)."\n"; print "".price($obj->price)."\n"; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 751ce7de019..4546a0a727f 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -607,12 +606,12 @@ else if ($num) { print ''; - print ''.$langs->trans('Description').''; - print ''.$langs->trans('VAT').''; - print ''.$langs->trans('PriceUHT').''; - print ''.$langs->trans('Qty').''; - print ''.$langs->trans('Discount').''; - print ''.$langs->trans('AmountHT').''; + print ''.$langs->trans('Description').''; + print ''.$langs->trans('VAT').''; + print ''.$langs->trans('PriceUHT').''; + print ''.$langs->trans('Qty').''; + print ''.$langs->trans('Discount').''; + print ''.$langs->trans('AmountHT').''; print '  '; print "\n"; } diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 55e44d35488..7e9f5dd158e 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -50,7 +49,9 @@ print ''; print ''; print ''; print ''; +print $langs->trans("Ref").':'; +print ''; +print ''; print "
'.$langs->trans("SearchOrder").'
'; -print $langs->trans("Ref").'
'.$langs->trans("Other").':

\n"; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index af633a7ee23..4dd6586fd17 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -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"] . "%'"; diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 1c388494f84..428ba9e4891 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -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