ajay javiya (OpenERP) has proposed merging 
lp:~openerp-commiter/openobject-addons/trunk-review-dashboards-purchase-aja 
into lp:~openerp-dev/openobject-addons/trunk-review-dashboards.

Requested reviews:
  Jigar Amin  (OpenERP) (jam-openerp)

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-review-dashboards-purchase-aja/+merge/109290

Hello
Make Improvement in Purchase dashboard
Thank You
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-review-dashboards-purchase-aja/+merge/109290
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-review-dashboards.
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml	2012-06-08 05:53:01 +0000
+++ account/board_account_view.xml	2012-06-08 06:23:29 +0000
@@ -50,12 +50,19 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
+<<<<<<< TREE
         <menuitem id="menu_board_account"
                   action="open_board_account" 
                   icon="terp-graph"  
                   parent="base.menu_reporting_dashboard" 
                   groups="group_account_user,group_account_manager" 
                   sequence="45"/>
+=======
+        <menuitem action="open_board_account" 
+                  icon="terp-graph" 
+                  id="menu_board_account" 
+                  parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager" sequence="35"/>
+>>>>>>> MERGE-SOURCE
 
     </data>
 </openerp>

=== modified file 'purchase/board_purchase_view.xml'
--- purchase/board_purchase_view.xml	2012-06-06 10:43:30 +0000
+++ purchase/board_purchase_view.xml	2012-06-08 06:23:29 +0000
@@ -88,7 +88,7 @@
                   icon="terp-graph"
                   id="menu_board_purchase"
                   parent="base.menu_reporting_dashboard"
-                  sequence="10"/>
+                  sequence="20"/>
 
     </data>
 </openerp>

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to