pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account_followup: multi currency handling

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20121130154208-q3gj23y9iqq92ko1
This commit is contained in:
Quentin (OpenERP)
2012-11-30 16:42:08 +01:00
parent e786a1675b
commit 1de4c8e210
4 changed files with 138 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_followup/account_followup.py
+5 -5
View File
@@ -66,7 +66,7 @@ class followup_line(osv.osv):
_sql_constraints = [('days_uniq', 'unique(followup_id, delay)', 'Days of the follow-up levels must be different')]
_defaults = {
'send_email': True,
'send_letter': False,
'send_letter': True,
'manual_action':False,
'description': """
Dear %(partner_name)s,
@@ -218,10 +218,10 @@ class res_partner(osv.osv):
mtp = self.pool.get('email.template')
unknown_mails = 0
for partner in self.browse(cr, uid, partner_ids, context=context):
if partner.email != False and partner.email != '' and partner.email != ' ':
p = partner.latest_followup_level_id_without_lit
if p and p.send_email and p.email_template_id.id != False:
mtp.send_mail(cr, uid, p.email_template_id.id, partner.id, context=context)
if partner.email and partner.email.strip():
level = partner.latest_followup_level_id_without_lit
if level and level.send_email and level.email_template_id and level.email_template_id.id:
mtp.send_mail(cr, uid, level.email_template_id.id, partner.id, context=context)
else:
mail_template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid,
'account_followup', 'email_template_account_followup_default')
addons/account_followup/account_followup_data.xml
+124 -170
View File
@@ -1,9 +1,5 @@
<?xml version="1.0"?>
<openerp>
<!-- Mail template is done in a NOUPDATE block
so users can freely customize/delete them -->
<data noupdate="1">
@@ -11,18 +7,19 @@
<record id="email_template_account_followup_level0" model="email.template">
<field name="name">Follow-up of overdue invoices level 0</field>
<field name="email_from">${user.email or ''}</field>
<field name="subject">${object.company_id.name} Payment Follow-up</field>
<field name="subject">${user.company_id.name} Payment Follow-up</field>
<field name="email_to">${object.email}</field>
<field name="lang">${object.lang}</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="auto_delete" eval="True"/>
<field name="body_html"><![CDATA[
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
<p>Dear ${object.name and ' ' or ''},</p>
<p>Dear ${object.name},</p>
<p>
Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take
appropriate measures in order to carry out this payment in the next 8 days.
Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to
contact our accounting department at (+32).10.68.94.39.
@@ -32,57 +29,46 @@ Best Regards,
<br/>
${user.name}
<br/>
<br/>
<table border="2" width=100%>
<br/>
<br/>
<%
from openerp.addons.account_followup.report import account_followup_print
rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
followup_table = ''
for currency_dict in final_res:
currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
followup_table += '''
<table border="2" width=100%%>
<tr>
<td>Invoice date</td>
<td>Reference</td>
<td>Due date</td>
<td>Amount</td>
<td>Amount (%s)</td>
<td>Lit.</td>
</tr>
''' % (currency_symbol)
total = 0
for aml in currency_dict['line']:
block = aml['blocked'] and 'X' or ' '
total += aml['balance']
strbegin = "<TD> "
strend = "</TD> "
date = aml['date_maturity'] or aml['date']
if date <= ctx['current_date'] and aml['balance'] > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
followup_table += '''<tr> </tr>
</table>
<center>Amount due: %s </center>''' % (total)
<%
amls = object.unreconciled_aml_ids
mel = {}
total = 0
for aml in amls:
strbegin = "<TD> "
strend = "</TD> "
date = False
if aml.date_maturity:
date = aml.date_maturity
if aml.date_maturity <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
if aml.date <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
strbegin = "<TD>"
strend = "</TD>"
date = aml.date
block = " "
if aml.blocked:
block = "X"
mel[aml.id] = "<TR>" + strbegin + str(aml.date) + strend + strbegin + aml.ref + strend + strbegin + str(date) + strend + strbegin + str(aml.result) + strend + strbegin + block + strend + "</TR>"
if (aml.company_id.id != user.company_id.id):
mel[aml.id] = ""
else:
total += aml.result
%>
<tr>
</tr>
% for aml in amls:
${mel[aml.id]}
% endfor
</table>
<center>Amount due: ${total} ${object.company_id.currency_id.name} </center>
${followup_table}
<br/>
</div>
@@ -95,7 +81,7 @@ ${mel[aml.id]}
<record id="email_template_account_followup_level1" model="email.template">
<field name="name">Follow-up of overdue invoices level 1</field>
<field name="email_from">${user.email or ''}</field>
<field name="subject">${object.company_id.name} Payment Follow-up</field>
<field name="subject">${user.company_id.name} Payment Follow-up</field>
<field name="email_to">${object.email}</field>
<field name="lang">${object.lang}</field>
<field name="model_id" ref="base.model_res_partner"/>
@@ -103,7 +89,7 @@ ${mel[aml.id]}
<field name="body_html"><![CDATA[
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
<p>Dear ${object.name and ' ' or ''},</p>
<p>Dear ${object.name},</p>
<p>
We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.
It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account
@@ -123,54 +109,43 @@ ${user.name}
<br/>
<table border="2" width=100%>
<%
from openerp.addons.account_followup.report import account_followup_print
rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
followup_table = ''
for currency_dict in final_res:
currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
followup_table += '''
<table border="2" width=100%%>
<tr>
<td>Invoice date</td>
<td>Reference</td>
<td>Due date</td>
<td>Amount</td>
<td>Amount (%s)</td>
<td>Lit.</td>
</tr>
''' % (currency_symbol)
total = 0
for aml in currency_dict['line']:
block = aml['blocked'] and 'X' or ' '
total += aml['balance']
strbegin = "<TD> "
strend = "</TD> "
date = aml['date_maturity'] or aml['date']
if date <= ctx['current_date'] and aml['balance'] > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
followup_table += '''<tr> </tr>
</table>
<center>Amount due: %s </center>''' % (total)
<%
amls = object.unreconciled_aml_ids
mel = {}
total = 0
for aml in amls:
strbegin = "<TD> "
strend = "</TD> "
date = False
if aml.date_maturity:
date = aml.date_maturity
if aml.date_maturity <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
if aml.date <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
strbegin = "<TD>"
strend = "</TD>"
date = aml.date
block = " "
if aml.blocked:
block = "X"
mel[aml.id] = "<TR>" + strbegin + str(aml.date) + strend + strbegin + aml.ref + strend + strbegin + str(date) + strend + strbegin + str(aml.result) + strend + strbegin + block + strend + "</TR>"
if (aml.company_id.id != user.company_id.id):
mel[aml.id] = ""
else:
total += aml.result
%>
<tr>
</tr>
% for aml in amls:
${mel[aml.id]}
% endfor
</table>
<center>Amount due: ${total} ${object.company_id.currency_id.name} </center>
${followup_table}
<br/>
</div>
@@ -180,7 +155,7 @@ ${mel[aml.id]}
<record id="email_template_account_followup_level2" model="email.template">
<field name="name">Follow-up of overdue invoices level 2</field>
<field name="email_from">${user.email or ''}</field>
<field name="subject">${object.company_id.name} Payment Follow-up</field>
<field name="subject">${user.company_id.name} Payment Follow-up</field>
<field name="email_to">${object.email}</field>
<field name="lang">${object.lang}</field>
<field name="model_id" ref="base.model_res_partner"/>
@@ -188,7 +163,7 @@ ${mel[aml.id]}
<field name="body_html"><![CDATA[
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
<p>Dear ${object.name and ' ' or ''},</p>
<p>Dear ${object.name},</p>
<p>
Despite several reminders, your account is still not settled.
Unless full payment is made in next 8 days, legal action for the recovery of the debt will be taken without
@@ -206,54 +181,44 @@ ${user.name}
<br/>
<table border="2" width=100%>
<%
from openerp.addons.account_followup.report import account_followup_print
rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
followup_table = ''
for currency_dict in final_res:
currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
followup_table += '''
<table border="2" width=100%%>
<tr>
<td>Invoice date</td>
<td>Reference</td>
<td>Due date</td>
<td>Amount</td>
<td>Amount (%s)</td>
<td>Lit.</td>
</tr>
''' % (currency_symbol)
total = 0
for aml in currency_dict['line']:
block = aml['blocked'] and 'X' or ' '
total += aml['balance']
strbegin = "<TD> "
strend = "</TD> "
date = aml['date_maturity'] or aml['date']
if date <= ctx['current_date'] and aml['balance'] > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
followup_table += '''<tr> </tr>
</table>
<center>Amount due: %s </center>''' % (total)
<%
amls = object.unreconciled_aml_ids
mel = {}
total = 0
for aml in amls:
strbegin = "<TD> "
strend = "</TD> "
date = False
if aml.date_maturity:
date = aml.date_maturity
if aml.date_maturity <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
if aml.date <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
strbegin = "<TD>"
strend = "</TD>"
date = aml.date
block = " "
if aml.blocked:
block = "X"
mel[aml.id] = "<TR>" + strbegin + str(aml.date) + strend + strbegin + aml.ref + strend + strbegin + str(date) + strend + strbegin + str(aml.result) + strend + strbegin + block + strend + "</TR>"
if (aml.company_id.id != user.company_id.id):
mel[aml.id] = ""
else:
total += aml.result
%>
<tr>
</tr>
% for aml in amls:
${mel[aml.id]}
% endfor
</table>
<center>Amount due: ${total} ${object.company_id.currency_id.name} </center>
${followup_table}
<br/>
</div>
@@ -265,7 +230,7 @@ ${mel[aml.id]}
<record id="email_template_account_followup_default" model="email.template">
<field name="name">Default follow-up of overdue invoices</field>
<field name="email_from">${user.email or ''}</field>
<field name="subject">${object.company_id.name} Payment Follow-up</field>
<field name="subject">${user.company_id.name} Payment Follow-up</field>
<field name="email_to">${object.email}</field>
<field name="lang">${object.lang}</field>
<field name="model_id" ref="base.model_res_partner"/>
@@ -273,7 +238,7 @@ ${mel[aml.id]}
<field name="body_html"><![CDATA[
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
<p>Dear ${object.name and ' ' or ''},</p>
<p>Dear ${object.name},</p>
<p>
Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take
appropriate measures in order to carry out this payment in the next 8 days.
@@ -291,54 +256,44 @@ ${user.name}
<br/>
<table border="2" width=100%>
<%
from openerp.addons.account_followup.report import account_followup_print
rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
followup_table = ''
for currency_dict in final_res:
currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
followup_table += '''
<table border="2" width=100%%>
<tr>
<td>Invoice date</td>
<td>Reference</td>
<td>Due date</td>
<td>Amount</td>
<td>Amount (%s)</td>
<td>Lit.</td>
</tr>
''' % (currency_symbol)
total = 0
for aml in currency_dict['line']:
block = aml['blocked'] and 'X' or ' '
total += aml['balance']
strbegin = "<TD> "
strend = "</TD> "
date = aml['date_maturity'] or aml['date']
if date <= ctx['current_date'] and aml['balance'] > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
followup_table += '''<tr> </tr>
</table>
<center>Amount due: %s </center>''' % (total)
<%
amls = object.unreconciled_aml_ids
mel = {}
total = 0
for aml in amls:
strbegin = "<TD> "
strend = "</TD> "
date = False
if aml.date_maturity:
date = aml.date_maturity
if aml.date_maturity <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
if aml.date <= ctx['current_date'] and aml.debit > 0:
strbegin = "<TD><B>"
strend = "</B></TD>"
else:
strbegin = "<TD>"
strend = "</TD>"
date = aml.date
block = " "
if aml.blocked:
block = "X"
mel[aml.id] = "<TR>" + strbegin + str(aml.date) + strend + strbegin + aml.ref + strend + strbegin + str(date) + strend + strbegin + str(aml.result) + strend + strbegin + block + strend + "</TR>"
if (aml.company_id.id != user.company_id.id):
mel[aml.id] = ""
else:
total += aml.result
%>
<tr>
</tr>
% for aml in amls:
${mel[aml.id]}
% endfor
</table>
<center>Amount due: ${total} ${object.company_id.currency_id.name} </center>
${followup_table}
<br/>
</div>
@@ -350,7 +305,6 @@ ${mel[aml.id]}
<record id="demo_followup1" model="account_followup.followup">
<field name="name">Default Follow-up</field>
<field name="company_id" ref="base.main_company"/>
</record>
addons/account_followup/report/account_followup_print.py
+7 -4
View File
@@ -25,7 +25,7 @@ import pooler
from report import report_sxw
class report_rappel(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
def __init__(self, cr, uid, name, context=None):
super(report_rappel, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
@@ -43,14 +43,17 @@ class report_rappel(report_sxw.rml_parse):
return all_lines
def _lines_get(self, stat_by_partner_line):
return self._lines_get_with_partner(stat_by_partner_line.partner_id, stat_by_partner_line.company_id.id)
def _lines_get_with_partner(self, partner, company_id):
pool = pooler.get_pool(self.cr.dbname)
moveline_obj = pool.get('account.move.line')
company_obj = pool.get('res.company')
obj_currency = pool.get('res.currency')
movelines = moveline_obj.search(self.cr, self.uid,
[('partner_id', '=', stat_by_partner_line.partner_id.id),
[('partner_id', '=', partner.id),
('account_id.type', '=', 'receivable'),
('reconcile_id', '=', False), ('state', '<>', 'draft'),('company_id','=', stat_by_partner_line.company_id.id)])
('reconcile_id', '=', False), ('state', '<>', 'draft'),('company_id','=', company_id)])
movelines = moveline_obj.browse(self.cr, self.uid, movelines)
base_currency = movelines[0].company_id.currency_id
final_res = []
@@ -67,7 +70,7 @@ class report_rappel(report_sxw.rml_parse):
'date_maturity': line.date_maturity,
'balance': currency.id <> line.company_id.currency_id.id and line.amount_currency or (line.debit - line.credit),
'blocked': line.blocked,
'currency_id': currency.symbol or currency.name,
'currency_id': currency,
}
line_cur[currency.id]['line'].append(line_data)
addons/account_followup/report/account_followup_print.rml
+2 -2
View File
@@ -194,7 +194,7 @@
<para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'], date=True) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line['balance']) ]] [[ line['currency_id'] ]]</para>
<para style="terp_default_Right_9">[[ formatLang(line['balance'], currency_obj=line['currency_id']) ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
@@ -212,7 +212,7 @@
<para style="terp_tblheader_Details_Centre">Total: </para>
</td>
<td>
<para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['balance'], cur_lines['line'], 0.00)) ]] [[ line['currency_id'] ]] </para>
<para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['balance'], cur_lines['line'], 0.00), currency_obj=line['currency_id']) ]] </para>
</td>
<td>
<para style="terp_default_Right_9">