From 7260f39d2121a71a9d966411315660e68c3980e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Feb 2013 17:06:32 +0100
Subject: [PATCH] New: Support tag total_vat_x.y for vat rate x.y into ODT
 templates

---
 .../commande/doc/doc_generic_order_odt.modules.php    | 11 ++++++++++-
 .../facture/doc/doc_generic_invoice_odt.modules.php   | 11 ++++++++++-
 .../propale/doc/doc_generic_proposal_odt.modules.php  | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 0ad0ecc0e7e..fff62466958 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -97,7 +97,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
     {
         global $conf;
 
-        return array(
+        $resarray=array(
             'object_id'=>$object->id,
             'object_ref'=>$object->ref,
             'object_ref_ext'=>$object->ref_ext,
@@ -120,6 +120,15 @@ class doc_generic_order_odt extends ModelePDFCommandes
             'object_note_private'=>$object->note,
             'object_note'=>$object->note_public,
         );
+        
+        // Add vat by rates
+        foreach ($object->lines as $line)
+        {
+        	if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
+        	$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
+        }
+        
+        return $resarray;
     }
 
     /**
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index dcf8436636d..37e2b7e32b6 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -105,7 +105,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$sumpayed = $object->getSommePaiement();
 		$alreadypayed=price($sumpayed,0,$outputlangs);
 
-        return array(
+        $resarray=array(
             'object_id'=>$object->id,
             'object_ref'=>$object->ref,
             'object_ref_ext'=>$object->ref_ext,
@@ -132,6 +132,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
             'object_already_payed'=>$alreadypayed,
             'object_remain_to_pay'=>price($object->total_ttc - $sumpayed,0,$outputlangs)
         );
+
+        // Add vat by rates
+		foreach ($object->lines as $line)
+		{
+			if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
+			$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
+		}
+		
+        return $resarray;
     }
 
     /**
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index be0ac3f7d3f..d18c17735ae 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -97,7 +97,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
     {
         global $conf;
 
-        return array(
+        $resarray=array(
             'object_id'=>$object->id,
             'object_ref'=>$object->ref,
             'object_ref_ext'=>$object->ref_ext,
@@ -119,6 +119,15 @@ class doc_generic_proposal_odt extends ModelePDFPropales
             'object_note_private'=>$object->note,
             'object_note'=>$object->note_public,
         );
+        
+        // Add vat by rates
+        foreach ($object->lines as $line)
+        {
+        	if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
+        	$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
+        }
+        
+        return $resarray;
     }
 
     /**