Skip to content

Commit

Permalink
[MIG] account_consolidation: Migration to 14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaynnan authored and kaynnan committed Nov 29, 2023
1 parent 4e5c4f5 commit 2d89ff2
Show file tree
Hide file tree
Showing 37 changed files with 2,843 additions and 2,616 deletions.
27 changes: 15 additions & 12 deletions account_consolidation_oca/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Account Consolidation
=====================

.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:eaee6a6dcd79ae3f8aadb14a4b8a88f98f5e71bf42e807d223c0010214f213ac
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
Expand All @@ -14,16 +17,16 @@ Account Consolidation
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--consolidation-lightgray.png?logo=github
:target: https://github.com/OCA/account-consolidation/tree/12.0/account_consolidation
:target: https://github.com/OCA/account-consolidation/tree/14.0/account_consolidation_oca
:alt: OCA/account-consolidation
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-consolidation-12-0/account-consolidation-12-0-account_consolidation
:target: https://translation.odoo-community.org/projects/account-consolidation-14-0/account-consolidation-14-0-account_consolidation_oca
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/90/12.0
:alt: Try me on Runbot
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-consolidation&target_branch=14.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
|badge1| |badge2| |badge3| |badge4| |badge5|

This module extends the functionality of accounting to allow you to consolidate
journal items in a consolidation company.
Expand Down Expand Up @@ -75,14 +78,14 @@ Usage
=====

To consolidate subsidiaries in your consolidation company, you should use
'Consolidation : consolidate' wizard in Accounting > Adviser.
'Consolidation : consolidate' wizard in Accounting > Accounting.

You have to select the month until which every account move will be processed,
and select if you want to consolidate all the moves or only posted ones.

This will generate a journal entry in YTD (Year-To-Date) mode on your
consolidation company for each subsidiary. Those entries are flagged as
'auto_reverse', so they will actually be reversed when you run the
'auto_post', so they will actually be reversed when you run the
consolidation the next time.

The generated journal entries are unposted, allowing you to modify or delete it to
Expand All @@ -98,8 +101,8 @@ Bug Tracker

Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-consolidation/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-consolidation/issues/new?body=module:%20account_consolidation%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-consolidation/issues/new?body=module:%20account_consolidation_oca%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Expand All @@ -124,6 +127,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

This module is part of the `OCA/account-consolidation <https://github.com/OCA/account-consolidation/tree/12.0/account_consolidation>`_ project on GitHub.
This module is part of the `OCA/account-consolidation <https://github.com/OCA/account-consolidation/tree/14.0/account_consolidation_oca>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
38 changes: 19 additions & 19 deletions account_consolidation_oca/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@

{
"name": "Account Consolidation",
"version": "12.0.1.0.0",
"version": "14.0.1.0.0",
"author": "Camptocamp, Odoo Community Association (OCA)",
"license": "AGPL-3",
"category": "Generic Modules/Accounting",
"website": "https://github.com/OCA/account-consolidation",
"depends": [
'account',
'currency_monthly_rate',
"account",
"currency_monthly_rate",
],
"data": [
'security/res_groups.xml',
'security/account_consolidation_security.xml',
'security/ir.model.access.csv',
'views/account_move_line_view.xml',
'views/account_view.xml',
'views/company_consolidation_profile.xml',
'wizard/consolidation_check_view.xml',
'wizard/consolidation_consolidate_view.xml',
'views/consolidation_menu.xml',
'views/res_config_settings.xml',
"security/res_groups.xml",
"security/account_consolidation_security.xml",
"security/ir.model.access.csv",
"views/account_move_line_view.xml",
"views/account_view.xml",
"views/company_consolidation_profile.xml",
"wizard/consolidation_check_view.xml",
"wizard/consolidation_consolidate_view.xml",
"views/consolidation_menu.xml",
"views/res_config_settings.xml",
],
"demo": [
'demo/company_demo.xml',
'demo/currency_demo.xml',
'demo/consolidation_demo.xml',
'demo/company_a_demo.xml',
'demo/company_b_demo.xml',
"demo/company_demo.xml",
"demo/currency_demo.xml",
"demo/consolidation_demo.xml",
"demo/company_a_demo.xml",
"demo/company_b_demo.xml",
],
'post_init_hook': 'post_init',
"post_init_hook": "post_init",
"installable": True,
}
41 changes: 25 additions & 16 deletions account_consolidation_oca/demo/company_a_demo.xml
Original file line number Diff line number Diff line change
@@ -1,88 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="subA_exp1" model="account.account">
<field name="code">EXP1</field>
<field name="name">Expenses 1</field>
<field name="user_type_id" ref="account.data_account_type_expenses" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_exp1" />
</record>
<record id="subA_exp2" model="account.account">
<field name="code">EXP2</field>
<field name="name">Expenses 2</field>
<field name="user_type_id" ref="account.data_account_type_expenses" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_exp2" />
</record>
<record id="subA_exp3" model="account.account">
<field name="code">EXP3</field>
<field name="name">Expenses 3</field>
<field name="user_type_id" ref="account.data_account_type_expenses" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_exp3" />
</record>
<record id="subA_rev1" model="account.account">
<field name="code">REV1</field>
<field name="name">Revenue 1</field>
<field name="user_type_id" ref="account.data_account_type_revenue" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_rev1" />
</record>
<record id="subA_rev2" model="account.account">
<field name="code">REV2</field>
<field name="name">Revenue 2</field>
<field name="user_type_id" ref="account.data_account_type_revenue" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_rev2" />
</record>
<record id="subA_ass1" model="account.account">
<field name="code">ASS1</field>
<field name="name">Assets 1</field>
<field name="user_type_id" ref="account.data_account_type_current_assets" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_ass1" />
</record>
<record id="subA_lia1" model="account.account">
<field name="code">LIA1</field>
<field name="name">Liabilities 1</field>
<field name="user_type_id" ref="account.data_account_type_current_liabilities" />
<field name="company_id" ref="subsidiary_a"/>
<field
name="user_type_id"
ref="account.data_account_type_current_liabilities"
/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_lia1" />
</record>
<record id="subA_lia2" model="account.account">
<field name="code">LIA2</field>
<field name="name">Liabilities 2</field>
<field name="user_type_id" ref="account.data_account_type_current_liabilities" />
<field name="company_id" ref="subsidiary_a"/>
<field
name="user_type_id"
ref="account.data_account_type_current_liabilities"
/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_lia2" />
</record>
<record id="subA_lia3" model="account.account">
<field name="code">LIA3</field>
<field name="name">Liabilities 3</field>
<field name="user_type_id" ref="account.data_account_type_current_liabilities" />
<field name="company_id" ref="subsidiary_a"/>
<field
name="user_type_id"
ref="account.data_account_type_current_liabilities"
/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_lia3" />
</record>
<record id="subA_rec1" model="account.account">
<field name="code">REC1</field>
<field name="name">Receivable 1</field>
<field name="user_type_id" ref="account.data_account_type_receivable" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_rec1" />
<field name="reconcile" eval="True" />
</record>
<record id="subA_pay1" model="account.account">
<field name="code">PAY1</field>
<field name="name">Payable 1</field>
<field name="user_type_id" ref="account.data_account_type_payable" />
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
<field name="consolidation_account_id" ref="conso_pay1" />
<field name="reconcile" eval="True" />
</record>
<record id="subA_op_journal" model="account.journal">
<field name="name">Operations journal</field>
<field name="code">OP</field>
<field name="type">general</field>
<field name="company_id" ref="subsidiary_a"/>
<field name="company_id" ref="subsidiary_a" />
</record>
</odoo>
41 changes: 25 additions & 16 deletions account_consolidation_oca/demo/company_b_demo.xml
Original file line number Diff line number Diff line change
@@ -1,88 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="subB_exp1" model="account.account">
<field name="code">EXP1</field>
<field name="name">Expenses 1</field>
<field name="user_type_id" ref="account.data_account_type_expenses" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_exp1" />
</record>
<record id="subB_exp2" model="account.account">
<field name="code">EXP2</field>
<field name="name">Expenses 2</field>
<field name="user_type_id" ref="account.data_account_type_expenses" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_exp2" />
</record>
<record id="subB_exp3" model="account.account">
<field name="code">EXP3</field>
<field name="name">Expenses 3</field>
<field name="user_type_id" ref="account.data_account_type_expenses" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_exp3" />
</record>
<record id="subB_rev1" model="account.account">
<field name="code">REV1</field>
<field name="name">Revenue 1</field>
<field name="user_type_id" ref="account.data_account_type_revenue" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_rev1" />
</record>
<record id="subB_rev2" model="account.account">
<field name="code">REV2</field>
<field name="name">Revenue 2</field>
<field name="user_type_id" ref="account.data_account_type_revenue" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_rev2" />
</record>
<record id="subB_ass1" model="account.account">
<field name="code">ASS1</field>
<field name="name">Assets 1</field>
<field name="user_type_id" ref="account.data_account_type_current_assets" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_ass1" />
</record>
<record id="subB_lia1" model="account.account">
<field name="code">LIA1</field>
<field name="name">Liabilities 1</field>
<field name="user_type_id" ref="account.data_account_type_current_liabilities" />
<field name="company_id" ref="subsidiary_b"/>
<field
name="user_type_id"
ref="account.data_account_type_current_liabilities"
/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_lia1" />
</record>
<record id="subB_lia2" model="account.account">
<field name="code">LIA2</field>
<field name="name">Liabilities 2</field>
<field name="user_type_id" ref="account.data_account_type_current_liabilities" />
<field name="company_id" ref="subsidiary_b"/>
<field
name="user_type_id"
ref="account.data_account_type_current_liabilities"
/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_lia2" />
</record>
<record id="subB_lia3" model="account.account">
<field name="code">LIA3</field>
<field name="name">Liabilities 3</field>
<field name="user_type_id" ref="account.data_account_type_current_liabilities" />
<field name="company_id" ref="subsidiary_b"/>
<field
name="user_type_id"
ref="account.data_account_type_current_liabilities"
/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_lia3" />
</record>
<record id="subB_rec1" model="account.account">
<field name="code">REC1</field>
<field name="name">Receivable 1</field>
<field name="user_type_id" ref="account.data_account_type_receivable" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_rec1" />
<field name="reconcile" eval="True" />
</record>
<record id="subB_pay1" model="account.account">
<field name="code">PAY1</field>
<field name="name">Payable 1</field>
<field name="user_type_id" ref="account.data_account_type_payable" />
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
<field name="consolidation_account_id" ref="conso_pay1" />
<field name="reconcile" eval="True" />
</record>
<record id="subB_op_journal" model="account.journal">
<field name="name">Operations journal</field>
<field name="code">OP</field>
<field name="type">general</field>
<field name="company_id" ref="subsidiary_b"/>
<field name="company_id" ref="subsidiary_b" />
</record>
</odoo>
2 changes: 1 addition & 1 deletion account_consolidation_oca/demo/company_demo.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="consolidation_company" model="res.company">
<field name="name">Consolidation company</field>
Expand Down
Loading

0 comments on commit 2d89ff2

Please sign in to comment.