| '.$langs->trans('Country').' | ';
$html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
$db->close();
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
?>
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 3e03924e697..935d02f67b4 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,3 +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.
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 95531c67c0e..4712ca76959 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,3 +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.
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 fdec201c31d..d87a7ed1051 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.57 2011/07/13 11:14:43 eldy Exp $
+ * \version $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@@ -188,7 +188,12 @@ if ($urllogo)
// Output introduction text
$text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."
\n";
+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";
+}
if (empty($text))
{
$text.=' |