lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix order of module for demo.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-08-17 11:39:11 +02:00
parent 47489265b1
commit ba8c2dbf9f
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/modHRM.class.php
View File

@ -45,7 +45,7 @@ class modHRM extends DolibarrModules
$this->family = "hr"; $this->family = "hr";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace( '/^mod/i', '', get_class($this)); $this->name = preg_replace( '/^mod/i', '', get_class($this));
$this->description = "Gestion des ressources humaines"; $this->description = "Management of employees carrier and feelings";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'development'; $this->version = 'development';

3
htdocs/langs/en_US/multicurrency.lang
View File

@ -1,4 +1,5 @@
# ADMIN # Dolibarr language file - Source file is en_US - multicurrency
MultiCurrency=Multi currency
ErrorAddRateFail=Error in added rate ErrorAddRateFail=Error in added rate
ErrorAddCurrencyFail=Error in added currency ErrorAddCurrencyFail=Error in added currency
ErrorDeleteCurrencyFail=Error delete fail ErrorDeleteCurrencyFail=Error delete fail

9
htdocs/public/demo/index.php
View File

@ -90,7 +90,7 @@ if (empty($reshook))
'mailmanspip','notification','oauth','syslog','user','webservices', 'mailmanspip','notification','oauth','syslog','user','webservices',
// Extended modules // Extended modules
'memcached','numberwords','zipautofillfr'); 'memcached','numberwords','zipautofillfr');
$alwayshiddenuncheckedmodules=array('ftp','webservicesclient','websites', $alwayshiddenuncheckedmodules=array('ftp','hrm','webservicesclient','websites',
// Extended modules // Extended modules
'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap', 'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail'); 'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
@ -375,8 +375,11 @@ foreach ($demoprofiles as $profilearray)
$listofdisabledmodules=explode(',',$profilearray['disablemodules']); $listofdisabledmodules=explode(',',$profilearray['disablemodules']);
$j=0; $j=0;
$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3; $nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
foreach($modules as $val) // Loop on qualified (enabled) modules //var_dump($modules);
foreach($orders as $index => $key) // Loop on qualified (enabled) modules
{ {
//print $index.' '.$key;
$val = $modules[$index];
$modulekeyname=strtolower($val->name); $modulekeyname=strtolower($val->name);
$modulequalified=1; $modulequalified=1;
@ -454,7 +457,7 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
} }
else else
{ {
print '<!-- google js addvert tag disabled with jmobile -->'."\n"; print '<!-- google js advert tag disabled with jmobile -->'."\n";
} }
} }