Merge branch '12.0' of https://github.com/akretion/odoo-usability into 12.0
This commit is contained in:
@@ -686,3 +686,10 @@ class AccountReconciliation(models.AbstractModel):
|
|||||||
position = domain.index(('payment_id', '<>', False))
|
position = domain.index(('payment_id', '<>', False))
|
||||||
domain[position] = ['journal_id', '=', st_line.journal_id.id]
|
domain[position] = ['journal_id', '=', st_line.journal_id.id]
|
||||||
return domain
|
return domain
|
||||||
|
|
||||||
|
|
||||||
|
class ResConfigSettings(models.TransientModel):
|
||||||
|
_inherit = 'res.config.settings'
|
||||||
|
|
||||||
|
transfer_account_id = fields.Many2one(
|
||||||
|
related='company_id.transfer_account_id', readonly=False)
|
||||||
|
|||||||
@@ -538,6 +538,28 @@ module -->
|
|||||||
|
|
||||||
<menuitem id="account_tax_group_menu" action="account_tax_group_action" parent="account.account_account_menu" sequence="2"/>
|
<menuitem id="account_tax_group_menu" action="account_tax_group_action" parent="account.account_account_menu" sequence="2"/>
|
||||||
|
|
||||||
|
<!-- Account config page -->
|
||||||
|
<record id="res_config_settings_view_form" model="ir.ui.view">
|
||||||
|
<field name="name">account_usability account config page</field>
|
||||||
|
<field name="model">res.config.settings</field>
|
||||||
|
<field name="inherit_id" ref="account.res_config_settings_view_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//field[@name='account_bank_reconciliation_start']/../.." position="after">
|
||||||
|
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||||
|
<div class="o_setting_left_pane"/>
|
||||||
|
<div class="o_setting_right_pane">
|
||||||
|
<label for="transfer_account_id"/>
|
||||||
|
<div class="text-muted">
|
||||||
|
Transit account when you transfer money from a bank account of your company to another bank account of your company.
|
||||||
|
</div>
|
||||||
|
<field name="transfer_account_id"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<!-- Remove menu entry "Accounting > Configuration > Accounting > Bank Accounts"
|
<!-- Remove menu entry "Accounting > Configuration > Accounting > Bank Accounts"
|
||||||
(account.journal filtered on type = 'bank' with special tree and form view)
|
(account.journal filtered on type = 'bank' with special tree and form view)
|
||||||
because it is useless and confusing -->
|
because it is useless and confusing -->
|
||||||
|
|||||||
Reference in New Issue
Block a user