diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php index a0605d3656ea0f38f9c966f0561fbe8666208d75..70d6b41bf3516de2baf224698402ca46d2ddd051 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php @@ -50,7 +50,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?> </tr> <tr> - <td><?php echo $langs->trans("Company"); ?></td> + <td><?php echo $langs->trans("ThirdParty"); ?></td> <td colspan="3"><?php echo $this->control->tpl['company']; ?></td> </tr> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php index a445444e42cd3f0965743ff661d12903e4a37094..3be1d16bc8dd6fe239bf638aaa8f6dae86e28acd 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php @@ -59,7 +59,7 @@ echo $this->control->tpl['ajax_selectcountry']; </tr> <tr> - <td><?php echo $langs->trans("Company"); ?></td> + <td><?php echo $langs->trans("ThirdParty"); ?></td> <td colspan="3"><?php echo $this->control->tpl['company']; ?></td> </tr> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index 623fad27e778fa127510815b429811feda712e7a..0b4b8a07fcb2d257727f03240ce46858a5931720 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -44,7 +44,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] </tr> <tr> - <td><?php echo $langs->trans("Company"); ?></td> + <td><?php echo $langs->trans("ThirdParty"); ?></td> <td colspan="3"><?php echo $this->control->tpl['company']; ?></td> </tr> diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index db83554c7ae7fc18bbb7d13c74f3124d70694ac0..af07cbb9a62fd5ae88ff8e84425695c979ecb6c2 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -456,7 +456,7 @@ else { if ($socid > 0) { - print '<tr><td><label for="socid">'.$langs->trans("Company").'</label></td>'; + print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>'; print '<td colspan="3" class="maxwidthonsmartphone">'; print $objsoc->getNomUrl(1); print '</td>'; @@ -464,7 +464,7 @@ else print '</td></tr>'; } else { - print '<tr><td><label for="socid">'.$langs->trans("Company").'</label></td><td colspan="3" class="maxwidthonsmartphone">'; + print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">'; print $form->select_company($socid,'socid','',1); print '</td></tr>'; } @@ -690,7 +690,7 @@ else // Company if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { - print '<tr><td><label for="socid">'.$langs->trans("Company").'</label></td>'; + print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>'; print '<td colspan="3" class="maxwidthonsmartphone">'; print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):($object->socid?$object->socid:-1),'socid','',1); print '</td>'; @@ -924,7 +924,7 @@ else // Company if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { - print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'; + print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'; if ($object->socid > 0) { $objsoc->fetch($object->socid); diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index bcb3b9c2be03385410275d1bf59f716172dc36bb..e9e9c70966c9f996836a10d14fc9af1e711f2b3e 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -77,11 +77,11 @@ if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) $objsoc = new Societe($db); $objsoc->fetch($contact->socid); - print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; + print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; } else { - print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'; + print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'; print $langs->trans("ContactNotLinkedToCompany"); print '</td></tr>'; } diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index fe3098eaa9a260d0e488e9b3ecf2c4ff0fb6361b..170ed03990458e6272fe9aeb8b0b4d2cb482ad10 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -105,11 +105,11 @@ if ($contact->socid > 0) $objsoc = new Societe($db); $objsoc->fetch($contact->socid); - print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; + print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; } else { - print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">'; + print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'; print $langs->trans("ContactNotLinkedToCompany"); print '</td></tr>'; } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index eab4369ac21d9dbca991abccb6ef473a806af578..4413b721fc9cdf6eb738c9d3bfc1b047a9fcb0f6 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -300,7 +300,7 @@ if ($result) print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.lastname", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("PostOrFunction"),$_SERVER["PHP_SELF"],"p.poste", $begin, $param, '', $sortfield,$sortorder); - if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder); + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Phone"),$_SERVER["PHP_SELF"],"p.phone", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax", $begin, $param, '', $sortfield,$sortorder); diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php index 73b0f513db97e75b81b931dab90b47e71dc05fec..ab8101dd73992cf5f184da49d6479bfb8fd69cc7 100644 --- a/htdocs/contact/note.php +++ b/htdocs/contact/note.php @@ -98,12 +98,12 @@ if ($id > 0) $objsoc = new Societe($db); $objsoc->fetch($object->socid); - print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; + print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; } else { - print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'; + print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'; print $langs->trans("ContactNotLinkedToCompany"); print '</td></tr>'; } diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 92ba03e9861dab3c07b36cbc7cc1294826d56d32..6ec43320e54b095413c04ac34a2b879bc449cd14 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -111,11 +111,11 @@ if ($action == 'edit') $objsoc = new Societe($db); $objsoc->fetch($object->socid); - print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>'; + print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>'; } else { - print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'; + print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'; print $langs->trans("ContactNotLinkedToCompany"); print '</td></tr>'; } @@ -179,12 +179,12 @@ else $objsoc = new Societe($db); $objsoc->fetch($object->socid); - print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; + print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; } else { - print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'; + print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'; print $langs->trans("ContactNotLinkedToCompany"); print '</td></tr>'; } diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 2bcfd36bddea6ed785ef06f11a643c991f78f152..cf06894dde5d74113e059841adc65ce34600b7b8 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -271,13 +271,13 @@ class FormFile if (! empty($iconPDF)) { return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir); } - + $printer=0; if (in_array($modulepart,array('facture','propal','proposal','order','commande'))) // This feature is implemented only for such elements { $printer = (!empty($user->rights->printipp->read) && !empty($conf->printipp->enabled))?true:false; } - + $hookmanager->initHooks(array('formfile')); $forname='builddoc'; $out=''; @@ -1100,6 +1100,8 @@ class FormFile global $bc; global $sortfield, $sortorder; + $langs->load("link"); + require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php'; $link = new Link($this->db); $links = array(); @@ -1161,7 +1163,7 @@ class FormFile $nboflinks = count($links); if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; - $var = false; + $var = true; foreach ($links as $link) { $var =! $var; diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index 2fde1ef5dcf38304fefe35f1268ece0fd385a95f..c2ad751f196ff0be6e0d6a61fe7da73a7d1e53d0 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -147,7 +147,7 @@ if ($object->id) print '</table>'; - print '</div>'; + dol_fiche_end(); $modulepart = 'societe'; $permission = $user->rights->societe->creer;