lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ task #1063 ] Allow edit localtaxes rate for thirds

Browse Source
This commit is contained in:
Juanjo Menent 2014-07-04 18:26:56 +02:00
parent 74b42f6cb4
commit 9aa234255d
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/admin/company.php
View File

@ -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":""); print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
if(! isOnlyOneLocalTax(1)) 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"); $formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
} }
print '</td></tr>'; print '</td></tr>';
@ -639,7 +639,7 @@ if ($action == 'edit' || $action == 'updateedit')
print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>"; print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";
$example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code); $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 ($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)) if(! isOnlyOneLocalTax(2))
{ {
$formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2"); $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>"; print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>";
$example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code); $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":""); 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){ 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>'; {
print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>';
} }
print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': '; 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); 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); 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); print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
} }
@ -1046,15 +1051,21 @@ else
print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>"; print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";
$example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code); $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 ($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){ 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>'; {
print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>';
} }
print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': '; 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); 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); 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); print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
} }

1
htdocs/langs/en_US/admin.lang
View File

@ -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. 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. 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 ##### ##### Local Taxes #####
LTRate=Rate
LocalTax1IsUsed=Use second tax LocalTax1IsUsed=Use second tax
LocalTax1IsNotUsed=Do not use second tax LocalTax1IsNotUsed=Do not use second tax
LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)