diff --git a/htdocs/includes/modules/modMultiCompany.class.php b/htdocs/includes/modules/modMultiCompany.class.php index 593d181b8a7..3756ba1331e 100644 --- a/htdocs/includes/modules/modMultiCompany.class.php +++ b/htdocs/includes/modules/modMultiCompany.class.php @@ -58,7 +58,7 @@ class modMultiCompany extends DolibarrModules // Can be enabled / disabled only in the main company with superadmin account $this->core_enabled = 1; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - $this->version = 'experimental'; + $this->version = 'development'; // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e290d3e466b..f73daeb885b 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -764,6 +764,9 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP DownloadMoreSkins=More skins to download SimpleNumRefModelDesc=Return the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset +ListOfEntities=List of entities +AddEntity=Add entity +EditEntity=Edit entity ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index cf2b78cae93..3b1995ccdb4 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -765,6 +765,9 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la command YourPHPDoesNotHaveSSLSupport=Fonctions SSL non présentes dans votre PHP DownloadMoreSkins=Plus de thèmes à télécharger SimpleNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0 +ListOfEntities=Liste des entités +AddEntity=Ajouter entité +EditEntity=Editer entité ##### Module password generation= undefined PasswordGenerationStandard= Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés. diff --git a/htdocs/multicompany/admin/multicompany.php b/htdocs/multicompany/admin/multicompany.php index 3f55f095dd3..c52f0de2556 100644 --- a/htdocs/multicompany/admin/multicompany.php +++ b/htdocs/multicompany/admin/multicompany.php @@ -51,6 +51,11 @@ if ($_GET["action"] == 'setvisible') } + +/* + * View + */ + llxHeader('',$langs->trans("MultiCompanySetup")); $linkback=''.$langs->trans("BackToModuleList").''; @@ -66,8 +71,8 @@ $smarty->template_dir = DOL_DOCUMENT_ROOT.'/multicompany/tpl/'; if ($_GET["action"] == 'create') { - print_titre($langs->trans("AddNewEntity")); - + print_titre($langs->trans("AddEntity")); + $template = 'add-entity.tpl'; } @@ -77,8 +82,8 @@ if ($_GET["action"] == 'create') else if ($_GET["action"] == 'modify') { - print_titre($langs->trans("EditEntity")); - + print_titre($langs->trans("EditEntity")); + $template = 'edit-entity.tpl'; } @@ -88,13 +93,13 @@ else if ($_GET["action"] == 'modify') else { - print_titre($langs->trans("ListOfEntity")); - + print_titre($langs->trans("ListOfEntities")); + $mc->getEntities(1); //var_dump($mc->entities); - + $template = 'admin-entity.tpl'; - + } $mc->assign_smarty_values($smarty,$_GET["action"]);