dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE product_multistore branch : product fields are now editable per shop

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache/class_index.php
Vendored
+4 -4
View File
@@ -76,8 +76,6 @@
'AdminGendersControllerCore' => 'controllers/admin/AdminGendersController.php',
'AdminGeolocationController' => 'override/controllers/admin/AdminGeolocationController.php',
'AdminGeolocationControllerCore' => 'controllers/admin/AdminGeolocationController.php',
'AdminGroupShopController' => 'override/controllers/admin/AdminGroupShopController.php',
'AdminGroupShopControllerCore' => 'controllers/admin/AdminGroupShopController.php',
'AdminGroupsController' => 'override/controllers/admin/AdminGroupsController.php',
'AdminGroupsControllerCore' => 'controllers/admin/AdminGroupsController.php',
'AdminHomeController' => 'override/controllers/admin/AdminHomeController.php',
@@ -156,6 +154,8 @@
'AdminShippingControllerCore' => 'controllers/admin/AdminShippingController.php',
'AdminShopController' => 'override/controllers/admin/AdminShopController.php',
'AdminShopControllerCore' => 'controllers/admin/AdminShopController.php',
'AdminShopGroupController' => 'override/controllers/admin/AdminShopGroupController.php',
'AdminShopGroupControllerCore' => 'controllers/admin/AdminShopGroupController.php',
'AdminShopUrlController' => 'override/controllers/admin/AdminShopUrlController.php',
'AdminShopUrlControllerCore' => 'controllers/admin/AdminShopUrlController.php',
'AdminSlipController' => 'override/controllers/admin/AdminSlipController.php',
@@ -346,8 +346,6 @@
'GroupCore' => 'classes/Group.php',
'GroupReduction' => 'override/classes/GroupReduction.php',
'GroupReductionCore' => 'classes/GroupReduction.php',
'GroupShop' => 'override/classes/shop/GroupShop.php',
'GroupShopCore' => 'classes/shop/GroupShop.php',
'Guest' => 'override/classes/Guest.php',
'GuestCore' => 'classes/Guest.php',
'GuestTrackingController' => 'override/controllers/front/GuestTrackingController.php',
@@ -548,6 +546,8 @@
'SearchEngineCore' => 'classes/SearchEngine.php',
'Shop' => 'override/classes/shop/Shop.php',
'ShopCore' => 'classes/shop/Shop.php',
'ShopGroup' => 'override/classes/shop/ShopGroup.php',
'ShopGroupCore' => 'classes/shop/ShopGroup.php',
'ShopUrl' => 'override/classes/shop/ShopUrl.php',
'ShopUrlCore' => 'classes/shop/ShopUrl.php',
'SitemapController' => 'override/controllers/front/SitemapController.php',