From 5c2ed0f19fb07c22ebde2cf59639b58d1d62793e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 12:57:34 +0100
Subject: [PATCH] Fix field title lost

---
 htdocs/societe/rib.php          | 55 ++++++++++++++++-----------------
 htdocs/theme/eldy/style.css.php |  9 ++++--
 htdocs/theme/md/style.css.php   |  9 ++++--
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 06c16a2efe6..65bd12b2be4 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -701,7 +701,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	print '<table class="border centpercent">';
 
     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 '<td><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
     print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
@@ -743,17 +743,17 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 		print '</tr>';
 	}
 
-    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
     print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
     print $account->domiciliation;
     print "</textarea></td></tr>";
 
     print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
+    print '<td><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
     print "</td></tr>\n";
 
-    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-    print "<textarea name=\"owner_address\" rows=\"4\" cols=\"40\" maxlength=\"255\">";
+    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
     print $account->owner_address;
     print "</textarea></td></tr>";
 
@@ -769,14 +769,14 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
     	// RUM
     	print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
-	print '<td colspan="4"><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
-
-	print '<td colspan="4">';
-	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-	print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
-	print '</td></tr>';
-
-	print '</table>';
+    	print '<td><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->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')?GETPOST('frstrecur'):$account->frstrecur), 0);
+    	print '</td></tr>';
+    
+    	print '</table>';
     }
 
     print '</div>';
@@ -806,7 +806,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 	print '<table class="border centpercent">';
 
     print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
+    print '<td><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
     print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
@@ -842,17 +842,17 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
         print '</tr>';
     }
 
-    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
-    print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
+    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+    print '<textarea name="domiciliation" rows="'.ROWS_4.'" cols="40" maxlength="255">';
     print GETPOST('domiciliation');
     print "</textarea></td></tr>";
 
     print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
+    print '<td><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
     print "</td></tr>\n";
 
-    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-    print '<textarea name="owner_address" rows="4" cols="40" maxlength="255">';
+    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
     print GETPOST('owner_address');
     print "</textarea></td></tr>";
 
@@ -860,21 +860,20 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
     if ($conf->prelevement->enabled)
     {
-	print '<br>';
+    	print '<br>';
 
     	print '<table class="border" width="100%">';
 
     	// RUM
     	print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
-	print '<td>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
+    	print '<td>'.$langs->trans("RUMWillBeGenerated").'</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 '<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 '</table>';
     }
 
     print '</div>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4970f7b6541..bed4b5c3fe3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2307,7 +2307,9 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
-
+.ficheaddleft table.noborder {
+	margin: 0px 0px 0px 0px;
+}
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: 100%;
 
@@ -2780,7 +2782,10 @@ div.tabBar .noborder {
 /*
  *  Boxes
  */
-
+ 
+.ficheaddleft div.boxstats {
+    border: none;
+}
 .boxstats {
     <?php print "float: ".$left.";\n"; ?>
     margin: 3px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d2a145b30ee..acfd9d67452 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2177,7 +2177,9 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
-
+.ficheaddleft table.noborder {
+	margin: 0px 0px 0px 0px;
+}
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: 100%;
 
@@ -2659,7 +2661,10 @@ div .tdtop {
 /*
  *  Boxes
  */
-
+ 
+.ficheaddleft div.boxstats {
+    border: none;
+}
 .boxstats {
     <?php print "float: ".$left.";\n"; ?>
     margin: 3px;