OCA
/
account-financial-reporting
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[account_financial_report][fix] fixes in usability

pull/484/head
Jordi Ballester Alomar 6 years ago
parent
d611e819f2
commit
61c33999a4
6 changed files with 31 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      account_financial_report/report/templates/trial_balance.xml
  2. 6
      account_financial_report/report/trial_balance_xlsx.py
  3. 14
      account_financial_report/wizard/aged_partner_balance_wizard_view.xml
  4. 6
      account_financial_report/wizard/general_ledger_wizard_view.xml
  5. 13
      account_financial_report/wizard/open_items_wizard_view.xml
  6. 12
      account_financial_report/wizard/trial_balance_wizard_view.xml

6
account_financial_report/report/templates/trial_balance.xml
View File

@ -108,7 +108,7 @@
<div class="act_as_row labels"> <div class="act_as_row labels">
<div class="act_as_cell">Date range filter</div> <div class="act_as_cell">Date range filter</div>
<div class="act_as_cell">Target moves filter</div> <div class="act_as_cell">Target moves filter</div>
<div class="act_as_cell">Account balance at 0 filter</div>
<div class="act_as_cell">Account at 0 filter</div>
<div class="act_as_cell">Limit hierarchy levels</div> <div class="act_as_cell">Limit hierarchy levels</div>
</div> </div>
<div class="act_as_row"> <div class="act_as_row">
@ -143,12 +143,12 @@
<!--## Code--> <!--## Code-->
<div class="act_as_cell" style="width: 8.86%;">Code</div> <div class="act_as_cell" style="width: 8.86%;">Code</div>
<!--## Account--> <!--## Account-->
<div class="act_as_cell" style="width: 52.58%;">Account
<div class="act_as_cell" style="width: 37.58%;">Account
</div> </div>
</t> </t>
<t t-if="show_partner_details"> <t t-if="show_partner_details">
<!--## Partner--> <!--## Partner-->
<div class="act_as_cell" style="width: 61.44%;">Partner
<div class="act_as_cell" style="width: 46.44%;">Partner
</div> </div>
</t> </t>
<!--## Initial balance--> <!--## Initial balance-->

6
account_financial_report/report/trial_balance_xlsx.py
View File

@ -82,15 +82,15 @@ class TrialBalanceXslx(models.AbstractModel):
} }
if report.foreign_currency: if report.foreign_currency:
foreign_currency = { foreign_currency = {
5: {'header': _('Cur.'),
6: {'header': _('Cur.'),
'field': 'currency_id', 'field': 'currency_id',
'field_currency_balance': 'currency_id', 'field_currency_balance': 'currency_id',
'type': 'many2one', 'width': 7}, 'type': 'many2one', 'width': 7},
6: {'header': _('Initial balance'),
7: {'header': _('Initial balance'),
'field': 'initial_balance_foreign_currency', 'field': 'initial_balance_foreign_currency',
'type': 'amount_currency', 'type': 'amount_currency',
'width': 14}, 'width': 14},
7: {'header': _('Ending balance'),
8: {'header': _('Ending balance'),
'field': 'final_balance_foreign_currency', 'field': 'final_balance_foreign_currency',
'type': 'amount_currency', 'type': 'amount_currency',
'width': 14}, 'width': 14},

14
account_financial_report/wizard/aged_partner_balance_wizard_view.xml
View File

@ -19,15 +19,17 @@
<field name="show_move_line_details"/> <field name="show_move_line_details"/>
</group> </group>
</group> </group>
<label for="partner_ids"/>
<field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
<group/>
<label for="account_ids"/>
<group col="4">
<group name="partner_filter" col="1">
<label for="partner_ids"/>
<field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
</group>
<group name="account_filter" col="4">
<label for="account_ids" colspan="4"/>
<field name="receivable_accounts_only"/> <field name="receivable_accounts_only"/>
<field name="payable_accounts_only"/> <field name="payable_accounts_only"/>
<field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
</group> </group>
<field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<field name="account_ids" nolabel="1" options="{'no_create': True}"/>
<footer> <footer>
<button name="button_export_html" string="View" <button name="button_export_html" string="View"
type="object" default_focus="1" class="oe_highlight"/> type="object" default_focus="1" class="oe_highlight"/>

6
account_financial_report/wizard/general_ledger_wizard_view.xml
View File

@ -32,16 +32,16 @@
<field name="receivable_accounts_only"/> <field name="receivable_accounts_only"/>
<field name="payable_accounts_only"/> <field name="payable_accounts_only"/>
</group> </group>
<field name="account_ids" nolabel="1" options="{'no_create': True}"/>
<field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
</page> </page>
<page string="Filter partners"> <page string="Filter partners">
<field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
<field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
</page> </page>
<page string="Filter cost centers" groups="analytic.group_analytic_accounting"> <page string="Filter cost centers" groups="analytic.group_analytic_accounting">
<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"/>
</page> </page>
<page string="Filter analytic tags"> <page string="Filter analytic tags">
<field name="analytic_tag_ids" nolabel="1" options="{'no_create': True}"/>
<field name="analytic_tag_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
</page> </page>
</notebook> </notebook>
</div> </div>

13
account_financial_report/wizard/open_items_wizard_view.xml
View File

@ -20,15 +20,16 @@
<field name="foreign_currency"/> <field name="foreign_currency"/>
</group> </group>
</group> </group>
<label for="partner_ids"/>
<field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
<group/>
<label for="account_ids"/>
<group col="4">
<group name="partner_filter" col="1">
<label for="partner_ids"/>
<field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
</group>
<group name="account_filter" col="4">
<label for="account_ids" colspan="4"/>
<field name="receivable_accounts_only"/> <field name="receivable_accounts_only"/>
<field name="payable_accounts_only"/> <field name="payable_accounts_only"/>
<field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
</group> </group>
<field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<footer> <footer>
<button name="button_export_html" string="View" <button name="button_export_html" string="View"
type="object" default_focus="1" class="oe_highlight"/> type="object" default_focus="1" class="oe_highlight"/>

12
account_financial_report/wizard/trial_balance_wizard_view.xml
View File

@ -28,18 +28,20 @@
<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)]}"/>
<group name="partner_filter" attrs="{'invisible':[('show_partner_details','!=',True)]}" col="1">
<label for="partner_ids"/>
<field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
</group>
<label for="journal_ids"/> <label for="journal_ids"/>
<field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/> <field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
<group attrs="{'invisible':[('show_partner_details','!=',True)]}"/> <group attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
<div/> <div/>
<label for="account_ids"/>
<group col="4">
<group name="account_filter" col="4">
<label for="account_ids" colspan="4"/>
<field name="receivable_accounts_only"/> <field name="receivable_accounts_only"/>
<field name="payable_accounts_only"/> <field name="payable_accounts_only"/>
<field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
</group> </group>
<field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
</div> </div>
<div attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', False)]}"> <div attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', False)]}">
<field name="not_only_one_unaffected_earnings_account" invisible="1"/> <field name="not_only_one_unaffected_earnings_account" invisible="1"/>

Write Preview
Loading…
Cancel
Save