From be9717dafd015e54ff982b2a79017a94e5e2f7dc Mon Sep 17 00:00:00 2001
From: Graeme Gellatly <gdgellatly@gmail.com>
Date: Sun, 5 Jan 2014 18:40:54 +1300
Subject: [PATCH] [FIX] Minor fixes to enable install on trunk, explicit
 imports added, alternative string concatenation in help and change to correct
 xml comment style

---
 account_statement_base_completion/__init__.py    |  5 +++--
 account_statement_base_completion/partner.py     |  8 ++++----
 account_statement_base_completion/statement.py   |  5 ++---
 .../report/bank_statement_report.py              |  2 +-
 account_statement_ext/statement_view.xml         | 16 ++++++++--------
 .../parser/ofx_parser.py                         |  6 ++++--
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/account_statement_base_completion/__init__.py b/account_statement_base_completion/__init__.py
index 6c9ef1bc..2a3a858d 100644
--- a/account_statement_base_completion/__init__.py
+++ b/account_statement_base_completion/__init__.py
@@ -19,5 +19,6 @@
 #
 ##############################################################################
 
-import statement
-import partner
+from . import partner
+from . import statement
+
diff --git a/account_statement_base_completion/partner.py b/account_statement_base_completion/partner.py
index 89c810d5..4d3a452e 100644
--- a/account_statement_base_completion/partner.py
+++ b/account_statement_base_completion/partner.py
@@ -20,7 +20,7 @@
 #################################################################################
 
 from openerp.osv.orm import Model
-from openerp.osv import fields, osv
+from openerp.osv import fields
 
 
 class res_partner(Model):
@@ -32,7 +32,7 @@ class res_partner(Model):
 
     _columns = {
         'bank_statement_label': fields.char('Bank Statement Label', size=100,
-                help="Enter the various label found on your bank statement separated by a ; If \
-                 one of this label is include in the bank statement line, the partner will be automatically \
-                 filled (as long as you use this method/rules in your statement profile)."),
+                help="Enter the various label found on your bank statement separated by a ; If "
+                 "one of this label is include in the bank statement line, the partner will be automatically "
+                 "filled (as long as you use this method/rules in your statement profile)."),
             }
diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py
index 96ab741b..d387e7da 100644
--- a/account_statement_base_completion/statement.py
+++ b/account_statement_base_completion/statement.py
@@ -23,16 +23,15 @@ import traceback
 import sys
 import logging
 import simplejson
-
+import datetime
 import psycopg2
 
 from collections import defaultdict
 import re
-from tools.translate import _
+from openerp.tools.translate import _
 from openerp.osv import osv, orm, fields
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from operator import attrgetter
-import datetime
 
 _logger = logging.getLogger(__name__)
 
diff --git a/account_statement_ext/report/bank_statement_report.py b/account_statement_ext/report/bank_statement_report.py
index 9bdca7fa..80e6af65 100644
--- a/account_statement_ext/report/bank_statement_report.py
+++ b/account_statement_ext/report/bank_statement_report.py
@@ -22,7 +22,7 @@ from openerp.report import report_sxw
 from openerp.tools.translate import _
 from openerp import pooler
 from datetime import datetime
-from report_webkit import webkit_report
+from openerp.addons.report_webkit import webkit_report
 
 
 class BankStatementWebkit(report_sxw.rml_parse):
diff --git a/account_statement_ext/statement_view.xml b/account_statement_ext/statement_view.xml
index f42d6581..063ba92a 100644
--- a/account_statement_ext/statement_view.xml
+++ b/account_statement_ext/statement_view.xml
@@ -96,13 +96,9 @@
       <field name="model">account.bank.statement</field>
       <field name="inherit_id" ref="account.view_bank_statement_form"/>
       <field name="type">form</field>
-      <field name="arch" type="xml">
+      <field name="arch" type="xml" >
 
           <!-- Add before the group : profile and related infos -->
-          <field name="journal_id" position="attributes">
-              <attribute name="invisible">True</attribute>
-          </field>
-
           <label for="name" position="before">
               <group>
                   <field name="profile_id" select="1" required="1" on_change="onchange_imp_config_id(profile_id)" widget="selection"/>
@@ -110,7 +106,11 @@
               </group>
           </label>
 
-          # Make balance visible or not depending on profile
+          <field name="journal_id" position="attributes">
+              <attribute name="invisible">True</attribute>
+          </field>
+
+          <!-- Make balance visible or not depending on profile -->
           <field name="balance_start" position="attributes">
               <attribute name="attrs">{'invisible':[('balance_check','=',False)]}</attribute>
           </field>
@@ -128,7 +128,7 @@
           <xpath expr="//field[@name='line_ids']/form//field[@name='date']" position="before">
               <field name="id" readonly="1" />
           </xpath>
-          # Adapt onchange signature
+          <!-- Adapt onchange signature -->
           <xpath expr="//field[@name='line_ids']/tree/field[@name='partner_id']" position="replace">
               <field name="partner_id" on_change="onchange_partner_id(partner_id,parent.profile_id)" domain="['|',('parent_id','=',False),('is_company','=',True)]"/>
           </xpath>
@@ -139,7 +139,7 @@
           <xpath expr="//field[@name='line_ids']/form//field[@name='type']" position="replace">
                <field name="type" on_change="onchange_type(partner_id, type, parent.profile_id)"/>
           </xpath>
-          # also set type hidden as it has no impact on reconciliation
+          <!-- also set type hidden as it has no impact on reconciliation -->
           <xpath expr="//field[@name='line_ids']/tree/field[@name='type']" position="replace">
                <field name="type" on_change="onchange_type(partner_id, type, parent.profile_id)" invisible="1"/>
           </xpath>
diff --git a/account_statement_ofx_import/parser/ofx_parser.py b/account_statement_ofx_import/parser/ofx_parser.py
index 65961241..5b86035d 100644
--- a/account_statement_ofx_import/parser/ofx_parser.py
+++ b/account_statement_ofx_import/parser/ofx_parser.py
@@ -18,11 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.tools.translate import _
-from account_statement_base_import.parser import BankStatementImportParser
+
 import tempfile
 import datetime
 
+from openerp.tools.translate import _
+from openerp.addons.account_statement_base_import.parser import BankStatementImportParser
+
 try:
     import ofxparse
 except: