lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Renvoi chaine qd un chaine est attendue et tableau qd tableau attendu

Browse Source
This commit is contained in:
Laurent Destailleur 2007-12-06 09:52:54 +00:00
parent 61baa919ed
commit 7c50c514bf
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/company.php
View File

@ -710,14 +710,6 @@ else
print "</table>"; print "</table>";
print "</td></tr>\n"; 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; $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 "<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">'; print '<td colspan="2">';

7
htdocs/html.form.class.php
View File

@ -3489,11 +3489,8 @@ class Form
*/ */
function select_month($selected='',$htmlname='monthid',$useempty=0) function select_month($selected='',$htmlname='monthid',$useempty=0)
{ {
global $langs; $month = monthArrayOrSelected(-1); // Get array
$langs->load("main");
$month = monthArrayOrSelected();
$select_month = '<select class="flat" name="'.$htmlname.'">'; $select_month = '<select class="flat" name="'.$htmlname.'">';
if ($useempty) if ($useempty)
{ {

1
htdocs/lib/functions.inc.php
View File

@ -3815,6 +3815,7 @@ function dol_genbarcode($code,$encoding,$generator=1,$readable='Y')
function monthArrayOrSelected($selected=0) function monthArrayOrSelected($selected=0)
{ {
global $langs; global $langs;
$langs->load("main");
$month = array (1 => $langs->trans("January"), $month = array (1 => $langs->trans("January"),
2 => $langs->trans("February"), 2 => $langs->trans("February"),