From 7c50c514bf9d308a7931de63377dc01a3e6c8cab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 6 Dec 2007 09:52:54 +0000
Subject: [PATCH] Fix: Renvoi chaine qd un chaine est attendue et tableau qd
 tableau attendu

---
 htdocs/admin/company.php     | 8 --------
 htdocs/html.form.class.php   | 7 ++-----
 htdocs/lib/functions.inc.php | 1 +
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 93f25c56427..b5ff0827d78 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -710,14 +710,6 @@ else
     print "</table>";
     print "</td></tr>\n";
     
-    /* Je désactive cette option "facturation" car ce statut fiscal n'existe pas. Seul le réel et franchise existe.
-    Cette option ne doit donc pas etre en "exclusif" avec l'option fiscale de gestion de tva. Peut etre faut-il
-    une option a part qui n'entre pas en conflit avec les choix "assujéti TVA" ou "non".
-    $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"facturation\"".($conf->global->FACTURE_TVAOPTION == "facturation"?" checked":"")."> Option facturation</label></td>";
-    print "<td colspan=\"2\">L'option 'facturation' est utilisée par les entreprises qui payent la TVA à facturation (vente de matériel).</td></tr>\n";
-     */
-    
     $var=!$var;
     print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" disabled value=\"franchise\"".($conf->global->FACTURE_TVAOPTION == "franchise"?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
     print '<td colspan="2">';
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 53bcff3d1f5..5fe1068073b 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -3489,11 +3489,8 @@ class Form
      */
     function select_month($selected='',$htmlname='monthid',$useempty=0)
     {
-    	global $langs;
-      $langs->load("main");
-      
-    	$month = monthArrayOrSelected();
- 
+    	$month = monthArrayOrSelected(-1);	// Get array
+
     	$select_month = '<select class="flat" name="'.$htmlname.'">';
     	if ($useempty) 
       {
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 84f664cd42a..4a9217a8ac7 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -3815,6 +3815,7 @@ function dol_genbarcode($code,$encoding,$generator=1,$readable='Y')
 function monthArrayOrSelected($selected=0)
 {
 	global $langs;
+    $langs->load("main");
 	
 	$month = array (1  => $langs->trans("January"),
 	   	            2  => $langs->trans("February"),