From 3e0815c7597ec297e392c0523a0de611c4a8fb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sun, 9 Jun 2013 15:37:25 +0200
Subject: [PATCH] CR Fix Git required me to commit these changes
---
.../invoices/email_unpaid_invoices_to_customers.php | 10 +++++-----
.../email_unpaid_invoices_to_representatives.php | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index a7890a091c6..cfe253a8621 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";
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 7e9e2355916..f190725a458 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++;
}
--
GitLab