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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-15 19:30:57 +02:00
commit bbb843ec58
3 changed files with 520 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1036
htdocs/compta/bank/annuel.php
View File

File diff suppressed because it is too large Load Diff

2
scripts/contracts/email_expire_services_to_customers.php
View File

@ -180,7 +180,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura
global $conf,$langs;
$newlangs=new Translate('',$conf);
$newlangs->setDefaultLang($userlang);
$newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
$newlangs->load("main");
$newlangs->load("contracts");

2
scripts/contracts/email_expire_services_to_representatives.php
View File

@ -180,7 +180,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
global $conf,$langs;
$newlangs=new Translate('',$conf);
$newlangs->setDefaultLang($userlang);
$newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
$newlangs->load("main");
$newlangs->load("contracts");