Qual: Uniformize code

build/makepack-dolibarr.pl

@@ -464,24 +464,24 @@ if ($nboftargetok) {
     		$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
             $ret=`$cmd`;
 			
-#			print "Fix filefunc.inc.php, install/inc.php, support/inc.php\n";
+			print "Fix filefunc.inc.php, install/inc.php, support/inc.php\n";
-#			$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/filefunc.inc.php\" | 
+			$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/filefunc.inc.php\" | 
-#					sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
+					sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
-#					sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
+					sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
-#					sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/htdocs/filefunc.inc.php\"";
+					sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/htdocs/filefunc.inc.php\"";
-#			$ret=`$cmd`;
+			$ret=`$cmd`;
-#			$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/install/inc.php\" | 
+			$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/install/inc.php\" | 
-#					sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
+					sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
-#					sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
+					sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
-#					sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/htdocs/install/inc.php\"";
+					sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/htdocs/install/inc.php\"";
-#			$ret=`$cmd`;
+			$ret=`$cmd`;
-#			$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/support/inc.php\" | 
+			$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/support/inc.php\" | 
-#					sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
+					sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
-#					sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
+					sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
-#					sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/htdocs/support/inc.php\"";
+					sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/htdocs/support/inc.php\"";
-#			$ret=`$cmd`;
+			$ret=`$cmd`;
 	
- 			#print "Remove other files\n";
+ 			print "Remove other files\n";
             #$ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/ChangeLog`;
             #$ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/COPYING`;
             #$ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/INSTALL`;
@@ -503,13 +503,13 @@ if ($nboftargetok) {
             #$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/zip`;
             #$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/perl`;
             # We remove embedded libraries or fonts
-            #if ($target !~ /GENE/i) 
+            if ($target !~ /GENE/i) 
-            #{            
+            {            
-			#	$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/artichow/font`,
+				$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/artichow/font`,
-			#	$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/fonts`,
+				$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/fonts`,
-            #}
+            }
             #$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip`;
-            #$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt`;
+            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt`;
 
 			# Conf files
     		#print "Copy config files into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT\n";
@@ -570,9 +570,6 @@ if ($nboftargetok) {
             close SPECFROM;
             close SPECTO;
     
-    		print "Copy patch file to $RPMDIR/SOURCES\n";
-    		$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
-
     		print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
     		#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
     		$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;

build/rpm/dolibarr-forrpm.patch

@@ -1,42 +0,0 @@
-diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
---- htdocs/filefunc.inc.php.patch	2011-09-03 02:32:48.666952000 +0200
-+++ htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -65,8 +65,8 @@ $conffiletoshowshort = "conf.php";
- $conffile = "conf/conf.php";
- $conffiletoshow = "htdocs/conf/conf.php";
- # For debian/redhat like systems
--#$conffile = "/etc/dolibarr/conf.php";
--#$conffiletoshow = "/etc/dolibarr/conf.php";
-+$conffile = "/etc/dolibarr/conf.php";
-+$conffiletoshow = "/etc/dolibarr/conf.php";
- 
- 
- // Include configuration
-diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
---- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
-+++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -75,8 +75,8 @@ $conffiletoshowshort = "conf.php";
- $conffile = "../conf/conf.php";
- $conffiletoshow = "htdocs/conf/conf.php";
- # For debian/redhat like systems
--#$conffile = "/etc/dolibarr/conf.php";
--#$conffiletoshow = "/etc/dolibarr/conf.php";
-+$conffile = "/etc/dolibarr/conf.php";
-+$conffiletoshow = "/etc/dolibarr/conf.php";
- 
- 
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
-diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
---- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
-+++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
- $conffile = "../conf/conf.php";
- $conffiletoshow = "htdocs/conf/conf.php";
- # For debian/redhat like systems
--#$conffile = "/etc/dolibarr/conf.php";
--#$conffiletoshow = "/etc/dolibarr/conf.php";
-+$conffile = "/etc/dolibarr/conf.php";
-+$conffiletoshow = "/etc/dolibarr/conf.php";
- 
- $charset="UTF-8";	// If not output format found in any conf file
- if (! defined('DONOTLOADCONF') && file_exists($conffile))

build/rpm/dolibarr_fedora.spec

@@ -20,7 +20,6 @@ Vendor: Dolibarr dev team
 
 URL: http://www.dolibarr.org
 Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -68,7 +67,6 @@ cui hai bisogno ed essere facile da usare.
 #---- prep
 %prep
 %setup -q
-%patch0 -p0 -b .patch
 
 
 

build/rpm/dolibarr_generic.spec

@@ -20,7 +20,6 @@ Vendor: Dolibarr dev team
 
 URL: http://www.dolibarr.org
 Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -69,7 +68,7 @@ cui hai bisogno ed essere facile da usare.
 #---- prep
 %prep
 %setup -q
-%patch0 -p0 -b .patch
+
 
 
 #---- build

build/rpm/dolibarr_mandriva.spec

@@ -20,7 +20,6 @@ Vendor: Dolibarr dev team
 
 URL: http://www.dolibarr.org
 Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -68,7 +67,6 @@ cui hai bisogno ed essere facile da usare.
 #---- prep
 %prep
 %setup -q
-%patch0 -p0 -b .patch
 
 
 

build/rpm/dolibarr_opensuse.spec

@@ -20,7 +20,6 @@ Vendor: Dolibarr dev team
 
 URL: http://www.dolibarr.org
 Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -68,7 +67,6 @@ cui hai bisogno ed essere facile da usare.
 #---- prep
 %prep
 %setup -q
-%patch0 -p0 -b .patch
 
 
 #---- build

htdocs/adherents/class/adherent.class.php

@@ -116,9 +116,8 @@ class Adherent extends CommonObject
 
 
     /**
-	 *	Constructor
+     *	Adherent
-	 *
+     *	@param DB		base de donnees
-	 *	@param 		DoliDB		$DB		Database handler
      */
     function Adherent($DB)
     {

htdocs/adherents/class/adherent_type.class.php

@@ -49,9 +49,8 @@ class AdherentType extends CommonObject
 
 
     /**
-	 *	Constructor
+     *  \brief AdherentType
-	 *
+     *  \param DB				handler acces base de donnees
-	 *	@param 		DoliDB		$DB		Database handler
      */
     function AdherentType($DB)
     {
@@ -195,7 +194,6 @@ class AdherentType extends CommonObject
 
     /**
      *  Return list of members' type
-     *
      *  @return 	array	List of types of members
      */
     function liste_array()
@@ -235,12 +233,11 @@ class AdherentType extends CommonObject
 
 
     /**
-     *    	Renvoie nom clicable (avec eventuellement le picto)
+     *    	\brief      Renvoie nom clicable (avec eventuellement le picto)
-     *
+     *		\param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
-     *		@param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
+     *		\param		maxlen			length max libelle
-     *		@param		maxlen			length max libelle
+     *		\param		option			Page lien
-     *		@param		option			Page lien
+     *		\return		string			Chaine avec URL
-     *		@return		string			Chaine avec URL
      */
     function getNomUrl($withpicto=0,$maxlen=0)
     {
@@ -263,7 +260,6 @@ class AdherentType extends CommonObject
 
     /**
      *     getMailOnValid
-     *
      *     @return     Return mail model
      */
     function getMailOnValid()
@@ -282,7 +278,6 @@ class AdherentType extends CommonObject
 
     /**
      *     getMailOnSubscription
-     *
      *     @return     Return mail model
      */
     function getMailOnSubscription()
@@ -301,7 +296,6 @@ class AdherentType extends CommonObject
 
     /**
      *     getMailOnResiliate
-     *
      *     @return     Return mail model
      */
     function getMailOnResiliate()

htdocs/adherents/class/adherentstats.class.php

@@ -47,9 +47,9 @@ class AdherentStats extends Stats
 	/**
 	 * Constructor
 	 *
-	 *	@param 		DoliDB		$DB		Database handler
+	 * @param 	$DB		   Database handler
-	 * 	@param 		int			$socid	   Id third party
+	 * @param 	$socid	   Id third party
-     * 	@param   	int			$userid    Id user for filter
+     * @param   $userid    Id user for filter
 	 * @return 	AdherentStats
 	 */
 	function AdherentStats($DB, $socid=0, $userid=0)

htdocs/adherents/class/cotisation.class.php

@@ -49,9 +49,8 @@ class Cotisation extends CommonObject
 
 
 	/**
-	 *	Constructor
+	 *		\brief Constructor
-	 *
+	 *		\param DB				Handler base de donnees
-	 *	@param 		DoliDB		$DB		Database handler
 	 */
 	function Cotisation($DB)
 	{
@@ -60,10 +59,9 @@ class Cotisation extends CommonObject
 
 
 	/**
-	 *	Fonction qui permet de creer la cotisation
+	 *	\brief 		Fonction qui permet de creer la cotisation
-	 *
+	 *	\param 		userid		userid de celui qui insere
-	 *	@param 		userid		userid de celui qui insere
+	 *	\return		int			<0 si KO, Id cotisation cree si OK
-	 *	@return		int			<0 si KO, Id cotisation cree si OK
 	 */
 	function create($userid)
 	{
@@ -97,10 +95,9 @@ class Cotisation extends CommonObject
 
 
 	/**
-	 *  Fonction qui permet de recuperer une cotisation
+	 *  \brief 		Fonction qui permet de recuperer une cotisation
-	 *
+	 *  \param 		rowid		Id cotisation
-	 *  @param 		rowid		Id cotisation
+	 *  \return		int			<0 si KO, =0 si OK mais non trouve, >0 si OK
-	 *  @return		int			<0 si KO, =0 si OK mais non trouve, >0 si OK
 	 */
 	function fetch($rowid)
 	{
@@ -147,11 +144,10 @@ class Cotisation extends CommonObject
 
 
 	/**
-	 *	Met a jour en base la cotisation
+	 *		\brief 		Met a jour en base la cotisation
-	 *
+	 *		\param 		user			Objet user qui met a jour
-	 *	@param 		user			Objet user qui met a jour
+	 *		\param 		notrigger		0=Desactive les triggers
-	 *	@param 		notrigger		0=Desactive les triggers
+	 *		\param		int				<0 if KO, >0 if OK
-	 *	@param		int				<0 if KO, >0 if OK
 	 */
 	function update($user,$notrigger=0)
 	{
@@ -188,10 +184,9 @@ class Cotisation extends CommonObject
 	}
 
 	/**
-	 *	Delete a subscription
+	 *		\brief		Delete a subscription
-	 *
+	 *		\param 		rowid	Id cotisation
-	 *	@param 		rowid	Id cotisation
+	 *		\return		int		<0 si KO, 0 si OK mais non trouve, >0 si OK
-	 *	@return		int		<0 si KO, 0 si OK mais non trouve, >0 si OK
 	 */
 	function delete($user)
 	{
@@ -255,10 +250,9 @@ class Cotisation extends CommonObject
 
 
 	/**
-	 *  Renvoie nom clicable (avec eventuellement le picto)
+	 *    	\brief      Renvoie nom clicable (avec eventuellement le picto)
-	 *
+	 *		\param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
-	 *	@param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
+	 *		\return		string			Chaine avec URL
-	 *	@return		string			Chaine avec URL
 	 */
 	function getNomUrl($withpicto=0)
 	{
@@ -280,9 +274,8 @@ class Cotisation extends CommonObject
 
 
     /**
-     *  Charge les informations d'ordre info dans l'objet cotisation
+     *      \brief     Charge les informations d'ordre info dans l'objet cotisation
-	 *
+     *      \param     id       Id adhesion a charger
-     *  @param     id       Id adhesion a charger
      */
 	function info($id)
 	{

htdocs/adherents/stats/geo.php

@@ -168,7 +168,7 @@ dol_fiche_head($head, $tab, $langs->trans("Statistics"), 0, 'user');
 
 
 // Print title
-if ($mode && ! count($data))
+if ($mode && ! sizeof($data))
 {
     print $langs->trans("NoValidatedMemberYet").'<br>';
     print '<br>';
@@ -202,7 +202,7 @@ if ($mode == 'memberbycountry')
     print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";
 
     // Get the total number of rows
-    print "\tdata.addRows(".count($data).");\n";
+    print "\tdata.addRows(".sizeof($data).");\n";
     print "\tdata.addColumn('string', 'Country');\n";
     print "\tdata.addColumn('number', 'Number');\n";
 

htdocs/admin/barcode.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,9 @@
  */
 
 /**
- *	\file       htdocs/admin/barcode.php
+ *	\file       htdocs/includes/modules/barcode/admin/barcode.php
  *	\ingroup    barcode
- *	\brief      Page to setup barcode module
+ *	\brief      Page d'administration/configuration du module Code barre
  */
 
 require("../main.inc.php");

htdocs/admin/notification.php

@@ -27,7 +27,6 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php");
 
 $langs->load("admin");
-$langs->load("mails");
 
 // Security check
 if (!$user->admin)
@@ -64,7 +63,7 @@ print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup');
 
 print $langs->trans("NotificationsDesc").'<br><br>';
 
-dol_htmloutput_mesg($mesg);
+if ($mesg) print $mesg.'<br>';
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -81,7 +80,6 @@ $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("NotificationEMailFrom").'</td><td>';
 print '<input size="32" type="text" name="email_from" value="'.$conf->global->NOTIFICATION_EMAIL_FROM.'">';
-if (! empty($conf->global->NOTIFICATION_EMAIL_FROM) && ! isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 print '</table>';
 
@@ -123,4 +121,5 @@ $db->close();
 
 
 llxFooter();
+
 ?>

htdocs/admin/societe.php

@@ -518,8 +518,7 @@ $profid[3][1]=$langs->transcountry('ProfId4' ,$mysoc->pays_code);
 $var = true;
 $i=0;
 
-$nbofloop=count($profid);
+while ($i < sizeof($profid))
-while ($i < $nbofloop)
 {
 	$var = !$var;
 

htdocs/comm/propal/class/propal.class.php

@@ -2094,7 +2094,7 @@ class Propal extends CommonObject
 						$this->nbtodolate++;
 					}
 				}
-				// TODO Definir regle des propales a facturer en retard
+				// \todo Definir regle des propales a facturer en retard
 				// if ($mode == 'signed' && ! sizeof($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
 			}
 			return 1;

htdocs/compta/bank/admin/bank.php

@@ -78,7 +78,7 @@ if ($action == 'setbankorder')
  * view
  */
 
-llxHeader("",$langs->trans("BankSetupModule"));
+llxHeader("","");
 
 $html=new Form($db);
 
@@ -144,8 +144,7 @@ $bankorder[1][2]='BankCode DeskCode BankAccountNumberKey AccountNumber';
 $var = true;
 $i=0;
 
-$nbofbank=count($bankorder);
+while ($i < sizeof($bankorder))
-while ($i < $nbofbank)
 {
 	$var = !$var;
 
@@ -175,11 +174,11 @@ while ($i < $nbofbank)
 		print '</a></td>';
 	}
 	print '<td>&nbsp;</td>';
-	print '</tr>'."\n";
+	print "</tr>\n";
 	$i++;
 }
 
-print '</table>'."\n";
+print "</table>\n";
 
 dol_htmloutput_mesg($mesg);
 

htdocs/compta/paiement/cheque/class/remisecheque.class.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  *
@@ -44,9 +44,9 @@ class RemiseCheque extends CommonObject
 	var $errno;
 
 	/**
-	 *    Constructor
+	 *    \brief  Constructeur de la classe
-	 *
+	 *    \param  DB          handler acces base de donnees
-	 *    @param  	DoliDB	$DB		Database handler
+	 *    \param  id          id compte (0 par defaut)
 	 */
 	function RemiseCheque($DB)
 	{
@@ -56,11 +56,10 @@ class RemiseCheque extends CommonObject
 	}
 
 	/**
-	 *	Load record
+	 *	\brief 		Load record
-	 *
+	 *	\param 		id 			Id record
-	 *	@param 		id 			Id record
+	 *	\param 		ref		 	Ref record
-	 *	@param 		ref		 	Ref record
+	 * 	\return		int			<0 if KO, > 0 if OK
-	 * 	@return		int			<0 if KO, > 0 if OK
 	 */
 	function fetch($id,$ref='')
 	{
@@ -114,7 +113,6 @@ class RemiseCheque extends CommonObject
 
 	/**
 	 *	Create a receipt to send cheques
-	 *
 	 *	@param  	user 			User making creation
 	 *	@param  	account_id 		Bank account for cheque receipt
 	 *  @param      limit           Limit number of cheque to this
@@ -272,7 +270,6 @@ class RemiseCheque extends CommonObject
 
 	/**
 	 *	Supprime la remise en base
-	 *
 	 *	@param  user utilisateur qui effectue l'operation
 	 */
 	function delete($user='')
@@ -327,7 +324,6 @@ class RemiseCheque extends CommonObject
 
 	/**
 	 *  Validate a receipt
-	 *
 	 *  @param     user 	User
 	 *  @return    int      <0 if KO, >0 if OK
 	 */
@@ -391,7 +387,7 @@ class RemiseCheque extends CommonObject
 	/**
 	 * Old module for cheque receipt numbering
 	 *
-	 * @return 	int		Next number of cheque
+	 * @return string
 	 */
 	function getNextNumber()
 	{
@@ -425,7 +421,6 @@ class RemiseCheque extends CommonObject
 
 	/**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
      *      @param      user                Objet user
      *      @param      filteraccountid     To get info for a particular account id
      *      @return     int                 <0 if KO, >0 if OK

htdocs/compta/prelevement/class/ligne-prelevement.class.php

@@ -19,7 +19,7 @@
  */
 
 /**
- *  \file       htdocs/compta/prelevement/class/ligne-prelevement.class.php
+ *  \file       htdocs/compta/prelevement/ligne-prelevement.class.php
  *  \ingroup    prelevement
  *  \brief      Fichier de la classe des lignes de prelevements
  */

htdocs/compta/stats/index.php

@@ -401,7 +401,7 @@ print "</table>";
  print '<br><table width="100%" class="noborder">';
 
  // Factures non reglees
- // Y a bug ici. Il faut prendre le reste a payer et non le total des factures non reglees !
+ // \todo Y a bug ici. Il faut prendre le reste a payer et non le total des factures non reglees !
 
  $sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid, f.total_ttc, sum(pf.amount) as am";
  $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";

htdocs/compta/tva/class/tva.class.php

@@ -511,7 +511,7 @@ class Tva extends CommonObject
         $result = $this->db->query($sql);
         if ($result)
         {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");    // TODO devrait s'appeler paiementtva
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");    // \todo devrait s'appeler paiementtva
             if ($this->id > 0)
             {
                 $ok=1;

htdocs/compta/tva/quadri.php

@@ -114,11 +114,10 @@ function tva_coll($db,$y,$q)
 /**
  * Gets VAT to pay for the given month of the given year
  * The function gets the VAT in split results, as the VAT declaration asks
- * to report the amounts for different VAT rates as different lines
+ * to report the amounts for different VAT rates as different lines.
- *
+ * @param		object		Database handler object
- * @param		DoliDB	$db			Database handler object
+ * @param		y			Year
- * @param		int		$y			Year
+ * @param		q			Year quarter (1-4)
- * @param		int		$q			Year quarter (1-4)
  */
 function tva_paye($db, $y,$q)
 {

htdocs/core/class/html.formmail.class.php

@@ -380,7 +380,7 @@ class FormMail
                     $liste=array();
                     $soc=new Societe($this->db);
                     $soc->fetch($this->withtosocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+                    foreach ($soc->thirdparty_and_contact_email_array() as $key=>$value)
                     {
                         $liste[$key]=$value;
                     }
@@ -414,7 +414,7 @@ class FormMail
                     $liste=array();
                     $soc=new Societe($this->db);
                     $soc->fetch($this->withtoccsocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+                    foreach ($soc->thirdparty_and_contact_email_array() as $key=>$value)
                     {
                         $liste[$key]=$value;
                     }
@@ -448,7 +448,7 @@ class FormMail
                     $liste=array();
                     $soc=new Societe($this->db);
                     $soc->fetch($this->withtosocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+                    foreach ($soc->thirdparty_and_contact_email_array() as $key=>$value)
                     {
                         $liste[$key]=$value;
                     }
@@ -630,6 +630,58 @@ class FormMail
 
         return $out;
     }
+
+
+    /**
+     *    \brief  Affiche la partie de formulaire pour saisie d'un mail
+     *    \param  withtopic   1 pour proposer a la saisie le sujet
+     *    \param  withbody    1 pour proposer a la saisie le corps du message
+     *    \param  withfile    1 pour proposer a la saisie l'ajout d'un fichier joint
+     *    \todo   Fonction a virer quand fichier /comm/mailing.php vire (= quand ecran dans /comm/mailing prets)
+     */
+    function mail_topicmessagefile($withtopic=1,$withbody=1,$withfile=1,$defaultbody)
+    {
+        global $langs;
+
+        $langs->load("other");
+
+        print "<table class=\"border\" width=\"100%\">";
+
+        // Topic
+        if ($withtopic)
+        {
+            print "<tr>";
+            print "<td width=\"180\">".$langs->trans("MailTopic")."</td>";
+            print "<td>";
+            print "<input type=\"text\" size=\"60\" name=\"subject\" value=\"\">";
+            print "</td></tr>";
+        }
+
+        // Message
+        if ($withbody)
+        {
+            print "<tr>";
+            print "<td width=\"180\" valign=\"top\">".$langs->trans("MailText")."</td>";
+            print "<td>";
+            print "<textarea rows=\"8\" cols=\"72\" name=\"message\">";
+            print $defaultbody;
+            print "</textarea>";
+            print "</td></tr>";
+        }
+
+        // Si fichier joint
+        if ($withfile)
+        {
+            print "<tr>";
+            print "<td width=\"180\">".$langs->trans("MailFile")."</td>";
+            print "<td>";
+            print "<input type=\"file\" name=\"addedfile\" value=\"".$langs->trans("Upload")."\"/>";
+            print "</td></tr>";
+        }
+
+        print "</table>";
+    }
+
 }
 
 ?>

htdocs/core/class/notify.class.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2008 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
@@ -42,11 +42,13 @@ class Notify
     var $fk_project;
 
 	// Les codes actions sont definis dans la table llx_notify_def
+	// \todo utiliser des codes texte plutot que numerique
+	// 1 = Validation fiche inter
+	// 2 = Validation facture
 
     /**
-	 *	Constructor
+     *    \brief      Constructeur
-	 *
+     *    \param      DB      Handler acces base
-	 *	@param 		DoliDB		$DB		Database handler
      */
     function Notify($DB)
     {

htdocs/core/class/rssparser.class.php

@@ -448,10 +448,10 @@ class RssParser
 	 * 	Triggered when CDATA is found
 	 *
 	 * 	@param		$p
-	 *  @param		$text	Tag
+	 *  @param		$element	Tag
+	 *  @param		$attrs		Attributes of tags
 	 */
-    function feed_cdata($p, $text)
+    function feed_cdata ($p, $text) {
-    {
         if ($this->_format == 'atom' and $this->incontent)
         {
             $this->append_content( $text );
@@ -466,10 +466,9 @@ class RssParser
 	 * 	Triggered when closed tag is found
 	 *
 	 * 	@param		$p
-	 *  @param		$el		Tag
+	 *  @param		$element	Tag
 	 */
-    function feed_end_element($p, $el)
+    function feed_end_element ($p, $el) {
-    {
         $el = strtolower($el);
 
         if ( $el == 'item' or $el == 'entry' )
@@ -521,8 +520,7 @@ class RssParser
 	 * 	@param		$str1
 	 *  @param		$str2
 	 */
-    function concat(&$str1, $str2="")
+    function concat (&$str1, $str2="") {
-    {
         if (!isset($str1) ) {
             $str1="";
         }
@@ -531,8 +529,7 @@ class RssParser
 
 	/**
 	 */
-    function append_content($text)
+    function append_content($text) {
-    {
         if ( $this->initem ) {
             $this->concat( $this->current_item[ $this->incontent ], $text );
         }
@@ -544,8 +541,7 @@ class RssParser
 	/**
 	 * 	smart append - field and namespace aware
 	 */
-    function append($el, $text)
+    function append($el, $text) {
-    {
         if (!$el) {
             return;
         }

htdocs/core/class/smtps.php

@@ -2120,7 +2120,6 @@ class SMTPs
 
 
     // DOL_CHANGE LDR
-
     /**
     * Method public void setImageInline( string )
     *
@@ -2130,7 +2129,6 @@ class SMTPs
     * @param string $strContent  Image data to attach to message
     * @param string $strImageName Image Name to give to attachment
     * @param string $strMimeType Image Mime Type of attachment
-     * @param 	string $strImageCid		CID
     * @return void
     *
     */
@@ -2518,10 +2516,7 @@ class SMTPs
 // ** CSV Version Control Info
 
 /**
- * $Log: smtps.class.php,v $
+ * $Log: smtps.php,v $
- * Revision 1.1  2011/09/03 00:14:27  eldy
- * Doxygen
- *
  * Revision 1.4  2011/08/28 14:24:23  eldy
  * Doxygen
  *

htdocs/includes/modules/barcode/barcodecoder.modules.php

@@ -12,7 +12,8 @@
  * 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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -36,7 +37,6 @@ class modBarcodeCoder extends ModeleBarCode
 
 	/** 
 	 *  Return if a module can be used or not
-     *
 	 *  @return		boolean     true if module can be used
 	 */
 	function isEnabled()
@@ -47,7 +47,6 @@ class modBarcodeCoder extends ModeleBarCode
 
 	/**
 	 *  Return description
-     *
 	 *  @return     string      Texte descripif
 	 */
 	function info()
@@ -59,8 +58,7 @@ class modBarcodeCoder extends ModeleBarCode
 
 	/**
 	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *  de conflits qui empechera cette numerotation de fonctionner
+	 *  de conflits qui empechera cette numerotation de fonctionner.
-     *
 	 *  @return     boolean     false si conflit, true si ok
 	 */
 	function canBeActivated()
@@ -73,7 +71,6 @@ class modBarcodeCoder extends ModeleBarCode
 
 	/**
 	 *	Return true if encodinf is supported
-     *
 	 *	@return		int		>0 if supported, 0 if not
 	 */
 	function encodingIsSupported($encoding)
@@ -93,7 +90,6 @@ class modBarcodeCoder extends ModeleBarCode
 
     /**
 	 *	Return an image file on the fly (no need to write on disk)
-     *
 	 *	@param   	$code			Value to encode
 	 *	@param   	$encoding		Mode of encoding
 	 *	@param   	$readable		Code can be read
@@ -194,7 +190,6 @@ class modBarcodeCoder extends ModeleBarCode
 
 	/**
 	 *	Save an image file on disk (with no output)
-     *
 	 *	@param   	$code			Value to encode
 	 *	@param   	$encoding		Mode of encoding
 	 *	@param   	$readable		Code can be read

htdocs/install/check.php

@@ -193,7 +193,7 @@ else
 	else
 	{
 		# If failed, we try to create an empty file
-		dolibarr_install_syslog("failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
+		dolibarr_install_syslog("failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.");
 
 		$fp = @fopen($conffile, "w");
 		if ($fp)
@@ -203,7 +203,6 @@ else
 			@fputs($fp,"?>");
 			fclose($fp);
 		}
-		else dolibarr_install_syslog("failed to create a new file ".$conffile." into current dir ".getcwd().". Check permission.", LOG_ERR);
 	}
 
 	// First install, on ne peut pas upgrader

htdocs/lib/CMailFile.class.php

@@ -234,7 +234,7 @@ class CMailFile
 			// Use SMTPS library
 			// ------------------------------------------
 
-			require_once(DOL_DOCUMENT_ROOT."/core/class/smtps.class.php");
+			require_once(DOL_DOCUMENT_ROOT."/core/class/smtps.php");
 			$smtps = new SMTPs();
 			$smtps->setCharSet($conf->file->character_set_client);
 

htdocs/lib/tax.lib.php

@@ -64,7 +64,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
         // If vat paid on due invoices (non draft)
         if ($conf->global->MAIN_MODULE_ACCOUNTING)
         {
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
+            // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
             // n'est pas stocke dans la table des payments.
             // Seul le module compta expert peut resoudre ce probleme.
             // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
@@ -102,7 +102,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
         if ($conf->global->MAIN_MODULE_ACCOUNTING)
         {
             // If vat paid on payments
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
+            // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
             // n'est pas stocke dans la table des payments.
             // Seul le module compta expert peut resoudre ce probleme.
             // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
@@ -215,7 +215,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
     {
         if ($conf->global->MAIN_MODULE_ACCOUNTING)
         {
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
+            // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
             // n'est pas stocke dans la table des payments.
             // Seul le module compta expert peut resoudre ce probleme.
             // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
@@ -261,7 +261,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
     {
         if ($conf->global->MAIN_MODULE_ACCOUNTING)
         {
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
+            // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
             // n'est pas stocke dans la table des payments.
             // Seul le module compta expert peut resoudre ce probleme.
             // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
@@ -376,7 +376,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
         if ($conf->global->MAIN_MODULE_ACCOUNTING)
         {
             // Count on invoice date
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
+            // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
             // n'est pas stocke dans la table des payments.
             // Seul le module compta expert peut resoudre ce probleme.
             // (Il faut quand un payment a lieu, stocker en plus du montant du paiement le
@@ -423,7 +423,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
         if ($conf->global->MAIN_MODULE_ACCOUNTING)
         {
             // Count on payments date
-            // TODO a ce jour on se sait pas la compter car le montant tva d'un payment
+            // \todo a ce jour on se sait pas la compter car le montant tva d'un payment
             // n'est pas stocke dans la table des payments.
             // Seul le module compta expert peut resoudre ce probleme.
             // (Il faut quand un paiement a lieu, stocker en plus du montant du paiement le

htdocs/product/canvas/service/actions_card_service.class.php

@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/product/canvas/service/actions_card_service.class.php
+ *	\file       htdocs/product/canvas/service/product.service.class.php
  *	\ingroup    service
  *	\brief      Fichier de la classe des services par defaut
  */

htdocs/product/class/product.class.php

@@ -2485,7 +2485,7 @@ class Product extends CommonObject
 		if (file_exists($dir_osencoded))
 		{
 			// Cree fichier en taille vignette
-			// TODO A faire
+			// \todo A faire
 
 			// Cree fichier en taille origine
 			$content = @file_get_contents($file);

htdocs/societe/class/companybankaccount.class.php

@@ -17,7 +17,7 @@
  */
 
 /**
- * 		\file		htdocs/societe/class/companybankaccount.class.php
+ * 		\files		htdocs/societe/class/companybankaccount.class.php
  *		\ingroup    societe
  *		\brief      File of class to manage bank accounts description of third parties
  */

htdocs/societe/class/societe.class.php

@@ -1545,16 +1545,14 @@ class Societe extends CommonObject
 
     /**
      *    Return list of contacts emails existing for third party
-     *
-     *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
      *    @return     array       Array of contacts emails
      */
-    function thirdparty_and_contact_email_array($addthirdparty=0)
+    function thirdparty_and_contact_email_array()
     {
         global $langs;
 
         $contact_emails = $this->contact_property_array('email');
-        if ($this->email && $addthirdparty)
+        if ($this->email)
         {
             if (empty($this->name)) $this->name=$this->nom;
             // TODO: Tester si email non deja present dans tableau contact
@@ -1565,7 +1563,6 @@ class Societe extends CommonObject
 
     /**
      *    Return list of contacts mobile phone existing for third party
-     *
      *    @return     array       Array of contacts emails
      */
     function thirdparty_and_contact_phone_array()
@@ -1584,7 +1581,6 @@ class Societe extends CommonObject
 
     /**
      *    Return list of contacts emails or mobile existing for third party
-     *
      *    @param        mode        'email' or 'mobile'
      *    @return       array       Array of contacts emails or mobile
      */
@@ -1595,7 +1591,6 @@ class Societe extends CommonObject
         $sql = "SELECT rowid, email, phone_mobile, name, firstname";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
         $sql.= " WHERE fk_soc = '".$this->id."'";
-
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -1622,9 +1617,8 @@ class Societe extends CommonObject
 
 
     /**
-     *    Renvoie la liste des contacts de cette societe
+     *    \brief      Renvoie la liste des contacts de cette societe
-     *
+     *    \return     array      tableau des contacts
-     *    @return     array      tableau des contacts
      */
     function contact_array()
     {
@@ -1655,7 +1649,6 @@ class Societe extends CommonObject
 
     /**
      *    Return property of contact from its id
-     *
      *    @param      rowid       id of contact
      *    @param      mode        'email' or 'mobile'
      *    @return     string      email of contact
@@ -1691,9 +1684,7 @@ class Societe extends CommonObject
 
 
     /**
-     *    Return bank number property of thirdparty
+     *    \brief      Affiche le rib
-     *
-     *    @return	string		Bank number
      */
     function display_rib()
     {

htdocs/societe/notify/fiche.php

@@ -33,12 +33,8 @@ $langs->load("mails");
 $langs->load("admin");
 $langs->load("other");
 
-$socid = GETPOST("socid",'int');
-$action = GETPOST('action');
-$contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
-$actionid=GETPOST('actionid');
-
 // Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
@@ -52,39 +48,20 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="c.name";
 
-$now=dol_now();
-
 
 /*
- * Actions
+ * Action
  */
 
 // Add a notification
-if ($action == 'add')
+if ($_POST["action"] == 'add')
 {
-    $error=0;
-
-    if (empty($contactid))
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")).'</div>';
-        $error++;
-    }
-    if ($actionid <= 0)
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")).'</div>';
-        $error++;
-    }
-
-    if (! $error)
-    {
-        $db->begin();
-
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-        $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+	$sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$_POST["contactid"]." AND fk_action=".$_POST["actionid"];
 	if ($db->query($sql))
 	{
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-            $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+		$sql .= " VALUES (".$db->idate(mktime()).",".$socid.",".$_POST["contactid"].",".$_POST["actionid"].")";
 
 		if ($db->query($sql))
 		{
@@ -92,7 +69,6 @@ if ($action == 'add')
 		}
 		else
 		{
-                $error++;
 			dol_print_error($db);
 		}
 	}
@@ -100,20 +76,10 @@ if ($action == 'add')
 	{
 		dol_print_error($db);
 	}
-
-        if (! $error)
-        {
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
-        }
-    }
 }
 
 // Remove a notification
-if ($action == 'delete')
+if ($_GET["action"] == 'delete')
 {
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"].";";
 	$db->query($sql);
@@ -129,16 +95,16 @@ $form = new Form($db);
 
 llxHeader();
 
-$object = new Societe($db);
+$soc = new Societe($db);
-$result=$object->fetch($socid);
+$soc->id = $socid;
 
-if ($result > 0)
+if ( $soc->fetch($soc->id) )
 {
 	$html = new Form($db);
 	$langs->load("other");
 
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($soc);
 
 	dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company');
 
@@ -146,38 +112,14 @@ if ($result > 0)
 	print '<table class="border"width="100%">';
 
 	print '<tr><td width="20%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
-    print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
+	print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
 	print '</td></tr>';
 
-    // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
-
-    if ($object->client)
-    {
-        print '<tr><td>';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
-
-    if ($object->fournisseur)
-    {
-        print '<tr><td>';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
-
 	print '<tr><td width="30%">'.$langs->trans("NbOfActiveNotifications").'</td>';
 	print '<td colspan="3">';
 	$sql = "SELECT COUNT(n.rowid) as nb";
 	$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-    $sql.= " WHERE fk_soc = ".$object->id;
+	$sql.= " WHERE fk_soc = ".$soc->id;
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -197,11 +139,11 @@ if ($result > 0)
 	print '</td></tr>';
 	print '</table>';
 
+	print '</div>';
+
+
 	// Help
-    print '<br>'.$langs->trans("NotificationsDesc").'<br>';
+	print $langs->trans("NotificationsDesc").'<br><br>';
-
-
-    dol_fiche_end();
 
 
 	print "\n";
@@ -211,22 +153,19 @@ if ($result > 0)
 
 	print '<form action="fiche.php?socid='.$socid.'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-
-    $param="&socid=".$socid;
 
 	// Line with titles
 	print '<table width="100%" class="noborder">';
 	print '<tr class="liste_titre">';
+	$param="&socid=".$socid;
 	print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'"width="45%"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder);
-    print_liste_field_titre('');
+	print '<td>&nbsp;</td>';
 	print '</tr>';
 
 	$var=false;
-    $listofemails=$object->thirdparty_and_contact_email_array();
+	if (count($soc->thirdparty_and_contact_email_array()) > 0)
-    if (count($listofemails) > 0)
 	{
 	    $actions=array();
 
@@ -239,8 +178,9 @@ if ($result > 0)
             $label=$langs->trans("Notify_".$notifiedevent['code'])!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
             $actions[$notifiedevent['rowid']]=$label;
         }
+		print '<input type="hidden" name="action" value="add">';
 		print '<tr '.$bc[$var].'><td>';
-        print $html->selectarray("contactid",$listofemails);
+		print $html->selectarray("contactid",$soc->thirdparty_and_contact_email_array());
 		print '</td>';
 		print '<td>';
 		print $html->selectarray("actionid",$actions,'',1);
@@ -264,7 +204,6 @@ if ($result > 0)
 	print '</form>';
 	print '<br>';
 
-    dol_htmloutput_mesg($mesg);
 
 	// List of active notifications
 	print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
@@ -288,7 +227,7 @@ if ($result > 0)
 	$sql.= " ".MAIN_DB_PREFIX."socpeople c";
 	$sql.= " WHERE a.rowid = n.fk_action";
 	$sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
+	$sql.= " AND c.fk_soc = ".$soc->id;
 
 	$resql=$db->query($sql);
 	if ($resql)
@@ -351,9 +290,9 @@ if ($result > 0)
 	// Line with titles
 	print '<table width="100%" class="noborder">';
 	print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name",'',"&socid=$socid",'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',"&socid=$socid",'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Date"),"fiche.php","a.daten",'',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Date"),"fiche.php","a.titre",'',"&socid=$socid",'align="right"',$sortfield,$sortorder);
 	print '</tr>';
 
 	// List
@@ -365,7 +304,7 @@ if ($result > 0)
     $sql.= " ".MAIN_DB_PREFIX."socpeople as c";
     $sql.= " WHERE a.rowid = n.fk_action";
     $sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
+    $sql.= " AND c.fk_soc = ".$soc->id;
 
 	$resql=$db->query($sql);
 	if ($resql)
@@ -406,7 +345,6 @@ if ($result > 0)
 
 	print '</table>';
 }
-else dol_print_error('','RecordNotFound');
 
 $db->close();
 

htdocs/theme/phones/smartphone/theme/default/default.css.php

@@ -127,8 +127,8 @@ input.ui-input-text, textarea.ui-input-text {
 /* ============================================================================== */
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone)?'10':'2'); ?>px;
+	margin-<?php print $left; ?>: <?php print empty($conf->browser->phone)?'10':'2'; ?>px;
-	margin-<?php print $right; ?>: <?php print (empty($conf->browser->phone)?'6':''); ?>px;
+	margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'6':''; ?>px;
 }
 
 div.fichecenter {