diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index e83dbe5b7956a877059377aa8d77041f4a705767..c0e04c0efeff810a53437bbcbf136828e2bab961 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -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; diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index f9bae36a5687f9b2cc2c70cf2d7afde32a27e860..0b7b09d199ec632b8b36fba515c6c6ff2b0cf6a3 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -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";