Commit Graph

752 Commits

Author SHA1 Message Date
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
vChabot 2c0f3a453f // conflict removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9181 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 12:39:51 +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
vChabot 9d2b379b88 // conflict resolved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9166 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 08:16:23 +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
mMarinetti 9236b287b1 // revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9135 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:40:46 +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
vChabot 6749d55e54 // improve JS (select/unselect all)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9130 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:29:51 +00:00
mMarinetti 0e494ed7db // revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9129 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:27:01 +00:00
jmCollin bf609d8374 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9128 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 11:27:45 +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
vChabot 38a23cf978 // refactoring function (delete useless functions)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9123 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:24:44 +00:00
vAugagneur 539b92b651 [+] BO : added action button in autocomplete module list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9122 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 08:05:29 +00:00
vChabot 3c12ce1943 // db_settings_extends updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 08:02:34 +00:00
vChabot 8e25db88cf // modification upgrade sql 1.5.0.1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:51:36 +00:00
vChabot 5e4eece1de // little correction
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9119 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:47:07 +00:00
vChabot 27fc74ffa5 // adding default restrictions on install
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:46:49 +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
mMarinetti 2f20dea507 // no more media in header.inc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9111 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:32:11 +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
vAugagneur 4d7bf6f76a //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9102 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:54:33 +00:00
vAugagneur ef8f39babe //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9101 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:41:24 +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
vAugagneur 646eda2e4e //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:06:18 +00:00
vAugagneur e228825648 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:05:37 +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