[MERGE] Merged With main Addons

bzr revid: mka@tinyerp.com-20140409132813-61ohxqh8mrtj2xzb

diff --cc addons/account_followup/__openerp__.py
index 24dc196,61e9ea2..afea4e7
--- 1/addons/account_followup/__openerp__.py
--- 2/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@@ -55,7 -55,8 +55,12 @@@ Note that if you want to check the foll
          '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 --cc addons/account_followup/account_followup.py
Simple merge

diff --cc addons/account_followup/account_followup_view.xml
index 7ca3083,57f7156..87b79ba
--- 1/addons/account_followup/account_followup_view.xml
--- 2/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@@ -133,11 -130,8 +133,15 @@@
               parent="menu_finance_followup"
               sequence="0"
               id="menu_manual_reconcile_followup"/>
 +       
 +       <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>