diff --git a/ChangeLog b/ChangeLog
index 2808c594086..81aa3c6c02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
--------------------------------------------------------------
English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
--------------------------------------------------------------
***** ChangeLog for 3.1 compared to 3.0 *****
-WARNING: IE6 browser is no more supported in this version.
For users:
- New: War against number of clicks:
- When adding a free bank transaction, form to add next one is still
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 29544b85be1..54c28b04389 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/admin/system/dolibarr.php
* \brief Page to show Dolibarr informations
- * \version $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
+ * \version $Id$
*/
require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
print '| '.$langs->trans("CurrentTimeZone").' | '; // Timezone server PHP
$a=date_default_timezone_get();
$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
- print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+ print $form->textwithtooltip($a,$txt,2,1,img_info());
print ' |
'."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
}
else
@@ -171,7 +171,7 @@ else
$var=!$var;
print '| '.$langs->trans("PHPServerOffsetWithGreenwich").' | ';
$a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
- print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+ print $form->textwithtooltip($a,$txt,2,1,img_info());
print ' |
'."\n";
}
$var=!$var;
@@ -213,5 +213,5 @@ print '=> '.$langs->trans("File encoding").'';
print '
';
-llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
+llxFooter('$Date$ - $Revision$');
?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 4020909186d..f265d751e83 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2004-2010 Laurent Destailleur
*
* 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
@@ -20,7 +20,7 @@
* \file htdocs/compta/paiement_charge.php
* \ingroup tax
* \brief Page to add payment of a tax
- * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
+ * \version $Id$
*/
require('../main.inc.php');
@@ -42,9 +42,8 @@ if ($user->societe_id > 0)
/*
- * Actions
+ * Actions add payment
*/
-
if ($_POST["action"] == 'add_payment')
{
$error=0;
@@ -146,7 +145,7 @@ if ($_POST["action"] == 'add_payment')
/*
- * View
+ * Affichage
*/
llxHeader();
@@ -154,7 +153,9 @@ llxHeader();
$html=new Form($db);
-// Formulaire de creation d'un paiement de charge
+/*
+ * Formulaire de creation d'un paiement de charge
+ */
if ($_GET["action"] == 'create')
{
@@ -222,7 +223,7 @@ if ($_GET["action"] == 'create')
print '';
print '| '.$langs->trans('AccountToDebit').' | ';
print '';
- $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list
+ $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1); // Affiche liste des comptes courant
print ' | ';
print '| '.$langs->trans('Numero');
@@ -334,5 +335,5 @@ if ($_GET["action"] == 'create')
$db->close();
-llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
+llxFooter('$Date$ - $Revision$');
?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c7dbb3a456..7e97abed808 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
* \file htdocs/core/class/html.form.class.php
* \ingroup core
* \brief File of class with all html predefined components
- * \version $Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
+ * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
*/
@@ -1771,14 +1771,12 @@ class Form
}
/**
- * Return combo list of differents status of a proposal
- * Values are id of table c_propalst
- * @param selected etat pre-selectionne
+ * \brief Retourne la liste deroulante des differents etats d'une propal.
+ * Les valeurs de la liste sont les id de la table c_propalst
+ * \param selected etat pre-selectionne
*/
function select_propal_statut($selected='')
{
- global $langs;
-
$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
$sql .= " WHERE active = 1";
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 5d753e8e01d..61f8131f847 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2011 Laurent Destailleur
+ * Copyright (C) 2004-2010 Laurent Destailleur
* Copyright (C) 2005-2009 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
* \file htdocs/fourn/facture/index.php
* \ingroup fournisseur,facture
* \brief List of suppliers invoices
- * \version $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
+ * \version $Id$
*/
require("../../main.inc.php");
@@ -35,7 +35,6 @@ if (!$user->rights->fournisseur->facture->lire)
accessforbidden();
$langs->load("companies");
-$langs->load("bills");
$socid = $_GET["socid"];
@@ -293,5 +292,5 @@ else
$db->close();
-llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
+llxFooter('$Date$ - $Revision$');
?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index f58d2118dcc..ad281e7f23a 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
* \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php
* \ingroup ficheinter
* \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- * \version $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
+ * \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
$result=$fichinter->fetch($id);
if ($result < 0)
{
- dol_print_error($this->db,$fichinter->error);
+ dol_print_error($db,$fichinter->error);
}
}
| |