Skip to content

Commit

Permalink
Merge 547ca14 into 5edafd6
Browse files Browse the repository at this point in the history
  • Loading branch information
@i-vyshnevska
i-vyshnevska committed May 21, 2019
2 parents 5edafd6 + 547ca14 commit 64ed279
Show file tree
Hide file tree
Showing 39 changed files with 2,878 additions and 1 deletion.
1 change: 0 additions & 1 deletion .travis.yml
View file
Expand Up @@ -8,7 +8,6 @@ cache: pip

addons:
postgresql: "9.6"
postgresql: "9.2" # minimal postgresql version for the daterange method
apt:
packages:
- expect-dev # provides unbuffer utility
Expand Down
3 changes: 3 additions & 0 deletions account_consolidation/__init__.py
View file
@@ -0,0 +1,3 @@
from . import models
from . import wizard
from .hooks import post_init
36 changes: 36 additions & 0 deletions account_consolidation/__manifest__.py
View file
@@ -0,0 +1,36 @@
# Copyright 2011-2019 Camptocamp SA
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

{
"name": "Account Consolidation",
"version": "12.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',
],
"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',
],
"demo": [
'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',
"installable": True,
}
88 changes: 88 additions & 0 deletions account_consolidation/demo/company_a_demo.xml
View file
@@ -0,0 +1,88 @@
<?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="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="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="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="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="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="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="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="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="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="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="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"/>
</record>
</odoo>
88 changes: 88 additions & 0 deletions account_consolidation/demo/company_b_demo.xml
View file
@@ -0,0 +1,88 @@
<?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="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="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="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="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="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="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="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="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="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="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="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"/>
</record>
</odoo>
29 changes: 29 additions & 0 deletions account_consolidation/demo/company_demo.xml
View file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="consolidation_company" model="res.company">
<field name="name">Consolidation company</field>
<field name="currency_id" ref="base.EUR" />
<field name="country_id" ref="base.fr" />
<field name="is_consolidation">True</field>
</record>
<record id="subsidiary_a" model="res.company">
<field name="name">Subsidiary A</field>
<field name="currency_id" ref="base.EUR" />
<field name="country_id" ref="base.fr" />
</record>
<record id="subsidiary_b" model="res.company">
<field name="name">Subsidiary B</field>
<field name="currency_id" ref="base.USD" />
<field name="country_id" ref="base.us" />
</record>
<record id="conso_sub_a" model="company.consolidation.profile">
<field name="company_id" ref="consolidation_company" />
<field name="sub_company_id" ref="subsidiary_a" />
<field name="consolidation_percentage">100.0</field>
</record>
<record id="conso_sub_b" model="company.consolidation.profile">
<field name="company_id" ref="consolidation_company" />
<field name="sub_company_id" ref="subsidiary_b" />
<field name="consolidation_percentage">100.0</field>
</record>
</odoo>
100 changes: 100 additions & 0 deletions account_consolidation/demo/consolidation_demo.xml
View file
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
</record>
<record id="conso_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="consolidation_company"/>
<field name="reconcile" eval="True" />
</record>
<record id="conso_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="consolidation_company"/>
<field name="reconcile" eval="True" />
</record>
<record id="conso_exch_diff" model="account.account">
<field name="code">CED</field>
<field name="name">Consolidation Exchange Differences</field>
<field name="user_type_id" ref="account.data_account_type_expenses" />
<field name="company_id" ref="consolidation_company"/>
</record>
<record id="conso_consolidation_journal" model="account.journal" >
<field name="name">Consolidation journal</field>
<field name="code">CONSO</field>
<field name="type">general</field>
<field name="company_id" ref="consolidation_company"/>
</record>
<record id="consolidation_company" model="res.company">
<field name="consolidation_diff_account_id" ref="conso_exch_diff" />
<field name="consolidation_default_journal_id" ref="conso_consolidation_journal" />
</record>
<record id="consolidation_manager_partner" model="res.partner">
<field name="name">Consolidation Manager</field>
<field name="company_id" ref="consolidation_company"/>
<field name="customer" eval="False"/>
</record>
<record id="consolidation_manager_user" model="res.users">
<field name="partner_id" ref="consolidation_manager_partner"/>
<field name="login">consolidation</field>
<field name="password">consolidation</field>
<field name="company_id" ref="consolidation_company"/>
<field name="company_ids" eval="[(6,0,[ref('account_consolidation.consolidation_company'), ref('account_consolidation.subsidiary_a'), ref('account_consolidation.subsidiary_b')])]"/>
<field name="groups_id" eval="[(6,0,[ref('base.group_user'), ref('account_consolidation.group_consolidation_manager'), ref('base.group_system')])]"/>
</record>
</odoo>
35 changes: 35 additions & 0 deletions account_consolidation/demo/currency_demo.xml
View file
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="usd_01_01" model="res.currency.rate">
<field name="rate">1.8</field>
<field name="currency_id" ref="base.USD"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
<field name="company_id" eval="False" />
</record>
<record id="usd_01_31" model="res.currency.rate">
<field name="rate">1.36</field>
<field name="currency_id" ref="base.USD"/>
<field eval="time.strftime('%Y-01-31')" name="name"/>
<field name="company_id" eval="False" />
</record>
<record id="usd_02_28" model="res.currency.rate">
<field name="rate">1.23</field>
<field name="currency_id" ref="base.USD"/>
<field eval="time.strftime('%Y-02-28')" name="name"/>
<field name="company_id" eval="False" />
</record>
<record id="usd_01" model="res.currency.rate.monthly">
<field name="rate">1.3</field>
<field name="currency_id" ref="base.USD"/>
<field name="year" eval="time.strftime('%Y')" />
<field name="month">01</field>
<field name="company_id" eval="False" />
</record>
<record id="usd_02" model="res.currency.rate.monthly">
<field name="rate">1.05</field>
<field name="currency_id" ref="base.USD"/>
<field name="year" eval="time.strftime('%Y')" />
<field name="month">02</field>
<field name="company_id" eval="False" />
</record>
</odoo>

0 comments on commit 64ed279

Please sign in to comment.