| '.$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$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7e97abed808..5c7dbb3a456 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.188 2011/07/10 17:28:09 hregis Exp $
+ * \version $Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
*/
@@ -1771,12 +1771,14 @@ class Form
}
/**
- * \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
+ * Return combo list of differents status of a proposal
+ * Values are id of 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 61f8131f847..5d753e8e01d 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2010 Laurent Destailleur
+ * Copyright (C) 2004-2011 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$
+ * \version $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
*/
require("../../main.inc.php");
@@ -35,6 +35,7 @@ if (!$user->rights->fournisseur->facture->lire)
accessforbidden();
$langs->load("companies");
+$langs->load("bills");
$socid = $_GET["socid"];
@@ -292,5 +293,5 @@ else
$db->close();
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index ad281e7f23a..f58d2118dcc 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$
+ * \version $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
*/
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($db,$fichinter->error);
+ dol_print_error($this->db,$fichinter->error);
}
}
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 935d02f67b4..9a38ecb5f11 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
Collectivités=Organizations
Particuliers=Personal
Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4712ca76959..6d55546256d 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
Collectivités=Collectivités
Particuliers=Particuliers
Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page http://wiki.dolibarr.org/index.php/Adhérer.
Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page http://wiki.dolibarr.org/index.php/Adhérer.
Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index d87a7ed1051..9d405438673 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
* \ingroup paybox
* \brief File to offer a way to make a payment for a particular Dolibarr entity
* \author Laurent Destailleur
- * \version $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
+ * \version $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@@ -193,6 +193,7 @@ if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
$langs->load("members");
if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n";
else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."
\n";
+ $text='
'.$text.'
| '."\n";
}
if (empty($text))
{
@@ -728,5 +729,5 @@ html_print_paybox_footer($mysoc,$langs);
$db->close();
-llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $');
+llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 4b96c8075ea..5215b3f9924 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
* \ingroup paypal
* \brief File to offer a way to make a payment for a particular Dolibarr entity
* \author Laurent Destailleur
- * \version $Id: newpayment.php,v 1.25 2011/07/13 12:03:29 eldy Exp $
+ * \version $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@@ -287,7 +287,6 @@ if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
$langs->load("members");
if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n";
else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."
\n";
- $text='
'.$text.'
| '."\n";
}
if (empty($text))
{
@@ -947,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
$db->close();
-llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $');
+llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
?>
|