From ad3645f7f4e654a1464e3c44cb9f2863b17fc70c Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Thu, 24 Jan 2013 12:53:42 +0100
Subject: [PATCH 1/2] Fix:  [ bug #698 ] Bad calculation of totals of
 associated documents

---
 htdocs/comm/propal/tpl/linkedobjectblock.tpl.php    | 4 +++-
 htdocs/commande/tpl/linkedobjectblock.tpl.php       | 4 +++-
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 4337611066e..e9ad176a86d 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011  Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +38,7 @@ print_titre($langs->trans('RelatedCommercialProposals'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index f5bf3f8ccce..c7d073501a3 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,6 +39,7 @@ print_titre($langs->trans('RelatedOrders'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index b36bffb3c68..f0fca0b90ff 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,6 +39,7 @@ else print_titre($langs->trans("RelatedBill"));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;

From 7983b1dec564771b8af90a1a91ebe66a9333584c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 25 Jan 2013 12:37:03 +0100
Subject: [PATCH 2/2] Fix: wrong object name

---
 htdocs/fourn/facture/fiche.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index b093d290a01..241c17b7cef 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -2078,7 +2078,7 @@ else
             $formmail->frommail = $user->email;
             $formmail->withfrom=1;
             $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-            $formmail->withtosocid=$soc->id;
+            $formmail->withtosocid=$societe->id;
             $formmail->withtocc=1;
             $formmail->withtoccsocid=0;
             $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;