diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 1164fa71d6a..e23ba7e103c 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -863,7 +863,7 @@ else /* * Local Taxes */ - if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($code_pays=='ES') { // Local Tax 1 print '
'; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 9bf48df374d..437b0551778 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -213,7 +213,7 @@ if ($socid > 0) print ''; // Local Taxes - if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 337625c8b59..e250fbf8ac1 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1197,7 +1197,7 @@ if ($id > 0 || ! empty($ref)) if ($conf->global->PROPALE_ADD_DELIVERY_ADDRESS) $rowspan++; //Local taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1") $rowspan++; if($mysoc->localtax2_assuj=="1") $rowspan++; @@ -1379,7 +1379,7 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("Currency".$conf->monnaie).''; // Amount Local Taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index d89fd1ee38b..8ebb025ce53 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1390,7 +1390,7 @@ else if ($conf->projet->enabled) $nbrow++; //Local taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++; @@ -1625,7 +1625,7 @@ else print ''.$langs->trans('Currency'.$conf->monnaie).''; // Amount Local Taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 6f7a59cee5c..997a0212f88 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -151,7 +151,7 @@ if ($id > 0 || ! empty($ref)) if ($conf->projet->enabled) $nbrow++; //Local taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++; @@ -360,7 +360,7 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans('Currency'.$conf->monnaie).''; // Amount Local Taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 749bdcfe3d8..685f548f99c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1680,7 +1680,7 @@ if ($_GET['action'] == 'create') print ''.$langs->trans($classname).''.$object->getNomUrl(1).''; print ''.$langs->trans('TotalHT').''.price($object->total_ht).''; print ''.$langs->trans('TotalVAT').''.price($object->total_tva).""; - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { @@ -2308,7 +2308,7 @@ else if ($conf->projet->enabled) $nbrows++; //Local taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1") $nbrows++; if($mysoc->localtax2_assuj=="1") $nbrows++; @@ -2639,7 +2639,7 @@ else print ''.$langs->trans('Currency'.$conf->monnaie).''; // Amount Local Taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 2339b706e77..efa555d60d2 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -213,7 +213,7 @@ if ($socid > 0) print ''; // Local Taxes - if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 7136817ca21..edac656091b 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -176,7 +176,7 @@ if ($id > 0 || ! empty($ref)) if ($conf->projet->enabled) $rowspan++; //Local taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1") $rowspan++; if($mysoc->localtax2_assuj=="1") $rowspan++; @@ -290,7 +290,7 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("Currency".$conf->monnaie).''; // Amount Local Taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 5a8050478f1..47ec0a90b68 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -858,7 +858,7 @@ if ($id > 0 || ! empty($ref)) if ($conf->projet->enabled) $nbrow++; //Local taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++; @@ -944,7 +944,7 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("Currency".$conf->monnaie).''; // Amount Local Taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index d3422b90691..f6d6148f556 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -797,7 +797,7 @@ else if ($conf->projet->enabled) $nbrows++; // Local taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++; @@ -892,7 +892,7 @@ else print ''.$langs->trans('AmountVAT').''.price($fac->total_tva).''.$langs->trans('Currency'.$conf->monnaie).''; // Amount Local Taxes - if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($mysoc->pays_code=='ES') { if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index b763181f986..7f21b7e01e6 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -119,7 +119,7 @@ if ( $societe->fetch($socid) ) print ''; // Local Taxes - if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { diff --git a/htdocs/soc.php b/htdocs/soc.php index b05ccb785c6..a5d4cabcae2 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -700,7 +700,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') } // Local Taxes - if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { @@ -1059,7 +1059,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') print ''; // Local Taxes - if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { @@ -1319,7 +1319,7 @@ else print ''; // Local Taxes - if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($mysoc->pays_code=='ES') { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") {