Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation

Browse Source
This commit is contained in:
Florian HENRY
2021-03-23 21:05:11 +01:00
parent cc78e7c685 02509ccbc4
commit d043c8f4ba
31 changed files with 112 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4381,9 +4381,9 @@ class Form
while ($i < $num) {
$obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected))) {
$out .= '<option value="'.$obj->rowid.'" selected>';
$out .= '<option value="'.$obj->rowid.'" data-currency-code="'.$obj->currency_code.'" selected>';
} else {
$out .= '<option value="'.$obj->rowid.'">';
$out .= '<option value="'.$obj->rowid.'" data-currency-code="'.$obj->currency_code.'">';
}
$out .= trim($obj->label);
if ($showcurrency) {
@@ -5676,7 +5676,7 @@ class Form
$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
$sql .= " WHERE t.fk_pays = c.rowid";
$sql .= " AND t.active > 0";
$sql .= " AND c.code IN (".$this->db->sanitize($country_code).")";
$sql .= " AND c.code IN (".$this->db->sanitize($country_code, 1).")";
$sql .= " ORDER BY t.code ASC, t.taux ASC, t.recuperableonly ASC";
$resql = $this->db->query($sql);
@@ -5759,6 +5759,7 @@ class Form
$defaultnpr = (preg_match('/\*/', $selectedrate) ? 1 : $defaultnpr);
$defaulttx = str_replace('*', '', $selectedrate);
$defaultcode = '';
$reg = array();
if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
$defaultcode = $reg[1];
$defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);