From 01ab27d68b7618052b06f7004400c5ee113041f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:56:36 +0000
Subject: [PATCH] Fix: Message for payment forms

---
 htdocs/public/members/new.php       |  8 ++++----
 htdocs/public/paybox/newpayment.php | 10 +++++-----
 htdocs/public/paypal/newpayment.php | 11 ++++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

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"))."<br>\n";
@@ -289,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    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 "<br></form>\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..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.58 2011/07/13 11:42:39 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,11 +188,11 @@ 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])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
 }
 if (empty($text))
 {
@@ -728,5 +728,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:00:18 $ - $Revision: 1.59 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 30001659341..4b96c8075ea 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.25 2011/07/13 12:03:29 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,11 +282,12 @@ 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])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -946,5 +947,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:03:29 $ - $Revision: 1.25 $');
 ?>