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

Ajout: utilisation du mme classement que les propales

Browse Source
This commit is contained in:
Regis Houssin 2007-03-30 11:41:41 +00:00
parent 91c8818fa2
commit 780bf6b929
3 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/admin/commande.php
View File

@ -124,11 +124,6 @@ if ($_GET["action"] == 'setmod')
dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"]);
}
if ($_POST["action"] == 'sethidetreated')
{
dolibarr_set_const($db, "COMMANDE_HIDE_TREATED",$_POST["hidetreated"]);
}
if ($_POST["action"] == 'setvalidorder')
{
dolibarr_set_const($db, "COMMANDE_VALID_AFTER_CLOSE_PROPAL",$_POST["validorder"]);
@ -348,19 +343,6 @@ print '<td align="center" width="160">'.$langs->trans("Value").'</td>';
print "</tr>\n";
$var=true;
// Cacher les commandes classer facturées des listes
$var=! $var;
print '<tr '.$bc[$var].'><td>';
print $langs->trans("HideTreadedOrders");
print '</td><td width="160" align="center">';
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="action" value="sethidetreated">';
print $html->selectyesno("hidetreated",$conf->global->COMMANDE_HIDE_TREATED,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n";
print "</td></tr>\n";
// Valider la commande après cloture de la propale
// permet de na pas passer par l'option commande provisoire
$var=! $var;

43
htdocs/commande/liste.php
View File

@ -62,6 +62,7 @@ llxHeader();
$begin=$_GET['begin'];
$sortorder=$_GET['sortorder'];
$sortfield=$_GET['sortfield'];
$viewstatut=$_GET['viewstatut'];
if (! $sortfield) $sortfield='c.rowid';
if (! $sortorder) $sortorder='DESC';
@ -91,6 +92,25 @@ if ($socid)
{
$sql .= ' AND s.idp = '.$socid;
}
if ($viewstatut <> '' && $viewstatut < 4)
{
if ($viewstatut == 3)
{
$sql .= ' AND c.fk_statut ='.$viewstatut.' AND c.facture = 0';
}
else
{
$sql .= ' AND c.fk_statut ='.$viewstatut;
}
}
if ($viewstatut <> '' && $viewstatut == 4)
{
$sql .= ' AND c.facture = 1';
}
else if (isset($_GET['afacturer']) && $_GET['afacturer'] == 1)
{
$sql .= ' AND c.facture = 0';
}
if ($_GET['month'] > 0)
{
$sql .= " AND date_format(c.date_commande, '%Y-%m') = '$year-$month'";
@ -99,14 +119,6 @@ if ($_GET['year'] > 0)
{
$sql .= " AND date_format(c.date_commande, '%Y') = $year";
}
if (isset($_GET['status']))
{
$sql .= " AND fk_statut = ".$_GET['status'];
}
if (isset($_GET['afacturer']) && $_GET['afacturer'] == 1)
{
$sql .= ' AND c.facture = 0';
}
if (strlen($_POST['sf_ref']) > 0)
{
$sql .= " AND c.ref like '%".addslashes($_POST['sf_ref']) . "%'";
@ -119,11 +131,6 @@ if (!empty($sref_client))
{
$sql .= ' AND c.ref_client like \'%'.addslashes($sref_client).'%\'';
}
// on ne liste pas les commandes classer facturées et annulées, elles apparaissent tout de même avec la recherche
if ($conf->global->COMMANDE_HIDE_TREATED && (!$sref && !$sref_client && !$snom && !$sall && (!strlen($_POST['sf_ref']) > 0)))
{
$sql .= ' AND c.facture = 0 AND c.fk_statut >= 0';
}
$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
$sql .= $db->plimit($limit + 1,$offset);
@ -149,11 +156,11 @@ if ($resql)
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),'liste.php','c.ref','','&amp;socid='.$socid,'width="25%"',$sortfield);
print_liste_field_titre($langs->trans('Company'),'liste.php','s.nom','','&amp;socid='.$socid,'width="30%"',$sortfield);
print_liste_field_titre($langs->trans('RefCustomerOrder'),'liste.php','c.ref_client','','&amp;socid='.$socid,'width="15%"',$sortfield);
print_liste_field_titre($langs->trans('Date'),'liste.php','c.date_commande','','&amp;socid='.$socid, 'width="20%" align="right" colspan="2"',$sortfield);
print_liste_field_titre($langs->trans('Status'),'liste.php','c.fk_statut','','&amp;socid='.$socid,'width="10%" align="center"',$sortfield);
print_liste_field_titre($langs->trans('Ref'),'liste.php','c.ref','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut,'width="25%"',$sortfield);
print_liste_field_titre($langs->trans('Company'),'liste.php','s.nom','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut,'width="30%"',$sortfield);
print_liste_field_titre($langs->trans('RefCustomerOrder'),'liste.php','c.ref_client','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut,'width="15%"',$sortfield);
print_liste_field_titre($langs->trans('Date'),'liste.php','c.date_commande','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'width="20%" align="right" colspan="2"',$sortfield);
print_liste_field_titre($langs->trans('Status'),'liste.php','c.fk_statut','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut,'width="10%" align="center"',$sortfield);
print '</tr>';
// Lignes des champs de filtre
print '<form method="get" action="liste.php">';

8
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -290,7 +290,13 @@ class MenuLeft {
$langs->load("orders");
$newmenu->add(DOL_URL_ROOT."/commande/index.php?leftmenu=orders", $langs->trans("Orders"), 0 ,$user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/societe.php?leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1 ,$user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?viewstatut=0", $langs->trans("StatusOrderDraftShort"), 1, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?viewstatut=1", $langs->trans("StatusOrderValidated"), 1, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 1, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?viewstatut=3", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?viewstatut=4", $langs->trans("StatusOrderProcessed"), 1, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 1, $user->rights->commande->lire);
//if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1 ,$user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1 ,$user->rights->commande->lire);
}