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

Synchro

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2006-12-04 18:03:23 +00:00
parent eb97686eae
commit 64421b5c68
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/contrat/pre.inc.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
@ -21,32 +21,34 @@
*/
/**
\file htdocs/contrat/pre.inc.php
\ingroup contrat
\brief Fichier de gestion du menu gauche de l'espace contrat
\version $Revision$
\file htdocs/contrat/pre.inc.php
\ingroup contrat
\brief Fichier de gestion du menu gauche de l'espace contrat
\version $Revision$
*/
require("../main.inc.php");
function llxHeader($head = "", $urlp = "")
{
global $user, $conf, $langs;
$langs->load("contracts");
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/contrat/index.php", $langs->trans("Contracts"));
$menu->add_submenu(DOL_URL_ROOT."/societe.php", $langs->trans("NewContract"));
$menu->add_submenu(DOL_URL_ROOT."/contrat/liste.php", $langs->trans("List"));
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php", $langs->trans("MenuServices"));
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=0", $langs->trans("MenuInactiveServices"), 2 , true);
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=4", $langs->trans("MenuRunningServices"), 2 , true);
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2 , true);
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=5", $langs->trans("MenuClosedServices"), 2 , true);
left_menu($menu->liste);
global $user, $conf, $langs;
$langs->load("contracts");
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/contrat/index.php", $langs->trans("Contracts"));
$menu->add_submenu(DOL_URL_ROOT."/societe.php", $langs->trans("NewContract"));
$menu->add_submenu(DOL_URL_ROOT."/contrat/liste.php", $langs->trans("List"));
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php", $langs->trans("MenuServices"));
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=0", $langs->trans("MenuInactiveServices"), 2 , true);
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=4", $langs->trans("MenuRunningServices"), 2 , true);
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2 , true);
$menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=5", $langs->trans("MenuClosedServices"), 2 , true);
$menu->add_submenu(DOL_URL_ROOT."/contrat/facturation.php", $langs->trans("AutoBill"));
left_menu($menu->liste);
}
?>

9
htdocs/product/reassort.php
View File

@ -51,7 +51,7 @@ $type=trim($type);
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
if (! $sortfield) $sortfield="stock";
if (! $sortfield) $sortfield="stock_dispo";
if (! $sortorder) $sortorder="ASC";
$page = $_GET["page"];
$limit = $conf->liste_limit;
@ -78,7 +78,7 @@ $title=$langs->trans("ProductsAndServices");
$sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, '.$db->pdate('p.tms').' as datem,';
$sql.= ' p.duration, p.envente as statut,';
$sql.= ' SUM(reel) as stock';
$sql.= ' SUM(reel) as stock,p.stock_commande,(SUM(reel) - p.stock_commande) as stock_dispo';
$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; // '.MAIN_DB_PREFIX.'product_det as d'; //en attendant le debugage
$sql.= ',' .MAIN_DB_PREFIX.'product_stock as s';
if ($catid || ($conf->categorie->enabled && !$user->rights->categorie->voir))
@ -184,7 +184,7 @@ if ($resql)
print "<tr class=\"liste_titre\">";
print_liste_field_titre($langs->trans("Ref"),"reassort.php", "p.ref","&amp;envente=$envente".(isset($type)?"&amp;type=$type":"")."&fourn_id=$fourn_id&amp;snom=$snom&amp;sref=$sref","","",$sortfield);
print_liste_field_titre($langs->trans("Label"),"reassort.php", "p.label","&envente=$envente&".(isset($type)?"&amp;type=$type":"")."&fourn_id=$fourn_id&amp;snom=$snom&amp;sref=$sref","","",$sortfield);
print_liste_field_titre($langs->trans("DateModification"),"reassort.php", "p.tms","&envente=$envente&".(isset($type)?"&amp;type=$type":"")."&fourn_id=$fourn_id&amp;snom=$snom&amp;sref=$sref","",'align="center"',$sortfield);
print_liste_field_titre($langs->trans("StockAvailable"),"reassort.php", "p.stock_dispo","&envente=$envente&".(isset($type)?"&amp;type=$type":"")."&fourn_id=$fourn_id&amp;snom=$snom&amp;sref=$sref","",'align="right"',$sortfield);
if ($conf->service->enabled && $type != 0) print_liste_field_titre($langs->trans("Duration"),"reassort.php", "p.duration","&envente=$envente&".(isset($type)?"&amp;type=$type":"")."&fourn_id=$fourn_id&amp;snom=$snom&amp;sref=$sref","",'align="center"',$sortfield);
print_liste_field_titre($langs->trans("Stock"),"reassort.php", "stock","&envente=$envente&".(isset($type)?"&amp;type=$type":"")."&fourn_id=$fourn_id&amp;snom=$snom&amp;sref=$sref","",'align="right"',$sortfield);
print_liste_field_titre($langs->trans("Status"),"reassort.php", "p.envente","&envente=$envente&".(isset($type)?"&amp;type=$type":"")."&fourn_id=$fourn_id&amp;snom=$snom&amp;sref=$sref","",'align="center"',$sortfield);
@ -250,7 +250,7 @@ if ($resql)
print '</a> ';
print '<a href="fiche.php?id='.$objp->rowid.'">'.$objp->ref.'</a></td>';
print '<td>'.$objp->label.'</td>';
print '<td align="center">'.dolibarr_print_date($objp->datem).'</td>';
if ($conf->service->enabled && $type != 0)
{
print '<td align="center">';
@ -260,6 +260,7 @@ if ($resql)
else print $objp->duration;
print '</td>';
}
print '<td align="right">'.$objp->stock_dispo.'</td>';
print '<td align="right">'.$objp->stock.'</td>';
print '<td align="right" nowrap="nowrap">'.$product_static->LibStatut($objp->statut,5).'</td>';
print "</tr>\n";