Merge pull request #1820 from aspangaro/develop-trad1

ChangeLog

htdocs/adherents/class/adherent.class.php

htdocs/admin/dict.php

htdocs/contact/class/contact.class.php

htdocs/core/boxes/box_contacts.php

htdocs/core/class/commonobject.class.php

htdocs/core/class/html.formcompany.class.php

htdocs/core/class/translate.class.php

htdocs/core/lib/company.lib.php

htdocs/core/modules/mailings/contacts1.modules.php

htdocs/core/modules/mailings/contacts2.modules.php

htdocs/core/modules/mailings/contacts3.modules.php

htdocs/core/modules/mailings/contacts4.modules.php

htdocs/core/modules/mailings/fraise.modules.php

htdocs/core/modules/mailings/framboise.modules.php

htdocs/core/modules/mailings/pomme.modules.php

htdocs/core/modules/modAdherent.class.php

htdocs/core/modules/modCategorie.class.php

htdocs/core/modules/modSociete.class.php

htdocs/install/mysql/data/llx_c_civilite.sql