[MERGE] Forward-port saas-3 up to 4fa30f5
This commit is contained in:
commit
5ceded9d69
|
@ -48,7 +48,8 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
|
|||
def list_providers(self):
|
||||
try:
|
||||
provider_obj = request.registry.get('auth.oauth.provider')
|
||||
providers = provider_obj.search_read(request.cr, SUPERUSER_ID, [('enabled', '=', True)])
|
||||
providers = provider_obj.search_read(request.cr, SUPERUSER_ID, [('enabled', '=', True), ('auth_endpoint', '!=', False), ('validation_endpoint', '!=', False)])
|
||||
# TODO in forwardport: remove conditions on 'auth_endpoint' and 'validation_endpoint' when these fields will be 'required' in model
|
||||
except Exception:
|
||||
providers = []
|
||||
for provider in providers:
|
||||
|
|
|
@ -235,18 +235,8 @@ class document_directory(osv.osv):
|
|||
_parent(dir_id, path)
|
||||
return path
|
||||
|
||||
def _check_recursion(self, cr, uid, ids, context=None):
|
||||
level = 100
|
||||
while len(ids):
|
||||
cr.execute('select distinct parent_id from document_directory where id in ('+','.join(map(str,ids))+')')
|
||||
ids = filter(None, map(lambda x:x[0], cr.fetchall()))
|
||||
if not level:
|
||||
return False
|
||||
level -= 1
|
||||
return True
|
||||
|
||||
_constraints = [
|
||||
(_check_recursion, 'Error! You cannot create recursive directories.', ['parent_id'])
|
||||
(osv.osv._check_recursion, 'Error! You cannot create recursive directories.', ['parent_id'])
|
||||
]
|
||||
|
||||
def onchange_content_id(self, cr, uid, ids, ressource_type_id):
|
||||
|
|
|
@ -522,8 +522,8 @@ class hr_employee(osv.osv):
|
|||
where
|
||||
h.state='validate' and
|
||||
s.limit=False and
|
||||
h.employee_id in (%s)
|
||||
group by h.employee_id"""% (','.join(map(str,ids)),) )
|
||||
h.employee_id in %s
|
||||
group by h.employee_id""", (tuple(ids),))
|
||||
res = cr.dictfetchall()
|
||||
remaining = {}
|
||||
for r in res:
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
templates to target objects.
|
||||
""",
|
||||
'website': 'http://www.openerp.com',
|
||||
'depends' : ['account_accountant'],
|
||||
'depends' : ['account'],
|
||||
'data': [],
|
||||
'demo': [],
|
||||
'installable': True,
|
||||
|
|
|
@ -164,15 +164,9 @@
|
|||
border-radius: 3px;
|
||||
margin: 0px;
|
||||
padding-left: 3px;
|
||||
padding-right: 15px;
|
||||
padding-right: 5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
.openerp .oe_mail .oe_mail_vote_count .oe_e{
|
||||
position: absolute;
|
||||
bottom: 1px;
|
||||
right: 2px;
|
||||
font-size: 26px;
|
||||
}
|
||||
|
||||
/* c) Message action icons */
|
||||
|
||||
|
|
|
@ -355,7 +355,7 @@
|
|||
<span t-name="mail.thread.message.vote">
|
||||
<span class="oe_mail_vote_count" t-if='widget.vote_nb > 0'>
|
||||
<t t-esc='widget.vote_nb' />
|
||||
<span class='oe_e'>8</span>
|
||||
<i class="fa fa-thumbs-o-up"></i>
|
||||
</span>
|
||||
<a href='#' class="oe_msg_vote">
|
||||
<t t-if="!widget.has_voted">like</t>
|
||||
|
|
|
@ -113,26 +113,38 @@ class MassMailingCampaign(osv.Model):
|
|||
|
||||
def _get_statistics(self, cr, uid, ids, name, arg, context=None):
|
||||
""" Compute statistics of the mass mailing campaign """
|
||||
Statistics = self.pool['mail.mail.statistics']
|
||||
results = dict.fromkeys(ids, False)
|
||||
for cid in ids:
|
||||
stat_ids = Statistics.search(cr, uid, [('mass_mailing_campaign_id', '=', cid)], context=context)
|
||||
stats = Statistics.browse(cr, uid, stat_ids, context=context)
|
||||
results[cid] = {
|
||||
'total': len(stats),
|
||||
'failed': len([s for s in stats if not s.scheduled is False and s.sent is False and not s.exception is False]),
|
||||
'scheduled': len([s for s in stats if not s.scheduled is False and s.sent is False and s.exception is False]),
|
||||
'sent': len([s for s in stats if not s.sent is False]),
|
||||
'opened': len([s for s in stats if not s.opened is False]),
|
||||
'replied': len([s for s in stats if not s.replied is False]),
|
||||
'bounced': len([s for s in stats if not s.bounced is False]),
|
||||
}
|
||||
results[cid]['delivered'] = results[cid]['sent'] - results[cid]['bounced']
|
||||
results[cid]['received_ratio'] = 100.0 * results[cid]['delivered'] / (results[cid]['total'] or 1)
|
||||
results[cid]['opened_ratio'] = 100.0 * results[cid]['opened'] / (results[cid]['total'] or 1)
|
||||
results[cid]['replied_ratio'] = 100.0 * results[cid]['replied'] / (results[cid]['total'] or 1)
|
||||
results = {}
|
||||
cr.execute("""
|
||||
SELECT
|
||||
c.id as campaign_id,
|
||||
COUNT(s.id) AS total,
|
||||
COUNT(CASE WHEN s.sent is not null THEN 1 ELSE null END) AS sent,
|
||||
COUNT(CASE WHEN s.scheduled is not null AND s.sent is null AND s.exception is null THEN 1 ELSE null END) AS scheduled,
|
||||
COUNT(CASE WHEN s.scheduled is not null AND s.sent is null AND s.exception is not null THEN 1 ELSE null END) AS failed,
|
||||
COUNT(CASE WHEN s.id is not null AND s.bounced is null THEN 1 ELSE null END) AS delivered,
|
||||
COUNT(CASE WHEN s.opened is not null THEN 1 ELSE null END) AS opened,
|
||||
COUNT(CASE WHEN s.replied is not null THEN 1 ELSE null END) AS replied ,
|
||||
COUNT(CASE WHEN s.bounced is not null THEN 1 ELSE null END) AS bounced
|
||||
FROM
|
||||
mail_mail_statistics s
|
||||
RIGHT JOIN
|
||||
mail_mass_mailing_campaign c
|
||||
ON (c.id = s.mass_mailing_campaign_id)
|
||||
WHERE
|
||||
c.id IN %s
|
||||
GROUP BY
|
||||
c.id
|
||||
""", (tuple(ids), ))
|
||||
for row in cr.dictfetchall():
|
||||
results[row.pop('campaign_id')] = row
|
||||
total = row['total'] or 1
|
||||
row['delivered'] = row['sent'] - row['bounced']
|
||||
row['received_ratio'] = 100.0 * row['delivered'] / total
|
||||
row['opened_ratio'] = 100.0 * row['opened'] / total
|
||||
row['replied_ratio'] = 100.0 * row['replied'] / total
|
||||
return results
|
||||
|
||||
|
||||
_columns = {
|
||||
'name': fields.char('Name', required=True),
|
||||
'stage_id': fields.many2one('mail.mass_mailing.stage', 'Stage', required=True),
|
||||
|
@ -283,26 +295,38 @@ class MassMailing(osv.Model):
|
|||
|
||||
def _get_statistics(self, cr, uid, ids, name, arg, context=None):
|
||||
""" Compute statistics of the mass mailing campaign """
|
||||
Statistics = self.pool['mail.mail.statistics']
|
||||
results = dict.fromkeys(ids, False)
|
||||
for mid in ids:
|
||||
stat_ids = Statistics.search(cr, uid, [('mass_mailing_id', '=', mid)], context=context)
|
||||
stats = Statistics.browse(cr, uid, stat_ids, context=context)
|
||||
results[mid] = {
|
||||
'total': len(stats),
|
||||
'failed': len([s for s in stats if not s.scheduled is False and s.sent is False and not s.exception is False]),
|
||||
'scheduled': len([s for s in stats if not s.scheduled is False and s.sent is False and s.exception is False]),
|
||||
'sent': len([s for s in stats if not s.sent is False]),
|
||||
'opened': len([s for s in stats if not s.opened is False]),
|
||||
'replied': len([s for s in stats if not s.replied is False]),
|
||||
'bounced': len([s for s in stats if not s.bounced is False]),
|
||||
}
|
||||
results[mid]['delivered'] = results[mid]['sent'] - results[mid]['bounced']
|
||||
results[mid]['received_ratio'] = 100.0 * results[mid]['delivered'] / (results[mid]['total'] or 1)
|
||||
results[mid]['opened_ratio'] = 100.0 * results[mid]['opened'] / (results[mid]['total'] or 1)
|
||||
results[mid]['replied_ratio'] = 100.0 * results[mid]['replied'] / (results[mid]['total'] or 1)
|
||||
results = {}
|
||||
cr.execute("""
|
||||
SELECT
|
||||
m.id as mailing_id,
|
||||
COUNT(s.id) AS total,
|
||||
COUNT(CASE WHEN s.sent is not null THEN 1 ELSE null END) AS sent,
|
||||
COUNT(CASE WHEN s.scheduled is not null AND s.sent is null AND s.exception is null THEN 1 ELSE null END) AS scheduled,
|
||||
COUNT(CASE WHEN s.scheduled is not null AND s.sent is null AND s.exception is not null THEN 1 ELSE null END) AS failed,
|
||||
COUNT(CASE WHEN s.id is not null AND s.bounced is null THEN 1 ELSE null END) AS delivered,
|
||||
COUNT(CASE WHEN s.opened is not null THEN 1 ELSE null END) AS opened,
|
||||
COUNT(CASE WHEN s.replied is not null THEN 1 ELSE null END) AS replied ,
|
||||
COUNT(CASE WHEN s.bounced is not null THEN 1 ELSE null END) AS bounced
|
||||
FROM
|
||||
mail_mail_statistics s
|
||||
RIGHT JOIN
|
||||
mail_mass_mailing m
|
||||
ON (m.id = s.mass_mailing_id)
|
||||
WHERE
|
||||
m.id IN %s
|
||||
GROUP BY
|
||||
m.id
|
||||
""", (tuple(ids), ))
|
||||
for row in cr.dictfetchall():
|
||||
results[row.pop('mailing_id')] = row
|
||||
total = row['total'] or 1
|
||||
row['delivered'] = row['sent'] - row['bounced']
|
||||
row['received_ratio'] = 100.0 * row['delivered'] / total
|
||||
row['opened_ratio'] = 100.0 * row['opened'] / total
|
||||
row['replied_ratio'] = 100.0 * row['replied'] / total
|
||||
return results
|
||||
|
||||
|
||||
def _get_mailing_model(self, cr, uid, context=None):
|
||||
res = []
|
||||
for model_name in self.pool:
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
<field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
|
||||
<field invisible="1" name="amount"/>
|
||||
<field invisible="1" name="general_account_id"/>
|
||||
<field invisible="1" name="to_invoice"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
|
|
|
@ -1892,7 +1892,6 @@ class stock_move(osv.osv):
|
|||
result = {
|
||||
'product_qty': 0.00
|
||||
}
|
||||
warning = {}
|
||||
|
||||
if (not product_id) or (product_uos_qty <=0.0):
|
||||
result['product_uos_qty'] = 0.0
|
||||
|
@ -1901,21 +1900,14 @@ class stock_move(osv.osv):
|
|||
product_obj = self.pool.get('product.product')
|
||||
uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
|
||||
|
||||
# Warn if the quantity was decreased
|
||||
for move in self.read(cr, uid, ids, ['product_uos_qty']):
|
||||
if product_uos_qty < move['product_uos_qty']:
|
||||
warning.update({
|
||||
'title': _('Warning: No Back Order'),
|
||||
'message': _("By changing the quantity here, you accept the "
|
||||
"new quantity as complete: OpenERP will not "
|
||||
"automatically generate a Back Order.") })
|
||||
break
|
||||
# No warning if the quantity was decreased to avoid double warnings:
|
||||
# The clients should call onchange_quantity too anyway
|
||||
|
||||
if product_uos and product_uom and (product_uom != product_uos):
|
||||
result['product_qty'] = product_uos_qty / uos_coeff['uos_coeff']
|
||||
else:
|
||||
result['product_qty'] = product_uos_qty
|
||||
return {'value': result, 'warning': warning}
|
||||
return {'value': result}
|
||||
|
||||
def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False,
|
||||
loc_dest_id=False, partner_id=False):
|
||||
|
|
|
@ -34,7 +34,7 @@ class Binary(openerp.http.Controller):
|
|||
_scheme, _netloc, path, params, query, fragment = urlparse(url)
|
||||
# media.linkedin.com is the master domain for LinkedIn media (replicated to CDNs),
|
||||
# so forcing it should always work and prevents abusing this method to load arbitrary URLs
|
||||
url = urlunparse(('http', 'media.linkedin.com', path, params, query, fragment))
|
||||
url = urlunparse(('http', 'media.licdn.com', path, params, query, fragment))
|
||||
bfile = urllib2.urlopen(url)
|
||||
return base64.b64encode(bfile.read())
|
||||
|
||||
|
|
|
@ -413,7 +413,7 @@
|
|||
<table class="table js_kanban">
|
||||
<thead>
|
||||
<tr>
|
||||
<t t-set="width" t-value="str(round(100.0 / len(objects), 2)) + '%'"/>
|
||||
<t t-set="width" t-value="str(round(100.0 / (len(objects) if objects else 1), 2)) + '%'"/>
|
||||
<t t-foreach="objects">
|
||||
<th t-att-width="width">
|
||||
<div t-field="column_id.name" class="text-center"></div>
|
||||
|
|
|
@ -52,6 +52,8 @@ class contactus(http.Controller):
|
|||
elif field_name not in _TECHNICAL: # allow to add some free fields or blacklisted field like ID
|
||||
post_description.append("%s: %s" % (field_name, field_value))
|
||||
|
||||
if "name" not in kwargs and values.get("contact_name"): # if kwarg.name is empty, it's an error, we cannot copy the contact_name
|
||||
values["name"] = values.get("contact_name")
|
||||
# fields validation : Check that required field from model crm_lead exists
|
||||
error = set(field for field in _REQUIRED if not kwargs.get(field))
|
||||
|
||||
|
|
|
@ -361,6 +361,7 @@ class res_partner(osv.osv, format_address):
|
|||
value = {}
|
||||
value['title'] = False
|
||||
if is_company:
|
||||
value['use_parent_address'] = False
|
||||
domain = {'title': [('domain', '=', 'partner')]}
|
||||
else:
|
||||
domain = {'title': [('domain', '=', 'contact')]}
|
||||
|
@ -380,6 +381,7 @@ class res_partner(osv.osv, format_address):
|
|||
'was never correctly set. If an existing contact starts working for a new '
|
||||
'company then a new contact should be created under that new '
|
||||
'company. You can use the "Discard" button to abandon this change.')}
|
||||
if use_parent_address:
|
||||
parent = self.browse(cr, uid, parent_id, context=context)
|
||||
address_fields = self._address_fields(cr, uid, context=context)
|
||||
result['value'] = dict((key, value_or_id(parent[key])) for key in address_fields)
|
||||
|
@ -590,7 +592,7 @@ class res_partner(osv.osv, format_address):
|
|||
""" Supported syntax:
|
||||
- 'Raoul <raoul@grosbedon.fr>': will find name and email address
|
||||
- otherwise: default, everything is set as the name """
|
||||
emails = tools.email_split(text)
|
||||
emails = tools.email_split(text.replace(' ',','))
|
||||
if emails:
|
||||
email = emails[0]
|
||||
name = text[:text.index(email)].replace('"', '').replace('<', '').strip()
|
||||
|
|
|
@ -159,8 +159,8 @@
|
|||
<div class="oe_edit_only">
|
||||
<field name="use_parent_address" class="oe_inline"
|
||||
on_change="onchange_address(use_parent_address, parent_id)"
|
||||
attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
|
||||
<label for="use_parent_address" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
|
||||
attrs="{'invisible': ['|', ('is_company', '=', True),('parent_id', '=', False)]}"/>
|
||||
<label for="use_parent_address" attrs="{'invisible': ['|', ('is_company', '=', True), ('parent_id', '=', False)]}"/>
|
||||
</div>
|
||||
<button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
|
||||
attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
|
||||
|
@ -190,7 +190,7 @@
|
|||
|
||||
<notebook colspan="4">
|
||||
<page string="Contacts" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', [])]}" autofocus="autofocus">
|
||||
<field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer}">
|
||||
<field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_use_parent_address': True}">
|
||||
<kanban>
|
||||
<field name="color"/>
|
||||
<field name="name"/>
|
||||
|
|
|
@ -379,7 +379,11 @@ class _rml_canvas(object):
|
|||
v = utils.attr_get(node, ['x','y'])
|
||||
text=self._textual(node, **v)
|
||||
text = utils.xml2str(text)
|
||||
try:
|
||||
self.canvas.drawString(text=text, **v)
|
||||
except TypeError:
|
||||
_logger.error("Bad RML: <drawString> tag requires attributes 'x' and 'y'!")
|
||||
raise
|
||||
|
||||
def _drawCenteredString(self, node):
|
||||
v = utils.attr_get(node, ['x','y'])
|
||||
|
@ -1005,10 +1009,10 @@ class _rml_template(object):
|
|||
story_cnt = 0
|
||||
for node_story in node_stories:
|
||||
if story_cnt > 0:
|
||||
fis.append(platypus.PageBreak())
|
||||
fis += r.render(node_story)
|
||||
# Reset Page Number with new story tag
|
||||
fis.append(PageReset())
|
||||
fis.append(platypus.PageBreak())
|
||||
fis += r.render(node_story)
|
||||
story_cnt += 1
|
||||
try:
|
||||
if self.localcontext and self.localcontext.get('internal_header',False):
|
||||
|
|
Loading…
Reference in New Issue