Skip to content

Commit

Permalink
Merge branch 'marcosgdf-bug-2835' into 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jun 14, 2015
2 parents c4ff9c3 + fadc640 commit 1fc4716
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -20,6 +20,7 @@ Fix: [ bug #2757 ] Deleting product category photo gives "Forbidden access" erro
Fix: [ bug #2976 ] "Report" tab is the current tab but it is not marked as selected by the UI
Fix: [ bug #2861 ] Undefined variable $res when migrating
Fix: [ bug #2837 ] Product list table column header does not match column body
Fix: [ bug #2835 ] Customer prices of a product shows incorrect history order

***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
Expand Down
2 changes: 1 addition & 1 deletion htdocs/product/price.php
Expand Up @@ -670,7 +670,7 @@
$sql.= " AND p.entity IN (".getEntity('productprice', 1).")";
$sql.= " AND p.fk_user_author = u.rowid";
if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES)) $sql.= " AND p.price_level = ".$soc->price_level;
$sql.= " ORDER BY p.date_price DESC, p.price_level ASC";
$sql.= " ORDER BY p.date_price DESC, p.price_level ASC, p.rowid DESC";

dol_syslog("sql=".$sql);
$result = $db->query($sql);
Expand Down

0 comments on commit 1fc4716

Please sign in to comment.