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

fix stickler

Browse Source
This commit is contained in:
ATM john 2021-01-06 17:33:19 +01:00
parent ae7b8e7f5e
commit dd19da66b2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3902,7 +3902,7 @@ class Form
$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units'; $sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
$sql .= ' WHERE active > 0'; $sql .= ' WHERE active > 0';
if(!empty($unit_type)){ if (!empty($unit_type)){
$sql .= ' AND unit_type = "'.$this->db->escape($unit_type).'" '; $sql .= ' AND unit_type = "'.$this->db->escape($unit_type).'" ';
} }

6
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -194,10 +194,10 @@ $coldisplay++;
$unit_type = false; $unit_type = false;
// limit unit select to unit type // limit unit select to unit type
if(!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){ if(!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){
if(!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php'; if (!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
$cUnit = new CUnits($line->db); $cUnit = new CUnits($line->db);
if($cUnit->fetch($line->fk_unit) > 0){ if ($cUnit->fetch($line->fk_unit) > 0){
if(!empty($cUnit->unit_type)){ if (!empty($cUnit->unit_type)){
$unit_type = $cUnit->unit_type; $unit_type = $cUnit->unit_type;
} }
} }