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

Fix: Param at wrong place.

Browse Source 
Fix: Add warning if phpunit are runned with external module on.
This commit is contained in:
Laurent Destailleur 2014-05-08 18:09:39 +02:00
parent 70cccc907a
commit 1b25fdc323
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/invoices/email_unpaid_invoices_to_representatives.php
View File

@ -226,7 +226,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
$allmessage.= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml?"<br>\n":"\n");
}
$allmessage.= $message.($usehtml?"<br>\n":"\n");
$allmessage.= $langs->trans("Total")." = ".price($total,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
$allmessage.= $langs->trans("Total")." = ".price($total,0,$newlangs,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
{
$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER;

5
test/phpunit/AllTests.php
View File

@ -36,7 +36,10 @@ if ($langs->defaultlang != 'en_US')
print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n";
exit;
}
if (! empty($conf->google->enabled))
{
print "Warning: Google module should not be enabled.\n";
}
if (empty($user->id))
{
print "Load permissions for admin user nb 1\n";