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

[MERGE] forward port of branch saas-3 up to b62ee07

This commit is contained in:
Christophe Simonis 2015-05-21 14:19:24 +02:00
parent 02b8be4a8b b62ee0734c
commit 327e471c9b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_move_line.py
View File

@ -1234,7 +1234,7 @@ class account_move_line(osv.osv):
period = period_obj.browse(cr, uid, period_id, context=context) period = period_obj.browse(cr, uid, period_id, context=context)
for (state,) in result: for (state,) in result:
if state == 'done': if state == 'done':
raise osv.except_osv(_('Error!'), _('You can not add/modify entries in a closed period %s of journal %s.') % (period.name,journal.name)) raise osv.except_osv(_('Error!'), _('You can not add/modify entries in a closed period %s of journal %s.') % (period.name, journal.name))
if not result: if not result:
jour_period_obj.create(cr, uid, { jour_period_obj.create(cr, uid, {
'name': (journal.code or journal.name)+':'+(period.name or ''), 'name': (journal.code or journal.name)+':'+(period.name or ''),

2
addons/mail/wizard/mail_compose_message.py
View File

@ -263,7 +263,7 @@ class mail_compose_message(osv.TransientModel):
# static wizard (mail.message) values # static wizard (mail.message) values
mail_values = { mail_values = {
'subject': wizard.subject, 'subject': wizard.subject,
'body': wizard.body, 'body': wizard.body or '',
'parent_id': wizard.parent_id and wizard.parent_id.id, 'parent_id': wizard.parent_id and wizard.parent_id.id,
'partner_ids': [partner.id for partner in wizard.partner_ids], 'partner_ids': [partner.id for partner in wizard.partner_ids],
'attachment_ids': [attach.id for attach in wizard.attachment_ids], 'attachment_ids': [attach.id for attach in wizard.attachment_ids],

2
addons/mrp_operations/mrp_operations.py
View File

@ -336,7 +336,7 @@ class mrp_production(osv.osv):
for po in self.browse(cr, uid, ids, context=context): for po in self.browse(cr, uid, ids, context=context):
direction[po.id] = cmp(po.date_start, vals.get('date_start', False)) direction[po.id] = cmp(po.date_start, vals.get('date_start', False))
result = super(mrp_production, self).write(cr, uid, ids, vals, context=context) result = super(mrp_production, self).write(cr, uid, ids, vals, context=context)
if (vals.get('workcenter_lines', False) or vals.get('date_start', False)) and update: if (vals.get('workcenter_lines', False) or vals.get('date_start', False) or vals.get('date_planned', False)) and update:
self._compute_planned_workcenter(cr, uid, ids, context=context, mini=mini) self._compute_planned_workcenter(cr, uid, ids, context=context, mini=mini)
for d in direction: for d in direction:
if direction[d] == 1: if direction[d] == 1:

2
openerp/osv/expression.py
View File

@ -401,7 +401,7 @@ def is_leaf(element, internal=False):
and len(element) == 3 \ and len(element) == 3 \
and element[1] in INTERNAL_OPS \ and element[1] in INTERNAL_OPS \
and ((isinstance(element[0], basestring) and element[0]) and ((isinstance(element[0], basestring) and element[0])
or element in (TRUE_LEAF, FALSE_LEAF)) or tuple(element) in (TRUE_LEAF, FALSE_LEAF))
# -------------------------------------------------- # --------------------------------------------------