Fix: crlf 2 lf
This commit is contained in:
parent
ae67496730
commit
48ec594fe6
@ -124,12 +124,12 @@ if ($resql)
|
|||||||
if (empty($obj->email)) print "Warning: Customer ".$customer." has no email. Notice disabled.\n";
|
if (empty($obj->email)) print "Warning: Customer ".$customer." 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");
|
||||||
$outputlangs->load("contracts");
|
$outputlangs->load("contracts");
|
||||||
|
|
||||||
if (dol_strlen($oldemail))
|
if (dol_strlen($oldemail))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -125,11 +125,11 @@ if ($resql)
|
|||||||
if (empty($obj->email)) print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
|
if (empty($obj->email)) print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -69,8 +69,8 @@ $error=0;
|
|||||||
print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
|
print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
|
||||||
|
|
||||||
$now=dol_now('tzserver');
|
$now=dol_now('tzserver');
|
||||||
$duration_value=isset($argv[3])?$argv[3]:'none';
|
$duration_value=isset($argv[3])?$argv[3]:'none';
|
||||||
$duration_value2=isset($argv[4])?$argv[4]:'none';
|
$duration_value2=isset($argv[4])?$argv[4]:'none';
|
||||||
|
|
||||||
$error = 0;
|
$error = 0;
|
||||||
print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"").(is_numeric($duration_value2)?" after=".$duration_value2:"")."\n";
|
print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"").(is_numeric($duration_value2)?" after=".$duration_value2:"")."\n";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user