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

[FIX] Automatically create transfer move lines instead of bank statement transfer lines

Browse Source
This commit is contained in:
Florian da Costa
2014-01-31 20:52:16 +01:00
parent e071aad62e
commit 07e41d8915
1 changed files with 48 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
account_statement_one_move/statement.py
View File

@@ -21,8 +21,6 @@
############################################################################### ###############################################################################
from openerp.osv import fields, orm, osv from openerp.osv import fields, orm, osv
from openerp.tools.translate import _
class AccountStatementProfile(orm.Model): class AccountStatementProfile(orm.Model):
@@ -38,7 +36,6 @@ class AccountStatementProfile(orm.Model):
"for the refunds and one for the payments.") "for the refunds and one for the payments.")
} }
class account_bank_statement(orm.Model): class account_bank_statement(orm.Model):
_inherit = "account.bank.statement" _inherit = "account.bank.statement"
@@ -132,89 +129,78 @@ class account_bank_statement(orm.Model):
return True return True
def create_statement_payment_line(self, cr, uid, st, payment_amount, context=None): def _prepare_transfer_move_line_vals(self, cr, uid, st, name, debit, credit, move_id, context=None):
st_line_obj = self.pool.get('account.bank.statement.line') """
payment_account_id = st.profile_id.journal_id.default_credit_account_id.id Prepare the dict of values to create the transfer move lines.
"""
account_id = st.profile_id.journal_id.default_debit_account_id.id
partner_id = st.profile_id.partner_id and profile.partner_id.id or False partner_id = st.profile_id.partner_id and profile.partner_id.id or False
vals = { vals = {
'name': _('Payment Transfer'), 'name': name,
'date': st.date, 'date': st.date,
'amount': -payment_amount,
'partner_id': partner_id, 'partner_id': partner_id,
'type': 'general',
'statement_id': st.id, 'statement_id': st.id,
'account_id': payment_account_id, 'account_id': account_id,
'ref': _('Transfer'), 'ref': name,
'already_completed': True 'move_id': move_id,
} 'credit': credit,
payment_line_id = st_line_obj.create(cr, uid, vals, context=context) 'debit': debit,
return payment_line_id 'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
}
return vals
def create_statement_refund_line(self, cr, uid, st, refund_amount, context=None): def create_move_transfer_lines(self, cr, uid, move, st, context=None):
st_line_obj = self.pool.get('account.bank.statement.line') move_line_obj = self.pool.get('account.move.line')
refund_account_id = st.profile_id.journal_id.default_credit_account_id.id move_id = move.id
partner_id = st.profile_id.partner_id and profile.partner_id.id or False refund = 0.0
vals = { payment = 0.0
'name': _('Refund Transfer'),
'date': st.date,
'amount': -refund_amount,
'partner_id': partner_id,
'type': 'general',
'statement_id': st.id,
'account_id': refund_account_id,
'ref': _('Transfer'),
'already_completed': True
}
refund_line_id = st_line_obj.create(cr, uid, vals, context=context)
return refund_line_id
def prepare_statement_transfer_lines(self, cr, uid, st, context=None):
refund_amount = 0.0
payment_amount = 0.0
transfer_line_ids = [] transfer_line_ids = []
#Calculate the part of the refund amount and the payment amount #Calculate the part of the refund amount and the payment amount
for st_line in st.line_ids: for move_line in move.line_id:
if st_line.amount < 0.0: refund += move_line.debit
refund_amount += st_line.amount payment += move_line.credit
else:
payment_amount += st_line.amount
#Create 2 Transfer lines or One global tranfer line #Create 2 Transfer lines or One global tranfer line
if st.profile_id.split_transfer_line: refund_name = 'Refund Transfer'
transfer_line_ids.append(self.create_statement_refund_line(cr, uid, st, payment_name = 'Payment Transfer'
refund_amount, if st.profile_id.split_transfer_line and refund != 0.0 and payment != 0.0:
context=context)) refund_vals = self._prepare_transfer_move_line_vals(cr, uid, st,
transfer_line_ids.append(self.create_statement_payment_line(cr, uid, st, refund_name, 0, refund,
payment_amount, move_id, context=context)
context=context)) transfer_line_ids.append(move_line_obj.create(cr, uid, refund_vals, context=context))
payment_vals = self._prepare_transfer_move_line_vals(cr, uid, st,
payment_name, payment, 0,
move_id, context=context)
transfer_line_ids.append(move_line_obj.create(cr, uid, payment_vals, context=context))
else: else:
global_amount = refund_amount + payment_amount
#The global transfer line can be a refund or a payment transfer #The global transfer line can be a refund or a payment transfer
if global_amount < 0.00: global_amount = abs(payment-refund)
transfer_line_ids.append(self.create_statement_refund_line(cr, uid, st, if payment > refund:
global_amount, vals = self._prepare_transfer_move_line_vals(cr, uid, st,
context=context)) payment_name,
global_amount, 0,
move_id, context=context)
else: else:
transfer_line_ids.append(self.create_statement_payment_line(cr, uid, st, vals = self._prepare_transfer_move_line_vals(cr, uid, st,
global_amount, refund_name, 0, global_amount,
context=context)) move_id, context=context)
transfer_line_ids.append(move_line_obj.create(cr, uid, vals, context=context))
return transfer_line_ids return transfer_line_ids
def button_confirm_bank(self, cr, uid, ids, context=None): def button_confirm_bank(self, cr, uid, ids, context=None):
st_line_obj = self.pool.get('account.bank.statement.line') st_line_obj = self.pool.get('account.bank.statement.line')
move_obj = self.pool.get('account.move')
if context is None: if context is None:
context = {} context = {}
for st in self.browse(cr, uid, ids, context=context): for st in self.browse(cr, uid, ids, context=context):
if st.profile_id.one_move:
refund_line_ids = self.prepare_statement_transfer_lines(cr, uid, st,
context=context)
super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, super(account_bank_statement, self).button_confirm_bank(cr, uid, ids,
context=context) context=context)
if st.profile_id.one_move: if st.profile_id.one_move:
move_id = context['move_id'] move_id = context['move_id']
move = move_obj.browse(cr, uid, move_id, context=context)
transfe_line_ids = self.create_move_transfer_lines(cr, uid, move, st, context=context)
self._valid_move(cr, uid, move_id, context=context) self._valid_move(cr, uid, move_id, context=context)
lines_ids = [x.id for x in st.line_ids] lines_ids = [x.id for x in st.line_ids]
st_line_obj.write(cr, uid, lines_ids, st_line_obj.write(cr, uid, lines_ids,