audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] account_statement_completion_voucher: Fix PEP8

Browse Source
This commit is contained in:
Pedro M. Baeza
2014-08-04 20:16:08 +02:00
parent 5cfa975a67
commit 85d139f776
4 changed files with 237 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
account_statement_ext/__openerp__.py
View File

@@ -29,14 +29,14 @@
'report_webkit',
'account_voucher'],
'description': """
Improve the basic bank statement, by adding various new features,
and help dealing with huge volume of reconciliation through payment offices such as Paypal, Lazer,
Visa, Amazon...
Improve the basic bank statement, by adding various new features, and help
dealing with huge volume of reconciliation through payment offices such as
Paypal, Lazer, Visa, Amazon...
It is mostly used for E-commerce but can be useful for other use cases as it introduces a
notion of profile on the bank statement to have more control on the generated entries. It serves as
a base for all new features developped to improve the reconciliation process (see our other
set of modules:
It is mostly used for E-commerce but can be useful for other use cases as it
introduces a notion of profile on the bank statement to have more control on
the generated entries. It serves as a base for all new features developped to
improve the reconciliation process (see our other set of modules:
* account_statement_base_completion
* account_statement_base_import
@@ -44,33 +44,38 @@
Features:
1) Improve the bank statement: allows to define profiles (for each
Office or Bank). The bank statement will then generate the entries based on some criteria chosen
in the selected profile. You can setup on the profile:
1) Improve the bank statement: allows to define profiles (for each Office or
Bank). The bank statement will then generate the entries based on some criteria
chosen in the selected profile. You can setup on the profile:
- the journal to use
- use balance check or not
- account commission and Analytic account for commission
- partner concerned by the profile (used in commission and optionaly on generated credit move)
- use a specific credit account (instead of the receivalble/payable default one)
- force Partner on the counter-part move (e.g. 100.- debit, Partner: M.Martin; 100.- credit, Partner: HSBC)
- partner concerned by the profile (used in commission and optionaly on
generated credit move)
- use a specific credit account (instead of the receivalble/payable default
one)
- force Partner on the counter-part move (e.g. 100.- debit, Partner: M.
Martin; 100.- credit, Partner: HSBC)
2) Add a report on bank statement that can be used for checks remittance
3) When an error occurs in a bank statement confirmation, go through all line anyway and summarize
all the erronous line in a same popup instead of raising and crashing on every step.
3) When an error occurs in a bank statement confirmation, go through all line
anyway and summarize all the erronous line in a same popup instead of
raising and crashing on every step.
4) Remove the period on the bank statement, and compute it for each line based on their date instead.
It also adds this feature in the voucher in order to compute the period correctly.
4) Remove the period on the bank statement, and compute it for each line based
on their date instead. It also adds this feature in the voucher in order to
compute the period correctly.
5) Cancelling a bank statement is much more easy and will cancel all related entries, unreconcile them,
and finally delete them.
6) Add the ID in entries view so that you can easily filter on a statement ID to reconcile all related
entries at once (e.g. one statement (ID 100) for paypal on an intermediate account, and then another for
the bank on the bank account. You can then manually reconcile all the line from the first one with
one line of the second by finding them through the statement ID.)
5) Cancelling a bank statement is much more easy and will cancel all related
entries, unreconcile them, and finally delete them.
6) Add the ID in entries view so that you can easily filter on a statement ID
to reconcile all related entries at once (e.g. one statement (ID 100) for
Paypal on an intermediate account, and then another for the bank on the
bank account. You can then manually reconcile all the line from the first
one with one line of the second by finding them through the statement ID.)
""",
'website': 'http://www.camptocamp.com',
'data': ['statement_view.xml',

13
account_statement_ext/report/bank_statement_report.py
View File

@@ -35,8 +35,9 @@ class BankStatementWebkit(report_sxw.rml_parse):
company = self.pool.get('res.users').browse(
self.cr, uid, uid, context=context).company_id
header_report_name = ' - '.join((_('BORDEREAU DE REMISE DE CHEQUES'),
company.name, company.currency_id.name))
header_report_name = ' - '.join((
_('BORDEREAU DE REMISE DE CHEQUES'),
company.name, company.currency_id.name))
footer_date_time = self.formatLang(
str(datetime.today())[:19], date_time=True)
self.localcontext.update({
@@ -68,7 +69,7 @@ class BankStatementWebkit(report_sxw.rml_parse):
self.cr, self.uid, statement_line_ids)
return statement_lines
webkit_report.WebKitParser('report.bank_statement_webkit',
'account.bank.statement',
'addons/account_statement_ext/report/bank_statement_report.mako',
parser=BankStatementWebkit)
webkit_report.WebKitParser(
'report.bank_statement_webkit', 'account.bank.statement',
'addons/account_statement_ext/report/bank_statement_report.mako',
parser=BankStatementWebkit)

394
account_statement_ext/statement.py
View File

@@ -19,8 +19,7 @@
#
##############################################################################
import openerp.addons.account.account_bank_statement as stat_mod
from openerp.osv.orm import Model
from openerp.osv import fields, osv
from openerp.osv import fields, orm
from openerp.tools.translate import _
@@ -29,8 +28,8 @@ def fixed_write(self, cr, uid, ids, vals, context=None):
""" Fix performance desing of original function
Ideally we should use a real PostgreSQL sequence or serial fields.
I will do it when I have time."""
res = super(stat_mod.account_bank_statement, self).write(cr, uid, ids,
vals, context=context)
res = super(stat_mod.account_bank_statement, self).write(
cr, uid, ids, vals, context=context)
if ids: # will be false for an new empty bank statement
cr.execute("UPDATE account_bank_statement_line"
" SET sequence = account_bank_statement_line.id + 1"
@@ -39,65 +38,56 @@ def fixed_write(self, cr, uid, ids, vals, context=None):
stat_mod.account_bank_statement.write = fixed_write
class AccountStatementProfile(Model):
"""
A Profile will contain all infos related to the type of
class AccountStatementProfile(orm.Model):
"""A Profile will contain all infos related to the type of
bank statement, and related generated entries. It defines the
journal to use, the partner and commision account and so on.
"""
_name = "account.statement.profile"
_inherit = ['mail.thread']
_description = "Statement Profile"
_order = 'sequence'
_columns = {
'name': fields.char('Name', required=True),
'sequence': fields.integer('Sequence', help="Gives a sequence in lists, the first profile will be used as default"),
'sequence': fields.integer(
'Sequence',
help="Gives a sequence in lists, the first profile will be used as "
"default"),
'partner_id': fields.many2one(
'res.partner',
'Bank/Payment Office partner',
help="Put a partner if you want to have it on the "
"commission move (and optionaly on the counterpart "
"of the intermediate/banking move if you tick the "
"corresponding checkbox)."),
help="Put a partner if you want to have it on the commission move "
"(and optionaly on the counterpart of the intermediate/"
"banking move if you tick the corresponding checkbox)."),
'journal_id': fields.many2one(
'account.journal',
'Financial journal to use for transaction',
required=True),
'commission_account_id': fields.many2one(
'account.account',
'Commission account',
required=True),
'commission_analytic_id': fields.many2one(
'account.analytic.account',
'Commission analytic account'),
'receivable_account_id': fields.many2one(
'account.account',
'Force Receivable/Payable Account',
help="Choose a receivable account to force the default "
"debit/credit account (eg. an intermediat bank account "
"instead of default debitors)."),
'force_partner_on_bank': fields.boolean(
'Force partner on bank move',
help="Tick that box if you want to use the credit "
"institute partner in the counterpart of the "
"intermediate/banking move."),
'balance_check': fields.boolean(
'Balance check',
help="Tick that box if you want OpenERP to control "
"the start/end balance before confirming a bank statement. "
"If don't ticked, no balance control will be done."),
'bank_statement_prefix': fields.char('Bank Statement Prefix', size=32),
'bank_statement_ids': fields.one2many('account.bank.statement',
'profile_id',
'Bank Statement Imported'),
@@ -112,7 +102,8 @@ class AccountStatementProfile(Model):
_constraints = [
(_check_partner,
"You need to put a partner if you tic the 'Force partner on bank move'!", []),
"You need to put a partner if you tic the 'Force partner on bank "
"move'!", []),
]
_sql_constraints = [
@@ -121,25 +112,21 @@ class AccountStatementProfile(Model):
]
class AccountBankStatement(Model):
"""
We improve the bank statement class mostly for :
class AccountBankStatement(orm.Model):
"""We improve the bank statement class mostly for :
- Removing the period and compute it from the date of each line.
- Allow to remove the balance check depending on the chosen profile
- Report errors on confirmation all at once instead of crashing onr by one
- Add a profile notion that can change the generated entries on statement
confirmation.
For this, we had to override quite some long method and we'll need to maintain
them up to date. Changes are point up by '#Chg' comment.
For this, we had to override quite some long method and we'll need to
maintain them up to date. Changes are point up by '#Chg' comment.
"""
_inherit = "account.bank.statement"
def _default_period(self, cr, uid, context=None):
"""
Statement default period
"""
"""Statement default period"""
if context is None:
context = {}
period_obj = self.pool.get('account.period')
@@ -148,20 +135,16 @@ class AccountBankStatement(Model):
return periods and periods[0] or False
def _default_profile(self, cr, uid, context=None):
"""
Returns the default statement profile
"""Returns the default statement profile
Default profile is the one with the lowest sequence of user's company
:return profile_id or False
"""
if context is None:
context = {}
user_obj = self.pool.get('res.users')
profile_obj = self.pool.get('account.statement.profile')
user_obj = self.pool['res.users']
profile_obj = self.pool['account.statement.profile']
user = user_obj.browse(cr, uid, uid, context=context)
profile_ids = profile_obj.search(
cr, uid, [('company_id', '=', user.company_id.id)], context=context)
return profile_ids[0] if profile_ids else False
def _get_statement_from_profile(self, cr, uid, profile_ids, context=None):
@@ -171,7 +154,6 @@ class AccountBankStatement(Model):
when the ORM calls this, self is an account.statement.profile.
Returns a list of account.bank.statement ids to recompute.
"""
triggered = []
for profile in self.browse(cr, uid, profile_ids, context=context):
@@ -237,29 +219,28 @@ class AccountBankStatement(Model):
}
def create(self, cr, uid, vals, context=None):
"""Need to pass the journal_id in vals anytime because of account.cash.statement
need it."""
"""Need to pass the journal_id in vals anytime because of
account.cash.statement need it."""
if 'profile_id' in vals:
profile_obj = self.pool.get('account.statement.profile')
profile_obj = self.pool['account.statement.profile']
profile = profile_obj.browse(
cr, uid, vals['profile_id'], context=context)
vals['journal_id'] = profile.journal_id.id
return super(AccountBankStatement, self
).create(cr, uid, vals, context=context)
return super(AccountBankStatement, self).create(
cr, uid, vals, context=context)
def _get_period(self, cr, uid, date, context=None):
"""Return matching period for a date."""
if context is None:
context = {}
period_obj = self.pool.get('account.period')
period_obj = self.pool['account.period']
local_context = context.copy()
local_context['account_period_prefer_normal'] = True
periods = period_obj.find(cr, uid, dt=date, context=local_context)
return periods and periods[0] or False
def _check_company_id(self, cr, uid, ids, context=None):
"""
Adapt this constraint method from the account module to reflect the
"""Adapt this constraint method from the account module to reflect the
move of period_id to the statement line
"""
for statement in self.browse(cr, uid, ids, context=context):
@@ -284,18 +265,18 @@ class AccountBankStatement(Model):
]
def _prepare_move(self, cr, uid, st_line, st_line_number, context=None):
"""Add the period_id from the statement line date to the move preparation.
Originaly, it was taken from the statement period_id
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:param char st_line_number: will be used as the name of the generated account move
"""Add the period_id from the statement line date to the move
preparation. Originaly, it was taken from the statement period_id
:param browse_record st_line: account.bank.statement.line record \
to create the move from.
:param char st_line_number: will be used as the name of the \
generated account move
:return: dict of value to create() the account.move
"""
if context is None:
context = {}
res = super(AccountBankStatement, self
)._prepare_move(cr, uid, st_line, st_line_number,
context=context)
res = super(AccountBankStatement, self)._prepare_move(
cr, uid, st_line, st_line_number, context=context)
ctx = context.copy()
ctx['company_id'] = st_line.company_id.id
period_id = self._get_period(cr, uid, st_line.date, context=ctx)
@@ -306,19 +287,23 @@ class AccountBankStatement(Model):
self, cr, uid, st_line, move_id, debit, credit, currency_id=False,
amount_currency=False, account_id=False, analytic_id=False,
partner_id=False, context=None):
"""Add the period_id from the statement line date to the move preparation.
Originaly, it was taken from the statement period_id
"""Add the period_id from the statement line date to the move
preparation. Originaly, it was taken from the statement period_id
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:param int/long move_id: ID of the account.move to link the move line
:param browse_record st_line: account.bank.statement.line record \
to create the move from.
:param int/long move_id: ID of the account.move to link the move \
line
:param float debit: debit amount of the move line
:param float credit: credit amount of the move line
:param int/long currency_id: ID of currency of the move line to create
:param float amount_currency: amount of the debit/credit expressed in the currency_id
:param int/long account_id: ID of the account to use in the move line if different
from the statement line account ID
:param int/long analytic_id: ID of analytic account to put on the move line
:param int/long currency_id: ID of currency of the move line to \
create
:param float amount_currency: amount of the debit/credit expressed \
in the currency_id
:param int/long account_id: ID of the account to use in the move \
line if different from the statement line account ID
:param int/long analytic_id: ID of analytic account to put on the \
move line
:param int/long partner_id: ID of the partner to put on the move line
:return: dict of value to create() the account.move.line
"""
@@ -338,15 +323,16 @@ class AccountBankStatement(Model):
return res
def _get_counter_part_partner(self, cr, uid, st_line, context=None):
"""
We change the move line generated from the lines depending on the profile:
- If partner_id is set and force_partner_on_bank is ticked, we'll let the partner of each line
for the debit line, but we'll change it on the credit move line for the choosen partner_id
=> This will ease the reconciliation process with the bank as the partner will match the bank
statement line
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:return: int/long of the res.partner to use as counterpart
"""We change the move line generated from the lines depending on the
profile:
- If partner_id is set and force_partner_on_bank is ticked, we'll let
the partner of each line for the debit line, but we'll change it on
the credit move line for the choosen partner_id
=> This will ease the reconciliation process with the bank as the
partner will match the bank statement line
:param browse_record st_line: account.bank.statement.line record to \
create the move from.
:return: int/long of the res.partner to use as counterpart
"""
bank_partner_id = super(AccountBankStatement, self
)._get_counter_part_partner(cr, uid, st_line,
@@ -357,22 +343,21 @@ class AccountBankStatement(Model):
return bank_partner_id
def _get_st_number_period_profile(self, cr, uid, date, profile_id):
"""
Retrieve the name of bank statement from sequence, according to the period
corresponding to the date passed in args. Add a prefix if set in the profile.
"""Retrieve the name of bank statement from sequence, according to the
period corresponding to the date passed in args. Add a prefix if set in
the profile.
:param: date: date of the statement used to compute the right period
:param: int/long: profile_id: the account.statement.profile ID from which to take the
bank_statement_prefix for the name
:param: int/long: profile_id: the account.statement.profile ID from \
which to take the bank_statement_prefix for the name
:return: char: name of the bank statement (st_number)
"""
year = self.pool.get('account.period').browse(
year = self.pool['account.period'].browse(
cr, uid, self._get_period(cr, uid, date)).fiscalyear_id.id
profile = self.pool.get(
'account.statement.profile').browse(cr, uid, profile_id)
c = {'fiscalyear_id': year}
obj_seq = self.pool.get('ir.sequence')
obj_seq = self.pool['ir.sequence']
journal_sequence_id = (profile.journal_id.sequence_id and
profile.journal_id.sequence_id.id or False)
if journal_sequence_id:
@@ -386,12 +371,10 @@ class AccountBankStatement(Model):
return st_number
def button_confirm_bank(self, cr, uid, ids, context=None):
"""
Completely override the method in order to have
an error message which displays all the messages
instead of having them pop one by one.
We have to copy paste a big block of code, changing the error
stack + managing period from date.
"""Completely override the method in order to have an error message
which displays all the messages instead of having them pop one by one.
We have to copy paste a big block of code, changing the error stack +
managing period from date.
TODO: Log the error in a bank statement field instead of using a popup!
"""
@@ -399,45 +382,45 @@ class AccountBankStatement(Model):
j_type = st.journal_id.type
company_currency_id = st.journal_id.company_id.currency_id.id
if not self.check_status_condition(cr, uid, st.state, journal_type=j_type):
if not self.check_status_condition(cr, uid, st.state,
journal_type=j_type):
continue
self.balance_check(
cr, uid, st.id, journal_type=j_type, context=context)
if (not st.journal_id.default_credit_account_id) \
or (not st.journal_id.default_debit_account_id):
raise osv.except_osv(_('Configuration Error!'),
_('Please verify that an account is defined in the journal.'))
raise orm.except_orm(
_('Configuration Error!'),
_('Please verify that an account is defined in the '
'journal.'))
if not st.name == '/':
st_number = st.name
else:
# Begin Changes
st_number = self._get_st_number_period_profile(
cr, uid, st.date, st.profile_id.id)
# End Changes
for line in st.move_line_ids:
if line.state != 'valid':
raise osv.except_osv(_('Error!'),
_('The account entries lines are not in valid state.'))
# begin changes
raise orm.except_orm(
_('Error!'),
_('The account entries lines are not in valid state.'))
errors_stack = []
for st_line in st.line_ids:
try:
if st_line.analytic_account_id:
if not st.journal_id.analytic_journal_id:
raise osv.except_osv(_('No Analytic Journal!'),
_("You have to assign an analytic"
" journal on the '%s' journal!") % st.journal_id.name)
raise orm.except_orm(
_('No Analytic Journal!'),
_("You have to assign an analytic journal on "
"the '%s' journal!") % st.journal_id.name)
if not st_line.amount:
continue
st_line_number = self.get_next_st_line_number(
cr, uid, st_number, st_line, context)
self.create_move_from_st_line(cr, uid, st_line.id,
company_currency_id,
st_line_number,
context)
except osv.except_osv, exc:
self.create_move_from_st_line(
cr, uid, st_line.id, company_currency_id,
st_line_number, context)
except orm.except_orm, exc:
msg = "Line ID %s with ref %s had following error: %s" % (
st_line.id, st_line.ref, exc.value)
errors_stack.append(msg)
@@ -447,31 +430,30 @@ class AccountBankStatement(Model):
errors_stack.append(msg)
if errors_stack:
msg = u"\n".join(errors_stack)
raise osv.except_osv(_('Error'), msg)
# end changes
raise orm.except_orm(_('Error'), msg)
self.write(cr, uid, [st.id],
{'name': st_number,
'balance_end_real': st.balance_end},
context=context)
body = _(
'Statement %s confirmed, journal items were created.') % st_number
body = _('Statement %s confirmed, journal items were '
'created.') % st_number
self.message_post(cr, uid, [st.id],
body,
context=context)
return self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
def get_account_for_counterpart(self, cr, uid, amount, account_receivable, account_payable):
def get_account_for_counterpart(self, cr, uid, amount, account_receivable,
account_payable):
"""For backward compatibility."""
account_id, type = self.get_account_and_type_for_counterpart(cr, uid, amount,
account_receivable,
account_payable)
account_id, type = self.get_account_and_type_for_counterpart(
cr, uid, amount, account_receivable, account_payable)
return account_id
def _compute_type_from_partner_profile(self, cr, uid, partner_id,
default_type, context=None):
"""Compute the statement line type
from partner profile (customer, supplier)"""
obj_partner = self.pool.get('res.partner')
obj_partner = self.pool['res.partner']
part = obj_partner.browse(cr, uid, partner_id, context=context)
if part.supplier == part.customer:
return default_type
@@ -491,43 +473,54 @@ class AccountBankStatement(Model):
def get_type_for_counterpart(self, cr, uid, amount, partner_id=False):
"""Give the amount and receive the type to use for the line.
The rules are:
- If the customer checkbox is checked on the found partner, type customer
- If the supplier checkbox is checked on the found partner, typewill be supplier
- If both checkbox are checked or none of them, it'll be based on the amount :
- If the customer checkbox is checked on the found partner, type
customer
- If the supplier checkbox is checked on the found partner, typewill
be supplier
- If both checkbox are checked or none of them, it'll be based on the
amount:
If amount is positif the type customer,
If amount is negativ, the type supplier
:param float: amount of the line
:param int/long: partner_id the partner id
:return: type as string: the default type to use: 'customer' or 'supplier'.
:return: type as string: the default type to use: 'customer' or \
'supplier'.
"""
s_line_type = self._compute_type_from_amount(cr, uid, amount)
if partner_id:
s_line_type = self._compute_type_from_partner_profile(cr, uid,
partner_id, s_line_type)
s_line_type = self._compute_type_from_partner_profile(
cr, uid, partner_id, s_line_type)
return s_line_type
def get_account_and_type_for_counterpart(self, cr, uid, amount, account_receivable,
account_payable, partner_id=False):
def get_account_and_type_for_counterpart(
self, cr, uid, amount, account_receivable, account_payable,
partner_id=False):
"""
Give the amount, payable and receivable account (that can be found using
get_default_pay_receiv_accounts method) and receive the one to use. This method
should be use when there is no other way to know which one to take.
The rules are:
- If the customer checkbox is checked on the found partner, type and account will be customer and receivable
- If the supplier checkbox is checked on the found partner, type and account will be supplier and payable
- If both checkbox are checked or none of them, it'll be based on the amount :
If amount is positive, the type and account will be customer and receivable,
If amount is negative, the type and account will be supplier and payable
Note that we return the payable or receivable account from agrs and not from the optional partner_id
given!
get_default_pay_receiv_accounts method) and receive the one to use. This
method should be use when there is no other way to know which one to
take. The rules are:
- If the customer checkbox is checked on the found partner, type and
account will be customer and receivable
- If the supplier checkbox is checked on the found partner, type and
account will be supplier and payable
- If both checkbox are checked or none of them, it'll be based on the
amount:
If amount is positive, the type and account will be customer and
receivable,
If amount is negative, the type and account will be supplier and
payable
Note that we return the payable or receivable account from agrs and not
from the optional partner_id given!
:param float: amount of the line
:param int/long: account_receivable the receivable account
:param int/long: account_payable the payable account
:param int/long: partner_id the partner id
:return: dict with [account_id as int/long,type as string]: the default account to be used by
statement line as the counterpart of the journal account depending on the amount and the type
as 'customer' or 'supplier'.
:return: dict with [account_id as int/long,type as string]: the \
default account to be used by statement line as the counterpart of \
the journal account depending on the amount and the type as \
'customer' or 'supplier'.
"""
account_id = False
ltype = self.get_type_for_counterpart(
@@ -537,26 +530,26 @@ class AccountBankStatement(Model):
else:
account_id = account_receivable
if not account_id:
raise osv.except_osv(
raise orm.except_orm(
_('Can not determine account'),
_('Please ensure that minimal properties are set')
)
_('Please ensure that minimal properties are set'))
return [account_id, ltype]
def get_default_pay_receiv_accounts(self, cr, uid, context=None):
"""
We try to determine default payable/receivable accounts to be used as counterpart
from the company default propoerty. This is to be used if there is no otherway to
find the good one, or to find a default value that will be overriden by a completion
method (rules of account_statement_base_completion) afterwards.
We try to determine default payable/receivable accounts to be used as
counterpart from the company default propoerty. This is to be used if
there is no otherway to find the good one, or to find a default value
that will be overriden by a completion method (rules of
account_statement_base_completion) afterwards.
:return: tuple of int/long ID that give account_receivable, account_payable based on
company default.
:return: tuple of int/long ID that give account_receivable,
account_payable based on company default.
"""
property_obj = self.pool.get('ir.property')
account_receivable = property_obj.get(cr, uid, 'property_account_receivable',
'res.partner', context=context)
property_obj = self.pool['ir.property']
account_receivable = property_obj.get(
cr, uid, 'property_account_receivable', 'res.partner',
context=context)
account_payable = property_obj.get(cr, uid, 'property_account_payable',
'res.partner', context=context)
@@ -565,8 +558,8 @@ class AccountBankStatement(Model):
def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
"""
Balance check depends on the profile. If no check for this profile is required,
return True and do nothing, otherwise call super.
Balance check depends on the profile. If no check for this profile is
required, return True and do nothing, otherwise call super.
:param int/long st_id: ID of the concerned account.bank.statement
:param char: journal_type that concern the bank statement
@@ -581,28 +574,25 @@ class AccountBankStatement(Model):
return True
def onchange_imp_config_id(self, cr, uid, ids, profile_id, context=None):
"""
Compute values on the change of the profile.
"""Compute values on the change of the profile.
:param: int/long: profile_id that changed
:return dict of dict with key = name of the field
"""
if not profile_id:
return {}
import_config = self.pool.get("account.statement.profile").browse(
import_config = self.pool["account.statement.profile"].browse(
cr, uid, profile_id, context=context)
journal_id = import_config.journal_id.id
return {'value': {'journal_id': journal_id,
'balance_check': import_config.balance_check}}
class AccountBankStatementLine(Model):
"""
Override to compute the period from the date of the line, add a method to retrieve
the values for a line from the profile. Override the on_change method to take care of
the profile when fullfilling the bank statement manually. Set the reference to 64
Char long instead 32.
class AccountBankStatementLine(orm.Model):
"""Override to compute the period from the date of the line, add a method
to retrieve the values for a line from the profile. Override the on_change
method to take care of the profile when fullfilling the bank statement
manually. Set the reference to 64 Char long instead 32.
"""
_inherit = "account.bank.statement.line"
@@ -616,7 +606,7 @@ class AccountBankStatementLine(Model):
local_context['account_period_prefer_normal'] = True
try:
periods = period_obj.find(cr, uid, dt=date, context=local_context)
except osv.except_osv:
except orm.except_orm:
# if no period defined, we are certainly at installation time
return False
return periods and periods[0] or False
@@ -634,30 +624,40 @@ class AccountBankStatementLine(Model):
'account_id': _get_default_account,
}
def get_values_for_line(self, cr, uid, profile_id=False, partner_id=False, line_type=False, amount=False, master_account_id=None, context=None):
"""
Return the account_id to be used in the line of a bank statement. It'll base the result as follow:
- If a receivable_account_id is set in the profile, return this value and type = general
def get_values_for_line(self, cr, uid, profile_id=False, partner_id=False,
line_type=False, amount=False,
master_account_id=None, context=None):
"""Return the account_id to be used in the line of a bank statement.
It'll base the result as follow:
- If a receivable_account_id is set in the profile, return this
value and type = general
# TODO
- Elif how_get_type_account is set to force_supplier or force_customer, will take respectively payable and type=supplier,
- Elif how_get_type_account is set to force_supplier or
force_customer, will take respectively payable and type=supplier,
receivable and type=customer otherwise
# END TODO
- Elif line_type is given, take the partner receivable/payable property (payable if type=supplier, receivable
otherwise)
- Elif line_type is given, take the partner receivable/payable
property (payable if type=supplier, receivable otherwise)
- Elif amount is given:
- If the customer checkbox is checked on the found partner, type and account will be customer and receivable
- If the supplier checkbox is checked on the found partner, type and account will be supplier and payable
- If both checkbox are checked or none of them, it'll be based on the amount :
If amount is positive, the type and account will be customer and receivable,
If amount is negative, the type and account will be supplier an payable
- Then, if no partner are given we look and take the property from the company so we always give a value
for account_id. Note that in that case, we return the receivable one.
- If the customer checkbox is checked on the found partner,
type and account will be customer and receivable
- If the supplier checkbox is checked on the found partner,
type and account will be supplier and payable
- If both checkbox are checked or none of them, it'll be based
on the amount :
If amount is positive, the type and account will be
customer and receivable,
If amount is negative, the type and account will be
supplier an payable
- Then, if no partner are given we look and take the property from
the company so we always give a value for account_id. Note that in
that case, we return the receivable one.
:param int/long profile_id of the related bank statement
:param int/long partner_id of the line
:param char line_type: a value from: 'general', 'supplier', 'customer'
:param float: amount of the line
:return: A dict of value that can be passed directly to the write method of
the statement line:
:return: A dict of value that can be passed directly to the write \
method of the statement line:
{'partner_id': value,
'account_id' : value,
'type' : value,
@@ -683,9 +683,9 @@ class AccountBankStatementLine(Model):
cr, uid, profile_id, context=context)
if profile.receivable_account_id:
res['account_id'] = profile.receivable_account_id.id
# We return general as default instead of get_type_for_counterpart
# for perfomance reasons as line_type is not a meaningfull value
# as account is forced
# We return general as default instead of
# get_type_for_counterpart for perfomance reasons as line_type
# is not a meaningfull value as account is forced
res['type'] = line_type if line_type else 'general'
return res
# If no account is available on profile you have to do the lookup
@@ -701,23 +701,25 @@ class AccountBankStatementLine(Model):
receiv_account = part.property_account_receivable.id
# If no value, look on the default company property
if not pay_account or not receiv_account:
receiv_account, pay_account = obj_stat.get_default_pay_receiv_accounts(
cr, uid, context=None)
account_id, comp_line_type = obj_stat.get_account_and_type_for_counterpart(cr, uid, amount,
receiv_account, pay_account,
partner_id=partner_id)
receiv_account, pay_account = obj_stat.\
get_default_pay_receiv_accounts(cr, uid, context=None)
account_id, comp_line_type = obj_stat.\
get_account_and_type_for_counterpart(
cr, uid, amount, receiv_account, pay_account,
partner_id=partner_id)
res['account_id'] = account_id if account_id else receiv_account
res['type'] = line_type if line_type else comp_line_type
return res
def onchange_partner_id(self, cr, uid, ids, partner_id, profile_id=None, context=None):
def onchange_partner_id(self, cr, uid, ids, partner_id, profile_id=None,
context=None):
"""
Override of the basic method as we need to pass the profile_id in the on_change_type
call.
Moreover, we now call the get_account_and_type_for_counterpart method now to get the
type to use.
Override of the basic method as we need to pass the profile_id in the
on_change_type call.
Moreover, we now call the get_account_and_type_for_counterpart method
now to get the type to use.
"""
obj_stat = self.pool.get('account.bank.statement')
obj_stat = self.pool['account.bank.statement']
if not partner_id:
return {}
line_type = obj_stat.get_type_for_counterpart(
@@ -730,10 +732,10 @@ class AccountBankStatementLine(Model):
'voucher_id': False}}
return {'value': {'type': line_type}}
def onchange_type(self, cr, uid, line_id, partner_id, line_type, profile_id, context=None):
"""
Keep the same features as in standard and call super. If an account is returned,
call the method to compute line values.
def onchange_type(self, cr, uid, line_id, partner_id, line_type, profile_id,
context=None):
"""Keep the same features as in standard and call super. If an account
is returned, call the method to compute line values.
"""
res = super(AccountBankStatementLine, self
).onchange_type(cr, uid, line_id, partner_id,

5
account_statement_ext/voucher.py
View File

@@ -29,8 +29,9 @@ class AccountVoucher(Model):
def _get_period(self, cr, uid, context=None):
"""If period not in context, take it from the move lines"""
if not context.get('period_id') and context.get('move_line_ids'):
res = self.pool.get('account.move.line').browse(
cr, uid, context.get('move_line_ids'), context=context)[0].period_id.id
res = self.pool['account.move.line'].browse(
cr, uid, context.get('move_line_ids'),
context=context)[0].period_id.id
context['period_id'] = res
elif context.get('date'):
periods = self.pool.get('account.period').find(