Skip to content
Snippets Groups Projects
Commit 1fc47166 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch 'marcosgdf-bug-2835' into 3.5

parents c4ff9c32 fadc6403
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -670,7 +670,7 @@ $sql.= " WHERE fk_product = ".$object->id;
$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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment