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

Local Taxes: Remove MAIN_FEATURES_LEVEL condition

Browse Source
This commit is contained in:
Juanjo Menent 2010-07-15 07:23:04 +00:00
parent 5687126662
commit 99e970d6c9
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/company.php
View File

@ -863,7 +863,7 @@ else
/* /*
* Local Taxes * Local Taxes
*/ */
if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($code_pays=='ES')
{ {
// Local Tax 1 // Local Tax 1
print '<br>'; print '<br>';

2
htdocs/comm/fiche.php
View File

@ -213,7 +213,7 @@ if ($socid > 0)
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{ {

4
htdocs/comm/propal.php
View File

@ -1197,7 +1197,7 @@ if ($id > 0 || ! empty($ref))
if ($conf->global->PROPALE_ADD_DELIVERY_ADDRESS) $rowspan++; if ($conf->global->PROPALE_ADD_DELIVERY_ADDRESS) $rowspan++;
//Local taxes //Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1") $rowspan++; if($mysoc->localtax1_assuj=="1") $rowspan++;
if($mysoc->localtax2_assuj=="1") $rowspan++; if($mysoc->localtax2_assuj=="1") $rowspan++;
@ -1379,7 +1379,7 @@ if ($id > 0 || ! empty($ref))
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {

4
htdocs/commande/fiche.php
View File

@ -1390,7 +1390,7 @@ else
if ($conf->projet->enabled) $nbrow++; if ($conf->projet->enabled) $nbrow++;
//Local taxes //Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax1_assuj=="1") $nbrow++;
if($mysoc->localtax2_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++;
@ -1625,7 +1625,7 @@ else
print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {

4
htdocs/compta/commande/fiche.php
View File

@ -151,7 +151,7 @@ if ($id > 0 || ! empty($ref))
if ($conf->projet->enabled) $nbrow++; if ($conf->projet->enabled) $nbrow++;
//Local taxes //Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax1_assuj=="1") $nbrow++;
if($mysoc->localtax2_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++;
@ -360,7 +360,7 @@ if ($id > 0 || ! empty($ref))
print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {

6
htdocs/compta/facture.php
View File

@ -1680,7 +1680,7 @@ if ($_GET['action'] == 'create')
print '<tr><td>'.$langs->trans($classname).'</td><td colspan="2">'.$object->getNomUrl(1).'</td></tr>'; print '<tr><td>'.$langs->trans($classname).'</td><td colspan="2">'.$object->getNomUrl(1).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($object->total_ht).'</td></tr>'; print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($object->total_ht).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($object->total_tva)."</td></tr>"; print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($object->total_tva)."</td></tr>";
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {
@ -2308,7 +2308,7 @@ else
if ($conf->projet->enabled) $nbrows++; if ($conf->projet->enabled) $nbrows++;
//Local taxes //Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1") $nbrows++; if($mysoc->localtax1_assuj=="1") $nbrows++;
if($mysoc->localtax2_assuj=="1") $nbrows++; if($mysoc->localtax2_assuj=="1") $nbrows++;
@ -2639,7 +2639,7 @@ else
print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {

2
htdocs/compta/fiche.php
View File

@ -213,7 +213,7 @@ if ($socid > 0)
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{ {

4
htdocs/compta/propal.php
View File

@ -176,7 +176,7 @@ if ($id > 0 || ! empty($ref))
if ($conf->projet->enabled) $rowspan++; if ($conf->projet->enabled) $rowspan++;
//Local taxes //Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1") $rowspan++; if($mysoc->localtax1_assuj=="1") $rowspan++;
if($mysoc->localtax2_assuj=="1") $rowspan++; if($mysoc->localtax2_assuj=="1") $rowspan++;
@ -290,7 +290,7 @@ if ($id > 0 || ! empty($ref))
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {

4
htdocs/fourn/commande/fiche.php
View File

@ -858,7 +858,7 @@ if ($id > 0 || ! empty($ref))
if ($conf->projet->enabled) $nbrow++; if ($conf->projet->enabled) $nbrow++;
//Local taxes //Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax1_assuj=="1") $nbrow++;
if($mysoc->localtax2_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++;
@ -944,7 +944,7 @@ if ($id > 0 || ! empty($ref))
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {

4
htdocs/fourn/facture/fiche.php
View File

@ -797,7 +797,7 @@ else
if ($conf->projet->enabled) $nbrows++; if ($conf->projet->enabled) $nbrows++;
// Local taxes // Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1") $nbrow++; if($mysoc->localtax1_assuj=="1") $nbrow++;
if($mysoc->localtax2_assuj=="1") $nbrow++; if($mysoc->localtax2_assuj=="1") $nbrow++;
@ -892,7 +892,7 @@ else
print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($fac->total_tva).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($fac->total_tva).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($mysoc->pays_code=='ES')
{ {
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {

2
htdocs/fourn/fiche.php
View File

@ -119,7 +119,7 @@ if ( $societe->fetch($socid) )
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{ {

6
htdocs/soc.php
View File

@ -700,7 +700,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
} }
// Local Taxes // Local Taxes
if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{ {
@ -1059,7 +1059,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{ {
@ -1319,7 +1319,7 @@ else
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{ {