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

[MERGE] trunk-bug-995986-rco (crm_lead does not have column 'opt_out' when email_template is installed after crm)

Browse Source 
bzr revid: rco@openerp.com-20120510080455-vhq9z9uxhxgk7l8w
This commit is contained in:
Raphael Collet
2012-05-10 10:04:55 +02:00
parent d158930910 1dcd32ec5e
commit 02200ffe30
34 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_lead.py
+6 -6
View File
@@ -162,8 +162,8 @@ class crm_lead(crm_case, osv.osv):
'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
'contact_name': fields.char('Contact Name', size=64),
'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
'opt_in': fields.boolean('Opt-In', oldname='optin', help="If opt-in is checked, this contact has accepted to receive emails."),
'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'date_closed': fields.datetime('Closed', readonly=True),
@@ -227,11 +227,11 @@ class crm_lead(crm_case, osv.osv):
self.create_send_note(cr, uid, [obj_id], context=context)
return obj_id
def on_change_optin(self, cr, uid, ids, optin):
return {'value':{'optin':optin,'optout':False}}
def on_change_opt_in(self, cr, uid, ids, opt_in):
return {'value':{'opt_in':opt_in,'opt_out':False}}
def on_change_optout(self, cr, uid, ids, optout):
return {'value':{'optout':optout,'optin':False}}
def on_change_opt_out(self, cr, uid, ids, opt_out):
return {'value':{'opt_out':opt_out,'opt_in':False}}
def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
if not stage_id:
addons/crm/crm_lead_view.xml
+4 -4
View File
@@ -144,8 +144,8 @@
</group>
<group colspan="2" col="2">
<separator string="Mailings" colspan="2" col="2"/>
<field name="optin" on_change="on_change_optin(optin)"/>
<field name="optout" on_change="on_change_optout(optout)"/>
<field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
<field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
</group>
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Statistics" colspan="2" col="2"/>
@@ -506,8 +506,8 @@
</group>
<group colspan="2" col="2">
<separator string="Mailings" colspan="2"/>
<field name="optin" on_change="on_change_optin(optin)"/>
<field name="optout" on_change="on_change_optout(optout)"/>
<field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
<field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
</group>
</page>
<page string="Extra Info">
addons/crm/test/ui/crm_demo.yml
+2 -2
View File
@@ -7,7 +7,7 @@
type: opportunity
stage_id: crm.stage_lead1
state: draft
optin: True
opt_in: True
-
I create lead record to call Mailing opt-out onchange method.
-
@@ -15,7 +15,7 @@
name: 'Need 20 Days of Consultancy'
type: opportunity
state: draft
optout: True
opt_out: True
-
I create phonecall record to call partner onchange method.
-
addons/email_template/i18n/ar.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "قوالب"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/bg.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Шаблони"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/ca.po
+1 -1
View File
@@ -528,7 +528,7 @@ msgstr "Plantilles"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/da.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr ""
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/de.po
+1 -1
View File
@@ -551,7 +551,7 @@ msgstr "Vorlagen"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr "abmelden"
#. module: email_template
addons/email_template/i18n/email_template.pot
+1 -1
View File
@@ -498,7 +498,7 @@ msgstr ""
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/es.po
+1 -1
View File
@@ -528,7 +528,7 @@ msgstr "Plantillas"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/es_CR.po
+1 -1
View File
@@ -561,7 +561,7 @@ msgstr "Plantillas"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr "Optar-Salir"
#. module: email_template
addons/email_template/i18n/es_EC.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr ""
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/et.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr ""
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/fi.po
+1 -1
View File
@@ -527,7 +527,7 @@ msgstr "Viestipohjat"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/fr.po
+1 -1
View File
@@ -535,7 +535,7 @@ msgstr "Modèles"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/hr.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr ""
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/hu.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Sablonok"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/it.po
+1 -1
View File
@@ -528,7 +528,7 @@ msgstr "Template"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/ja.po
+1 -1
View File
@@ -531,7 +531,7 @@ msgstr "テンプレート"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr "オプトアウト"
#. module: email_template
addons/email_template/i18n/mn.po
+1 -1
View File
@@ -527,7 +527,7 @@ msgstr "Загвар"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/nb.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Maler"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/nl.po
+2 -2
View File
@@ -560,8 +560,8 @@ msgstr "Sjablonen"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgstr "Opt-out"
msgid "Opt-Out"
msgstr "Opt-Out"
#. module: email_template
#: help:email.template,email_bcc:0
addons/email_template/i18n/pl.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Szablony"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/pt.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Modelos"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/pt_BR.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Modelos"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/ro.po
+1 -1
View File
@@ -528,7 +528,7 @@ msgstr "Șabloane"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/ru.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Шаблоны"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/sr.po
+1 -1
View File
@@ -527,7 +527,7 @@ msgstr "Šabloni"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/sr@latin.po
+1 -1
View File
@@ -527,7 +527,7 @@ msgstr "Šabloni"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/sv.po
+1 -1
View File
@@ -524,7 +524,7 @@ msgstr "Mallar"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/tr.po
+1 -1
View File
@@ -530,7 +530,7 @@ msgstr "Şablonlar"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgid "Opt-Out"
msgstr ""
#. module: email_template
addons/email_template/i18n/zh_CN.po
+2 -2
View File
@@ -528,8 +528,8 @@ msgstr "模板"
#. module: email_template
#: field:res.partner,opt_out:0
msgid "Opt-out"
msgstr "Opt-out"
msgid "Opt-Out"
msgstr "Opt-Out"
#. module: email_template
#: help:email.template,email_bcc:0
addons/email_template/res_partner.py
+1 -1
View File
@@ -28,7 +28,7 @@ class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
'opt_out': fields.boolean('Opt-out', help="If checked, this partner will not receive any automated email " \
'opt_out': fields.boolean('Opt-Out', help="If checked, this partner will not receive any automated email " \
"notifications, such as the availability of invoices."),
}
addons/import_sugarcrm/import_sugarcrm.py
+1 -1
View File
@@ -697,7 +697,7 @@ class sugar_import(import_framework):
'state': map_val('status', self.lead_state) ,
'fax': 'phone_fax',
'referred': 'refered_by',
'optout': 'do_not_call',
'opt_out': 'do_not_call',
'channel_id/id': call(self.get_channel_id, value('lead_source')),
'type_id/id': ref(self.TABLE_COMPAIGN, 'campaign_id'),
'country_id/id': 'country_id/id',