Add navigation on order pages

htdocs/boutique/commande/commande.class.php

@@ -17,12 +17,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
- /**
+/**
  \file       htdocs/boutique/commande/commande.class.php
  \ingroup    osc
  \brief      Fichier de la classe des commandes OSC
  \version    $Id$
-*/
+ */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/address.class.php");
 
@@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT ."/core/address.class.php");
 /**
  \class      Commande
  \brief      Classe permettant la gestion des commandes OSC
-*/
+ */
 class Commande
 {
 	var $db ;
@@ -49,17 +49,17 @@ class Commande
 		$this->total_ot_shipping = 0;
 	}
 
-  /*
+	/**
-   *
+	 *	\brief      Get object and lines from database
-   *
+	 *	\param      rowid       id of object to load
-   *
+	 * 	\param		ref			Ref of order
+	 *	\return     int         >0 si ok, <0 si ko
 	 */
-  function fetch ($id) {
+	function fetch ($id,$ref='')
-
+	{
 		$sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, ".$this->db->pdate("date_purchased") . " as date_purchased, orders_status, orders_date_finished, currency, currency_value";
-
+		$sql.= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders";
-    
+		$sql.= " WHERE orders_id = ".$id;
-    $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders WHERE orders_id = $id";
 
 		$result = $this->db->query($sql) ;
 

htdocs/commande/commande.class.php

@@ -816,10 +816,12 @@ class Commande extends CommonObject
 
 
 	/**
-	 *    \brief      Load an order from database
+	 *	\brief      Get object and lines from database
-	 *    \param      rowid       id de la commande a recuperer
+	 *	\param      rowid       id of object to load
+	 * 	\param		ref			Ref of invoice
+	 *	\return     int         >0 if OK, <0 if KO
 	 */
-	function fetch($id)
+	function fetch($id,$ref='')
 	{
 		$sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_statut';
 		$sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.fk_cond_reglement, c.fk_mode_reglement';
@@ -834,10 +836,10 @@ class Commande extends CommonObject
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'cond_reglement as cr ON (c.fk_cond_reglement = cr.rowid)';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON (c.fk_mode_reglement = p.id)';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'co_pr as cp ON (cp.fk_commande = c.rowid)';
-		$sql.= ' WHERE c.rowid = '.$id;
+		if ($ref) $sql.= " WHERE c.ref='".$ref."'";
+		else $sql.= " WHERE c.rowid=".$id;
 
 		dolibarr_syslog("Commande::fetch sql=$sql");
-
 		$result = $this->db->query($sql) ;
 		if ($result)
 		{

htdocs/commande/contact.php

@@ -154,14 +154,15 @@ $contactstatic=new Contact($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-if ( isset($mesg))
+if (isset($mesg)) print $mesg;
-	print $mesg;
+
-$id = $_GET["id"];
+$id = $_GET['id'];
-if ($id > 0)
+$ref= $_GET['ref'];
+if ($id > 0 || ! empty($ref))
 {
 	$langs->trans("OrderCard");
-	$commande = New Commande($db);
+	$commande = new Commande($db);
-	if ( $commande->fetch($_GET['id'], $user->societe_id) > 0)
+	if ( $commande->fetch($_GET['id'],$_GET['ref']) > 0)
 	{
 		$soc = new Societe($db, $commande->socid);
 		$soc->fetch($commande->socid);
@@ -178,7 +179,7 @@ if ($id > 0)
 
 		// Ref
 		print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $commande->ref;
+		print $html->showrefnav($commande,'ref','',1,'ref','ref');
 		print "</td></tr>";
 
 		// Ref commande client

htdocs/commande/document.php

@@ -24,7 +24,7 @@
  \ingroup    order
  \brief      Page de gestion des documents attachees a une commande
  \version    $Id$
-*/
+ */
 
 require('./pre.inc.php');
 require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
@@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
 if (!$user->rights->commande->lire)
-  accessforbidden();
+accessforbidden();
 
 $langs->load('companies');
 //$langs->load("bills");
@@ -62,11 +62,15 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 
+$id = $_GET['id'];
+$ref= $_GET['ref'];
 $commande = new Commande($db);
-if (!$commande->fetch($id)) {
+if (! $commande->fetch($_GET['id'],$_GET['ref']) > 0) 
+{
 	dolibarr_print_error($db);
 }
 
+
 /*
  * Actions
  */
@@ -104,12 +108,15 @@ if ($action=='delete')
 
 
 /*
- * Affichage
+ * View
  */
-if ($id > 0)
-{
-  llxHeader();
 
+llxHeader();
+
+$html = new Form($db);
+
+if ($id > 0 || ! empty($ref))
+{
 	$upload_dir = $conf->commande->dir_output.'/'.sanitizeFileName($commande->ref);
 
 	$societe = new Societe($db);
@@ -131,7 +138,9 @@ if ($id > 0)
 	print '<table class="border"width="100%">';
 
 	// Ref
-  print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">'.$commande->ref.'</td></tr>';
+	print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
+	print $html->showrefnav($commande,'ref','',1,'ref','ref');
+	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.sizeof($filearray).'</td></tr>';

htdocs/commande/fiche.php

@@ -1136,13 +1136,17 @@ else
 	/* Mode vue et edition                                                         */
 	/*                                                                             */
 	/* *************************************************************************** */
+	$now=gmmktime();
+	
 	$id = $_GET['id'];
-	if ($id > 0)
+	$ref= $_GET['ref'];
+	if ($id > 0 || ! empty($ref))
 	{
 		if ($mesg) print $mesg.'<br>';
 
 		$commande = new Commande($db);
-		if ( $commande->fetch($_GET['id']) > 0)
+		$result=$commande->fetch($_GET['id'],$_GET['ref']);
+		if ($result > 0)
 		{
 			$soc = new Societe($db);
 			$soc->fetch($commande->socid);
@@ -1221,7 +1225,9 @@ else
 
 			// Ref
 			print '<tr><td width="18%">'.$langs->trans('Ref').'</td>';
-	  print '<td colspan="3">'.$commande->ref.'</td>';
+			print '<td colspan="3">';
+			print $html->showrefnav($commande,'ref','',1,'ref','ref');
+			print '</td>';
 			print '</tr>';
 
 			// Ref commande client

htdocs/commande/note.php

@@ -16,16 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**
  \file       htdocs/commande/note.php
  \ingroup    commande
  \brief      Fiche de notes sur une commande
-		\version    $Revision$
+ \version    $Id$
-*/
+ */
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
@@ -33,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
 $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
 
 if (!$user->rights->commande->lire)
-  accessforbidden();
+accessforbidden();
 
 $langs->load("companies");
 $langs->load("bills");
@@ -47,13 +45,18 @@ if ($user->societe_id > 0)
 }
 
 
+$id = $_GET['id'];
+$ref= $_GET['ref'];
 $commande = new Commande($db);
-$commande->fetch($_GET["id"]);
+if (! $commande->fetch($_GET['id'],$_GET['ref']) > 0)
+{
+	dolibarr_print_error($db);
+}
 
 
-/******************************************************************************/
+/*
-/*                     Actions                                                */
+ * Actions
-/******************************************************************************/
+ */
 
 if ($_POST["action"] == 'update' && $user->rights->commande->creer)
 {
@@ -75,15 +78,15 @@ if ($_POST["action"] == 'update' && $user->rights->commande->creer)
 
 
 
-/******************************************************************************/
+/*
-/* Affichage fiche                                                            */
+ * View
-/******************************************************************************/
+ */
 
 llxHeader();
 
 $html = new Form($db);
 
-if ($_GET["id"])
+if ($id > 0 || ! empty($ref))
 {
 	$soc = new Societe($db, $commande->socid);
 	$soc->fetch($commande->socid);
@@ -96,7 +99,7 @@ if ($_GET["id"])
 
 	// Ref
 	print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $commande->ref;
+	print $html->showrefnav($commande,'ref','',1,'ref','ref');
 	print "</td></tr>";
 
 	// Ref commande client

htdocs/compta/commande/fiche.php

@@ -105,22 +105,21 @@ if ($_POST['action'] == 'setconditions' && $user->rights->commande->creer)
 }
 
 
-llxHeader('',$langs->trans("OrderCard"),"Commande");
+/*
+ * View
+ */
 
+llxHeader('',$langs->trans("OrderCard"),"Commande");
 
 $html = new Form($db);
 $formfile = new FormFile($db);
 
-/* *************************************************************************** */
+$id = $_GET['id'];
-/*                                                                             */
+$ref= $_GET['ref'];
-/* Mode vue et edition                                                         */
+if ($id > 0 || ! empty($ref))
-/*                                                                             */
-/* *************************************************************************** */
-
-if ($_GET["id"] > 0)
 {
 	$commande = new Commande($db);
-	if ( $commande->fetch($_GET["id"]) > 0)
+	if ( $commande->fetch($_GET['id'],$_GET['ref']) > 0)
 	{
 		$soc = new Societe($db);
 		$soc->fetch($commande->socid);
@@ -142,7 +141,9 @@ if ($_GET["id"] > 0)
 
 		// Ref
 		print '<tr><td width="18%">'.$langs->trans('Ref').'</td>';
-		print '<td colspan="3">'.$commande->ref.'</td>';
+		print '<td colspan="3">';
+		print $html->showrefnav($commande,'ref','',1,'ref','ref');
+		print '</td>';
 		print '</tr>';
 
 		// Ref commande client

htdocs/expedition/commande.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -123,10 +123,12 @@ $formfile = new FormFile($db);
 
 llxHeader('',$langs->trans("OrderCard"));
 
-if ($_GET["id"] > 0)
+$id = $_GET['id'];
+$ref= $_GET['ref'];
+if ($id > 0 || ! empty($ref))
 {
 	$commande = new Commande($db);
-	if ( $commande->fetch($_GET["id"]) > 0)
+	if ( $commande->fetch($_GET['id'],$_GET['ref']) > 0)
 	{
 		$commande->loadExpeditions(1);
 
@@ -158,7 +160,9 @@ if ($_GET["id"] > 0)
 
 		// Ref
 		print '<tr><td width="18%">'.$langs->trans('Ref').'</td>';
-		print '<td colspan="3">'.$commande->ref.'</td>';
+		print '<td colspan="3">';
+		print $html->showrefnav($commande,'ref','',1,'ref','ref');
+		print '</td>';
 		print '</tr>';
 
 		// Ref commande client
@@ -507,19 +511,29 @@ if ($_GET["id"] > 0)
 			print '<div class="tabsAction">';
 
 			// Bouton expedier sans gestion des stocks
-			if (! $conf->stock->enabled && $reste_a_livrer_total > 0 && ! $commande->brouillon && $user->rights->expedition->creer)
+			if (! $conf->stock->enabled && ! $commande->brouillon)
+			{ 
+				if ($user->rights->expedition->creer)
 				{
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/fiche.php?action=create&amp;origin=commande&amp;object_id='.$_GET["id"].'">'.$langs->trans("NewSending").'</a>';
+					if ($reste_a_livrer_total <= 0) 
+					{
+						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
+					}
+				}
+				else
+				{
+					print '<a class="butActionRefused" href="#">'.$langs->trans("NewSending").'</a>';
+				}
 			}
 			print "</div>";
 		}
 
 
 		// Bouton expedier avec gestion des stocks
-
+		if ($conf->stock->enabled && $commande->statut > 0 && $commande->statut < 3)
-		print '<table width="100%"><tr><td width="100%" colspan="2" valign="top">';
+		{
-
+			if ($user->rights->expedition->creer)
-		if ($conf->stock->enabled && $reste_a_livrer_total > 0 && $commande->statut > 0 && $commande->statut < 3 && $user->rights->expedition->creer)
 			{
 				print_titre($langs->trans("NewSending"));
 	
@@ -550,29 +564,32 @@ if ($_GET["id"] > 0)
 	
 				if (sizeof($entrepot->list_array()) <= 0)
 				{
-				print ' &nbsp; Aucun entrepôt définit, <a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?action=create">definissez en un</a>';
+					print ' &nbsp; No warehouse defined, <a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?action=create">add one</a>';
 				}
-			print '</td></tr>';
+				print '</td><td align="center">';
-			/*
-			 print '<tr><td width="20%">Mode d\'expédition</td>';
-			 print '<td>';
-			 $html->select_array("entrepot_id",$entrepot->list_array());
-			 print '</td></tr>';
-			 */
-
-			print '<tr><td align="center" colspan="2">';
 				print '<input type="submit" class="button" named="save" value="'.$langs->trans("NewSending").'">';
+				if ($reste_a_livrer_total <= 0) 
+				{
+					print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
+				}
 				print '</td></tr>';
 	
 				print "</table>";
 				print "</form>\n";
+				print '<br>';
 				
 				$somethingshown=1;
+		
+			}
+			else
+			{
+				print '<div class="tabsAction">';
+				print '<a class="butActionRefused" href="#">'.$langs->trans("NewSending").'</a>';
+				print '</div>';
+			}
 		}
 
-		print "</td></tr></table>";
 
-		print '<br>';
 		show_list_sending_receive('commande',$commande->id);
 
 	}

htdocs/expedition/fiche.php

@@ -210,7 +210,7 @@ if ($_GET["action"] == 'create')
 
 	$expe = new Expedition($db);
 
-	print_titre($langs->trans("CreateASending"));
+	print_fiche_titre($langs->trans("CreateASending"));
 	if (! $origin)
 	{
 		$mesg='<div class="error">'.$langs->trans("ErrorBadParameters").'</div>';
@@ -295,9 +295,8 @@ if ($_GET["action"] == 'create')
 			{
 				print '<tr><td colspan="3">'.$langs->trans("NotePrivate").': '.nl2br($object->note)."</td></tr>";
 			}
-			print "</table>";
 			
-			print '<table><tr><td>';
+			print '<tr><td>';
 			print $langs->trans("Weight");
 			print '</td><td><input name="weight" size="4" value=""></td><td>';
 			print $formproduct->select_measuring_units("weight_units","weight");
@@ -311,10 +310,7 @@ if ($_GET["action"] == 'create')
 			print '</td></tr><tr><td>';
 			print $langs->trans("Depth");
 			print '</td><td><input name="sizeS" size="4" value=""></td>';
-			print '<td>&nbsp;</td></tr></table>';
+			print '<td>&nbsp;</td></tr>';
-
-
-			print '<table>';
 
 			// Delivery method
 			print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";

htdocs/facture.class.php

@@ -485,10 +485,10 @@ class Facture extends CommonObject
 
 
 	/**
-	 *	\brief      Recupére l'objet facture et ses lignes de factures
+	 *	\brief      Get object and lines from database
-	 *	\param      rowid       id de la facture a récupérer
+	 *	\param      rowid       id of object to load
 	 * 	\param		ref			Ref of invoice
-	 *	\return     int         >0 si ok, <0 si ko
+	 *	\return     int         >0 if OK, <0 if KO
 	 */
 	function fetch($rowid,$ref='')
 	{

htdocs/langs/en_US/other.lang

@@ -62,6 +62,7 @@ FeaturesSupported=Features supported
 Width=Width
 Height=Height
 Weight=Weight
+Depth=Depth
 TotalWeight=Total weight
 WeightUnitton=tonnes
 WeightUnitkg=kg
@@ -73,9 +74,6 @@ VolumeUnitm3=m3
 VolumeUnitdm3=dm3
 VolumeUnitcm3=cm3
 VolumeUnitmm3=mm3
-Height=height
-Width=width
-Depth=depth
 Size=size
 SizeUnitm=m
 SizeUnitdm=dm

htdocs/langs/en_US/sendings.lang

@@ -41,6 +41,7 @@ ConfirmCancelSending=Are you sure you want to cancel this sending ?
 GenericTransport=Generic transport
 Enlevement=Gotten by customer
 DocumentModelSimple=Simple document model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
  
 # NumRef
 NumRefModelJade=Return a reference number with format BLYY00001, ... where YY is year. Number at end is never reset to zero.

htdocs/langs/fr_FR/other.lang

@@ -62,6 +62,7 @@ FeaturesSupported=Fonctionnalit
 Width=Largeur
 Height=Hauteur
 Weight=Poids
+Depth=Profondeur
 TotalWeight=Poids total
 WeightUnitton=tonnes
 WeightUnitkg=kg
@@ -73,9 +74,6 @@ VolumeUnitm3=m3
 VolumeUnitdm3=dm3
 VolumeUnitcm3=cm3
 VolumeUnitmm3=mm3
-Height=hauteur
-Width=largeur
-Depth=profondeur
 Size=taille
 SizeUnitm=m
 SizeUnitdm=dm

htdocs/langs/fr_FR/sendings.lang

@@ -41,6 +41,7 @@ ConfirmCancelSending=Etes-vous s
 GenericTransport=Transporteur générique
 Enlevement=Enlèvement sur place par le client
 DocumentModelSimple=Modèle simple
+WarningNoQtyLeftToSend=Alerte, aucun produit en attente de livraison.
 
 # NumRef
 NumRefModelJade=Renvoie un numéro de référence sous la forme numérique BLYY00001, ... où YY représente l'année. Le numéro d'incrément qui suit l'année n'est PAS remis à zéro en début d'année.

htdocs/product/fiche.php

@@ -1142,7 +1142,7 @@ if ($_GET["action"] == '')
 		print '<a class="butAction" href="fiche.php?action=edit&amp;id='.$product->id.'">'.$langs->trans("Modify").'</a>';
 
 		if ($product->no_button_copy <> 1)
-		print '<a class="butAction" href="fiche.php?action=clone&amp;id='.$product->id.'">'.$langs->trans("CreateCopy").'</a>';
+		print '<a class="butAction" href="fiche.php?action=clone&amp;id='.$product->id.'">'.$langs->trans("ToClone").'</a>';
 	}
 
 	/*