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

Merge pull request #581 from simnandez/3.3

Browse Source 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
This commit is contained in:
Laurent Destailleur 2013-01-08 13:38:38 -08:00
commit 1555bb681c
3 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -728,12 +728,17 @@ class pdf_einstein extends ModelePDFCommandes
case '3': case '3':
case '5': case '5':
case '7': case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2; continue 2;
break; break;
} }
}
foreach( $localtax_rate as $tvakey => $tvaval ) foreach( $localtax_rate as $tvakey => $tvaval )
{ {
if ($tvakey>0) // On affiche pas taux 0 if ($tvakey!=0) // On affiche pas taux 0
{ {
//$this->atleastoneratenotnull++; //$this->atleastoneratenotnull++;
@ -765,12 +770,17 @@ class pdf_einstein extends ModelePDFCommandes
case '3': case '3':
case '5': case '5':
case '7': case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2; continue 2;
break; break;
} }
}
foreach( $localtax_rate as $tvakey => $tvaval ) foreach( $localtax_rate as $tvakey => $tvaval )
{ {
if ($tvakey>0) // On affiche pas taux 0 if ($tvakey!=0) // On affiche pas taux 0
{ {
//$this->atleastoneratenotnull++; //$this->atleastoneratenotnull++;

12
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -858,12 +858,16 @@ class pdf_crabe extends ModelePDFFactures
case '3': case '3':
case '5': case '5':
case '7': case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2; continue 2;
break; break;
} }
}
foreach( $localtax_rate as $tvakey => $tvaval ) foreach( $localtax_rate as $tvakey => $tvaval )
{ {
if ($tvakey>0) // On affiche pas taux 0 if ($tvakey!=0) // On affiche pas taux 0
{ {
//$this->atleastoneratenotnull++; //$this->atleastoneratenotnull++;
@ -895,12 +899,16 @@ class pdf_crabe extends ModelePDFFactures
case '3': case '3':
case '5': case '5':
case '7': case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2; continue 2;
break; break;
} }
}
foreach( $localtax_rate as $tvakey => $tvaval ) foreach( $localtax_rate as $tvakey => $tvaval )
{ {
if ($tvakey>0) // On affiche pas taux 0 if ($tvakey!=0) // On affiche pas taux 0
{ {
//$this->atleastoneratenotnull++; //$this->atleastoneratenotnull++;

14
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -761,12 +761,17 @@ class pdf_azur extends ModelePDFPropales
case '3': case '3':
case '5': case '5':
case '7': case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2; continue 2;
break; break;
} }
}
foreach( $localtax_rate as $tvakey => $tvaval ) foreach( $localtax_rate as $tvakey => $tvaval )
{ {
if ($tvakey>0) // On affiche pas taux 0 if ($tvakey!=0) // On affiche pas taux 0
{ {
//$this->atleastoneratenotnull++; //$this->atleastoneratenotnull++;
@ -798,12 +803,17 @@ class pdf_azur extends ModelePDFPropales
case '3': case '3':
case '5': case '5':
case '7': case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2; continue 2;
break; break;
} }
}
foreach( $localtax_rate as $tvakey => $tvaval ) foreach( $localtax_rate as $tvakey => $tvaval )
{ {
if ($tvakey>0) // On affiche pas taux 0 if ($tvakey!=0) // On affiche pas taux 0
{ {
//$this->atleastoneratenotnull++; //$this->atleastoneratenotnull++;