Merge remote branch 'origin/master'

ecling · May 14, 2018 · 71e7d25 · 71e7d25
2 parents 7fbe012 + 00bce98
commit 71e7d25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/code/local/Martin/SalesReports/controllers/Adminhtml/Salesreports/NewController.php b/app/code/local/Martin/SalesReports/controllers/Adminhtml/Salesreports/NewController.php
@@ -7,7 +7,7 @@ public function preDispatch(){
     protected function _initAction()
     {
         $this->loadLayout()
-            ->_setActiveMenu('catalog')
+            ->_setActiveMenu('salesreports')
             ->_addBreadcrumb($this->__('salesreports'), $this->__('New Product Sales Report'))
         ;
         return $this;
@@ -34,6 +34,6 @@ public function viewAction(){
         $this->renderLayout();
     }
     protected function _isAllowed(){
-        return Mage::getSingleton('admin/session')->isAllowed('admin/salesreports/product');
+        return Mage::getSingleton('admin/session')->isAllowed('admin/salesreports/new');
     }
 }
diff --git a/app/code/local/Martin/SalesReports/etc/adminhtml.xml b/app/code/local/Martin/SalesReports/etc/adminhtml.xml
@@ -52,6 +52,10 @@
                                 <title>Product Reports</title>
                                 <sort_order>1</sort_order>
                             </product>
+                            <new>
+                                <title>New Product Reports</title>
+                                <sort_order>2</sort_order>
+                            </new>
                         </children>
                     </salesreports>
                 </children>