Add missing page

htdocs/comm/prospect/fiche.php

@@ -95,8 +95,8 @@ if ($socid > 0)
 
 	dolibarr_fiche_head($head, 'prospect', $langs->trans("ThirdParty"));
 
-    print "<table width=\"100%\">\n";
+	print '<table width="100%" class="notopnoleftnoright">';
-    print '<tr><td valign="top" width="50%">';
+	print '<tr><td valign="top" width="50%" class="notopnoleft">';
 
 	print '<table class="border" width="100%">';
 	print '<tr><td width="25%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
@@ -153,12 +153,21 @@ if ($socid > 0)
 
 
 	print "</td>\n";
-    print '<td valign="top" width="50%">';
+	print '<td valign="top" width="50%" class="notopnoleft">';
 
 	// Nbre max d'éléments des petites listes
 	$MAXLIST=5;
 	$tableaushown=0;
 
+	// Lien recap
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
+	print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/prospect/recap-prospect.php?socid='.$societe->id.'">'.$langs->trans("ShowProspectPreview").'</a></td></tr></table></td>';
+	print '</tr>';
+	print '</table>';
+	print '<br>';
+
 
 	/*
 	 * Dernieres propales

htdocs/comm/prospect/recap-prospect.php

@@ -0,0 +1,96 @@
+<?php
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+/**
+    	\file       htdocs/fourn/recap-fourn.php
+		\ingroup    fournisseur
+		\brief      Page de fiche recap fournisseur
+		\version    $Id$
+*/
+
+require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
+
+$langs->load("companies");
+if ($conf->facture->enabled) $langs->load("bills");
+
+// Sécurité accés client
+$socid = $_GET["socid"];
+if ($user->societe_id > 0)
+{
+  $action = '';
+  $socid = $user->societe_id;
+}
+
+
+
+/*
+ *
+ * Mode fiche
+ *
+ */
+
+llxHeader();
+
+if ($socid > 0)
+{
+    $societe = new Societe($db);
+    $societe->fetch($socid, $to);  // si $to='next' ajouter " AND s.rowid > $socid ORDER BY idp ASC LIMIT 1";
+
+    /*
+     * Affichage onglets
+     */
+	$head = societe_prepare_head($societe);
+
+    dolibarr_fiche_head($head, 'prospect', $langs->trans("ThirdParty"));
+
+
+    print "<table width=\"100%\">\n";
+    print '<tr><td valign="top" width="50%">';
+
+    print '<table class="border" width="100%">';
+
+    // Nom
+    print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
+
+	// Prefix
+    print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+    print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
+    print '</td></tr>';
+
+    print "</table>";
+
+    print "</td></tr></table>\n";
+
+    print '</div>';
+
+
+	print $langs->trans("FeatureNotYetAvailable");
+}
+else
+{
+  	dolibarr_print_error($db);
+}
+
+
+$db->close();
+
+llxFooter('$Date$ - $Revision$');
+?>

htdocs/compta/recap-compta.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,13 @@
  * 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$
- * $Source$
  */
 
 /**
    \file       htdocs/compta/recap-compta.php
    \ingroup    compta
    \brief      Page de fiche recap compta
-   \version    $Revision$
+   \version    $Id$
 */
 
 require("./pre.inc.php");
@@ -60,7 +57,7 @@ if ($socid > 0)
      */
 	$head = societe_prepare_head($societe);
 
-    dolibarr_fiche_head($head, 'compta', $societe->nom);
+    dolibarr_fiche_head($head, 'compta', $langs->trans("ThirdParty"));
 
     print "<table width=\"100%\">\n";
     print '<tr><td valign="top" width="50%">';

htdocs/fourn/recap-fourn.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,13 @@
  * 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$
- * $Source$
  */
 
 /**
     	\file       htdocs/fourn/recap-fourn.php
 		\ingroup    fournisseur
 		\brief      Page de fiche recap fournisseur
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
@@ -62,7 +59,7 @@ if ($socid > 0)
      */
 	$head = societe_prepare_head($societe);
 
-    dolibarr_fiche_head($head, 'supplier', $societe->nom);
+    dolibarr_fiche_head($head, 'supplier', $langs->trans("ThirdParty"));
 
 
     print "<table width=\"100%\">\n";

htdocs/langs/en_US/main.lang

@@ -404,6 +404,7 @@ AccountancyPreview=Accountancy preview
 ShowCustomerPreview=Show customer preview
 ShowSupplierPreview=Show supplier preview
 ShowAccountancyPreview=Show accountancy preview
+ShowProspectPreview=Show prospect preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators

htdocs/langs/fr_FR/main.lang

@@ -404,6 +404,7 @@ SupplierPreview=Aperçu fournisseur
 AccountancyPreview=Aperçu compta
 ShowCustomerPreview=Afficher aperçu client
 ShowSupplierPreview=Afficher aperçu fournisseur
+ShowProspectPreview=Afficher aperçu prospect
 ShowAccountancyPreview=Afficher aperçu compta
 RefCustomer=Réf. client
 Currency=Devise

htdocs/soc.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Brian Fraval         <brian@fraval.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2008	   Patrick Raguin       <patrick.raguin@auuguria.net>
@@ -255,7 +255,8 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' &&
 	else
 	{
 		$reload = 0;
-		$mesg=$soc->error;
+		$langs->load("errors");
+		$mesg=$langs->trans($soc->error);
 		$_GET["action"]='';
 	}
 }

htdocs/societe.class.php

@@ -694,9 +694,27 @@ class Societe extends CommonObject
 		dolibarr_syslog("Societe::Delete");
 		$sqr = 0;
 
-		// \Todo
 		// Check if third party can be deleted
-
+		$nbpropal=0;
+		$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX."propal";
+		$sql.= " WHERE fk_soc = " . $id;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj=$this->db->fetch_object($resql);
+			$nbpropal=$obj->nb;
+			if ($nbpropal > 0)
+			{
+				$this->error="ErrorRecordHasChildren";
+				return -1;
+			}
+		}
+		else
+		{
+			$this->error .= $this->db->lasterror();
+			dolibarr_syslog("Societe::Delete erreur -1 ".$this->error);
+			return -1;
+		}