Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove conflict from prev rebase

pull/196/head
Simone Orsi 2016-04-27 12:33:43 +02:00 committed by Leonardo Pistone
parent 0aaa2a2c0f
commit 883cf1e220
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
account_financial_report_qweb/__openerp__.py
View File

@ -19,6 +19,7 @@
], ],
'data': [ 'data': [
'wizard/aged_partner_balance_wizard_view.xml', 'wizard/aged_partner_balance_wizard_view.xml',
'wizard/general_ledger_wizard.xml',
'wizard/ledger_report_wizard_view.xml', 'wizard/ledger_report_wizard_view.xml',
'wizard/open_invoice_wizard_view.xml', 'wizard/open_invoice_wizard_view.xml',
'report_menus.xml', 'report_menus.xml',
@ -28,9 +29,9 @@
'views/report_menus.xml', 'views/report_menus.xml',
'menuitems.xml', 'menuitems.xml',
'reports.xml', 'reports.xml',
'wizard/general_ledger_wizard.xml',
# 'wizard/partner_ledger_wizard.xml', # 'wizard/partner_ledger_wizard.xml',
'report/templates/ledger_general.xml', 'report/templates/ledger_general.xml',
'report/templates/general_ledger.xml',
], ],
'test': [ 'test': [
], ],