diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index 6de9c1fdba7..0178d95d0b6 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -144,12 +144,12 @@ if ($resql) //if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n"; } - // Define line content - $outputlangs=new Translate('',$conf); - $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer + // Define line content + $outputlangs=new Translate('',$conf); + $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer $outputlangs->load("bills"); - $outputlangs->load("main"); - + $outputlangs->load("main"); + if (dol_strlen($newemail)) { $message .= $outputlangs->trans("Invoice")." ".$obj->facnumber." : ".price($obj->total_ttc,0,$outputlangs)."\n"; @@ -301,4 +301,4 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget) } } -?> \ No newline at end of file +?> diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index c2adbf50c5e..ef5935b7946 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -74,8 +74,8 @@ print $script_file." launched with mode ".$mode." default lang=".$langs->default if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1; -$sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,"; -$sql.= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang"; +$sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,"; +$sql.= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " , ".MAIN_DB_PREFIX."societe as s"; $sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -130,8 +130,8 @@ if ($resql) // Define line content $outputlangs=new Translate('',$conf); $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative - $outputlangs->load("bills"); - $outputlangs->load("main"); + $outputlangs->load("bills"); + $outputlangs->load("main"); if (dol_strlen($obj->email)) { @@ -144,8 +144,8 @@ if ($resql) else print "disqualified (no email)."; print "\n"; - unset($outputlangs); - + unset($outputlangs); + $total += $obj->total_ttc; $i++; } @@ -276,4 +276,4 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta } } -?> \ No newline at end of file +?> diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php index d5bda95e2b3..82d6a6c7240 100755 --- a/test/phpunit/ScriptsTest.php +++ b/test/phpunit/ScriptsTest.php @@ -151,28 +151,28 @@ class ScriptsTest extends PHPUnit_Framework_TestCase return $result; } - /** - * testInvoices - * - * @return string - */ - public function testInvoices() - { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; - - $script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties'; - $result=exec($script, $output, $returnvar); - - print __METHOD__." result=".$result."\n"; - print __METHOD__." output=".join("\n",$output)."\n"; - print __METHOD__." returnvar=".$returnvar."\n"; - $this->assertEquals($returnvar,0); - - return $result; + /** + * testInvoices + * + * @return string + */ + public function testInvoices() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties'; + $result=exec($script, $output, $returnvar); + + print __METHOD__." result=".$result."\n"; + print __METHOD__." output=".join("\n",$output)."\n"; + print __METHOD__." returnvar=".$returnvar."\n"; + $this->assertEquals($returnvar,0); + + return $result; } } ?> \ No newline at end of file