Skip to content

Commit

Permalink
[REF] auto-fix conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
@moylop260
moylop260 committed Nov 13, 2014
1 parent 98007e5 commit 752f640
Show file tree
Hide file tree
Showing 12 changed files with 312 additions and 267 deletions.
4 changes: 2 additions & 2 deletions account_consolidation/account_move_line.py
View file
Expand Up @@ -32,7 +32,6 @@ def _current_company(self, cursor, uid, ids, name, args, context=None):
res = dict([(tid, tid in curr_ids) for tid in ids])
return res


def search_is_current_company(self, cursor, uid, obj, name, args, context=None):
company_id = self.pool['res.company']._company_default_get(cursor, uid)
res = self.search(cursor, uid, [('company_id', '=', company_id)])
Expand All @@ -42,7 +41,8 @@ def search_is_current_company(self, cursor, uid, obj, name, args, context=None):
relation='res.company',
type="many2one",
string='Subsidaries',
store=True, # for the group_by
# for the group_by
store=True,
readonly=True),

'is_current_company': fields.function(_current_company,
Expand Down
26 changes: 14 additions & 12 deletions account_consolidation/company.py
View file
Expand Up @@ -26,16 +26,18 @@ class res_company(orm.Model):
_inherit = 'res.company'

_columns = {'consolidation_chart_account_id': fields.many2one(
'account.account',
'Chart of Accounts for Consolidation',
domain=[('parent_id', '=', False)],
help=("Current company root account"
" to be used when consolidating")),
'account.account',
'Chart of Accounts for Consolidation',
domain=[
('parent_id', '=', False)],
help=("Current company root account"
" to be used when consolidating")),

'consolidation_diff_account_id': fields.many2one(
'account.account',
'Consolidation difference account',
domain=[('type', '=', 'other')],
help=("Conso. differences will be affected"
" to this account"))
}
'consolidation_diff_account_id': fields.many2one(
'account.account',
'Consolidation difference account',
domain=[
('type', '=', 'other')],
help=("Conso. differences will be affected"
" to this account"))
}
6 changes: 3 additions & 3 deletions account_consolidation/wizard/__init__.py
View file
@@ -1,3 +1,3 @@
import consolidation_base
import consolidation_check
import consolidation_consolidate
from . import consolidation_base
from . import consolidation_check
from . import consolidation_consolidate
65 changes: 33 additions & 32 deletions account_consolidation/wizard/consolidation_base.py
View file
Expand Up @@ -77,7 +77,8 @@ def on_change_company_id(self, cr, uid, ids, company_id, context=None):
result = {}
company = company_obj.browse(cr, uid, company_id, context=context)
if company.consolidation_chart_account_id:
result['main_chart_account_id'] = company.consolidation_chart_account_id.id
result[
'main_chart_account_id'] = company.consolidation_chart_account_id.id

result['subsidiary_ids'] = [child.id for child in company.child_ids]

Expand Down Expand Up @@ -116,43 +117,43 @@ def check_subsidiary_periods(self, cr, uid, ids, holding_company_id,

# get holding fiscal year and periods
holding = company_obj.browse(
cr, uid, holding_company_id, context=context)
cr, uid, holding_company_id, context=context)
subsidiary = company_obj.browse(
cr, uid, subs_company_id, context=context)
cr, uid, subs_company_id, context=context)

holding_periods_ids = period_obj.search(
cr, uid,
[('company_id', '=', holding.id),
('fiscalyear_id', '=', holding_fiscal_year.id)],
context=context)
holding_periods = period_obj.browse(
cr, uid, holding_periods_ids, context=context)
cr, uid, holding_periods_ids, context=context)

# get subsidiary fiscal year and periods
subsidiary_fiscal_year = fy_obj.search(
cr, uid,
[('company_id', '=', subsidiary.id),
('date_start', '=', holding_fiscal_year.date_start),
('date_stop', '=', holding_fiscal_year.date_stop),
],
],
context=context)
if not subsidiary_fiscal_year:
errors.append(
_('The fiscal year of the subsidiary company %s '
'does not exists from %s to %s') %
(subsidiary.name,
holding_fiscal_year.date_start,
holding_fiscal_year.date_stop))
(subsidiary.name,
holding_fiscal_year.date_start,
holding_fiscal_year.date_stop))
else:
subsidiary_period_ids = period_obj.search(
cr, uid,
[('company_id', '=', subsidiary.id),
# 0 because there can be only 1 fiscal year
# on the same dates than the holding
# 0 because there can be only 1 fiscal year
# on the same dates than the holding
('fiscalyear_id', '=', subsidiary_fiscal_year[0])],
context=context)
subsidiary_periods = period_obj.browse(
cr, uid, subsidiary_period_ids, context=context)
cr, uid, subsidiary_period_ids, context=context)

# a holding fiscal year may have more periods than a subsidiary
# (a subsidiary created at the middle of the year for example)
Expand All @@ -175,9 +176,9 @@ def check_subsidiary_periods(self, cr, uid, ids, holding_company_id,
errors.append(
_('Period from %s to %s not found '
'in holding company %s') %
(subsidiary_period.date_start,
subsidiary_period.date_stop,
holding.name))
(subsidiary_period.date_start,
subsidiary_period.date_stop,
holding.name))
return errors

def check_all_periods(self, cr, uid, ids, context=None):
Expand Down Expand Up @@ -226,7 +227,7 @@ def _chart_accounts_data(self, cr, uid, ids, chart_account_id, context=None):
account_obj = self.pool.get('account.account')
res = {}
account_ids = account_obj._get_children_and_consol(
cr, uid, chart_account_id, context=context)
cr, uid, chart_account_id, context=context)

# do not consolidate chart root
account_ids.remove(chart_account_id)
Expand Down Expand Up @@ -281,14 +282,14 @@ def _check_subsidiary_mapping_account(self, cr, uid, ids,
errors = []
account_obj = self.pool.get('account.account')
normal_account_ids = account_obj.search(cr, uid,
[('company_id', '=', company_id.id),
('type', 'not in', ['consolidation', 'view'])],
context=context)
[('company_id', '=', company_id.id),
('type', 'not in', ['consolidation', 'view'])],
context=context)
consolidated_account_ids = account_obj.search(
cr, uid,
[('company_id', '=', company_id.id),
('type', '=', 'consolidation')],
context=context)
cr, uid,
[('company_id', '=', company_id.id),
('type', '=', 'consolidation')],
context=context)
consolidate_child_ids = []
for account_id in consolidated_account_ids:
child_consol_ids = account_obj._get_children_and_consol(
Expand All @@ -297,7 +298,7 @@ def _check_subsidiary_mapping_account(self, cr, uid, ids,
for sub_id in normal_account_ids:
cpt_occur = consolidate_child_ids.count(sub_id)
if cpt_occur == 0 or cpt_occur > 1:
## We read the code of account
# We read the code of account
code = account_obj.read(cr, uid, sub_id, ['code'],
context=context)['code']
message = _("Code %s is mapping %s times" % (code, cpt_occur))
Expand All @@ -324,9 +325,9 @@ def check_subsidiary_chart(self, cr, uid, ids, holding_chart_account_id,
context = {}
holding_ctx = dict(context, holding_coa=True)
holding_accounts = self._chart_accounts_data(
cr, uid, ids, holding_chart_account_id, context=holding_ctx)
cr, uid, ids, holding_chart_account_id, context=holding_ctx)
subsidiary_accounts = self._chart_accounts_data(
cr, uid, ids, subsidiary_chart_account_id, context=context)
cr, uid, ids, subsidiary_chart_account_id, context=context)
# accounts which are configured on the subsidiary
# Virtual CoA but not on the holding CoA
spare_accounts = [code for code
Expand All @@ -348,14 +349,14 @@ def check_account_charts(self, cr, uid, ids, context=None):
for subsidiary in form.subsidiary_ids:
if not subsidiary.consolidation_chart_account_id:
raise osv.except_osv(
_('Error'),
_('No chart of accounts for company %s') % subsidiary.name)
_('Error'),
_('No chart of accounts for company %s') % subsidiary.name)
invalid_items = self.check_subsidiary_chart(
cr, uid,
ids,
form.holding_chart_account_id.id,
subsidiary.consolidation_chart_account_id.id,
context=context)
cr, uid,
ids,
form.holding_chart_account_id.id,
subsidiary.consolidation_chart_account_id.id,
context=context)
if any(invalid_items):
invalid_items_per_company[subsidiary.id] = invalid_items

Expand Down
8 changes: 4 additions & 4 deletions account_consolidation/wizard/consolidation_check.py
View file
Expand Up @@ -45,7 +45,7 @@ def check_account_charts(self, cr, uid, ids, context=None):
"""
company_obj = self.pool.get('res.company')
invalid_items_per_company = super(account_consolidation_check, self).\
check_account_charts(cr, uid, ids, context=context)
check_account_charts(cr, uid, ids, context=context)

if not invalid_items_per_company:
raise osv.except_osv(
Expand All @@ -55,7 +55,7 @@ def check_account_charts(self, cr, uid, ids, context=None):
err_lines = []
for company_id, account_codes in invalid_items_per_company.iteritems():
company = company_obj.browse(
cr, uid, company_id, context=context)
cr, uid, company_id, context=context)
err_lines.append(_("%s :") % company.name)
for account_code in account_codes:
err_lines.append(
Expand All @@ -72,7 +72,7 @@ def check_all_periods(self, cr, uid, ids, context=None):
Check the periods and display a report of the errors
"""
errors_by_company = super(account_consolidation_check, self).\
check_all_periods(cr, uid, ids, context=context)
check_all_periods(cr, uid, ids, context=context)

if not errors_by_company:
raise osv.except_osv(_('Validation'), _('Periods are OK.'))
Expand All @@ -97,7 +97,7 @@ def check_subsidiary_mapping_account(self, cr, uid, ids, context=None):
"""
errors_by_company = super(
account_consolidation_check, self
).check_subsidiary_mapping_account(cr, uid, ids, context=context)
).check_subsidiary_mapping_account(cr, uid, ids, context=context)

if not errors_by_company:
raise osv.except_osv(_('Validation'), _('All account is mapped'))
Expand Down

0 comments on commit 752f640

Please sign in to comment.