Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

CR Fix

Browse Source 
Git required me to commit these changes
This commit is contained in:
Marcos García
2013-06-09 15:37:25 +02:00
parent c8a634fa08
commit 3e0815c759
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/invoices/email_unpaid_invoices_to_customers.php
View File

@@ -144,12 +144,12 @@ if ($resql)
//if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n"; //if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n";
} }
// Define line content // Define line content
$outputlangs=new Translate('',$conf); $outputlangs=new Translate('',$conf);
$outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer
$outputlangs->load("bills"); $outputlangs->load("bills");
$outputlangs->load("main"); $outputlangs->load("main");
if (dol_strlen($newemail)) if (dol_strlen($newemail))
{ {
$message .= $outputlangs->trans("Invoice")." ".$obj->facnumber." : ".price($obj->total_ttc,0,$outputlangs)."\n"; $message .= $outputlangs->trans("Invoice")." ".$obj->facnumber." : ".price($obj->total_ttc,0,$outputlangs)."\n";

12
scripts/invoices/email_unpaid_invoices_to_representatives.php
View File

@@ -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; 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 = "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.= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " , ".MAIN_DB_PREFIX."societe as s"; $sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -130,8 +130,8 @@ if ($resql)
// Define line content // Define line content
$outputlangs=new Translate('',$conf); $outputlangs=new Translate('',$conf);
$outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative
$outputlangs->load("bills"); $outputlangs->load("bills");
$outputlangs->load("main"); $outputlangs->load("main");
if (dol_strlen($obj->email)) if (dol_strlen($obj->email))
{ {
@@ -144,8 +144,8 @@ if ($resql)
else print "disqualified (no email)."; else print "disqualified (no email).";
print "\n"; print "\n";
unset($outputlangs); unset($outputlangs);
$total += $obj->total_ttc; $total += $obj->total_ttc;
$i++; $i++;
} }