audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] missing references of mail

Browse Source 
(lp:c2c-addons/6.1  rev 89.1.57)
This commit is contained in:
Guewen Baconnier @ Camptocamp
2012-11-07 13:58:18 +01:00
parent 8ef2032e54
commit 6e3bffdee4
6 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
account_credit_control/data.xml
View File

@@ -2,14 +2,14 @@
<data noupdate="0"> <data noupdate="0">
<!--Email template --> <!--Email template -->
<record id="email_template_credit_control_base" model="email.template"> <record id="email_template_credit_control_base" model="email.template">
<field name="name">Credit Control Mail</field> <field name="name">Credit Control Email</field>
<field name="email_from">noreply@localhost</field> <field name="email_from">noreply@localhost</field>
<field name="subject">Credit Control: (${object.current_policy_level.name or 'n/a' })</field> <field name="subject">Credit Control: (${object.current_policy_level.name or 'n/a' })</field>
<field name="email_to">${object.get_mail() or ''}</field> <field name="email_to">${object.get_email() or ''}</field>
<field name="model_id" ref="model_credit_control_communication"/> <field name="model_id" ref="model_credit_control_communication"/>
<field name="auto_delete" eval="True"/> <field name="auto_delete" eval="True"/>
<field name="body_html"><![CDATA[ <field name="body_html"><![CDATA[
<%page args="object, user=None, ctx=None, quote=None, format_exception=True, mode='mail'" /> <%page args="object, user=None, ctx=None, quote=None, format_exception=True, mode='email'" />
%if mode != 'pdf': %if mode != 'pdf':
<!-- your css here --> <!-- your css here -->
<style type="text/css"> <style type="text/css">
@@ -93,9 +93,9 @@
<field name="level" eval="1"/> <field name="level" eval="1"/>
<field name="computation_mode">net_days</field> <field name="computation_mode">net_days</field>
<field name="delay_days" eval="10"/> <field name="delay_days" eval="10"/>
<field name="mail_template_id" ref="email_template_credit_control_base"/> <field name="email_template_id" ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_3_time"/> <field name="policy_id" ref="credit_control_3_time"/>
<field name="channel">mail</field> <field name="channel">email</field>
<field name="custom_text">Dear Sir or Madam, <field name="custom_text">Dear Sir or Madam,
Our records indicate that we have not received the payment of the Our records indicate that we have not received the payment of the
@@ -115,9 +115,9 @@ Best regards,
<field name="level" eval="2"/> <field name="level" eval="2"/>
<field name="computation_mode">end_of_month</field> <field name="computation_mode">end_of_month</field>
<field name="delay_days" eval="30"/> <field name="delay_days" eval="30"/>
<field name="mail_template_id" ref="email_template_credit_control_base"/> <field name="email_template_id" ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_3_time"/> <field name="policy_id" ref="credit_control_3_time"/>
<field name="channel">mail</field> <field name="channel">email</field>
<field name="custom_text">Dear Sir or Madam, <field name="custom_text">Dear Sir or Madam,
Our records indicate that we have not yet received the payment of the Our records indicate that we have not yet received the payment of the
@@ -137,7 +137,7 @@ Best regards,
<field name="level" eval="3"/> <field name="level" eval="3"/>
<field name="computation_mode">previous_date</field> <field name="computation_mode">previous_date</field>
<field name="delay_days" eval="10"/> <field name="delay_days" eval="10"/>
<field name="mail_template_id" ref="email_template_credit_control_base"/> <field name="email_template_id" ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_3_time"/> <field name="policy_id" ref="credit_control_3_time"/>
<field name="channel">letter</field> <field name="channel">letter</field>
<field name="custom_text">Dear Sir or Madam, <field name="custom_text">Dear Sir or Madam,
@@ -170,9 +170,9 @@ Best regards,
<field name="level" eval="1"/> <field name="level" eval="1"/>
<field name="computation_mode">end_of_month</field> <field name="computation_mode">end_of_month</field>
<field name="delay_days" eval="30"/> <field name="delay_days" eval="30"/>
<field name="mail_template_id" ref="email_template_credit_control_base"/> <field name="email_template_id" ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_2_time"/> <field name="policy_id" ref="credit_control_2_time"/>
<field name="channel">mail</field> <field name="channel">email</field>
<field name="custom_text">Dear Sir or Madam, <field name="custom_text">Dear Sir or Madam,
Our records indicate that we have not received the payment of the Our records indicate that we have not received the payment of the
@@ -192,7 +192,7 @@ Best regards,
<field name="level" eval="2"/> <field name="level" eval="2"/>
<field name="computation_mode">previous_date</field> <field name="computation_mode">previous_date</field>
<field name="delay_days" eval="60"/> <field name="delay_days" eval="60"/>
<field name="mail_template_id" ref="email_template_credit_control_base"/> <field name="email_template_id" ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_2_time"/> <field name="policy_id" ref="credit_control_2_time"/>
<field name="channel">letter</field> <field name="channel">letter</field>
<field name="custom_text">Dear Sir or Madam, <field name="custom_text">Dear Sir or Madam,

4
account_credit_control/line_view.xml
View File

@@ -44,7 +44,7 @@
help="New lines"/> help="New lines"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-gtk-stop" string="Error" <filter icon="terp-gtk-stop" string="Error"
domain="[('state', 'in', ('error', 'mail_error'))]" domain="[('state', 'in', ('error', 'email_error'))]"
help="New lines"/> help="New lines"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@@ -97,7 +97,7 @@
<field name="model">credit.control.line</field> <field name="model">credit.control.line</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree editable="bottom" string="Control Credit Lines" colors="green:state == 'sent';red:state in ('error', 'mail_error');"> <tree editable="bottom" string="Control Credit Lines" colors="green:state == 'sent';red:state in ('error', 'email_error');">
<field name="date"/> <field name="date"/>
<field name="date_due"/> <field name="date_due"/>
<field name="level"/> <field name="level"/>

8
account_credit_control/policy_view.xml
View File

@@ -19,7 +19,7 @@
<field name="channel"/> <field name="channel"/>
<field name="delay_days"/> <field name="delay_days"/>
<field name="computation_mode"/> <field name="computation_mode"/>
<field name="mail_template_id"/> <field name="email_template_id"/>
</tree> </tree>
<form> <form>
<field name="name"/> <field name="name"/>
@@ -31,7 +31,7 @@
<field name="computation_mode"/> <field name="computation_mode"/>
</page> </page>
<page string="Mail and reporting"> <page string="Mail and reporting">
<field name="mail_template_id"/> <field name="email_template_id"/>
<field name="custom_text"/> <field name="custom_text"/>
</page> </page>
</notebook> </notebook>
@@ -94,7 +94,7 @@
<field name="computation_mode"/> <field name="computation_mode"/>
</page> </page>
<page string="Mail and reporting"> <page string="Mail and reporting">
<field name="mail_template_id"/> <field name="email_template_id"/>
<field name="custom_text"/> <field name="custom_text"/>
</page> </page>
</notebook> </notebook>
@@ -113,7 +113,7 @@
<field name="channel"/> <field name="channel"/>
<field name="delay_days"/> <field name="delay_days"/>
<field name="computation_mode"/> <field name="computation_mode"/>
<field name="mail_template_id"/> <field name="email_template_id"/>
</tree> </tree>
</field> </field>
</record> </record>

2
account_credit_control/report/credit_control_summary.html.mako
View File

@@ -11,7 +11,7 @@
setLang(comm.partner_id.lang) setLang(comm.partner_id.lang)
current_uri = '%s_policy_template' % (comm.partner_id.lang) current_uri = '%s_policy_template' % (comm.partner_id.lang)
if not context.lookup.has_template(current_uri): if not context.lookup.has_template(current_uri):
context.lookup.put_string(current_uri, comm.current_policy_level.mail_template_id.body_html) context.lookup.put_string(current_uri, comm.current_policy_level.email_template_id.body_html)
%> %>
<!-- <!--
move the inner part in the mail template once done and reactivate this move the inner part in the mail template once done and reactivate this

2
account_credit_control/wizard/credit_control_communication.py
View File

@@ -157,7 +157,7 @@ class CreditCommunication(TransientModel):
cr_line_obj.write( cr_line_obj.write(
cr, uid, cl_ids, cr, uid, cl_ids,
{'mail_message_id': mail_id, {'mail_message_id': email_id,
'state': state}, 'state': state},
context=context) context=context)

24
account_credit_control/wizard/credit_control_emailer_view.xml
View File

@@ -1,40 +1,40 @@
<openerp> <openerp>
<data> <data>
<record id="credit_line_mailer_form" model="ir.ui.view"> <record id="credit_line_emailer_form" model="ir.ui.view">
<field name="name">credit.line.mailer.form</field> <field name="name">credit.line.emailer.form</field>
<field name="model">credit.control.mailer</field> <field name="model">credit.control.emailer</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<separator string="Send e-mails for the selected lines" colspan="4"/> <separator string="Send emails for the selected lines" colspan="4"/>
<newline/> <newline/>
<field name="line_ids" colspan="4" nolabel="1" /> <field name="line_ids" colspan="4" nolabel="1" />
<newline/> <newline/>
<group colspan="4"> <group colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/> <button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="mail_lines" string="Send the e-mails" type="object" icon="gtk-execute"/> <button name="email_lines" string="Send the emails" type="object" icon="gtk-execute"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<!-- for menu --> <!-- for menu -->
<act_window name="Send By E-mail" <act_window name="Send By Email"
res_model="credit.control.mailer" res_model="credit.control.emailer"
src_model="credit.control.line" src_model="credit.control.line"
view_mode="form" view_mode="form"
target="new" target="new"
key2="client_action_multi" key2="client_action_multi"
id="open_credit_line_mailer_wizard_menu_action"/> id="open_credit_line_emailer_wizard_menu_action"/>
<!-- for button --> <!-- for button -->
<record id="open_credit_line_mailer_wizard" model="ir.actions.act_window"> <record id="open_credit_line_emailer_wizard" model="ir.actions.act_window">
<field name="name">Send By E-mail</field> <field name="name">Send By Email</field>
<field name="res_model">credit.control.mailer</field> <field name="res_model">credit.control.emailer</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="credit_line_mailer_form"/> <field name="view_id" ref="credit_line_emailer_form"/>
<field name="target">new</field> <field name="target">new</field>
<field name="help">Send an email for the selected lines.</field> <field name="help">Send an email for the selected lines.</field>
</record> </record>