diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 711a0bb499ded..d07e28ab17267 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -395,31 +395,6 @@ public function __construct() $this->productbatch = new stdClass(); } - /** - * Provide list of deprecated properties and replacements - * - * @return array - */ - protected function deprecatedProperties() - { - return MODULE_MAPPING - + array( - // Previously detected module names, already in mapping - //'adherent' => 'member', - //'banque' => 'bank', - //'categorie' => 'category', - //'commande' => 'order', - //'contrat' => 'contract', - //'expedition' => 'delivery_note', - //'facture' => 'invoice', - //'projet' => 'project', - - // Other, not deprecated module names - 'produit' => 'product', - 'supplierproposal' => 'supplier_proposal', - ); - } - /** * Load setup values into conf object (read llx_const) for a specified entity diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php index f1185ea072b74..dfb378a6a8e84 100644 --- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php +++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php @@ -787,7 +787,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede return 0; } } else { - $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR"); + $this->error = $langs->transnoentities("ErrorConstantNotDefined", "ASSET_OUTPUTDIR"); return 0; } }