Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: uniformize code

Browse Source 
Fix: if the contact's address is empty, it uses one of the company
This commit is contained in:
Regis Houssin
2009-12-23 10:07:48 +00:00
parent 2df0d15ef7
commit 3b5735bd9c
41 changed files with 177 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/books/droits-editeurs.php
View File

@@ -180,7 +180,7 @@ class pdf_courrier_editeur
$pdf->MultiCell(106,4, $soc->nom, 0, 'L');
// Caracteristiques client
$carac_client=$soc->adresse;
$carac_client=$soc->address;
$carac_client.="\n".$soc->cp . " " . $soc->ville."\n";
$carac_client.=$soc->pays."\n";

3
scripts/members/sync_members_ldap2dolibarr.php
View File

@@ -188,7 +188,8 @@ if ($result >= 0)
$member->pass=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD];
//$member->societe;
$member->adresse=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
$member->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
$member->adresse=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS]; // TODO obsolete
$member->cp=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
$member->ville=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
$member->pays=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY]; // Pays en libelle