Skip to content

Commit

Permalink
FIX regression. A lot of broken feature and corruption of data du to
Browse files Browse the repository at this point in the history
deprecation management.
  • Loading branch information
eldy committed Apr 3, 2024
1 parent bec3061 commit 56f9ec4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
25 changes: 0 additions & 25 deletions htdocs/core/class/conf.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -395,31 +395,6 @@ public function __construct()
$this->productbatch = new stdClass();
}

/**
* Provide list of deprecated properties and replacements
*
* @return array<string,string>
*/
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 56f9ec4

Please sign in to comment.