Commit Graph

17570 Commits

Author SHA1 Message Date
Damien Metzger f82e748fc8 [*] MO : you can now exclude IP addresses from the online visitors module #PSCFV-9056 2013-07-12 15:38:36 +02: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
sLorenzini 160857bdc3 // update css module tab 2013-07-12 14:30:44 +02:00
gRoussac 24d124f190 [*] MODULE : Multi-shop compatibility in newsletter module tanks @axometeam 2013-07-12 14:17:49 +02:00
gRoussac b880bc3a18 [*] PDF : Free shipping in invoice PDF display X2 thanks @axometeam 2013-07-12 12:09:34 +02:00
gRoussac 6f9e415ca7 // missing image 2013-07-12 12:03:32 +02:00
djfm e4173fbc98 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-12 09:50:04 +00: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
Gregory Roussac c3b7e1dad9 Merge pull request #519 from axometeam/patch-5
[*] BO : Correct Request Sql Manager validate options
2013-07-12 02:08:45 -07:00
Gregory Roussac 44debd682f Merge pull request #517 from axometeam/patch-4
[*] BO : AdminControllers Keep "active" filter on pagination
2013-07-12 02:07:51 -07:00
Rémi Gaillard 4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
Gregory Roussac 8fcca7999d Merge pull request #502 from axometeam/patch-2
[-] BO : Prevent false error for product duplication
2013-07-12 01:29:39 -07:00
Damien Metzger 994d43d3e4 // Oops 2013-07-12 09:40:14 +02:00
BigZ f1049c021a get correct prefix for invoices
One must use the shop id when getting invoices prefix
2013-07-12 03:43:03 +02:00
BigZ 25b5d2857b develivery slip should use prefix
as develivery_prefix uses lang and shop id, those variables has to be passed as parameters
2013-07-12 03:03:21 +02:00
BigZ e28a1e793a Invoice prefix wasn't used in filename
As invoice_prefix uses lang and shop ids they have to be passed has parameters
2013-07-12 03:01:33 +02:00
BigZ bd432641a0 update documents listing to display proper prefix
In order details, generic prefix was displayed in right column instead of shop specific prefix
2013-07-12 02:32:52 +02:00
Kevin Granger 84c0ccbae6 // products TPL 2013-07-11 18:58:44 +02:00
gRoussac 5d8d7c0383 [-] MO : Followup : don't send emails for empty carts thanks @axometeam 2013-07-11 18:57:37 +02:00
Piotr Moćko 68d135b4cf Payment currency restriction incorret type of input for radio
When payment module has currencies restrictions set to radio it still displays as checkbox because in TPL file type of input is not being changed
2013-07-11 18:56:50 +02:00
Damien Metzger 9af2d3946f // Fixed potential error when deleting a module 2013-07-11 18:46:06 +02:00
gRoussac a5ee2c2f4f [-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab 2013-07-11 18:27:54 +02:00
Gregory Roussac 293d1afbc7 Merge pull request #484 from axome/module_followup_guests
[-] MO : Followup : Don't send followup vouchers to guest accounts
2013-07-11 09:13:39 -07:00
Gregory Roussac 27a72f9b2c Merge pull request #482 from axome/module_followup_cron
[-] MO : Followup : Don't execute crontasks if the module is disabled
2013-07-11 09:08:51 -07:00
Damien Metzger 184515a27c [-] MO : fixed bad redirection in trackingfront #PSCFV-8378 2013-07-11 18:03:39 +02:00
sLorenzini 40967e6525 // update modules list tab 2013-07-11 17:27:11 +02:00
Rémi Gaillard d8a444335f Merge pull request #524 from ChristopheBoucaut/development
Update OrderDetailController.php
2013-07-11 08:26:13 -07:00
Rémi Gaillard d0cf8fce18 // small fix 2013-07-11 17:04:29 +02:00
Rémi Gaillard 20b5449231 [*] Core: that is now easier to get links for another shop 2013-07-11 16:40:40 +02:00
Rémi Gaillard 17ee071bdf Merge pull request #540 from axometeam/patch-7
[*] BO : Correct the getList() request for quantity and id_product
2013-07-11 06:40:17 -07:00
Rémi Gaillard 004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
Damien Metzger d772d97bfa [-] BO : you can now have different mail topic for one mail template #PSCFV-9617 2013-07-11 14:27:40 +02:00
Francois Gaillard d0e4e956c4 [-] Classes : Mail - check instance of link in the context 2013-07-11 14:01:24 +02:00
Damien Metzger 7cc5196fec [-] FO : fixed useless error when the product id in the URL is not an int #PSCFV-9726 2013-07-11 11:38:57 +02:00
Rémi Gaillard c0cdd0a0e1 Merge pull request #547 from PiotrKaczor/patch-1
[*] MO : pscleaner reset employees notyfications
2013-07-11 00:46:30 -07:00
Rémi Gaillard 2578ffb6e1 Merge pull request #552 from codl/development
[-] WS: do not escape shop name overzealously
2013-07-11 00:44:52 -07:00
Kevin Granger f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
sLorenzini f847c821ed // update tab modules bootsrap 2013-07-10 18:19:03 +02:00
gRoussac 105ae7e59f [*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko 2013-07-10 18:16:09 +02:00
gRoussac 9f2dad0c6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-10 17:44:48 +02:00
gRoussac 8b16bd44aa [*] FO : Fix bug #PSCFV-9440 add another address in guest checkout in OPC 2013-07-10 17:43:36 +02:00
Vincent Augagneur 53ec2aab7e //remove unused configuration 2013-07-10 17:33:02 +02:00
sLorenzini 8b33ac5aca // quantities product modified + line bootsrap added in order, categories and attributes group controllers 2013-07-10 12:21:22 +02:00
Corentin Delcourt 02faf9d18e [-] WS: do not escape shop name overzealously 2013-07-10 10:21:33 +02:00
Kevin Granger ec466b8c70 // Porting more product tpl 2013-07-09 19:10:56 +02:00
gRoussac e8b8fa0527 [-] CORE: No category in url preview on BO product page 2013-07-09 18:06:02 +02:00
gRoussac 5e0893979b [-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on 2013-07-09 16:06:21 +02:00
gRoussac 4f5661572e [-] PDF : Fix columns error 2013-07-09 11:58:56 +02:00