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

Merge pull request #5007 from altatof/fichinter_order_by_date

Browse Source 
NEW: fichinter lines ordered by rang AND DATE
This commit is contained in:
Laurent Destailleur 2016-04-19 19:26:57 +02:00
commit 6d2df1f6ea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fichinter/card.php
View File

@ -1445,7 +1445,7 @@ else if ($id > 0 || ! empty($ref))
$sql.= ' WHERE ft.fk_fichinter = '.$object->id; $sql.= ' WHERE ft.fk_fichinter = '.$object->id;
if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION)) if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION))
$sql.= ' AND ft.duree <> 0'; $sql.= ' AND ft.duree <> 0';
$sql.= ' ORDER BY ft.rang ASC, ft.rowid'; $sql.= ' ORDER BY ft.rang ASC, ft.date ASC, ft.rowid';
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)

2
htdocs/fichinter/class/fichinter.class.php
View File

@ -981,7 +981,7 @@ class Fichinter extends CommonObject
{ {
$sql = 'SELECT rowid, description, duree, date, rang'; $sql = 'SELECT rowid, description, duree, date, rang';
$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet'; $sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
$sql.=' WHERE fk_fichinter = '.$this->id .' ORDER BY rang ASC' ; $sql.=' WHERE fk_fichinter = '.$this->id .' ORDER BY rang ASC, date ASC' ;
dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG); dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);