diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index b4e9f5d5258..3b72d57ed03 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -34,13 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codeclient_elephant extends ModeleThirdPartyCode { - /** - * @var string Nom du modele - * @deprecated - * @see name - */ - public $nom='Elephant'; - /** * @var string model name */ diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 727d2e09299..abea7070e80 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -38,13 +38,6 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode * Le fonctionnement de celui-ci doit donc rester le plus ouvert possible */ - /** - * @var string Nom du modele - * @deprecated - * @see name - */ - public $nom='Leopard'; - /** * @var string model name */ diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index f86be2ed96c..87f4a527880 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -32,13 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codeclient_monkey extends ModeleThirdPartyCode { - /** - * @var string Nom du modele - * @deprecated - * @see name - */ - public $nom='Monkey'; - /** * @var string model name */ diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index e9c60b699cc..edd0c5cf4dd 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -31,13 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codecompta_aquarium extends ModeleAccountancyCode { - /** - * @var string Nom du modele - * @deprecated - * @see name - */ - public $nom='Aquarium'; - /** * @var string model name */ @@ -49,9 +42,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $prefixcustomeraccountancycode; + public $prefixcustomeraccountancycode; - public $prefixsupplieraccountancycode; + public $prefixsupplieraccountancycode; + + public $position = 20; /** @@ -93,11 +88,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2)."
\n"; $texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1)."
\n"; $texte.="
\n"; - if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."
\n"; + if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('RemoveSpecialChars').' = '.yn(1)."
\n"; //if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."
\n"; if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."
\n"; $texte.= ''; - $texte.= '  '; + $texte.= ''; $texte.= ''; $texte.= ''; diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php index 01b8da27b91..97486da70cc 100644 --- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php +++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php @@ -31,13 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codecompta_digitaria extends ModeleAccountancyCode { - /** - * @var string Nom du modele - * @deprecated - * @see name - */ - public $nom='Digitaria'; - /** * @var string model name */ @@ -49,9 +42,12 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode */ public $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - public $prefixcustomeraccountancycode; + public $prefixcustomeraccountancycode; + + public $prefixsupplieraccountancycode; + + public $position = 30; - public $prefixsupplieraccountancycode; /** * Constructor @@ -98,13 +94,13 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode $texte.= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1, $s3)."
\n"; $texte.= "
\n"; // Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default) - if (! isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte.= $langs->trans('COMPANY_DIGITARIA_REMOVE_SPECIAL').' = '.yn(1)."
\n"; + if (! isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte.= $langs->trans('RemoveSpecialChars').' = '.yn(1)."
\n"; // Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed. if (! empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX)) $texte.= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX."
\n"; // Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default) if (! isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || ! empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) $texte.= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."
\n"; $texte.= ''; - $texte.= '  '; + $texte.= ''; $texte.= ''; $texte.= ''; diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php index f3106cef761..60f66ca4e46 100644 --- a/htdocs/core/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php @@ -30,13 +30,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codecompta_panicum extends ModeleAccountancyCode { - /** - * @var string Nom du modele - * @deprecated - * @see name - */ - public $nom='Panicum'; - /** * @var string model name */ @@ -48,6 +41,8 @@ class mod_codecompta_panicum extends ModeleAccountancyCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + public $position = 10; + /** * Constructor diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 4a873847d8a..62f481b9b25 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -83,18 +83,18 @@ abstract class ModeleThirdPartyCode return $langs->trans("NoDescription"); } - /** Renvoi nom module + /** Return name of module * * @param Translate $langs Object langs * @return string Nom du module */ public function getNom($langs) { - return $this->nom; + return $this->name; } - /** Renvoi un exemple de numerotation + /** Return an example of numbering * * @param Translate $langs Object langs * @return string Example @@ -261,8 +261,7 @@ abstract class ModeleThirdPartyCode /** - * \class ModeleAccountancyCode - * \brief Parent class for third parties accountancy code generators + * Parent class for third parties accountancy code generators */ abstract class ModeleAccountancyCode { @@ -340,7 +339,7 @@ abstract class ModeleAccountancyCode $langs->load("admin"); $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->nom.'
'; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->name.'
'; if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; //$s.='
'; //$s.=''.$langs->trans("ThisIsModuleRules").':
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 0ae5239642d..f59f4449b8e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1848,9 +1848,8 @@ NothingToSetup=There is no specific setup required for this module. SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2') SeveralLangugeVariatFound=Several language variants found -COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters +RemoveSpecialChars=Remove special characters COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX) -COMPANY_DIGITARIA_REMOVE_SPECIAL=Remove special characters COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX) COMPANY_DIGITARIA_UNIQUE_CODE=Unauthorized double GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact) diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index d07ddfc2b4f..82f8c32510e 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -360,6 +360,8 @@ print ' '.$langs->trans("Status").''; print ' '.$langs->trans("ShortInfo").''; print "\n"; +$arrayofmodules = array(); + foreach ($dirsociete as $dirroot) { $dir = dol_buildpath($dirroot, 0); @@ -388,39 +390,45 @@ foreach ($dirsociete as $dirroot) if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - print ''."\n"; - print ''.$modCodeTiers->name.''."\n"; - print ''.$modCodeTiers->info($langs).''."\n"; - print ''.$modCodeTiers->getExample($langs).''."\n"; - - if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file") - { - print ''."\n"; - print img_picto($langs->trans("Activated"), 'switch_on'); - print "\n"; - } - else - { - $disabled = false; - if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true); - print ''; - if (! $disabled) print ''; - print img_picto($langs->trans("Disabled"), 'switch_off'); - if (! $disabled) print ''; - print ''; - } - - print ''; - $s=$modCodeTiers->getToolTip($langs, null, -1); - print $form->textwithpicto('', $s, 1); - print ''; - - print ''; + $arrayofmodules[$file] = $modCodeTiers; } } closedir($handle); } } + +$arrayofmodules = dol_sort_array($arrayofmodules, 'position'); + +foreach($arrayofmodules as $file => $modCodeTiers) +{ + print ''."\n"; + print ''.$modCodeTiers->name.''."\n"; + print ''.$modCodeTiers->info($langs).''."\n"; + print ''.$modCodeTiers->getExample($langs).''."\n"; + + if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file") + { + print ''."\n"; + print img_picto($langs->trans("Activated"), 'switch_on'); + print "\n"; + } + else + { + $disabled = (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true); + print ''; + if (! $disabled) print ''; + print img_picto($langs->trans("Disabled"), 'switch_off'); + if (! $disabled) print ''; + print ''; + } + + print ''; + $s=$modCodeTiers->getToolTip($langs, null, -1); + print $form->textwithpicto('', $s, 1); + print ''; + + print ''; +} print ''; print ''; @@ -441,6 +449,8 @@ print ''.$langs->trans("Status").''; print ''.$langs->trans("ShortInfo").''; print "\n"; +$arrayofmodules = array(); + foreach ($dirsociete as $dirroot) { $dir = dol_buildpath($dirroot, 0); @@ -464,33 +474,41 @@ foreach ($dirsociete as $dirroot) $modCodeCompta = new $file; - print ''; - print ''.$modCodeCompta->name."\n"; - print $modCodeCompta->info($langs); - print ''; - print ''.$modCodeCompta->getExample($langs)."\n"; - - if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file") - { - print ''; - print img_picto($langs->trans("Activated"), 'switch_on'); - print ''; - } - else - { - print ''; - print img_picto($langs->trans("Disabled"), 'switch_off'); - print ''; - } - print ''; - $s=$modCodeCompta->getToolTip($langs, null, -1); - print $form->textwithpicto('', $s, 1); - print ''; - print "\n"; + $arrayofmodules[$file] = $modCodeCompta; } } - closedir($handle); } + closedir($handle); +} + +$arrayofmodules = dol_sort_array($arrayofmodules, 'position'); + + +foreach($arrayofmodules as $file => $modCodeCompta) +{ + print ''; + print ''.$modCodeCompta->name."\n"; + print $modCodeCompta->info($langs); + print ''; + print ''.$modCodeCompta->getExample($langs)."\n"; + + if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file") + { + print ''; + print img_picto($langs->trans("Activated"), 'switch_on'); + print ''; + } + else + { + print ''; + print img_picto($langs->trans("Disabled"), 'switch_off'); + print ''; + } + print ''; + $s=$modCodeCompta->getToolTip($langs, null, -1); + print $form->textwithpicto('', $s, 1); + print ''; + print "\n"; } print "\n"; print '';