[FIX] Fixed issues got when merged with main

bzr revid: mka@tinyerp.com-20140410070617-rwxia7tf4hkgm398

diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index afea4e7..3ff409d 100644 (file)
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -55,12 +55,9 @@ Note that if you want to check the follow-up level for a given partner/account e
         'account_followup_view.xml',
         'account_followup_customers.xml',
         'wizard/account_followup_print_view.xml',
-<<<<<<< TREE
         'res_config_view.xml'
-=======
         'views/report_followup.xml',
         'account_followup_reports.xml'
->>>>>>> MERGE-SOURCE
     ],
     'demo': ['account_followup_demo.xml'],
     'test': [

diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 87b79ba..675edd1 100644 (file)
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -136,12 +136,10 @@
        
        <menuitem id="account_followup_main_menu" parent="account.menu_finance_configuration" name="Follow-up"/>
 
-<<<<<<< TREE
+
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Follow-up Report"/>
-=======
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" name="Follow-up Levels"/>
->>>>>>> MERGE-SOURCE
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>