Commit Graph

252 Commits

Author SHA1 Message Date
mMarinetti 1e9e80b266 // #PSCFV-94 - AdminProducts, AdminCatalog
// new menu style


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9515 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 15:22:22 +00:00
vAugagneur 8b8bb3db00 [+] BO : added ssl option for imap sync in SAV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9507 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 14:55:27 +00:00
lLefevre 286535500b [*] BO #PSFV-94 : Added AdminCountriesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9492 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:32:13 +00:00
mDeflotte 61898e2ac1 // Removing undefined function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9491 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:14:43 +00:00
mDeflotte 78ddaa120c // Stock decrementation when order is shipped
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9486 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:08:59 +00:00
tDidierjean ba6de70fc5 [*] BO : #PSFV-94 - added AdminEmailsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9474 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:38:57 +00:00
lLefevre 74788d0959 // revert commit 9463
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9465 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:47:37 +00:00
lLefevre 5f4ee34f0f //FIxed Added Controller AdminCarrierController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9464 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:36:25 +00:00
lLefevre 2f9e2b313f [*] BO #PSFV-94 : Added AdminCarrierController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9462 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:34:37 +00:00
tDidierjean 433a771bfe //delete AdminRequestSql.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9453 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 13:23:19 +00:00
tDidierjean 6303b68d51 [*] BO : #PSFV-94 - added AdminDbController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9452 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 13:18:51 +00:00
hAitmansour d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:36:12 +00:00
tDidierjean de59e7b432 [*] BO : #PSFV-94 - added AdminCurrencuesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9442 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:29:49 +00:00
rMalie 42564ca3d0 // Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
dSevere c65af0c1f3 // Stock: Add Stock Management in admin tabs - extend HelperList to render simple lists without filter, sorting, pagination, ...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9432 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 17:11:13 +00:00
tDidierjean 730e5e4d96 [*] BO : #PSFV-94 - added AdminContactsController, fix flags display for option lists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9424 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 14:00:27 +00:00
tDidierjean 9f92e7941c [*] BO : #PSFV-94 - added AdminBackupController and some changes to AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9417 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 12:40:35 +00:00
lLefevre 96844f2d92 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminStoresController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9401 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 16:37:21 +00:00
tDidierjean 63599c09dc [*] BO : #PSFV-94 - remove AdminImages.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9398 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 15:12:22 +00:00
bMancone 23a24b58e2 // Removed occurences of setStock / getStock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 15:03:15 +00:00
lLefevre 154c7a9ed9 // Fixed bug tab AdminEmployee
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9387 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 12:10:18 +00:00
rMalie 336fb68ef4 // Merge -> revision 9385
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:55:33 +00:00
rMalie a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:46:08 +00:00
lLefevre 50cb82f508 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminGenderController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9364 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 12:59:26 +00:00
lLefevre b58fb34c97 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminQuickAccessesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9355 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:57:52 +00:00
mDeflotte 2ea57df6cb // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9339 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:37:07 +00:00
dSevere 3863401d0b // stock: add main tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9336 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:30:40 +00:00
dSevere bc565999d1 // stock: add warehouse tab and update stock mvt tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9332 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:18:09 +00:00
lLefevre cf8cb50631 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminOrderMessageController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:01:44 +00:00
mDeflotte 205e54c31c // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:58:29 +00:00
jmCollin c4391df038 // fix bug with virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9325 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:44:33 +00:00
bMancone cc24b5abc0 // Stock : removed references to the actual stock management in AdminOrders/Product in order to merge with the new stock management system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9322 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:32:06 +00:00
mDeflotte da6641ca10 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9321 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:27:41 +00:00
rMalie 543c42430c [*] Smarty: move tools/smarty/compile/ and tools/smarty/cache/ folders to cache/smarty/compile/ and cache/smarty/cache/ folders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9300 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 08:14:03 +00:00
rMalie 798de9aaea // Merge -> revision 9288
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 16:04:28 +00:00
vChabot c4e28b117d [*] BO : Carriers are now sortable by position or price
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9276 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 14:31:36 +00:00
vChabot 8e659eb701 [*] BO : carriers are now sortable by position
// Carriers class is now normalized
// Attribute class is now normalized

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9254 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 16:29:34 +00:00
rMalie 7db309c819 [+] Classes: Add Xcache support
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9242 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 14:28:21 +00:00
rMalie de69396a04 // Merge -> revision 9221
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 12:45:12 +00:00
rMalie 48d8dc379f [+] Classes: add support of APC cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9217 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 10:04:55 +00:00
rMalie 4d91a31031 // Add exceptions in db classes + normalize some files + split defines.inc file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9216 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 10:04:23 +00:00
fBrignoli 0bac60447e [*] BO : AdminTaxRulesGroup country select size
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9213 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 09:55:05 +00:00
lLefevre a8a11c0ece [*] BO : Rights verification for multi-shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9198 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 16:10:57 +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
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
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
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
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