global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")." ";
print '';
print "";
print "".$langs->trans("VATIsUsedDesc")." ";
@@ -573,7 +571,7 @@ if ($action == 'edit' || $action == 'updateedit')
print "\n";
- print " global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")." ";
+ print " global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")." ";
print '';
print "";
print "".$langs->trans("VATIsNotUsedDesc")." ";
@@ -595,10 +593,9 @@ if ($action == 'edit' || $action == 'updateedit')
print ''.$langs->transcountry("LocalTax1Management",$mysoc->country_code).' '.$langs->trans("Description").' ';
print ' ';
print "\n";
- $var=true;
// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
- print " global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)." ";
print '';
print '';
print "".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)." ";
@@ -620,7 +617,7 @@ if ($action == 'edit' || $action == 'updateedit')
print "\n";
- print " global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)." ";
print '';
print "";
print "".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)." ";
@@ -639,11 +636,10 @@ if ($action == 'edit' || $action == 'updateedit')
print ''.$langs->transcountry("LocalTax2Management",$mysoc->country_code).' '.$langs->trans("Description").' ';
print ' ';
print "\n";
- $var=true;
// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
- print " global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)." ";
print '';
print '';
print "".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)." ";
@@ -662,7 +658,7 @@ if ($action == 'edit' || $action == 'updateedit')
print "\n";
- print " global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)." ";
print '';
print "";
print "".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)." ";
@@ -696,7 +692,6 @@ else
print '';
print ''.$langs->trans("CompanyInfo").' '.$langs->trans("Value").' ';
- $var=true;
print ''.$langs->trans("CompanyName").' ';
@@ -965,7 +960,6 @@ else
print ' ';
print ''.$langs->trans("FiscalYearInformation").' '.$langs->trans("Value").' ';
print " \n";
- $var=true;
print ''.$langs->trans("FiscalMonthStart").' ';
@@ -983,10 +977,9 @@ else
print ' '.$langs->trans("VATManagement").' '.$langs->trans("Description").' ';
print ' ';
print " \n";
- $var=true;
- print " global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")." ";
+ print " global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")." ";
print '';
print "";
print "".$langs->trans("VATIsUsedDesc")." ";
@@ -995,7 +988,7 @@ else
print "\n";
- print " global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")." ";
+ print " global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")." ";
print '';
print "";
print "".$langs->trans("VATIsNotUsedDesc")." ";
@@ -1018,10 +1011,9 @@ else
print ''.$langs->transcountry("LocalTax1Management",$mysoc->country_code).' '.$langs->trans("Description").' ';
print ' ';
print "\n";
- $var=true;
- print " global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)." ";
print '';
print "";
print "".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)." ";
@@ -1049,7 +1041,7 @@ else
print "\n";
- print " global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)." ";
print '';
print "";
print "".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)." ";
@@ -1069,10 +1061,9 @@ else
print ''.$langs->transcountry("LocalTax2Management",$mysoc->country_code).' '.$langs->trans("Description").' ';
print ' ';
print "\n";
- $var=true;
- print " global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)." ";
print '';
print "";
print "".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)." ";
@@ -1101,7 +1092,7 @@ else
print "\n";
- print " global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)." ";
+ print " global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)." ";
print '';
print "";
print "".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)." ";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index c097b9f39b1..4c289ee25c7 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2008 Laurent Destailleur
* Copyright (C) 2005-2009 Regis Houssin
* Copyright (C) 2011-2013 Juanjo Menent
- * Copyright (C) 2013-2016 Philippe Grand
+ * Copyright (C) 2013-2017 Philippe Grand
* Copyright (C) 2014 Marcos GarcĂa
*
* This program is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@ print '\n";
@@ -148,9 +148,7 @@ print "\n";
foreach ($list as $key)
{
-
-
- print '';
+ print ' ';
// Param
$libelle = $langs->trans($key);
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 161b1aac45d..74525a6855b 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -105,7 +105,7 @@ foreach ($eventstolog as $key => $arr)
print '';
$key='MAIN_LOGEVENTS_'.$arr['id'];
$value=$conf->global->$key;
- print ' ';
+ print ' ';
print ' '."\n";
}
}
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 6c73afcf8f5..fce15178cdb 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005-2014 Regis Houssin
* Copyright (C) 2008 Raphael Bertrand (Resultic)
* Copyright (C) 2011-2013 Juanjo Menent
- * Copyright (C) 2011-2015 Philippe Grand
+ * Copyright (C) 2011-2017 Philippe Grand
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -410,7 +410,6 @@ print "\n";
clearstatcache();
-$var=true;
foreach ($dirmodels as $reldir)
{
$dir = dol_buildpath($reldir."core/modules/fichinter/doc/");
@@ -532,9 +531,7 @@ print ''.$langs->trans("Parameter").' ';
print ''.$langs->trans("Value").' ';
print " \n";
print "\n";
-$var=true;
-$var=! $var;
print '