[REF] use except_orm instead of except_osv

account_credit_control/line.py

@@ -186,7 +186,7 @@ class CreditControlLine(orm.Model):
     def unlink(self, cr, uid, ids, context=None, check=True):
         for line in self.browse(cr, uid, ids, context=context):
             if line.state != 'draft':
-                raise osv.except_osv(
+                raise orm.except_orm(
                     _('Error !'),
                     _('You are not allowed to delete a credit control line that '
                       'is not in draft state.'))

account_credit_control/run.py

@@ -22,7 +22,6 @@ import logging
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
-from openerp.osv.osv import except_osv
 
 logger = logging.getLogger('credit.control.run')
 
@@ -72,9 +71,9 @@ class CreditControlRun(orm.Model):
                                 order='date DESC', limit=1, context=context)
         if lines:
             line = line_obj.browse(cr, uid, lines[0], context=context)
-            raise except_osv(
-                _('Error'),
-                _('A run has already been executed more recently than %s') % (line.date))
+            raise orm.except_orm(_('Error'),
+                                 _('A run has already been executed more '
+                                   'recently than %s') % (line.date))
         return True
 
     def _generate_credit_lines(self, cr, uid, run_id, context=None):
@@ -92,9 +91,8 @@ class CreditControlRun(orm.Model):
 
         policies = run.policy_ids
         if not policies:
-            raise except_osv(
-                _('Error'),
-                _('Please select a policy'))
+            raise orm.except_orm(_('Error'),
+                                 _('Please select a policy'))
 
         report = ''
         for policy in policies:
@@ -137,9 +135,9 @@ class CreditControlRun(orm.Model):
                            ' LIMIT 1 FOR UPDATE NOWAIT')
         except Exception as exc:
             # in case of exception openerp will do a rollback for us and free the lock
-            raise except_osv(_('Error'),
-                             _('A credit control run is already running'
-                               ' in background, please try later.'), repr(exc))
+            raise orm.except_orm(_('Error'),
+                                 _('A credit control run is already running'
+                                   ' in background, please try later.'))
 
         self._generate_credit_lines(cr, uid, run_id, context)
         return True

account_credit_control/wizard/credit_control_emailer.py

@@ -19,12 +19,11 @@
 #
 ##############################################################################
 
-from openerp.osv.orm import  TransientModel, fields
-from openerp.osv.osv import except_osv
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 
-class CreditControlEmailer(TransientModel):
+class CreditControlEmailer(orm.TransientModel):
     """Send emails for each selected credit control lines."""
 
     _name = "credit.control.emailer"
@@ -71,7 +70,7 @@ class CreditControlEmailer(TransientModel):
         form = self.browse(cr, uid, wiz_id, context)
 
         if not form.line_ids:
-            raise except_osv(_('Error'), _('No credit control lines selected.'))
+            raise orm.except_orm(_('Error'), _('No credit control lines selected.'))
 
         line_ids = [l.id for l in form.line_ids]
         filtered_ids = self._filter_line_ids(

account_credit_control/wizard/credit_control_marker.py

@@ -18,12 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv.orm import  TransientModel, fields
-from openerp.osv.osv import except_osv
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 
-class CreditControlMarker(TransientModel):
+class CreditControlMarker(orm.TransientModel):
     """Change the state of lines in mass"""
 
     _name = 'credit.control.marker'
@@ -81,7 +80,7 @@ class CreditControlMarker(TransientModel):
         form = self.browse(cr, uid, wiz_id, context)
 
         if not form.line_ids:
-            raise except_osv(_('Error'), _('No credit control lines selected.'))
+            raise orm.except_orm(_('Error'), _('No credit control lines selected.'))
 
         line_ids = [l.id for l in form.line_ids]
 

account_credit_control/wizard/credit_control_printer.py

@@ -20,11 +20,10 @@
 ##############################################################################
 import base64
 
-from openerp.osv.orm import  TransientModel, fields
-from openerp.osv.osv import except_osv
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
-class CreditControlPrinter(TransientModel):
+class CreditControlPrinter(orm.TransientModel):
     """Print lines"""
 
     _name = "credit.control.printer"
@@ -72,7 +71,7 @@ class CreditControlPrinter(TransientModel):
         form = self.browse(cr, uid, wiz_id, context)
 
         if not form.line_ids and not form.print_all:
-            raise except_osv(_('Error'), _('No credit control lines selected.'))
+            raise orm.except_orm(_('Error'), _('No credit control lines selected.'))
 
         line_ids = [l.id for l in form.line_ids]
         comms = comm_obj._generate_comm_from_credit_line_ids(cr, uid, line_ids,