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] add date of payment line instead of taking current date by default

Browse Source
This commit is contained in:
unknown
2013-10-16 10:59:28 +02:00
committed by Joel Grand-Guillaume
parent 3d9296ab35 54def1b6f1
commit a8d3c46237
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
statement_voucher_killer/__openerp__.py
View File

@@ -19,7 +19,7 @@
#
##############################################################################
{'name': 'voucher killer',
{'name': 'Satement voucher killer',
'version': '1.0.0',
'category': 'other',
'description': """
@@ -27,7 +27,15 @@ Prevent voucher creation when importing lines into statement.
#############################################################
When importing invoice or payment into a bank statement or a payment order, normally a
draft voucher is created on the line. This module will disable this voucher creation""",
draft voucher is created on the line. This module will disable this voucher creation.
When importing payment line, date used to populate statement
line will be take from imported line in this order:
* Date
* Maturity date
* Related statement date
""",
'author': 'Camptocamp',
'website': 'http://www.camptocamp.com',
'depends': ['account_voucher', 'account_payment'],

7
statement_voucher_killer/voucher.py
View File

@@ -35,7 +35,7 @@ class AccountStatementFromInvoiceLines(orm.TransientModel):
statement_id = context.get('statement_id', False)
if not statement_id:
return {'type': 'ir.actions.act_window_close'}
data = self.read(cr, uid, ids, context=context)[0]
data = self.read(cr, uid, ids, context=context)[0]
line_ids = data['line_ids']
if not line_ids:
return {'type': 'ir.actions.act_window_close'}
@@ -61,7 +61,7 @@ class AccountStatementFromInvoiceLines(orm.TransientModel):
if line.amount_currency:
amount = currency_obj.compute(cr, uid, line.currency_id.id,
statement.currency.id, line.amount_currency, context=ctx)
elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
elif (line.invoice and line.invoice.currency_id.id != statement.currency.id):
amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
statement.currency.id, amount, context=ctx)
@@ -108,7 +108,7 @@ class AccountPaymentPopulateStatement(orm.TransientModel):
for line in line_obj.browse(cr, uid, line_ids, context=context):
ctx = context.copy()
ctx['date'] = line.ml_maturity_date # was value_date earlier,but this field exists no more now
ctx['date'] = line.ml_maturity_date # Last value_date earlier,but this field exists no more now
amount = currency_obj.compute(cr, uid, line.currency.id,
statement.currency.id, line.amount_currency, context=ctx)
if not line.move_line_id.id:
@@ -122,6 +122,7 @@ class AccountPaymentPopulateStatement(orm.TransientModel):
'account_id': line.move_line_id.account_id.id,
'statement_id': statement.id,
'ref': line.communication,
'date': line.date or line.ml_maturity_date or statement.date,
}, context=context)
line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})