Browse Source

report_qweb: Fix layout issue introduced by PR https://github.com/OCA/account-financial-reporting/pull/445

pull/469/head
Alexis de Lattre 6 years ago
committed by Jordi Ballester Alomar
parent
commit
38e6f5f864
  1. 12
      account_financial_report_qweb/wizard/general_ledger_wizard_view.xml
  2. 1
      account_financial_report_qweb/wizard/trial_balance_wizard.py
  3. 10
      account_financial_report_qweb/wizard/trial_balance_wizard_view.xml

12
account_financial_report_qweb/wizard/general_ledger_wizard_view.xml

@ -17,6 +17,7 @@
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
<field name="fy_start_date" invisible="1"/> <field name="fy_start_date" invisible="1"/>
<field name="journal_ids" widget="many2many_tags" options="{'no_create': True}"/>
</group> </group>
<group name="other_filters"> <group name="other_filters">
<field name="target_move" widget="radio"/> <field name="target_move" widget="radio"/>
@ -25,15 +26,14 @@
<field name="foreign_currency"/> <field name="foreign_currency"/>
</group> </group>
</group> </group>
<label for="cost_center_ids" groups="analytic.group_analytic_accounting"/>
<group groups="analytic.group_analytic_accounting" name="cost_center_filter" col="1">
<label for="cost_center_ids"/>
<field name="cost_center_ids" nolabel="1" options="{'no_create': True}" groups="analytic.group_analytic_accounting"/> <field name="cost_center_ids" nolabel="1" options="{'no_create': True}" groups="analytic.group_analytic_accounting"/>
<group/>
</group>
<group name="partner_filter" col="1">
<label for="partner_ids"/> <label for="partner_ids"/>
<field name="partner_ids" nolabel="1" options="{'no_create': True}"/> <field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
<group/>
<label for="journal_ids"/>
<field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<group/>
</group>
<label for="account_ids"/> <label for="account_ids"/>
<group col="4"> <group col="4">
<field name="receivable_accounts_only"/> <field name="receivable_accounts_only"/>

1
account_financial_report_qweb/wizard/trial_balance_wizard.py

@ -51,6 +51,7 @@ class TrialBalanceReportWizard(models.TransientModel):
) )
journal_ids = fields.Many2many( journal_ids = fields.Many2many(
comodel_name="account.journal", comodel_name="account.journal",
string="Filter journals",
) )
not_only_one_unaffected_earnings_account = fields.Boolean( not_only_one_unaffected_earnings_account = fields.Boolean(

10
account_financial_report_qweb/wizard/trial_balance_wizard_view.xml

@ -17,6 +17,7 @@
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
<field name="fy_start_date" invisible="1"/> <field name="fy_start_date" invisible="1"/>
<field name="journal_ids" widget="many2many_tags" options="{'no_create': True}"/>
</group> </group>
<group name="other_filters"> <group name="other_filters">
<field name="target_move" widget="radio"/> <field name="target_move" widget="radio"/>
@ -25,11 +26,10 @@
<field name="foreign_currency"/> <field name="foreign_currency"/>
</group> </group>
</group> </group>
<label for="partner_ids" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
<field name="partner_ids" nolabel="1" options="{'no_create': True}" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
<label for="journal_ids"/>
<field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<group attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
<group name="partner_filter" attrs="{'invisible':[('show_partner_details','!=',True)]}" col="1">
<label for="partner_ids"/>
<field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
</group>
<label for="account_ids"/> <label for="account_ids"/>
<group col="4"> <group col="4">
<field name="receivable_accounts_only"/> <field name="receivable_accounts_only"/>

Loading…
Cancel
Save