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

Fix: bad default vat calculation

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-30 21:16:41 +02:00
parent cd9a6942ce
commit c7e7b67433
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/class/html.form.class.php
View File

@ -3096,20 +3096,10 @@ class Form
$defaulttx = $this->cache_vatrates[$num-1]['txtva']; $defaulttx = $this->cache_vatrates[$num-1]['txtva'];
} }
// Disabled if customer is not subject to VAT if (! $options_only) $return.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
$disabled=false;
if (is_object($societe_acheteuse) && ! empty($societe_acheteuse->id)
&& $societe_acheteuse->tva_assuj == "0") {
$disabled=true;
}
if (! $options_only) $return.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').'>';
foreach ($this->cache_vatrates as $rate) foreach ($this->cache_vatrates as $rate)
{ {
// Force 0 if customer is not subject to VAT
if ($disabled && $rate['txtva'] != 0) continue;
$return.= '<option value="'.$rate['txtva']; $return.= '<option value="'.$rate['txtva'];
$return.= $rate['nprtva'] ? '*': ''; $return.= $rate['nprtva'] ? '*': '';
$return.= '"'; $return.= '"';

2
htdocs/core/tpl/freeproductline_create.tpl.php
View File

@ -76,7 +76,7 @@ if (! empty($conf->margin->enabled)) {
<td align="right"> <td align="right">
<?php <?php
if ($buyer->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0'; if ($seller->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
else echo $form->load_tva('np_tva_tx', (isset($_POST["np_tva_tx"])?$_POST["np_tva_tx"]:-1), $seller, $buyer); else echo $form->load_tva('np_tva_tx', (isset($_POST["np_tva_tx"])?$_POST["np_tva_tx"]:-1), $seller, $buyer);
?> ?>
</td> </td>

3
htdocs/core/tpl/objectline_add.tpl.php
View File

@ -146,7 +146,8 @@ if (! empty($conf->margin->enabled)) {
<td align="right"> <td align="right">
<?php <?php
echo $form->load_tva('tva_tx', (GETPOST('tva_tx')?GETPOST('tva_tx'):-1), $seller, $buyer); if ($buyer->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" value="0">0';
else echo $form->load_tva('tva_tx', (GETPOST('tva_tx')?GETPOST('tva_tx'):-1), $seller, $buyer);
?> ?>
<input type="hidden" id="origin_tva_tx_cache" name="origin_tva_tx_cache" value="" /> <input type="hidden" id="origin_tva_tx_cache" name="origin_tva_tx_cache" value="" />
</td> </td>