Commit Graph

2053 Commits

Author SHA1 Message Date
lLefevre a61b6a31bc // fixed bug in AdminProductsController for display errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11045 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 12:53:32 +00:00
mDeflotte c1d6e68cd6 // BugFix : Blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11043 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 10:50:54 +00:00
mDeflotte 403d24ff4b // BugFix : Blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11040 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 10:45:27 +00:00
mDeflotte 52c86a9bc3 // Blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11038 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 10:36:42 +00:00
rMalie 1c2347ddab // Remove AdminStatsConf controller (conf is already in AdminStatsTab)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11035 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 09:25:10 +00:00
vChabot c6fb7aa4f7 // little fix about advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11034 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 09:22:02 +00:00
mDeflotte 0d917153da // Little BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11033 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 09:00:29 +00:00
mDeflotte fded1dfe2d // Little BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11032 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 08:58:50 +00:00
vKham f5bd143eb6 // re add engine page stats, admin css module account
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11031 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 08:42:55 +00:00
dSevere c23c2d983b // Bugs fix on CSV export on supply order interface
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11030 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 18:07:38 +00:00
lLefevre 7873905bb5 // fix norm && added PDO::FETCH_ASSOC in method fetch() for PDO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 17:30:32 +00:00
fGaillard 4aa4094808 [-] Installer : #PSCFI-4383 : BugFix SQL installation script corrected, unique key for specific_price_priority
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 17:09:38 +00:00
rMalie 814bb7dcc4 // Add again engines in stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11024 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 13:52:31 +00:00
vKham a2209b5d84 // change layout module position consistency with listing module, new admin stylesheets
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11023 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 10:50:11 +00:00
rMalie f6cf5ff6ed // Fix Blowfish for autoload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11022 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 10:10:46 +00:00
fGaillard c8fc8d1733 [-] Classes : #PSCFI-3880 : BugFix mbstring overload on Rijndael encrypt-decrypt
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11019 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 09:21:05 +00:00
rMalie 3d1176686f // Fix collection in cartRule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11018 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 09:11:43 +00:00
lLefevre 8dcd11f56f // update size a button to top
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11017 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 22:42:01 +00:00
tDidierjean d171de204f // BO performance improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11016 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:39:37 +00:00
lLefevre a972dae0ae // adding customization template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11015 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:24:08 +00:00
dSevere 1f42bf8d4e // Bugs fix (Collection, SQL optimizations, Backoffice interfaces improvement, ...) + update db_settings_extends.sql for base datas relative to available quantities and suppliers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11014 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:07:06 +00:00
lLefevre bfcb15b998 // adding attachement template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11013 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:01:14 +00:00
mMarinetti f6bad7e3b6 // fix in db_settings_extends
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11012 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:56:39 +00:00
mMarinetti eae123dbeb [+] MO : homeslider is now replacing editorial in default installation
[-] MO : homeslider bugfix multishop + add samples
[-] MO : blocksupplier updated hookname

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11011 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:53:23 +00:00
sThiebaut f2fbf0687b // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11010 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:39:36 +00:00
sThiebaut d53a71636d // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11009 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:39:17 +00:00
sThiebaut 9c42a4987d // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11008 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:38:25 +00:00
mDeflotte 85b186a956 // BugFix : Problem with delivery_option calculation
// @TODO : All the undefined index are now fixed but there is not all the available delivery option

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11007 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:35:38 +00:00
lLefevre 2b74e1f59a // fix bug in AdminFeaturesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11004 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 16:37:59 +00:00
mDeflotte c843e9bd84 // BugFix in checkout with multishipping on step address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11003 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 16:03:00 +00:00
fSerny ef44083253 [-] BO : Upload zip module is repaired
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11002 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 16:00:17 +00:00
rMalie a9fafc5147 // Can add / delete element from Collection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11001 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:59:23 +00:00
rMalie f55a9e04b9 [*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:41:34 +00:00
bMancone bda11e1541 // Supply Orders : added supplier address in the order form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10998 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:27:38 +00:00
lLefevre 53ffa9dace // fixed bug delete img && update back url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10997 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:21:22 +00:00
bMancone 1886d7ddfc // Fixed bug when updating address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10996 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:20:50 +00:00
rMalie 0bf721b108 // Fix return of AssociateTo method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10995 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:59:00 +00:00
mDeflotte 943741871e // Multishipping button is replaced by a checkbox
// BugFix with back params in the checkout process

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10994 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:56:29 +00:00
mMarinetti 33589430f7 // bugfix db.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10993 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:49:32 +00:00
vChabot 5a438d1849 // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10992 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:47:00 +00:00
vChabot a0f69ae398 // adding configuration when upgrade to the three new groups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10991 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:43:39 +00:00
mDeflotte 476923cf36 // BugFix : Prevent undefined index multi_shipping in template orders-step.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10989 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:37:00 +00:00
bMancone 65f1c44ae6 // Address: added id_warehouse. Supplier: it is now possible to edit the address of a given supplier. Manufacturers: addresses are now correctly displayed. AdminSuppliers: addresses are now editable / when deleting a supplier (if possible <=> no current orders) address is now flaged deleted. AdminWarehouses: when deleting a warehouse, its address is now flagged as deleted.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:28:40 +00:00
mDeflotte f24d06977b [-] MO : #PSCFI-4015 - layered navigation module on IE7 creates scripterror / empty query
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10987 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:26:43 +00:00
mDeflotte 35fea4b692 [-] FO : #PSCFI-3865 - Block Layered translation issues
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10985 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:23:57 +00:00
vSchoener de36bcb13b // Add getShopProtocol to have the current protocol use by the current shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10984 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:22:03 +00:00
vSchoener b07dde4585 // Fields aren't set in getPartnersBlock !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10983 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:21:07 +00:00
rMalie 1172e7a8d0 // Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10982 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:08:48 +00:00
dSevere 5b9e12bba1 // Update Stats interface relative to stock available functionnality + retrocompatibility for supplier reference and wholesale_price for a product/product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10980 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:02:50 +00:00
rMalie 9e7e47847b // Little fix on CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10979 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 13:24:42 +00:00