// improve multishop code with id_shop = 0 when share_customer or share_order is true

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11169 b9a71923-0436-4b27-9f14-aed3839534dd

cache/class_index.php

@@ -2,7 +2,7 @@
   'AbstractLoggerCore' => 'classes/AbstractLogger.php',
   'AbstractLogger' => 'override/classes/AbstractLogger.php',
   'AccountingCore' => 'classes/Accounting.php',
-  'Accounting' => '',
+  'Accounting' => 'override/classes/Accounting.php',
   'AddressCore' => 'classes/Address.php',
   'Address' => 'override/classes/Address.php',
   'AddressFormatCore' => 'classes/AddressFormat.php',
@@ -28,6 +28,8 @@
   'CMS' => 'override/classes/CMS.php',
   'CMSCategoryCore' => 'classes/CMSCategory.php',
   'CMSCategory' => 'override/classes/CMSCategory.php',
+  'CSVCore' => 'classes/CSV.php',
+  'CSV' => 'override/classes/CSV.php',
   'CarrierCore' => 'classes/Carrier.php',
   'Carrier' => 'override/classes/Carrier.php',
   'CarrierModuleCore' => 'classes/CarrierModule.php',
@@ -35,13 +37,13 @@
   'CartCore' => 'classes/Cart.php',
   'Cart' => 'override/classes/Cart.php',
   'CartRuleCore' => 'classes/CartRule.php',
-  'CartRule' => '',
+  'CartRule' => 'override/classes/CartRule.php',
   'CategoryCore' => 'classes/Category.php',
   'Category' => 'override/classes/Category.php',
   'ChartCore' => 'classes/Chart.php',
   'Chart' => 'override/classes/Chart.php',
   'CollectionCore' => 'classes/Collection.php',
-  'Collection' => '',
+  'Collection' => 'override/classes/Collection.php',
   'CombinationCore' => 'classes/Combination.php',
   'Combination' => 'override/classes/Combination.php',
   'CompareProductCore' => 'classes/CompareProduct.php',
@@ -108,16 +110,6 @@
   'Guest' => 'override/classes/Guest.php',
   'HelpAccessCore' => 'classes/HelpAccess.php',
   'HelpAccess' => 'override/classes/HelpAccess.php',
-  'HelperCore' => 'classes/Helper.php',
-  'Helper' => 'override/classes/Helper.php',
-  'HelperFormCore' => 'classes/HelperForm.php',
-  'HelperForm' => '',
-  'HelperListCore' => 'classes/HelperList.php',
-  'HelperList' => '',
-  'HelperOptionsCore' => 'classes/HelperOptions.php',
-  'HelperOptions' => '',
-  'HelperViewCore' => 'classes/HelperView.php',
-  'HelperView' => '',
   'HookCore' => 'classes/Hook.php',
   'Hook' => 'override/classes/Hook.php',
   'ImageCore' => 'classes/Image.php',
@@ -139,7 +131,7 @@
   'ManufacturerCore' => 'classes/Manufacturer.php',
   'Manufacturer' => 'override/classes/Manufacturer.php',
   'MediaCore' => 'classes/Media.php',
-  'Media' => '',
+  'Media' => 'override/classes/Media.php',
   'MessageCore' => 'classes/Message.php',
   'Message' => 'override/classes/Message.php',
   'MetaCore' => 'classes/Meta.php',
@@ -159,7 +151,7 @@
   'ObjectModelCore' => 'classes/ObjectModel.php',
   'ObjectModel' => 'override/classes/ObjectModel.php',
   'PDFCore' => 'classes/pdf/PDF.php',
-  'PDF' => 'override/classes/PDF.php',
+  'PDF' => 'override/classes/pdf/PDF.php',
   'PackCore' => 'classes/Pack.php',
   'Pack' => 'override/classes/Pack.php',
   'PageCore' => 'classes/Page.php',
@@ -175,7 +167,7 @@
   'ProductSaleCore' => 'classes/ProductSale.php',
   'ProductSale' => 'override/classes/ProductSale.php',
   'ProductSupplierCore' => 'classes/ProductSupplier.php',
-  'ProductSupplier' => '',
+  'ProductSupplier' => 'override/classes/ProductSupplier.php',
   'ProfileCore' => 'classes/Profile.php',
   'Profile' => 'override/classes/Profile.php',
   'QuickAccessCore' => 'classes/QuickAccess.php',
@@ -198,6 +190,8 @@
   'SearchEngine' => 'override/classes/SearchEngine.php',
   'SpecificPriceCore' => 'classes/SpecificPrice.php',
   'SpecificPrice' => 'override/classes/SpecificPrice.php',
+  'SpecificPriceRuleCore' => 'classes/SpecificPriceRule.php',
+  'SpecificPriceRule' => '',
   'StateCore' => 'classes/State.php',
   'State' => 'override/classes/State.php',
   'StoreCore' => 'classes/Store.php',
@@ -232,8 +226,6 @@
   'CacheMemcache' => 'override/classes/cache/CacheMemcache.php',
   'CacheXcacheCore' => 'classes/cache/CacheXcache.php',
   'CacheXcache' => 'override/classes/cache/CacheXcache.php',
-  'CSVCore' => 'classes/csv/CSV.php',
-  'CSV' => 'override/classes/CSV.php',
   'DbCore' => 'classes/db/Db.php',
   'Db' => 'override/classes/db/Db.php',
   'DbMySQLiCore' => 'classes/db/DbMySQLi.php',
@@ -252,43 +244,56 @@
   'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php',
   'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php',
   'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php',
+  'HelperCore' => 'classes/helper/Helper.php',
+  'Helper' => 'override/classes/helper/Helper.php',
+  'HelperFormCore' => 'classes/helper/HelperForm.php',
+  'HelperForm' => 'override/classes/helper/HelperForm.php',
+  'HelperListCore' => 'classes/helper/HelperList.php',
+  'HelperList' => 'override/classes/helper/HelperList.php',
+  'HelperOptionsCore' => 'classes/helper/HelperOptions.php',
+  'HelperOptions' => 'override/classes/helper/HelperOptions.php',
+  'HelperViewCore' => 'classes/helper/HelperView.php',
+  'HelperView' => 'override/classes/helper/HelperView.php',
   'OrderCore' => 'classes/order/Order.php',
-  'Order' => 'override/classes/Order.php',
+  'Order' => 'override/classes/order/Order.php',
+  'OrderCarrierCore' => 'classes/order/OrderCarrier.php',
+  'OrderCarrier' => '',
   'OrderCartRuleCore' => 'classes/order/OrderCartRule.php',
-  'OrderCartRule' => '',
+  'OrderCartRule' => 'override/classes/order/OrderCartRule.php',
   'OrderDetailCore' => 'classes/order/OrderDetail.php',
-  'OrderDetail' => 'override/classes/OrderDetail.php',
+  'OrderDetail' => 'override/classes/order/OrderDetail.php',
   'OrderDiscountCore' => 'classes/order/OrderDiscount.php',
-  'OrderDiscount' => 'override/classes/OrderDiscount.php',
+  'OrderDiscount' => 'override/classes/order/OrderDiscount.php',
   'OrderHistoryCore' => 'classes/order/OrderHistory.php',
-  'OrderHistory' => 'override/classes/OrderHistory.php',
+  'OrderHistory' => 'override/classes/order/OrderHistory.php',
   'OrderInvoiceCore' => 'classes/order/OrderInvoice.php',
-  'OrderInvoice' => '',
+  'OrderInvoice' => 'override/classes/order/OrderInvoice.php',
   'OrderMessageCore' => 'classes/order/OrderMessage.php',
-  'OrderMessage' => 'override/classes/OrderMessage.php',
+  'OrderMessage' => 'override/classes/order/OrderMessage.php',
   'OrderPaymentCore' => 'classes/order/OrderPayment.php',
-  'OrderPayment' => '',
+  'OrderPayment' => 'override/classes/order/OrderPayment.php',
   'OrderReturnCore' => 'classes/order/OrderReturn.php',
-  'OrderReturn' => 'override/classes/OrderReturn.php',
+  'OrderReturn' => 'override/classes/order/OrderReturn.php',
   'OrderReturnStateCore' => 'classes/order/OrderReturnState.php',
-  'OrderReturnState' => 'override/classes/OrderReturnState.php',
+  'OrderReturnState' => 'override/classes/order/OrderReturnState.php',
   'OrderSlipCore' => 'classes/order/OrderSlip.php',
-  'OrderSlip' => 'override/classes/OrderSlip.php',
+  'OrderSlip' => 'override/classes/order/OrderSlip.php',
   'OrderStateCore' => 'classes/order/OrderState.php',
-  'OrderState' => 'override/classes/OrderState.php',
+  'OrderState' => 'override/classes/order/OrderState.php',
   'HTMLTemplateCore' => 'classes/pdf/HTMLTemplate.php',
-  'HTMLTemplate' => '',
+  'HTMLTemplate' => 'override/classes/pdf/HTMLTemplate.php',
   'HTMLTemplateDeliverySlipCore' => 'classes/pdf/HTMLTemplateDeliverySlip.php',
-  'HTMLTemplateDeliverySlip' => '',
+  'HTMLTemplateDeliverySlip' => 'override/classes/pdf/HTMLTemplateDeliverySlip.php',
   'HTMLTemplateInvoiceCore' => 'classes/pdf/HTMLTemplateInvoice.php',
-  'HTMLTemplateInvoice' => '',
+  'HTMLTemplateInvoice' => 'override/classes/pdf/HTMLTemplateInvoice.php',
   'HTMLTemplateOrderReturnCore' => 'classes/pdf/HTMLTemplateOrderReturn.php',
-  'HTMLTemplateOrderReturn' => '',
+  'HTMLTemplateOrderReturn' => 'override/classes/pdf/HTMLTemplateOrderReturn.php',
   'HTMLTemplateOrderSlipCore' => 'classes/pdf/HTMLTemplateOrderSlip.php',
-  'HTMLTemplateOrderSlip' => '',
+  'HTMLTemplateOrderSlip' => 'override/classes/pdf/HTMLTemplateOrderSlip.php',
-  'HTMLTemplateSupplyOrderForm' => 'classes/pdf/HTMLTemplateSupplyOrderForm.php',
+  'HTMLTemplateSupplyOrderFormCore' => 'classes/pdf/HTMLTemplateSupplyOrderForm.php',
+  'HTMLTemplateSupplyOrderForm' => 'override/classes/pdf/HTMLTemplateSupplyOrderForm.php',
   'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php',
-  'PDFGenerator' => '',
+  'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php',
   'GroupShopCore' => 'classes/shop/GroupShop.php',
   'GroupShop' => 'override/classes/shop/GroupShop.php',
   'ShopCore' => 'classes/shop/Shop.php',
@@ -296,33 +301,34 @@
   'ShopUrlCore' => 'classes/shop/ShopUrl.php',
   'ShopUrl' => 'override/classes/shop/ShopUrl.php',
   'StockCore' => 'classes/stock/Stock.php',
-  'Stock' => 'override/classes/Stock.php',
+  'Stock' => 'override/classes/stock/Stock.php',
   'StockAvailableCore' => 'classes/stock/StockAvailable.php',
-  'StockAvailable' => '',
+  'StockAvailable' => 'override/classes/stock/StockAvailable.php',
   'StockManagerCore' => 'classes/stock/StockManager.php',
-  'StockManager' => '',
+  'StockManager' => 'override/classes/stock/StockManager.php',
   'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php',
-  'StockManagerFactory' => '',
+  'StockManagerFactory' => 'override/classes/stock/StockManagerFactory.php',
   'StockManagerInterface' => 'classes/stock/StockManagerInterface.php',
-  'StockManagerModule' => 'classes/stock/StockManagerModule.php',
+  'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php',
+  'StockManagerModule' => 'override/classes/stock/StockManagerModule.php',
   'StockMvtCore' => 'classes/stock/StockMvt.php',
-  'StockMvt' => 'override/classes/StockMvt.php',
+  'StockMvt' => 'override/classes/stock/StockMvt.php',
   'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php',
-  'StockMvtReason' => 'override/classes/StockMvtReason.php',
+  'StockMvtReason' => 'override/classes/stock/StockMvtReason.php',
   'SupplyOrderCore' => 'classes/stock/SupplyOrder.php',
-  'SupplyOrder' => '',
+  'SupplyOrder' => 'override/classes/stock/SupplyOrder.php',
   'SupplyOrderDetailCore' => 'classes/stock/SupplyOrderDetail.php',
-  'SupplyOrderDetail' => '',
+  'SupplyOrderDetail' => 'override/classes/stock/SupplyOrderDetail.php',
   'SupplyOrderHistoryCore' => 'classes/stock/SupplyOrderHistory.php',
-  'SupplyOrderHistory' => '',
+  'SupplyOrderHistory' => 'override/classes/stock/SupplyOrderHistory.php',
   'SupplyOrderReceiptHistoryCore' => 'classes/stock/SupplyOrderReceiptHistory.php',
-  'SupplyOrderReceiptHistory' => '',
+  'SupplyOrderReceiptHistory' => 'override/classes/stock/SupplyOrderReceiptHistory.php',
   'SupplyOrderStateCore' => 'classes/stock/SupplyOrderState.php',
-  'SupplyOrderState' => '',
+  'SupplyOrderState' => 'override/classes/stock/SupplyOrderState.php',
   'WarehouseCore' => 'classes/stock/Warehouse.php',
-  'Warehouse' => '',
+  'Warehouse' => 'override/classes/stock/Warehouse.php',
   'WarehouseProductLocationCore' => 'classes/stock/WarehouseProductLocation.php',
-  'WarehouseProductLocation' => '',
+  'WarehouseProductLocation' => 'override/classes/stock/WarehouseProductLocation.php',
   'TaxCore' => 'classes/tax/Tax.php',
   'Tax' => 'override/classes/tax/Tax.php',
   'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php',
@@ -355,187 +361,199 @@
   'WebserviceSpecificManagementSearchCore' => 'classes/webservice/WebserviceSpecificManagementSearch.php',
   'WebserviceSpecificManagementSearch' => 'override/classes/webservice/WebserviceSpecificManagementSearch.php',
   'FB' => 'override/classes/fb.php',
-  'AdminAccessController' => 'controllers/admin/AdminAccessController.php',
+  'AdminAccessControllerCore' => 'controllers/admin/AdminAccessController.php',
+  'AdminAccessController' => 'override/controllers/admin/AdminAccessController.php',
   'AdminAccountingExportControllerCore' => 'controllers/admin/AdminAccountingExportController.php',
-  'AdminAccountingExportController' => '',
+  'AdminAccountingExportController' => 'override/controllers/admin/AdminAccountingExportController.php',
   'AdminAccountingManagementControllerCore' => 'controllers/admin/AdminAccountingManagementController.php',
-  'AdminAccountingManagementController' => '',
+  'AdminAccountingManagementController' => 'override/controllers/admin/AdminAccountingManagementController.php',
   'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php',
-  'AdminAddonsCatalogController' => '',
+  'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php',
   'AdminAddonsMyAccountControllerCore' => 'controllers/admin/AdminAddonsMyAccountController.php',
-  'AdminAddonsMyAccountController' => '',
+  'AdminAddonsMyAccountController' => 'override/controllers/admin/AdminAddonsMyAccountController.php',
   'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php',
-  'AdminAddressesController' => '',
+  'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php',
   'AdminAliasesControllerCore' => 'controllers/admin/AdminAliasesController.php',
-  'AdminAliasesController' => '',
+  'AdminAliasesController' => 'override/controllers/admin/AdminAliasesController.php',
   'AdminAttachmentsControllerCore' => 'controllers/admin/AdminAttachmentsController.php',
-  'AdminAttachmentsController' => '',
+  'AdminAttachmentsController' => 'override/controllers/admin/AdminAttachmentsController.php',
   'AdminAttributeGeneratorControllerCore' => 'controllers/admin/AdminAttributeGeneratorController.php',
-  'AdminAttributeGeneratorController' => '',
+  'AdminAttributeGeneratorController' => 'override/controllers/admin/AdminAttributeGeneratorController.php',
   'AdminAttributesGroupsControllerCore' => 'controllers/admin/AdminAttributesGroupsController.php',
-  'AdminAttributesGroupsController' => '',
+  'AdminAttributesGroupsController' => 'override/controllers/admin/AdminAttributesGroupsController.php',
   'AdminBackupControllerCore' => 'controllers/admin/AdminBackupController.php',
-  'AdminBackupController' => '',
+  'AdminBackupController' => 'override/controllers/admin/AdminBackupController.php',
   'AdminCarriersControllerCore' => 'controllers/admin/AdminCarriersController.php',
-  'AdminCarriersController' => '',
+  'AdminCarriersController' => 'override/controllers/admin/AdminCarriersController.php',
   'AdminCartRulesControllerCore' => 'controllers/admin/AdminCartRulesController.php',
-  'AdminCartRulesController' => '',
+  'AdminCartRulesController' => 'override/controllers/admin/AdminCartRulesController.php',
-  'AdminCartsController' => 'controllers/admin/AdminCartsController.php',
+  'AdminCartsControllerCore' => 'controllers/admin/AdminCartsController.php',
-  'AdminCatalogController' => 'controllers/admin/AdminCatalogController.php',
+  'AdminCartsController' => 'override/controllers/admin/AdminCartsController.php',
+  'AdminCatalogControllerCore' => 'controllers/admin/AdminCatalogController.php',
+  'AdminCatalogController' => 'override/controllers/admin/AdminCatalogController.php',
   'AdminCategoriesControllerCore' => 'controllers/admin/AdminCategoriesController.php',
-  'AdminCategoriesController' => '',
+  'AdminCategoriesController' => 'override/controllers/admin/AdminCategoriesController.php',
   'AdminCmsCategoriesControllerCore' => 'controllers/admin/AdminCmsCategoriesController.php',
-  'AdminCmsCategoriesController' => '',
+  'AdminCmsCategoriesController' => 'override/controllers/admin/AdminCmsCategoriesController.php',
   'AdminCmsContentControllerCore' => 'controllers/admin/AdminCmsContentController.php',
-  'AdminCmsContentController' => '',
+  'AdminCmsContentController' => 'override/controllers/admin/AdminCmsContentController.php',
   'AdminCmsControllerCore' => 'controllers/admin/AdminCmsController.php',
-  'AdminCmsController' => '',
+  'AdminCmsController' => 'override/controllers/admin/AdminCmsController.php',
   'AdminContactControllerCore' => 'controllers/admin/AdminContactController.php',
-  'AdminContactController' => '',
+  'AdminContactController' => 'override/controllers/admin/AdminContactController.php',
   'AdminContactsControllerCore' => 'controllers/admin/AdminContactsController.php',
-  'AdminContactsController' => '',
+  'AdminContactsController' => 'override/controllers/admin/AdminContactsController.php',
   'AdminCountriesControllerCore' => 'controllers/admin/AdminCountriesController.php',
-  'AdminCountriesController' => '',
+  'AdminCountriesController' => 'override/controllers/admin/AdminCountriesController.php',
   'AdminCurrenciesControllerCore' => 'controllers/admin/AdminCurrenciesController.php',
-  'AdminCurrenciesController' => '',
+  'AdminCurrenciesController' => 'override/controllers/admin/AdminCurrenciesController.php',
   'AdminCustomerThreadsControllerCore' => 'controllers/admin/AdminCustomerThreadsController.php',
-  'AdminCustomerThreadsController' => '',
+  'AdminCustomerThreadsController' => 'override/controllers/admin/AdminCustomerThreadsController.php',
   'AdminCustomersControllerCore' => 'controllers/admin/AdminCustomersController.php',
-  'AdminCustomersController' => '',
+  'AdminCustomersController' => 'override/controllers/admin/AdminCustomersController.php',
   'AdminDbControllerCore' => 'controllers/admin/AdminDbController.php',
-  'AdminDbController' => '',
+  'AdminDbController' => 'override/controllers/admin/AdminDbController.php',
   'AdminDeliverySlipControllerCore' => 'controllers/admin/AdminDeliverySlipController.php',
-  'AdminDeliverySlipController' => '',
+  'AdminDeliverySlipController' => 'override/controllers/admin/AdminDeliverySlipController.php',
   'AdminEmailsControllerCore' => 'controllers/admin/AdminEmailsController.php',
-  'AdminEmailsController' => '',
+  'AdminEmailsController' => 'override/controllers/admin/AdminEmailsController.php',
   'AdminEmployeesControllerCore' => 'controllers/admin/AdminEmployeesController.php',
-  'AdminEmployeesController' => '',
+  'AdminEmployeesController' => 'override/controllers/admin/AdminEmployeesController.php',
   'AdminFeaturesControllerCore' => 'controllers/admin/AdminFeaturesController.php',
-  'AdminFeaturesController' => '',
+  'AdminFeaturesController' => 'override/controllers/admin/AdminFeaturesController.php',
-  'AdminGendersController' => 'controllers/admin/AdminGendersController.php',
+  'AdminGendersControllerCore' => 'controllers/admin/AdminGendersController.php',
+  'AdminGendersController' => 'override/controllers/admin/AdminGendersController.php',
   'AdminGeneratorControllerCore' => 'controllers/admin/AdminGeneratorController.php',
-  'AdminGeneratorController' => '',
+  'AdminGeneratorController' => 'override/controllers/admin/AdminGeneratorController.php',
   'AdminGeolocationControllerCore' => 'controllers/admin/AdminGeolocationController.php',
-  'AdminGeolocationController' => '',
+  'AdminGeolocationController' => 'override/controllers/admin/AdminGeolocationController.php',
   'AdminGroupShopControllerCore' => 'controllers/admin/AdminGroupShopController.php',
-  'AdminGroupShopController' => '',
+  'AdminGroupShopController' => 'override/controllers/admin/AdminGroupShopController.php',
-  'AdminGroupsController' => 'controllers/admin/AdminGroupsController.php',
+  'AdminGroupsControllerCore' => 'controllers/admin/AdminGroupsController.php',
+  'AdminGroupsController' => 'override/controllers/admin/AdminGroupsController.php',
   'AdminHomeControllerCore' => 'controllers/admin/AdminHomeController.php',
   'AdminHomeController' => 'override/controllers/admin/AdminHomeController.php',
-  'AdminImagesController' => 'controllers/admin/AdminImagesController.php',
+  'AdminImagesControllerCore' => 'controllers/admin/AdminImagesController.php',
-  'AdminImportController' => 'controllers/admin/AdminImportController.php',
+  'AdminImagesController' => 'override/controllers/admin/AdminImagesController.php',
+  'AdminImportControllerCore' => 'controllers/admin/AdminImportController.php',
+  'AdminImportController' => 'override/controllers/admin/AdminImportController.php',
   'AdminInformationControllerCore' => 'controllers/admin/AdminInformationController.php',
-  'AdminInformationController' => '',
+  'AdminInformationController' => 'override/controllers/admin/AdminInformationController.php',
   'AdminInvoicesControllerCore' => 'controllers/admin/AdminInvoicesController.php',
-  'AdminInvoicesController' => '',
+  'AdminInvoicesController' => 'override/controllers/admin/AdminInvoicesController.php',
   'AdminLanguagesControllerCore' => 'controllers/admin/AdminLanguagesController.php',
-  'AdminLanguagesController' => '',
+  'AdminLanguagesController' => 'override/controllers/admin/AdminLanguagesController.php',
   'AdminLocalizationControllerCore' => 'controllers/admin/AdminLocalizationController.php',
-  'AdminLocalizationController' => '',
+  'AdminLocalizationController' => 'override/controllers/admin/AdminLocalizationController.php',
-  'AdminLoginController' => 'controllers/admin/AdminLoginController.php',
+  'AdminLoginControllerCore' => 'controllers/admin/AdminLoginController.php',
+  'AdminLoginController' => 'override/controllers/admin/AdminLoginController.php',
   'AdminLogsControllerCore' => 'controllers/admin/AdminLogsController.php',
-  'AdminLogsController' => '',
+  'AdminLogsController' => 'override/controllers/admin/AdminLogsController.php',
   'AdminManufacturersControllerCore' => 'controllers/admin/AdminManufacturersController.php',
-  'AdminManufacturersController' => '',
+  'AdminManufacturersController' => 'override/controllers/admin/AdminManufacturersController.php',
   'AdminMetaControllerCore' => 'controllers/admin/AdminMetaController.php',
-  'AdminMetaController' => '',
+  'AdminMetaController' => 'override/controllers/admin/AdminMetaController.php',
   'AdminModulesControllerCore' => 'controllers/admin/AdminModulesController.php',
-  'AdminModulesController' => '',
+  'AdminModulesController' => 'override/controllers/admin/AdminModulesController.php',
   'AdminModulesPositionsControllerCore' => 'controllers/admin/AdminModulesPositionsController.php',
-  'AdminModulesPositionsController' => '',
+  'AdminModulesPositionsController' => 'override/controllers/admin/AdminModulesPositionsController.php',
   'AdminNotFoundControllerCore' => 'controllers/admin/AdminNotFoundController.php',
-  'AdminNotFoundController' => '',
+  'AdminNotFoundController' => 'override/controllers/admin/AdminNotFoundController.php',
-  'AdminOrderMessageController' => 'controllers/admin/AdminOrderMessageController.php',
+  'AdminOrderMessageControllerCore' => 'controllers/admin/AdminOrderMessageController.php',
+  'AdminOrderMessageController' => 'override/controllers/admin/AdminOrderMessageController.php',
   'AdminOrdersControllerCore' => 'controllers/admin/AdminOrdersController.php',
-  'AdminOrdersController' => '',
+  'AdminOrdersController' => 'override/controllers/admin/AdminOrdersController.php',
   'AdminPPreferencesControllerCore' => 'controllers/admin/AdminPPreferencesController.php',
-  'AdminPPreferencesController' => '',
+  'AdminPPreferencesController' => 'override/controllers/admin/AdminPPreferencesController.php',
   'AdminPaymentControllerCore' => 'controllers/admin/AdminPaymentController.php',
-  'AdminPaymentController' => '',
+  'AdminPaymentController' => 'override/controllers/admin/AdminPaymentController.php',
   'AdminPdfControllerCore' => 'controllers/admin/AdminPdfController.php',
-  'AdminPdfController' => '',
+  'AdminPdfController' => 'override/controllers/admin/AdminPdfController.php',
-  'AdminPerformanceController' => 'controllers/admin/AdminPerformanceController.php',
+  'AdminPerformanceControllerCore' => 'controllers/admin/AdminPerformanceController.php',
+  'AdminPerformanceController' => 'override/controllers/admin/AdminPerformanceController.php',
   'AdminPreferencesControllerCore' => 'controllers/admin/AdminPreferencesController.php',
-  'AdminPreferencesController' => '',
+  'AdminPreferencesController' => 'override/controllers/admin/AdminPreferencesController.php',
   'AdminProductsControllerCore' => 'controllers/admin/AdminProductsController.php',
-  'AdminProductsController' => '',
+  'AdminProductsController' => 'override/controllers/admin/AdminProductsController.php',
   'AdminProfilesControllerCore' => 'controllers/admin/AdminProfilesController.php',
-  'AdminProfilesController' => '',
+  'AdminProfilesController' => 'override/controllers/admin/AdminProfilesController.php',
-  'AdminQuickAccessesController' => 'controllers/admin/AdminQuickAccessesController.php',
+  'AdminQuickAccessesControllerCore' => 'controllers/admin/AdminQuickAccessesController.php',
+  'AdminQuickAccessesController' => 'override/controllers/admin/AdminQuickAccessesController.php',
   'AdminRangePriceControllerCore' => 'controllers/admin/AdminRangePriceController.php',
-  'AdminRangePriceController' => '',
+  'AdminRangePriceController' => 'override/controllers/admin/AdminRangePriceController.php',
   'AdminRangeWeightControllerCore' => 'controllers/admin/AdminRangeWeightController.php',
-  'AdminRangeWeightController' => '',
+  'AdminRangeWeightController' => 'override/controllers/admin/AdminRangeWeightController.php',
   'AdminReferrersControllerCore' => 'controllers/admin/AdminReferrersController.php',
-  'AdminReferrersController' => '',
+  'AdminReferrersController' => 'override/controllers/admin/AdminReferrersController.php',
   'AdminRequestSqlControllerCore' => 'controllers/admin/AdminRequestSqlController.php',
-  'AdminRequestSqlController' => '',
+  'AdminRequestSqlController' => 'override/controllers/admin/AdminRequestSqlController.php',
   'AdminReturnControllerCore' => 'controllers/admin/AdminReturnController.php',
-  'AdminReturnController' => '',
+  'AdminReturnController' => 'override/controllers/admin/AdminReturnController.php',
   'AdminScenesControllerCore' => 'controllers/admin/AdminScenesController.php',
-  'AdminScenesController' => '',
+  'AdminScenesController' => 'override/controllers/admin/AdminScenesController.php',
   'AdminSearchConfControllerCore' => 'controllers/admin/AdminSearchConfController.php',
-  'AdminSearchConfController' => '',
+  'AdminSearchConfController' => 'override/controllers/admin/AdminSearchConfController.php',
   'AdminSearchControllerCore' => 'controllers/admin/AdminSearchController.php',
-  'AdminSearchController' => '',
+  'AdminSearchController' => 'override/controllers/admin/AdminSearchController.php',
   'AdminSearchEnginesControllerCore' => 'controllers/admin/AdminSearchEnginesController.php',
-  'AdminSearchEnginesController' => '',
+  'AdminSearchEnginesController' => 'override/controllers/admin/AdminSearchEnginesController.php',
   'AdminShippingControllerCore' => 'controllers/admin/AdminShippingController.php',
-  'AdminShippingController' => '',
+  'AdminShippingController' => 'override/controllers/admin/AdminShippingController.php',
   'AdminShopControllerCore' => 'controllers/admin/AdminShopController.php',
-  'AdminShopController' => '',
+  'AdminShopController' => 'override/controllers/admin/AdminShopController.php',
   'AdminShopUrlControllerCore' => 'controllers/admin/AdminShopUrlController.php',
-  'AdminShopUrlController' => '',
+  'AdminShopUrlController' => 'override/controllers/admin/AdminShopUrlController.php',
   'AdminSlipControllerCore' => 'controllers/admin/AdminSlipController.php',
-  'AdminSlipController' => '',
+  'AdminSlipController' => 'override/controllers/admin/AdminSlipController.php',
+  'AdminSpecificPriceRuleController' => 'controllers/admin/AdminSpecificPriceRuleController.php',
   'AdminStatesControllerCore' => 'controllers/admin/AdminStatesController.php',
-  'AdminStatesController' => '',
+  'AdminStatesController' => 'override/controllers/admin/AdminStatesController.php',
-  'AdminStatsConfControllerCore' => 'controllers/admin/AdminStatsConfController.php',
-  'AdminStatsConfController' => '',
   'AdminStatsControllerCore' => 'controllers/admin/AdminStatsController.php',
-  'AdminStatsController' => '',
+  'AdminStatsController' => 'override/controllers/admin/AdminStatsController.php',
   'AdminStatsTabControllerCore' => 'controllers/admin/AdminStatsTabController.php',
-  'AdminStatsTabController' => '',
+  'AdminStatsTabController' => 'override/controllers/admin/AdminStatsTabController.php',
   'AdminStatusesControllerCore' => 'controllers/admin/AdminStatusesController.php',
-  'AdminStatusesController' => '',
+  'AdminStatusesController' => 'override/controllers/admin/AdminStatusesController.php',
-  'AdminStockConfigurationController' => 'controllers/admin/AdminStockConfigurationController.php',
+  'AdminStockConfigurationControllerCore' => 'controllers/admin/AdminStockConfigurationController.php',
+  'AdminStockConfigurationController' => 'override/controllers/admin/AdminStockConfigurationController.php',
   'AdminStockCoverControllerCore' => 'controllers/admin/AdminStockCoverController.php',
-  'AdminStockCoverController' => '',
+  'AdminStockCoverController' => 'override/controllers/admin/AdminStockCoverController.php',
   'AdminStockInstantStateControllerCore' => 'controllers/admin/AdminStockInstantStateController.php',
-  'AdminStockInstantStateController' => '',
+  'AdminStockInstantStateController' => 'override/controllers/admin/AdminStockInstantStateController.php',
   'AdminStockManagementControllerCore' => 'controllers/admin/AdminStockManagementController.php',
-  'AdminStockManagementController' => '',
+  'AdminStockManagementController' => 'override/controllers/admin/AdminStockManagementController.php',
   'AdminStockMvtControllerCore' => 'controllers/admin/AdminStockMvtController.php',
-  'AdminStockMvtController' => '',
+  'AdminStockMvtController' => 'override/controllers/admin/AdminStockMvtController.php',
   'AdminStoresControllerCore' => 'controllers/admin/AdminStoresController.php',
-  'AdminStoresController' => '',
+  'AdminStoresController' => 'override/controllers/admin/AdminStoresController.php',
   'AdminSubDomainsControllerCore' => 'controllers/admin/AdminSubDomainsController.php',
-  'AdminSubDomainsController' => '',
+  'AdminSubDomainsController' => 'override/controllers/admin/AdminSubDomainsController.php',
   'AdminSuppliersControllerCore' => 'controllers/admin/AdminSuppliersController.php',
-  'AdminSuppliersController' => '',
+  'AdminSuppliersController' => 'override/controllers/admin/AdminSuppliersController.php',
   'AdminSupplyOrdersControllerCore' => 'controllers/admin/AdminSupplyOrdersController.php',
-  'AdminSupplyOrdersController' => '',
+  'AdminSupplyOrdersController' => 'override/controllers/admin/AdminSupplyOrdersController.php',
   'AdminTabsControllerCore' => 'controllers/admin/AdminTabsController.php',
-  'AdminTabsController' => '',
+  'AdminTabsController' => 'override/controllers/admin/AdminTabsController.php',
   'AdminTagsControllerCore' => 'controllers/admin/AdminTagsController.php',
-  'AdminTagsController' => '',
+  'AdminTagsController' => 'override/controllers/admin/AdminTagsController.php',
   'AdminTaxRulesGroupControllerCore' => 'controllers/admin/AdminTaxRulesGroupController.php',
-  'AdminTaxRulesGroupController' => '',
+  'AdminTaxRulesGroupController' => 'override/controllers/admin/AdminTaxRulesGroupController.php',
   'AdminTaxesControllerCore' => 'controllers/admin/AdminTaxesController.php',
-  'AdminTaxesController' => '',
+  'AdminTaxesController' => 'override/controllers/admin/AdminTaxesController.php',
   'AdminThemesControllerCore' => 'controllers/admin/AdminThemesController.php',
-  'AdminThemesController' => '',
+  'AdminThemesController' => 'override/controllers/admin/AdminThemesController.php',
   'AdminToolsControllerCore' => 'controllers/admin/AdminToolsController.php',
   'AdminToolsController' => 'override/controllers/admin/AdminToolsController.php',
-  'AdminTrackingController' => 'controllers/admin/AdminTrackingController.php',
+  'AdminTrackingControllerCore' => 'controllers/admin/AdminTrackingController.php',
+  'AdminTrackingController' => 'override/controllers/admin/AdminTrackingController.php',
   'AdminTranslationsControllerCore' => 'controllers/admin/AdminTranslationsController.php',
-  'AdminTranslationsController' => '',
+  'AdminTranslationsController' => 'override/controllers/admin/AdminTranslationsController.php',
   'AdminWarehousesControllerCore' => 'controllers/admin/AdminWarehousesController.php',
-  'AdminWarehousesController' => '',
+  'AdminWarehousesController' => 'override/controllers/admin/AdminWarehousesController.php',
   'AdminWebserviceControllerCore' => 'controllers/admin/AdminWebserviceController.php',
-  'AdminWebserviceController' => '',
+  'AdminWebserviceController' => 'override/controllers/admin/AdminWebserviceController.php',
   'AdminZonesControllerCore' => 'controllers/admin/AdminZonesController.php',
-  'AdminZonesController' => '',
+  'AdminZonesController' => 'override/controllers/admin/AdminZonesController.php',
   'AddressControllerCore' => 'controllers/front/AddressController.php',
   'AddressController' => 'override/controllers/front/AddressController.php',
   'AddressesControllerCore' => 'controllers/front/AddressesController.php',
@@ -618,4 +636,5 @@
   'StoresController' => 'override/controllers/front/StoresController.php',
   'SupplierControllerCore' => 'controllers/front/SupplierController.php',
   'SupplierController' => 'override/controllers/front/SupplierController.php',
+  'AdminStatsConfController' => 'override/controllers/admin/AdminStatsConfController.php',
 );

classes/Cart.php

@@ -171,7 +171,8 @@ class CartCore extends ObjectModel
 	{
 		if (!$this->id_lang)
 			$this->id_lang = Configuration::get('PS_LANG_DEFAULT');
-
+		if (Context::getContext()->shop->getGroup()->share_order == true)
+			$this->id_shop = null;
 		$return = parent::add($autodate);
 		Hook::exec('cart');
 
@@ -185,7 +186,8 @@ class CartCore extends ObjectModel
 
 		if (isset(self::$_totalWeight[$this->id]))
 			unset(self::$_totalWeight[$this->id]);
-
+		if (Context::getContext()->shop->getGroup()->share_order == true)
+			$this->id_shop = null;
 		$this->_products = null;
 		$return = parent::update();
 		Hook::exec('cart');

classes/Customer.php

@@ -187,7 +187,10 @@ class CustomerCore extends ObjectModel
 
 	public function add($autodate = true, $null_values = true)
 	{
-		$this->id_shop = ($this->id_shop) ? $this->id_shop : Context::getContext()->shop->getID();
+		if (Context::getContext()->shop->getGroup()->share_customer == true)
+			$this->id_shop = null;
+		else
+			$this->id_shop = ($this->id_shop) ? $this->id_shop : Context::getContext()->shop->getID();
 		$this->id_group_shop = ($this->id_group_shop) ? $this->id_group_shop : Context::getContext()->shop->getGroupID();
 		$this->birthday = (empty($this->years) ? $this->birthday : (int)$this->years.'-'.(int)$this->months.'-'.(int)$this->days);
 		$this->secure_key = md5(uniqid(rand(), true));

classes/order/Order.php

@@ -298,6 +298,21 @@ class OrderCore extends ObjectModel
 			$this->_taxCalculationMethod = Group::getDefaultPriceDisplayMethod();
 	}
 
+	public function add($autodate = true, $null_values = false)
+	{
+		if (Context::getContext()->shop->getGroup()->share_order == true)
+			$this->id_shop = null;
+		return parent::add($autodate);
+	}
+
+	public function update($null_values = false)
+	{
+		if (Context::getContext()->shop->getGroup()->share_order == true)
+			$this->id_shop = null;
+		$return = parent::update();
+		return $return;
+	}
+
 	public function getTaxCalculationMethod()
 	{
 		return (int)($this->_taxCalculationMethod);

classes/shop/Shop.php

@@ -758,12 +758,13 @@ class ShopCore extends ObjectModel
 		}
 		else
 		{
-			if ($shop_id || $shop_group_id)
+			if ($shop_group_id && ($share == Shop::SHARE_CUSTOMER || $share == Shop::SHARE_ORDER))
+				$restriction = ' AND '.$alias.'id_group_shop = '.$shop_group_id.' AND '.$alias.'id_shop = 0';
+			else if ($shop_id || $shop_group_id)
 				$restriction = ' AND '.$alias.'id_shop IN ('.implode(', ', $this->getListOfID($share)).') ';
 			//else if ($share == Shop::SHARE_STOCK)
 			//	$restriction = ' AND '.$alias.'id_shop = '.$this->getID(true);
 		}
-
 		return $restriction;
 	}