Merge lp:~elbati/purchase-wkfl/fix-purchase_delivery_term-osv into lp:~purchase-core-editors/purchase-wkfl/7.0

[Lorenzo Battistini]

[Stefan Rijnhart (Opener) (stefan-opener)]

LGTM

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

=== modified file 'purchase_delivery_term/purchase.py'
--- purchase_delivery_term/purchase.py	2013-02-20 07:53:01 +0000
+++ purchase_delivery_term/purchase.py	2013-03-28 17:40:27 +0000
@@ -146,14 +146,14 @@
         group_ids = group_pool.search(cr, uid, [])
         for master_line in self.browse(cr, uid, ids):
             if master_line.order_line_ids:
-                raise osv.except_osv(_('Error'),
+                raise orm.except_orm(_('Error'),
                     _("Detailed lines generated yet (for master line '%s'). Remove them first") % master_line.name)
             if len(master_line.delivery_term_id.line_ids) > len(group_ids):
-                raise osv.except_osv(_('Error'),
+                raise orm.except_orm(_('Error'),
                     _("Delivery term lines are %d. Order line groups are %d. Please create more groups")
                     % (len(master_line.delivery_term_id.line_ids), len(group_ids)))
             if not master_line.delivery_term_id.is_total_percentage_correct():
-                raise osv.except_osv(_('Error'),
+                raise orm.except_orm(_('Error'),
                     _("Total percentage of delivery term %s is not equal to 1") % master_line.delivery_term_id.name)
             for group_index, term_line in enumerate(master_line.delivery_term_id.line_ids):
                 order_line_vals = self._prepare_order_line(cr, uid, term_line,