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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-19 19:52:37 +02:00
commit fb5497f3d6
3 changed files with 3 additions and 3 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;
if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION))
$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);
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.= ' 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);
$resql=$this->db->query($sql);

2
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
View File

@ -362,7 +362,7 @@ CREATE TABLE llx_c_accounting_category (
) ENGINE=innodb;
ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code);
UPDATE llx_accounting_account SET account_parent = '0' WHERE account_parent = '';
ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent integer;