Commit Graph

18638 Commits

Author SHA1 Message Date
gRoussac
d1904e7c56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-22 12:16:54 +02:00
gRoussac
7f65d01692 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-22 12:16:54 +02:00
gRoussac
7713e86efc [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); 2013-05-22 12:16:27 +02:00
gRoussac
62cbee150b [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); 2013-05-22 12:16:27 +02:00
djfm
5b250dbe8d // parse error 2013-05-22 11:11:37 +02:00
djfm
da2db7d799 // parse error 2013-05-22 11:11:37 +02:00
Rémi Gaillard
c7a056f301 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
Rémi Gaillard
0e45c649d9 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
Rémi Gaillard
b65423f232 [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
Rémi Gaillard
fe5a54cfcc [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
gRoussac
9196ec042e // 1.4.9.1 does not exists 2013-05-22 09:41:00 +02:00
gRoussac
41184dac33 // 1.4.9.1 does not exists 2013-05-22 09:41:00 +02:00
gRoussac
3879897f38 // reduondant call to p1540_add_missing_columns 2013-05-21 17:36:25 +02:00
gRoussac
949333c1c4 // reduondant call to p1540_add_missing_columns 2013-05-21 17:36:25 +02:00
gRoussac
a4c150d2fb [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 2013-05-21 17:20:13 +02:00
gRoussac
65123157fc [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 2013-05-21 17:20:13 +02:00
gRoussac
d6c1a2f038 [-] INSTALLER : SQL error during upgrade from 1.5.0.13 2013-05-21 17:05:12 +02:00
gRoussac
b64cf50391 [-] INSTALLER : SQL error during upgrade from 1.5.0.13 2013-05-21 17:05:12 +02:00
gRoussac
9b8bfe1bbc [-] INSTALLER : SQL error during upgrade from 1.5.0.9 2013-05-21 16:47:53 +02:00
gRoussac
93e3ac23ff [-] INSTALLER : SQL error during upgrade from 1.5.0.9 2013-05-21 16:47:53 +02:00
gRoussac
2f660b70b2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-21 16:29:48 +02:00
gRoussac
58acc64ed8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-21 16:29:48 +02:00
gRoussac
22ba79eb10 [-] INSTALLER : Fix bug #PSCFV-8605 loop on ressource wether than n array 2013-05-21 16:29:26 +02:00
gRoussac
f6ccbb0080 [-] INSTALLER : Fix bug #PSCFV-8605 loop on ressource wether than n array 2013-05-21 16:29:26 +02:00
Rémi Gaillard
2542e97164 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
Rémi Gaillard
5312290774 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
PrestaEdit
446abf7e3f // use getModuleIdByName() 2013-05-21 13:11:41 +02:00
PrestaEdit
f5828aa49a // use getModuleIdByName() 2013-05-21 13:11:41 +02:00
PrestaEdit
0abe3b3193 [*] Class: Module / Use method instead of SQL query 2013-05-21 13:03:41 +03:00
PrestaEdit
770d925729 [*] Class: Module / Use method instead of SQL query 2013-05-21 13:03:41 +03:00
vAugagneur
43a333ff03 //remove useless comments 2013-05-21 11:28:24 +02:00
vAugagneur
dc5df43d16 //remove useless comments 2013-05-21 11:28:24 +02:00
Vincent Augagneur
70b061343b Merge pull request #225 from emily-d/development
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
2013-05-21 02:27:30 -07:00
Vincent Augagneur
6d6b2ef7d3 Merge pull request #225 from emily-d/development
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
2013-05-21 02:27:30 -07:00
Rémi Gaillard
0ddc7e0e4b // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard
7576bc18e4 // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard
b573b39acb [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
Rémi Gaillard
3d9596aa99 [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
vAugagneur
2a606999fd //small bug 2013-05-21 10:30:35 +02:00
vAugagneur
0d4fd0729b //small bug 2013-05-21 10:30:35 +02:00
Vincent Augagneur
69c045d8fd Merge pull request #429 from PrestaEdit/patch-34
[-] BO: Ajax Confirmation / padding-left
2013-05-21 01:25:54 -07:00
Vincent Augagneur
5c9abe1194 Merge pull request #429 from PrestaEdit/patch-34
[-] BO: Ajax Confirmation / padding-left
2013-05-21 01:25:54 -07:00
Grégoire Bélorgey
0759fd36c0 Merge branch 'development' of github.com:MyBB-Services/PrestaShop into development 2013-05-21 08:18:23 +02:00
Rémi Gaillard
7d5830af94 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Rémi Gaillard
532a727cc2 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Kevin Granger
3fd3ad2919 Added close span tag to avoid bug on IE8 (thanks Atch) 2013-05-20 18:20:55 +03:00
Kevin Granger
2a3820f068 Added close span tag to avoid bug on IE8 (thanks Atch) 2013-05-20 18:20:55 +03:00
vAugagneur
e01383c5a1 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur
5244fdaa21 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00