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

[FIX] activate date_range and fix installation errors

pull/367/head
Thomas Rehn 2016-04-27 19:01:02 +02:00 committed by Jordi Ballester
parent 4023b4b9a8
commit 1727ecb84d
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
account_financial_report_qweb/__openerp__.py
View File

@ -21,12 +21,13 @@
'wizard/aged_partner_balance_wizard_view.xml', 'wizard/aged_partner_balance_wizard_view.xml',
'wizard/general_ledger_wizard.xml', 'wizard/general_ledger_wizard.xml',
'wizard/open_invoice_wizard_view.xml', 'wizard/open_invoice_wizard_view.xml',
'report_menus.xml', 'wizard/partner_ledger_wizard.xml',
'wizard/partner_balance_wizard_view.xml',
'wizard/balance_common_wizard_view.xml', 'wizard/balance_common_wizard_view.xml',
'wizard/partner_balance_wizard_view.xml', 'wizard/partner_balance_wizard_view.xml',
'wizard/trial_balance_wizard_view.xml', 'wizard/trial_balance_wizard_view.xml',
'wizard/balance_sheet_wizard_view.xml', 'wizard/balance_sheet_wizard_view.xml',
#'wizard/profit_loss_wizard_view.xml', # 'wizard/profit_loss_wizard_view.xml',
'views/report_menus.xml', 'views/report_menus.xml',
'menuitems.xml', 'menuitems.xml',
'reports.xml', 'reports.xml',

16
account_financial_report_qweb/wizard/balance_common_wizard.py
View File

@ -29,14 +29,14 @@ class AccountBalanceCommonWizard(models.TransientModel):
print all accounts.", print all accounts.",
default=_get_account_ids default=_get_account_ids
) )
# date_range = fields.Many2one( date_range_id = fields.Many2one(
# comodel_name='date.range', comodel_name='date.range',
# string='Date Range', string='Date Range',
# ) )
# comparison_date_range = fields.Many2one( comparison_date_range_id = fields.Many2one(
# comodel_name='date.range', comodel_name='date.range',
# string='Date Range', string='Date Range',
# ) )
comparison_date_start = fields.Datetime( comparison_date_start = fields.Datetime(
string='Start Date' string='Start Date'
) )

4
account_financial_report_qweb/wizard/balance_common_wizard_view.xml
View File

@ -15,7 +15,7 @@
</group> </group>
</field> </field>
<field name="target_move" position="after"> <field name="target_move" position="after">
<!--<field name="date_range"/>--> <field name="date_range_id"/>
<newline/> <newline/>
</field> </field>
<field name="date_to" position="after"> <field name="date_to" position="after">
@ -41,7 +41,7 @@
</page> </page>
<page string="Comparison" name="comparison"> <page string="Comparison" name="comparison">
<group> <group>
<!--<field name="comparison_date_range"/>--> <field name="comparison_date_range_id"/>
<field name="comparison_date_start"/> <field name="comparison_date_start"/>
<field name="comparison_date_end"/> <field name="comparison_date_end"/>
</group> </group>

10
account_financial_report_qweb/wizard/balance_sheet_wizard_view.xml
View File

@ -3,7 +3,7 @@
<data> <data>
<record id="account_balance_sheet_wizard_view" model="ir.ui.view"> <record id="account_balance_sheet_wizard_view" model="ir.ui.view">
<field name="name">Trial Balance Wizard</field> <field name="name">Balance Sheet Wizard</field>
<field name="model">account.common.balance.report</field> <field name="model">account.common.balance.report</field>
<field name="mode">primary</field> <field name="mode">primary</field>
<field name="inherit_id" ref="account_balance_common_wizard_view"/> <field name="inherit_id" ref="account_balance_common_wizard_view"/>
@ -12,9 +12,11 @@
<notebook position="attributes"> <notebook position="attributes">
<attribute name="invisible">True</attribute> <attribute name="invisible">True</attribute>
</notebook> </notebook>
<!-- Replicate group here because hiding all tabs except Comparison
does not work well. -->
<notebook position="before"> <notebook position="before">
<group> <group string="Compare with other date range">
<!--<field name="comparison_date_range"/>--> <field name="comparison_date_range_id"/>
<field name="comparison_date_start"/> <field name="comparison_date_start"/>
<field name="comparison_date_end"/> <field name="comparison_date_end"/>
</group> </group>
@ -24,7 +26,7 @@
</record> </record>
<record id="action_account_balance_sheet_wizard_view" model="ir.actions.act_window"> <record id="action_account_balance_sheet_wizard_view" model="ir.actions.act_window">
<!--field name="name">Balance Sheet </field --> <field name="name">Balance Sheet</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.common.balance.report</field> <field name="res_model">account.common.balance.report</field>
<field name="view_type">form</field> <field name="view_type">form</field>