[FIX] Allow for any kind of account

[RFR] Use property fields

account_banking_partner_journal_account/i18n/nl.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-16 10:29+0000\n"
-"PO-Revision-Date: 2013-11-16 10:29+0000\n"
+"POT-Creation-Date: 2013-11-26 19:34+0000\n"
+"PO-Revision-Date: 2013-11-26 19:34+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,22 +21,21 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: account_banking_partner_journal_account
-#: help:res.partner,account_receivable_bank_id:0
+#: help:res.partner,property_account_receivable_bank_id:0
 msgid "Optional default journal account on bank statements for debits from this partner. Overrides the default debit account."
 msgstr "Optionele standaard grootboekrekening voor geïmporteerde bankbijschrijvingen, in plaats van de standaard debiteurenrekening."
 
 #. module: account_banking_partner_journal_account
-#: field:res.partner,account_payable_bank_id:0
+#: field:res.partner,property_account_payable_bank_id:0
 msgid "Default bank credit account"
 msgstr "Standaardrekening bankafschrijvingen"
 
 #. module: account_banking_partner_journal_account
-#: help:res.partner,account_payable_bank_id:0
+#: help:res.partner,property_account_payable_bank_id:0
 msgid "Optional default journal account on bank statements for credits from this partner. Overrides the default credit account."
 msgstr "Optionele standaard grootboekrekening voor geïmporteerde bankafschrijvingen, in plaats van de standaard crediteurenrekening."
 
 #. module: account_banking_partner_journal_account
-#: field:res.partner,account_receivable_bank_id:0
+#: field:res.partner,property_account_receivable_bank_id:0
 msgid "Default bank debit account"
 msgstr "Standaardrekening bankbijschrijvingen"
-

account_banking_partner_journal_account/res_partner.py

@@ -25,20 +25,24 @@ class ResPartner(orm.Model):
     _inherit = 'res.partner'
 
     _columns = {
-        'account_payable_bank_id': fields.many2one(
+        'property_account_payable_bank_id': fields.property(
             'account.account',
-            'Default bank credit account',
+            type='many2one',
+            relation='account.account',
+            string='Default bank credit account',
             help=('Optional default journal account on bank statements for '
                   'credits from this partner. Overrides the default credit '
                   'account.'),
-            domain=[('reconcile', '=', True)]),
-        'account_receivable_bank_id': fields.many2one(
+            domain=[('type', '!=', 'view')]),
+        'property_account_receivable_bank_id': fields.property(
             'account.account',
-            'Default bank debit account',
+            type='many2one',
+            relation='account.account',
+            string='Default bank debit account',
             help=('Optional default journal account on bank statements for '
                   'debits from this partner. Overrides the default debit '
                   'account.'),
-            domain=[('reconcile', '=', True)]),
+            domain=[('type', '!=', 'view')]),
         }
 
     def def_journal_account_bank_decr(
@@ -48,8 +52,8 @@ class ResPartner(orm.Model):
         res = super(ResPartner, self).def_journal_account_bank_decr(
             cr, uid, ids, context=context)
         for partner in self.browse(cr, uid, ids, context=context):
-            if partner.account_payable_bank_id:
-                res[partner.id] = partner.account_payable_bank_id.id
+            if partner.property_account_payable_bank_id:
+                res[partner.id] = partner.property_account_payable_bank_id.id
         return res
 
     def def_journal_account_bank_incr(
@@ -59,6 +63,6 @@ class ResPartner(orm.Model):
         res = super(ResPartner, self).def_journal_account_bank_incr(
             cr, uid, ids, context=context)
         for partner in self.browse(cr, uid, ids, context=context):
-            if partner.account_receivable_bank_id:
-                res[partner.id] = partner.account_receivable_bank_id.id
+            if partner.property_account_receivable_bank_id:
+                res[partner.id] = partner.property_account_receivable_bank_id.id
         return res

account_banking_partner_journal_account/res_partner_view.xml

@@ -7,11 +7,11 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="property_account_receivable" position="after">
-                    <field name="account_receivable_bank_id"
+                    <field name="property_account_receivable_bank_id"
                            groups="account.group_account_invoice" />
                 </field>
                 <field name="property_account_payable" position="after">
-                    <field name="account_payable_bank_id"
+                    <field name="property_account_payable_bank_id"
                            groups="account.group_account_invoice" />
                 </field>
             </field>