From 91068a4476f14ed0e04909cae07e68c62e563edf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Jun 2013 20:16:05 +0200
Subject: [PATCH] Fix: Pb into form output

Conflicts:
	htdocs/core/class/html.formfile.class.php
---
 htdocs/core/class/html.formfile.class.php | 14 ++++++++------
 htdocs/societe/soc.php                    |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5d2fbf4f225..24707425cf4 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -442,15 +442,17 @@ class FormFile
 
             // Button
             $out.= '<th align="center" colspan="'.($delallowed?'2':'1').'" class="formdocbutton liste_titre">';
-            $out.= '<input class="button" id="'.$forname.'_generatebutton"';
-            $out.= ' type="submit" value="'.$buttonlabel.'"';
-            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $out.= ' disabled="disabled"';
-            $out.= '>';
+            $genbutton = '<input class="button" id="'.$forname.'_generatebutton"';
+            $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled="disabled"';
+            $genbutton.= '>';
             if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
             {
-                $langs->load("errors");
-                $out.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+               	$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='';
+            $out.= $genbutton;
             $out.= '</th>';
 
             if ($printer) $out.= '<th></th>';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 27db36e8a32..e5e119fc92b 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1793,7 +1793,6 @@ else
         }
 
         print '</div>'."\n";
-        print '<br>';
 
         if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
         {
@@ -1821,6 +1820,8 @@ else
             print '<br>';
         }
 
+        print '<div class="fichecenter"><br></div>';
+
         // Subsidiaries list
         $result=show_subsidiaries($conf,$langs,$db,$object);