diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index ca276246705..078de5b2ed6 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -210,18 +210,29 @@ if ($socid > 0)
print '';
// Local Taxes
- if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+ if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{
- print '';
- print '| '.$langs->trans('LocalTax1IsUsedES').' | ';
- print yn($objsoc->localtax1_assuj);
- print ' | ';
- print '
';
- print '';
- print '| '.$langs->trans('LocalTax2IsUsedES').' | ';
- print yn($objsoc->localtax2_assuj);
- print ' | ';
- print '
';
+ if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans('LocalTax1IsUsedES').' | ';
+ print yn($objsoc->localtax1_assuj);
+ print ' |
';
+ print '| '.$langs->trans('LocalTax2IsUsedES').' | ';
+ print yn($objsoc->localtax2_assuj);
+ print ' |
';
+ }
+ elseif($mysoc->localtax1_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print yn($objsoc->localtax1_assuj);
+ print ' |
';
+ }
+ elseif($mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print yn($objsoc->localtax2_assuj);
+ print ' |
';
+ }
}
// Conditions de reglement par defaut
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index a59b0fcf7c5..d3835a03b03 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -208,18 +208,29 @@ if ($socid > 0)
print '';
// Local Taxes
- if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+ if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{
- print '';
- print '| '.$langs->trans('LocalTax1IsUsedES').' | ';
- print yn($societe->localtax1_assuj);
- print ' | ';
- print '
';
- print '';
- print '| '.$langs->trans('LocalTax2IsUsedES').' | ';
- print yn($societe->localtax2_assuj);
- print ' | ';
- print '
';
+ if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans('LocalTax1IsUsedES').' | ';
+ print yn($societe->localtax1_assuj);
+ print ' |
';
+ print '| '.$langs->trans('LocalTax2IsUsedES').' | ';
+ print yn($societe->localtax2_assuj);
+ print ' |
';
+ }
+ elseif($mysoc->localtax1_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print yn($societe->localtax1_assuj);
+ print ' |
';
+ }
+ elseif($mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print yn($societe->localtax2_assuj);
+ print ' |
';
+ }
}
// TVA Intra
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 98df2e46351..e47ad5106a3 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -115,23 +115,33 @@ if ( $societe->fetch($socid) )
print '';
// Local Taxes
- if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+ if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{
- print '';
- print '| '.$langs->trans('LocalTax1IsUsedES').' | ';
- print yn($societe->localtax1_assuj);
- print ' | ';
- print '
';
- print '';
- print '| '.$langs->trans('LocalTax2IsUsedES').' | ';
- print yn($societe->localtax2_assuj);
- print ' | ';
- print '
';
+ if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans('LocalTax1IsUsedES').' | ';
+ print yn($societe->localtax1_assuj);
+ print ' |
';
+ print '| '.$langs->trans('LocalTax2IsUsedES').' | ';
+ print yn($societe->localtax2_assuj);
+ print ' |
';
+ }
+ elseif($mysoc->localtax1_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print yn($societe->localtax1_assuj);
+ print ' |
';
+ }
+ elseif($mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print yn($societe->localtax2_assuj);
+ print ' |
';
+ }
}
-
+
print '';
-
print '';
$var=true;
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 2bb73c8afc5..ed7a5f88dd7 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -685,17 +685,29 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
}
// Local Taxes
- if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+ if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{
- print ' | | '.$langs->trans("LocalTax1IsUsedES").' | ';
- print '';
- print $html->selectyesno('localtax1assuj_value',0,1);
- print ' | ';
- print ''.$langs->trans("LocalTax2IsUsedES").' | ';
- print '';
- print $html->selectyesno('localtax2assuj_value',0,1);
- print ' | ';
- print '
';
+ if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print $html->selectyesno('localtax1assuj_value',0,1);
+ print ' | '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print $html->selectyesno('localtax2assuj_value',0,1);
+ print ' |
';
+
+ }
+ elseif($mysoc->localtax1_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print $html->selectyesno('localtax1assuj_value',0,1);
+ print ' |
';
+ }
+ elseif($mysoc->localtax2_assuj=="1")
+ {
+ print '
| '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print $html->selectyesno('localtax2assuj_value',0,1);
+ print ' |
';
+ }
}
if ($user->rights->societe->client->voir)
@@ -1027,18 +1039,30 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '
';
// Local Taxes
- if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+ if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{
- print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
- print '';
- print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
- print ' | ';
-
- print ''.$langs->trans("LocalTax2IsUsedES").' | ';
- print '';
- print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
- print ' | ';
- print '
';
+ if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
+ print ' | '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
+ print ' |
';
+
+ }
+ elseif($mysoc->localtax1_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
+ print ' |
';
+
+ }
+ elseif($mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
+ print ' |
';
+ }
}
print '| '.$langs->trans("Capital").' | '.$langs->trans("Currency".$conf->monnaie).' |
';
@@ -1273,23 +1297,31 @@ else
print '';
// Local Taxes
- if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+ if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{
- print '| ';
- print $langs->trans('LocalTax1IsUsedES');
- print ' | ';
- print yn($soc->localtax1_assuj);
- print ' | ';
-
- print '';
- print $langs->trans('LocalTax2IsUsedES');
- print ' | ';
- print yn($soc->localtax2_assuj);
- print ' | ';
- print '
';
+ if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print yn($soc->localtax1_assuj);
+ print ' | '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print yn($soc->localtax2_assuj);
+ print ' |
';
+
+ }
+ elseif($mysoc->localtax1_assuj=="1")
+ {
+ print '| '.$langs->trans("LocalTax1IsUsedES").' | ';
+ print yn($soc->localtax1_assuj);
+ print ' |
';
+ }
+ elseif($mysoc->localtax2_assuj=="1")
+ {
+ print '
| '.$langs->trans("LocalTax2IsUsedES").' | ';
+ print yn($soc->localtax2_assuj);
+ print ' |
';
+ }
}
-
// Capital
print '
| '.$langs->trans('Capital').' | ';
if ($soc->capital) print $soc->capital.' '.$langs->trans("Currency".$conf->monnaie);
|