From e0c724f3be20b55a9c123d98e3924b721dc13c06 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 22 Jun 2006 22:00:23 +0000
Subject: [PATCH] Trad: Ajout champ total_ht, total_tva et total_ttc au niveau
 de lignes detail des entites

---
 htdocs/install/upgrade2.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 113c2bc1f6d..4e4b167cc7d 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -170,11 +170,11 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
 
         migrate_modeles($db,$langs,$conf);
 
-//		migrate_price_propal($db,$langs,$conf);
+		migrate_price_propal($db,$langs,$conf);
 
-//		migrate_price_commande($db,$langs,$conf);
+		migrate_price_commande($db,$langs,$conf);
 
-//		migrate_price_facture($db,$langs,$conf);
+		migrate_price_facture($db,$langs,$conf);
 
     	// On commit dans tous les cas.
     	// La procédure etant conçue pour pouvoir passer plusieurs fois quelquesoit la situation.
@@ -615,7 +615,7 @@ function migrate_price_facture($db,$langs,$conf)
 		$sql.= " f.rowid as facid, f.remise_percent as remise_percent_global";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
 		$sql.= " WHERE fd.fk_facture = f.rowid";
-		$sql.= " AND (fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL";
+		$sql.= " AND ((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL)";
 		$resql=$db->query($sql);
 		if ($resql)
 		{
@@ -649,7 +649,7 @@ function migrate_price_facture($db,$langs,$conf)
 					
 					dolibarr_install_syslog("Line $rowid: facid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
 					print ". ";
-					$facligne->update();
+					$facligne->update_total();
 															
 					
 					/* On touche pas a facture mere
@@ -718,7 +718,7 @@ function migrate_price_propal($db,$langs,$conf)
 		$sql.= " p.rowid as propalid, p.remise_percent as remise_percent_global";
 		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
 		$sql.= " WHERE pd.fk_propal = p.rowid";
-		$sql.= " AND (pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL";
+		$sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
 		$resql=$db->query($sql);
 		if ($resql)
 		{
@@ -752,7 +752,7 @@ function migrate_price_propal($db,$langs,$conf)
 					
 					dolibarr_install_syslog("Line $rowid: propalid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
 					print ". ";
-					$propalligne->update($rowid);
+					$propalligne->update_total($rowid);
 
 
 					/* On touche pas a propal mere
@@ -820,7 +820,7 @@ function migrate_price_commande($db,$langs,$conf)
 		$sql.= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
 		$sql.= " WHERE cd.fk_commande = c.rowid";
-		$sql.= " AND (cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL";
+		$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 		$resql=$db->query($sql);
 		if ($resql)
 		{
@@ -854,7 +854,7 @@ function migrate_price_commande($db,$langs,$conf)
 					
 					dolibarr_install_syslog("Line $rowid: commandeid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
 					print ". ";
-					$commandeligne->update($rowid);
+					$commandeligne->update_total($rowid);
 
 					/* On touche pas a facture mere
 					$commande = new Commande($db);