openerp-community-reviewer team mailing list archive

[David BEAL <david.beal@xxxxxxxxxxxx>]

David BEAL has proposed merging lp:~akretion-team/carriers-deliveries/fix-postlogis-menu-dbl into lp:carriers-deliveries.

Requested reviews:
  Yannick Vaucher @ Camptocamp (yvaucher-c2c)

For more details, see:
https://code.launchpad.net/~akretion-team/carriers-deliveries/fix-postlogis-menu-dbl/+merge/207000

 add a menu entry 'Carriers' in settings
-- 
https://code.launchpad.net/~akretion-team/carriers-deliveries/fix-postlogis-menu-dbl/+merge/207000
Your team Stock and Logistic Core Editors is subscribed to branch lp:carriers-deliveries.

=== modified file 'base_delivery_carrier_label/__openerp__.py'
--- base_delivery_carrier_label/__openerp__.py	2013-12-23 10:44:50 +0000
+++ base_delivery_carrier_label/__openerp__.py	2014-02-18 17:42:39 +0000
@@ -52,6 +52,7 @@
  'website': 'http://www.camptocamp.com/',
  'data': ['delivery_view.xml',
           'stock_view.xml',
+          'res_config_view.xml',
           'security/ir.model.access.csv',
           ],
  'tests': [],

=== added file 'base_delivery_carrier_label/res_config_view.xml'
--- base_delivery_carrier_label/res_config_view.xml	1970-01-01 00:00:00 +0000
+++ base_delivery_carrier_label/res_config_view.xml	2014-02-18 17:42:39 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <menuitem id="menu_carriers_config" name="Carriers"
+              parent="base.menu_config" sequence="20"/>
+
+  </data>
+</openerp>

=== modified file 'delivery_carrier_label_postlogistics/res_config_view.xml'
--- delivery_carrier_label_postlogistics/res_config_view.xml	2013-12-03 17:18:48 +0000
+++ delivery_carrier_label_postlogistics/res_config_view.xml	2014-02-18 17:42:39 +0000
@@ -103,8 +103,9 @@
       <field name="target">inline</field>
     </record>
 
-    <menuitem id="menu_postlogistics_config" name="Postlogistics" parent="base.menu_config"
-        sequence="20" action="action_postlogistics_config"/>
+    <menuitem id="menu_postlogistics_config" name="Postlogistics"
+              parent="base_delivery_carrier_label.menu_carriers_config"
+              sequence="20" action="action_postlogistics_config"/>
 
   </data>
 </openerp>