Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/cashdesk/class/Facturation.class.php

@@ -96,8 +96,8 @@ class Facturation
         $societe = new Societe($db);
         $societe->fetch($thirdpartyid);
 
-        $product = new Product($db);
+        $product = new Product($db);
-        $product->fetch($this->id);
+        $product->fetch($this->id);
 
         $sql = "SELECT taux";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_tva";

htdocs/categories/class/categorie.class.php

@@ -86,7 +86,7 @@ class Categorie
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			if ($this->db->num_rows($resql) > 0)
+			if ($this->db->num_rows($resql) > 0)
 			{
 				$res = $this->db->fetch_array($resql);
 

htdocs/compta/bank/fiche.php

@@ -88,12 +88,12 @@ if ($_POST["action"] == 'add')
         $action='create';       // Force chargement page en mode creation
         $error++;
     }
-    if (empty($account->label))
+    if (empty($account->label))
-    {
+    {
-    	setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
+    	setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
-    	$action='create';       // Force chargement page en mode creation
+    	$action='create';       // Force chargement page en mode creation
-    	$error++;
+    	$error++;
-    }
+    }
 
     if (! $error)
     {

htdocs/compta/facture.php

@@ -280,14 +280,14 @@ else if ($action == 'setconditions' && $user->rights->facture->creer)
     $object->cond_reglement_code=0;	// To clean property
     $object->cond_reglement_id=0;		// To clean property
     $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
-    if ($result < 0) dol_print_error($db,$object->error);
+    if ($result < 0) dol_print_error($db,$object->error);
 
-    $old_date_lim_reglement=$object->date_lim_reglement;
+    $old_date_lim_reglement=$object->date_lim_reglement;
-    $new_date_lim_reglement=$object->calculate_date_lim_reglement();
+    $new_date_lim_reglement=$object->calculate_date_lim_reglement();
-    if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement=$new_date_lim_reglement;
+    if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement=$new_date_lim_reglement;
-    if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement=$object->date;
+    if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement=$object->date;
-    $result=$object->update($user);
+    $result=$object->update($user);
-    if ($result < 0) dol_print_error($db,$object->error);
+    if ($result < 0) dol_print_error($db,$object->error);
 }
 else if ($action == 'setpaymentterm' && $user->rights->facture->creer)
 {

htdocs/core/class/CMailFile.class.php

@@ -651,10 +651,10 @@ class CMailFile
 
 		// Sender
 		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
-		$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
+		$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
 		if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
 		{
-			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
+			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
 		}
 		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
 		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
@@ -747,8 +747,8 @@ class CMailFile
 
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-		{
+		{
 			$strContent = preg_replace("/\r\n/si", "\n", $strContent);
 		}
 		

htdocs/core/lib/functions.lib.php

@@ -2819,54 +2819,54 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 		require DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 	}
 
-	$ret=0;
+	$ret=0;
-	$found=0;
+	$found=0;
 
-	if ($idprod > 0)
+	if ($idprod > 0)
-	{
+	{
-		// Load product
+		// Load product
-		$product=new Product($db);
+		$product=new Product($db);
-		$result=$product->fetch($idprod);
+		$result=$product->fetch($idprod);
-
+
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
+		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
-		{
+		{
 			/* Not defined yet, so we don't use this
 			if ($local==1) $ret=$product->localtax1_tx;
 			elseif ($local==2) $ret=$product->localtax2_tx;
 			$found=1;
-			*/
+			*/
-		}
+		}
-		else
+		else
-		{
+		{
-			// TODO Read default product vat according to countrycode and product
+			// TODO Read default product vat according to countrycode and product
-
+
-
+
-		}
+		}
-	}
+	}
-
+
-	if (! $found)
+	if (! $found)
-	{
+	{
-		// If vat of product for the country not found or not defined, we return higher vat of country.
+		// If vat of product for the country not found or not defined, we return higher vat of country.
-		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
+		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-		$sql.= " WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$thirdparty_seller->country_code."'";
+		$sql.= " WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$thirdparty_seller->country_code."'";
-		$sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC";
+		$sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC";
-		$sql.= $db->plimit(1);
+		$sql.= $db->plimit(1);
-
+
-		$resql=$db->query($sql);
+		$resql=$db->query($sql);
-		if ($resql)
+		if ($resql)
-		{
+		{
-			$obj=$db->fetch_object($resql);
+			$obj=$db->fetch_object($resql);
-			if ($obj)
+			if ($obj)
-			{
+			{
-				if ($local==1) $ret=$obj->localtax1;
+				if ($local==1) $ret=$obj->localtax1;
 				elseif ($local==2) $ret=$obj->localtax2;
-			}
+			}
-		}
+		}
-		else dol_print_error($db);
+		else dol_print_error($db);
-	}
+	}
-
+
-	dol_syslog("get_product_localtax_for_country: ret=".$ret);
+	dol_syslog("get_product_localtax_for_country: ret=".$ret);
 	return $ret;
 }
 

htdocs/core/lib/price.lib.php

@@ -57,30 +57,30 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	if (empty($seller) || ! is_object($seller)) $seller=$mysoc;	// If seller is a customer, $seller is not provided, we use $mysoc
 	$countryid=$seller->country_id;
 	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
 
 	// Now we search localtaxes information ourself (rates and types).
-	$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
+	$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
 	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
-	//$sql.= ", ".MAIN_DB_PREFIX."c_pays as cc";
+	//$sql.= ", ".MAIN_DB_PREFIX."c_pays as cc";
 	$sql.= " WHERE cv.taux = ".$txtva;
 	//$sql.= " AND cv.fk_pays = cc.rowid and cc.code = '".$mysoc->country_code."'";
-	$sql.= " AND cv.fk_pays = ".$countryid;
+	$sql.= " AND cv.fk_pays = ".$countryid;
-	dol_syslog("search vat information sql=".$sql);
+	dol_syslog("search vat information sql=".$sql);
-	$resql = $db->query($sql);
+	$resql = $db->query($sql);
-	if ($resql)
+	if ($resql)
-	{
+	{
 		$obj = $db->fetch_object($resql);
 		if ($obj)
-		{
+		{
-			$localtax1_rate=$obj->localtax1;
+			$localtax1_rate=$obj->localtax1;
-			$localtax2_rate=$obj->localtax2;
+			$localtax2_rate=$obj->localtax2;
-			$localtax1_type=$obj->localtax1_type;
+			$localtax1_type=$obj->localtax1_type;
-			$localtax2_type=$obj->localtax2_type;
+			$localtax2_type=$obj->localtax2_type;
 			//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
-		}
+		}
 	}
-	else dol_print_error($db);
+	else dol_print_error($db);
 
 	// initialize total (may be HT or TTC depending on price_base_type)
 	$tot_sans_remise = $pu * $qty;

htdocs/core/modules/action/rapport.pdf.php

@@ -42,10 +42,10 @@ class CommActionRapport
 	var $title;
 	var $subject;
 
-	var $marge_gauche;
+	var $marge_gauche;
-	var	$marge_droite;
+	var	$marge_droite;
-	var	$marge_haute;
+	var	$marge_haute;
-	var	$marge_basse;
+	var	$marge_basse;
 
 
 	/**

htdocs/core/modules/facture/doc/pdf_crabe.modules.php

@@ -500,8 +500,8 @@ class pdf_crabe extends ModelePDFFactures
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		{
 			$tab3_posx -= 20;
 		}
 

htdocs/core/modules/propale/doc/pdf_azur.modules.php

@@ -283,13 +283,13 @@ class pdf_azur extends ModelePDFPropales
 
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
-					$pageposafter=$pdf->getPage();
+					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
@@ -298,15 +298,15 @@ class pdf_azur extends ModelePDFPropales
 							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
 							{
 								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
 								$pdf->setPage($pagenb+1);
 							}
 						}
 						else
 						{
-							// We found a page break
+							// We found a page break
-							$showpricebeforepagebreak=0;
+							$showpricebeforepagebreak=0;
 						}
 					}
 					else	// No pagebreak

htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php

@@ -739,9 +739,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		{
-			$tab3_posx -= 20;
+			$tab3_posx -= 20;
 		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);

htdocs/externalsite/admin/externalsite.php

@@ -79,7 +79,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'setup');
 
 print $langs->trans("Module100Desc")."<br>\n";
-print '<br>';
+print '<br>';
 
 print '<form name="externalsiteconfig" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

htdocs/holiday/class/holiday.class.php

@@ -1,20 +1,21 @@
 <?php
-/* Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2011      Dimitri Mouillard <dmouillard@teclib.com>
+ * Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
-*
+ * Copyright (C) 2012	Regis Houssin		<regis@dolibarr.fr>
-* 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
+ * This program is free software; you can redistribute it and/or modify
-* the Free Software Foundation; either version 2 of the License, or
+ * it under the terms of the GNU General Public License as published by
-* (at your option) any later version.
+ * the Free Software Foundation; either version 2 of the License, or
-*
+ * (at your option) any later version.
-* This program is distributed in the hope that it will be useful,
+ *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*
+ * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 /**
  *    \file       holiday.class.php
@@ -1182,12 +1183,12 @@ class Holiday extends CommonObject
             // On séléctionne les utilisateurs qui ne sont pas déjà dans le module
             $sql = "SELECT u.fk_user";
             $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as u";
-            $sql.= " WHERE u.fk_user NOT IN(".$listUsersDolibarr.")";
+            $sql.= " WHERE u.fk_user NOT IN (".$listUsersDolibarr.")";
 
-            $result = $this->db->query($sql);
+            $resql = $this->db->query($sql);
 
             // Si pas d'erreur SQL
-            if($result) {
+            if ($resql) {
 
                 $i = 0;
                 $num = $this->db->num_rows($resql);

htdocs/holiday/common.inc.php

@@ -43,14 +43,14 @@ if (empty($conf->holiday->enabled))
 }
 
 
-$verifConf.= "SELECT value";
+$sql = "SELECT value";
-$verifConf.= " FROM ".MAIN_DB_PREFIX."holiday_config";
+$sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
-$verifConf.= " WHERE name = 'userGroup'";
+$sql.= " WHERE name = 'userGroup'";
 
-$result = $db->query($verifConf);
+$result = $db->query($sql);
 $obj = $db->fetch_object($result);
 
-if($obj->value == NULL)
+if ($obj->value == NULL)
 {
     llxHeader('',$langs->trans('CPTitreMenu'));
     print '<div class="tabBar">';

htdocs/holiday/fiche.php

@@ -1,20 +1,21 @@
 <?php
-/* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2011      Dimitri Mouillard    <dmouillard@teclib.com>
+ * Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
-*
+ * Copyright (C) 2012	Regis Houssin		<regis@dolibarr.fr>
-* 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
+ * This program is free software; you can redistribute it and/or modify
-* the Free Software Foundation; either version 2 of the License, or
+ * it under the terms of the GNU General Public License as published by
-* (at your option) any later version.
+ * the Free Software Foundation; either version 2 of the License, or
-*
+ * (at your option) any later version.
-* This program is distributed in the hope that it will be useful,
+ *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*
+ * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 /**
  *   	\file       fiche.php
@@ -33,14 +34,14 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 
 // Get parameters
 $myparam = GETPOST("myparam");
-$action=GETPOST('action');
+$action=GETPOST('action', 'alpha');
-$id=GETPOST('id');
+$id=GETPOST('id', 'int');
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
 $user_id = $user->id;
-
+$now=dol_now();
 
 
 /*******************************************************************
@@ -50,7 +51,6 @@ $user_id = $user->id;
 // Si création de la demande
 if ($action == 'create')
 {
-
     // Si pas le droit de créer une demande
     if(!$user->rights->holiday->write)
     {
@@ -290,7 +290,6 @@ if ($action == 'confirm_send')
             $delayForRequest = $cp->getConfCP('delayForRequest');
             //$delayForRequest = $delayForRequest * (60*60*24);
 
-            $now=dol_now();
             $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
 
             // Si l'option pour avertir le valideur en cas de délai trop court
@@ -703,11 +702,11 @@ if (empty($id) || $action == 'add' || $action == 'request')
         // Liste des utiliseurs du groupes choisi dans la config
         $idGroupValid = $cp->getConfCP('userGroup');
 
-        $validator = new UserGroup($db,$idGroupValid);
+        $validator = new UserGroup($db, $idGroupValid);
         $valideurarray = $validator->listUsersForGroup();
 
         print '<td>';
-        print $html->select_dolusers($valideur,"valideur",1,"",0,$valideurarray,'');
+        print $html->select_dolusers($validator->id, "valideur", 1, "", 0, $valideurarray);
         print '</td>';
         print '</tr>';
         print '<tr>';

htdocs/holiday/index.php

@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012	Regis Houssin		<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -71,6 +71,7 @@ $search_statut   = GETPOST('select_statut');
 
 $max_year = 5;
 $min_year = 10;
+$filter='';
 
 llxHeader(array(),$langs->trans('CPTitreMenu'));
 
@@ -185,7 +186,7 @@ if($holiday_payes == '-1')
 $var=true; $num = count($holiday->holiday);
 $html = new Form($db);
 $htmlother = new FormOther($db);
-print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num,$nbtotalofrecords);
+print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, "", $num);
 
 print '<div class="tabBar">';
 

htdocs/langs/ca_ES/exports.lang

@@ -123,4 +123,8 @@ SuppliersProducts=Productes de proveïdors
 BankCode=Codi banc
 DeskCode=Codi oficina
 BankAccountNumber=Número compte
-BankAccountNumberKey=Dígit Control
+BankAccountNumberKey=Dígit Control
+## filters
+FilterableFields=Camps filtrables
+FilteredFields=Campos filtrats
+FilteredFieldsValues=Valors de filtres

htdocs/langs/ca_ES/languages.lang

@@ -42,4 +42,5 @@ Language_tr_TR=Turc
 Language_sl_SI=Eslovè
 Language_sv_SV=Suec
 Language_sv_SE=Suec
-Language_zh_CN=Xinès
+Language_zh_CN=Xinès
+Language_zh_TW=Xinès (Tradicional)

htdocs/langs/es_ES/exports.lang

@@ -123,4 +123,8 @@ SuppliersProducts=Productos de proveedores
 BankCode=Código banco
 DeskCode=Código oficina
 BankAccountNumber=Número cuenta
-BankAccountNumberKey=Dígito Control
+BankAccountNumberKey=Dígito Control
+## filters
+FilterableFields=Campos filtrables
+FilteredFields=Campos filtrados
+FilteredFieldsValues=Valores de filtros

htdocs/langs/es_ES/languages.lang

@@ -45,4 +45,5 @@ Language_tr_TR=Turco
 Language_sl_SI=Esloveno
 Language_sv_SV=Sueco
 Language_sv_SE=Sueco
-Language_zh_CN=Chino
+Language_zh_CN=Chino
+Language_zh_TW=Chino (Tradicional)

htdocs/product/stock/class/entrepot.class.php

@@ -265,7 +265,7 @@ class Entrepot extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			if ($this->db->num_rows($result) > 0)
+			if ($this->db->num_rows($result) > 0)
 			{
 				$obj=$this->db->fetch_object($result);
 

htdocs/webservices/server_invoice.php

@@ -294,7 +294,7 @@ function getInvoice($authentication,$id='',$ref='',$ref_ext='')
 					$linesresp[]=array(
 						'id'=>$line->rowid,
 						'type'=>$line->product_type,
-                        'desc'=>dol_htmlcleanlastbr($line->description),
+                        'desc'=>dol_htmlcleanlastbr($line->desc),
 					    'total_net'=>$line->total_ht,
 						'total_vat'=>$line->total_tva,
 						'total'=>$line->total_ttc,