diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 413c8d1dca8..f9c731c097a 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -62,13 +62,13 @@ function societe_prepare_head($object) $h++; } - if (($object->localtax1_assuj || $object->localtax2_assuj) && (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) ) - { + if (($object->localtax1_assuj || $object->localtax2_assuj) && (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) ) + { $head[$h][0] = DOL_URL_ROOT.'/societe/localtaxes.php?socid='.$object->id; - $head[$h][1] = $langs->trans("LocalTaxes"); - $head[$h][2] = 'localtaxes'; - $h++; - } + $head[$h][1] = $langs->trans("LocalTaxes"); + $head[$h][2] = 'localtaxes'; + $h++; + } if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) { diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang index e32dcb8912f..0cd15aabcd5 100644 --- a/htdocs/langs/ca_ES/companies.lang +++ b/htdocs/langs/ca_ES/companies.lang @@ -85,6 +85,8 @@ LocalTax1IsUsedES=Subjecte a RE LocalTax1IsNotUsedES=No subjecte a RE LocalTax2IsUsedES=Subjecte a IRPF LocalTax2IsNotUsedES=No subjecte a IRPF +LocalTax1ES=RE +LocalTax2ES=IRPF ThirdPartyEMail=%s WrongCustomerCode=Codi client incorrecte WrongSupplierCode=Códi proveïdor incorrecte diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 75f98701fe3..6942dfea6ee 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -85,6 +85,8 @@ LocalTax1IsUsedES= RE is used LocalTax1IsNotUsedES= RE is not used LocalTax2IsUsedES= IRPF is used LocalTax2IsNotUsedES= IRPF is not used +LocalTax1ES=RE +LocalTax2ES=IRPF ThirdPartyEMail=%s WrongCustomerCode=Customer code invalid WrongSupplierCode=Supplier code invalid diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 01b1380991f..cc53fca73f6 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -85,6 +85,8 @@ LocalTax1IsUsedES=Sujeto a RE LocalTax1IsNotUsedES=No sujeto a RE LocalTax2IsUsedES=Sujeto a IRPF LocalTax2IsNotUsedES=No sujeto a IRPF +LocalTax1ES=RE +LocalTax2ES=IRPF ThirdPartyEMail=%s WrongCustomerCode=Código cliente incorrecto WrongSupplierCode=Código proveedor incorrecto diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 9848d21ec61..2d9d58b3b8f 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -85,6 +85,8 @@ LocalTax1IsUsedES= Assujetti à RE LocalTax1IsNotUsedES= Non assujetti à RE LocalTax2IsUsedES= Assujetti à IRPF LocalTax2IsNotUsedES= Non assujetti à IRPF +LocalTax1ES=RE +LocalTax2ES=IRPF ThirdPartyEMail=%s WrongCustomerCode=Code client incorrect WrongSupplierCode=Code fournisseur incorrect diff --git a/htdocs/societe/localtaxes.php b/htdocs/societe/localtaxes.php index 1f5d81bc5bd..80378bf65a6 100644 --- a/htdocs/societe/localtaxes.php +++ b/htdocs/societe/localtaxes.php @@ -16,9 +16,9 @@ */ /** - * \file htdocs/societe/agenda.php + * \file htdocs/societe/localtaxes.php * \ingroup societe - * \brief Page of third party events + * \brief Page of third party localtaxes rates */ require '../main.inc.php'; @@ -143,22 +143,22 @@ if ($socid) if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { - print ''.$langs->trans('LocalTax1IsUsedES').''; + print ''.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).''; print yn($soc->localtax1_assuj); print ''; - print ''.$langs->trans('LocalTax2IsUsedES').''; + print ''.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).''; print yn($soc->localtax2_assuj); print ''; } elseif($mysoc->localtax1_assuj=="1") { - print ''.$langs->trans("LocalTax1IsUsedES").''; + print ''.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).''; print yn($soc->localtax1_assuj); print ''; } elseif($mysoc->localtax2_assuj=="1") { - print ''.$langs->trans("LocalTax2IsUsedES").''; + print ''.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).''; print yn($soc->localtax2_assuj); print ''; } @@ -185,10 +185,10 @@ if ($socid) // Localtax 1 if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj) - print ''.$langs->trans('Localtax1').' (%)'; + print ''.$langs->transcountry('LocalTax1',$mysoc->country_code).' (%)'; if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj) - print ''.$langs->trans('Localtax2').' (%)'; + print ''.$langs->transcountry('LocalTax2',$mysoc->country_code).' (%)'; //print ''; if ($user->rights->societe->creer)