ORDER BY rowid
This commit is contained in:
parent
590373a620
commit
927d0a2fa1
@ -5688,22 +5688,20 @@ function isOnlyOneLocalTax($local)
|
||||
function get_localtax_by_third($local)
|
||||
{
|
||||
global $db, $mysoc;
|
||||
$sql = "SELECT t.localtax1_type, t.localtax2_type, t.localtax1, t.localtax2 ";
|
||||
|
||||
$sql = " SELECT t.localtax$local as localtax";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";
|
||||
$sql .= " WHERE c.code = '".$db->escape($mysoc->country_code)."' AND t.active = 1 AND t.taux=(";
|
||||
$sql .= " SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";
|
||||
$sql .= " WHERE c.code = '".$db->escape($mysoc->country_code)."' AND tt.active = 1";
|
||||
$sql .= " )";
|
||||
$sql .= " ) ";
|
||||
$sql .= " AND t.localtax${local}_type > 0";
|
||||
$sql .= " ORDER BY rowid DESC";
|
||||
|
||||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
while ($obj = $db->fetch_object($resql)) {
|
||||
if ($local == 1 && $obj->localtax1_type > 0) {
|
||||
return $obj->localtax1;
|
||||
} elseif ($local == 2 && $obj->localtax2_type > 0) {
|
||||
return $obj->localtax2;
|
||||
}
|
||||
}
|
||||
$obj = $db->fetch_object($resql);
|
||||
return $obj->localtax;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user