odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] removing unused code 

bzr revid: fp@tinyerp.com-20140413202922-glv198j62sqeugz2
This commit is contained in:
Fabien Pinckaers 2014-04-13 22:29:22 +02:00
parent b1ccd56368
commit 2ad0b6e369
2 changed files with 6 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
addons/mass_mailing/models/mass_mailing.py
View File

@ -245,15 +245,13 @@ class MassMailing(osv.Model):
list_ids += command[2]
if list_ids:
values['contact_nbr'] = self.pool[mailing_model].search(
cr, uid,
self.pool['mail.mass_mailing.list'].get_global_domain(cr, uid, list_ids, context=context)[mailing_model],
cr, uid, [('list_id', 'in', list_ids), ('opt_out','!=',1)],
count=True, context=context
)
else:
values['contact_nbr'] = 0
return {'value': values}
def on_change_contact_ab_pc(self, cr, uid, ids, contact_ab_pc, contact_nbr, context=None):
return {'value': {'contact_ab_nbr': contact_nbr * contact_ab_pc / 100.0}}
def action_duplicate(self, cr, uid, ids, context=None):
copy_id = None
for mid in ids:
@ -269,44 +267,6 @@ class MassMailing(osv.Model):
}
return False
def _get_model_to_list_action_id(self, cr, uid, model, context=None):
if model == 'res.partner':
return self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mass_mailing.action_partner_to_mailing_list')
else:
return self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mass_mailing.action_contact_to_mailing_list')
def action_domain_select(self, cr, uid, ids, context=None):
mailing = self.browse(cr, uid, ids[0], context=context)
ctx = dict(
context,
search_default_not_opt_out=True,
view_manager_highlight=[action_id], # To Change
default_mass_mailing_id=ids[0],
default_model=mailing.mailing_model
)
return {
'name': _('Choose Recipients'),
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': mailing.mailing_model,
'context': ctx,
}
def action_see_recipients(self, cr, uid, ids, context=None):
mailing = self.browse(cr, uid, ids[0], context=context)
domain = self.pool['mail.mass_mailing.list'].get_global_domain(cr, uid, [c.id for c in mailing.contact_list_ids], context=context)[mailing.mailing_model]
return {
'name': _('See Recipients'),
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': mailing.mailing_model,
'target': 'new',
'domain': domain,
'context': context,
}
def action_test_mailing(self, cr, uid, ids, context=None):
ctx = dict(context, default_mass_mailing_id=ids[0])
return {
@ -349,7 +309,7 @@ class MassMailing(osv.Model):
res_ids = self.pool[mailing.mailing_model].search(cr, uid, domain, context=context)
# randomly choose a fragment
if mailing.contact_ab_pc != 100:
if mailing.contact_ab_pc < 100:
topick = mailing.contact_ab_nbr
if mailing.mass_mailing_campaign_id and mailing.ab_testing:
already_mailed = self.pool['mail.mass_mailing.campaign'].get_recipients(cr, uid, [mailing.mass_mailing_campaign_id.id], context=context)[mailing.mass_mailing_campaign_id.id]

5
addons/mass_mailing/views/mass_mailing.xml
View File

@ -194,8 +194,7 @@
</strong></p>
</div>
<sheet>
<div class="oe_button_box pull-right" attrs="{'invisible': [('total', '=', 0)]}">
<div class="oe_button_box pull-right" attrs="{'invisible': [('state', 'in', ('draft','test'))]}">
<button name="%(action_mail_mass_mailing_report)d"
type="action" class="oe_stat_button">
<field name="received_ratio" string="Received" widget="percentpie"/>
@ -209,7 +208,7 @@
<field name="replied_ratio" string="Replied" widget="percentpie"/>
</button>
</div>
<div class="oe_button_box" attrs="{'invisible': [('total', '=', 0)]}" style="margin-bottom: 32px">
<div class="oe_button_box" attrs="{'invisible': [('state', 'in', ('draft','test'))]}" style="margin-bottom: 32px">
<button name="%(action_mail_mass_mailing_report)d" type="action"
icon="fa-envelope-o" class="oe_stat_button">
<field name="total" string="Emails" widget="statinfo"/>