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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2017-02-17 13:10:03 +01:00
commit 0e6c329695
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/multicurrency.php
View File

@ -131,7 +131,7 @@ elseif ($action == 'synchronize')
} }
else else
{ {
setEventMessages($langs->trans('multicurrency_syncronize_error', $reponse->error->info), null, 'errors'); setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
} }
} }
@ -377,4 +377,4 @@ print '
llxFooter(); llxFooter();
$db->close(); $db->close();

11
htdocs/comm/action/index.php
View File

@ -1328,7 +1328,16 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$cssclass.= " unmovable"; $cssclass.= " unmovable";
} }
} }
else $cssclass.= " movable"; else{
if ($user->rights->agenda->allactions->create ||
(($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
{
$cssclass.= " movable";
}else{
$cssclass.= " unmovable";
}
}
$h=''; $nowrapontd=1; $h=''; $nowrapontd=1;
if ($action == 'show_day') { $h='height: 100%; '; $nowrapontd=0; } if ($action == 'show_day') { $h='height: 100%; '; $nowrapontd=0; }

13
htdocs/core/lib/admin.lib.php
View File

@ -763,6 +763,11 @@ function activateModule($value,$withdeps=1)
return $ret; return $ret;
} }
$const_name = $objMod->const_name;
if(!empty($conf->global->$const_name)){
return $ret;
}
$result=$objMod->init(); $result=$objMod->init();
if ($result <= 0) if ($result <= 0)
{ {
@ -784,7 +789,13 @@ function activateModule($value,$withdeps=1)
if (file_exists($dir.$objMod->depends[$i].".class.php")) if (file_exists($dir.$objMod->depends[$i].".class.php"))
{ {
$resarray = activateModule($objMod->depends[$i]); $resarray = activateModule($objMod->depends[$i]);
if (empty($resarray['errors'])) $activate = true; if (empty($resarray['errors'])){
$activate = true;
}else{
foreach ($resarray['errors'] as $errorMessage){
dol_syslog($errorMessage, LOG_ERR);
}
}
break; break;
} }
} }

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

@ -3,7 +3,7 @@ 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
multicurrency_syncronize_error=Error in synchronization multicurrency_syncronize_error=Synchronisation error: %s
multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the new known rate) multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the new known rate)
CurrencyLayerAccount=CurrencyLayer API CurrencyLayerAccount=CurrencyLayer API
CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br />Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br />Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
@ -15,4 +15,4 @@ CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to u
rate=rate rate=rate
MulticurrencyReceived=Received, original currency MulticurrencyReceived=Received, original currency
MulticurrencyRemainderToTake=Remaining amout, original currency MulticurrencyRemainderToTake=Remaining amout, original currency
MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyPaymentAmount=Payment amount, original currency