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 0f55fbda3d3..949c8abf977 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -95,7 +95,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc */ public function info($langs) { - global $conf, $langs; + global $langs; // Load traductions files required by page $langs->loadLangs(array("companies", "errors")); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index d36aeb1222e..51bb8c4a407 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -206,21 +206,6 @@ if ($action == "setaccountancycodecustomerinvoicemandatory") { setEventMessages($langs->trans("Error"), null, 'errors'); } } -/* This code is not needed anymore as we can use the setprofid functions instead with key = 'VAT_INTRA' -//Activate Set vat id unique -if ($action == "setvatintraunique") { - $setvatintraunique = GETPOSTINT('value'); - $res = dolibarr_set_const($db, "SOCIETE_VAT_INTRA_UNIQUE", $setvatintraunique, 'yesno', 0, '', $conf->entity); - if (!($res > 0)) { - $error++; - } - if (!$error) { - setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } else { - setEventMessages($langs->trans("Error"), null, 'errors'); - } -} -*/ //Activate Set ref in list if ($action == "setaddrefinlist") { @@ -627,22 +612,15 @@ foreach ($dirsociete as $dirroot) { // Activate / Disable if (in_array($name, $def)) { - print "