// MERGE with trunk revision 7754

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 12:48:42 +00:00
parent 4ade3a0ea0
commit e159c925d8
182 changed files with 6179 additions and 1333 deletions
@@ -231,7 +231,12 @@ class SpecificPriceCore extends ObjectModel
 					`id_country` IN(0, '.(int)($id_country).') AND
 					`id_group` IN(0, '.(int)($id_group).') AND
 					`from_quantity` = 1 AND
-					(`from` = \'0000-00-00 00:00:00\' OR (\''.$beginning.'\' >= `from` AND \''.$ending.'\' <= `to`)) AND
+					(
+						(`from` = \'0000-00-00 00:00:00\' OR \''.$beginning.'\' >= `from`)
+						AND
+						(`to` = \'0000-00-00 00:00:00\' OR \''.$ending.'\' <= `to`)
+					)
+					AND
 					`reduction` > 0
 		', false);
 		$ids_product = array();