odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fixed issues got when merged with main 

bzr revid: mka@tinyerp.com-20140410070617-rwxia7tf4hkgm398
This commit is contained in:
Mansi Kariya (OpenERP) 2014-04-10 12:36:17 +05:30
parent c8e215f986
commit c3869dc5fb
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/account_followup/__openerp__.py
View File

@ -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': [

4
addons/account_followup/account_followup_view.xml
View File

@ -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>