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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
da0ae2d9cb
//added AdminSearchEnginesController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9083 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 08:26:24 +00:00
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
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
3133e7ab27
//added AdminStatesController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9054 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:42:52 +00:00
06713441d5
//Added AdminAliasesController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9047 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:34:10 +00:00
899c461853
// Added AdminGroupShopController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9042 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:18:44 +00:00
7dba311ab1
// fix bug with combination
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:51:28 +00:00
1bb02e3abf
[+] Classes : Helper::renderAdminCategorieTree() have new params "$use_search" to add a input search
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9026 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:42:56 +00:00
35280d155d
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9013 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 12:42:20 +00:00
e12b202e85
// Added AdminShopUrlController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8994 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 16:44:23 +00:00
ae5fc92bf7
// Merge -> revision 8984
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:48:07 +00:00
fffe36a72b
//fixed small bug
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8985 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:40:40 +00:00
ef17d0b7da
// Merge -> revision 8952
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:14:01 +00:00
8fcc94e777
[*] Registration type is now in 2 steps or all in one
...
// refactoring AuthController.php (front)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8941 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 15:48:20 +00:00
3b827893b1
[*] Add reference for carriers
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8933 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 14:59:07 +00:00
2fbc132933
[+] Classes : added new class Media => It contains all the method related to media like CSS, JS
...
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8926 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:01:10 +00:00
3620f0837f
// Merge -> 8910
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 08:17:25 +00:00
3e9e437ac1
[+] FO : add files for combination
...
[*] FO : Create virtual products with no associated file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8901 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:40:44 +00:00
940d412a0c
// fix links in main menu,
...
// + moved tab AdminTracking.php to AdminTrackingController.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8894 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:13:34 +00:00
b5a03180f5
// AdminCustomer : "</from>" have nothing to do in the translation function l();
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8882 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 14:33:59 +00:00
42c5603cc3
[+] Classes: Add ObjectModel::hydrateCollection() in order to transform arrays from sql queries return in list of objects
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 13:23:54 +00:00
94e015fb29
// Delete old AdminAddresses
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8860 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:50:58 +00:00
be8d2136be
// Merge -> revision 8851
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:03:30 +00:00
dSevere