diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 7c6792e1a02..a7a863c4725 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -369,7 +369,6 @@ if ($conf->produit->enabled) } $modBarCode = new $file(); - $var = !$var; print ''; print ''.(isset($modBarCode->name)?$modBarCode->name:$modBarCode->nom)."\n"; diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index d2dc063df78..2f393e50002 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -452,11 +452,9 @@ class doc_generic_project_odt extends ModelePDFProjects if (! is_object($outputlangs)) $outputlangs=$langs; $sav_charset_output=$outputlangs->charset_output; $outputlangs->charset_output='UTF-8'; - - $outputlangs->load("main"); - $outputlangs->load("dict"); - $outputlangs->load("companies"); - $outputlangs->load("projects"); + + // Load translation files required by the page + $outputlangs->loadLangs(array("main", "dict", "companies", "projects")); if ($conf->projet->dir_output) { @@ -951,7 +949,6 @@ class doc_generic_project_odt extends ModelePDFProjects $elementarray = $object->get_element_list($keyref, $tablename); if (count($elementarray)>0 && is_array($elementarray)) { - $var=true; $total_ht = 0; $total_ttc = 0; $num=count($elementarray); diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index c3472cc690a..6aa4267d827 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -197,11 +197,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc if (! is_object($outputlangs)) $outputlangs=$langs; $sav_charset_output=$outputlangs->charset_output; $outputlangs->charset_output='UTF-8'; - - $outputlangs->load("main"); - $outputlangs->load("dict"); - $outputlangs->load("companies"); - $outputlangs->load("projects"); + + // Load translation files required by the page + $outputlangs->loadLangs(array("main", "dict", "companies", "projects")); if ($conf->societe->multidir_output[$object->entity]) { @@ -282,7 +280,6 @@ class doc_generic_odt extends ModeleThirdPartyDoc $result = $this->db->query($sql); $num = $this->db->num_rows($result); - $var=true; if ($num) { require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 0ecf01f9dd1..a6e895d5fed 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -78,7 +78,6 @@ if ($permission) {   - - -
"> +
trans("User"); ?> trans("ThirdPartyContact"); ?> diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php index 1603d3ff001..aff342191cb 100644 --- a/htdocs/core/tpl/resource_view.tpl.php +++ b/htdocs/core/tpl/resource_view.tpl.php @@ -36,7 +36,6 @@ else if( (array) $linked_resources && count($linked_resources) > 0) { - $var=true; foreach ($linked_resources as $linked_resource) { @@ -48,7 +47,7 @@ if( (array) $linked_resources && count($linked_resources) > 0) if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid')) { - print ''; + print ''; print ''; print ''; print ''; @@ -68,7 +67,7 @@ if( (array) $linked_resources && count($linked_resources) > 0) if ($linked_resource['rowid'] == GETPOST('lineid')) $style='style="background: orange;"'; - print ''; + print ''; print '
'; print $object_resource->getNomUrl(1); @@ -102,7 +101,7 @@ if( (array) $linked_resources && count($linked_resources) > 0) } else { - print ''; + print ''; print '
'.$langs->trans('NoResourceLinked').'
'; print '
'; print '
';