Commit Graph

1780 Commits

Author SHA1 Message Date
aFolletete bf0c68ca5e // fixed icon column type issue on HelperList
// now callback column call a method of AdminController and not of Entity
// clean datepicker in HelperList

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9194 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 15:35:25 +00:00
rMalie ce914bd435 [*] Classes: refactoring of cache classes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9191 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 14:45:27 +00:00
aNiassy 31815febc5 [-] FO-BO: #PSFV-95 : deleted some treatments for avoid code repeated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9187 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 13:19:40 +00:00
bMancone f8ddc8fcfc // Stock: deleted files while it's not fully implemented.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9184 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 12:52:59 +00:00
bMancone 2a0305f31e // StockWarehouse : updated __PS_USE_SQL_SLAVE__
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9179 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 12:27:16 +00:00
rMalie 577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 12:18:56 +00:00
bMancone 251dd966b7 // Stock : getStockId() copied in this new Class untill its implementation is done
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9177 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 10:05:43 +00:00
bMancone 9658d81762 // StockWarehouse Fixed setIdShopList()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9175 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 10:01:15 +00:00
lLefevre 791dd3e6a6 [-][-] FO : not check if Object employee is Load
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9173 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 09:18:11 +00:00
mDeflotte 493dc1d811 // StockWarehouse FixBug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9172 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:57:58 +00:00
mDeflotte f01b058f09 // StockWarehouse FixBug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9171 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:47:14 +00:00
bMancone 5fc2d5fe34 // StockWarehouse updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9170 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:43:56 +00:00
dSevere 220a1406d3 // Add Stock Manager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9169 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:35:03 +00:00
lLefevre 19a86d0a8f [-] FO : not check if context employee exist
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9168 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:34:25 +00:00
dSevere 8cb02307e5 // Updating Stock interface for using arrays of warehouses id when getting product quantities
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9167 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:27:24 +00:00
lLefevre c781f25760 [*] BO : added right of multi-shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9157 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 15:39:55 +00:00
bMancone 7f13440775 // Updated stock: Stock & StockMvt & StockWarehouse & StockManagerModule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9151 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 15:10:03 +00:00
dSevere fca4a10c0f // Updating Stock interface for using Warehouses objects
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9150 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 15:08:12 +00:00
mDeflotte 2900595bc0 // Add StockWarehouse Class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 14:50:38 +00:00
mDeflotte fb5c6d48f2 [*] All : Now autoExecute allow inserting multiple row
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9137 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:55:34 +00:00
rMalie de7107b58c // MCached renamed in CacheMemcache + CacheFS renamed in CacheFs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:49:15 +00:00
rMalie 581e212a66 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9134 b9a71923-0436-4b27-9f14-aed3839534dd 2011-10-07 12:40:41 +00:00
rMalie 64dca3508e // Move cache classes in classes/cache/
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9133 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:40:00 +00:00
vChabot 02026b1c8c // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9132 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:31:58 +00:00
vChabot 70c6d95950 // object cache added for getGroupsStatic methode
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9131 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:30:58 +00:00
bMancone 92b032e8dd // StockManagement : Interface/Factory/Module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9126 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:56:55 +00:00
rMalie 14542fea44 // Merge -> revision 9124
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:54:43 +00:00
vAugagneur 1cdc37f80d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9114 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:45:53 +00:00
vAugagneur bd1657dc01 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9113 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:36:28 +00:00
aFolletete e7fa851a7c // move js_files and css_files assign in initFooter
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9112 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:34:05 +00:00
vChabot 4134ed3f5d [*] BO : Modules can now be authorized or not by client group
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9108 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:22:25 +00:00
vAugagneur 40d0463987 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9106 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 14:52:02 +00:00
vAugagneur 7a75fe3c57 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9105 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 14:51:47 +00:00
mMarinetti f9bcf3f84f [-] Installer : Fix country_to_timezone in last step
[+] BO : now AdminProducts and AdminCategories are separated from AdminCatalog
[+] FO : new method Category::getAllChildren() (the return value is an array, but can evolve to a collection
// Uses of Media:: in header.inc.php 

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9097 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:02:24 +00:00
rMalie 3d0e96b313 // context->controller now work for adminController too
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9090 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:55:28 +00:00
vAugagneur 6c7d1a5ee7 [*] Classes : addJqueryUI automaticaly add css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9089 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:51:37 +00:00
aFolletete 05de006711 // fix bug on AdminController and callback usage
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9087 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:48:48 +00:00
aFolletete 6cb41061cf // fix norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9086 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:39:45 +00:00
lLefevre bac1d615cb [-] BO : fixed bug in method displayDate() to the class Tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9084 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:17:56 +00:00
lLefevre 6f9f82a2e5 //update property in AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9081 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 16:31:51 +00:00
jmCollin 5e8cd2a3f2 // Fix shipping cost for virtual products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 16:02:12 +00:00
aFolletete 9d063a0a67 // fix norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9073 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:45:57 +00:00
rMalie b4d436ca21 // Merge -> revision 9061
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:21:55 +00:00
rMalie 66db4c486d // Small fix on exceptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9064 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:43:25 +00:00
lBrieu 4b8ae2693c [*] FO : Hide the download link and download icon if the virtual product do not have files associated with it
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9063 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:28:47 +00:00
lBrieu 9eda5d4cdc [*] FO : get the product attribute id for download link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9059 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:57:02 +00:00
lBrieu 3dc3144727 [*] FO : change the download link for files associated to product attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9057 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:54:56 +00:00
lBrieu fc8a13192c [+] FO : don't send email if there's no file associated to the virtual product
[*] FO : change the download link for files associated to product attributes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9056 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:53:51 +00:00
rMalie 0e33114d4d // Improve exception display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9051 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:05:40 +00:00
vAugagneur 053af8843f [+] Classes : Media::getJqueryPluginPath() - added new parameter $folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9045 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:01:19 +00:00