4b6642d76c
// Small optimization
2013-07-23 09:50:25 +02:00
3503670478
Update Search.php
...
$string = preg_replace('/[._-]+/', '', $string);
Ex :
Product's name : Saint-leon
Search : leon => 0 result
------------------------------------------------------
$string = preg_replace('/[._-]+/', ' ', $string);
Ex :
Product's name : Saint-leon
Search : leon => 1 result
-------------------------------------------------------
I think that thus the search is more relevant
2013-07-23 09:36:08 +02:00
928181bd1f
Update Hook.php
2013-07-22 21:35:20 +01:00
2e860d6750
Update product.js
...
if product with declinaison without reduction : reduction price is showed !!
because of this comparison after (line ~400):
if (productPriceWithoutReductionDisplay > productPriceDisplay)
and :
var tmp = productPriceDisplay * group_reduction;
is unused
2013-07-22 18:58:59 +01:00
939f7d7770
//most of the translation of the NL installer is done
2013-07-22 17:09:26 +00:00
3ecf929ff0
[-] BO : FixBug #PSCFV-9881 Remove updateCarriersList on zip code blur
2013-07-22 18:05:37 +02:00
f194aec8c5
// update module and orders tab
2013-07-22 17:56:24 +02:00
0f7d59ad26
[-] BO : FixBug #PSCFV-9878 Wrong login tab order
2013-07-22 17:07:57 +02:00
9d16eb1d1b
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
b88ddf4483
[-] Classes : SwiftMailer - Fix deprecated preg_replace (PHP 5. 5.0)
2013-07-22 15:39:50 +02:00
b87e934a66
[-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement
2013-07-22 14:58:55 +02:00
794475a9cc
[-] BO : FixBug #PSCFV-8237 Javascript Error setting default supplier
2013-07-22 14:33:16 +02:00
d79365fe4d
// small fix
2013-07-22 11:54:35 +02:00
32c02bba5f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-22 11:39:44 +02:00
b8d272a459
// fix entities
2013-07-22 11:39:15 +02:00
f76fe635ff
// Added queries table to the profiling mode, you can easily copy/paste it into excel or anything
2013-07-22 11:37:29 +02:00
3c59c5e779
//replaced all js='1' with js=1 so that the translation regexes don't fail
2013-07-22 09:34:18 +00:00
ca9f2c9459
[-] BO : FixBug #PSCFV-9138 Error duplicate product group reduction
2013-07-22 11:25:13 +02:00
287cf0c955
Update 1.5.5.0.sql
...
Missing DEFAULT
2013-07-22 09:55:06 +01:00
3556e75ce3
// Moved useless code into the block where it is useful
2013-07-22 10:49:41 +02:00
838a4e8bc9
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-22 08:25:26 +00:00
3483706951
[-] FO : Prevent unsassigned category id, thans @PrestaCaptainFLAM
2013-07-20 19:07:10 +02:00
1581a371c5
[-] BO : FixBug #PSCFV-9251 Meta Tag delete previous
2013-07-19 18:41:46 +02:00
288c0d3ca8
// Css cleaning
2013-07-19 18:41:15 +02:00
aa276aeee6
Merge remote-tracking branch 'origin/development' into development
2013-07-19 17:51:00 +02:00
5825dda836
[-] MO mailalerts : infinite coverage (-1) is taken into account when sending coverage e-mails
...
#PNM-1563
#PNM-1597
2013-07-19 17:36:51 +02:00
2f6a53f971
[+] TR: Created file structure for Dutch installer
2013-07-19 15:34:10 +00:00
b1f380c120
// Fixed statsforecast category distribution
2013-07-19 16:59:54 +02:00
19fb1da4f2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-19 16:30:21 +02:00
abf874d576
[-] BO : FixBug #PSCFV-9049 Bad actionOrderSlipAdd hook description
2013-07-19 16:30:04 +02:00
84d9caca81
// Blind fix
2013-07-19 16:29:17 +02:00
5646e682bc
[-] BO : FIxBug Correct image language in product
2013-07-19 15:21:06 +02:00
3389cf8acb
[-] FO : fixed pagination for p = 0 #PSCFV-9746
2013-07-19 14:08:24 +02:00
8d034a7ebf
// up
2013-07-19 13:33:56 +02:00
95122e8849
Merge remote-tracking branch 'origin/development' into development
2013-07-19 12:04:39 +02:00
8c47ca3edf
[-] BO : fixed sort by currency exchange rate #PSCFV-9840
2013-07-19 11:40:52 +02:00
989dafce21
[*] FO : a few more SQL improvements
2013-07-19 11:29:18 +02:00
7570c9eb87
[-] MO loyalty : minimum amount is now taken into account when creating discount vouchers
...
#PNM-1561
2013-07-19 11:15:14 +02:00
bd4ece095b
[*] FO : lots of performance improvements (removed or merged useless SQL queries)
2013-07-19 10:58:51 +02:00
eb6b233e31
[-] BO : If no nb, get default 8, not 10.
2013-07-19 10:33:28 +02:00
219ec6e8be
[-] FO : Removed useless live edit query #PSCFV-9845
2013-07-19 09:50:30 +02:00
78ddec3ac7
[-] BO : translation copy is now easier #PSCFV-8886
2013-07-18 18:51:37 +02:00
0b4512dbcb
// some work on style sheets
2013-07-18 18:51:24 +02:00
a6a700c9d8
// parse error
2013-07-18 18:40:19 +02:00
236aaa9354
[*] MAILS : add {order_name} & {attached_file} , manaul merge from https://github.com/PrestaEdit/PrestaShop/commit/e9f963174486362a0ba471c18e113f6b83e5efc8
2013-07-18 18:38:12 +02:00
54fe5dfe96
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:34:18 +02:00
ac02e5191a
// ups
2013-07-18 18:34:10 +02:00
c90ba4c406
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:33:51 +02:00
066b791cf7
[-] FO : FixBug of total products from supliers and manufacturer
2013-07-18 18:33:35 +02:00
354622857f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:31:35 +02:00
Damien Metzger