diff --git a/htdocs/contrat/pre.inc.php b/htdocs/contrat/pre.inc.php index 25460994a4c..7706b57a885 100644 --- a/htdocs/contrat/pre.inc.php +++ b/htdocs/contrat/pre.inc.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2001-2006 Rodolphe Quiedeville * Copyright (C) 2005-2006 Laurent Destailleur * * 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); } ?> diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 23f6d5e34a1..bd551a82ccd 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -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 ""; print_liste_field_titre($langs->trans("Ref"),"reassort.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); print_liste_field_titre($langs->trans("Label"),"reassort.php", "p.label","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); - print_liste_field_titre($langs->trans("DateModification"),"reassort.php", "p.tms","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); + print_liste_field_titre($langs->trans("StockAvailable"),"reassort.php", "p.stock_dispo","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&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)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); print_liste_field_titre($langs->trans("Stock"),"reassort.php", "stock","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield); print_liste_field_titre($langs->trans("Status"),"reassort.php", "p.envente","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); @@ -250,7 +250,7 @@ if ($resql) print ' '; print ''.$objp->ref.''; print ''.$objp->label.''; - print ''.dolibarr_print_date($objp->datem).''; + if ($conf->service->enabled && $type != 0) { print ''; @@ -260,6 +260,7 @@ if ($resql) else print $objp->duration; print ''; } + print ''.$objp->stock_dispo.''; print ''.$objp->stock.''; print ''.$product_static->LibStatut($objp->statut,5).''; print "\n";