Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur
2020-09-17 11:39:58 +02:00
5 changed files with 438 additions and 407 deletions

View File

@@ -82,6 +82,12 @@ function getEntity($element, $shared = 1, $currentobject = null)
{
global $conf, $mc;
// fix different element names (France to English)
switch ($element) {
case 'contrat': $element = 'contract'; break; // "/contrat/class/contrat.class.php"
case 'order_supplier': $element = 'supplier_order'; break; // "/fourn/class/fournisseur.commande.class.php"
}
if (is_object($mc))
{
return $mc->getEntity($element, $shared, $currentobject);