[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz
2012-03-23 10:55:30 +05:30
parent c3687e6f22 b917267f2d
commit e17dee3a5e
99 changed files with 275 additions and 255 deletions
@@ -35,10 +35,10 @@

        <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
         <menuitem
-            name="Dashboard"
+            name="Knowledge"
            id="menu_reports_document"
-            parent="menu_reporting"
-            sequence="0"
+            parent="base.menu_dasboard"
+            sequence="45"
            groups="base.group_system"/>