Skip to content

Commit

Permalink
Allow to configure different account for refunds (credit notes)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbaudoux authored and sbidoul committed Aug 20, 2018
1 parent b2d6317 commit 83e9b1c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 2 deletions.
16 changes: 14 additions & 2 deletions account_cutoff_accrual_base/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,25 @@ msgstr "Sociétés"
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_account_config_settings_default_accrued_expense_account_id
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_res_company_default_accrued_expense_account_id
msgid "Default Account for Accrued Expenses"
msgstr "Compte par défaut pour factures non parvenues"
msgstr "Compte par défaut pour les factures non parvenues"

#. module: account_cutoff_accrual_base
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_account_config_settings_default_accrued_expense_return_account_id
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_res_company_default_accrued_expense_return_account_id
msgid "Default Account for Accrued Expenses Returns"
msgstr "Compte par défaut pour les notes de crédit à recevoir"

#. module: account_cutoff_accrual_base
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_account_config_settings_default_accrued_revenue_account_id
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_res_company_default_accrued_revenue_account_id
msgid "Default Account for Accrued Revenues"
msgstr "Compte par défaut pour factures à établir"
msgstr "Compte par défaut pour les factures à établir"

#. module: account_cutoff_accrual_base
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_account_config_settings_default_accrued_revenue_return_account_id
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_res_company_default_accrued_revenue_return_account_id
msgid "Default Account for Accrued Revenues Returns"
msgstr "Compte par défaut pour les notes de crédit à établir"

#. module: account_cutoff_accrual_base
#: model:ir.model.fields,field_description:account_cutoff_accrual_base.field_account_config_settings_default_accrual_expense_journal_id
Expand Down
4 changes: 4 additions & 0 deletions account_cutoff_accrual_base/models/account_config_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ class AccountConfigSettings(models.TransientModel):

default_accrued_revenue_account_id = fields.Many2one(
related='company_id.default_accrued_revenue_account_id')
default_accrued_revenue_return_account_id = fields.Many2one(
related='company_id.default_accrued_revenue_return_account_id')
default_accrued_expense_account_id = fields.Many2one(
related='company_id.default_accrued_expense_account_id')
default_accrued_expense_return_account_id = fields.Many2one(
related='company_id.default_accrued_expense_return_account_id')
default_accrual_revenue_journal_id = fields.Many2one(
related='company_id.default_accrual_revenue_journal_id')
default_accrual_expense_journal_id = fields.Many2one(
Expand Down
10 changes: 10 additions & 0 deletions account_cutoff_accrual_base/models/company.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,21 @@ class ResCompany(models.Model):
string='Default Account for Accrued Revenues',
domain=[('deprecated', '=', False)])

default_accrued_revenue_return_account_id = fields.Many2one(
comodel_name='account.account',
string='Default Account for Accrued Revenues Returns',
domain=[('deprecated', '=', False)])

default_accrued_expense_account_id = fields.Many2one(
comodel_name='account.account',
string='Default Account for Accrued Expenses',
domain=[('deprecated', '=', False)])

default_accrued_expense_return_account_id = fields.Many2one(
comodel_name='account.account',
string='Default Account for Accrued Expenses Returns',
domain=[('deprecated', '=', False)])

default_accrual_revenue_journal_id = fields.Many2one(
comodel_name='account.journal',
string='Default Journal for Accrued Revenues')
Expand Down
2 changes: 2 additions & 0 deletions account_cutoff_accrual_base/views/account_config_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<field name="default_accrual_revenue_journal_id" />
<field name="default_accrual_expense_journal_id" />
<field name="default_accrued_revenue_account_id" />
<field name="default_accrued_revenue_return_account_id" />
<field name="default_accrued_expense_account_id" />
<field name="default_accrued_expense_return_account_id" />
<field name="accrual_taxes" />
</field>
</field>
Expand Down

0 comments on commit 83e9b1c

Please sign in to comment.