Uniformize look and feel

htdocs/core/class/conf.class.php

@@ -386,6 +386,8 @@ class Conf
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))       $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
 		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))       $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";
 
+		if (empty($this->global->CHEQUERECEIPTS_ADDON))           $this->global->CHEQUERECEIPTS_ADDON='mod_chequereceipt_mint';
+		
         // Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator
         if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664';         // Default mask

htdocs/core/lib/company.lib.php

@@ -123,7 +123,45 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-    // Show more tabs from modules
+	// Related items
+    if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fichinter->enabled) || ! empty($conf->fournisseur->enabled))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
+        $head[$h][1] = $langs->trans("Referers");
+        $head[$h][2] = 'consumption';
+        $h++;
+    }
+
+    // Bank accounrs
+    if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
+    {
+        $nbBankAccount=0;
+        $head[$h][0] = DOL_URL_ROOT .'/societe/rib.php?socid='.$object->id;
+        $head[$h][1] = $langs->trans("BankAccounts");
+        $sql = "SELECT COUNT(n.rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
+        $sql.= " WHERE fk_soc = ".$object->id;
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $num = $db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                $nbBankAccount=$obj->nb;
+                $i++;
+            }
+        }
+        else {
+            dol_print_error($db);
+        }
+		if ($nbBankAccount > 0) $head[$h][1].= ' <span class="badge">'.$nbBankAccount.'</span>';
+        $head[$h][2] = 'rib';
+        $h++;
+    }
+        
+	// Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
@@ -131,14 +169,6 @@ function societe_prepare_head(Societe $object)
 
     if ($user->societe_id == 0)
     {
-        if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fichinter->enabled) || ! empty($conf->fournisseur->enabled))
-        {
-	        $head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
-	        $head[$h][1] = $langs->trans("Referers");
-	        $head[$h][2] = 'consumption';
-	        $h++;
-        }
-
         // Notifications
         if (! empty($conf->notification->enabled))
         {
@@ -232,14 +262,6 @@ function societe_prepare_head2($object)
     $head[$h][2] = 'company';
     $h++;
 
-    if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
-    {
-	    $head[$h][0] = DOL_URL_ROOT .'/societe/rib.php?socid='.$object->id;
-	    $head[$h][1] = $langs->trans("BankAccount");
-	    $head[$h][2] = 'rib';
-	    $h++;
-    }
-
     $head[$h][0] = 'commerciaux.php?socid='.$object->id;
     $head[$h][1] = $langs->trans("SalesRepresentative");
     $head[$h][2] = 'salesrepresentative';

htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

@@ -332,6 +332,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 $var=true;
                 if ($num)
                 {
+                    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+                    
                 	$i=0;
                 	$contactstatic = new Contact($this->db);
 

htdocs/langs/en_US/withdrawals.lang

@@ -80,7 +80,7 @@ WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
 SepaMandate=SEPA Direct Debit Mandate
 PleaseReturnMandate=Please return this mandate form to
-SEPALegalText=By signing this mandate form, you authorise (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
 CreditorIdentifier=Creditor Identifier
 CreditorName=Creditor’s Name
 SEPAFillForm=(B) Please complete all the fields marked *

htdocs/societe/consumption.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2012-2013 Philippe Berthet     <berthet@systune.be>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2015 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015	   Ferran Marcet		<fmarcet@2byte.es>
@@ -57,7 +57,7 @@ $month	= GETPOST('month','int');
 $year	= GETPOST('year','int');
 
 // Clean up on purge search criteria ?
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
     $sref='';
     $sprod_fulldescr='';

htdocs/societe/rib.php

@@ -29,6 +29,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 
@@ -38,220 +39,258 @@ $langs->load("banks");
 $langs->load("bills");
 
 // Security check
-$socid = GETPOST("socid");
+$socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$object = new Societe($db);
-$object->fetch($socid);
-
 $id=GETPOST("id","int");
 $ribid=GETPOST("ribid","int");
 $action=GETPOST("action");
 
+$object = new Societe($db);
+$object->fetch($socid);
+
 $account = new CompanyBankAccount($db);
 $prelevement = new BonPrelevement($db);
 
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('thirdpartybancard','globalcard'));
+
+
 
 /*
  *	Actions
  */
 
-if ($action == 'update' && ! $_POST["cancel"])
+$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
-{
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-	// Modification
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	if (! GETPOST('label'))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-		$action='update';
-		$error++;
-	}
-	if (! GETPOST('bank'))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-		$action='update';
-		$error++;
-	}
-	if ($account->needIBAN() == 1)
-	{
-		if (! GETPOST('iban'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-			$action='update';
-			$error++;
-		}
-		if (! GETPOST('bic'))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-			$action='update';
-			$error++;
-		}
-	}
 
-    $account->fetch($id);
+if (empty($reshook))
-    if (! $error)
+{
+    if ($cancel)
     {
-	    $account->socid           = $object->id;
+        $action='';
-
+        if (! empty($backtopage))
-		$account->bank            = GETPOST('bank','alpha');
+        {
-		$account->label           = GETPOST('label','alpha');
+            header("Location: ".$backtopage);
-		$account->courant         = GETPOST('courant','alpha');
+            exit;
-		$account->clos            = GETPOST('clos','alpha');
+        }
-		$account->code_banque     = GETPOST('code_banque','alpha');
-		$account->code_guichet    = GETPOST('code_guichet','alpha');
-		$account->number          = GETPOST('number','alpha');
-		$account->cle_rib         = GETPOST('cle_rib','alpha');
-		$account->bic             = GETPOST('bic','alpha');
-		$account->iban            = GETPOST('iban','alpha');
-		$account->domiciliation   = GETPOST('domiciliation','alpha');
-		$account->proprio         = GETPOST('proprio','alpha');
-		$account->owner_address   = GETPOST('owner_address','alpha');
-		$account->frstrecur       = GETPOST('frstrecur','alpha');
-		if (empty($account->rum)) 
-		{
-		    $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-		    $account->date_rum = dol_now();
-		}
-		
-		$result = $account->update($user);
-		if (! $result)
-		{
-			setEventMessages($account->error, $account->errors, 'errors');
-		}
-		else
-		{
-			// If this account is the default bank account, we disable others
-			if ($account->default_rib)
-			{
-				$account->setAsDefault($id);	// This will make sure there is only one default rib
-			}
-
-			$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-	        header('Location: '.$url);
-	        exit;
-		}
     }
-}
 
-if ($action == 'add' && ! $_POST["cancel"])
+    
-{
+    if ($action == 'update' && ! $_POST["cancel"])
-	$error=0;
+    {
-
+    	// Modification
-	if (! GETPOST('label'))
+    	if (! GETPOST('label'))
-	{
+    	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-		$action='create';
+    		$action='update';
-		$error++;
+    		$error++;
-	}
+    	}
-	if (! GETPOST('bank'))
+    	if (! GETPOST('bank'))
-	{
+    	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-		$action='create';
+    		$action='update';
-		$error++;
+    		$error++;
-	}
+    	}
-
+    	if ($account->needIBAN() == 1)
-	if (! $error)
+    	{
-	{
+    		if (! GETPOST('iban'))
-	    // Ajout
+    		{
-	    $account = new CompanyBankAccount($db);
+    			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-
+    			$action='update';
-	    $account->socid           = $object->id;
+    			$error++;
-
+    		}
-	    $account->bank            = GETPOST('bank','alpha');
+    		if (! GETPOST('bic'))
-		$account->label           = GETPOST('label','alpha');
+    		{
-		$account->courant         = GETPOST('courant','alpha');
+    			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-		$account->clos            = GETPOST('clos','alpha');
+    			$action='update';
-		$account->code_banque     = GETPOST('code_banque','alpha');
+    			$error++;
-		$account->code_guichet    = GETPOST('code_guichet','alpha');
+    		}
-		$account->number          = GETPOST('number','alpha');
+    	}
-		$account->cle_rib         = GETPOST('cle_rib','alpha');
+    
-		$account->bic             = GETPOST('bic','alpha');
+        $account->fetch($id);
-		$account->iban            = GETPOST('iban','alpha');
+        if (! $error)
-		$account->domiciliation   = GETPOST('domiciliation','alpha');
+        {
-		$account->proprio         = GETPOST('proprio','alpha');
+    	    $account->socid           = $object->id;
-		$account->owner_address   = GETPOST('owner_address','alpha');
+    
-		$account->frstrecur       = GETPOST('frstrecur');
+    		$account->bank            = GETPOST('bank','alpha');
-
+    		$account->label           = GETPOST('label','alpha');
-		// This test can be done only once properties were set
+    		$account->courant         = GETPOST('courant','alpha');
-		if ($account->needIBAN() == 1)
+    		$account->clos            = GETPOST('clos','alpha');
-		{
+    		$account->code_banque     = GETPOST('code_banque','alpha');
-		    if (! GETPOST('iban'))
+    		$account->code_guichet    = GETPOST('code_guichet','alpha');
-		    {
+    		$account->number          = GETPOST('number','alpha');
-		        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
+    		$account->cle_rib         = GETPOST('cle_rib','alpha');
-		        $action='create';
+    		$account->bic             = GETPOST('bic','alpha');
-		        $error++;
+    		$account->iban            = GETPOST('iban','alpha');
-		    }
+    		$account->domiciliation   = GETPOST('domiciliation','alpha');
-		    if (! GETPOST('bic'))
+    		$account->proprio         = GETPOST('proprio','alpha');
-		    {
+    		$account->owner_address   = GETPOST('owner_address','alpha');
-		        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
+    		$account->frstrecur       = GETPOST('frstrecur','alpha');
-		        $action='create';
+    		if (empty($account->rum)) 
-		        $error++;
+    		{
-		    }
+    		    $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
-		}
+    		    $account->date_rum = dol_now();
-		
+    		}
-		if (! $error)
+    		
-		{
+    		$result = $account->update($user);
-		    if (empty($account->rum))
+    		if (! $result)
-		    {
+    		{
-		        $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+    			setEventMessages($account->error, $account->errors, 'errors');
-		        $account->date_rum = dol_now();
+    		}
-		    }
+    		else
-		    
+    		{
-		    $result = $account->update($user);	// This will set the UMR number.
+    			// If this account is the default bank account, we disable others
-    	    // TODO Use create and include update into create method
+    			if ($account->default_rib)
-    	    if (! $result)
+    			{
-    	    {
+    				$account->setAsDefault($id);	// This will make sure there is only one default rib
-    		    setEventMessages($account->error, $account->errors, 'errors');
+    			}
-    	        $_GET["action"]='create';     // Force chargement page création
+    
-    	    }
+    			$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-    	    else
-    	    {
-    	        $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
     	        header('Location: '.$url);
     	        exit;
-    	    }
+    		}
-		}
+        }
-	}
+    }
+    
+    if ($action == 'add' && ! $_POST["cancel"])
+    {
+    	$error=0;
+    
+    	if (! GETPOST('label'))
+    	{
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+    		$action='create';
+    		$error++;
+    	}
+    	if (! GETPOST('bank'))
+    	{
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+    		$action='create';
+    		$error++;
+    	}
+    
+    	if (! $error)
+    	{
+    	    // Ajout
+    	    $account = new CompanyBankAccount($db);
+    
+    	    $account->socid           = $object->id;
+    
+    	    $account->bank            = GETPOST('bank','alpha');
+    		$account->label           = GETPOST('label','alpha');
+    		$account->courant         = GETPOST('courant','alpha');
+    		$account->clos            = GETPOST('clos','alpha');
+    		$account->code_banque     = GETPOST('code_banque','alpha');
+    		$account->code_guichet    = GETPOST('code_guichet','alpha');
+    		$account->number          = GETPOST('number','alpha');
+    		$account->cle_rib         = GETPOST('cle_rib','alpha');
+    		$account->bic             = GETPOST('bic','alpha');
+    		$account->iban            = GETPOST('iban','alpha');
+    		$account->domiciliation   = GETPOST('domiciliation','alpha');
+    		$account->proprio         = GETPOST('proprio','alpha');
+    		$account->owner_address   = GETPOST('owner_address','alpha');
+    		$account->frstrecur       = GETPOST('frstrecur');
+    
+    		// This test can be done only once properties were set
+    		if ($account->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)
+    		{
+    		    if (empty($account->rum))
+    		    {
+    		        $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
+    		        $account->date_rum = dol_now();
+    		    }
+    		    
+    		    $result = $account->update($user);	// This will set the UMR number.
+        	    // TODO Use create and include update into create method
+        	    if (! $result)
+        	    {
+        		    setEventMessages($account->error, $account->errors, 'errors');
+        	        $_GET["action"]='create';     // Force chargement page création
+        	    }
+        	    else
+        	    {
+        	        $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+        	        header('Location: '.$url);
+        	        exit;
+        	    }
+    		}
+    	}
+    }
+    
+    if ($action == 'setasdefault')
+    {
+        $account = new CompanyBankAccount($db);
+        $res = $account->setAsDefault(GETPOST('ribid','int'));
+        if ($res)
+        {
+            $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
+            header('Location: '.$url);
+            exit;
+        }
+        else
+        {
+    	    setEventMessages($db->lasterror, null, 'errors');
+        }
+    }
+    
+    if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
+    {
+    	$account = new CompanyBankAccount($db);
+    	if ($account->fetch($ribid?$ribid:$id))
+    	{
+    		$result = $account->delete($user);
+    		if ($result > 0)
+    		{
+    			$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
+    			header('Location: '.$url);
+    			exit;
+    		}
+    		else
+    		{
+    			setEventMessages($account->error, $account->errors, 'errors');
+    		}
+    	}
+    	else
+    	{
+    		setEventMessages($account->error, $account->errors, 'errors');
+        }
+    }
+
+    $savid=$id;
+
+    // Actions to build doc
+    $id = $socid;
+    $upload_dir = $conf->societe->dir_output;
+    $permissioncreate=$user->rights->societe->creer;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+    
+    $id = $savid;
 }
 
-if ($action == 'setasdefault')
-{
-    $account = new CompanyBankAccount($db);
-    $res = $account->setAsDefault(GETPOST('ribid','int'));
-    if ($res)
-    {
-        $url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
-        header('Location: '.$url);
-        exit;
-    }
-    else
-    {
-	    setEventMessages($db->lasterror, null, 'errors');
-    }
-}
-
-if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
-{
-	$account = new CompanyBankAccount($db);
-	if ($account->fetch($ribid?$ribid:$id))
-	{
-		$result = $account->delete($user);
-		if ($result > 0)
-		{
-			$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
-			header('Location: '.$url);
-			exit;
-		}
-		else
-		{
-			setEventMessages($account->error, $account->errors, 'errors');
-		}
-	}
-	else
-	{
-		setEventMessages($account->error, $account->errors, 'errors');
-    }
-}
 
 
 /*
@@ -259,10 +298,11 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
  */
 
 $form = new Form($db);
+$formfile = new FormFile($db);
 
 llxHeader();
 
-$head=societe_prepare_head2($object);
+$head=societe_prepare_head($object);
 
 if (! $id)
     $account->fetch(0,$object->id);
@@ -270,7 +310,6 @@ else
     $account->fetch($id);
 if (empty($account->socid)) $account->socid=$object->id;
 
-
 if ($socid && $action == 'edit' && $user->rights->societe->creer)
 {
     print '<form action="rib.php?socid='.$object->id.'" method="post">';
@@ -315,7 +354,6 @@ if ($socid && $action != 'edit' && $action != "create")
 	print '<td colspan="4">'.$account->bank.'</td></tr>';
 
 	// Show fields of bank account
-
 	foreach($account->getFieldsToShow() as $val)
 	{
 		if ($val == 'BankCode') {
@@ -324,24 +362,31 @@ if ($socid && $action != 'edit' && $action != "create")
 			$content = $account->code_guichet;
 		} elseif ($val == 'BankAccountNumber') {
 			$content = $account->number;
+			if (! empty($account->label)) {
+			    if (! checkBanForAccount($account)) {
+			        $content.= ' '.img_picto($langs->trans("NotValid"),'warning');
+			    } else {
+			        $content.= ' '.img_picto($langs->trans("Valid"),'info');
+			    }
+			}				
 		} elseif ($val == 'BankAccountNumberKey') {
 			$content = $account->cle_rib;
 		}elseif ($val == 'IBAN') {
 			$content = $account->iban;
 			if (! empty($account->iban)) {
 				if (! checkIbanForAccount($account)) {
-					$content.= img_picto($langs->trans("IbanNotValid"),'warning');
+					$content.= ' '.img_picto($langs->trans("IbanNotValid"),'warning');
 				} else {
-					$content.= img_picto($langs->trans("IbanValid"),'info');
+					$content.= ' '.img_picto($langs->trans("IbanValid"),'info');
 				}
 			}
 		}elseif ($val == 'BIC') {
 			$content = $account->bic;
 			if (! empty($account->bic)) {
 				if (! checkSwiftForAccount($account)) {
-					$content.= img_picto($langs->trans("SwiftNotValid"),'warning');
+					$content.= ' '.img_picto($langs->trans("SwiftNotValid"),'warning');
 				} else {
-					$content.= img_picto($langs->trans("SwiftValid"),'info');
+					$content.= ' '.img_picto($langs->trans("SwiftValid"),'info');
 				}
 			}
 		}
@@ -351,26 +396,20 @@ if ($socid && $action != 'edit' && $action != "create")
 		print '</tr>';
 	}
 
-	print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
 	print $account->domiciliation;
 	print "</td></tr>\n";
 
-	print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="4">';
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td><td colspan="4">';
 	print $account->proprio;
 	print "</td></tr>\n";
 
-	print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
+	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
 	print $account->owner_address;
 	print "</td></tr>\n";
 
 	print '</table>';
 
-	// Check BBAN
-	if ($account->label && ! checkBanForAccount($account))
-	{
-		print '<div class="warning">'.$langs->trans("RIBControlError").'</div>';
-	}
-
     print "</div>";
 
     dol_fiche_end();
@@ -401,10 +440,6 @@ if ($socid && $action != 'edit' && $action != "create")
         }
         print_liste_field_titre($langs->trans("DefaultRIB"), '', '', '', '', 'align="center"');
         print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-        if (! empty($conf->prelevement->enabled))
-        {
-            print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-        }
 		print "</tr>\n";
 
         foreach ($rib_list as $rib)
@@ -415,11 +450,47 @@ if ($socid && $action != 'edit' && $action != "create")
             // Bank name
             print '<td>'.$rib->bank.'</td>';
             // Account number
-            print '<td>'.$rib->getRibLabel(false).'</td>';
+            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.' ';*/
+                }
+            }
+            print $string;
+            print '</td>';
             // IBAN
-            print '<td>'.$rib->iban.'</td>';
+            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.'</td>';
+            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))
             {
@@ -458,27 +529,6 @@ if ($socid && $action != 'edit' && $action != "create")
             }
         	print '</td>';
         	
-        	if (! empty($conf->prelevement->enabled))
-        	{    	
-            	include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
-            	$modellist=ModeleBankAccountDoc::liste_modeles($db);
-            	print '<td>';
-            	if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-            	{
-            	    $arraykeys=array_keys($modellist);
-            	    $modelselected=$arraykeys[0];
-            	}
-            	$out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-            	$out.= ajax_combobox('model');
-            	//print $out;
-            	$buttonlabel=$langs->trans("Generate");
-            	$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-            	$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-                $genbutton.= '>';
-                //print $genbutton;
-            	print '</td>';     // TODO Add link to generate doc
-        	}
-        	
 	        print '</tr>';
         }
 
@@ -494,6 +544,68 @@ if ($socid && $action != 'edit' && $action != "create")
         dol_print_error($db);
     }
 
+    
+    if ($socid && $action != 'edit' && $action != 'create')
+    {
+        /*
+         * Barre d'actions
+         */
+        print '<div class="tabsAction">';
+    
+        if ($user->rights->societe->creer)
+        {
+            print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
+        }
+    
+        print '</div>';
+    }
+
+    
+
+
+    if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+    {
+        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->creer;
+        $delallowed=$user->rights->societe->supprimer;
+    
+        $var=true;
+    
+        print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, '', 0, '', $object->default_lang);
+    
+        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>';
+    if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+    {
+        $arraykeys=array_keys($modellist);
+        $modelselected=$arraykeys[0];
+    }
+    $out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+    $out.= ajax_combobox('model');
+    //print $out;
+    $buttonlabel=$langs->trans("Generate");
+    $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+    $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+    $genbutton.= '>';
+    print $genbutton;
+    //print '</td>';     // TODO Add link to generate doc
+    */
 }
 
 // Edit
@@ -510,7 +622,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    print '<tr><td valign="top" class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
@@ -650,10 +762,10 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     }
 
     // IBAN
-    print '<tr><td valign="top" '.($account->needIBAN()?' class="fieldrequired" ':'').'>'.$langs->trans("IBAN").'</td>';
+    print '<tr><td'.($account->needIBAN()?' class="fieldrequired" ':'').'>'.$langs->trans("IBAN").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="iban" value="'.GETPOST('iban').'"></td></tr>';
 
-    print '<tr><td valign="top" '.($account->needIBAN()?' class="fieldrequired" ':'').'>'.$langs->trans("BIC").'</td>';
+    print '<tr><td'.($account->needIBAN()?' class="fieldrequired" ':'').'>'.$langs->trans("BIC").'</td>';
     print '<td colspan="4"><input size="12" type="text" name="bic" value="'.GETPOST('bic').'"></td></tr>';
 
     print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
@@ -710,23 +822,6 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 }
 
 
-
-if ($socid && $action != 'edit' && $action != 'create')
-{
-	/*
-	 * Barre d'actions
-	 */
-	print '<div class="tabsAction">';
-
-	if ($user->rights->societe->creer)
-	{
-		print '<a class="butAction" href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';
-	}
-
-	print '</div>';
-}
-
-
 llxFooter();
 
 $db->close();

htdocs/societe/soc.php

@@ -2267,22 +2267,6 @@ else
         	print $object->showOptionals($extrafields);
         }
 
-        // Ban
-        if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
-        {
-            print '<tr><td>';
-            print '<table width="100%" class="nobordernopadding"><tr><td>';
-            print $langs->trans('RIB');
-            print '<td><td align="right">';
-            if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id.'">'.img_edit().'</a>';
-            else print '&nbsp;';
-            print '</td></tr></table>';
-            print '</td>';
-            print '<td colspan="3">';
-            print $object->display_rib();
-            print '</td></tr>';
-        }
-
         // Parent company
         if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
         {

htdocs/theme/eldy/style.css.php

@@ -3974,6 +3974,9 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-container .select2-choice > .select2-chosen {
+    margin-right: 23px;
+}
 .select2-container .select2-choice .select2-arrow {
 	border-radius: 0;
 }

htdocs/theme/md/style.css.php

@@ -3841,6 +3841,9 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-container .select2-choice > .select2-chosen {
+    margin-right: 23px;
+}
 .select2-container .select2-choice .select2-arrow {
 	border-radius: 0;
 }