From 83263e242e72effdcd4038e59971f3780895ed0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Sat, 23 Jan 2016 20:32:22 +0100
Subject: [PATCH] Corrected typo of PR #4444
---
htdocs/product/class/product.class.php | 4 ++--
htdocs/product/price.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2bf92821c1e..37f7d228869 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1510,7 +1510,7 @@ class Product extends CommonObject
$sql.= " WHERE entity IN (".getEntity('productprice', 1).")";
$sql.= " AND price_level=".$i;
$sql.= " AND fk_product = '".$this->id."'";
- $sql.= " ORDER BY date_price, rowid DESC";
+ $sql.= " ORDER BY date_price DESC, rowid DESC";
$sql.= " LIMIT 1";
$resql = $this->db->query($sql);
if ($resql)
@@ -1571,7 +1571,7 @@ class Product extends CommonObject
$sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
$sql.= " WHERE fk_product = '".$this->id."'";
- $sql.= " ORDER BY date_price, rowid DESC";
+ $sql.= " ORDER BY date_price DESC, rowid DESC";
$sql.= " LIMIT 1";
$resql = $this->db->query($sql);
if ($resql)
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 79ee0dd0f55..f338a0b4dd9 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -687,7 +687,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, p.rowid DESC, p.price_level ASC";
+$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
// $sql .= $db->plimit();
dol_syslog("sql=" . $sql);
--
GitLab