Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into d…

…evelop
Dolibarr · Feb 22, 2013 · 04e1be4 · 04e1be4
2 parents 87dc3a0 + 7d0f02e
commit 04e1be4
Show file tree

Hide file tree

Showing 32 changed files with 353 additions and 465 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -16,6 +16,7 @@ For users:
 - New: total per vat rate are available as tags for ODT templates.
 - New: Add more types for extra parameters (lists, phone, emails, checkbox, prices)
 - New: Some part of interface use more CSS3 (ie: agenda)
+- New: [ task #707 ] Create option ProfIdx are mandatory to validate a invoice
 
 For developers:
 - System of menu managers has been rewritten to reduce code to do same things. 
@@ -24,7 +25,7 @@ For developers:
 - A mymodule can bring its own core/modules/mymodule/modules_mymodule.php file.
 - Removed not used libraries.
 - More web services. 
-- Renamed some french fields into english.
+- Renamed some database fields, code variables and parameters from french to english.
 - First change to manage margins on contracts.
 - Add hook getFormMail.
 

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
@@ -320,7 +320,7 @@
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootsrap*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;

diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
@@ -62,7 +62,7 @@
 
     // requete en prenant que les adherents a jour de cotisation
     $sql = "SELECT d.rowid, d.prenom as firstname, d.nom as lastname, d.login, d.societe as company, d.datefin,";
-    $sql.= " d.adresse as address, d.cp as zip, d.ville as town, d.naiss, d.email, d.photo,";
+    $sql.= " d.address, d.cp as zip, d.ville as town, d.naiss, d.email, d.photo,";
     $sql.= " t.libelle as type,";
     $sql.= " p.code as country_code, p.libelle as country";
     $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
@@ -112,7 +112,7 @@
             '%PRENOM%'=>$objp->firstname,
             '%NOM%'=>$objp->lastname,
             '%SOCIETE%'=>$objp->company,
-            '%ADRESSE%'=>$objp->address,
+            '%ADDRESS%'=>$objp->address,
             '%CP%'=>$objp->zip,
             '%VILLE%'=>$objp->town,
             '%PAYS%'=>$objp->country,

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
@@ -51,7 +51,6 @@ class Adherent extends CommonObject
     var $login;
     var $pass;
     var $societe;
-    //var $adresse;
     var $address;
     var $cp;
     var $zip;
@@ -233,7 +232,7 @@ function makeSubstitution($text)
 				'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
 				'%NOM%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
 				'%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
-				'%ADRESSE%'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
+				'%ADDRESS%'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
 				'%CP%'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
 				'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
 				'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
@@ -404,7 +403,7 @@ function update($user,$notrigger=0,$nosyncuser=0,$nosyncuserpass=0,$nosyncthirdp
         // Clean parameters
 		$this->lastname=trim($this->lastname)?trim($this->lastname):trim($this->nom);
 		$this->firstname=trim($this->firstname)?trim($this->firstname):trim($this->prenom);
-		$this->address=($this->address?$this->address:$this->adresse);
+		$this->address=($this->address?$this->address:$this->address);
 		$this->zip=($this->zip?$this->zip:$this->cp);
 		$this->town=($this->town?$this->town:$this->ville);
 		$this->country_id=($this->country_id > 0?$this->country_id:$this->fk_pays);
@@ -1065,7 +1064,6 @@ function fetch($rowid,$ref='',$fk_soc='')
                 $this->pass				= $obj->pass;
                 $this->societe			= $obj->societe;
                 $this->fk_soc			= $obj->fk_soc;
-                //$this->adresse			= $obj->address;	// deprecated
                 $this->address			= $obj->address;
                 $this->cp				= $obj->zip;		// deprecated
                 $this->zip				= $obj->zip;
@@ -1201,7 +1199,7 @@ function fetch_subscriptions()
      *	Insert subscription into database and eventually add links to banks, mailman, etc...
      *
      *	@param	timestamp	$date        		Date d'effet de la cotisation
-     *	@param	amount		$montant     		Montant cotisation (accepte 0 pour les adherents non soumis e cotisation)
+     *	@param	amount		$montant     		Montant cotisation (accepte 0 pour les adherents non soumis a cotisation)
      *	@param	int			$accountid			Id compte bancaire
      *	@param	string		$operation			Type operation (si Id compte bancaire fourni)
      *	@param	string		$label				Label operation (si Id compte bancaire fourni)
@@ -1386,7 +1384,7 @@ function resiliate($user)
 
 
     /**
-     *  Fonction qui ajoute l'adherent au abonnements automatiques mailing-list, spip, etc.
+     *  Fonction qui ajoute l'adherent aux abonnements automatiques mailing-list, spip, etc.
      *  TODO Move this into member creation trigger (trigger of mailmanspip module)
      *
      *  @return		int		<0 if KO, >0 if OK
@@ -1479,7 +1477,7 @@ function del_to_abo()
 
 
     /**
-     *    Return label of a civility of a contact
+     *    Return civility label of a contact
      *
      *    @param	int		$nohtmlentities     0=Encode with htmlentities for HTML output, 1=No htmlentities for memory translation
      *    @return   string              		Name translated of civility

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2013 Philippe Grand       <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,9 +98,9 @@
 	}
 }
 
-// Define variables to know what current user can do on members
+// Define variables to determine what the current user can do on the members
 $canaddmember=$user->rights->adherent->creer;
-// Define variables to know what current user can do on properties of a member
+// Define variables to determine what the current user can do on the properties of a member
 if ($rowid)
 {
 	$caneditfieldmember=$user->rights->adherent->creer;
@@ -259,7 +259,6 @@
 		$object->pass        = trim($_POST["pass"]);
 
 		$object->societe     = trim($_POST["societe"]);
-		//$object->adresse     = trim($_POST["address"]);    // deprecated
 		$object->address     = trim($_POST["address"]);
 		$object->cp          = trim($_POST["zipcode"]);    // deprecated
 		$object->zip         = trim($_POST["zipcode"]);
@@ -440,7 +439,6 @@
 	$object->firstname   = $prenom;
 	$object->lastname    = $nom;
 	$object->societe     = $societe;
-	//$object->adresse     = $address; // deprecated
 	$object->address     = $address;
 	$object->cp          = $zip;     // deprecated
 	$object->zip         = $zip;