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

FIX Change position of line in BOM

Browse Source
This commit is contained in:
Laurent Destailleur
2020-07-09 16:00:15 +02:00
parent f756864670
commit b8721e0c64
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/ajax/row.php
View File

@@ -47,8 +47,8 @@ top_httphead();
print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n"; print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
// Registering the location of boxes // Registering the location of boxes
if ((!empty($_POST['roworder'])) && (!empty($_POST['table_element_line'])) if (GETPOST('roworder', 'alpha') && GETPOST('table_element_line', 'alpha', 2)
&& (!empty($_POST['fk_element'])) && (!empty($_POST['element_id']))) && GETPOST('fk_element', 'alpha', 2) && GETPOST('element_id', 'int', 2))
{ {
$roworder = GETPOST('roworder', 'alpha', 2); $roworder = GETPOST('roworder', 'alpha', 2);
$table_element_line = GETPOST('table_element_line', 'alpha', 2); $table_element_line = GETPOST('table_element_line', 'alpha', 2);

3
htdocs/core/class/commonobject.class.php
View File

@@ -8154,6 +8154,9 @@ abstract class CommonObject
$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element; $sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
$sql .= ' WHERE fk_'.$this->element.' = '.$this->id; $sql .= ' WHERE fk_'.$this->element.' = '.$this->id;
if ($morewhere) $sql .= $morewhere; if ($morewhere) $sql .= $morewhere;
if (isset($objectline->fields['position'])) {
$sql .= $this->db->order('position', 'ASC');
}
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)