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

Fix: An easier to understand fix. Remove also not recommanded "continue

Browse Source 
2" instructions.
This commit is contained in:
Laurent Destailleur 2013-01-08 22:59:36 +01:00
parent 1555bb681c
commit f3df7a2fec
3 changed files with 60 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -722,20 +722,10 @@ class pdf_einstein extends ModelePDFCommandes
//Local tax 1 before VAT //Local tax 1 before VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on') if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
{ {
foreach( $this->localtax1 as $localtax_type => $localtax_rate ) { foreach( $this->localtax1 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '1': // TODO: Place into a function to control showing by country or study better option
case '3': if (in_array((string) $localtax_type, array('1','3','5','7')) && $mysoc->country_code != 'ES') continue;
case '5':
case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2;
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
@ -761,23 +751,13 @@ class pdf_einstein extends ModelePDFCommandes
} }
} }
} }
//Local tax 2 before VAT //Local tax 2 before VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on') if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
{ {
foreach( $this->localtax2 as $localtax_type => $localtax_rate ) { foreach( $this->localtax2 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '1': // TODO: Place into a function to control showing by country or study better option
case '3': if (in_array((string) $localtax_type, array('1','3','5','7')) && $mysoc->country_code != 'ES') continue;
case '5':
case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2;
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
@ -834,14 +814,10 @@ class pdf_einstein extends ModelePDFCommandes
//Local tax 1 after VAT //Local tax 1 after VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on') if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
{ {
foreach( $this->localtax1 as $localtax_type => $localtax_rate ) { foreach( $this->localtax1 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '2': if (in_array((string) $localtax_type, array('2','4','6'))) continue;
case '4':
case '6':
continue 2;
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
@ -875,17 +851,13 @@ class pdf_einstein extends ModelePDFCommandes
} }
} }
} }
//Local tax 2 after VAT //Local tax 2 after VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on') if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
{ {
foreach( $this->localtax2 as $localtax_type => $localtax_rate ) { foreach( $this->localtax2 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '2': if (in_array((string) $localtax_type, array('2','4','6'))) continue;
case '4':
case '6':
continue 2;
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

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

@ -852,19 +852,11 @@ class pdf_crabe extends ModelePDFFactures
//Local tax 1 before VAT //Local tax 1 before VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on') if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
{ {
foreach( $this->localtax1 as $localtax_type => $localtax_rate ) { foreach( $this->localtax1 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '1': // TODO: Place into a function to control showing by country or study better option
case '3': if (in_array((string) $localtax_type, array('1','3','5','7')) && $mysoc->country_code != 'ES') continue;
case '5':
case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2;
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
@ -889,23 +881,15 @@ class pdf_crabe extends ModelePDFFactures
} }
} }
} }
} }
//Local tax 2 before VAT //Local tax 2 before VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on') if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
{ {
foreach( $this->localtax2 as $localtax_type => $localtax_rate ) { foreach( $this->localtax2 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '1': // TODO: Place into a function to control showing by country or study better option
case '3': if (in_array((string) $localtax_type, array('1','3','5','7')) && $mysoc->country_code != 'ES') continue;
case '5':
case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2;
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
@ -962,14 +946,10 @@ class pdf_crabe extends ModelePDFFactures
//Local tax 1 after VAT //Local tax 1 after VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on') if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
{ {
foreach( $this->localtax1 as $localtax_type => $localtax_rate ) { foreach( $this->localtax1 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '2': if (in_array((string) $localtax_type, array('2','4','6'))) continue;
case '4':
case '6':
continue 2;
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
@ -1003,17 +983,13 @@ class pdf_crabe extends ModelePDFFactures
} }
} }
} }
//Local tax 2 after VAT //Local tax 2 after VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on') if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
{ {
foreach( $this->localtax2 as $localtax_type => $localtax_rate ) { foreach( $this->localtax2 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '2': if (in_array((string) $localtax_type, array('2','4','6'))) continue;
case '4':
case '6':
continue 2;
break;
}
foreach( $localtax_rate as $tvakey => $tvaval ) foreach( $localtax_rate as $tvakey => $tvaval )
{ {
// retrieve global local tax // retrieve global local tax

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

@ -755,20 +755,11 @@ class pdf_azur extends ModelePDFPropales
//Local tax 1 before VAT //Local tax 1 before VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on') if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
{ {
foreach( $this->localtax1 as $localtax_type => $localtax_rate ) { foreach( $this->localtax1 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '1': // TODO: Place into a function to control showing by country or study better option
case '3': if (in_array((string) $localtax_type, array('1','3','5','7')) && $mysoc->country_code != 'ES') continue;
case '5':
case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2;
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
@ -793,24 +784,15 @@ class pdf_azur extends ModelePDFPropales
} }
} }
} }
} }
//Local tax 2 before VAT //Local tax 2 before VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on') if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
{ {
foreach( $this->localtax2 as $localtax_type => $localtax_rate ) { foreach( $this->localtax2 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '1': // TODO: Place into a function to control showing by country or study better option
case '3': if (in_array((string) $localtax_type, array('1','3','5','7')) && $mysoc->country_code != 'ES') continue;
case '5':
case '7':
//TODO: Place into a function to control showing by country or study better option
if($mysoc->country_code!='ES')
{
continue 2;
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
@ -867,14 +849,10 @@ class pdf_azur extends ModelePDFPropales
//Local tax 1 after VAT //Local tax 1 after VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on') if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
{ {
foreach( $this->localtax1 as $localtax_type => $localtax_rate ) { foreach( $this->localtax1 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '2': if (in_array((string) $localtax_type, array('2','4','6'))) continue;
case '4':
case '6':
continue 2;
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
@ -908,17 +886,13 @@ class pdf_azur extends ModelePDFPropales
} }
} }
} }
//Local tax 2 after VAT //Local tax 2 after VAT
if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on') if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
{ {
foreach( $this->localtax2 as $localtax_type => $localtax_rate ) { foreach( $this->localtax2 as $localtax_type => $localtax_rate )
switch ($localtax_type) { {
case '2': if (in_array((string) $localtax_type, array('2','4','6'))) continue;
case '4':
case '6':
continue 2;
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