From 3e42ad7cf5c0a72004db92fcdd0474f19e7f6357 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 10:22:54 +0000
Subject: [PATCH] Fix: Only one message

---
 htdocs/includes/menus/init_menu_auguria.sql |  4 +--
 htdocs/includes/menus/standard/eldy.lib.php |  2 +-
 htdocs/public/members/new.php               | 31 ++++++++-------------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index fc98e29aa63..f9b90c48d5f 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
--- $Revision: 1.121 $
+-- $Id: init_menu_auguria.sql,v 1.119 2011/07/03 16:00:20 eldy Exp $
+-- $Revision: 1.119 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 062f1f002a6..7c50b92df5a 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
  */
 
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index d461137eaf6..035e8848da4 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.40 2011/07/13 10:22:54 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -182,18 +182,13 @@ if ($action == 'add')
         $langs->load("errors");
         $errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
     }
-    if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
+    if (isset($public))
     {
-        if (GETPOST('budget') <= 0)
-        {
-            $error+=1;
-            $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
-        }
+        $public=1;
+    }else{
+        $public=0;
     }
 
-    if (isset($public)) $public=1;
-    else $public=0;
-
     if (! $error)
     {
         // email a peu pres correct et le login n'existe pas
@@ -237,24 +232,20 @@ if ($action == 'add')
             }
 
             if ($backtopage) $urlback=$backtopage;
-            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)
-            {
-                $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
-                // TODO Make replacement of __AMOUNT__, etc...
-            }
+            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
             else $urlback=$_SERVER["PHP_SELF"]."?action=added";
 
             if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE))
             {
                 if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
                 else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
@@ -289,7 +280,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 10:22:54 $ - $Revision: 1.40 $');
     exit;
 }
 
@@ -459,7 +450,7 @@ print '</tr>'."\n";
 if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
 {
     $arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+');
-    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
+    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").'</td><td>';
     print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1);
     print ' € or $';
 
@@ -537,5 +528,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
 ?>