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:
simnandez 2013-09-17 18:06:06 +02:00
parent c0b57fccaf
commit f7299f1a28
6 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/lib/company.lib.php
View File

@ -62,13 +62,13 @@ function societe_prepare_head($object)
$h++; $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][0] = DOL_URL_ROOT.'/societe/localtaxes.php?socid='.$object->id;
$head[$h][1] = $langs->trans("LocalTaxes"); $head[$h][1] = $langs->trans("LocalTaxes");
$head[$h][2] = 'localtaxes'; $head[$h][2] = 'localtaxes';
$h++; $h++;
} }
if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
{ {

2
htdocs/langs/ca_ES/companies.lang
View File

@ -85,6 +85,8 @@ LocalTax1IsUsedES=Subjecte a RE
LocalTax1IsNotUsedES=No subjecte a RE LocalTax1IsNotUsedES=No subjecte a RE
LocalTax2IsUsedES=Subjecte a IRPF LocalTax2IsUsedES=Subjecte a IRPF
LocalTax2IsNotUsedES=No subjecte a IRPF LocalTax2IsNotUsedES=No subjecte a IRPF
LocalTax1ES=RE
LocalTax2ES=IRPF
ThirdPartyEMail=%s ThirdPartyEMail=%s
WrongCustomerCode=Codi client incorrecte WrongCustomerCode=Codi client incorrecte
WrongSupplierCode=Códi proveïdor incorrecte WrongSupplierCode=Códi proveïdor incorrecte

2
htdocs/langs/en_US/companies.lang
View File

@ -85,6 +85,8 @@ LocalTax1IsUsedES= RE is used
LocalTax1IsNotUsedES= RE is not used LocalTax1IsNotUsedES= RE is not used
LocalTax2IsUsedES= IRPF is used LocalTax2IsUsedES= IRPF is used
LocalTax2IsNotUsedES= IRPF is not used LocalTax2IsNotUsedES= IRPF is not used
LocalTax1ES=RE
LocalTax2ES=IRPF
ThirdPartyEMail=%s ThirdPartyEMail=%s
WrongCustomerCode=Customer code invalid WrongCustomerCode=Customer code invalid
WrongSupplierCode=Supplier code invalid WrongSupplierCode=Supplier code invalid

2
htdocs/langs/es_ES/companies.lang
View File

@ -85,6 +85,8 @@ LocalTax1IsUsedES=Sujeto a RE
LocalTax1IsNotUsedES=No sujeto a RE LocalTax1IsNotUsedES=No sujeto a RE
LocalTax2IsUsedES=Sujeto a IRPF LocalTax2IsUsedES=Sujeto a IRPF
LocalTax2IsNotUsedES=No sujeto a IRPF LocalTax2IsNotUsedES=No sujeto a IRPF
LocalTax1ES=RE
LocalTax2ES=IRPF
ThirdPartyEMail=%s ThirdPartyEMail=%s
WrongCustomerCode=Código cliente incorrecto WrongCustomerCode=Código cliente incorrecto
WrongSupplierCode=Código proveedor incorrecto WrongSupplierCode=Código proveedor incorrecto

2
htdocs/langs/fr_FR/companies.lang
View File

@ -85,6 +85,8 @@ LocalTax1IsUsedES= Assujetti à RE
LocalTax1IsNotUsedES= Non assujetti à RE LocalTax1IsNotUsedES= Non assujetti à RE
LocalTax2IsUsedES= Assujetti à IRPF LocalTax2IsUsedES= Assujetti à IRPF
LocalTax2IsNotUsedES= Non assujetti à IRPF LocalTax2IsNotUsedES= Non assujetti à IRPF
LocalTax1ES=RE
LocalTax2ES=IRPF
ThirdPartyEMail=%s ThirdPartyEMail=%s
WrongCustomerCode=Code client incorrect WrongCustomerCode=Code client incorrect
WrongSupplierCode=Code fournisseur incorrect WrongSupplierCode=Code fournisseur incorrect

16
htdocs/societe/localtaxes.php
View File

@ -16,9 +16,9 @@
*/ */
/** /**
* \file htdocs/societe/agenda.php * \file htdocs/societe/localtaxes.php
* \ingroup societe * \ingroup societe
* \brief Page of third party events * \brief Page of third party localtaxes rates
*/ */
require '../main.inc.php'; require '../main.inc.php';
@ -143,22 +143,22 @@ if ($socid)
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{ {
print '<tr><td class="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; print '<tr><td class="nowrap">'.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).'</td><td colspan="3">';
print yn($soc->localtax1_assuj); print yn($soc->localtax1_assuj);
print '</td></tr>'; print '</td></tr>';
print '<tr><td class="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; print '<tr><td class="nowrap">'.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).'</td><td colspan="3">';
print yn($soc->localtax2_assuj); print yn($soc->localtax2_assuj);
print '</td></tr>'; print '</td></tr>';
} }
elseif($mysoc->localtax1_assuj=="1") elseif($mysoc->localtax1_assuj=="1")
{ {
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">'; print '<tr><td>'.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).'</td><td colspan="3">';
print yn($soc->localtax1_assuj); print yn($soc->localtax1_assuj);
print '</td></tr>'; print '</td></tr>';
} }
elseif($mysoc->localtax2_assuj=="1") elseif($mysoc->localtax2_assuj=="1")
{ {
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">'; print '<tr><td>'.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).'</td><td colspan="3">';
print yn($soc->localtax2_assuj); print yn($soc->localtax2_assuj);
print '</td></tr>'; print '</td></tr>';
} }
@ -185,10 +185,10 @@ if ($socid)
// Localtax 1 // Localtax 1
if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj) if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj)
print '<td align="right" width="80">'.$langs->trans('Localtax1').' (%)</td>'; print '<td align="right" width="80">'.$langs->transcountry('LocalTax1',$mysoc->country_code).' (%)</td>';
if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj) if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj)
print '<td align="right" width="80">'.$langs->trans('Localtax2').' (%)</td>'; print '<td align="right" width="80">'.$langs->transcountry('LocalTax2',$mysoc->country_code).' (%)</td>';
//print '<td width="10"></td>'; //print '<td width="10"></td>';
if ($user->rights->societe->creer) if ($user->rights->societe->creer)