Minor import fixes plus a couple of other small changes to allow trunk install. Changed method get_default_pay_receive_accounts of account_statement_ext to use orm built in get. Is actually an improvement as get ensures the result is the most specific property whereas the original method gave no such guarentee in a multicompany environment.

Without this this method will fail on trunk and am surprised if it worked on 7.0, however the change is backward compatible with 7.0 and more efficient and less code.

account_statement_ext/__openerp__.py

@@ -20,7 +20,7 @@
 ##############################################################################
 
 {'name': "Bank statement extension and profiles",
- 'version': '1.3.5',
+ 'version': '1.3.6',
  'author': 'Camptocamp',
  'maintainer': 'Camptocamp',
  'category': 'Finance',

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):

account_statement_ext/statement.py

@@ -112,7 +112,7 @@ class AccountStatementProfile(Model):
     _constraints = [
         (_check_partner, "You need to put a partner if you tic the 'Force partner on bank move'!", []),
     ]
-    
+
     _sql_constraints = [
         ('name_uniq', 'unique (name, company_id)', 'The name of the bank statement must be unique !')
     ]
@@ -434,7 +434,7 @@ class AccountBankStatement(Model):
             if errors_stack:
                 msg = u"\n".join(errors_stack)
                 raise osv.except_osv(_('Error'), msg)
-#end changes
+# end changes
             self.write(cr, uid, [st.id],
                        {'name': st_number,
                         'balance_end_real': st.balance_end},
@@ -537,31 +537,15 @@ class AccountBankStatement(Model):
         :return: tuple of int/long ID that give account_receivable, account_payable based on
                  company default.
         """
-        account_receivable = False
-        account_payable = False
-        property_obj = self.pool.get('ir.property')
-        model_fields_obj = self.pool.get('ir.model.fields')
-        model_fields_ids = model_fields_obj.search(
-            cr,
-            uid,
-            [('name', 'in', ['property_account_receivable',
-                             'property_account_payable']),
-             ('model', '=', 'res.partner')],
-            context=context
-        )
-        property_ids = property_obj.search(cr,
-                                           uid,
-                                           [('fields_id', 'in', model_fields_ids),
-                                            ('res_id', '=', False)],
-                                           context=context)
 
-        for erp_property in property_obj.browse(
-                cr, uid, property_ids, context=context):
-            if erp_property.fields_id.name == 'property_account_receivable':
-                account_receivable = erp_property.value_reference.id
-            elif erp_property.fields_id.name == 'property_account_payable':
-                account_payable = erp_property.value_reference.id
-        return account_receivable, account_payable
+        property_obj = self.pool.get('ir.property')
+        account_receivable = property_obj.get(cr, uid, 'property_account_receivable',
+                                              'res.partner', context=context)
+        account_payable = property_obj.get(cr, uid, 'property_account_payable',
+                                           'res.partner', context=context)
+
+        return (account_receivable and account_receivable.id or False,
+                account_payable and account_payable.id or False)
 
     def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
         """

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>