dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,362 Commits 9 Branches 19 Tags
d9c2ec37d43f28aab2ff9a31a6f85e153532dbf5
Commit Graph
17362 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger d9c2ec37d4 // Code cleaning 2013-07-15 18:13:07 +02:00
Damien Metzger a3039024e7 // Code cleaning 2013-07-15 18:07:53 +02:00
gRoussac 7a27b11309 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-15 17:31:17 +02:00
gRoussac f9c5bf0bf2 [-] Fix bug #PSCFV-9633 again could not see delete href in block cart 2013-07-15 17:29:08 +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
gRoussac ca4a73ddf4 // avoid copy paste mistake with trailing space 2013-07-15 15:34:34 +02:00
gRoussac 1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko 2013-07-15 14:47:38 +02:00
gRoussac f1dcf02caf //fix warnings #PSCFV-9786 2013-07-15 14:25:58 +02:00
gRoussac e30e15d76d [-] INSTALER: Fix bug #PSCFV-9762 marketing tab disapear after upgrade 2013-07-15 12:29: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
Damien Metzger db7f0da746 // Improved display in pscleaner 2013-07-15 10:48:48 +02:00
Damien Metzger cf7f72fc30 // Fixed AdminMarketing position in upgrade 2013-07-15 10:11:40 +02:00
gRoussac 6ea4a2c553 [-] FO : Fix bug #PSCFV-9662 udpate payments means after delete thanks @maofree 2013-07-15 10:08:16 +02:00
Rémi Gaillard e34289b0b7 // fix product warehouses 2013-07-12 18:53:22 +02:00
Gregory Roussac c89281166b Merge pull request #467 from PrestaEdit/patch-40 
[-] BO : Controller: AdminTranslationsController / Back translations
 2013-07-12 09:23:29 -07:00
Gregory Roussac 5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39 
[*] BO: hook displayAdminForm / add param fieldset
 2013-07-12 08:56:42 -07:00
Rémi Gaillard e23854d143 // Add currency ID on default modules cache id 2013-07-12 17:49:38 +02:00
Gregory Roussac 5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5 
[-] PDF : Get correct prefix for invoices
 2013-07-12 08:44:24 -07: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 0453698f50 Merge pull request #557 from BigZ/patch-1 
[-] BO : Update documents listing to display proper prefix
 2013-07-12 08:37:21 -07:00
gRoussac 9c44faf295 [-] FO : Fix bug #PSCFV-9754 do not use back url on cart summary link in steps 2013-07-12 16:59:11 +02:00
Damien Metzger 4e0723b3cc [-] BO : fixed charts and grids in multishop #PSCFV-8978 2013-07-12 16:29:31 +02: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
Damien Metzger 38b32f7e1a [-] MO : fixed disappearing form in sekeyword #PSCFV-9743 2013-07-12 15:56:54 +02:00
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
gRoussac 8588978e03 [*] FO : getCatImageLink doesn't work without type thanks @axometeam 2013-07-12 15:03:52 +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
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
gRoussac 5d8d7c0383 [-] MO : Followup : don't send emails for empty carts thanks @axometeam 2013-07-11 18:57:37 +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
Rémi Gaillard d8a444335f Merge pull request #524 from ChristopheBoucaut/development 
Update OrderDetailController.php
 2013-07-11 08:26:13 -07:00