diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index fd3629b1cba44427efa0cec8670af6ba9348f386..f136c1200cf542f4e439cb81349607754c379f87 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -597,7 +597,7 @@ if ($action == 'edit' || $action == 'updateedit') print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":""); if(! isOnlyOneLocalTax(1)) { - print '<tr><td align="left">'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).': '; + print '<tr><td align="left">'.$langs->trans("LTRate").': '; $formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1"); } print '</td></tr>'; @@ -639,7 +639,7 @@ if ($action == 'edit' || $action == 'updateedit') print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>"; $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code); print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":""); - print '<tr><td align="left">'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).': '; + print '<tr><td align="left">'.$langs->transcountry("LTRate").': '; if(! isOnlyOneLocalTax(2)) { $formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2"); @@ -1000,15 +1000,20 @@ else print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>"; $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code); print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":""); - if($conf->global->MAIN_INFO_VALUE_LOCALTAX1!=0){ - print '<tr><td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>'; + if($conf->global->MAIN_INFO_VALUE_LOCALTAX1!=0) + { + print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>'; } print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': '; - if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0){ + if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0) + { print $langs->transcountry("CalcLocaltax1",$mysoc->country_code); - }else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==1){ + } + else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==1) + { print $langs->transcountry("CalcLocaltax2",$mysoc->country_code); - }else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){ + } + else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){ print $langs->transcountry("CalcLocaltax3",$mysoc->country_code); } @@ -1046,15 +1051,21 @@ else print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>"; $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code); print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":""); - if($conf->global->MAIN_INFO_VALUE_LOCALTAX2!=0){ - print '<tr><td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>'; + if($conf->global->MAIN_INFO_VALUE_LOCALTAX2!=0) + { + print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>'; } print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': '; - if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0){ + if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0) + { print $langs->transcountry("CalcLocaltax1",$mysoc->country_code); - }else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==1){ + } + else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==1) + { print $langs->transcountry("CalcLocaltax2",$mysoc->country_code); - }else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==2){ + } + else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==2) + { print $langs->transcountry("CalcLocaltax3",$mysoc->country_code); } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 55f72609b807744cc7246f41a50dd640d69d16db..5355d26161e2006296c4b0f026ffee33a4711cbc 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -785,6 +785,7 @@ VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases li VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. ##### Local Taxes ##### +LTRate=Rate LocalTax1IsUsed=Use second tax LocalTax1IsNotUsed=Do not use second tax LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)