From 8a44709ef9ac3a7d665f5ab69c299e53882f4444 Mon Sep 17 00:00:00 2001 From: vChabot Date: Tue, 27 Dec 2011 14:30:19 +0000 Subject: [PATCH] // BugFix : TreeView not displayed in Group Reduction form --- cache/class_index.php | 334 ++++++++++---------- classes/helper/Helper.php | 12 +- controllers/admin/AdminGroupsController.php | 2 +- 3 files changed, 176 insertions(+), 172 deletions(-) diff --git a/cache/class_index.php b/cache/class_index.php index 7fefd49a9..d2825c5b0 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -3,10 +3,10 @@ 'AbstractLogger' => 'override/classes/AbstractLogger.php', 'AccountingCore' => 'classes/Accounting.php', 'Accounting' => 'override/classes/Accounting.php', - 'AddressCore' => 'classes/Address.php', - 'Address' => 'override/classes/Address.php', 'AddressFormatCore' => 'classes/AddressFormat.php', 'AddressFormat' => 'override/classes/AddressFormat.php', + 'AddressCore' => 'classes/Address.php', + 'Address' => 'override/classes/Address.php', 'AdminControllerCore' => 'classes/AdminController.php', 'AdminController' => 'override/classes/AdminController.php', 'AdminTabCore' => 'classes/AdminTab.php', @@ -15,25 +15,29 @@ 'Alias' => 'override/classes/Alias.php', 'AttachmentCore' => 'classes/Attachment.php', 'Attachment' => 'override/classes/Attachment.php', - 'AttributeCore' => 'classes/Attribute.php', - 'Attribute' => 'override/classes/Attribute.php', 'AttributeGroupCore' => 'classes/AttributeGroup.php', 'AttributeGroup' => 'override/classes/AttributeGroup.php', + 'AttributeCore' => 'classes/Attribute.php', + 'Attribute' => 'override/classes/Attribute.php', 'Autoload' => 'classes/Autoload.php', 'BackupCore' => 'classes/Backup.php', 'Backup' => 'override/classes/Backup.php', 'BlowfishCore' => 'classes/Blowfish.php', 'Blowfish' => 'override/classes/Blowfish.php', - 'CMSCore' => 'classes/CMS.php', - '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', + 'CacheApcCore' => 'classes/cache/CacheApc.php', + 'CacheApc' => 'override/classes/cache/CacheApc.php', + 'CacheFsCore' => 'classes/cache/CacheFs.php', + 'CacheFs' => 'override/classes/cache/CacheFs.php', + 'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php', + 'CacheMemcache' => 'override/classes/cache/CacheMemcache.php', + 'CacheCore' => 'classes/cache/Cache.php', + 'Cache' => 'override/classes/cache/Cache.php', + 'CacheXcacheCore' => 'classes/cache/CacheXcache.php', + 'CacheXcache' => 'override/classes/cache/CacheXcache.php', 'CarrierModuleCore' => 'classes/CarrierModule.php', 'CarrierModule' => 'override/classes/CarrierModule.php', + 'CarrierCore' => 'classes/Carrier.php', + 'Carrier' => 'override/classes/Carrier.php', 'CartCore' => 'classes/Cart.php', 'Cart' => 'override/classes/Cart.php', 'CartRuleCore' => 'classes/CartRule.php', @@ -42,6 +46,10 @@ 'Category' => 'override/classes/Category.php', 'ChartCore' => 'classes/Chart.php', 'Chart' => 'override/classes/Chart.php', + 'CMSCategoryCore' => 'classes/CMSCategory.php', + 'CMSCategory' => 'override/classes/CMSCategory.php', + 'CMSCore' => 'classes/CMS.php', + 'CMS' => 'override/classes/CMS.php', 'CollectionCore' => 'classes/Collection.php', 'Collection' => 'override/classes/Collection.php', 'CombinationCore' => 'classes/Combination.php', @@ -60,28 +68,40 @@ 'Contact' => 'override/classes/Contact.php', 'ContextCore' => 'classes/Context.php', 'Context' => 'override/classes/Context.php', - 'ControllerCore' => 'classes/Controller.php', - 'Controller' => 'override/classes/Controller.php', 'ControllerFactoryCore' => 'classes/ControllerFactory.php', 'ControllerFactory' => 'override/classes/ControllerFactory.php', + 'ControllerCore' => 'classes/Controller.php', + 'Controller' => 'override/classes/Controller.php', 'CookieCore' => 'classes/Cookie.php', 'Cookie' => 'override/classes/Cookie.php', 'CountryCore' => 'classes/Country.php', 'Country' => 'override/classes/Country.php', 'CountyCore' => 'classes/County.php', 'County' => 'override/classes/County.php', + 'CSVCore' => 'classes/CSV.php', + 'CSV' => 'override/classes/CSV.php', 'CurrencyCore' => 'classes/Currency.php', 'Currency' => 'override/classes/Currency.php', - 'CustomerCore' => 'classes/Customer.php', - 'Customer' => 'override/classes/Customer.php', 'CustomerMessageCore' => 'classes/CustomerMessage.php', 'CustomerMessage' => 'override/classes/CustomerMessage.php', + 'CustomerCore' => 'classes/Customer.php', + 'Customer' => 'override/classes/Customer.php', 'CustomerThreadCore' => 'classes/CustomerThread.php', 'CustomerThread' => 'override/classes/CustomerThread.php', 'CustomizationCore' => 'classes/Customization.php', 'Customization' => 'override/classes/Customization.php', 'DateRangeCore' => 'classes/DateRange.php', 'DateRange' => 'override/classes/DateRange.php', + 'DbMySQLiCore' => 'classes/db/DbMySQLi.php', + 'DbMySQLi' => 'override/classes/db/DbMySQLi.php', + 'DbPDOCore' => 'classes/db/DbPDO.php', + 'DbPDO' => 'override/classes/db/DbPDO.php', + 'DbCore' => 'classes/db/Db.php', + 'Db' => 'override/classes/db/Db.php', + 'DbQueryCore' => 'classes/db/DbQuery.php', + 'DbQuery' => 'override/classes/db/DbQuery.php', + 'MySQLCore' => 'classes/db/MySQL.php', + 'MySQL' => 'override/classes/db/MySQL.php', 'DeliveryCore' => 'classes/Delivery.php', 'Delivery' => 'override/classes/Delivery.php', 'DiscountCore' => 'classes/Discount.php', @@ -90,6 +110,14 @@ 'Dispatcher' => 'override/classes/Dispatcher.php', 'EmployeeCore' => 'classes/Employee.php', 'Employee' => 'override/classes/Employee.php', + 'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php', + 'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php', + 'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php', + 'PrestashopException' => 'override/classes/exception/PrestashopException.php', + 'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php', + 'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php', + 'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php', + 'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php', 'FeatureCore' => 'classes/Feature.php', 'Feature' => 'override/classes/Feature.php', 'FeatureValueCore' => 'classes/FeatureValue.php', @@ -110,6 +138,16 @@ 'Guest' => 'override/classes/Guest.php', 'HelpAccessCore' => 'classes/HelpAccess.php', 'HelpAccess' => 'override/classes/HelpAccess.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', + 'HelperCore' => 'classes/helper/Helper.php', + 'Helper' => 'override/classes/helper/Helper.php', + 'HelperViewCore' => 'classes/helper/HelperView.php', + 'HelperView' => 'override/classes/helper/HelperView.php', 'HookCore' => 'classes/Hook.php', 'Hook' => 'override/classes/Hook.php', 'ImageCore' => 'classes/Image.php', @@ -136,20 +174,46 @@ 'Message' => 'override/classes/Message.php', 'MetaCore' => 'classes/Meta.php', 'Meta' => 'override/classes/Meta.php', - 'ModuleCore' => 'classes/Module.php', - 'Module' => 'override/classes/Module.php', - 'ModuleGraphCore' => 'classes/ModuleGraph.php', - 'ModuleGraph' => 'override/classes/ModuleGraph.php', 'ModuleGraphEngineCore' => 'classes/ModuleGraphEngine.php', 'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php', - 'ModuleGridCore' => 'classes/ModuleGrid.php', - 'ModuleGrid' => 'override/classes/ModuleGrid.php', + 'ModuleGraphCore' => 'classes/ModuleGraph.php', + 'ModuleGraph' => 'override/classes/ModuleGraph.php', 'ModuleGridEngineCore' => 'classes/ModuleGridEngine.php', 'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php', + 'ModuleGridCore' => 'classes/ModuleGrid.php', + 'ModuleGrid' => 'override/classes/ModuleGrid.php', + 'ModuleCore' => 'classes/Module.php', + 'Module' => 'override/classes/Module.php', 'NotificationCore' => 'classes/Notification.php', 'Notification' => 'override/classes/Notification.php', 'ObjectModelCore' => 'classes/ObjectModel.php', 'ObjectModel' => 'override/classes/ObjectModel.php', + 'OrderCarrierCore' => 'classes/order/OrderCarrier.php', + 'OrderCarrier' => '', + 'OrderCartRuleCore' => 'classes/order/OrderCartRule.php', + 'OrderCartRule' => 'override/classes/order/OrderCartRule.php', + 'OrderDetailCore' => 'classes/order/OrderDetail.php', + 'OrderDetail' => 'override/classes/OrderDetail.php', + 'OrderDiscountCore' => 'classes/order/OrderDiscount.php', + 'OrderDiscount' => 'override/classes/OrderDiscount.php', + 'OrderHistoryCore' => 'classes/order/OrderHistory.php', + 'OrderHistory' => 'override/classes/OrderHistory.php', + 'OrderInvoiceCore' => 'classes/order/OrderInvoice.php', + 'OrderInvoice' => 'override/classes/order/OrderInvoice.php', + 'OrderMessageCore' => 'classes/order/OrderMessage.php', + 'OrderMessage' => 'override/classes/OrderMessage.php', + 'OrderPaymentCore' => 'classes/order/OrderPayment.php', + 'OrderPayment' => 'override/classes/order/OrderPayment.php', + 'OrderCore' => 'classes/order/Order.php', + 'Order' => 'override/classes/Order.php', + 'OrderReturnCore' => 'classes/order/OrderReturn.php', + 'OrderReturn' => 'override/classes/OrderReturn.php', + 'OrderReturnStateCore' => 'classes/order/OrderReturnState.php', + 'OrderReturnState' => 'override/classes/OrderReturnState.php', + 'OrderSlipCore' => 'classes/order/OrderSlip.php', + 'OrderSlip' => 'override/classes/OrderSlip.php', + 'OrderStateCore' => 'classes/order/OrderState.php', + 'OrderState' => 'override/classes/OrderState.php', 'PackCore' => 'classes/Pack.php', 'Pack' => 'override/classes/Pack.php', 'PageCore' => 'classes/Page.php', @@ -158,10 +222,26 @@ 'PaymentCC' => 'override/classes/PaymentCC.php', 'PaymentModuleCore' => 'classes/PaymentModule.php', 'PaymentModule' => 'override/classes/PaymentModule.php', - 'ProductCore' => 'classes/Product.php', - 'Product' => 'override/classes/Product.php', + 'HTMLTemplateDeliverySlipCore' => 'classes/pdf/HTMLTemplateDeliverySlip.php', + 'HTMLTemplateDeliverySlip' => 'override/classes/pdf/HTMLTemplateDeliverySlip.php', + 'HTMLTemplateInvoiceCore' => 'classes/pdf/HTMLTemplateInvoice.php', + 'HTMLTemplateInvoice' => 'override/classes/pdf/HTMLTemplateInvoice.php', + 'HTMLTemplateOrderReturnCore' => 'classes/pdf/HTMLTemplateOrderReturn.php', + 'HTMLTemplateOrderReturn' => 'override/classes/pdf/HTMLTemplateOrderReturn.php', + 'HTMLTemplateOrderSlipCore' => 'classes/pdf/HTMLTemplateOrderSlip.php', + 'HTMLTemplateOrderSlip' => 'override/classes/pdf/HTMLTemplateOrderSlip.php', + 'HTMLTemplateCore' => 'classes/pdf/HTMLTemplate.php', + 'HTMLTemplate' => 'override/classes/pdf/HTMLTemplate.php', + 'HTMLTemplateSupplyOrderFormCore' => 'classes/pdf/HTMLTemplateSupplyOrderForm.php', + 'HTMLTemplateSupplyOrderForm' => 'override/classes/pdf/HTMLTemplateSupplyOrderForm.php', + 'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php', + 'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php', + 'PDFCore' => 'classes/pdf/PDF.php', + 'PDF' => 'override/classes/PDF.php', 'ProductDownloadCore' => 'classes/ProductDownload.php', 'ProductDownload' => 'override/classes/ProductDownload.php', + 'ProductCore' => 'classes/Product.php', + 'Product' => 'override/classes/Product.php', 'ProductSaleCore' => 'classes/ProductSale.php', 'ProductSale' => 'override/classes/ProductSale.php', 'ProductSupplierCore' => 'classes/ProductSupplier.php', @@ -184,16 +264,52 @@ 'Risk' => '', 'SceneCore' => 'classes/Scene.php', 'Scene' => 'override/classes/Scene.php', - 'SearchCore' => 'classes/Search.php', - 'Search' => 'override/classes/Search.php', 'SearchEngineCore' => 'classes/SearchEngine.php', 'SearchEngine' => 'override/classes/SearchEngine.php', + 'SearchCore' => 'classes/Search.php', + 'Search' => 'override/classes/Search.php', + 'GroupShopCore' => 'classes/shop/GroupShop.php', + 'GroupShop' => 'override/classes/shop/GroupShop.php', + 'ShopCore' => 'classes/shop/Shop.php', + 'Shop' => 'override/classes/shop/Shop.php', + 'ShopUrlCore' => 'classes/shop/ShopUrl.php', + 'ShopUrl' => 'override/classes/shop/ShopUrl.php', 'SpecificPriceCore' => 'classes/SpecificPrice.php', 'SpecificPrice' => 'override/classes/SpecificPrice.php', 'SpecificPriceRuleCore' => 'classes/SpecificPriceRule.php', 'SpecificPriceRule' => '', 'StateCore' => 'classes/State.php', 'State' => 'override/classes/State.php', + 'StockAvailableCore' => 'classes/stock/StockAvailable.php', + 'StockAvailable' => 'override/classes/stock/StockAvailable.php', + 'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php', + 'StockManagerFactory' => 'override/classes/stock/StockManagerFactory.php', + 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', + 'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php', + 'StockManagerModule' => 'override/classes/stock/StockManagerModule.php', + 'StockManagerCore' => 'classes/stock/StockManager.php', + 'StockManager' => 'override/classes/stock/StockManager.php', + 'StockMvtCore' => 'classes/stock/StockMvt.php', + 'StockMvt' => 'override/classes/StockMvt.php', + 'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php', + 'StockMvtReason' => 'override/classes/StockMvtReason.php', + 'StockMvtWS' => 'classes/stock/StockMvtWS.php', + 'StockCore' => 'classes/stock/Stock.php', + 'Stock' => 'override/classes/Stock.php', + 'SupplyOrderDetailCore' => 'classes/stock/SupplyOrderDetail.php', + 'SupplyOrderDetail' => 'override/classes/stock/SupplyOrderDetail.php', + 'SupplyOrderHistoryCore' => 'classes/stock/SupplyOrderHistory.php', + 'SupplyOrderHistory' => 'override/classes/stock/SupplyOrderHistory.php', + 'SupplyOrderCore' => 'classes/stock/SupplyOrder.php', + 'SupplyOrder' => 'override/classes/stock/SupplyOrder.php', + 'SupplyOrderReceiptHistoryCore' => 'classes/stock/SupplyOrderReceiptHistory.php', + 'SupplyOrderReceiptHistory' => 'override/classes/stock/SupplyOrderReceiptHistory.php', + 'SupplyOrderStateCore' => 'classes/stock/SupplyOrderState.php', + 'SupplyOrderState' => 'override/classes/stock/SupplyOrderState.php', + 'WarehouseCore' => 'classes/stock/Warehouse.php', + 'Warehouse' => 'override/classes/stock/Warehouse.php', + 'WarehouseProductLocationCore' => 'classes/stock/WarehouseProductLocation.php', + 'WarehouseProductLocation' => 'override/classes/stock/WarehouseProductLocation.php', 'StoreCore' => 'classes/Store.php', 'Store' => 'override/classes/Store.php', 'SubDomainCore' => 'classes/SubDomain.php', @@ -204,6 +320,21 @@ 'Tab' => 'override/classes/Tab.php', 'TagCore' => 'classes/Tag.php', 'Tag' => 'override/classes/Tag.php', + 'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php', + 'TaxCalculator' => 'override/classes/tax/TaxCalculator.php', + 'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php', + 'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php', + 'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php', + 'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php', + 'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php', + 'TaxCore' => 'classes/tax/Tax.php', + 'Tax' => 'override/classes/tax/Tax.php', + 'TaxRuleCore' => 'classes/tax/TaxRule.php', + 'TaxRule' => 'override/classes/tax/TaxRule.php', + 'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php', + 'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php', + 'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php', + 'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php', 'ThemeCore' => 'classes/Theme.php', 'Theme' => 'override/classes/Theme.php', 'ToolsCore' => 'classes/Tools.php', @@ -214,139 +345,6 @@ 'Upgrader' => 'override/classes/Upgrader.php', 'ValidateCore' => 'classes/Validate.php', 'Validate' => 'override/classes/Validate.php', - 'ZoneCore' => 'classes/Zone.php', - 'Zone' => 'override/classes/Zone.php', - 'CacheCore' => 'classes/cache/Cache.php', - 'Cache' => 'override/classes/cache/Cache.php', - 'CacheApcCore' => 'classes/cache/CacheApc.php', - 'CacheApc' => 'override/classes/cache/CacheApc.php', - 'CacheFsCore' => 'classes/cache/CacheFs.php', - 'CacheFs' => 'override/classes/cache/CacheFs.php', - 'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php', - 'CacheMemcache' => 'override/classes/cache/CacheMemcache.php', - 'CacheXcacheCore' => 'classes/cache/CacheXcache.php', - 'CacheXcache' => 'override/classes/cache/CacheXcache.php', - 'DbCore' => 'classes/db/Db.php', - 'Db' => 'override/classes/db/Db.php', - 'DbMySQLiCore' => 'classes/db/DbMySQLi.php', - 'DbMySQLi' => 'override/classes/db/DbMySQLi.php', - 'DbPDOCore' => 'classes/db/DbPDO.php', - 'DbPDO' => 'override/classes/db/DbPDO.php', - 'DbQueryCore' => 'classes/db/DbQuery.php', - 'DbQuery' => 'override/classes/db/DbQuery.php', - 'MySQLCore' => 'classes/db/MySQL.php', - 'MySQL' => 'override/classes/db/MySQL.php', - 'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php', - 'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php', - 'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php', - 'PrestashopException' => 'override/classes/exception/PrestashopException.php', - 'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php', - '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/Order.php', - 'OrderCarrierCore' => 'classes/order/OrderCarrier.php', - 'OrderCarrier' => '', - 'OrderCartRuleCore' => 'classes/order/OrderCartRule.php', - 'OrderCartRule' => 'override/classes/order/OrderCartRule.php', - 'OrderDetailCore' => 'classes/order/OrderDetail.php', - 'OrderDetail' => 'override/classes/order/OrderDetail.php', - 'OrderDiscountCore' => 'classes/order/OrderDiscount.php', - 'OrderDiscount' => 'override/classes/order/OrderDiscount.php', - 'OrderHistoryCore' => 'classes/order/OrderHistory.php', - 'OrderHistory' => 'override/classes/order/OrderHistory.php', - 'OrderInvoiceCore' => 'classes/order/OrderInvoice.php', - 'OrderInvoice' => 'override/classes/order/OrderInvoice.php', - 'OrderMessageCore' => 'classes/order/OrderMessage.php', - 'OrderMessage' => 'override/classes/order/OrderMessage.php', - 'OrderPaymentCore' => 'classes/order/OrderPayment.php', - 'OrderPayment' => 'override/classes/order/OrderPayment.php', - 'OrderReturnCore' => 'classes/order/OrderReturn.php', - 'OrderReturn' => 'override/classes/order/OrderReturn.php', - 'OrderReturnStateCore' => 'classes/order/OrderReturnState.php', - 'OrderReturnState' => 'override/classes/order/OrderReturnState.php', - 'OrderSlipCore' => 'classes/order/OrderSlip.php', - 'OrderSlip' => 'override/classes/order/OrderSlip.php', - 'OrderStateCore' => 'classes/order/OrderState.php', - 'OrderState' => 'override/classes/order/OrderState.php', - 'HTMLTemplateCore' => 'classes/pdf/HTMLTemplate.php', - 'HTMLTemplate' => 'override/classes/pdf/HTMLTemplate.php', - 'HTMLTemplateDeliverySlipCore' => 'classes/pdf/HTMLTemplateDeliverySlip.php', - 'HTMLTemplateDeliverySlip' => 'override/classes/pdf/HTMLTemplateDeliverySlip.php', - 'HTMLTemplateInvoiceCore' => 'classes/pdf/HTMLTemplateInvoice.php', - 'HTMLTemplateInvoice' => 'override/classes/pdf/HTMLTemplateInvoice.php', - 'HTMLTemplateOrderReturnCore' => 'classes/pdf/HTMLTemplateOrderReturn.php', - 'HTMLTemplateOrderReturn' => 'override/classes/pdf/HTMLTemplateOrderReturn.php', - 'HTMLTemplateOrderSlipCore' => 'classes/pdf/HTMLTemplateOrderSlip.php', - 'HTMLTemplateOrderSlip' => 'override/classes/pdf/HTMLTemplateOrderSlip.php', - 'HTMLTemplateSupplyOrderFormCore' => 'classes/pdf/HTMLTemplateSupplyOrderForm.php', - 'HTMLTemplateSupplyOrderForm' => 'override/classes/pdf/HTMLTemplateSupplyOrderForm.php', - 'PDFCore' => 'classes/pdf/PDF.php', - 'PDF' => 'override/classes/pdf/PDF.php', - 'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php', - 'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php', - 'GroupShopCore' => 'classes/shop/GroupShop.php', - 'GroupShop' => 'override/classes/shop/GroupShop.php', - 'ShopCore' => 'classes/shop/Shop.php', - 'Shop' => 'override/classes/shop/Shop.php', - 'ShopUrlCore' => 'classes/shop/ShopUrl.php', - 'ShopUrl' => 'override/classes/shop/ShopUrl.php', - 'StockCore' => 'classes/stock/Stock.php', - 'Stock' => 'override/classes/stock/Stock.php', - 'StockAvailableCore' => 'classes/stock/StockAvailable.php', - 'StockAvailable' => 'override/classes/stock/StockAvailable.php', - 'StockManagerCore' => 'classes/stock/StockManager.php', - 'StockManager' => 'override/classes/stock/StockManager.php', - 'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php', - 'StockManagerFactory' => 'override/classes/stock/StockManagerFactory.php', - 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', - 'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php', - 'StockManagerModule' => 'override/classes/stock/StockManagerModule.php', - 'StockMvtCore' => 'classes/stock/StockMvt.php', - 'StockMvt' => 'override/classes/stock/StockMvt.php', - 'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php', - 'StockMvtReason' => 'override/classes/stock/StockMvtReason.php', - 'StockMvtWS' => 'classes/stock/StockMvtWS.php', - 'SupplyOrderCore' => 'classes/stock/SupplyOrder.php', - 'SupplyOrder' => 'override/classes/stock/SupplyOrder.php', - 'SupplyOrderDetailCore' => 'classes/stock/SupplyOrderDetail.php', - 'SupplyOrderDetail' => 'override/classes/stock/SupplyOrderDetail.php', - 'SupplyOrderHistoryCore' => 'classes/stock/SupplyOrderHistory.php', - 'SupplyOrderHistory' => 'override/classes/stock/SupplyOrderHistory.php', - 'SupplyOrderReceiptHistoryCore' => 'classes/stock/SupplyOrderReceiptHistory.php', - 'SupplyOrderReceiptHistory' => 'override/classes/stock/SupplyOrderReceiptHistory.php', - 'SupplyOrderStateCore' => 'classes/stock/SupplyOrderState.php', - 'SupplyOrderState' => 'override/classes/stock/SupplyOrderState.php', - 'WarehouseCore' => 'classes/stock/Warehouse.php', - 'Warehouse' => 'override/classes/stock/Warehouse.php', - 'WarehouseProductLocationCore' => 'classes/stock/WarehouseProductLocation.php', - 'WarehouseProductLocation' => 'override/classes/stock/WarehouseProductLocation.php', - 'TaxCore' => 'classes/tax/Tax.php', - 'Tax' => 'override/classes/tax/Tax.php', - 'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php', - 'TaxCalculator' => 'override/classes/tax/TaxCalculator.php', - 'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php', - 'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php', - 'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php', - 'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php', - 'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php', - 'TaxRuleCore' => 'classes/tax/TaxRule.php', - 'TaxRule' => 'override/classes/tax/TaxRule.php', - 'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php', - 'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php', - 'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php', - 'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php', 'WebserviceExceptionCore' => 'classes/webservice/WebserviceException.php', 'WebserviceException' => 'override/classes/webservice/WebserviceException.php', 'WebserviceKeyCore' => 'classes/webservice/WebserviceKey.php', @@ -363,6 +361,8 @@ 'WebserviceSpecificManagementInterface' => 'classes/webservice/WebserviceSpecificManagementInterface.php', 'WebserviceSpecificManagementSearchCore' => 'classes/webservice/WebserviceSpecificManagementSearch.php', 'WebserviceSpecificManagementSearch' => 'override/classes/webservice/WebserviceSpecificManagementSearch.php', + 'ZoneCore' => 'classes/Zone.php', + 'Zone' => 'override/classes/Zone.php', 'FB' => 'override/classes/fb.php', 'AdminAccessControllerCore' => 'controllers/admin/AdminAccessController.php', 'AdminAccessController' => 'override/controllers/admin/AdminAccessController.php', @@ -410,10 +410,10 @@ 'AdminCountriesController' => 'override/controllers/admin/AdminCountriesController.php', 'AdminCurrenciesControllerCore' => 'controllers/admin/AdminCurrenciesController.php', 'AdminCurrenciesController' => 'override/controllers/admin/AdminCurrenciesController.php', - 'AdminCustomerThreadsControllerCore' => 'controllers/admin/AdminCustomerThreadsController.php', - 'AdminCustomerThreadsController' => 'override/controllers/admin/AdminCustomerThreadsController.php', 'AdminCustomersControllerCore' => 'controllers/admin/AdminCustomersController.php', 'AdminCustomersController' => 'override/controllers/admin/AdminCustomersController.php', + 'AdminCustomerThreadsControllerCore' => 'controllers/admin/AdminCustomerThreadsController.php', + 'AdminCustomerThreadsController' => 'override/controllers/admin/AdminCustomerThreadsController.php', 'AdminDbControllerCore' => 'controllers/admin/AdminDbController.php', 'AdminDbController' => 'override/controllers/admin/AdminDbController.php', 'AdminDeliverySlipControllerCore' => 'controllers/admin/AdminDeliverySlipController.php', @@ -430,10 +430,10 @@ 'AdminGeneratorController' => 'override/controllers/admin/AdminGeneratorController.php', 'AdminGeolocationControllerCore' => 'controllers/admin/AdminGeolocationController.php', 'AdminGeolocationController' => 'override/controllers/admin/AdminGeolocationController.php', - 'AdminGroupShopControllerCore' => 'controllers/admin/AdminGroupShopController.php', - 'AdminGroupShopController' => 'override/controllers/admin/AdminGroupShopController.php', 'AdminGroupsControllerCore' => 'controllers/admin/AdminGroupsController.php', 'AdminGroupsController' => 'override/controllers/admin/AdminGroupsController.php', + 'AdminGroupShopControllerCore' => 'controllers/admin/AdminGroupShopController.php', + 'AdminGroupShopController' => 'override/controllers/admin/AdminGroupShopController.php', 'AdminHomeControllerCore' => 'controllers/admin/AdminHomeController.php', 'AdminHomeController' => 'override/controllers/admin/AdminHomeController.php', 'AdminImagesControllerCore' => 'controllers/admin/AdminImagesController.php', @@ -467,14 +467,14 @@ 'AdminOrdersControllerCore' => 'controllers/admin/AdminOrdersController.php', 'AdminOrdersController' => 'override/controllers/admin/AdminOrdersController.php', 'AdminOutstandingController' => 'controllers/admin/AdminOutstandingController.php', - 'AdminPPreferencesControllerCore' => 'controllers/admin/AdminPPreferencesController.php', - 'AdminPPreferencesController' => 'override/controllers/admin/AdminPPreferencesController.php', 'AdminPaymentControllerCore' => 'controllers/admin/AdminPaymentController.php', 'AdminPaymentController' => 'override/controllers/admin/AdminPaymentController.php', 'AdminPdfControllerCore' => 'controllers/admin/AdminPdfController.php', 'AdminPdfController' => 'override/controllers/admin/AdminPdfController.php', 'AdminPerformanceControllerCore' => 'controllers/admin/AdminPerformanceController.php', 'AdminPerformanceController' => 'override/controllers/admin/AdminPerformanceController.php', + 'AdminPPreferencesControllerCore' => 'controllers/admin/AdminPPreferencesController.php', + 'AdminPPreferencesController' => 'override/controllers/admin/AdminPPreferencesController.php', 'AdminPreferencesControllerCore' => 'controllers/admin/AdminPreferencesController.php', 'AdminPreferencesController' => 'override/controllers/admin/AdminPreferencesController.php', 'AdminProductsControllerCore' => 'controllers/admin/AdminProductsController.php', @@ -540,10 +540,10 @@ 'AdminTabsController' => 'override/controllers/admin/AdminTabsController.php', 'AdminTagsControllerCore' => 'controllers/admin/AdminTagsController.php', 'AdminTagsController' => 'override/controllers/admin/AdminTagsController.php', - 'AdminTaxRulesGroupControllerCore' => 'controllers/admin/AdminTaxRulesGroupController.php', - 'AdminTaxRulesGroupController' => 'override/controllers/admin/AdminTaxRulesGroupController.php', 'AdminTaxesControllerCore' => 'controllers/admin/AdminTaxesController.php', 'AdminTaxesController' => 'override/controllers/admin/AdminTaxesController.php', + 'AdminTaxRulesGroupControllerCore' => 'controllers/admin/AdminTaxRulesGroupController.php', + 'AdminTaxRulesGroupController' => 'override/controllers/admin/AdminTaxRulesGroupController.php', 'AdminThemesControllerCore' => 'controllers/admin/AdminThemesController.php', 'AdminThemesController' => 'override/controllers/admin/AdminThemesController.php', 'AdminToolsControllerCore' => 'controllers/admin/AdminToolsController.php', diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php index dfed77ebb..e015ae857 100755 --- a/classes/helper/Helper.php +++ b/classes/helper/Helper.php @@ -121,7 +121,7 @@ class HelperCore * @param type $input_name name of input * @return string */ - public static function renderAdminCategorieTree($trads, $selected_cat = array(), $input_name = 'categoryBox', $use_radio = false, $use_search = false, $disabled_categories = array()) + public static function renderAdminCategorieTree($trads, $selected_cat = array(), $input_name = 'categoryBox', $use_radio = false, $use_search = false, $disabled_categories = array(), $use_in_popup = false) { if (!$use_radio) $input_name = $input_name.'[]'; @@ -156,11 +156,15 @@ class HelperCore $html .= ' var selectedLabel = \''.$trads['selected'].'\'; var home = \''.$trads['Home'].'\'; - var use_radio = '.(int)$use_radio.'; + var use_radio = '.(int)$use_radio.';'; + if (!$use_in_popup) + $html .= ' $(document).ready(function(){ buildTreeView(); - }); - '; + });'; + else + $html .= 'buildTreeView();'; + $html .= ''; $html .= '
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 341303083..a0ae34060 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -254,7 +254,7 @@ class AdminGroupsControllerCore extends AdminController 'Uncheck All' => $this->l('Uncheck All'), 'search' => $this->l('Search a category') ); - $this->tpl_form_vars['categoryTreeView'] = Helper::renderAdminCategorieTree($trads, array(), 'id_category', true); + $this->tpl_form_vars['categoryTreeView'] = Helper::renderAdminCategorieTree($trads, array(), 'id_category', true, false, array(), true); return parent::renderForm();