From d705995a491325401ba731a38c90cd8db5b3afdd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 18 Oct 2012 10:36:53 +0200
Subject: [PATCH] Fix: convert line delimiters

---
 htdocs/admin/index.php                        |  6 +--
 htdocs/comm/fiche.php                         |  4 +-
 htdocs/contrat/fiche.php                      | 12 ++---
 htdocs/core/modules/modStock.class.php        | 50 +++++++++----------
 htdocs/fourn/fiche.php                        |  6 +--
 htdocs/product/stock/class/entrepot.class.php |  4 +-
 .../stock/class/mouvementstock.class.php      |  4 +-
 7 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index fa1b5405127..d63da5ea882 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -56,9 +56,9 @@ print $langs->trans("SetupDescription2")."<br><br>";
 print '<br>';
 //print '<hr style="color: #DDDDDD;">';
 print img_picto('','puce').' '.$langs->trans("SetupDescription3",DOL_URL_ROOT.'/admin/company.php?mainmenu=home');
-if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_PAYS))
-{
-	$langs->load("errors");
+if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_PAYS))
+{
+	$langs->load("errors");
 	$warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
 }
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 5680cfb676c..1f22f42eb4e 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -776,8 +776,8 @@ if ($id > 0)
 		{
 			if ($user->rights->facture->creer)
 			{
-				$langs->load("bills");
-				$langs->load("orders");
+				$langs->load("bills");
+				$langs->load("orders");
 
 				if (! empty($conf->commande->enabled))
 				{
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index d980a8fac2d..ca6b2eadae1 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -627,9 +627,9 @@ if ($action == 'create')
 
     print '<tr><td>'.$langs->trans("NotePublic").'</td><td valign="top">';
 
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('note_public', GETPOST('note_public'), '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
-    print $doleditor->Create(1);
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('note_public', GETPOST('note_public'), '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
+    print $doleditor->Create(1);
     /*
     print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">';
     print GETPOST("note_public");
@@ -639,9 +639,9 @@ if ($action == 'create')
     if (! $user->societe_id)
     {
         print '<tr><td>'.$langs->trans("NotePrivate").'</td><td valign="top">';
-        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-        $doleditor=new DolEditor('note', GETPOST('note'), '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
-        print $doleditor->Create(1);
+        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+        $doleditor=new DolEditor('note', GETPOST('note'), '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
+        print $doleditor->Create(1);
         /*
         print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
         print GETPOST("note");
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 092cb0117d8..03a6a22c62a 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -133,31 +133,31 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r] .=' AND e.entity = '.$conf->entity;
 		
 		
-		// Imports
-		//--------
-		
-		$r=0;
-		
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="Warehouses";	// Translation key
-		$this->import_icon[$r]=$this->picto;
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('e'=>MAIN_DB_PREFIX.'entrepot');
-		$this->import_tables_creator_array[$r]=array('e'=>'fk_user_author');
-		$this->import_fields_array[$r]=array('e.label'=>"LocationSummary*",
-				'e.description'=>"DescWareHouse",'e.lieu'=>"LieuWareHouse",
-				'e.address'=>"Address",'e.cp'=>'Zip','e.fk_pays'=>'CountryCode',
-				'e.statut'=>'Status'
-		);
-		
-		$this->import_convertvalue_array[$r]=array(
-				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionnaryCountry')
-		);
-		$this->import_regex_array[$r]=array('e.statut'=>'^[0|1]');
-		$this->import_examplevalues_array[$r]=array('e.label'=>"ALM001",
-				'e.description'=>"Central Warehouse",'e.lieu'=>"Central",
-				'e.address'=>"Route 66",'e.cp'=>'28080','e.fk_pays'=>'US',
+		// Imports
+		//--------
+		
+		$r=0;
+		
+		$r++;
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]="Warehouses";	// Translation key
+		$this->import_icon[$r]=$this->picto;
+		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r]=array('e'=>MAIN_DB_PREFIX.'entrepot');
+		$this->import_tables_creator_array[$r]=array('e'=>'fk_user_author');
+		$this->import_fields_array[$r]=array('e.label'=>"LocationSummary*",
+				'e.description'=>"DescWareHouse",'e.lieu'=>"LieuWareHouse",
+				'e.address'=>"Address",'e.cp'=>'Zip','e.fk_pays'=>'CountryCode',
+				'e.statut'=>'Status'
+		);
+		
+		$this->import_convertvalue_array[$r]=array(
+				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionnaryCountry')
+		);
+		$this->import_regex_array[$r]=array('e.statut'=>'^[0|1]');
+		$this->import_examplevalues_array[$r]=array('e.label'=>"ALM001",
+				'e.description'=>"Central Warehouse",'e.lieu'=>"Central",
+				'e.address'=>"Route 66",'e.cp'=>'28080','e.fk_pays'=>'US',
 				'e.statut'=>'1');
 	}
 
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 254543f5960..dad9c11e14c 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -404,9 +404,9 @@ if ($object->fetch($id))
         show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?id='.$object->id);
     }
 
-    // Addresses list
-    if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
-    {
+    // Addresses list
+    if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
+    {
     	$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
     }
 
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 1b7622e105b..30a590016e5 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -209,8 +209,8 @@ class Entrepot extends CommonObject
 			// Update denormalized fields because we change content of produt_stock
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product p SET p.stock= (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock ps WHERE ps.fk_product = p.rowid)";
 
-			dol_syslog(get_class($this)."::delete sql=".$sql);
-			$resql2=$this->db->query($sql);
+			dol_syslog(get_class($this)."::delete sql=".$sql);
+			$resql2=$this->db->query($sql);
 
 			if ($resql1 && $resql2)
 			{
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index e31134a613d..e7a30ab3c96 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -194,8 +194,8 @@ class MouvementStock
 			{
 				$sql = "UPDATE ".MAIN_DB_PREFIX."product SET pmp = ".$newpmp.", stock = ".$this->db->ifsql("stock IS NULL", 0, "stock") . " + ".$qty;
 				$sql.= " WHERE rowid = ".$fk_product;
-				// May be this request is better:
-				// UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);
+				// May be this request is better:
+				// UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);
 
 				dol_syslog(get_class($this)."::_create sql=".$sql);
 				$resql=$this->db->query($sql);