[FIX] minor styling

This commit is contained in:
Guewen Baconnier @ Camptocamp
2012-12-07 09:35:13 +01:00
parent d2358c2d23
commit 70ea693209
3 changed files with 10 additions and 10 deletions

View File

@@ -85,7 +85,6 @@ class ir_attachment(orm.Model):
else: else:
if document: if document:
if document.state == 'pushed': if document.state == 'pushed':
# TODO: cancel on pingen.com
raise osv.except_osv( raise osv.except_osv(
_('Error'), _('Error'),
_('The attachment %s is already pushed to pingen.com.') % \ _('The attachment %s is already pushed to pingen.com.') % \

View File

@@ -37,6 +37,7 @@ POST_SENDING_STATUS = {
400: 'Sending cancelled', 400: 'Sending cancelled',
} }
class PingenException(RuntimeError): class PingenException(RuntimeError):
"""There was an ambiguous exception that occurred while handling your """There was an ambiguous exception that occurred while handling your
request.""" request."""
@@ -51,8 +52,7 @@ class APIError(PingenException):
class Pingen(object): class Pingen(object):
""" Interface to pingen.com API """ Interface to the pingen.com API """
"""
def __init__(self, token, staging=True): def __init__(self, token, staging=True):
self._token = token self._token = token

View File

@@ -91,7 +91,7 @@ class pingen_document(orm.Model):
] ]
def _get_pingen_session(self, cr, uid, context=None): def _get_pingen_session(self, cr, uid, context=None):
""" Returns a pingen session for a user""" """ Returns a pingen session for a user """
company = self.pool.get('res.users').browse( company = self.pool.get('res.users').browse(
cr, uid, uid, context=context).company_id cr, uid, uid, context=context).company_id
return self.pool.get('res.company')._pingen(cr, uid, company, context=context) return self.pool.get('res.company')._pingen(cr, uid, company, context=context)
@@ -99,7 +99,7 @@ class pingen_document(orm.Model):
def _push_to_pingen(self, cr, uid, document, pingen=None, context=None): def _push_to_pingen(self, cr, uid, document, pingen=None, context=None):
""" Push a document to pingen.com """ Push a document to pingen.com
:param Pingen pingen: optional pingen object to, reuse session :param Pingen pingen: optional pingen object to reuse session
""" """
attachment_obj = self.pool.get('ir.attachment') attachment_obj = self.pool.get('ir.attachment')
@@ -224,12 +224,13 @@ class pingen_document(orm.Model):
loc_cr.rollback() loc_cr.rollback()
raise raise
loc_cr.commit() else:
loc_cr.commit()
return True return True
def _resolve_error(self, cr, uid, document, context=None): def _resolve_error(self, cr, uid, document, context=None):
""" A document as resolved, put in the correct state""" """ A document as resolved, put in the correct state """
if document.post_id: if document.post_id:
state = 'sendcenter' state = 'sendcenter'
elif document.pingen_id: elif document.pingen_id:
@@ -239,7 +240,7 @@ class pingen_document(orm.Model):
document.write({'state': state}, context=context) document.write({'state': state}, context=context)
def resolve_error(self, cr, uid, ids, context=None): def resolve_error(self, cr, uid, ids, context=None):
""" A document as resolved, put in the correct state""" """ A document as resolved, put in the correct state """
for document in self.browse(cr, uid, ids, context=context): for document in self.browse(cr, uid, ids, context=context):
self._resolve_error(cr, uid, document, context=context) self._resolve_error(cr, uid, document, context=context)
return True return True
@@ -380,8 +381,8 @@ class pingen_document(orm.Model):
_logger.error('Unexcepted error in pingen cron') _logger.error('Unexcepted error in pingen cron')
loc_cr.rollback() loc_cr.rollback()
raise raise
else:
loc_cr.commit() loc_cr.commit()
return True return True
def update_post_infos(self, cr, uid, ids, context=None): def update_post_infos(self, cr, uid, ids, context=None):