vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX Buyer state/province VAT default (VATRULE 2) ignores active and entity filters (#39279)

Browse source 
get_default_tva() VATRULE 2 selects the VAT rate attached to the buyer
department (c_tva.fk_department_buyer) but filters only on the department id.
Unlike get_product_vat_for_country(), it omits t.active and t.entity, so a
disabled rate (or a rate from another entity) can be returned as the default,
and because of the taux DESC ordering an inactive higher rate wins over the
active one.

Add "AND t.active > 0" and "AND t.entity IN (getEntity('c_tva'))" to the query.
The ordering is unchanged, so the documented behaviour is preserved: the rate
flagged Default (use_default) wins, otherwise the highest active rate.

Add testGetDefaultTvaForBuyerState() covering VATRULE 2, which was previously
untested: it asserts the active department rate is selected and the inactive
one is ignored.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Jam Balaya 2026-07-27 20:04:30 +09:00 committed by GitHub
parent 1bbf06f587
commit 4116c251da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 80 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View file

@ -7784,6 +7784,8 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
$sql .= " FROM ".$db->prefix()."c_tva as t";
$sql .= " INNER JOIN ".$db->prefix()."c_departements as d ON t.fk_department_buyer = d.rowid";
$sql .= " WHERE d.rowid = ".((int) $thirdparty_buyer->state_id);
$sql .= " AND t.active > 0";
$sql .= " AND t.entity IN (".getEntity('c_tva').")";
$sql .= " ORDER BY t.use_default DESC, t.taux DESC, t.code ASC, t.recuperableonly ASC";
$res = $db->query($sql);

78
test/phpunit/FunctionsLibTest.php
View file

@ -1424,6 +1424,84 @@ class FunctionsLibTest extends CommonClassTest
$this->assertEquals(0, $vat, 'RULE 5 ECOMMERCE_200238EC');
}
/**
* testGetDefaultTvaForBuyerState
*
* Covers VATRULE 2: when the buyer department (state/province) has a VAT rule in the
* dictionary, it becomes the default VAT rate. Also checks that only active rates of the
* current entity are considered (an inactive rate must never be selected).
*
* @return void
*/
public function testGetDefaultTvaForBuyerState()
{
global $conf,$user,$langs,$db;
$this->savconf = $conf;
$this->savuser = $user;
$this->savlangs = $langs;
$this->savdb = $db;
// Make sure the ecommerce directive left on by a previous test does not interfere with VATRULE 2
unset($conf->global->SERVICE_ARE_ECOMMERCE_200238EC);
// Seller subject to VAT in France
$companyfr = new Societe($db);
$companyfr->country_code = 'FR';
$companyfr->tva_assuj = 1;
$companyfr->tva_intra = 'FR9999';
// Find an existing department (state/province) to attach a VAT rule to, and the France country id
$stateid = 0;
$sql = "SELECT rowid FROM ".$db->prefix()."c_departements WHERE code_departement = '75'";
$resql = $db->query($sql);
if ($resql && $db->num_rows($resql)) {
$objdep = $db->fetch_object($resql);
$stateid = (int) $objdep->rowid;
}
if (empty($stateid)) {
$this->markTestSkipped('No department found in c_departements to run the VATRULE 2 test.');
return;
}
$frpaysid = 0;
$sql = "SELECT rowid FROM ".$db->prefix()."c_country WHERE code = 'FR'";
$resql = $db->query($sql);
if ($resql && $db->num_rows($resql)) {
$objpays = $db->fetch_object($resql);
$frpaysid = (int) $objpays->rowid;
}
// Insert two temporary VAT rules attached to that department:
// - an ACTIVE one at 12 that must be selected
// - an INACTIVE one at 25 (higher, so it would win the taux DESC sort) that must be ignored
$db->query("DELETE FROM ".$db->prefix()."c_tva WHERE code IN ('TESTVATACT', 'TESTVATINACT')");
$db->query("INSERT INTO ".$db->prefix()."c_tva (entity, fk_pays, fk_department_buyer, code, type_vat, taux, use_default, recuperableonly, active) VALUES (1, ".$frpaysid.", ".$stateid.", 'TESTVATACT', 0, 12, 0, 0, 1)");
$db->query("INSERT INTO ".$db->prefix()."c_tva (entity, fk_pays, fk_department_buyer, code, type_vat, taux, use_default, recuperableonly, active) VALUES (1, ".$frpaysid.", ".$stateid.", 'TESTVATINACT', 0, 25, 0, 0, 0)");
// Buyer located in that department
$buyer = new Societe($db);
$buyer->country_code = 'FR';
$buyer->tva_assuj = 1;
$buyer->state_id = $stateid;
// Case 1: an active department rate exists -> VATRULE 2 returns it, ignoring the inactive (higher) one
$vatactive = get_default_tva($companyfr, $buyer, 0);
// Case 2: no active department rate remains -> VATRULE 2 must not fire on the inactive rows
$db->query("UPDATE ".$db->prefix()."c_tva SET active = 0 WHERE code = 'TESTVATACT'");
$vatinactive = get_default_tva($companyfr, $buyer, 0);
// Cleanup fixtures before asserting so a failed assertion never leaves test data behind
$db->query("DELETE FROM ".$db->prefix()."c_tva WHERE code IN ('TESTVATACT', 'TESTVATINACT')");
// The active department rate is selected...
$this->assertStringContainsString('TESTVATACT', $vatactive, 'VATRULE 2 must select the active department VAT rate');
// ...and the inactive one is never selected (this is the fix)
$this->assertStringNotContainsString('TESTVATINACT', $vatactive, 'An inactive department VAT rate must not be selected by VATRULE 2');
// When no active department rate remains, VATRULE 2 does not select the (now inactive) rate either
$this->assertStringNotContainsString('TESTVATACT', $vatinactive, 'An inactive department VAT rate must not be selected by VATRULE 2');
}
/**
* testGetDefaultLocalTax
*