Fix: errors in expedition module migration

htdocs/install/upgrade2.php

@@ -22,7 +22,7 @@
 	\file       htdocs/install/upgrade2.php
 	\brief      Effectue la migration de donnees diverses
 	\version    $Id$
-*/
+	*/
 
 include_once('./inc.php');
 if (file_exists($conffile)) include_once($conffile);
@@ -511,13 +511,13 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
 function migrate_paiements_orphelins_3($db,$langs,$conf)
 {
 
-/*
+	/*
-select p.rowid from llx_paiement as p left join llx_paiement_facture as pf on pf.fk_paiement=p.rowid WHERE pf.rowid IS NULL AND (p.fk_facture = 0 OR p.fk_facture IS NULL)
+	 select p.rowid from llx_paiement as p left join llx_paiement_facture as pf on pf.fk_paiement=p.rowid WHERE pf.rowid IS NULL AND (p.fk_facture = 0 OR p.fk_facture IS NULL)
-Poru chaque rep, test si
+	 Poru chaque rep, test si
-select count(*) from llx_bank where rowid = obj->fk_bank
+	 select count(*) from llx_bank where rowid = obj->fk_bank
-select count(*) from llx_bank_url where url_id = 128 and type='payment'
+	 select count(*) from llx_bank_url where url_id = 128 and type='payment'
-Si partout 0, on efface ligne de llx_paiement
+	 Si partout 0, on efface ligne de llx_paiement
-*/
+	 */
 
 }
 
@@ -1614,8 +1614,6 @@ function migrate_module_menus($db,$langs,$conf)
  */
 function migrate_commande_expedition($db,$langs,$conf)
 {
-	if ($conf->expedition->enabled)
-	{
 	print '<tr><td colspan="4">';
 
 	print '<br>';
@@ -1625,12 +1623,15 @@ function migrate_commande_expedition($db,$langs,$conf)
 	$obj = $db->fetch_object($result);
 	if ($obj)
 	{
+		$error = 0;
+		
+		$db->begin();
+		
 		$sql = "SELECT e.rowid, e.fk_commande FROM ".MAIN_DB_PREFIX."expedition as e";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$i = 0;
-				$error = 0;
 			$num = $db->num_rows($resql);
 
 			if ($num)
@@ -1653,10 +1654,13 @@ function migrate_commande_expedition($db,$langs,$conf)
 					print ". ";
 					$i++;
 				}
+			}
+
 			if ($error == 0)
 			{
 				$db->commit();
 				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
+				print $langs->trans('FieldRenamed')."<br>\n";
 				$db->query($sql);
 			}
 			else
@@ -1664,10 +1668,10 @@ function migrate_commande_expedition($db,$langs,$conf)
 				$db->rollback();
 			}
 		}
-      }
 		else
 		{
 			dolibarr_print_error($db);
+			$db->rollback();
 		}
 	}
 	else
@@ -1675,7 +1679,6 @@ function migrate_commande_expedition($db,$langs,$conf)
 		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 	print '</td></tr>';
-  }
 }
 
 /*
@@ -1683,8 +1686,6 @@ function migrate_commande_expedition($db,$langs,$conf)
  */
 function migrate_commande_livraison($db,$langs,$conf)
 {
-	if ($conf->livraison_bon->enabled)
-	{
 	print '<tr><td colspan="4">';
 
 	print '<br>';
@@ -1694,6 +1695,10 @@ function migrate_commande_livraison($db,$langs,$conf)
 	$obj = $db->fetch_object($result);
 	if ($obj)
 	{
+		$error = 0;
+		
+		$db->begin();
+		
 		$sql = "SELECT l.rowid, l.fk_commande";
 		$sql.= ", c.ref_client, c.date_livraison";
 		$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l, ".MAIN_DB_PREFIX."commande as c";
@@ -1702,13 +1707,10 @@ function migrate_commande_livraison($db,$langs,$conf)
 		if ($resql)
 		{
 			$i = 0;
-				$error = 0;
 			$num = $db->num_rows($resql);
 
 			if ($num)
 			{
-        	$db->begin();
-        	
 				while ($i < $num)
 				{
 					$obj = $db->fetch_object($resql);
@@ -1738,10 +1740,13 @@ function migrate_commande_livraison($db,$langs,$conf)
 					print ". ";
 					$i++;
 				}
+			}
+
 			if ($error == 0)
 			{
 				$db->commit();
 				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
+				print $langs->trans('FieldRenamed')."<br>\n";
 				$db->query($sql);
 			}
 			else
@@ -1749,10 +1754,10 @@ function migrate_commande_livraison($db,$langs,$conf)
 				$db->rollback();
 			}
 		}
-      }
 		else
 		{
 			dolibarr_print_error($db);
+			$db->rollback();
 		}
 	}
 	else
@@ -1760,7 +1765,6 @@ function migrate_commande_livraison($db,$langs,$conf)
 		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 	print '</td></tr>';
-  }
 }
 
 /*
@@ -1768,17 +1772,21 @@ function migrate_commande_livraison($db,$langs,$conf)
  */
 function migrate_detail_livraison($db,$langs,$conf)
 {
-	if ($conf->livraison->enabled)
-	{
 	print '<tr><td colspan="4">';
 
 	print '<br>';
 	print '<b>'.$langs->trans('MigrationDeliveryDetail')."</b><br>\n";
 
+	// This is done if field fk_commande_ligne exists.
+	// If not this means migration was already done.
 	$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet","fk_commande_ligne");
 	$obj = $db->fetch_object($result);
 	if ($obj)
 	{
+		$error = 0;
+
+		$db->begin();
+		
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.description, cd.subprice, cd.total_ht";
 		$sql.= ", ld.fk_livraison";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
@@ -1787,13 +1795,10 @@ function migrate_detail_livraison($db,$langs,$conf)
 		if ($resql)
 		{
 			$i = 0;
-				$error = 0;
 			$num = $db->num_rows($resql);
 
 			if ($num)
 			{
-        	$db->begin();
-        	
 				while ($i < $num)
 				{
 					$obj = $db->fetch_object($resql);
@@ -1843,10 +1848,13 @@ function migrate_detail_livraison($db,$langs,$conf)
 					$i++;
 				}
 
+			}
+
 			if ($error == 0)
 			{
 				$db->commit();
 				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet CHANGE fk_commande_ligne fk_origin_line integer";
+				print $langs->trans('FieldRenamed')."<br>\n";
 				$db->query($sql);
 			}
 			else
@@ -1854,10 +1862,10 @@ function migrate_detail_livraison($db,$langs,$conf)
 				$db->rollback();
 			}
 		}
-      }
 		else
 		{
 			dolibarr_print_error($db);
+			$db->rollback();
 		}
 	}
 	else
@@ -1872,10 +1880,9 @@ function migrate_detail_livraison($db,$langs,$conf)
 		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 	print '</td></tr>';
-  }
 }
 
-/* A faire egalement: Modif statut paye et fk_facture des factures payés completement
+/* A faire egalement: Modif statut paye et fk_facture des factures payes completement
 
 On recherche facture incorrecte:
 select f.rowid, f.total_ttc as t1, sum(pf.amount) as t2 from llx_facture as f, llx_paiement_facture as pf where pf.fk_facture=f.rowid and f.fk_statut in(2,3) and paye=0 and close_code is null group by f.rowid

htdocs/langs/en_US/install.lang

@@ -143,7 +143,10 @@ MigrationPaymentsNothingUpdatable=No more payments that can be corrected
 
 # Contracts Update
 MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
 
 # Contracts Empty Dates Update
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
@@ -172,4 +175,8 @@ MigrationReopeningContractsNothingToUpdate=No closed contract to open
 MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfert
 MigrationBankTransfertsNothingToUpdate=All links are up to date
 
+# Migration delivery
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
 

htdocs/langs/fr_FR/install.lang

@@ -177,5 +177,8 @@ MigrationReopeningContractsNothingToUpdate=Pas ou plus de contrats
 MigrationBankTransfertsUpdate=Mise a jour des liens entre ecriture bancaire et un transfert entre compte
 MigrationBankTransfertsNothingToUpdate=Aucun lien non à jour
 
-
+# Migration delivery
+MigrationShipmentOrderMatching=Mise a jour bon expedition
+MigrationDeliveryOrderMatching=Mise a jour bon reception
+MigrationDeliveryDetail=Mise a jour bon reception