diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 26231e52a92..891dc23efac 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -307,8 +307,8 @@ if ($user->rights->societe->contact->creer) print ''; // Name - print ''; - print ''; + print ''; + print ''; // Company if ($socid > 0) @@ -320,7 +320,7 @@ if ($user->rights->societe->contact->creer) } else { print ''; @@ -328,25 +328,25 @@ if ($user->rights->societe->contact->creer) // Civility print ''; - print ''; + print ''; // Address if (($objsoc->typent_code == 'TE_PRIVATE') && strlen(trim($contact->address)) == 0) $contact->address = $objsoc->address; // Predefined with third party - print ''; + print ''; // Zip / Town if (($objsoc->typent_code == 'TE_PRIVATE') && strlen(trim($contact->cp)) == 0) $contact->cp = $objsoc->cp; // Predefined with third party if (($objsoc->typent_code == 'TE_PRIVATE') && strlen(trim($contact->ville)) == 0) $contact->ville = $objsoc->ville; // Predefined with third party - print ''; + print ''; // Country if (strlen(trim($contact->fk_pays)) == 0) $contact->fk_pays = $objsoc->pays_id; // Predefined with third party print ''; @@ -354,7 +354,7 @@ if ($user->rights->societe->contact->creer) print ''; - print ''; + print ''; + print ''; if (($objsoc->typent_code == 'TE_PRIVATE') && strlen(trim($contact->fax)) == 0) $contact->fax = $objsoc->fax; // Predefined with third party - print ''; - print ''; + print ''; + print ''; // EMail if (($objsoc->typent_code == 'TE_PRIVATE') && strlen(trim($contact->email)) == 0) $contact->email = $objsoc->email; // Predefined with third party - print ''; + print ''; // Jabberid - print ''; + print ''; // Visibility print ''; // Note - print ''; + print ''; print ''; print "
'.$langs->trans("Lastname").' / '.$langs->trans("Label").''.$langs->trans("Firstname").'
'.$langs->trans("Lastname").' / '.$langs->trans("Label").'name).'">'.$langs->trans("Firstname").'firstname).'">
'.$langs->trans("Company").''; - print $form->select_societes('','socid','',1); + print $form->select_societes(isset($_POST["socid"])?$_POST["socid"]:'','socid','',1); //print $form->select_societes('','socid',''); //print $langs->trans("ContactNotLinkedToCompany"); print '
'.$langs->trans("UserTitle").''; - print $formcompany->select_civilite($contact->civilite_id); + print $formcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$contact->civilite_id); print '
'.$langs->trans("PostOrFunction").'
'.$langs->trans("PostOrFunction").'poste).'">
'.$langs->trans("Address").'
'.$langs->trans("Address").'
'.$langs->trans("Zip").' / '.$langs->trans("Town").' '; - print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").'cp).'"> '; + print 'ville).'" maxlength="80">
'.$langs->trans("Country").''; - $form->select_pays($contact->fk_pays,'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_create()"':''); + $form->select_pays((isset($_POST["pays_id"])?$_POST["pays_id"]:$contact->fk_pays),'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_create()"':''); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1); print '
'.$langs->trans('State').''; if ($contact->fk_pays) { - $formcompany->select_departement($contact->fk_departement,$contact->pays_code); + $formcompany->select_departement(isset($_POST["departement_id"])?$_POST["departement_id"]:$contact->fk_departement,$contact->pays_code); } else { @@ -364,28 +364,28 @@ if ($user->rights->societe->contact->creer) // Phone / Fax if (($objsoc->typent_code == 'TE_PRIVATE') && strlen(trim($contact->phone_pro)) == 0) $contact->phone_pro = $objsoc->tel; // Predefined with third party - print '
'.$langs->trans("PhonePro").''.$langs->trans("PhonePerso").'
'.$langs->trans("PhonePro").'phone_pro).'">'.$langs->trans("PhonePerso").'phone_perso).'">
'.$langs->trans("PhoneMobile").''.$langs->trans("Fax").'
'.$langs->trans("PhoneMobile").'phone_mobile).'">'.$langs->trans("Fax").'fax).'">
'.$langs->trans("Email").'
'.$langs->trans("Email").'email).'">
Jabberid
Jabberidjabberid).'">
'.$langs->trans("ContactVisibility").''; $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate")); - $form->select_array('priv',$selectarray,$contact->priv,0); + $form->select_array('priv',$selectarray,(isset($_POST["priv"])?$_POST["priv"]:$contact->priv),0); print '
'.$langs->trans("Note").'
'.$langs->trans("Note").'

";