From a1d2a4806bfbf9c3fd77b635f074a472c19b50ac Mon Sep 17 00:00:00 2001
From: Florian da Costa <florian.dacosta@akretion.com.br>
Date: Thu, 13 Mar 2014 16:44:34 +0100
Subject: [PATCH] [FIX] replace old naming of exception + simplify xpath
 expression to make it more portable

---
 account_statement_base_completion/statement.py   | 2 +-
 account_statement_base_import/statement_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py
index 4f70d041..0ac47489 100644
--- a/account_statement_base_completion/statement.py
+++ b/account_statement_base_completion/statement.py
@@ -394,7 +394,7 @@ class AccountStatement(orm.Model):
                 ], context=context)
             if line_without_account:
                 stat = self.browse(cr, uid, stat_id, context=context)
-                raise osv.except_osv(_('User error'),
+                raise orm.except_orm(_('User error'),
                         _('You should fill all account on the line of the'
                         ' statement %s')%stat.name)
         return super(AccountStatement, self).button_confirm_bank(cr, uid, ids, context=context)
diff --git a/account_statement_base_import/statement_view.xml b/account_statement_base_import/statement_view.xml
index 3a7fae60..ded05b28 100644
--- a/account_statement_base_import/statement_view.xml
+++ b/account_statement_base_import/statement_view.xml
@@ -34,10 +34,10 @@
          <field name="type">form</field>
          <field eval="20" name="priority"/>
          <field name="arch" type="xml">
-             <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/group/field[@name='account_id']" position="attributes">
+             <xpath expr="//field[@name='line_ids']/form//field[@name='account_id']" position="attributes">
                  <attribute name="attrs">{'required': [('already_completed','=', True)]}</attribute>
              </xpath>
-             <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='account_id']" position="attributes">
+             <xpath expr="//field[@name='line_ids']/tree//field[@name='account_id']" position="attributes">
                  <attribute name="attrs">{'required': [('already_completed','=', True)]}</attribute>
              </xpath>
          </field>