alxarafe / alixar

dolibarr/htdocs/societe/admin/societe.php

Indentation +475 added lines, -475 removed lines

@@ -46,169 +46,169 @@ 
 
 if ($action == 'setcodeclient')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 if ($action == 'setcodecompta')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 if ($action == 'updateoptions')
 {
-	if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT'))
-	{
-		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
-		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
-		if (! $error)
-	    {
-		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    }
-	    else
-	    {
-		    setEventMessages($langs->trans("Error"), null, 'errors');
-		}
-	}
-
-	if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
-	{
-		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
-		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
-		if (! $error)
-		{
-			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
-			setEventMessages($langs->trans("Error"), null, 'errors');
-		}
-	}
+    if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT'))
+    {
+        $companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
+        $res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
+        if (! $res > 0) $error++;
+        if (! $error)
+        {
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans("Error"), null, 'errors');
+        }
+    }
+
+    if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
+    {
+        $contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
+        $res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
+        if (! $res > 0) $error++;
+        if (! $error)
+        {
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans("Error"), null, 'errors');
+        }
+    }
 }
 
 // Activate a document generator module
 if ($action == 'set')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scan_dir','alpha');
+    $label = GETPOST('label','alpha');
+    $scandir = GETPOST('scan_dir','alpha');
 
-	$type='company';
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
-	$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-	$sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
-	$sql.= ")";
+    $type='company';
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
+    $sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
+    $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
+    $sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
+    $sql.= ")";
 
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+    $resql=$db->query($sql);
+    if (! $resql) dol_print_error($db);
 }
 
 // Disable a document generator module
 if ($action== 'del')
 {
-	$type='company';
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql.= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+    $type='company';
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+    $sql.= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
+    $resql=$db->query($sql);
+    if (! $resql) dol_print_error($db);
 }
 
 // Define default generator
 if ($action == 'setdoc')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scan_dir','alpha');
+    $label = GETPOST('label','alpha');
+    $scandir = GETPOST('scan_dir','alpha');
 
-	$db->begin();
+    $db->begin();
 
-	dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity);
 
-	// On active le modele
-	$type='company';
-	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql_del.= " WHERE nom = '".$db->escape(GETPOST('value','alpha'))."'";
-	$sql_del.= " AND type = '".$type."'";
-	$sql_del.= " AND entity = ".$conf->entity;
+    // On active le modele
+    $type='company';
+    $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+    $sql_del.= " WHERE nom = '".$db->escape(GETPOST('value','alpha'))."'";
+    $sql_del.= " AND type = '".$type."'";
+    $sql_del.= " AND entity = ".$conf->entity;
     dol_syslog("societe.php ".$sql);
-	$result1=$db->query($sql_del);
+    $result1=$db->query($sql_del);
 
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql.= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", ";
-	$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-	$sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
-	$sql.= ")";
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
+    $sql.= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", ";
+    $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
+    $sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
+    $sql.= ")";
     dol_syslog("societe.php", LOG_DEBUG);
-	$result2=$db->query($sql);
-	if ($result1 && $result2)
-	{
-		$db->commit();
-	}
-	else
-	{
-	    $db->rollback();
-	}
+    $result2=$db->query($sql);
+    if ($result1 && $result2)
+    {
+        $db->commit();
+    }
+    else
+    {
+        $db->rollback();
+    }
 }
 
 //Activate Set ref in list
 if ($action=="setaddrefinlist") {
-	$setaddrefinlist = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
+    $setaddrefinlist = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
 }
 
 //Activate Set adress in list
 if ($action=="setaddadressinlist") {
-	$val = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
+    $val = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
 }
 
 //Activate Ask For Preferred Shipping Method
 if ($action=="setaskforshippingmet") {
-	$setaskforshippingmet = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
+    $setaskforshippingmet = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
 }
 
 //Activate "Disable prospect/customer type"
@@ -229,81 +229,81 @@ 
 //Activate ProfId unique
 if ($action == 'setprofid')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	$idprof="SOCIETE_".$value."_UNIQUE";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $idprof="SOCIETE_".$value."_UNIQUE";
+    if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        //header("Location: ".$_SERVER["PHP_SELF"]);
+        //exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 //Activate ProfId mandatory
 if ($action == 'setprofidmandatory')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	$idprof="SOCIETE_".$value."_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $idprof="SOCIETE_".$value."_MANDATORY";
+    if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        //header("Location: ".$_SERVER["PHP_SELF"]);
+        //exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 //Activate ProfId invoice mandatory
 if ($action == 'setprofidinvoicemandatory')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	$idprof="SOCIETE_".$value."_INVOICE_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $idprof="SOCIETE_".$value."_INVOICE_MANDATORY";
+    if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        //header("Location: ".$_SERVER["PHP_SELF"]);
+        //exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 //Set hide closed customer into combox or select
 if ($action == 'sethideinactivethirdparty')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX",$status,'chaine',0,'',$conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX",$status,'chaine',0,'',$conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 if($action=='setonsearchandlistgooncustomerorsuppliercard'){
-       $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
-       $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
-       if (! $res > 0) $error++;
-       if (! $error)
-       {
-               setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-       }
-       else
-       {
-               setEventMessages($langs->trans("Error"), null, 'errors');
-       }
+        $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
+        $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
+        if (! $res > 0) $error++;
+        if (! $error)
+        {
+                setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+                setEventMessages($langs->trans("Error"), null, 'errors');
+        }
 }
 
 
@@ -343,63 +343,63 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot,0);
+    $dir = dol_buildpath($dirroot,0);
 
     $handle = @opendir($dir);
     if (is_resource($handle))
     {
-    	// Loop on each module find in opened directory
-    	while (($file = readdir($handle))!==false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file)-4);
-
-    			try {
-        			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$modCodeTiers = new $file;
-
-    			// Show modules according to features level
-    			if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
-    			print '<tr class="oddeven">'."\n";
-    			print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
-    			print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
-    			print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
-
-    			if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
-    			{
-    				print '<td align="center">'."\n";
-    				print img_picto($langs->trans("Activated"),'switch_on');
-    				print "</td>\n";
-    			}
-    			else
-    			{
-    				$disabled = false;
-    				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
-    				print '<td align="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"),'switch_off');
-    				if (! $disabled) print '</a>';
-    				print '</td>';
-    			}
-
-    			print '<td align="center">';
-    			$s=$modCodeTiers->getToolTip($langs,null,-1);
-    			print $form->textwithpicto('',$s,1);
-    			print '</td>';
-
-    			print '</tr>';
-    		}
-    	}
-    	closedir($handle);
+        // Loop on each module find in opened directory
+        while (($file = readdir($handle))!==false)
+        {
+            if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
+            {
+                $file = substr($file, 0, dol_strlen($file)-4);
+
+                try {
+                    dol_include_once($dirroot.$file.'.php');
+                }
+                catch(Exception $e)
+                {
+                    dol_syslog($e->getMessage(), LOG_ERR);
+                }
+
+                $modCodeTiers = new $file;
+
+                // Show modules according to features level
+                if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+                if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+                print '<tr class="oddeven">'."\n";
+                print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
+                print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
+                print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
+
+                if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
+                {
+                    print '<td align="center">'."\n";
+                    print img_picto($langs->trans("Activated"),'switch_on');
+                    print "</td>\n";
+                }
+                else
+                {
+                    $disabled = false;
+                    if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
+                    print '<td align="center">';
+                    if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+                    print img_picto($langs->trans("Disabled"),'switch_off');
+                    if (! $disabled) print '</a>';
+                    print '</td>';
+                }
+
+                print '<td align="center">';
+                $s=$modCodeTiers->getToolTip($langs,null,-1);
+                print $form->textwithpicto('',$s,1);
+                print '</td>';
+
+                print '</tr>';
+            }
+        }
+        closedir($handle);
     }
 }
 print '</table>';
@@ -423,53 +423,53 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot,0);
+    $dir = dol_buildpath($dirroot,0);
 
-	$handle = @opendir($dir);
+    $handle = @opendir($dir);
     if (is_resource($handle))
     {
-    	while (($file = readdir($handle))!==false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file)-4);
-
-    		    try {
-        			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$modCodeCompta = new $file;
-
-    			print '<tr class="oddeven">';
-    			print '<td>'.$modCodeCompta->name."</td><td>\n";
-    			print $modCodeCompta->info($langs);
-    			print '</td>';
-    			print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
-
-    			if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
-    			{
-    				print '<td align="center">';
-    				print img_picto($langs->trans("Activated"),'switch_on');
-    				print '</td>';
-    			}
-    			else
-    			{
-    				print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"),'switch_off');
-    				print '</a></td>';
-    			}
-    			print '<td align="center">';
-    			$s=$modCodeCompta->getToolTip($langs,null,-1);
-    			print $form->textwithpicto('',$s,1);
-    			print '</td>';
-    			print "</tr>\n";
-    		}
-    	}
-    	closedir($handle);
+        while (($file = readdir($handle))!==false)
+        {
+            if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
+            {
+                $file = substr($file, 0, dol_strlen($file)-4);
+
+                try {
+                    dol_include_once($dirroot.$file.'.php');
+                }
+                catch(Exception $e)
+                {
+                    dol_syslog($e->getMessage(), LOG_ERR);
+                }
+
+                $modCodeCompta = new $file;
+
+                print '<tr class="oddeven">';
+                print '<td>'.$modCodeCompta->name."</td><td>\n";
+                print $modCodeCompta->info($langs);
+                print '</td>';
+                print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
+
+                if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
+                {
+                    print '<td align="center">';
+                    print img_picto($langs->trans("Activated"),'switch_on');
+                    print '</td>';
+                }
+                else
+                {
+                    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
+                    print img_picto($langs->trans("Disabled"),'switch_off');
+                    print '</a></td>';
+                }
+                print '<td align="center">';
+                $s=$modCodeCompta->getToolTip($langs,null,-1);
+                print $form->textwithpicto('',$s,1);
+                print '</td>';
+                print "</tr>\n";
+            }
+        }
+        closedir($handle);
     }
 }
 print "</table>\n";
@@ -490,18 +490,18 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$i = 0;
-	$num_rows=$db->num_rows($resql);
-	while ($i < $num_rows)
-	{
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
-		$i++;
-	}
+    $i = 0;
+    $num_rows=$db->num_rows($resql);
+    while ($i < $num_rows)
+    {
+        $array = $db->fetch_array($resql);
+        array_push($def, $array[0]);
+        $i++;
+    }
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 print '<table class="noborder" width="100%">';
@@ -515,108 +515,108 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot.'doc/',0);
-
-	$handle=@opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle))!==false)
-		{
-			if (preg_match('/\.modules\.php$/i',$file))
-			{
-				$name = substr($file, 4, dol_strlen($file) -16);
-				$classname = substr($file, 0, dol_strlen($file) -12);
-
-			    try {
-        			dol_include_once($dirroot.'doc/'.$file);
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$module = new $classname($db);
-
-				$modulequalified=1;
-				if (! empty($module->version)) {
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-				}
-
-				if ($modulequalified)
-				{
-					print '<tr class="oddeven"><td width="100">';
-					print $module->name;
-					print "</td><td>\n";
-					if (method_exists($module,'info')) print $module->info($langs);
-					else print $module->description;
-					print '</td>';
-
-					// Activate / Disable
-					if (in_array($name, $def))
-					{
-						print "<td align=\"center\">\n";
-						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
-						//{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
-							print img_picto($langs->trans("Enabled"),'switch_on');
-							print '</a>';
-						//}
-						//else
-						//{
-						//	print img_picto($langs->trans("Enabled"),'on');
-						//}
-						print "</td>";
-					}
-					else
-					{
-						if (versioncompare($module->phpmin,versionphparray()) > 0)
-						{
-							print "<td align=\"center\">\n";
-							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
-							print "</td>";
-						}
-						else
-						{
-							print "<td align=\"center\">\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-							print "</td>";
-						}
-					}
-
-					// Info
-					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-					if ($module->type == 'pdf')
-					{
-						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
-					}
-					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
-
-					print '<td align="center" class="nowrap">';
-					print $form->textwithpicto('',$htmltooltip,1,0);
-					print '</td>';
-
-					// Preview
-					print '<td align="center" class="nowrap">';
-					if ($module->type == 'pdf')
-					{
-						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-					}
-					else
-					{
-						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
-					}
-					print $linkspec;
-					print '</td>';
-
-					print "</tr>\n";
-				}
-			}
-		}
-		closedir($handle);
-	}
+    $dir = dol_buildpath($dirroot.'doc/',0);
+
+    $handle=@opendir($dir);
+    if (is_resource($handle))
+    {
+        while (($file = readdir($handle))!==false)
+        {
+            if (preg_match('/\.modules\.php$/i',$file))
+            {
+                $name = substr($file, 4, dol_strlen($file) -16);
+                $classname = substr($file, 0, dol_strlen($file) -12);
+
+                try {
+                    dol_include_once($dirroot.'doc/'.$file);
+                }
+                catch(Exception $e)
+                {
+                    dol_syslog($e->getMessage(), LOG_ERR);
+                }
+
+                $module = new $classname($db);
+
+                $modulequalified=1;
+                if (! empty($module->version)) {
+                    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+                    else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+                }
+
+                if ($modulequalified)
+                {
+                    print '<tr class="oddeven"><td width="100">';
+                    print $module->name;
+                    print "</td><td>\n";
+                    if (method_exists($module,'info')) print $module->info($langs);
+                    else print $module->description;
+                    print '</td>';
+
+                    // Activate / Disable
+                    if (in_array($name, $def))
+                    {
+                        print "<td align=\"center\">\n";
+                        //if ($conf->global->COMPANY_ADDON_PDF != "$name")
+                        //{
+                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
+                            print img_picto($langs->trans("Enabled"),'switch_on');
+                            print '</a>';
+                        //}
+                        //else
+                        //{
+                        //	print img_picto($langs->trans("Enabled"),'on');
+                        //}
+                        print "</td>";
+                    }
+                    else
+                    {
+                        if (versioncompare($module->phpmin,versionphparray()) > 0)
+                        {
+                            print "<td align=\"center\">\n";
+                            print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
+                            print "</td>";
+                        }
+                        else
+                        {
+                            print "<td align=\"center\">\n";
+                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+                            print "</td>";
+                        }
+                    }
+
+                    // Info
+                    $htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+                    $htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+                    if ($module->type == 'pdf')
+                    {
+                        $htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
+                    }
+                    $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+                    $htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
+
+                    print '<td align="center" class="nowrap">';
+                    print $form->textwithpicto('',$htmltooltip,1,0);
+                    print '</td>';
+
+                    // Preview
+                    print '<td align="center" class="nowrap">';
+                    if ($module->type == 'pdf')
+                    {
+                        $linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+                    }
+                    else
+                    {
+                        $linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
+                    }
+                    print $linkspec;
+                    print '</td>';
+
+                    print "</tr>\n";
+                }
+            }
+        }
+        closedir($handle);
+    }
 }
 print '</table>';
 
@@ -652,63 +652,63 @@ 
 $nbofloop=count($profid);
 foreach($profid as $key => $val)
 {
-	if ($profid[$key][1]!='-')
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$profid[$key][0]."</td><td>\n";
-		print $profid[$key][1];
-		print '</td>';
-
-		$idprof_unique ='SOCIETE_'.$key.'_UNIQUE';
-		$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-		$idprof_invoice_mandatory ='SOCIETE_'.$key.'_INVOICE_MANDATORY';
-
-		$verif=(empty($conf->global->$idprof_unique)?false:true);
-		$mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
-		$invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true);
-
-		if ($verif)
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
-			print '</a></td>';
-		}
-		else
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
-			print '</a></td>';
-		}
-
-		if ($mandatory)
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
-			print '</a></td>';
-		}
-		else
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
-			print '</a></td>';
-		}
-
-		if ($invoice_mandatory)
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
-			print '</a></td>';
-		}
-		else
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
-			print '</a></td>';
-		}
-
-		print "</tr>\n";
-	}
-	$i++;
+    if ($profid[$key][1]!='-')
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$profid[$key][0]."</td><td>\n";
+        print $profid[$key][1];
+        print '</td>';
+
+        $idprof_unique ='SOCIETE_'.$key.'_UNIQUE';
+        $idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
+        $idprof_invoice_mandatory ='SOCIETE_'.$key.'_INVOICE_MANDATORY';
+
+        $verif=(empty($conf->global->$idprof_unique)?false:true);
+        $mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
+        $invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true);
+
+        if ($verif)
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
+            print img_picto($langs->trans("Activated"),'switch_on');
+            print '</a></td>';
+        }
+        else
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
+            print img_picto($langs->trans("Disabled"),'switch_off');
+            print '</a></td>';
+        }
+
+        if ($mandatory)
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
+            print img_picto($langs->trans("Activated"),'switch_on');
+            print '</a></td>';
+        }
+        else
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
+            print img_picto($langs->trans("Disabled"),'switch_off');
+            print '</a></td>';
+        }
+
+        if ($invoice_mandatory)
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
+            print img_picto($langs->trans("Activated"),'switch_on');
+            print '</a></td>';
+        }
+        else
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
+            print img_picto($langs->trans("Disabled"),'switch_off');
+            print '</a></td>';
+        }
+
+        print "</tr>\n";
+    }
+    $i++;
 }
 
 print "</table><br>\n";
@@ -735,22 +735,22 @@ 
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' </td>';
 if (! $conf->use_javascript_ajax)
 {
-	print '<td class="nowrap" align="right" colspan="2">';
-	print $langs->trans("NotAvailableWhenAjaxDisabled");
-	print "</td>";
+    print '<td class="nowrap" align="right" colspan="2">';
+    print $langs->trans("NotAvailableWhenAjaxDisabled");
+    print "</td>";
 }
 else
 {
-	print '<td width="60" align="right">';
-	$arrval=array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
+    print '<td width="60" align="right">';
+    $arrval=array('0'=>$langs->trans("No"),
+    '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
     '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
     '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
-	);
-	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
-	print '</td><td align="right">';
-	print '<input type="submit" class="button" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
-	print "</td>";
+    );
+    print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+    print '</td><td align="right">';
+    print '<input type="submit" class="button" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
+    print "</td>";
 }
 print '</tr>';
 
@@ -759,22 +759,22 @@ 
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'</td>';
 if (! $conf->use_javascript_ajax)
 {
-	print '<td class="nowrap" align="right" colspan="2">';
-	print $langs->trans("NotAvailableWhenAjaxDisabled");
-	print "</td>";
+    print '<td class="nowrap" align="right" colspan="2">';
+    print $langs->trans("NotAvailableWhenAjaxDisabled");
+    print "</td>";
 }
 else
 {
-	print '<td width="60" align="right">';
-	$arrval=array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
-	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
-	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
-	);
-	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
-	print '</td><td align="right">';
-	print '<input type="submit" class="button" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
-	print "</td>";
+    print '<td width="60" align="right">';
+    $arrval=array('0'=>$langs->trans("No"),
+    '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
+    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
+    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
+    );
+    print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+    print '</td><td align="right">';
+    print '<input type="submit" class="button" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
+    print "</td>";
 }
 print '</tr>';
 
@@ -786,13 +786,13 @@ 
 print '<td align="center">';
 if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -803,13 +803,13 @@ 
 print '<td align="center">';
 if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -822,13 +822,13 @@ 
 print '<td align="center">';
 if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
 }
 print '</a></td>';
 print '</tr>';

dolibarr/htdocs/societe/admin/contact_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -93,8 +93,8 @@
 
 if ($action == 'create')
 {
-	print '<br><div id="newattrib"></div>';
-	print load_fiche_titre($langs->trans('NewAttribute'));
+    print '<br><div id="newattrib"></div>';
+    print load_fiche_titre($langs->trans('NewAttribute'));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }

dolibarr/htdocs/societe/ajax/company.php

Indentation +27 added lines, -27 removed lines

@@ -50,48 +50,48 @@
 
 if (! empty($action) && $action == 'fetch' && ! empty($id))
 {
-	require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
-	$outjson=array();
+    $outjson=array();
 
-	$object = new Societe($db);
-	$ret=$object->fetch($id);
-	if ($ret > 0)
-	{
-		$outname=$object->name;
-		$outlabel = '';
-		$outdesc = '';
-		$outtype = $object->type;
+    $object = new Societe($db);
+    $ret=$object->fetch($id);
+    if ($ret > 0)
+    {
+        $outname=$object->name;
+        $outlabel = '';
+        $outdesc = '';
+        $outtype = $object->type;
 
-		$outjson = array('ref' => $outref,'name' => $outname,'desc' => $outdesc,'type' => $outtype);
-	}
+        $outjson = array('ref' => $outref,'name' => $outname,'desc' => $outdesc,'type' => $outtype);
+    }
 
-	echo json_encode($outjson);
+    echo json_encode($outjson);
 }
 else
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
-	$langs->load("companies");
+    $langs->load("companies");
 
-	top_httphead();
+    top_httphead();
 
-	if (empty($htmlname)) return;
+    if (empty($htmlname)) return;
 
-	$match = preg_grep('/('.$htmlname.'[0-9]+)/',array_keys($_GET));
-	sort($match);
-	$id = (! empty($match[0]) ? $match[0] : '');
+    $match = preg_grep('/('.$htmlname.'[0-9]+)/',array_keys($_GET));
+    sort($match);
+    $id = (! empty($match[0]) ? $match[0] : '');
 
-	// When used from jQuery, the search term is added as GET param "term".
-	$searchkey=(($id && GETPOST($id, 'alpha'))?GETPOST($id, 'alpha'):(($htmlname && GETPOST($htmlname, 'alpha'))?GETPOST($htmlname, 'alpha'):''));
+    // When used from jQuery, the search term is added as GET param "term".
+    $searchkey=(($id && GETPOST($id, 'alpha'))?GETPOST($id, 'alpha'):(($htmlname && GETPOST($htmlname, 'alpha'))?GETPOST($htmlname, 'alpha'):''));
 
-	if (! $searchkey) return;
+    if (! $searchkey) return;
 
-	if (! is_object($form)) $form = new Form($db);
-	$arrayresult=$form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson);
+    if (! is_object($form)) $form = new Form($db);
+    $arrayresult=$form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson);
 
-	$db->close();
+    $db->close();
 
-	if ($outjson) print json_encode($arrayresult);
+    if ($outjson) print json_encode($arrayresult);
 }
 

dolibarr/htdocs/societe/checkvat/checkVatPopup.php

Indentation +104 added lines, -104 removed lines

@@ -49,117 +49,117 @@ 
 
 if (! $vatNumber)
 {
-	print '<br>';
-	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired",$langs->trans("VATIntraShort")).'</font><br>';
+    print '<br>';
+    print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired",$langs->trans("VATIntraShort")).'</font><br>';
 }
 else
 {
-	$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
-	$countryCode=substr($vatNumber,0,2);
-	$vatNumber=substr($vatNumber,2);
+    $vatNumber = preg_replace('/\^\w/', '', $vatNumber);
+    $countryCode=substr($vatNumber,0,2);
+    $vatNumber=substr($vatNumber,2);
 
-	print '<b>'.$langs->trans("Country").'</b>: '.$countryCode.'<br>';
-	print '<b>'.$langs->trans("VATIntraShort").'</b>: '.$vatNumber.'<br>';
-	print '<br>';
+    print '<b>'.$langs->trans("Country").'</b>: '.$countryCode.'<br>';
+    print '<b>'.$langs->trans("VATIntraShort").'</b>: '.$vatNumber.'<br>';
+    print '<br>';
 
-	// Set the parameters to send to the WebService
-	$parameters = array("countryCode" => $countryCode,
-						"vatNumber" => $vatNumber);
+    // Set the parameters to send to the WebService
+    $parameters = array("countryCode" => $countryCode,
+                        "vatNumber" => $vatNumber);
 
-	// Set the WebService URL
-	dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL);
+    // Set the WebService URL
+    dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL);
     require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
     $params=getSoapParams();
     //ini_set('default_socket_timeout', $params['response_timeout']);
     //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
-	$soapclient = new nusoap_client($WS_DOL_URL_WSDL,true,$params['proxy_host'],$params['proxy_port'],$params['proxy_login'],$params['proxy_password'],$params['connection_timeout'],$params['response_timeout']);
-	$soapclient->soap_defencoding = 'utf-8';
-	$soapclient->xml_encoding = 'utf-8';
-	$soapclient->decode_utf8 = false;
-
-	// Check for an error
-	$err = $soapclient->getError();
-	if ($err)
-	{
-		dol_syslog("Constructor error ".$WS_DOL_URL, LOG_ERR);
-	}
-
-	// Call the WebService and store its result in $result.
-	dol_syslog("Call method ".$WS_METHOD);
-	$result = $soapclient->call($WS_METHOD,$parameters);
-
-	//var_dump($parameters);
-	//var_dump($soapclient);
-	//print "x".is_array($result)."i";
-	//var_dump($result);
-	//print $soapclient->request.'<br>';
-	//print $soapclient->response.'<br>';
-
-	$messagetoshow='';
-	print '<b>'.$langs->trans("Response").'</b>:<br>';
-
-	// Service indisponible
-	if (! is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i',$result['faultstring']))
-	{
-		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
-		$messagetoshow=$soapclient->response;
-	}
-	elseif (preg_match('/TIMEOUT/i',$result['faultstring']))
-	{
-		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
-		$messagetoshow=$soapclient->response;
-	}
-	elseif (preg_match('/SERVER_BUSY/i',$result['faultstring']))
-	{
-		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
-		$messagetoshow=$soapclient->response;
-	}
-	elseif ($result['faultstring'])
-	{
-		print '<font class="error">'.$langs->trans("Error").'</font><br>';
-		$messagetoshow=$result['faultstring'];
-	}
-	// Syntaxe ko
-	elseif (preg_match('/INVALID_INPUT/i',$result['faultstring'])
-	|| ($result['requestDate'] && ! $result['valid']))
-	{
-		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
-		print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
-		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
-		//$messagetoshow=$soapclient->response;
-	}
-	else
-	{
-		// Syntaxe ok
-		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
-		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
-		print $langs->trans("ValueIsValid").': ';
-		if (preg_match('/MS_UNAVAILABLE/i',$result['faultstring']))
-		{
-			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$countryCode).'</font><br>';
-		}
-		else
-		{
-			if (! empty($result['valid']) && ($result['valid']==1 || $result['valid']=='true'))
-			{
-				print '<font class="ok">'.$langs->trans("Yes").'</font>';
-				print '<br>';
-				print $langs->trans("Name").': '.$result['name'].'<br>';
-				print $langs->trans("Address").': '.$result['address'].'<br>';
-			}
-			else
-			{
-				print '<font class="error">'.$langs->trans("No").'</font>';
-				print '<br>'."\n";
-			}
-		}
-	}
-
-	// Show log data into page
-	print "\n";
-	print '<!-- ';
-	var_dump($result);
-	print '-->';
+    $soapclient = new nusoap_client($WS_DOL_URL_WSDL,true,$params['proxy_host'],$params['proxy_port'],$params['proxy_login'],$params['proxy_password'],$params['connection_timeout'],$params['response_timeout']);
+    $soapclient->soap_defencoding = 'utf-8';
+    $soapclient->xml_encoding = 'utf-8';
+    $soapclient->decode_utf8 = false;
+
+    // Check for an error
+    $err = $soapclient->getError();
+    if ($err)
+    {
+        dol_syslog("Constructor error ".$WS_DOL_URL, LOG_ERR);
+    }
+
+    // Call the WebService and store its result in $result.
+    dol_syslog("Call method ".$WS_METHOD);
+    $result = $soapclient->call($WS_METHOD,$parameters);
+
+    //var_dump($parameters);
+    //var_dump($soapclient);
+    //print "x".is_array($result)."i";
+    //var_dump($result);
+    //print $soapclient->request.'<br>';
+    //print $soapclient->response.'<br>';
+
+    $messagetoshow='';
+    print '<b>'.$langs->trans("Response").'</b>:<br>';
+
+    // Service indisponible
+    if (! is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i',$result['faultstring']))
+    {
+        print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+        $messagetoshow=$soapclient->response;
+    }
+    elseif (preg_match('/TIMEOUT/i',$result['faultstring']))
+    {
+        print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+        $messagetoshow=$soapclient->response;
+    }
+    elseif (preg_match('/SERVER_BUSY/i',$result['faultstring']))
+    {
+        print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+        $messagetoshow=$soapclient->response;
+    }
+    elseif ($result['faultstring'])
+    {
+        print '<font class="error">'.$langs->trans("Error").'</font><br>';
+        $messagetoshow=$result['faultstring'];
+    }
+    // Syntaxe ko
+    elseif (preg_match('/INVALID_INPUT/i',$result['faultstring'])
+    || ($result['requestDate'] && ! $result['valid']))
+    {
+        if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+        print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
+        print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
+        //$messagetoshow=$soapclient->response;
+    }
+    else
+    {
+        // Syntaxe ok
+        if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+        print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
+        print $langs->trans("ValueIsValid").': ';
+        if (preg_match('/MS_UNAVAILABLE/i',$result['faultstring']))
+        {
+            print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$countryCode).'</font><br>';
+        }
+        else
+        {
+            if (! empty($result['valid']) && ($result['valid']==1 || $result['valid']=='true'))
+            {
+                print '<font class="ok">'.$langs->trans("Yes").'</font>';
+                print '<br>';
+                print $langs->trans("Name").': '.$result['name'].'<br>';
+                print $langs->trans("Address").': '.$result['address'].'<br>';
+            }
+            else
+            {
+                print '<font class="error">'.$langs->trans("No").'</font>';
+                print '<br>'."\n";
+            }
+        }
+    }
+
+    // Show log data into page
+    print "\n";
+    print '<!-- ';
+    var_dump($result);
+    print '-->';
 }
 
 print '<br>';
@@ -169,9 +169,9 @@ 
 
 if ($messagetoshow)
 {
-	print '<br><br>';
-	print "\n".'Error returned:<br>';
-	print nl2br($messagetoshow);
+    print '<br><br>';
+    print "\n".'Error returned:<br>';
+    print nl2br($messagetoshow);
 }
 
 // End of page

dolibarr/htdocs/societe/paymentmodes.php

Indentation +1402 added lines, -1402 removed lines

@@ -71,17 +71,17 @@ 
 
 if (! empty($conf->stripe->enabled))
 {
-	$service = 'StripeTest';
-	$servicestatus = 0;
-	if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
-	{
-		$service = 'StripeLive';
-		$servicestatus = 1;
-	}
-
-	$stripe = new Stripe($db);
-	$stripeacc = $stripe->getStripeAccount($service);								// Get Stripe OAuth connect account (no network access here)
-	$stripecu = $stripe->getStripeCustomerAccount($object->id, $servicestatus);		// Get remote Stripe customer 'cus_...' (no network access here)
+    $service = 'StripeTest';
+    $servicestatus = 0;
+    if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
+    {
+        $service = 'StripeLive';
+        $servicestatus = 1;
+    }
+
+    $stripe = new Stripe($db);
+    $stripeacc = $stripe->getStripeAccount($service);								// Get Stripe OAuth connect account (no network access here)
+    $stripecu = $stripe->getStripeCustomerAccount($object->id, $servicestatus);		// Get remote Stripe customer 'cus_...' (no network access here)
 }
 
 
@@ -92,7 +92,7 @@ 
 
 if ($cancel)
 {
-	$action='';
+    $action='';
 }
 
 $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
@@ -101,546 +101,546 @@ 
 
 if (empty($reshook))
 {
-	if ($cancel)
-	{
-		$action='';
-		if (! empty($backtopage))
-		{
-			header("Location: ".$backtopage);
-			exit;
-		}
-	}
-
-	if ($action == 'update')
-	{
-		// Modification
-		if (! GETPOST('label','alpha') || ! GETPOST('bank','alpha'))
-		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('bank','alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-			$action='edit';
-			$error++;
-		}
-		if ($companybankaccount->needIBAN() == 1)
-		{
-			if (! GETPOST('iban'))
-			{
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-				$action='edit';
-				$error++;
-			}
-			if (! GETPOST('bic'))
-			{
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-				$action='edit';
-				$error++;
-			}
-		}
-
-		$companybankaccount->fetch($id);
-		if (! $error)
-		{
-			$companybankaccount->socid           = $object->id;
-
-			$companybankaccount->bank            = GETPOST('bank','alpha');
-			$companybankaccount->label           = GETPOST('label','alpha');
-			$companybankaccount->courant         = GETPOST('courant','alpha');
-			$companybankaccount->clos            = GETPOST('clos','alpha');
-			$companybankaccount->code_banque     = GETPOST('code_banque','alpha');
-			$companybankaccount->code_guichet    = GETPOST('code_guichet','alpha');
-			$companybankaccount->number          = GETPOST('number','alpha');
-			$companybankaccount->cle_rib         = GETPOST('cle_rib','alpha');
-			$companybankaccount->bic             = GETPOST('bic','alpha');
-			$companybankaccount->iban            = GETPOST('iban','alpha');
-			$companybankaccount->domiciliation   = GETPOST('domiciliation','alpha');
-			$companybankaccount->proprio         = GETPOST('proprio','alpha');
-			$companybankaccount->owner_address   = GETPOST('owner_address','alpha');
-			$companybankaccount->frstrecur       = GETPOST('frstrecur','alpha');
-			$companybankaccount->rum             = GETPOST('rum','alpha');
-			if (empty($companybankaccount->rum))
-			{
-				$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
-				$companybankaccount->date_rum = dol_now();
-			}
-
-			$result = $companybankaccount->update($user);
-			if (! $result)
-			{
-				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-			}
-			else
-			{
-				// If this account is the default bank account, we disable others
-				if ($companybankaccount->default_rib)
-				{
-					$companybankaccount->setAsDefault($id);	// This will make sure there is only one default rib
-				}
-
-				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-		}
-	}
-
-	if ($action == 'updatecard')
-	{
-		// Modification
-		if (! GETPOST('label','alpha') || ! GETPOST('proprio','alpha') || ! GETPOST('cardnumber','alpha') || ! GETPOST('exp_date_month','alpha') || ! GETPOST('exp_date_year','alpha') || ! GETPOST('cvn','alpha'))
-		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('proprio','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
-			if (! GETPOST('cardnumber','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
-			if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
-			if (! GETPOST('cvn','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
-			$action='createcard';
-			$error++;
-		}
-
-		$companypaymentmode->fetch($id);
-		if (! $error)
-		{
-			$companypaymentmode->fk_soc          = $object->id;
-
-			$companypaymentmode->bank            = GETPOST('bank','alpha');
-			$companypaymentmode->label           = GETPOST('label','alpha');
-			$companypaymentmode->number          = GETPOST('cardnumber','alpha');
-			$companypaymentmode->last_four       = substr(GETPOST('cardnumber','alpha'), -4);
-			$companypaymentmode->proprio         = GETPOST('proprio','alpha');
-			$companypaymentmode->exp_date_month  = GETPOST('exp_date_month','int');
-			$companypaymentmode->exp_date_year   = GETPOST('exp_date_year','int');
-			$companypaymentmode->cvn             = GETPOST('cvn','alpha');
-			$companypaymentmode->country_code    = $object->country_code;
-
-			$companypaymentmode->stripe_card_ref = GETPOST('stripe_card_ref','alpha');
-
-			$result = $companypaymentmode->update($user);
-			if (! $result)
-			{
-				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-			}
-			else
-			{
-				// If this account is the default bank account, we disable others
-				if ($companypaymentmode->default_rib)
-				{
-					$companypaymentmode->setAsDefault($id);	// This will make sure there is only one default rib
-				}
-
-				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-		}
-	}
-
-	if ($action == 'add')
-	{
-		$error=0;
-
-		if (! GETPOST('label','alpha') || ! GETPOST('bank','alpha'))
-		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('bank','alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-			$action='create';
-			$error++;
-		}
-
-		if (! $error)
-		{
-			// Ajout
-			$companybankaccount = new CompanyBankAccount($db);
-
-			$companybankaccount->socid           = $object->id;
-
-			$companybankaccount->bank            = GETPOST('bank','alpha');
-			$companybankaccount->label           = GETPOST('label','alpha');
-			$companybankaccount->courant         = GETPOST('courant','alpha');
-			$companybankaccount->clos            = GETPOST('clos','alpha');
-			$companybankaccount->code_banque     = GETPOST('code_banque','alpha');
-			$companybankaccount->code_guichet    = GETPOST('code_guichet','alpha');
-			$companybankaccount->number          = GETPOST('number','alpha');
-			$companybankaccount->cle_rib         = GETPOST('cle_rib','alpha');
-			$companybankaccount->bic             = GETPOST('bic','alpha');
-			$companybankaccount->iban            = GETPOST('iban','alpha');
-			$companybankaccount->domiciliation   = GETPOST('domiciliation','alpha');
-			$companybankaccount->proprio         = GETPOST('proprio','alpha');
-			$companybankaccount->owner_address   = GETPOST('owner_address','alpha');
-			$companybankaccount->frstrecur       = GETPOST('frstrecur');
-			$companybankaccount->rum             = GETPOST('rum','alpha');
-			$companybankaccount->datec			 = dol_now();
-			$companybankaccount->status          = 1;
-
-			$db->begin();
-
-			// This test can be done only once properties were set
-			if ($companybankaccount->needIBAN() == 1)
-			{
-				if (! GETPOST('iban'))
-				{
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-					$action='create';
-					$error++;
-				}
-				if (! GETPOST('bic'))
-				{
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-					$action='create';
-					$error++;
-				}
-			}
-
-			if (! $error)
-			{
-				$result = $companybankaccount->create($user);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-					$action='create';     // Force chargement page création
-				}
-
-				if (empty($companybankaccount->rum))
-				{
-					$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
-					$companybankaccount->date_rum = dol_now();
-				}
-			}
-
-			if (! $error)
-			{
-				$result = $companybankaccount->update($user);	// This will set the UMR number.
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-					$action='create';
-				}
-			}
-
-			if (! $error)
-			{
-				$db->commit();
-
-				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				$db->rollback();
-			}
-		}
-	}
-
-	if ($action == 'addcard')
-	{
-		$error=0;
-
-		if (! GETPOST('label','alpha') || ! GETPOST('proprio','alpha') || ! GETPOST('cardnumber','alpha') || ! GETPOST('exp_date_month','alpha') || ! GETPOST('exp_date_year','alpha') || ! GETPOST('cvn','alpha'))
-		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('proprio','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
-			if (! GETPOST('cardnumber','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
-			if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
-			if (! GETPOST('cvn','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
-			$action='createcard';
-			$error++;
-		}
-
-		if (! $error)
-		{
-			// Ajout
-			$companypaymentmode = new CompanyPaymentMode($db);
-
-			$companypaymentmode->fk_soc          = $object->id;
-			$companypaymentmode->bank            = GETPOST('bank','alpha');
-			$companypaymentmode->label           = GETPOST('label','alpha');
-			$companypaymentmode->number          = GETPOST('cardnumber','alpha');
-			$companypaymentmode->last_four       = substr(GETPOST('cardnumber','alpha'), -4);
-			$companypaymentmode->proprio         = GETPOST('proprio','alpha');
-			$companypaymentmode->exp_date_month  = GETPOST('exp_date_month','int');
-			$companypaymentmode->exp_date_year   = GETPOST('exp_date_year','int');
-			$companypaymentmode->cvn             = GETPOST('cvn','alpha');
-			$companypaymentmode->datec           = dol_now();
-			$companypaymentmode->default_rib     = 0;
-			$companypaymentmode->type            = 'card';
-			$companypaymentmode->country_code    = $object->country_code;
-			$companypaymentmode->status          = $servicestatus;
-
-			$companypaymentmode->stripe_card_ref = GETPOST('stripe_card_ref','alpha');
-
-			$db->begin();
-
-			if (! $error)
-			{
-				$result = $companypaymentmode->create($user);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-					$action='createcard';     // Force chargement page création
-				}
-			}
-
-			if (! $error)
-			{
-				$db->commit();
-
-				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				$db->rollback();
-			}
-		}
-	}
-
-	if ($action == 'setasbankdefault' && GETPOST('ribid','int') > 0)
-	{
-		$companybankaccount = new CompanyBankAccount($db);
-		$res = $companybankaccount->setAsDefault(GETPOST('ribid','int'));
-		if ($res)
-		{
-			$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
-			header('Location: '.$url);
-			exit;
-		}
-		else
-		{
-			setEventMessages($db->lasterror, null, 'errors');
-		}
-	}
-
-	if ($action == 'confirm_deletecard' && GETPOST('confirm','alpha') == 'yes')
-	{
-		$companypaymentmode = new CompanyPaymentMode($db);
-		if ($companypaymentmode->fetch($ribid?$ribid:$id))
-		{
-			$result = $companypaymentmode->delete($user);
-			if ($result > 0)
-			{
-				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-		}
-	}
-	if ($action == 'confirm_delete' && GETPOST('confirm','alpha') == 'yes')
-	{
-		$companybankaccount = new CompanyBankAccount($db);
-		if ($companybankaccount->fetch($ribid?$ribid:$id))
-		{
-			$result = $companybankaccount->delete($user);
-			if ($result > 0)
-			{
-				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			else
-			{
-				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-		}
-	}
-
-	$savid=$id;
-
-	// Actions to build doc
-	if ($action == 'builddocrib')
-	{
-		$action = 'builddoc';
-		$moreparams = array(
-			'use_companybankid'=>GETPOST('companybankid'),
-			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
-		);
-		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid','int'), 'alpha');
-		$_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid','int'), 'alpha');
-	}
-
-	$id = $socid;
-	$upload_dir = $conf->societe->multidir_output[$object->entity];
-	$permissioncreate=$user->rights->societe->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
-	$id = $savid;
-
-	// Action for stripe
-	if (! empty($conf->stripe->enabled) && class_exists('Stripe'))
-	{
-		if ($action == 'synccustomertostripe')
-		{
-			if ($object->client == 0)
-			{
-				$error++;
-				setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
-			}
-			else
-			{
-				// Creation of Stripe customer + update of societe_account
-				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
-				if (! $cu)
-				{
-					$error++;
-					setEventMessages($stripe->error, $stripe->errors, 'errors');
-				}
-				else
-				{
-					$stripecu = $cu->id;
-				}
-			}
-		}
-		if ($action == 'synccardtostripe')
-		{
-			$companypaymentmode = new CompanyPaymentMode($db);
-			$companypaymentmode->fetch($id);
-
-			if ($companypaymentmode->type != 'card')
-			{
-				$error++;
-				setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
-			}
-			else
-			{
-				// Get the Stripe customer
-				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if (! $cu)
-				{
-					$error++;
-					setEventMessages($stripe->error, $stripe->errors, 'errors');
-				}
-
-				if (! $error)
-				{
-					// Creation of Stripe card + update of societe_account
-					$card = $stripe->cardStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
-					if (! $card)
-					{
-						$error++;
-						setEventMessages($stripe->error, $stripe->errors, 'errors');
-					}
-					else
-					{
-						$stripecard = $card->id;
-					}
-				}
-			}
-		}
-
-		if ($action == 'setkey_account')
-		{
-			$error = 0;
-
-			$newcu = GETPOST('key_account', 'alpha');
-
-			$db->begin();
+    if ($cancel)
+    {
+        $action='';
+        if (! empty($backtopage))
+        {
+            header("Location: ".$backtopage);
+            exit;
+        }
+    }
+
+    if ($action == 'update')
+    {
+        // Modification
+        if (! GETPOST('label','alpha') || ! GETPOST('bank','alpha'))
+        {
+            if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+            if (! GETPOST('bank','alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+            $action='edit';
+            $error++;
+        }
+        if ($companybankaccount->needIBAN() == 1)
+        {
+            if (! GETPOST('iban'))
+            {
+                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
+                $action='edit';
+                $error++;
+            }
+            if (! GETPOST('bic'))
+            {
+                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
+                $action='edit';
+                $error++;
+            }
+        }
+
+        $companybankaccount->fetch($id);
+        if (! $error)
+        {
+            $companybankaccount->socid           = $object->id;
+
+            $companybankaccount->bank            = GETPOST('bank','alpha');
+            $companybankaccount->label           = GETPOST('label','alpha');
+            $companybankaccount->courant         = GETPOST('courant','alpha');
+            $companybankaccount->clos            = GETPOST('clos','alpha');
+            $companybankaccount->code_banque     = GETPOST('code_banque','alpha');
+            $companybankaccount->code_guichet    = GETPOST('code_guichet','alpha');
+            $companybankaccount->number          = GETPOST('number','alpha');
+            $companybankaccount->cle_rib         = GETPOST('cle_rib','alpha');
+            $companybankaccount->bic             = GETPOST('bic','alpha');
+            $companybankaccount->iban            = GETPOST('iban','alpha');
+            $companybankaccount->domiciliation   = GETPOST('domiciliation','alpha');
+            $companybankaccount->proprio         = GETPOST('proprio','alpha');
+            $companybankaccount->owner_address   = GETPOST('owner_address','alpha');
+            $companybankaccount->frstrecur       = GETPOST('frstrecur','alpha');
+            $companybankaccount->rum             = GETPOST('rum','alpha');
+            if (empty($companybankaccount->rum))
+            {
+                $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
+                $companybankaccount->date_rum = dol_now();
+            }
+
+            $result = $companybankaccount->update($user);
+            if (! $result)
+            {
+                setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
+            }
+            else
+            {
+                // If this account is the default bank account, we disable others
+                if ($companybankaccount->default_rib)
+                {
+                    $companybankaccount->setAsDefault($id);	// This will make sure there is only one default rib
+                }
+
+                $url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+        }
+    }
+
+    if ($action == 'updatecard')
+    {
+        // Modification
+        if (! GETPOST('label','alpha') || ! GETPOST('proprio','alpha') || ! GETPOST('cardnumber','alpha') || ! GETPOST('exp_date_month','alpha') || ! GETPOST('exp_date_year','alpha') || ! GETPOST('cvn','alpha'))
+        {
+            if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+            if (! GETPOST('proprio','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+            if (! GETPOST('cardnumber','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
+            if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+            if (! GETPOST('cvn','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
+            $action='createcard';
+            $error++;
+        }
+
+        $companypaymentmode->fetch($id);
+        if (! $error)
+        {
+            $companypaymentmode->fk_soc          = $object->id;
+
+            $companypaymentmode->bank            = GETPOST('bank','alpha');
+            $companypaymentmode->label           = GETPOST('label','alpha');
+            $companypaymentmode->number          = GETPOST('cardnumber','alpha');
+            $companypaymentmode->last_four       = substr(GETPOST('cardnumber','alpha'), -4);
+            $companypaymentmode->proprio         = GETPOST('proprio','alpha');
+            $companypaymentmode->exp_date_month  = GETPOST('exp_date_month','int');
+            $companypaymentmode->exp_date_year   = GETPOST('exp_date_year','int');
+            $companypaymentmode->cvn             = GETPOST('cvn','alpha');
+            $companypaymentmode->country_code    = $object->country_code;
+
+            $companypaymentmode->stripe_card_ref = GETPOST('stripe_card_ref','alpha');
+
+            $result = $companypaymentmode->update($user);
+            if (! $result)
+            {
+                setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
+            }
+            else
+            {
+                // If this account is the default bank account, we disable others
+                if ($companypaymentmode->default_rib)
+                {
+                    $companypaymentmode->setAsDefault($id);	// This will make sure there is only one default rib
+                }
+
+                $url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+        }
+    }
+
+    if ($action == 'add')
+    {
+        $error=0;
+
+        if (! GETPOST('label','alpha') || ! GETPOST('bank','alpha'))
+        {
+            if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+            if (! GETPOST('bank','alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+            $action='create';
+            $error++;
+        }
+
+        if (! $error)
+        {
+            // Ajout
+            $companybankaccount = new CompanyBankAccount($db);
+
+            $companybankaccount->socid           = $object->id;
+
+            $companybankaccount->bank            = GETPOST('bank','alpha');
+            $companybankaccount->label           = GETPOST('label','alpha');
+            $companybankaccount->courant         = GETPOST('courant','alpha');
+            $companybankaccount->clos            = GETPOST('clos','alpha');
+            $companybankaccount->code_banque     = GETPOST('code_banque','alpha');
+            $companybankaccount->code_guichet    = GETPOST('code_guichet','alpha');
+            $companybankaccount->number          = GETPOST('number','alpha');
+            $companybankaccount->cle_rib         = GETPOST('cle_rib','alpha');
+            $companybankaccount->bic             = GETPOST('bic','alpha');
+            $companybankaccount->iban            = GETPOST('iban','alpha');
+            $companybankaccount->domiciliation   = GETPOST('domiciliation','alpha');
+            $companybankaccount->proprio         = GETPOST('proprio','alpha');
+            $companybankaccount->owner_address   = GETPOST('owner_address','alpha');
+            $companybankaccount->frstrecur       = GETPOST('frstrecur');
+            $companybankaccount->rum             = GETPOST('rum','alpha');
+            $companybankaccount->datec			 = dol_now();
+            $companybankaccount->status          = 1;
+
+            $db->begin();
+
+            // This test can be done only once properties were set
+            if ($companybankaccount->needIBAN() == 1)
+            {
+                if (! GETPOST('iban'))
+                {
+                    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
+                    $action='create';
+                    $error++;
+                }
+                if (! GETPOST('bic'))
+                {
+                    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
+                    $action='create';
+                    $error++;
+                }
+            }
+
+            if (! $error)
+            {
+                $result = $companybankaccount->create($user);
+                if ($result < 0)
+                {
+                    $error++;
+                    setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
+                    $action='create';     // Force chargement page création
+                }
+
+                if (empty($companybankaccount->rum))
+                {
+                    $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
+                    $companybankaccount->date_rum = dol_now();
+                }
+            }
+
+            if (! $error)
+            {
+                $result = $companybankaccount->update($user);	// This will set the UMR number.
+                if ($result < 0)
+                {
+                    $error++;
+                    setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
+                    $action='create';
+                }
+            }
+
+            if (! $error)
+            {
+                $db->commit();
+
+                $url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+            else
+            {
+                $db->rollback();
+            }
+        }
+    }
+
+    if ($action == 'addcard')
+    {
+        $error=0;
+
+        if (! GETPOST('label','alpha') || ! GETPOST('proprio','alpha') || ! GETPOST('cardnumber','alpha') || ! GETPOST('exp_date_month','alpha') || ! GETPOST('exp_date_year','alpha') || ! GETPOST('cvn','alpha'))
+        {
+            if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+            if (! GETPOST('proprio','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+            if (! GETPOST('cardnumber','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
+            if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+            if (! GETPOST('cvn','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
+            $action='createcard';
+            $error++;
+        }
+
+        if (! $error)
+        {
+            // Ajout
+            $companypaymentmode = new CompanyPaymentMode($db);
+
+            $companypaymentmode->fk_soc          = $object->id;
+            $companypaymentmode->bank            = GETPOST('bank','alpha');
+            $companypaymentmode->label           = GETPOST('label','alpha');
+            $companypaymentmode->number          = GETPOST('cardnumber','alpha');
+            $companypaymentmode->last_four       = substr(GETPOST('cardnumber','alpha'), -4);
+            $companypaymentmode->proprio         = GETPOST('proprio','alpha');
+            $companypaymentmode->exp_date_month  = GETPOST('exp_date_month','int');
+            $companypaymentmode->exp_date_year   = GETPOST('exp_date_year','int');
+            $companypaymentmode->cvn             = GETPOST('cvn','alpha');
+            $companypaymentmode->datec           = dol_now();
+            $companypaymentmode->default_rib     = 0;
+            $companypaymentmode->type            = 'card';
+            $companypaymentmode->country_code    = $object->country_code;
+            $companypaymentmode->status          = $servicestatus;
+
+            $companypaymentmode->stripe_card_ref = GETPOST('stripe_card_ref','alpha');
+
+            $db->begin();
+
+            if (! $error)
+            {
+                $result = $companypaymentmode->create($user);
+                if ($result < 0)
+                {
+                    $error++;
+                    setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
+                    $action='createcard';     // Force chargement page création
+                }
+            }
+
+            if (! $error)
+            {
+                $db->commit();
+
+                $url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+            else
+            {
+                $db->rollback();
+            }
+        }
+    }
+
+    if ($action == 'setasbankdefault' && GETPOST('ribid','int') > 0)
+    {
+        $companybankaccount = new CompanyBankAccount($db);
+        $res = $companybankaccount->setAsDefault(GETPOST('ribid','int'));
+        if ($res)
+        {
+            $url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+            header('Location: '.$url);
+            exit;
+        }
+        else
+        {
+            setEventMessages($db->lasterror, null, 'errors');
+        }
+    }
+
+    if ($action == 'confirm_deletecard' && GETPOST('confirm','alpha') == 'yes')
+    {
+        $companypaymentmode = new CompanyPaymentMode($db);
+        if ($companypaymentmode->fetch($ribid?$ribid:$id))
+        {
+            $result = $companypaymentmode->delete($user);
+            if ($result > 0)
+            {
+                $url = $_SERVER['PHP_SELF']."?socid=".$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+            else
+            {
+                setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
+            }
+        }
+        else
+        {
+            setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
+        }
+    }
+    if ($action == 'confirm_delete' && GETPOST('confirm','alpha') == 'yes')
+    {
+        $companybankaccount = new CompanyBankAccount($db);
+        if ($companybankaccount->fetch($ribid?$ribid:$id))
+        {
+            $result = $companybankaccount->delete($user);
+            if ($result > 0)
+            {
+                $url = $_SERVER['PHP_SELF']."?socid=".$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+            else
+            {
+                setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
+            }
+        }
+        else
+        {
+            setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
+        }
+    }
+
+    $savid=$id;
+
+    // Actions to build doc
+    if ($action == 'builddocrib')
+    {
+        $action = 'builddoc';
+        $moreparams = array(
+            'use_companybankid'=>GETPOST('companybankid'),
+            'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
+        );
+        $_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid','int'), 'alpha');
+        $_POST['model'] =  GETPOST('modelrib'.GETPOST('companybankid','int'), 'alpha');
+    }
+
+    $id = $socid;
+    $upload_dir = $conf->societe->multidir_output[$object->entity];
+    $permissioncreate=$user->rights->societe->creer;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+    $id = $savid;
+
+    // Action for stripe
+    if (! empty($conf->stripe->enabled) && class_exists('Stripe'))
+    {
+        if ($action == 'synccustomertostripe')
+        {
+            if ($object->client == 0)
+            {
+                $error++;
+                setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
+            }
+            else
+            {
+                // Creation of Stripe customer + update of societe_account
+                $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
+                if (! $cu)
+                {
+                    $error++;
+                    setEventMessages($stripe->error, $stripe->errors, 'errors');
+                }
+                else
+                {
+                    $stripecu = $cu->id;
+                }
+            }
+        }
+        if ($action == 'synccardtostripe')
+        {
+            $companypaymentmode = new CompanyPaymentMode($db);
+            $companypaymentmode->fetch($id);
+
+            if ($companypaymentmode->type != 'card')
+            {
+                $error++;
+                setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
+            }
+            else
+            {
+                // Get the Stripe customer
+                $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+                if (! $cu)
+                {
+                    $error++;
+                    setEventMessages($stripe->error, $stripe->errors, 'errors');
+                }
+
+                if (! $error)
+                {
+                    // Creation of Stripe card + update of societe_account
+                    $card = $stripe->cardStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
+                    if (! $card)
+                    {
+                        $error++;
+                        setEventMessages($stripe->error, $stripe->errors, 'errors');
+                    }
+                    else
+                    {
+                        $stripecard = $card->id;
+                    }
+                }
+            }
+        }
+
+        if ($action == 'setkey_account')
+        {
+            $error = 0;
+
+            $newcu = GETPOST('key_account', 'alpha');
+
+            $db->begin();
 
                 if (empty($newcu)) {
                         $sql  = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE site = 'stripe' AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;
                 } else {
-			$sql = 'UPDATE '.MAIN_DB_PREFIX."societe_account";
-			$sql.= " SET key_account = '".$db->escape(GETPOST('key_account', 'alpha'))."'";
-			$sql.= " WHERE site = 'stripe' AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;	// Keep = here for entity. Only 1 record must be modified !
+            $sql = 'UPDATE '.MAIN_DB_PREFIX."societe_account";
+            $sql.= " SET key_account = '".$db->escape(GETPOST('key_account', 'alpha'))."'";
+            $sql.= " WHERE site = 'stripe' AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;	// Keep = here for entity. Only 1 record must be modified !
                 }
 
-			$resql = $db->query($sql);
-			$num = $db->num_rows($resql);
-			if (empty($num) && !empty($newcu))
-			{
-				$societeaccount = new SocieteAccount($db);
-				$societeaccount->fk_soc = $object->id;
-				$societeaccount->login = '';
-				$societeaccount->pass_encoding = '';
-				$societeaccount->site = 'stripe';
-				$societeaccount->status = $servicestatus;
-				$societeaccount->key_account = $newcu;
-				$result = $societeaccount->create($user);
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
-
-			if (! $error)
-			{
-				$stripecu = $newcu;
-				$db->commit();
-			}
-			else
-			{
-				$db->rollback();
-			}
-		}
-		if ($action == 'setlocalassourcedefault')
-		{
-			try {
-				$companypaymentmode->setAsDefault($id);
-
-				$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			catch(Exception $e)
-			{
-				$error++;
-				setEventMessages($e->getMessage(), null, 'errors');
-			}
-		}
-		elseif ($action == 'setassourcedefault')
-		{
-			try {
-				$cu=$stripe->customerStripe($object, $stripeacc, $servicestatus);
-				$cu->default_source = (string) $source;
-				$result = $cu->save();
-
-				$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			catch(Exception $e)
-			{
-				$error++;
-				setEventMessages($e->getMessage(), null, 'errors');
-			}
-		}
-		elseif ($action == 'deletecard' && $source)
-		{
-			try {
-				$cu=$stripe->customerStripe($object, $stripeacc, $servicestatus);
-				$card=$cu->sources->retrieve("$source");
-				if ($card)
-				{
-					// $card->detach();  Does not work with card_, only with src_
-					if (method_exists($card, 'detach')) $card->detach();
-					else $card->delete();
-				}
-
-				$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
-				header('Location: '.$url);
-				exit;
-			}
-			catch(Exception $e)
-			{
-				$error++;
-				setEventMessages($e->getMessage(), null, 'errors');
-			}
-		}
-	}
+            $resql = $db->query($sql);
+            $num = $db->num_rows($resql);
+            if (empty($num) && !empty($newcu))
+            {
+                $societeaccount = new SocieteAccount($db);
+                $societeaccount->fk_soc = $object->id;
+                $societeaccount->login = '';
+                $societeaccount->pass_encoding = '';
+                $societeaccount->site = 'stripe';
+                $societeaccount->status = $servicestatus;
+                $societeaccount->key_account = $newcu;
+                $result = $societeaccount->create($user);
+                if ($result < 0)
+                {
+                    $error++;
+                }
+            }
+
+            if (! $error)
+            {
+                $stripecu = $newcu;
+                $db->commit();
+            }
+            else
+            {
+                $db->rollback();
+            }
+        }
+        if ($action == 'setlocalassourcedefault')
+        {
+            try {
+                $companypaymentmode->setAsDefault($id);
+
+                $url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+            catch(Exception $e)
+            {
+                $error++;
+                setEventMessages($e->getMessage(), null, 'errors');
+            }
+        }
+        elseif ($action == 'setassourcedefault')
+        {
+            try {
+                $cu=$stripe->customerStripe($object, $stripeacc, $servicestatus);
+                $cu->default_source = (string) $source;
+                $result = $cu->save();
+
+                $url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+            catch(Exception $e)
+            {
+                $error++;
+                setEventMessages($e->getMessage(), null, 'errors');
+            }
+        }
+        elseif ($action == 'deletecard' && $source)
+        {
+            try {
+                $cu=$stripe->customerStripe($object, $stripeacc, $servicestatus);
+                $card=$cu->sources->retrieve("$source");
+                if ($card)
+                {
+                    // $card->detach();  Does not work with card_, only with src_
+                    if (method_exists($card, 'detach')) $card->detach();
+                    else $card->delete();
+                }
+
+                $url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+                header('Location: '.$url);
+                exit;
+            }
+            catch(Exception $e)
+            {
+                $error++;
+                setEventMessages($e->getMessage(), null, 'errors');
+            }
+        }
+    }
 }
 
 
@@ -664,217 +664,217 @@ 
 }*/
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
 {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+    dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
 }
 
 // Load Bank account
 if (! $id)
 {
-	$companybankaccount->fetch(0, $object->id);
-	$companypaymentmode->fetch(0, null, $object->id, 'card');
+    $companybankaccount->fetch(0, $object->id);
+    $companypaymentmode->fetch(0, null, $object->id, 'card');
 }
 else
 {
-	$companybankaccount->fetch($id);
-	$companypaymentmode->fetch($id);
+    $companybankaccount->fetch($id);
+    $companypaymentmode->fetch($id);
 }
 if (empty($companybankaccount->socid)) $companybankaccount->socid=$object->id;
 
 if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer)
 {
-	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$actionforadd='update';
-	if ($action == 'editcard') $actionforadd='updatecard';
-	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
-	print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
+    print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    $actionforadd='update';
+    if ($action == 'editcard') $actionforadd='updatecard';
+    print '<input type="hidden" name="action" value="'.$actionforadd.'">';
+    print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
 }
 if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer)
 {
-	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$actionforadd='add';
-	if ($action == 'createcard') $actionforadd='addcard';
-	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
+    print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    $actionforadd='add';
+    if ($action == 'createcard') $actionforadd='addcard';
+    print '<input type="hidden" name="action" value="'.$actionforadd.'">';
 }
 
 
 // View
 if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' && $action != 'createcard')
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
-
-	// Confirm delete ban
-	if ($action == 'delete')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $companybankaccount->getRibLabel()), "confirm_delete", '', 0, 1);
-	}
-	// Confirm delete card
-	if ($action == 'deletecard')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteACard"), $langs->trans("ConfirmDeleteCard", $companybankaccount->getRibLabel()), "confirm_deletecard", '', 0, 1);
-	}
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
-		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-	}
-
-	//if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
-
-	print '<div class="fichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border tableforfield" width="100%">';
-
-	if ($object->client)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('CustomerCode').'</td><td colspan="2">';
-		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		print '</td></tr>';
-		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
-		$resql=$db->query($sql);
-		if (!$resql) dol_print_error($db);
-
-		$obj = $db->fetch_object($resql);
-		$nbFactsClient = $obj->nb;
-		$thirdTypeArray['customer']=$langs->trans("customer");
-		if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
-		if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
-		if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
-		if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
-	}
-
-	if (! empty($conf->stripe->enabled))
-	{
-		$permissiontowrite = $user->rights->societe->creer;
-		// Stripe customer key 'cu_....' stored into llx_societe_account
-		print '<tr><td class="titlefield">';
-		//print $langs->trans('StripeCustomerId');
-		print $form->editfieldkey("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
-		print '</td><td>';
-		//print $stripecu;
-		print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
-		if ($stripecu && $action != 'editkey_account')
-		{
-			if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/';
-			$url='https://dashboard.stripe.com/'.$connect.'test/customers/'.$stripecu;
-			if ($servicestatus)
-			{
-				$url='https://dashboard.stripe.com/'.$connect.'customers/'.$stripecu;
-			}
-			print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'object_globe').'</a>';
-		}
-		print '</td><td align="right">';
-		if (empty($stripecu))
-		{
-			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input type="hidden" name="action" value="synccustomertostripe">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="socid" value="'.$object->id.'">';
-			print '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
-			print '<input type="submit" class="button" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
-			print '</form>';
-		}
-		print '</td></tr>';
-	}
-
-	print '</table>';
-	print '</div>';
-
-	dol_fiche_end();
-
-	print '<br>';
-
-	// List of Stripe payment modes
-	if (! (empty($conf->stripe->enabled)))
-	{
-		$morehtmlright='';
-		if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-		{
-			$morehtmlright='<a class="butActionNew" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard">'.$langs->trans("Add").' <span class="fa fa-plus-circle valignmiddle"></span></a>';
-		}
-		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc?' (Stripe connection with StripeConnect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, '');
-
-		$listofsources = array();
-		if (is_object($stripe))
-		{
-			try {
-				$customerstripe=$stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if ($customerstripe->id) {
-					$listofsources=$customerstripe->sources->data;
-				}
-			}
-			catch(Exception $e)
-			{
-				dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
-			}
-		}
-
-		print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
-		print '<table class="liste" width="100%">'."\n";
-		print '<tr class="liste_titre">';
-		if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-		{
-			print '<td>'.$langs->trans('LocalID').'</td>';
-		}
-		print '<td>'.$langs->trans('StripeID').'</td>';
-		print '<td>'.$langs->trans('Type').'</td>';
-		print '<td>'.$langs->trans('Informations').'</td>';
-		print '<td></td>';
-		print '<td align="center">'.$langs->trans('Default').'</td>';
-		print '<td>'.$langs->trans('Note').'</td>';
-		print '<td>'.$langs->trans('DateModification').'</td>';
-		print "<td></td>";
-		print "</tr>\n";
-
-		$nbremote = 0;
-		$nblocal = 0;
-		$arrayofstripecard = array();
-
-		// Show local sources
-		if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-		{
-			//$societeaccount = new SocieteAccount($db);
-			$companypaymentmodetemp = new CompanyPaymentMode($db);
-
-			$sql='SELECT rowid FROM '.MAIN_DB_PREFIX."societe_rib";
-			$sql.=" WHERE type in ('card', 'paypal')";
-			$sql.=" AND fk_soc = ".$object->id;
-			$sql.=" AND status = ".$servicestatus;
-
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$num_rows = $db->num_rows($resql);
-				if ($num_rows)
-				{
-					$i=0;
-					while ($i < $num_rows)
-					{
-						$nblocal++;
-
-						$obj = $db->fetch_object($resql);
-						if ($obj)
-						{
-							$companypaymentmodetemp->fetch($obj->rowid);
-
-							$arrayofstripecard[$companypaymentmodetemp->stripe_card_ref]=$companypaymentmodetemp->stripe_card_ref;
-
-							print '<tr>';
-							print '<td>';
-							print $companypaymentmodetemp->id;
-							print '</td>';
-							print '<td>';
-							print $companypaymentmodetemp->stripe_card_ref;
-							/*if ($companypaymentmodetemp->stripe_card_ref)
+    dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
+
+    // Confirm delete ban
+    if ($action == 'delete')
+    {
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $companybankaccount->getRibLabel()), "confirm_delete", '', 0, 1);
+    }
+    // Confirm delete card
+    if ($action == 'deletecard')
+    {
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteACard"), $langs->trans("ConfirmDeleteCard", $companybankaccount->getRibLabel()), "confirm_deletecard", '', 0, 1);
+    }
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+    //if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
+
+    print '<div class="fichecenter">';
+
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border tableforfield" width="100%">';
+
+    if ($object->client)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('CustomerCode').'</td><td colspan="2">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td></tr>';
+        $sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
+        $resql=$db->query($sql);
+        if (!$resql) dol_print_error($db);
+
+        $obj = $db->fetch_object($resql);
+        $nbFactsClient = $obj->nb;
+        $thirdTypeArray['customer']=$langs->trans("customer");
+        if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
+        if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
+        if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
+        if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+    }
+
+    if (! empty($conf->stripe->enabled))
+    {
+        $permissiontowrite = $user->rights->societe->creer;
+        // Stripe customer key 'cu_....' stored into llx_societe_account
+        print '<tr><td class="titlefield">';
+        //print $langs->trans('StripeCustomerId');
+        print $form->editfieldkey("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
+        print '</td><td>';
+        //print $stripecu;
+        print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
+        if ($stripecu && $action != 'editkey_account')
+        {
+            if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/';
+            $url='https://dashboard.stripe.com/'.$connect.'test/customers/'.$stripecu;
+            if ($servicestatus)
+            {
+                $url='https://dashboard.stripe.com/'.$connect.'customers/'.$stripecu;
+            }
+            print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'object_globe').'</a>';
+        }
+        print '</td><td align="right">';
+        if (empty($stripecu))
+        {
+            print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+            print '<input type="hidden" name="action" value="synccustomertostripe">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="socid" value="'.$object->id.'">';
+            print '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
+            print '<input type="submit" class="button" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
+            print '</form>';
+        }
+        print '</td></tr>';
+    }
+
+    print '</table>';
+    print '</div>';
+
+    dol_fiche_end();
+
+    print '<br>';
+
+    // List of Stripe payment modes
+    if (! (empty($conf->stripe->enabled)))
+    {
+        $morehtmlright='';
+        if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
+        {
+            $morehtmlright='<a class="butActionNew" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard">'.$langs->trans("Add").' <span class="fa fa-plus-circle valignmiddle"></span></a>';
+        }
+        print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc?' (Stripe connection with StripeConnect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, '');
+
+        $listofsources = array();
+        if (is_object($stripe))
+        {
+            try {
+                $customerstripe=$stripe->customerStripe($object, $stripeacc, $servicestatus);
+                if ($customerstripe->id) {
+                    $listofsources=$customerstripe->sources->data;
+                }
+            }
+            catch(Exception $e)
+            {
+                dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
+            }
+        }
+
+        print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+        print '<table class="liste" width="100%">'."\n";
+        print '<tr class="liste_titre">';
+        if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
+        {
+            print '<td>'.$langs->trans('LocalID').'</td>';
+        }
+        print '<td>'.$langs->trans('StripeID').'</td>';
+        print '<td>'.$langs->trans('Type').'</td>';
+        print '<td>'.$langs->trans('Informations').'</td>';
+        print '<td></td>';
+        print '<td align="center">'.$langs->trans('Default').'</td>';
+        print '<td>'.$langs->trans('Note').'</td>';
+        print '<td>'.$langs->trans('DateModification').'</td>';
+        print "<td></td>";
+        print "</tr>\n";
+
+        $nbremote = 0;
+        $nblocal = 0;
+        $arrayofstripecard = array();
+
+        // Show local sources
+        if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
+        {
+            //$societeaccount = new SocieteAccount($db);
+            $companypaymentmodetemp = new CompanyPaymentMode($db);
+
+            $sql='SELECT rowid FROM '.MAIN_DB_PREFIX."societe_rib";
+            $sql.=" WHERE type in ('card', 'paypal')";
+            $sql.=" AND fk_soc = ".$object->id;
+            $sql.=" AND status = ".$servicestatus;
+
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num_rows = $db->num_rows($resql);
+                if ($num_rows)
+                {
+                    $i=0;
+                    while ($i < $num_rows)
+                    {
+                        $nblocal++;
+
+                        $obj = $db->fetch_object($resql);
+                        if ($obj)
+                        {
+                            $companypaymentmodetemp->fetch($obj->rowid);
+
+                            $arrayofstripecard[$companypaymentmodetemp->stripe_card_ref]=$companypaymentmodetemp->stripe_card_ref;
+
+                            print '<tr>';
+                            print '<td>';
+                            print $companypaymentmodetemp->id;
+                            print '</td>';
+                            print '<td>';
+                            print $companypaymentmodetemp->stripe_card_ref;
+                            /*if ($companypaymentmodetemp->stripe_card_ref)
 							{
 								$url='https://dashboard.stripe.com/test/card/'.$companypaymentmodetemp->stripe_card_ref;
 								if ($servicestatus)
@@ -883,427 +883,427 @@ 
 								}
 								print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'object_globe').'</a>';
 							}*/
-							print '</td>';
-							print '<td>';
-							print img_credit_card($companypaymentmodetemp->type);
-							print '</td>';
-							print '<td>';
-							if ($companypaymentmodetemp->last_four) print '....'.$companypaymentmodetemp->last_four;
-							if ($companypaymentmodetemp->exp_date_month || $companypaymentmodetemp->exp_date_year) print ' - '.sprintf("%02d", $companypaymentmodetemp->exp_date_month).'/'.$companypaymentmodetemp->exp_date_year.'';
-							print '</td><td>';
-							if ($companypaymentmodetemp->country_code)
-							{
-								$img=picto_from_langcode($companypaymentmodetemp->country_code);
-								print $img?$img.' ':'';
-								print getCountry($companypaymentmodetemp->country_code,1);
-							}
-							else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-							print '</td>';
-							// Default
-							print '<td align="center">';
-							if (empty($companypaymentmodetemp->default_rib))
-							{
-								print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=setlocalassourcedefault">';
-								print img_picto($langs->trans("Default"),'off');
-								print '</a>';
-							} else {
-								print img_picto($langs->trans("Default"),'on');
-							}
-							print '</td>';
-							print '<td>';
-							if (empty($companypaymentmodetemp->stripe_card_ref)) print $langs->trans("Local");
-							else print $langs->trans("LocalAndRemote");
-							print '</td>';
-							print '<td>';
-							print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
-							print '</td>';
-							print '<td align="right" class="nowraponall">';
-							if ($user->rights->societe->creer)
-							{
-								if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref))
-								{
-									print '<a href="'.$_SERVER['PHP_SELF'].'?action=synccardtostripe&socid='.$object->id.'&id='.$companypaymentmodetemp->id.'" class="button">'.$langs->trans("CreateCardOnStripe").'</a>';
-								}
+                            print '</td>';
+                            print '<td>';
+                            print img_credit_card($companypaymentmodetemp->type);
+                            print '</td>';
+                            print '<td>';
+                            if ($companypaymentmodetemp->last_four) print '....'.$companypaymentmodetemp->last_four;
+                            if ($companypaymentmodetemp->exp_date_month || $companypaymentmodetemp->exp_date_year) print ' - '.sprintf("%02d", $companypaymentmodetemp->exp_date_month).'/'.$companypaymentmodetemp->exp_date_year.'';
+                            print '</td><td>';
+                            if ($companypaymentmodetemp->country_code)
+                            {
+                                $img=picto_from_langcode($companypaymentmodetemp->country_code);
+                                print $img?$img.' ':'';
+                                print getCountry($companypaymentmodetemp->country_code,1);
+                            }
+                            else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+                            print '</td>';
+                            // Default
+                            print '<td align="center">';
+                            if (empty($companypaymentmodetemp->default_rib))
+                            {
+                                print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=setlocalassourcedefault">';
+                                print img_picto($langs->trans("Default"),'off');
+                                print '</a>';
+                            } else {
+                                print img_picto($langs->trans("Default"),'on');
+                            }
+                            print '</td>';
+                            print '<td>';
+                            if (empty($companypaymentmodetemp->stripe_card_ref)) print $langs->trans("Local");
+                            else print $langs->trans("LocalAndRemote");
+                            print '</td>';
+                            print '<td>';
+                            print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
+                            print '</td>';
+                            print '<td align="right" class="nowraponall">';
+                            if ($user->rights->societe->creer)
+                            {
+                                if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref))
+                                {
+                                    print '<a href="'.$_SERVER['PHP_SELF'].'?action=synccardtostripe&socid='.$object->id.'&id='.$companypaymentmodetemp->id.'" class="button">'.$langs->trans("CreateCardOnStripe").'</a>';
+                                }
+
+                                print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=editcard">';
+                                print img_picto($langs->trans("Modify"),'edit');
+                                print '</a>';
+                                print '&nbsp;';
+                                print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=deletecard">';	// source='.$companypaymentmodetemp->stripe_card_ref.'&
+                                print img_picto($langs->trans("Delete"), 'delete');
+                                print '</a>';
+                            }
+                            print '</td>';
+                            print '</tr>';
+                        }
+                        $i++;
+                    }
+                }
+            }
+            else dol_print_error($db);
+        }
+
+        // Show remote sources (not already shown as local source)
+        if (is_array($listofsources) && count($listofsources))
+        {
+            foreach ($listofsources as $src)
+            {
+                if (! empty($arrayofstripecard[$src->id])) continue;	// Already in previous list
+
+                $nbremote++;
+
+                print '<tr class="oddeven">';
+                // Local ID
+                if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
+                {
+                    print '<td>';
+                    print '</td>';
+                }
+                // Src ID
+                print '<td>';
+                if (!empty($stripeacc)) $connect=$stripeacc.'/';
+                $url='https://dashboard.stripe.com/'.$connect.'test/sources/'.$src->id;
+                if ($servicestatus)
+                {
+                    $url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
+                }
+                print $src->id." <a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')."</a>";
+                print '</td>';
+                // Img of credit card
+                print '<td>';
+                if ($src->object=='card')
+                {
+                    print img_credit_card($src->brand);
+                }
+                elseif ($src->object=='source' && $src->type=='card')
+                {
+                    print img_credit_card($src->card->brand);
+                }
+                elseif ($src->object=='source' && $src->type=='sepa_debit')
+                {
+                    print '<span class="fa fa-university fa-2x fa-fw"></span>';
+                }
+                print'</td>';
+                print '<td valign="middle">';
+                if ($src->object=='card')
+                {
+                    print '....'.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
+                    print '</td><td>';
+                    if ($src->country)
+                    {
+                        $img=picto_from_langcode($src->country);
+                        print $img?$img.' ':'';
+                        print getCountry($src->country,1);
+                    }
+                    else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+                }
+                elseif ($src->object=='source' && $src->type=='card')
+                {
+                    print $src->owner->name.'<br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
+                    print '</td><td>';
+
+                        if ($src->card->country)
+                    {
+                        $img=picto_from_langcode($src->card->country);
+                        print $img?$img.' ':'';
+                        print getCountry($src->card->country,1);
+                    }
+                    else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+                }
+                elseif ($src->object=='source' && $src->type=='sepa_debit')
+                {
+                    print 'info sepa';
+                    print '</td><td>';
+                    if ($src->sepa_debit->country)
+                    {
+                            $img=picto_from_langcode($src->sepa_debit->country);
+                            print $img?$img.' ':'';
+                            print getCountry($src->sepa_debit->country,1);
+                    }
+                    else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+                }
+                print '</td>';
+                // Default
+                print '<td align="center" width="50">';
+                if (($customerstripe->default_source != $src->id))
+                {
+                    print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault">';
+                    print img_picto($langs->trans("Default"),'off');
+                    print '</a>';
+                } else {
+                    print img_picto($langs->trans("Default"),'on');
+                }
+                print '</td>';
+                print '<td>';
+                print $langs->trans("Remote");
+                //if ($src->cvc_check == 'fail') print ' - CVC check fail';
+                print '</td>';
+                print '<td>';
+                //var_dump($src);
+                print '';
+                print '</td>';
+                print '<td align="right" class="nowraponall">';
+                if ($user->rights->societe->creer)
+                {
+                    print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=deletecard">';
+                    print img_picto($langs->trans("Delete"), 'delete');
+                    print '</a>';
+                }
+                print '</td>';
+
+                print '</tr>';
+            }
+        }
+
+        if ($nbremote == 0 && $nblocal == 0)
+        {
+            print '<tr><td class="opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';
+        }
+        print "</table>";
+        print "</div>";
+    }
+
 
-								print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=editcard">';
-								print img_picto($langs->trans("Modify"),'edit');
-								print '</a>';
-								print '&nbsp;';
-								print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=deletecard">';	// source='.$companypaymentmodetemp->stripe_card_ref.'&
-								print img_picto($langs->trans("Delete"), 'delete');
-								print '</a>';
-							}
-							print '</td>';
-							print '</tr>';
-						}
-						$i++;
-					}
-				}
-			}
-			else dol_print_error($db);
-		}
-
-		// Show remote sources (not already shown as local source)
-		if (is_array($listofsources) && count($listofsources))
-		{
-			foreach ($listofsources as $src)
-			{
-				if (! empty($arrayofstripecard[$src->id])) continue;	// Already in previous list
-
-				$nbremote++;
-
-				print '<tr class="oddeven">';
-				// Local ID
-				if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-				{
-					print '<td>';
-					print '</td>';
-				}
-				// Src ID
-				print '<td>';
-				if (!empty($stripeacc)) $connect=$stripeacc.'/';
-				$url='https://dashboard.stripe.com/'.$connect.'test/sources/'.$src->id;
-				if ($servicestatus)
-				{
-					$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
-				}
-				print $src->id." <a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')."</a>";
-				print '</td>';
-				// Img of credit card
-				print '<td>';
-				if ($src->object=='card')
-				{
-					print img_credit_card($src->brand);
-				}
-				elseif ($src->object=='source' && $src->type=='card')
-				{
-					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object=='source' && $src->type=='sepa_debit')
-				{
-					print '<span class="fa fa-university fa-2x fa-fw"></span>';
-				}
-				print'</td>';
-				print '<td valign="middle">';
-				if ($src->object=='card')
-				{
-					print '....'.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
-					print '</td><td>';
-					if ($src->country)
-					{
-						$img=picto_from_langcode($src->country);
-						print $img?$img.' ':'';
-						print getCountry($src->country,1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object=='source' && $src->type=='card')
-				{
-					print $src->owner->name.'<br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
-					print '</td><td>';
-
-				 	if ($src->card->country)
-					{
-						$img=picto_from_langcode($src->card->country);
-						print $img?$img.' ':'';
-						print getCountry($src->card->country,1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object=='source' && $src->type=='sepa_debit')
-				{
-					print 'info sepa';
-					print '</td><td>';
-					if ($src->sepa_debit->country)
-					{
-							$img=picto_from_langcode($src->sepa_debit->country);
-							print $img?$img.' ':'';
-							print getCountry($src->sepa_debit->country,1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				print '</td>';
-				// Default
-				print '<td align="center" width="50">';
-				if (($customerstripe->default_source != $src->id))
-				{
-					print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault">';
-					print img_picto($langs->trans("Default"),'off');
-					print '</a>';
-				} else {
-					print img_picto($langs->trans("Default"),'on');
-				}
-				print '</td>';
-				print '<td>';
-				print $langs->trans("Remote");
-				//if ($src->cvc_check == 'fail') print ' - CVC check fail';
-				print '</td>';
-				print '<td>';
-				//var_dump($src);
-				print '';
-				print '</td>';
-				print '<td align="right" class="nowraponall">';
-				if ($user->rights->societe->creer)
-				{
-					print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=deletecard">';
-					print img_picto($langs->trans("Delete"), 'delete');
-					print '</a>';
-				}
-				print '</td>';
-
-				print '</tr>';
-			}
-		}
-
-		if ($nbremote == 0 && $nblocal == 0)
-		{
-			print '<tr><td class="opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';
-		}
-		print "</table>";
-		print "</div>";
-	}
-
-
-	// List of bank accounts
-	print '<br>';
-
-	$morehtmlright='<a class="butActionNew" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").' <span class="fa fa-plus-circle valignmiddle"></span></a>';
-
-	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, '');
-
-	$rib_list = $object->get_all_rib();
-	if (is_array($rib_list))
-	{
-		print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
-		print '<table class="liste" width="100%">';
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre("LabelRIB");
-		print_liste_field_titre("Bank");
-		print_liste_field_titre("RIB");
-		print_liste_field_titre("IBAN");
-		print_liste_field_titre("BIC");
-		if (! empty($conf->prelevement->enabled))
-		{
-			print print_liste_field_titre("RUM");
-			print print_liste_field_titre("WithdrawMode");
-		}
-		print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"');
-		print_liste_field_titre('', '', '', '', '', 'align="center"');
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-		print "</tr>\n";
-
-		foreach ($rib_list as $rib)
-		{
-			print '<tr class="oddeven">';
-			// Label
-			print '<td>'.$rib->label.'</td>';
-			// Bank name
-			print '<td>'.$rib->bank.'</td>';
-			// Account number
-			print '<td>';
-			$string='';
-			foreach ($rib->getFieldsToShow() as $val) {
-
-				if ($val == 'BankCode') {
-					$string .= $rib->code_banque.' ';
-				} elseif ($val == 'BankAccountNumber') {
-					$string .= $rib->number.' ';
-				} elseif ($val == 'DeskCode') {
-					$string .= $rib->code_guichet.' ';
-				} elseif ($val == 'BankAccountNumberKey') {
-					$string .= $rib->cle_rib.' ';
-				/* Already output after
+    // List of bank accounts
+    print '<br>';
+
+    $morehtmlright='<a class="butActionNew" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").' <span class="fa fa-plus-circle valignmiddle"></span></a>';
+
+    print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, '');
+
+    $rib_list = $object->get_all_rib();
+    if (is_array($rib_list))
+    {
+        print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+        print '<table class="liste" width="100%">';
+
+        print '<tr class="liste_titre">';
+        print_liste_field_titre("LabelRIB");
+        print_liste_field_titre("Bank");
+        print_liste_field_titre("RIB");
+        print_liste_field_titre("IBAN");
+        print_liste_field_titre("BIC");
+        if (! empty($conf->prelevement->enabled))
+        {
+            print print_liste_field_titre("RUM");
+            print print_liste_field_titre("WithdrawMode");
+        }
+        print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"');
+        print_liste_field_titre('', '', '', '', '', 'align="center"');
+        print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+        print "</tr>\n";
+
+        foreach ($rib_list as $rib)
+        {
+            print '<tr class="oddeven">';
+            // Label
+            print '<td>'.$rib->label.'</td>';
+            // Bank name
+            print '<td>'.$rib->bank.'</td>';
+            // Account number
+            print '<td>';
+            $string='';
+            foreach ($rib->getFieldsToShow() as $val) {
+
+                if ($val == 'BankCode') {
+                    $string .= $rib->code_banque.' ';
+                } elseif ($val == 'BankAccountNumber') {
+                    $string .= $rib->number.' ';
+                } elseif ($val == 'DeskCode') {
+                    $string .= $rib->code_guichet.' ';
+                } elseif ($val == 'BankAccountNumberKey') {
+                    $string .= $rib->cle_rib.' ';
+                /* Already output after
                 }elseif ($val == 'BIC') {
                     $string .= $rib->bic.' ';
                 }elseif ($val == 'IBAN') {
                     $string .= $rib->iban.' ';*/
-				}
-			}
-			if (! empty($rib->label) && $rib->number) {
-				if (! checkBanForAccount($rib)) {
-					$string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
-				} else {
-					$string.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
-				}
-			}
-
-			print $string;
-			print '</td>';
-			// IBAN
-			print '<td>'.$rib->iban;
-   			if (! empty($rib->iban)) {
-				if (! checkIbanForAccount($rib)) {
-					print ' '.img_picto($langs->trans("IbanNotValid"),'warning');
-				} else {
-					print ' '.img_picto($langs->trans("IbanValid"),'info');
-				}
-			}
-			print '</td>';
-			// BIC
-			print '<td>'.$rib->bic;
-			if (! empty($rib->bic)) {
-				if (! checkSwiftForAccount($rib)) {
-					print ' '.img_picto($langs->trans("SwiftNotValid"),'warning');
-				} else {
-					print ' '.img_picto($langs->trans("SwiftValid"),'info');
-				}
-			}
-			print '</td>';
-
-			if (! empty($conf->prelevement->enabled))
-			{
-				// RUM
-				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
-				print '<td>'.$rib->rum.'</td>';
-
-				// FRSTRECUR
-				print '<td>'.$rib->frstrecur.'</td>';
-			}
-
-			// Default
-			print '<td align="center" width="70">';
-			if (!$rib->default_rib) {
-				print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&ribid='.$rib->id.'&action=setasbankdefault">';
-				print img_picto($langs->trans("Disabled"),'off');
-				print '</a>';
-			} else {
-				print img_picto($langs->trans("Enabled"),'on');
-			}
-			print '</td>';
-
-			// Generate doc
-			print '<td align="center">';
-
-			$buttonlabel = $langs->trans("BuildDoc");
-			$forname='builddocrib'.$rib->id;
-
-			include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
-			$modellist=ModeleBankAccountDoc::liste_modeles($db);
-
-			$out = '';
-			if (is_array($modellist) && count($modellist))
-			{
-				$out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
-				$out.= '<input type="hidden" name="action" value="builddocrib">';
-				$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				$out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
-				$out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
-
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-				{
-					$arraykeys=array_keys($modellist);
-					$modelselected=$arraykeys[0];
-				}
-				if (! empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
-
-				$out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				$out.= ajax_combobox('modelrib'.$rib->id);
-
-				// Language code (if multilang)
-				if ($conf->global->MAIN_MULTILANGS)
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-					$formadmin=new FormAdmin($db);
-					$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-					$morecss='maxwidth150';
-					if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
-					$out.= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
-				}
-				// Button
-				$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-				$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-				$genbutton.= '>';
-				if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-				{
-					$langs->load("errors");
-					$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
-				}
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-				if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-				$out.= $genbutton;
-				$out.= '</form>';
-			}
-			print $out;
-			print '</td>';
-
-			// Edit/Delete
-			print '<td align="right" class="nowraponall">';
-			if ($user->rights->societe->creer)
-			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
-				print img_picto($langs->trans("Modify"),'edit');
-				print '</a>';
-
-		   		print '&nbsp;';
-
-		   		print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
-		   		print img_picto($langs->trans("Delete"),'delete');
-		   		print '</a>';
-			}
-			print '</td>';
-
-			print '</tr>';
-		}
-
-		if (count($rib_list) == 0)
-		{
-			$colspan=8;
-			if (! empty($conf->prelevement->enabled)) $colspan+=2;
-			print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
-		}
-
-		print '</table>';
-		print '</div>';
-	} else {
-		dol_print_error($db);
-	}
-
-
-	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	{
-		print '<br>';
-
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-
-		/*
+                }
+            }
+            if (! empty($rib->label) && $rib->number) {
+                if (! checkBanForAccount($rib)) {
+                    $string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
+                } else {
+                    $string.= ' '.img_picto($langs->trans("ValueIsValid"),'info');
+                }
+            }
+
+            print $string;
+            print '</td>';
+            // IBAN
+            print '<td>'.$rib->iban;
+                if (! empty($rib->iban)) {
+                if (! checkIbanForAccount($rib)) {
+                    print ' '.img_picto($langs->trans("IbanNotValid"),'warning');
+                } else {
+                    print ' '.img_picto($langs->trans("IbanValid"),'info');
+                }
+            }
+            print '</td>';
+            // BIC
+            print '<td>'.$rib->bic;
+            if (! empty($rib->bic)) {
+                if (! checkSwiftForAccount($rib)) {
+                    print ' '.img_picto($langs->trans("SwiftNotValid"),'warning');
+                } else {
+                    print ' '.img_picto($langs->trans("SwiftValid"),'info');
+                }
+            }
+            print '</td>';
+
+            if (! empty($conf->prelevement->enabled))
+            {
+                // RUM
+                //print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
+                print '<td>'.$rib->rum.'</td>';
+
+                // FRSTRECUR
+                print '<td>'.$rib->frstrecur.'</td>';
+            }
+
+            // Default
+            print '<td align="center" width="70">';
+            if (!$rib->default_rib) {
+                print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&ribid='.$rib->id.'&action=setasbankdefault">';
+                print img_picto($langs->trans("Disabled"),'off');
+                print '</a>';
+            } else {
+                print img_picto($langs->trans("Enabled"),'on');
+            }
+            print '</td>';
+
+            // Generate doc
+            print '<td align="center">';
+
+            $buttonlabel = $langs->trans("BuildDoc");
+            $forname='builddocrib'.$rib->id;
+
+            include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
+            $modellist=ModeleBankAccountDoc::liste_modeles($db);
+
+            $out = '';
+            if (is_array($modellist) && count($modellist))
+            {
+                $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
+                $out.= '<input type="hidden" name="action" value="builddocrib">';
+                $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                $out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
+                $out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
+
+                if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+                {
+                    $arraykeys=array_keys($modellist);
+                    $modelselected=$arraykeys[0];
+                }
+                if (! empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
+
+                $out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+                $out.= ajax_combobox('modelrib'.$rib->id);
+
+                // Language code (if multilang)
+                if ($conf->global->MAIN_MULTILANGS)
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+                    $formadmin=new FormAdmin($db);
+                    $defaultlang=$codelang?$codelang:$langs->getDefaultLang();
+                    $morecss='maxwidth150';
+                    if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
+                    $out.= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
+                }
+                // Button
+                $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+                $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+                if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+                $genbutton.= '>';
+                if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+                {
+                    $langs->load("errors");
+                    $genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+                }
+                if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
+                if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+                $out.= $genbutton;
+                $out.= '</form>';
+            }
+            print $out;
+            print '</td>';
+
+            // Edit/Delete
+            print '<td align="right" class="nowraponall">';
+            if ($user->rights->societe->creer)
+            {
+                print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
+                print img_picto($langs->trans("Modify"),'edit');
+                print '</a>';
+
+                    print '&nbsp;';
+
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
+                    print img_picto($langs->trans("Delete"),'delete');
+                    print '</a>';
+            }
+            print '</td>';
+
+            print '</tr>';
+        }
+
+        if (count($rib_list) == 0)
+        {
+            $colspan=8;
+            if (! empty($conf->prelevement->enabled)) $colspan+=2;
+            print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
+        }
+
+        print '</table>';
+        print '</div>';
+    } else {
+        dol_print_error($db);
+    }
+
+
+    if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+    {
+        print '<br>';
+
+        print '<div class="fichecenter"><div class="fichehalfleft">';
+        print '<a name="builddoc"></a>'; // ancre
+
+        /*
          * Documents generes
          */
-		$filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
-		$urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-		$genallowed=$user->rights->societe->lire;
-		$delallowed=$user->rights->societe->creer;
-
-		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-
-		// Show direct download link
-		if (! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))
-		{
-			$companybankaccounttemp = new CompanyBankAccount($db);
-			$companypaymentmodetemp = new CompanyPaymentMode($db);
-			$result = $companypaymentmodetemp->fetch(0, null, $object->id, 'ban');
-
-			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-			$ecmfile = new EcmFiles($db);
-			$result = $ecmfile->fetch(0, '', '', '', '', $companybankaccounttemp->table_element, $companypaymentmodetemp->id);
-			if ($result > 0)
-			{
-				$companybankaccounttemp->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
-				print '<br><!-- Link to download main doc -->'."\n";
-				print showDirectDownloadLink($companybankaccounttemp).'<br>';
-			}
-		}
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-		print '</div></div></div>';
-
-		print '<br>';
-	}
-	/*
+        $filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
+        $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+        $genallowed=$user->rights->societe->lire;
+        $delallowed=$user->rights->societe->creer;
+
+        print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+
+        // Show direct download link
+        if (! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))
+        {
+            $companybankaccounttemp = new CompanyBankAccount($db);
+            $companypaymentmodetemp = new CompanyPaymentMode($db);
+            $result = $companypaymentmodetemp->fetch(0, null, $object->id, 'ban');
+
+            include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+            $ecmfile = new EcmFiles($db);
+            $result = $ecmfile->fetch(0, '', '', '', '', $companybankaccounttemp->table_element, $companypaymentmodetemp->id);
+            if ($result > 0)
+            {
+                $companybankaccounttemp->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
+                print '<br><!-- Link to download main doc -->'."\n";
+                print showDirectDownloadLink($companybankaccounttemp).'<br>';
+            }
+        }
+
+        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+        print '</div></div></div>';
+
+        print '<br>';
+    }
+    /*
     include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
     $modellist=ModeleBankAccountDoc::liste_modeles($db);
     //print '<td>';
@@ -1327,310 +1327,310 @@ 
 // Edit BAN
 if ($socid && $action == 'edit' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-	print '<div class="fichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-	print '<td><input class="minwidth300" type="text" name="label" value="'.$companybankaccount->label.'"></td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
-	print '<td><input class="minwidth200" type="text" name="bank" value="'.$companybankaccount->bank.'"></td></tr>';
-
-	// Show fields of bank account
-	foreach ($companybankaccount->getFieldsToShow(1) as $val) {
-
-		$require=false;
-		if ($val == 'BankCode') {
-			$name = 'code_banque';
-			$size = 8;
-			$content = $companybankaccount->code_banque;
-		} elseif ($val == 'DeskCode') {
-			$name = 'code_guichet';
-			$size = 8;
-			$content = $companybankaccount->code_guichet;
-		} elseif ($val == 'BankAccountNumber') {
-			$name = 'number';
-			$size = 18;
-			$content = $companybankaccount->number;
-		} elseif ($val == 'BankAccountNumberKey') {
-			$name = 'cle_rib';
-			$size = 3;
-			$content = $companybankaccount->cle_rib;
-		} elseif ($val == 'IBAN') {
-			$name = 'iban';
-			$size = 30;
-			$content = $companybankaccount->iban;
-			if ($companybankaccount->needIBAN()) $require=true;
-		} elseif ($val == 'BIC') {
-			$name = 'bic';
-			$size = 12;
-			$content = $companybankaccount->bic;
-			if ($companybankaccount->needIBAN()) $require=true;
-		}
-
-		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
-		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
-		print '</tr>';
-	}
-
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
-	print $companybankaccount->domiciliation;
-	print "</textarea></td></tr>";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-	print '<td><input class="minwidth300" type="text" name="proprio" value="'.$companybankaccount->proprio.'"></td></tr>';
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-	print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
-	print $companybankaccount->owner_address;
-	print "</textarea></td></tr>";
-
-	print '</table>';
-
-	if ($conf->prelevement->enabled)
-	{
-		print '<br>';
-
-		print '<table class="border" width="100%">';
-
-		if (empty($companybankaccount->rum)) $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
-
-		// RUM
-		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
-		print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($companybankaccount->rum).'"></td></tr>';
-
-		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
-		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur','alpha')?GETPOST('frstrecur','alpha'):$companybankaccount->frstrecur), 0);
-		print '</td></tr>';
-
-		print '</table>';
-	}
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	print '<div align="center">';
-	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+    dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+    print '<div class="fichecenter">';
+
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent">';
+
+    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+    print '<td><input class="minwidth300" type="text" name="label" value="'.$companybankaccount->label.'"></td></tr>';
+
+    print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
+    print '<td><input class="minwidth200" type="text" name="bank" value="'.$companybankaccount->bank.'"></td></tr>';
+
+    // Show fields of bank account
+    foreach ($companybankaccount->getFieldsToShow(1) as $val) {
+
+        $require=false;
+        if ($val == 'BankCode') {
+            $name = 'code_banque';
+            $size = 8;
+            $content = $companybankaccount->code_banque;
+        } elseif ($val == 'DeskCode') {
+            $name = 'code_guichet';
+            $size = 8;
+            $content = $companybankaccount->code_guichet;
+        } elseif ($val == 'BankAccountNumber') {
+            $name = 'number';
+            $size = 18;
+            $content = $companybankaccount->number;
+        } elseif ($val == 'BankAccountNumberKey') {
+            $name = 'cle_rib';
+            $size = 3;
+            $content = $companybankaccount->cle_rib;
+        } elseif ($val == 'IBAN') {
+            $name = 'iban';
+            $size = 30;
+            $content = $companybankaccount->iban;
+            if ($companybankaccount->needIBAN()) $require=true;
+        } elseif ($val == 'BIC') {
+            $name = 'bic';
+            $size = 12;
+            $content = $companybankaccount->bic;
+            if ($companybankaccount->needIBAN()) $require=true;
+        }
+
+        print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
+        print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
+        print '</tr>';
+    }
+
+    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+    print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
+    print $companybankaccount->domiciliation;
+    print "</textarea></td></tr>";
+
+    print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+    print '<td><input class="minwidth300" type="text" name="proprio" value="'.$companybankaccount->proprio.'"></td></tr>';
+    print "</td></tr>\n";
+
+    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
+    print $companybankaccount->owner_address;
+    print "</textarea></td></tr>";
+
+    print '</table>';
+
+    if ($conf->prelevement->enabled)
+    {
+        print '<br>';
+
+        print '<table class="border" width="100%">';
+
+        if (empty($companybankaccount->rum)) $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
+
+        // RUM
+        print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
+        print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($companybankaccount->rum).'"></td></tr>';
+
+        print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+        $tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+        print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur','alpha')?GETPOST('frstrecur','alpha'):$companybankaccount->frstrecur), 0);
+        print '</td></tr>';
+
+        print '</table>';
+    }
+
+    print '</div>';
+
+    dol_fiche_end();
+
+    print '<div align="center">';
+    print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+    print '</div>';
 }
 
 // Edit Card
 if ($socid && $action == 'editcard' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-	print '<div class="fichecenter">';
+    print '<div class="fichecenter">';
 
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
-	print '<td><input class="minwidth300" type="text" id="label" name="label" value="'.$companypaymentmode->label.'"></td></tr>';
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
+    print '<td><input class="minwidth300" type="text" id="label" name="label" value="'.$companypaymentmode->label.'"></td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("NameOnCard").'</td>';
-	print '<td><input class="minwidth200" type="text" name="proprio" value="'.$companypaymentmode->proprio.'"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("NameOnCard").'</td>';
+    print '<td><input class="minwidth200" type="text" name="proprio" value="'.$companypaymentmode->proprio.'"></td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("CardNumber").'</td>';
-	print '<td><input class="minwidth200" type="text" name="cardnumber" value="'.$companypaymentmode->number.'"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("CardNumber").'</td>';
+    print '<td><input class="minwidth200" type="text" name="cardnumber" value="'.$companypaymentmode->number.'"></td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("ExpiryDate").'</td>';
-	print '<td>';
-	print $formother->select_month($companypaymentmode->exp_date_month, 'exp_date_month', 1);
-	print $formother->select_year($companypaymentmode->exp_date_year, 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
-	print '</td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("ExpiryDate").'</td>';
+    print '<td>';
+    print $formother->select_month($companypaymentmode->exp_date_month, 'exp_date_month', 1);
+    print $formother->select_year($companypaymentmode->exp_date_year, 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
+    print '</td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("CVN").'</td>';
-	print '<td><input size="8" type="text" name="cvn" value="'.$companypaymentmode->cvn.'"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("CVN").'</td>';
+    print '<td><input size="8" type="text" name="cvn" value="'.$companypaymentmode->cvn.'"></td></tr>';
 
-	print '<tr><td>'.$langs->trans("StripeID")." ('card_....')</td>";
-	print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.$companypaymentmode->stripe_card_ref.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("StripeID")." ('card_....')</td>";
+    print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.$companypaymentmode->stripe_card_ref.'"></td></tr>';
 
-	print '</table>';
-	print '</div>';
+    print '</table>';
+    print '</div>';
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div align="center">';
-	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+    print '<div align="center">';
+    print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+    print '</div>';
 }
 
 
 // Create BAN
 if ($socid && $action == 'create' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-	print '<div class="nofichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-	print '<td><input class="minwidth200" type="text" id="label" name="label" value="'.GETPOST('label').'"></td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
-	print '<td><input class="minwidth200" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
-
-	// Show fields of bank account
-	foreach ($companybankaccount->getFieldsToShow(1) as $val) {
-
-		$require=false;
-		if ($val == 'BankCode') {
-			$name = 'code_banque';
-			$size = 8;
-		} elseif ($val == 'DeskCode') {
-			$name = 'code_guichet';
-			$size = 8;
-		} elseif ($val == 'BankAccountNumber') {
-			$name = 'number';
-			$size = 18;
-		} elseif ($val == 'BankAccountNumberKey') {
-			$name = 'cle_rib';
-			$size = 3;
-		} elseif ($val == 'IBAN') {
-			$name = 'iban';
-			$size = 30;
-			if ($companybankaccount->needIBAN()) $require=true;
-		} elseif ($val == 'BIC') {
-			$name = 'bic';
-			$size = 12;
-			if ($companybankaccount->needIBAN()) $require=true;
-		}
-
-		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
-		print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.GETPOST($name).'"></td>';
-		print '</tr>';
-	}
-
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
-	print GETPOST('domiciliation');
-	print "</textarea></td></tr>";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-	print '<td><input class="minwidth200" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
-	print "</td></tr>\n";
-
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-	print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
-	print GETPOST('owner_address');
-	print "</textarea></td></tr>";
-
-	print '</table>';
-
-	if ($conf->prelevement->enabled)
-	{
-		print '<br>';
-
-		print '<table class="border" width="100%">';
-
-		// RUM
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
-		print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum','alpha').'"> <div class="opacitymedium">'.$langs->trans("RUMWillBeGenerated").'</div></td></tr>';
-
-		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
-		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
-		print '</td></tr>';
-
-		print '</table>';
-	}
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	dol_set_focus('#label');
-
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+    dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+    print '<div class="nofichecenter">';
+
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent">';
+
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+    print '<td><input class="minwidth200" type="text" id="label" name="label" value="'.GETPOST('label').'"></td></tr>';
+
+    print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
+    print '<td><input class="minwidth200" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
+
+    // Show fields of bank account
+    foreach ($companybankaccount->getFieldsToShow(1) as $val) {
+
+        $require=false;
+        if ($val == 'BankCode') {
+            $name = 'code_banque';
+            $size = 8;
+        } elseif ($val == 'DeskCode') {
+            $name = 'code_guichet';
+            $size = 8;
+        } elseif ($val == 'BankAccountNumber') {
+            $name = 'number';
+            $size = 18;
+        } elseif ($val == 'BankAccountNumberKey') {
+            $name = 'cle_rib';
+            $size = 3;
+        } elseif ($val == 'IBAN') {
+            $name = 'iban';
+            $size = 30;
+            if ($companybankaccount->needIBAN()) $require=true;
+        } elseif ($val == 'BIC') {
+            $name = 'bic';
+            $size = 12;
+            if ($companybankaccount->needIBAN()) $require=true;
+        }
+
+        print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
+        print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.GETPOST($name).'"></td>';
+        print '</tr>';
+    }
+
+    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+    print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
+    print GETPOST('domiciliation');
+    print "</textarea></td></tr>";
+
+    print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+    print '<td><input class="minwidth200" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
+    print "</td></tr>\n";
+
+    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
+    print GETPOST('owner_address');
+    print "</textarea></td></tr>";
+
+    print '</table>';
+
+    if ($conf->prelevement->enabled)
+    {
+        print '<br>';
+
+        print '<table class="border" width="100%">';
+
+        // RUM
+        print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
+        print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum','alpha').'"> <div class="opacitymedium">'.$langs->trans("RUMWillBeGenerated").'</div></td></tr>';
+
+        print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+        $tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+        print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
+        print '</td></tr>';
+
+        print '</table>';
+    }
+
+    print '</div>';
+
+    dol_fiche_end();
+
+    dol_set_focus('#label');
+
+    print '<div class="center">';
+    print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
+    print '</div>';
 }
 
 // Create Card
 if ($socid && $action == 'createcard' && $user->rights->societe->creer)
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-	print '<div class="nofichecenter">';
+    print '<div class="nofichecenter">';
 
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
-	print '<td><input class="minwidth200" type="text" id="label" name="label" value="'.GETPOST('label','alpha').'"></td></tr>';
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
+    print '<td><input class="minwidth200" type="text" id="label" name="label" value="'.GETPOST('label','alpha').'"></td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("NameOnCard").'</td>';
-	print '<td><input class="minwidth200" type="text" name="proprio" value="'.GETPOST('proprio','alpha').'"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("NameOnCard").'</td>';
+    print '<td><input class="minwidth200" type="text" name="proprio" value="'.GETPOST('proprio','alpha').'"></td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("CardNumber").'</td>';
-	print '<td><input class="minwidth200" type="text" name="cardnumber" value="'.GETPOST('cardnumber','alpha').'"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("CardNumber").'</td>';
+    print '<td><input class="minwidth200" type="text" name="cardnumber" value="'.GETPOST('cardnumber','alpha').'"></td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("ExpiryDate").'</td>';
-	print '<td>';
-	print $formother->select_month(GETPOST('exp_date_month','int'), 'exp_date_month', 1);
-	print $formother->select_year(GETPOST('exp_date_year','int'), 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
-	print '</td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("ExpiryDate").'</td>';
+    print '<td>';
+    print $formother->select_month(GETPOST('exp_date_month','int'), 'exp_date_month', 1);
+    print $formother->select_year(GETPOST('exp_date_year','int'), 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
+    print '</td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("CVN").'</td>';
-	print '<td><input size="8" type="text" name="cvn" value="'.GETPOST('cvn','alpha').'"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("CVN").'</td>';
+    print '<td><input size="8" type="text" name="cvn" value="'.GETPOST('cvn','alpha').'"></td></tr>';
 
-	print '<tr><td>'.$langs->trans("StripeID")." ('card_....')</td>";
-	print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.GETPOST('stripe_card_ref','alpha').'"></td></tr>';
+    print '<tr><td>'.$langs->trans("StripeID")." ('card_....')</td>";
+    print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.GETPOST('stripe_card_ref','alpha').'"></td></tr>';
 
-	print '</table>';
+    print '</table>';
 
-	print '</div>';
+    print '</div>';
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	dol_set_focus('#label');
+    dol_set_focus('#label');
 
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+    print '<div class="center">';
+    print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
+    print '</div>';
 }
 
 if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer)
 {
-	print '</form>';
+    print '</form>';
 }
 if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer)
 {
-	print '</form>';
+    print '</form>';
 }
 
 // End of page

dolibarr/htdocs/societe/note.php

Indentation +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
 }
 else
 {
-	$langs->load("errors");
-	print $langs->trans("ErrorRecordNotFound");
+    $langs->load("errors");
+    print $langs->trans("ErrorRecordNotFound");
 }
 
 // End of page

dolibarr/htdocs/societe/price.php

Indentation +367 added lines, -367 removed lines

@@ -33,9 +33,9 @@ 
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
 if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-	require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 
-	$prodcustprice = new Productcustomerprice($db);
+    $prodcustprice = new Productcustomerprice($db);
 }
 
 $langs->loadLangs(array("products", "companies", "bills"));
@@ -47,7 +47,7 @@ 
 // Security check
 $socid = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int');
 if ($user->societe_id)
-	$socid = $user->societe_id;
+    $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $object = new Societe($db);
@@ -74,98 +74,98 @@ 
 
     if ($action == 'add_customer_price_confirm' && ! $cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
 
-    	$update_child_soc = GETPOST('updatechildprice');
-
-    	// add price by customer
-    	$prodcustprice->fk_soc = $socid;
-    	$prodcustprice->fk_product = GETPOST('prodid', 'int');
-    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-
-    	$tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
-
-    	// We must define tva_tx, npr and local taxes
-    	$vatratecode = '';
-    	$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
-    	$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-    	$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-    	// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-    	if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-    	{
-    	    // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
-    	    $vatratecode=$reg[1];
-    	    // Get record from code
-    	    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-    	    $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-    	    $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-    	    $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-    	    $sql.= " AND t.code ='".$vatratecode."'";
-    	    $resql=$db->query($sql);
-    	    if ($resql)
-    	    {
-    	        $obj = $db->fetch_object($resql);
-    	        $npr = $obj->recuperableonly;
-    	        $localtax1 = $obj->localtax1;
-    	        $localtax2 = $obj->localtax2;
-    	        $localtax1_type = $obj->localtax1_type;
-    	        $localtax2_type = $obj->localtax2_type;
-    	    }
-    	}
-
-    	$prodcustprice->default_vat_code = $vatratecode;
-    	$prodcustprice->tva_tx = $tva_tx;
-    	$prodcustprice->recuperableonly = $npr;
-    	$prodcustprice->localtax1_tx = $localtax1;
-    	$prodcustprice->localtax2_tx = $localtax2;
-    	$prodcustprice->localtax1_type = $localtax1_type;
-    	$prodcustprice->localtax2_type = $localtax2_type;
-
-    	$result = $prodcustprice->create($user, 0, $update_child_soc);
-
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-    	} else {
-    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-    	}
-
-    	$action = '';
+        $update_child_soc = GETPOST('updatechildprice');
+
+        // add price by customer
+        $prodcustprice->fk_soc = $socid;
+        $prodcustprice->fk_product = GETPOST('prodid', 'int');
+        $prodcustprice->price = price2num(GETPOST("price"), 'MU');
+        $prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+        $prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+
+        $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+
+        // We must define tva_tx, npr and local taxes
+        $vatratecode = '';
+        $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+        $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+        $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+        // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+        if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+        {
+            // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+            $vatratecode=$reg[1];
+            // Get record from code
+            $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+            $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+            $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+            $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+            $sql.= " AND t.code ='".$vatratecode."'";
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $obj = $db->fetch_object($resql);
+                $npr = $obj->recuperableonly;
+                $localtax1 = $obj->localtax1;
+                $localtax2 = $obj->localtax2;
+                $localtax1_type = $obj->localtax1_type;
+                $localtax2_type = $obj->localtax2_type;
+            }
+        }
+
+        $prodcustprice->default_vat_code = $vatratecode;
+        $prodcustprice->tva_tx = $tva_tx;
+        $prodcustprice->recuperableonly = $npr;
+        $prodcustprice->localtax1_tx = $localtax1;
+        $prodcustprice->localtax2_tx = $localtax2;
+        $prodcustprice->localtax1_type = $localtax1_type;
+        $prodcustprice->localtax2_type = $localtax2_type;
+
+        $result = $prodcustprice->create($user, 0, $update_child_soc);
+
+        if ($result < 0) {
+            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+        } else {
+            setEventMessages($langs->trans('Save'), null, 'mesgs');
+        }
+
+        $action = '';
     }
 
     if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	// Delete price by customer
-    	$prodcustprice->id = GETPOST('lineid');
-    	$result = $prodcustprice->delete($user);
-
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
-    	} else {
-    		setEventMessages($langs->trans('Delete'), null, 'errors');
-    	}
-    	$action = '';
+        // Delete price by customer
+        $prodcustprice->id = GETPOST('lineid');
+        $result = $prodcustprice->delete($user);
+
+        if ($result < 0) {
+            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
+        } else {
+            setEventMessages($langs->trans('Delete'), null, 'errors');
+        }
+        $action = '';
     }
 
     if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 
-    	$prodcustprice->fetch(GETPOST('lineid', 'int'));
+        $prodcustprice->fetch(GETPOST('lineid', 'int'));
 
-    	$update_child_soc = GETPOST('updatechildprice');
+        $update_child_soc = GETPOST('updatechildprice');
 
-    	// update price by customer
-    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-    	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-    	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
+        // update price by customer
+        $prodcustprice->price = price2num(GETPOST("price"), 'MU');
+        $prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+        $prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+        $prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
+        $prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
-    	$result = $prodcustprice->update($user, 0, $update_child_soc);
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-    	} else {
-    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-    	}
+        $result = $prodcustprice->update($user, 0, $update_child_soc);
+        if ($result < 0) {
+            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+        } else {
+            setEventMessages($langs->trans('Save'), null, 'mesgs');
+        }
 
-    	$action = '';
+        $action = '';
     }
 }
 
@@ -182,7 +182,7 @@ 
 llxHeader("", $langs->trans("ThirdParty") . '-' . $langs->trans('PriceByCustomer'));
 
 if (! empty($conf->notification->enabled))
-	$langs->load("mails");
+    $langs->load("mails");
 $head = societe_prepare_head($object);
 
 dol_fiche_head($head, 'price', $langs->trans("ThirdParty"), -1, 'company');
@@ -198,25 +198,25 @@ 
 
 if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
 {
-	print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
+    print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
 }
 
 if ($object->client) {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('CustomerCode') . '</td><td colspan="3">';
-	print $object->code_client;
-	if ($object->check_codeclient() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
-	print '</td></tr>';
+    print '<tr><td class="titlefield">';
+    print $langs->trans('CustomerCode') . '</td><td colspan="3">';
+    print $object->code_client;
+    if ($object->check_codeclient() != 0)
+        print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+    print '</td></tr>';
 }
 
 if ($object->fournisseur) {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('SupplierCode') . '</td><td colspan="3">';
-	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
-	print '</td></tr>';
+    print '<tr><td class="titlefield">';
+    print $langs->trans('SupplierCode') . '</td><td colspan="3">';
+    print $object->code_fournisseur;
+    if ($object->check_codefournisseur() != 0)
+        print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+    print '</td></tr>';
 }
 
 print '</table>';
@@ -229,277 +229,277 @@ 
 
 if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
-	$prodcustprice = new Productcustomerprice($db);
+    $prodcustprice = new Productcustomerprice($db);
 
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+    $sortfield = GETPOST("sortfield", 'alpha');
+    $sortorder = GETPOST("sortorder", 'alpha');
     $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-	$page = GETPOST("page", 'int');
-	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-	$offset = $limit * $page;
-	$pageprev = $page - 1;
-	$pagenext = $page + 1;
-	if (! $sortorder)
-		$sortorder = "ASC";
-	if (! $sortfield)
-		$sortfield = "soc.nom";
-
-		// Build filter to diplay only concerned lines
-	$filter = array (
-		't.fk_soc' => $object->id
-	);
-
-	if (! empty($search_prod)) {
-		$filter ['prod.ref'] = $search_prod;
-	}
-
-	if ($action == 'add_customer_price') {
-
-		// Create mode
-
-		print load_fiche_titre($langs->trans('PriceByCustomer'));
-
-		print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
-		print '<input type="hidden" name="socid" value="' . $object->id . '">';
-		print '<table class="border" width="100%">';
-		print '<tr>';
-		print '<td>' . $langs->trans('Product') . '</td>';
-		print '<td>';
-		print $form->select_produits('', 'prodid', '', 0);
-		print '</td>';
-		print '</tr>';
-
-		// VAT
-		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
-		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, '', false, 1);
-		print '</td></tr>';
-
-		// Price base
-		print '<tr><td width="15%">';
-		print $langs->trans('PriceBase');
-		print '</td>';
-		print '<td>';
-		print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
-		print '</td>';
-		print '</tr>';
-
-		// Price
-		print '<tr><td width="20%">';
-		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
-		print '</td><td>';
-		if ($object->price_base_type == 'TTC') {
-			print '<input name="price" size="10" value="' . price($object->price_ttc) . '">';
-		} else {
-			print '<input name="price" size="10" value="' . price($object->price) . '">';
-		}
-		print '</td></tr>';
-
-		// Price minimum
-		print '<tr><td>';
-		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
-		if ($object->price_base_type == 'TTC') {
-			print '<td><input name="price_min" size="10" value="' . price($object->price_min_ttc) . '">';
-		} else {
-			print '<td><input name="price_min" size="10" value="' . price($object->price_min) . '">';
-		}
-		print '</td></tr>';
-
-		// Update all child soc
-		print '<tr><td width="15%">';
-		print $langs->trans('ForceUpdateChildPriceSoc');
-		print '</td>';
-		print '<td>';
-		print '<input type="checkbox" name="updatechildprice" value="1"/>';
-		print '</td>';
-		print '</tr>';
-
-		print '</table>';
-
-		print '<br><div align="center">';
-		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
-		print '</div>';
-
-		print '<br></form>';
-	} elseif ($action == 'edit_customer_price') {
-
-		// Edit mode
-
-		print load_fiche_titre($langs->trans('PriceByCustomer'));
-
-		$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
-		if ($result < 0)
-		{
-			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-		}
-
-		print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-		print '<input type="hidden" name="action" value="update_customer_price_confirm">';
-		print '<input type="hidden" name="lineid" value="' . $prodcustprice->id . '">';
-		print '<table class="border" width="100%">';
-		print '<tr>';
-		print '<td>' . $langs->trans('Product') . '</td>';
-		$staticprod = new Product($db);
-		$staticprod->fetch($prodcustprice->fk_product);
-		print "<td>" . $staticprod->getNomUrl(1) . "</td>";
-		print '</tr>';
-
-		// VAT
-		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
-		print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $staticprod->id, $prodcustprice->recuperableonly);
-		print '</td></tr>';
-
-		// Price base
-		print '<tr><td width="15%">';
-		print $langs->trans('PriceBase');
-		print '</td>';
-		print '<td>';
-		print $form->selectPriceBaseType($prodcustprice->price_base_type, "price_base_type");
-		print '</td>';
-		print '</tr>';
-
-		// Price
-		print '<tr><td width="20%">';
-		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
-		print '</td><td>';
-		if ($prodcustprice->price_base_type == 'TTC') {
-			print '<input name="price" size="10" value="' . price($prodcustprice->price_ttc) . '">';
-		} else {
-			print '<input name="price" size="10" value="' . price($prodcustprice->price) . '">';
-		}
-		print '</td></tr>';
-
-		// Price minimum
-		print '<tr><td>';
-		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
-		print '</td><td>';
-		if ($prodcustprice->price_base_type == 'TTC') {
-			print '<input name="price_min" size="10" value="' . price($prodcustprice->price_min_ttc) . '">';
-		} else {
-			print '<input name="price_min" size="10" value="' . price($prodcustprice->price_min) . '">';
-		}
-		print '</td></tr>';
-
-		// Update all child soc
-		print '<tr><td width="15%">';
-		print $langs->trans('ForceUpdateChildPriceSoc');
-		print '</td>';
-		print '<td>';
-		print '<input type="checkbox" name="updatechildprice" value="1">';
-		print '</td>';
-		print '</tr>';
-
-		print '</table>';
-
-		print '<br><div class="center">';
-		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
-		print '</div>';
-
-		print '<br></form>';
-	} elseif ($action == 'showlog_customer_price') {
-
-	    print '<!-- showlog_customer_price -->'."\n";
-
-		$filter = array (
-			't.fk_product' => GETPOST('prodid', 'int'),'t.fk_soc' => $socid
-		);
-
-		// Count total nb of records
-		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-			$nbtotalofrecords = $prodcustprice->fetch_all_log($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-		}
-
-		$result = $prodcustprice->fetch_all_log($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-		if ($result < 0)
-		{
-			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-		}
-
-		$option = '&socid=' . GETPOST('socid', 'int') . '&prodid=' . GETPOST('prodid', 'int');
-
-		print_barre_liste($langs->trans('PriceByCustomerLog'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);
-
-		if (count($prodcustprice->lines) > 0) {
-
-			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
-			print '<input type="hidden" name="id" value="' . $object->id . '">';
-
-			print '<table class="noborder" width="100%">';
-
-			print '<tr class="liste_titre">';
-			print '<td>' . $langs->trans("Product") . '</td>';
-			print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
-			print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
-			print '<td align="right">' . $langs->trans("VAT") . '</td>';
-			print '<td align="right">' . $langs->trans("HT") . '</td>';
-			print '<td align="right">' . $langs->trans("TTC") . '</td>';
-			print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
-			print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '</td>';
-			print '<td align="right">' . $langs->trans("ChangedBy") . '</td>';
-			print '<td>&nbsp;</td>';
-			print '</tr>';
-
-			foreach ( $prodcustprice->lines as $line ) {
-
-				print '<tr class="oddeven">';
-				$staticprod = new Product($db);
-				$staticprod->fetch($line->fk_product);
-
-				print "<td>" . $staticprod->getNomUrl(1) . "</td>";
-				print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
-
-				print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
-				print '<td align="right">' . vatrate($line->tva_tx, true, $line->recuperableonly) . "</td>";
-				print '<td align="right">' . price($line->price) . "</td>";
-				print '<td align="right">' . price($line->price_ttc) . "</td>";
-				print '<td align="right">' . price($line->price_min) . '</td>';
-				print '<td align="right">' . price($line->price_min_ttc) . '</td>';
-
-				// User
-				$userstatic = new User($db);
-				$userstatic->fetch($line->fk_user);
-				print '<td align="right">';
-				print $userstatic->getLoginUrl(1);
-				print '</td>';
-			}
-			print "</table>";
-		}
-		else
-		{
-			print $langs->trans('None');
-		}
-
-		print "\n" . '<div class="tabsAction">' . "\n";
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '">' . $langs->trans("Ok") . '</a></div>';
-		print "\n</div><br>\n";
-	}
-	else
-	{
+    $page = GETPOST("page", 'int');
+    if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+    $offset = $limit * $page;
+    $pageprev = $page - 1;
+    $pagenext = $page + 1;
+    if (! $sortorder)
+        $sortorder = "ASC";
+    if (! $sortfield)
+        $sortfield = "soc.nom";
+
+        // Build filter to diplay only concerned lines
+    $filter = array (
+        't.fk_soc' => $object->id
+    );
+
+    if (! empty($search_prod)) {
+        $filter ['prod.ref'] = $search_prod;
+    }
+
+    if ($action == 'add_customer_price') {
+
+        // Create mode
+
+        print load_fiche_titre($langs->trans('PriceByCustomer'));
+
+        print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
+        print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+        print '<input type="hidden" name="action" value="add_customer_price_confirm">';
+        print '<input type="hidden" name="socid" value="' . $object->id . '">';
+        print '<table class="border" width="100%">';
+        print '<tr>';
+        print '<td>' . $langs->trans('Product') . '</td>';
+        print '<td>';
+        print $form->select_produits('', 'prodid', '', 0);
+        print '</td>';
+        print '</tr>';
+
+        // VAT
+        print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
+        print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, '', false, 1);
+        print '</td></tr>';
+
+        // Price base
+        print '<tr><td width="15%">';
+        print $langs->trans('PriceBase');
+        print '</td>';
+        print '<td>';
+        print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
+        print '</td>';
+        print '</tr>';
+
+        // Price
+        print '<tr><td width="20%">';
+        $text = $langs->trans('SellingPrice');
+        print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+        print '</td><td>';
+        if ($object->price_base_type == 'TTC') {
+            print '<input name="price" size="10" value="' . price($object->price_ttc) . '">';
+        } else {
+            print '<input name="price" size="10" value="' . price($object->price) . '">';
+        }
+        print '</td></tr>';
+
+        // Price minimum
+        print '<tr><td>';
+        $text = $langs->trans('MinPrice');
+        print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+        if ($object->price_base_type == 'TTC') {
+            print '<td><input name="price_min" size="10" value="' . price($object->price_min_ttc) . '">';
+        } else {
+            print '<td><input name="price_min" size="10" value="' . price($object->price_min) . '">';
+        }
+        print '</td></tr>';
+
+        // Update all child soc
+        print '<tr><td width="15%">';
+        print $langs->trans('ForceUpdateChildPriceSoc');
+        print '</td>';
+        print '<td>';
+        print '<input type="checkbox" name="updatechildprice" value="1"/>';
+        print '</td>';
+        print '</tr>';
+
+        print '</table>';
+
+        print '<br><div align="center">';
+        print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
+        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+        print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
+        print '</div>';
+
+        print '<br></form>';
+    } elseif ($action == 'edit_customer_price') {
+
+        // Edit mode
+
+        print load_fiche_titre($langs->trans('PriceByCustomer'));
+
+        $result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
+        if ($result < 0)
+        {
+            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+        }
+
+        print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
+        print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+        print '<input type="hidden" name="action" value="update_customer_price_confirm">';
+        print '<input type="hidden" name="lineid" value="' . $prodcustprice->id . '">';
+        print '<table class="border" width="100%">';
+        print '<tr>';
+        print '<td>' . $langs->trans('Product') . '</td>';
+        $staticprod = new Product($db);
+        $staticprod->fetch($prodcustprice->fk_product);
+        print "<td>" . $staticprod->getNomUrl(1) . "</td>";
+        print '</tr>';
+
+        // VAT
+        print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
+        print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $staticprod->id, $prodcustprice->recuperableonly);
+        print '</td></tr>';
+
+        // Price base
+        print '<tr><td width="15%">';
+        print $langs->trans('PriceBase');
+        print '</td>';
+        print '<td>';
+        print $form->selectPriceBaseType($prodcustprice->price_base_type, "price_base_type");
+        print '</td>';
+        print '</tr>';
+
+        // Price
+        print '<tr><td width="20%">';
+        $text = $langs->trans('SellingPrice');
+        print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+        print '</td><td>';
+        if ($prodcustprice->price_base_type == 'TTC') {
+            print '<input name="price" size="10" value="' . price($prodcustprice->price_ttc) . '">';
+        } else {
+            print '<input name="price" size="10" value="' . price($prodcustprice->price) . '">';
+        }
+        print '</td></tr>';
+
+        // Price minimum
+        print '<tr><td>';
+        $text = $langs->trans('MinPrice');
+        print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+        print '</td><td>';
+        if ($prodcustprice->price_base_type == 'TTC') {
+            print '<input name="price_min" size="10" value="' . price($prodcustprice->price_min_ttc) . '">';
+        } else {
+            print '<input name="price_min" size="10" value="' . price($prodcustprice->price_min) . '">';
+        }
+        print '</td></tr>';
+
+        // Update all child soc
+        print '<tr><td width="15%">';
+        print $langs->trans('ForceUpdateChildPriceSoc');
+        print '</td>';
+        print '<td>';
+        print '<input type="checkbox" name="updatechildprice" value="1">';
+        print '</td>';
+        print '</tr>';
+
+        print '</table>';
+
+        print '<br><div class="center">';
+        print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
+        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+        print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
+        print '</div>';
+
+        print '<br></form>';
+    } elseif ($action == 'showlog_customer_price') {
+
+        print '<!-- showlog_customer_price -->'."\n";
+
+        $filter = array (
+            't.fk_product' => GETPOST('prodid', 'int'),'t.fk_soc' => $socid
+        );
+
+        // Count total nb of records
+        $nbtotalofrecords = '';
+        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+            $nbtotalofrecords = $prodcustprice->fetch_all_log($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
+        }
+
+        $result = $prodcustprice->fetch_all_log($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
+        if ($result < 0)
+        {
+            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+        }
+
+        $option = '&socid=' . GETPOST('socid', 'int') . '&prodid=' . GETPOST('prodid', 'int');
+
+        print_barre_liste($langs->trans('PriceByCustomerLog'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);
+
+        if (count($prodcustprice->lines) > 0) {
+
+            print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
+            print '<input type="hidden" name="id" value="' . $object->id . '">';
+
+            print '<table class="noborder" width="100%">';
+
+            print '<tr class="liste_titre">';
+            print '<td>' . $langs->trans("Product") . '</td>';
+            print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
+            print '<td align="center">' . $langs->trans("PriceBase") . '</td>';
+            print '<td align="right">' . $langs->trans("VAT") . '</td>';
+            print '<td align="right">' . $langs->trans("HT") . '</td>';
+            print '<td align="right">' . $langs->trans("TTC") . '</td>';
+            print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '</td>';
+            print '<td align="right">' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '</td>';
+            print '<td align="right">' . $langs->trans("ChangedBy") . '</td>';
+            print '<td>&nbsp;</td>';
+            print '</tr>';
+
+            foreach ( $prodcustprice->lines as $line ) {
+
+                print '<tr class="oddeven">';
+                $staticprod = new Product($db);
+                $staticprod->fetch($line->fk_product);
+
+                print "<td>" . $staticprod->getNomUrl(1) . "</td>";
+                print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
+
+                print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
+                print '<td align="right">' . vatrate($line->tva_tx, true, $line->recuperableonly) . "</td>";
+                print '<td align="right">' . price($line->price) . "</td>";
+                print '<td align="right">' . price($line->price_ttc) . "</td>";
+                print '<td align="right">' . price($line->price_min) . '</td>';
+                print '<td align="right">' . price($line->price_min_ttc) . '</td>';
+
+                // User
+                $userstatic = new User($db);
+                $userstatic->fetch($line->fk_user);
+                print '<td align="right">';
+                print $userstatic->getLoginUrl(1);
+                print '</td>';
+            }
+            print "</table>";
+        }
+        else
+        {
+            print $langs->trans('None');
+        }
+
+        print "\n" . '<div class="tabsAction">' . "\n";
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '">' . $langs->trans("Ok") . '</a></div>';
+        print "\n</div><br>\n";
+    }
+    else
+    {
         // View mode
 
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* Barre d'action                                                             */
-		/*                                                                            */
-		/* ************************************************************************** */
+        /* ************************************************************************** */
+        /*                                                                            */
+        /* Barre d'action                                                             */
+        /*                                                                            */
+        /* ************************************************************************** */
 
-		print "\n" . '<div class="tabsAction">' . "\n";
+        print "\n" . '<div class="tabsAction">' . "\n";
 
-		if ($user->rights->produit->creer || $user->rights->service->creer) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;socid=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
-		}
-		print "\n</div>\n";
+        if ($user->rights->produit->creer || $user->rights->service->creer) {
+            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;socid=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
+        }
+        print "\n</div>\n";
 
 
         // Count total nb of records
@@ -517,9 +517,9 @@ 
 
         $option = '&search_prod=' . $search_prod . '&id=' . $object->id;
 
-	    print '<!-- view specific price for each product -->'."\n";
+        print '<!-- view specific price for each product -->'."\n";
 
-	    print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+        print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
 
         print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
         print '<input type="hidden" name="id" value="' . $object->id . '">';
@@ -542,7 +542,7 @@ 
         if (count($prodcustprice->lines) > 0 || $search_prod)
         {
             print '<tr class="liste_titre">';
-			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="' . $search_prod . '" size="20"></td>';
+            print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="' . $search_prod . '" size="20"></td>';
             print '<td class="liste_titre" colspan="8">&nbsp;</td>';
             // Print the search button
             print '<td class="liste_titre" align="right">';
@@ -609,7 +609,7 @@ 
         print "</table>";
 
         print "</form>";
-	}
+    }
 }
 
 // End of page

dolibarr/htdocs/societe/contact.php

Indentation +16 added lines, -16 removed lines

@@ -70,9 +70,9 @@ 
 
 if ($action == 'view' && $object->fetch($socid)<=0)
 {
-	$langs->load("errors");
-	print($langs->trans('ErrorRecordNotFound'));
-	exit;
+    $langs->load("errors");
+    print($langs->trans('ErrorRecordNotFound'));
+    exit;
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
@@ -102,7 +102,7 @@ 
 
 if (empty($reshook))
 {
-	if ($cancel)
+    if ($cancel)
     {
         $action='';
         if (! empty($backtopage))
@@ -129,7 +129,7 @@ 
 if ($socid > 0 && empty($object->id))
 {
     $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
+    if ($result <= 0) dol_print_error('',$object->error);
 }
 
 $title=$langs->trans("ThirdParty");
@@ -158,17 +158,17 @@ 
 
 if ($action != 'presend')
 {
-	// Contacts list
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-	{
-		$result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-	}
-
-	// Addresses list
-	if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
-	{
-		$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-	}
+    // Contacts list
+    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+    {
+        $result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+    }
+
+    // Addresses list
+    if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
+    {
+        $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+    }
 }
 
 // End of page

dolibarr/htdocs/api/class/api_login.class.php

Indentation +100 added lines, -100 removed lines

@@ -31,110 +31,110 @@
      */
     function __construct()
     {
-		global $db;
-		$this->db = $db;
-	}
-
-	/**
-	 * Login
-	 *
-	 * Request the API token for a couple username / password.
-	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API key (DOLAPIKEY) can be found/set on the user page.
-	 *
-	 * @param   string  $login			User login
-	 * @param   string  $password		User password
-	 * @param   string  $entity			Entity (when multicompany module is used). '' means 1=first company.
-	 * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
+        global $db;
+        $this->db = $db;
+    }
+
+    /**
+     * Login
+     *
+     * Request the API token for a couple username / password.
+     * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
+     * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API key (DOLAPIKEY) can be found/set on the user page.
+     *
+     * @param   string  $login			User login
+     * @param   string  $password		User password
+     * @param   string  $entity			Entity (when multicompany module is used). '' means 1=first company.
+     * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
      * @return  array                   Response status and user token
      *
-	 * @throws 200
-	 * @throws 403
-	 * @throws 500
-	 *
-	 * @url GET /
-	 * @url POST /
-	 */
+     * @throws 200
+     * @throws 403
+     * @throws 500
+     *
+     * @url GET /
+     * @url POST /
+     */
     public function index($login, $password, $entity='', $reset=0)
     {
 
-	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
-
-		// Authentication mode
-		if (empty($dolibarr_main_authentication))
-			$dolibarr_main_authentication = 'http,dolibarr';
-		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser')
-		{
-			if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
-			if ($dolibarr_auto_user != $login)
-			{
-				dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
-				throw new RestException(403, "Your instance is set to use the automatic login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
-			}
-		}
-		// Set authmode
-		$authmode = explode(',', $dolibarr_main_authentication);
-
-		if ($entity != '' && ! is_numeric($entity))
-		{
-			throw new RestException(403, "Bad value for entity, must be the numeric ID of company.");
-		}
-		if ($entity == '') $entity=1;
-
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
-		$login = checkLoginPassEntity($login, $password, $entity, $authmode);
-		if (empty($login))
-		{
-			throw new RestException(403, 'Access denied');
-		}
-
-		$token = 'failedtogenerateorgettoken';
-
-		$tmpuser=new User($this->db);
-		$tmpuser->fetch(0, $login, 0, 0, $entity);
-		if (empty($tmpuser->id))
-		{
-			throw new RestException(500, 'Failed to load user');
-		}
-
-		// Renew the hash
-		if (empty($tmpuser->api_key) || $reset)
-		{
-			$tmpuser->getrights();
-			if (empty($tmpuser->rights->user->self->creer))
-			{
-				throw new RestException(403, 'User need write permission on itself to reset its API token');
-			}
-
-    		// Generate token for user
-    		$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
-
-    		// We store API token into database
-    		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-    		$sql.= " SET api_key = '".$this->db->escape($token)."'";
-    		$sql.= " WHERE login = '".$this->db->escape($login)."'";
-
-    		dol_syslog(get_class($this)."::login", LOG_DEBUG);	// No log
-    		$result = $this->db->query($sql);
-    		if (!$result)
-    		{
-    			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
-    		}
-		}
-		else
-		{
+        global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
+
+        // Authentication mode
+        if (empty($dolibarr_main_authentication))
+            $dolibarr_main_authentication = 'http,dolibarr';
+        // Authentication mode: forceuser
+        if ($dolibarr_main_authentication == 'forceuser')
+        {
+            if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+            if ($dolibarr_auto_user != $login)
+            {
+                dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
+                throw new RestException(403, "Your instance is set to use the automatic login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
+            }
+        }
+        // Set authmode
+        $authmode = explode(',', $dolibarr_main_authentication);
+
+        if ($entity != '' && ! is_numeric($entity))
+        {
+            throw new RestException(403, "Bad value for entity, must be the numeric ID of company.");
+        }
+        if ($entity == '') $entity=1;
+
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+        $login = checkLoginPassEntity($login, $password, $entity, $authmode);
+        if (empty($login))
+        {
+            throw new RestException(403, 'Access denied');
+        }
+
+        $token = 'failedtogenerateorgettoken';
+
+        $tmpuser=new User($this->db);
+        $tmpuser->fetch(0, $login, 0, 0, $entity);
+        if (empty($tmpuser->id))
+        {
+            throw new RestException(500, 'Failed to load user');
+        }
+
+        // Renew the hash
+        if (empty($tmpuser->api_key) || $reset)
+        {
+            $tmpuser->getrights();
+            if (empty($tmpuser->rights->user->self->creer))
+            {
+                throw new RestException(403, 'User need write permission on itself to reset its API token');
+            }
+
+            // Generate token for user
+            $token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
+
+            // We store API token into database
+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";
+            $sql.= " SET api_key = '".$this->db->escape($token)."'";
+            $sql.= " WHERE login = '".$this->db->escape($login)."'";
+
+            dol_syslog(get_class($this)."::login", LOG_DEBUG);	// No log
+            $result = $this->db->query($sql);
+            if (!$result)
+            {
+                throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
+            }
+        }
+        else
+        {
             $token = $tmpuser->api_key;
-		}
-
-		//return token
-		return array(
-			'success' => array(
-				'code' => 200,
-				'token' => $token,
-			    'entity' => $tmpuser->entity,
-			    'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
-			)
-		);
-	}
+        }
+
+        //return token
+        return array(
+            'success' => array(
+                'code' => 200,
+                'token' => $token,
+                'entity' => $tmpuser->entity,
+                'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+            )
+        );
+    }
 }