| '.$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/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/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/members/new.php b/htdocs/public/members/new.php
index d461137eaf6..f4d349046b0 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
* \file htdocs/public/members/new.php
* \ingroup member
* \brief Example of form to add a new member
- * \version $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
+ * \version $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
*
* Note that you can add following constant to change behaviour of page
* MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form
@@ -184,7 +184,7 @@ if ($action == 'add')
}
if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
{
- if (GETPOST('budget') <= 0)
+ if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
{
$error+=1;
$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."
\n";
@@ -289,7 +289,7 @@ if ($action == 'added')
print $langs->trans("NewMemberbyWeb");
print '';
- llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+ llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
exit;
}
@@ -537,5 +537,5 @@ print "
\n";
$db->close();
-llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index e27a2493369..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.58 2011/07/13 11:42:39 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.
@@ -188,11 +188,12 @@ if ($urllogo)
// Output introduction text
$text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
{
$langs->load("members");
- if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n";
- else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."
\n";
+ 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 11:42:39 $ - $Revision: 1.58 $');
+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 30001659341..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.23 2011/07/13 11:42:39 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.
@@ -282,11 +282,11 @@ if ($urllogo)
// Output introduction text
$text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
{
$langs->load("members");
- if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n";
- else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."
\n";
+ if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."
\n";
+ else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."
\n";
}
if (empty($text))
{
@@ -946,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
$db->close();
-llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
+llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
?>
|