ChristopheBoucaut
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
Captain FLAM
928181bd1f
Update Hook.php
2013-07-22 21:35:20 +01:00
Jérôme Nadaud
b87e934a66
[-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement
2013-07-22 14:58:55 +02:00
Jérôme Nadaud
ca9f2c9459
[-] BO : FixBug #PSCFV-9138 Error duplicate product group reduction
2013-07-22 11:25:13 +02:00
Damien Metzger
3556e75ce3
// Moved useless code into the block where it is useful
2013-07-22 10:49:41 +02:00
Damien Metzger
84d9caca81
// Blind fix
2013-07-19 16:29:17 +02:00
Damien Metzger
3389cf8acb
[-] FO : fixed pagination for p = 0 #PSCFV-9746
2013-07-19 14:08:24 +02:00
Damien Metzger
989dafce21
[*] FO : a few more SQL improvements
2013-07-19 11:29:18 +02:00
Damien Metzger
bd4ece095b
[*] FO : lots of performance improvements (removed or merged useless SQL queries)
2013-07-19 10:58:51 +02:00
Damien Metzger
219ec6e8be
[-] FO : Removed useless live edit query #PSCFV-9845
2013-07-19 09:50:30 +02:00
Damien Metzger
78ddec3ac7
[-] BO : translation copy is now easier #PSCFV-8886
2013-07-18 18:51:37 +02:00
Jérôme Nadaud
54fe5dfe96
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:34:18 +02:00
Rémi Gaillard
ac02e5191a
// ups
2013-07-18 18:34:10 +02:00
Jérôme Nadaud
c90ba4c406
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:33:51 +02:00
Jérôme Nadaud
066b791cf7
[-] FO : FixBug of total products from supliers and manufacturer
2013-07-18 18:33:35 +02:00
Rémi Gaillard
354622857f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:31:35 +02:00
Rémi Gaillard
958d92c9fa
[*] BO: Add an option to allow iframes on descriptions
2013-07-18 18:31:31 +02:00
Damien Metzger
c70fe92dac
// Validate::isGenericName now allow "#" #PSCFV-6530
2013-07-18 18:22:50 +02:00
Jérôme Nadaud
caf321e691
[-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden
2013-07-18 18:16:57 +02:00
Jérôme Nadaud
d879fb15a9
[-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products
2013-07-18 18:10:29 +02:00
Jérôme Nadaud
3693349643
[-] BO : FixBug #PSCFV-5316 Translation problem in delete button link
2013-07-18 15:49:53 +02:00
Damien Metzger
6293631ac4
[-] FO : fixed group query for cart rules #PSCFV-8992
2013-07-18 13:47:43 +02:00
Jérôme Nadaud
69066361a6
[-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search
2013-07-18 12:15:42 +02:00
Damien Metzger
108bd92c3b
[-] FO : Fixed partial use of cart rules which does not offer free shipping #PSCFV-9216
2013-07-18 12:09:48 +02:00
Jérôme Nadaud
40389822c3
[-] BO : FixBug Directory Separator on URL
2013-07-18 08:52:39 +02:00
Jérôme Nadaud
eecfdae0b6
[-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change
2013-07-17 18:23:59 +02:00
Gregory Roussac
312e066751
Merge pull request #550 from PrestaEdit/patch-44
...
[-] Class: PaymentModule / Be sure to have the right "TaxCalculationMeth...
2013-07-17 09:01:32 -07:00
Gregory Roussac
cf04c18ce6
Merge pull request #537 from PrestaEdit/patch-43
...
[-] FO: OrderHistory - Unclosed tag
2013-07-17 08:53:31 -07:00
Jérôme Nadaud
458838e598
[-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent
2013-07-17 17:33:53 +02:00
gRoussac
24b2e1ec8c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 15:36:03 +02:00
gRoussac
d55f31d3b5
Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
...
Conflicts:
classes/Tools.php
controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00
Damien Metzger
1b9892b944
// removed deprecated message
2013-07-17 13:42:45 +02:00
François Gaillard
899dc30097
[-] Class : AdminController - Object id fixed
2013-07-17 11:33:33 +02:00
Jérôme Nadaud
d66f407fcb
[-] BO : Use only 0% reduction from category in group
2013-07-16 18:28:11 +02:00
Jérôme Nadaud
ae5b6b79ee
[*] BO : #PSCFV-8498 You can now use 0% in groups category rules in order to not apply discount on this category
2013-07-16 17:42:38 +02:00
Rémi Gaillard
8d39f32506
[-] BO: Fix tax rule edition - unique tax rule can't be edited
2013-07-16 11:52:05 +02:00
gRoussac
d2ff50ddb7
[*] CORE : Fix bug #PSCFV-9811 doc on display404Error
2013-07-16 10:50:27 +02:00
Damien Metzger
3d283000a0
// Fixed misplaced comma
2013-07-16 10:27:52 +02:00
Gregory Roussac
f6ef6f5d0e
Merge pull request #572 from PrestaEdit/patch-47
...
[-] Class : Media / Correct jquery_ui_dependencies fileName
2013-07-15 07:41:07 -07:00
gRoussac
01bad90b29
// Welcome 2013
2013-07-15 16:36:54 +02:00
PrestaEdit
4b8a756add
[-] Class: Media / Correct jquery_ui_dependencies fileName
...
Even if not used...
2013-07-15 16:34:51 +02:00
Rémi Gaillard
ee1187d821
[-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query
2013-07-15 11:00:35 +02:00
Rémi Gaillard
e23854d143
// Add currency ID on default modules cache id
2013-07-12 17:49:38 +02:00
Gregory Roussac
39a23e1494
Merge pull request #560 from BigZ/patch-4
...
[-] PDF : Develivery slip should use prefix
2013-07-12 08:42:16 -07:00
Gregory Roussac
b25b88cf33
Merge pull request #559 from BigZ/patch-3
...
[-] PDF : Invoice prefix wasn't used in filename
2013-07-12 08:41:37 -07:00
Gregory Roussac
105b1422a3
Merge pull request #562 from axometeam/patch-14
...
[*] BO : Do not increment stock if statut change fom Error to Canceled
2013-07-12 07:22:50 -07:00
Sylvain WITMEYER
9fec968488
Update Translate.php
...
Translations shouldn't be cached if they contain dynamic vars (sprintf)
On productcomments,
<li>{l s='%1$d out of %2$d people found this review useful.' sprintf=[$comment.total_useful, $comment.total_advice] mod='productcomments'}</li>
was always printing the same sentence
2013-07-12 15:17:09 +02:00
gRoussac
8588978e03
[*] FO : getCatImageLink doesn't work without type thanks @axometeam
2013-07-12 15:03:52 +02:00
Axome
1c960da57a
[*] BO : Not increment stock if statut change fom Error to Canceled
...
Not increment stock if statut change fom Error => Canceled or Canceled => Error (stock should stay the same).
Add a code simplification too
2013-07-12 11:22:42 +02:00
Rémi Gaillard
0928efb112
// small fix
2013-07-12 11:17:30 +02:00