New: Enhance form to post a new member

Dolibarr · Jun 26, 2011 · 4d65503 · 4d65503
1 parent 2bd29e2
commit 4d65503
Show file tree

Hide file tree

Showing 5 changed files with 348 additions and 203 deletions.
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
@@ -28,7 +28,7 @@
  *	\file       htdocs/filefunc.inc.php
  * 	\ingroup	core
  *  \brief      File that include conf.php file and functions.lib.php
- *  \version    $Id$
+ *  \version    $Id: filefunc.inc.php,v 1.16 2011/06/26 18:53:16 eldy Exp $
  */
 
 define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -125,9 +125,9 @@
 $pathroot=$_SERVER["DOCUMENT_ROOT"];
 $paths=explode('/',str_replace('\\','/',$_SERVER["SCRIPT_NAME"]));
 $concatpath='';
-foreach($paths as $path)
+foreach($paths as $tmppath)
 {
-    if ($path) $concatpath.='/'.$path;
+    if ($tmppath) $concatpath.='/'.$tmppath;
     //print $real_$dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
     if ($real_dolibarr_main_document_root == realpath($pathroot.$concatpath))
     {

diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
@@ -76,6 +76,7 @@ EditMember=Edit member
 SubscriptionEndDate=Subscription's end date
 MembersTypeSetup=Members type setup
 NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription being already a member, please contact foundation board instead. 
 Subscription=Subscription
 Subscriptions=Subscriptions
 SubscriptionLate=Late
@@ -182,3 +183,4 @@ NewMemberForm=New member form
 SubscriptionsStatistics=Statistics on subscriptions
 NbOfSubscriptions=Number of subscriptions
 AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
@@ -77,6 +77,7 @@ EditMember=Édition adhérent
 SubscriptionEndDate=Date de fin adhésion
 MembersTypeSetup=Configuration des types d'adhérents
 NewSubscription=Nouvelle adhésion
+NewSubscriptionDesc=Ce formulaire permet de vous enregistrer comme nouvel adhérent de l'association. Pour un renouvellement si vous êtes déjà adhérent, contacter plutôt l'association.
 Subscription=Adhésion/cotisation
 Subscriptions=Adhésions/cotisations
 SubscriptionLate=En retard
@@ -182,4 +183,5 @@ NewMemberbyWeb=Nouvel Adherent ajoute. En attente de validation
 NewMemberForm=Nouvel Adherent form
 SubscriptionsStatistics=Statistiques sur les cotisations
 NbOfSubscriptions=Nombre de cotisations
-AmountOfSubscriptions=Montant de cotisations
+AmountOfSubscriptions=Montant de cotisations
+TurnoverOrBudget=Chiffre affaire (pour société) ou Budget (asso ou collectivité)
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
@@ -24,7 +24,7 @@
  *	\file       htdocs/lib/company.lib.php
  *	\brief      Ensemble de fonctions de base pour le module societe
  *	\ingroup    societe
- *	\version    $Id$
+ *	\version    $Id: company.lib.php,v 1.119 2011/06/26 18:53:16 eldy Exp $
  */
 
 /**
@@ -208,7 +208,7 @@ function societe_admin_prepare_head($object)
 
 
 /**
- *    Return country translated from an id or a code
+ *    Return country label, code or id from an id or a code
  *    @param      id            Id or code of country
  *    @param      withcode      0=Return label, 1=Return code + label, 2=Return code from id
  *    @param      dbtouse       Database handler (using in global way may fail because of conflicts with some autoload features)