Преглед на файлове

Fix: Param at wrong place.
Fix: Add warning if phpunit are runned with external module on.

Laurent Destailleur преди 11 години
родител
ревизия
1b25fdc323
променени са 2 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 1 1
      scripts/invoices/email_unpaid_invoices_to_representatives.php
  2. 4 1
      test/phpunit/AllTests.php

+ 1 - 1
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;

+ 4 - 1
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";