Fix: Can edit state in foundation members cards

htdocs/adherents/class/adherent.class.php

@@ -57,6 +57,11 @@ class Adherent extends CommonObject
 	var $adresse;
 	var $cp;
 	var $ville;
+
+	var $fk_departement;		// Id of department
+	var $departement_code;		// Code of department
+	var $departement;			// Label of department
+
 	var $pays_id;
 	var $pays_code;
 	var $pays;
@@ -401,7 +406,8 @@ class Adherent extends CommonObject
 		$sql.= ", adresse=" .($this->adresse?"'".addslashes($this->adresse)."'":"null");
 		$sql.= ", cp="      .($this->cp?"'".addslashes($this->cp)."'":"null");
 		$sql.= ", ville="   .($this->ville?"'".addslashes($this->ville)."'":"null");
-		$sql.= ", pays="    ."'".$this->pays_id."'";
+		$sql.= ", pays="          .($this->pays_id>0?"'".$this->pays_id."'":"null");
+		$sql.= ", fk_departement=".($this->fk_departement>0?"'".$this->fk_departement."'":"null");
 		$sql.= ", email="   ."'".$this->email."'";
 		$sql.= ", phone="   .($this->phone?"'".addslashes($this->phone)."'":"null");
 		$sql.= ", phone_perso="  .($this->phone_perso?"'".addslashes($this->phone_perso)."'":"null");
@@ -939,11 +945,14 @@ class Adherent extends CommonObject
 		$sql.= " d.naiss as datenaiss,";
 		$sql.= " d.datevalid as datev,";
 		$sql.= " d.pays,";
+		$sql.= " d.fk_departement,";
 		$sql.= " p.rowid as pays_id, p.code as pays_code, p.libelle as pays_lib,";
+		$sql.= " dep.nom as departement, dep.code_departement as departement_code,";
 		$sql.= " t.libelle as type, t.cotisation as cotisation,";
 		$sql.= " u.rowid as user_id, u.login as user_login";
 		$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON d.pays = p.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.fk_departement = dep.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
 		$sql.= " WHERE d.fk_adherent_type = t.rowid";
 		$sql.= " AND d.entity = ".$conf->entity;
@@ -972,11 +981,17 @@ class Adherent extends CommonObject
 				$this->adresse        = $obj->adresse;
 				$this->cp             = $obj->cp;
 				$this->ville          = $obj->ville;
+
+				$this->fk_departement = $obj->fk_departement;
+				$this->departement_code = $obj->fk_departement?$obj->departement_code:'';
+				$this->departement	  = $obj->fk_departement?$obj->departement:'';
+
 				$this->pays_id        = $obj->pays_id;
 				$this->pays_code      = $obj->pays_code;
 				if ($langs->trans("Country".$obj->pays_code) != "Country".$obj->pays_code) $this->pays = $langs->trans("Country".$obj->pays_code);
 				elseif ($obj->pays_lib) $this->pays=$obj->pays_lib;
 				else $this->pays=$obj->pays;
+
 				$this->phone          = $obj->phone;
 				$this->phone_perso    = $obj->phone_perso;
 				$this->phone_mobile   = $obj->phone_mobile;

htdocs/adherents/fiche.php

@@ -239,7 +239,9 @@ if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adhe
 		$adh->adresse     = trim($_POST["adresse"]);
 		$adh->cp          = trim($_POST["cp"]);
 		$adh->ville       = trim($_POST["ville"]);
-		$adh->pays_id     = $_POST["pays"];
+
+		$adh->fk_departement = $_POST["departement_id"];
+		$adh->pays_id        = $_POST["pays"];
 
 		$adh->phone       = trim($_POST["phone"]);
 		$adh->phone_perso = trim($_POST["phone_perso"]);
@@ -357,6 +359,7 @@ if ($_POST["action"] == 'add' && $user->rights->adherent->creer)
     $adresse=$_POST["adresse"];
     $cp=$_POST["cp"];
     $ville=$_POST["ville"];
+	$departement_id=$_POST["departement_id"];
     $pays_id=$_POST["pays_id"];
 
     $phone=$_POST["phone"];
@@ -381,6 +384,7 @@ if ($_POST["action"] == 'add' && $user->rights->adherent->creer)
     $adh->adresse     = $adresse;
     $adh->cp          = $cp;
     $adh->ville       = $ville;
+	$adh->fk_departement = $departement_id;
     $adh->pays_id     = $pays_id;
     $adh->phone       = $phone;
     $adh->phone_perso = $phone_perso;
@@ -660,6 +664,8 @@ $htmlcompany = new FormCompany($db);
 // fetch optionals attributes and labels
 $adho->fetch_name_optionals_label();
 
+$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+
 
 if ($action == 'edit')
 {
@@ -682,9 +688,24 @@ if ($action == 'edit')
     $adht->fetch($adh->typeid);
 
 
-	/*
+	// We set pays_id, and pays_code label of the chosen country
-	 * Affichage onglets
+	if ($adh->pays_id)
-	 */
+	{
+		$sql = "SELECT code, libelle from ".MAIN_DB_PREFIX."c_pays where rowid = ".(isset($_POST["pays"])?$_POST["pays"]:$adh->pays_id);
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+		$adh->pays_code=$obj->code;
+		$adh->pays=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
+	}
+
+
 	$head = member_prepare_head($adh);
 
 	dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
@@ -696,11 +717,11 @@ if ($action == 'edit')
 	if ($mesg) print '<div class="ok">'.$mesg.'</div>';
 
 
-	$rowspan=15;
+	$rowspan=17;
 	$rowspan+=sizeof($adho->attribute_label);
 	if ($conf->societe->enabled) $rowspan++;
 
-	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
+	print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"update\">";
 	print "<input type=\"hidden\" name=\"rowid\" value=\"$rowid\">";
@@ -715,20 +736,20 @@ if ($action == 'edit')
 	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Morale");
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Person").'</span></td><td colspan="2">';
-	$html->select_array("morphy",  $morphys, $adh->morphy);
+	$html->select_array("morphy",  $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$adh->morphy);
 	print "</td></tr>";
 
 	// Societe
-	print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2"><input type="text" name="societe" size="40" value="'.$adh->societe.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2"><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?$_POST["societe"]:$adh->societe).'"></td></tr>';
 
 	// Civilite
 	print '<tr><td width="20%">'.$langs->trans("UserTitle").'</td><td width="35%">';
-	print $htmlcompany->select_civilite($adh->civilite_id);
+	print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$adh->civilite_id)."\n";
 	print '</td>';
 
 	// Photo
     print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
-	print $html->showphoto('memberphoto',$adh);
+	print $html->showphoto('memberphoto',$adh)."\n";
     if ($caneditfieldmember)
     {
         print '<br><br><table class="nobordernopadding"><tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
@@ -740,24 +761,24 @@ if ($action == 'edit')
 	print '</tr>';
 
 	// Nom
-	print '<tr><td><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td><td><input type="text" name="nom" size="40" value="'.$adh->nom.'"></td>';
+	print '<tr><td><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td><td><input type="text" name="nom" size="40" value="'.(isset($_POST["nom"])?$_POST["nom"]:$adh->nom).'"></td>';
 	print '</tr>';
 
 	// Prenom
-	print '<tr><td width="20%"><span class="fieldrequired">'.$langs->trans("Firstname").'</span></td><td><input type="text" name="prenom" size="40" value="'.$adh->prenom.'"></td>';
+	print '<tr><td width="20%"><span class="fieldrequired">'.$langs->trans("Firstname").'</span></td><td><input type="text" name="prenom" size="40" value="'.(isset($_POST["prenom"])?$_POST["prenom"]:$adh->prenom).'"></td>';
 	print '</tr>';
 
 	// Login
-	print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td><td><input type="text" name="login" size="30" value="'.$adh->login.'"></td></tr>';
+	print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td><td><input type="text" name="login" size="30" value="'.(isset($_POST["login"])?$_POST["login"]:$adh->login).'"></td></tr>';
 
 	// Password
-	print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td><input type="password" name="pass" size="30" value="'.$adh->pass.'"></td></tr>';
+	print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td><input type="password" name="pass" size="30" value="'.(isset($_POST["pass"])?$_POST["pass"]:$adh->pass).'"></td></tr>';
 
 	// Type
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Type").'</span></td><td>';
 	if ($user->rights->adherent->creer)
 	{
-		$html->select_array("typeid",  $adht->liste_array(), $adh->typeid);
+		$html->select_array("typeid",  $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$adh->typeid));
 	}
 	else
 	{
@@ -768,36 +789,42 @@ if ($action == 'edit')
 
 	// Address
 	print '<tr><td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="adresse" wrap="soft" cols="40" rows="2">'.$adh->adresse.'</textarea></td></tr>';
+	print '<textarea name="adresse" wrap="soft" cols="40" rows="2">'.(isset($_POST["adresse"])?$_POST["adresse"]:$adh->adresse).'</textarea></td></tr>';
 
-	// Cp
+	// Zip / Town
-	print '<tr><td>'.$langs->trans("Zip").'/'.$langs->trans("Town").'</td><td><input type="text" name="cp" size="6" value="'.$adh->cp.'"> <input type="text" name="ville" size="32" value="'.$adh->ville.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Zip").'/'.$langs->trans("Town").'</td><td><input type="text" name="cp" size="6" value="'.(isset($_POST["cp"])?$_POST["cp"]:$adh->cp).'"> <input type="text" name="ville" size="32" value="'.(isset($_POST["ville"])?$_POST["ville"]:$adh->ville).'"></td></tr>';
 
 	// Country
 	print '<tr><td>'.$langs->trans("Country").'</td><td>';
-	$html->select_pays($adh->pays_code?$adh->pays_code:$mysoc->pays_code,'pays');
+	$html->select_pays(isset($_POST["pays"])?$_POST["pays"]:$adh->pays_id,'pays',$conf->use_javascript_ajax?' onChange="company_save_refresh_edit()"':'');
+	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+	print '</td></tr>';
+
+	// Department
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	$htmlcompany->select_departement($adh->fk_departement,$adh->pays_code);
 	print '</td></tr>';
 
 	// Tel
-	print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.$adh->phone.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?$_POST["phone"]:$adh->phone).'"></td></tr>';
 
 	// Tel perso
-	print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.$adh->phone_perso.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$adh->phone_perso).'"></td></tr>';
 
 	// Tel mobile
-	print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.$adh->phone_mobile.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$adh->phone_mobile).'"></td></tr>';
 
 	// EMail
-	print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.$adh->email.'"></td></tr>';
+	print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?$_POST["email"]:$adh->email).'"></td></tr>';
 
 	// Date naissance
     print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-    $html->select_date(($adh->naiss ? $adh->naiss : -1),'naiss','','',1,'update');
+    $html->select_date(($adh->naiss ? $adh->naiss : -1),'naiss','','',1,'formsoc');
     print "</td></tr>\n";
 
 	// Profil public
     print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-    print $html->selectyesno("public",$adh->public,1);
+    print $html->selectyesno("public",(isset($_POST["public"])?$_POST["public"]:$adh->public),1);
     print "</td></tr>\n";
 
 	// Attributs supplementaires
@@ -833,7 +860,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	print '<tr><td colspan="3" align="center">';
-	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; &nbsp; ';
 	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</td></tr>';
@@ -852,6 +879,27 @@ if ($action == 'create')
 	/* Fiche creation                                                             */
 	/*                                                                            */
 	/* ************************************************************************** */
+	$adh->fk_departement = $_POST["departement_id"];
+
+	// We set pays_id, pays_code and label for the selected country
+	$adh->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$conf->global->MAIN_INFO_SOCIETE_PAYS;
+	if ($adh->pays_id)
+	{
+		$sql = "SELECT code, libelle";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+		$sql.= " WHERE rowid = ".$adh->pays_id;
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+		$adh->pays_code=$obj->code;
+		$adh->pays=$obj->libelle;
+	}
 
     $adht = new AdherentType($db);
 
@@ -863,7 +911,7 @@ if ($action == 'create')
 	}
 	if ($mesg) print '<div class="ok">'.$mesg.'</div>';
 
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
+	print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
 
@@ -873,27 +921,27 @@ if ($action == 'create')
     $morphys["phy"] = "Physique";
     $morphys["mor"] = "Morale";
     print '<tr><td><span class="fieldrequired">'.$langs->trans("Person")."</span></td><td>\n";
-    $html->select_array("morphy", $morphys, $adh->morphy, 1);
+    $html->select_array("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$adh->morphy, 1);
     print "</td>\n";
 
     // Company
-    print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$adh->societe.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?$_POST["societe"]:$adh->societe).'"></td></tr>';
 
     // Civility
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-    print $htmlcompany->select_civilite($adh->civilite_id,'civilite_id').'</td>';
+    print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$adh->civilite_id,'civilite_id').'</td>';
     print '</tr>';
 
     // Nom
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td><td><input type="text" name="nom" value="'.$adh->nom.'" size="40"></td>';
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td><td><input type="text" name="nom" value="'.(isset($_POST["nom"])?$_POST["nom"]:$adh->nom).'" size="40"></td>';
     print '</tr>';
 
 	// Prenom
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Firstname").'</span></td><td><input type="text" name="prenom" size="40" value="'.$adh->prenom.'"></td>';
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Firstname").'</span></td><td><input type="text" name="prenom" size="40" value="'.(isset($_POST["prenom"])?$_POST["prenom"]:$adh->prenom).'"></td>';
     print '</tr>';
 
 	// Login
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td><td><input type="text" name="member_login" size="40" value="'.$adh->login.'"></td></tr>';
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td><td><input type="text" name="member_login" size="40" value="'.(isset($_POST["member_login"])?$_POST["member_login"]:$adh->login).'"></td></tr>';
 
 	// Mot de passe
 	$generated_password='';
@@ -915,7 +963,7 @@ if ($action == 'create')
     $listetype=$adht->liste_array();
     if (sizeof($listetype))
     {
-        $html->select_array("typeid", $listetype, $typeid, 1);
+        $html->select_array("typeid", $listetype, isset($_POST["typeid"])?$_POST["typeid"]:$typeid, 1);
     } else {
         print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
     }
@@ -923,31 +971,45 @@ if ($action == 'create')
 
     // Address
     print '<tr><td valign="top">'.$langs->trans("Address").'</td><td>';
-    print '<textarea name="adresse" wrap="soft" cols="40" rows="2">'.$adh->adresse.'</textarea></td></tr>';
+    print '<textarea name="adresse" wrap="soft" cols="40" rows="2">'.(isset($_POST["adresse"])?$_POST["adresse"]:$adh->adresse).'</textarea></td></tr>';
 
     // CP / Ville
-    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="32" value="'.$adh->ville.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8" value="'.(isset($_POST["cp"])?$_POST["cp"]:$adh->cp).'"> <input type="text" name="ville" size="32" value="'.(isset($_POST["ville"])?$_POST["ville"]:$adh->ville).'"></td></tr>';
 
-	// Pays
+	// Country
-    print '<tr><td>'.$langs->trans("Country").'</td><td>';
+	$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
-    $html->select_pays($adh->pays_id ? $adh->pays_id : $mysoc->pays_id,'pays_id');
+	print '<tr><td>'.$langs->trans("Country").'</td><td>';
-    print '</td></tr>';
+	$html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_create()"':'');
+	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+	print '</td></tr>';
+
+	// State
+	print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+	if ($adh->pays_id)
+	{
+		$htmlcompany->select_departement(isset($_POST["departement_id"])?$_POST["departement_id"]:$adh->fk_departement,$adh->pays_code);
+	}
+	else
+	{
+		print $countrynotdefined;
+	}
+	print '</td></tr>';
 
     // Tel pro
-    print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.$adh->phone.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?$_POST["phone"]:$adh->phone).'"></td></tr>';
 
     // Tel perso
-    print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.$adh->phone_perso.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$adh->phone_perso).'"></td></tr>';
 
     // Tel mobile
-    print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.$adh->phone_mobile.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$adh->phone_mobile).'"></td></tr>';
 
     // EMail
-    print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.$adh->email.'"></td></tr>';
+    print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(isset($_POST["member_email"])?$_POST["member_email"]:$adh->email).'"></td></tr>';
 
 	// Date naissance
     print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-    $html->select_date(($adh->naiss ? $adh->naiss : -1),'naiss','','',1,'add');
+    $html->select_date(($adh->naiss ? $adh->naiss : -1),'naiss','','',1,'formsoc');
     print "</td></tr>\n";
 
 	// Profil public
@@ -958,7 +1020,7 @@ if ($action == 'create')
     // Attribut optionnels
     foreach($adho->attribute_label as $key=>$value)
     {
-        print "<tr><td>$value</td><td><input type=\"text\" name=\"options_$key\" size=\"40\"></td></tr>\n";
+        print "<tr><td>".$value.'</td><td><input type="text" name="options_'.$key.'" size="40" value="'.(isset($_POST["options_".$key])?$_POST["options_".$key]:'').'"></td></tr>'."\n";
     }
 
 /*
@@ -1159,12 +1221,15 @@ if ($rowid && $action != 'edit')
     // Address
     print '<tr><td>'.$langs->trans("Address").'</td><td class="valeur">'.nl2br($adh->adresse).'</td></tr>';
 
-    // CP / Ville
+    // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$adh->cp.' '.$adh->ville.'</td></tr>';
 
-    // Pays
+	// Pays
     print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">'.getCountryLabel($adh->pays_id).'</td></tr>';
 
+	// Department
+	print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'.$adh->departement.'</td>';
+
     // Tel pro.
     print '<tr><td>'.$langs->trans("PhonePro").'</td><td class="valeur">'.dol_print_phone($adh->phone,$adh->pays_code,0,$adh->fk_soc,1).'</td></tr>';
 

htdocs/contact/class/contact.class.php

@@ -398,11 +398,13 @@ class Contact extends CommonObject
 		$langs->load("companies");
 		$sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.name, c.firstname,";
 		$sql.= " c.address, c.cp, c.ville,";
-		$sql.= " c.fk_pays, p.libelle as pays, p.code as pays_code,";
+		$sql.= " c.fk_pays,";
-		$sql.= " c.fk_departement, d.nom as departement, d.code_departement as departement_code,";
+		$sql.= " c.fk_departement,";
 		$sql.= " c.birthday,";
 		$sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,";
 		$sql.= " c.priv, c.note, c.default_lang,";
+		$sql.= " p.libelle as pays, p.code as pays_code,";
+		$sql.= " d.nom as departement, d.code_departement as departement_code,";
 		$sql.= " u.rowid as user_id, u.login as user_login,";
 		$sql.= " s.nom as socname, s.address as socaddress, s.cp as soccp, s.ville as soccity, s.default_lang as socdefault_lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
@@ -432,12 +434,12 @@ class Contact extends CommonObject
 				$this->adresse        = $obj->address?$obj->address:$obj->socaddress; // TODO obsolete
 				$this->cp             = $obj->cp?$obj->cp:$obj->soccp;
 				$this->ville          = $obj->ville?$obj->ville:$obj->soccity;
-				$this->fk_pays        = $obj->fk_pays;
 
 				$this->fk_departement = $obj->fk_departement;
 				$this->departement_code = $obj->fk_departement?$obj->departement_code:'';
 				$this->departement	  = $obj->fk_departement?$obj->departement:'';
 
+				$this->fk_pays        = $obj->fk_pays;
 				$this->pays_code      = $obj->fk_pays?$obj->pays_code:'';
 				$this->pays           = ($obj->fk_pays > 0)?$langs->transnoentities("Country".$obj->pays_code):$langs->transnoentities("SelectCountry");
 

htdocs/core/class/html.form.class.php

@@ -266,92 +266,40 @@ class Form
 		$sql = "SELECT rowid, code, libelle, active";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
 		$sql.= " WHERE active = 1";
-		// \TODO A virer
-		if ($conf->use_javascript_ajax && $conf->global->CODE_DE_TEST)
-		{
-			if (is_numeric($selected))
-			{
-				$sql.= " AND rowid = ".$selected;
-			}
-			else
-			{
-				$sql.= " AND code = '".$selected."'";
-			}
-		}
 		$sql.= " ORDER BY code ASC";
 
 		dol_syslog("Form::select_pays sql=".$sql);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			// \TODO A virer
+			print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>';
-			if ($conf->use_javascript_ajax && $conf->global->CODE_DE_TEST)
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num)
 			{
-				$langs->load("companies");
+				$foundselected=false;
-				$obj = $this->db->fetch_object($resql);
+				while ($i < $num)
-				$pays_id = $obj->rowid?$obj->rowid:'';
-
-				// On applique un delai d'execution pour le bon fonctionnement
-				$mode_create = substr($htmloption,-9,6);
-				$mode_edit = substr($htmloption,-7,4);
-				$mode_company = substr($htmloption,-10,7);
-				if ($mode_create == 'create')
 				{
-					$htmloption = 'onChange="ac_delay(\'company_save_refresh_create()\',\'500\')"';
+					$obj = $this->db->fetch_object($resql);
-				}
+					if ($selected && $selected != '-1' &&
-				else if ($mode_edit == 'edit')
+					($selected == $obj->rowid || $selected == $obj->code || $selected == $obj->libelle) )
-				{
-					$htmloption = 'onChange="ac_delay(\'company_save_refresh_edit()\',\'500\')"';
-				}
-				else if ($mode_company == 'refresh')
-				{
-					$htmloption = 'onChange="ac_delay(\'company_save_refresh()\',\'500\')"';
-				}
-
-				print '<div>';
-				if ($obj->rowid == 0)
-				{
-					print '<input type="text" size="45" id="pays" name="pays" value="'.$langs->trans("SelectCountry").'" '.$htmloption.' />';
-				}
-				else
-				{
-					print '<input type="text" size="45" id="pays" name="pays" value="'.$obj->libelle.'" '.$htmloption.' />';
-				}
-
-				print ajax_indicator($htmlname,'working');
-				print ajax_autocompleter($pays_id,'pays',DOL_URL_ROOT.'/societe/ajaxcountries.php','');
-			}
-			else
-			{
-				print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>';
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				if ($num)
-				{
-					$foundselected=false;
-					while ($i < $num)
 					{
-						$obj = $this->db->fetch_object($resql);
+						$foundselected=true;
-						if ($selected && $selected != '-1' &&
+						print '<option value="'.$obj->rowid.'" selected="true">';
-						($selected == $obj->rowid || $selected == $obj->code || $selected == $obj->libelle) )
-						{
-							$foundselected=true;
-							print '<option value="'.$obj->rowid.'" selected="true">';
-						}
-						else
-						{
-							print '<option value="'.$obj->rowid.'">';
-						}
-						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-						if ($obj->code) { print $obj->code . ' - '; }
-						print ($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:'&nbsp;'));
-						print '</option>';
-						$i++;
 					}
+					else
+					{
+						print '<option value="'.$obj->rowid.'">';
+					}
+					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+					if ($obj->code) { print $obj->code . ' - '; }
+					print ($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:'&nbsp;'));
+					print '</option>';
+					$i++;
 				}
-				print '</select>';
-				return 0;
 			}
+			print '</select>';
+			return 0;
 		}
 		else
 		{

htdocs/install/mysql/migration/2.8.0-2.9.0.sql

@@ -12,7 +12,9 @@
 -- V4.1 UPDATE llx_projet_task set fk_user_valid=NULL WHERE fk_user_valid IS NOT NULL AND fk_user_valid NOT IN (SELECT rowid from llx_user);
 
 
-ALTER TABLE llx_socpeople ADD COLUMN fk_departement integer        DEFAULT 0 after ville;
+ALTER TABLE llx_socpeople ADD COLUMN fk_departement integer        DEFAULT NULL after ville;
+ALTER TABLE llx_adherent  ADD COLUMN fk_departement integer        DEFAULT NULL after ville;
+ALTER TABLE llx_entrepot  ADD COLUMN fk_departement integer        DEFAULT NULL after ville;
 
 ALTER TABLE llx_bookmark ADD COLUMN position integer        DEFAULT 0;
 

htdocs/install/mysql/tables/llx_adherent.sql

@@ -42,6 +42,7 @@ create table llx_adherent
   adresse          text,
   cp               varchar(30),
   ville            varchar(50),
+  fk_departement   integer,
   pays             integer,
   email            varchar(255),
   phone            varchar(30),

htdocs/install/mysql/tables/llx_entrepot.sql

@@ -31,6 +31,7 @@ create table llx_entrepot
   address         varchar(255),
   cp              varchar(10),
   ville           varchar(50),
+  fk_departement  integer,
   fk_pays         integer DEFAULT 0,
   statut          tinyint DEFAULT 1,			-- 1 open, 0 close
   valo_pmp        float(12,4),					-- valoristaion du stock en PMP

htdocs/install/mysql/tables/llx_socpeople.sql

@@ -33,7 +33,7 @@ create table llx_socpeople
   address        varchar(255),
   cp             varchar(25),
   ville          varchar(255),
-  fk_departement integer        DEFAULT 0,
+  fk_departement integer,
   fk_pays        integer        DEFAULT 0,
   birthday       date,
   poste          varchar(80),