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

Works on enhancement of local taxes. Fix: Best local tax control in third parties

Browse Source
This commit is contained in:
Juanjo Menent 2010-04-24 17:31:16 +00:00
parent 4b857f035d
commit db199b55a2
4 changed files with 134 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/comm/fiche.php
View File

@ -210,18 +210,29 @@ if ($socid > 0)
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr>'; if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; {
print yn($objsoc->localtax1_assuj); print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';
print '</td>'; print yn($objsoc->localtax1_assuj);
print '</tr>'; print '</td></tr>';
print '<tr>'; print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">';
print '<td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; print yn($objsoc->localtax2_assuj);
print yn($objsoc->localtax2_assuj); print '</td></tr>';
print '</td>'; }
print '</tr>'; elseif($mysoc->localtax1_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
print yn($objsoc->localtax1_assuj);
print '</td></tr>';
}
elseif($mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
print yn($objsoc->localtax2_assuj);
print '</td></tr>';
}
} }
// Conditions de reglement par defaut // Conditions de reglement par defaut

33
htdocs/compta/fiche.php
View File

@ -208,18 +208,29 @@ if ($socid > 0)
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr>'; if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; {
print yn($societe->localtax1_assuj); print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';
print '</td>'; print yn($societe->localtax1_assuj);
print '</tr>'; print '</td></tr>';
print '<tr>'; print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">';
print '<td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; print yn($societe->localtax2_assuj);
print yn($societe->localtax2_assuj); print '</td></tr>';
print '</td>'; }
print '</tr>'; elseif($mysoc->localtax1_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
print yn($societe->localtax1_assuj);
print '</td></tr>';
}
elseif($mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
print yn($societe->localtax2_assuj);
print '</td></tr>';
}
} }
// TVA Intra // TVA Intra

34
htdocs/fourn/fiche.php
View File

@ -115,23 +115,33 @@ if ( $societe->fetch($socid) )
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr>'; if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; {
print yn($societe->localtax1_assuj); print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';
print '</td>'; print yn($societe->localtax1_assuj);
print '</tr>'; print '</td></tr>';
print '<tr>'; print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">';
print '<td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; print yn($societe->localtax2_assuj);
print yn($societe->localtax2_assuj); print '</td></tr>';
print '</td>'; }
print '</tr>'; elseif($mysoc->localtax1_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
print yn($societe->localtax1_assuj);
print '</td></tr>';
}
elseif($mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
print yn($societe->localtax2_assuj);
print '</td></tr>';
}
} }
print '</table>'; print '</table>';
print '</td><td valign="top" width="50%" class="notopnoleftnoright">'; print '</td><td valign="top" width="50%" class="notopnoleftnoright">';
$var=true; $var=true;

98
htdocs/soc.php
View File

@ -685,17 +685,29 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
} }
// Local Taxes // Local Taxes
if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>'; if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
print '<td>'; {
print $html->selectyesno('localtax1assuj_value',0,1); print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
print '</td>'; print $html->selectyesno('localtax1assuj_value',0,1);
print '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>'; print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
print '<td>'; print $html->selectyesno('localtax2assuj_value',0,1);
print $html->selectyesno('localtax2assuj_value',0,1); print '</td></tr>';
print '</td>';
print '</tr>'; }
elseif($mysoc->localtax1_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
print $html->selectyesno('localtax1assuj_value',0,1);
print '</td><tr>';
}
elseif($mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
print $html->selectyesno('localtax2assuj_value',0,1);
print '</td><tr>';
}
} }
if ($user->rights->societe->client->voir) if ($user->rights->societe->client->voir)
@ -1027,18 +1039,30 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>'; if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
print '<td>'; {
print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1); print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
print '</td>'; print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
print '</td></tr>';
print '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>'; }
print '<td>'; elseif($mysoc->localtax1_assuj=="1")
print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1); {
print '</td>'; print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
print '</tr>'; print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
print '</td></tr>';
}
elseif($mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
print '</td></tr>';
}
} }
print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
@ -1273,23 +1297,31 @@ else
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr><td>'; if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
print $langs->trans('LocalTax1IsUsedES'); {
print '</td><td>'; print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
print yn($soc->localtax1_assuj); print yn($soc->localtax1_assuj);
print '</td>'; print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
print yn($soc->localtax2_assuj);
print '</td></tr>';
print '<td>'; }
print $langs->trans('LocalTax2IsUsedES'); elseif($mysoc->localtax1_assuj=="1")
print '</td><td>'; {
print yn($soc->localtax2_assuj); print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
print '</td>'; print yn($soc->localtax1_assuj);
print '</tr>'; print '</td><tr>';
}
elseif($mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
print yn($soc->localtax2_assuj);
print '</td><tr>';
}
} }
// Capital // Capital
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">';
if ($soc->capital) print $soc->capital.' '.$langs->trans("Currency".$conf->monnaie); if ($soc->capital) print $soc->capital.' '.$langs->trans("Currency".$conf->monnaie);