From 8deb338ccbdbfb6ac0c29105d46d81b451595252 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Sun, 8 May 2016 00:11:26 +0200
Subject: [PATCH] Add _id suffix on M2O fields customer_payment_mode and
 supplier_payment_mode (Odoo did the same on all the M2O property fields of
 res.partner)

---
 .../demo/sepa_credit_transfer_demo.xml                   | 4 ++--
 .../demo/sepa_direct_debit_demo.xml                      | 4 ++--
 account_payment_partner/demo/partner_demo.xml            | 8 ++++----
 account_payment_partner/models/account_invoice.py        | 4 ++--
 account_payment_partner/models/res_partner.py            | 6 +++---
 account_payment_partner/views/res_partner_view.xml       | 9 +++++----
 account_payment_sale/models/sale_order.py                | 2 +-
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml b/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml
index 6e43a5267..224237ed1 100644
--- a/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml
+++ b/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml
@@ -13,12 +13,12 @@
 
 <!-- Camptocamp -->
 <record id="base.res_partner_12" model="res.partner">
-    <field name="supplier_payment_mode" ref="payment_mode_outbound_sepa_ct1"/>
+    <field name="supplier_payment_mode_id" ref="payment_mode_outbound_sepa_ct1"/>
 </record>
 
 <!-- Asustek -->
 <record id="base.res_partner_1" model="res.partner">
-    <field name="supplier_payment_mode" ref="payment_mode_outbound_sepa_ct1"/>
+    <field name="supplier_payment_mode_id" ref="payment_mode_outbound_sepa_ct1"/>
 </record>
 
 </data>
diff --git a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml
index fb72bb89f..2eeca210b 100644
--- a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml
+++ b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml
@@ -27,7 +27,7 @@
 </record>
 
 <record id="base.res_partner_12" model="res.partner">
-    <field name="customer_payment_mode" ref="payment_mode_inbound_sepa_dd1"/>
+    <field name="customer_payment_mode_id" ref="payment_mode_inbound_sepa_dd1"/>
 </record>
 
 
@@ -42,7 +42,7 @@
 </record>
 
 <record id="base.res_partner_2" model="res.partner">
-    <field name="customer_payment_mode" ref="payment_mode_inbound_sepa_dd1"/>
+    <field name="customer_payment_mode_id" ref="payment_mode_inbound_sepa_dd1"/>
 </record>
 
 
diff --git a/account_payment_partner/demo/partner_demo.xml b/account_payment_partner/demo/partner_demo.xml
index 383d4ae10..20545d978 100644
--- a/account_payment_partner/demo/partner_demo.xml
+++ b/account_payment_partner/demo/partner_demo.xml
@@ -3,19 +3,19 @@
 <openerp>
 <data noupdate="1">
 
-<record id="default_supplier_payment_mode" model="ir.property" forcecreate="True">
+<record id="default_supplier_payment_mode_id" model="ir.property" forcecreate="True">
     <field name="name">Default Supplier Payment Mode</field>
     <field name="fields_id"
-    search="[('model','=','res.partner'),('name','=','supplier_payment_mode')]"/>
+    search="[('model','=','res.partner'),('name','=','supplier_payment_mode_id')]"/>
     <field name="value"
     eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_outbound_ct1'))"/>
     <field name="company_id" ref="base.main_company"/>
 </record>
 
-<record id="default_customer_payment_mode" model="ir.property" forcecreate="True">
+<record id="default_customer_payment_mode_id" model="ir.property" forcecreate="True">
     <field name="name">Default Customer Payment Mode</field>
     <field name="fields_id"
-    search="[('model','=','res.partner'),('name','=','customer_payment_mode')]"/>
+    search="[('model','=','res.partner'),('name','=','customer_payment_mode_id')]"/>
     <field name="value"
     eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_inbound_ct1'))"/>
     <field name="company_id" ref="base.main_company"/>
diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py
index 2e3399a75..b5fbb539f 100644
--- a/account_payment_partner/models/account_invoice.py
+++ b/account_payment_partner/models/account_invoice.py
@@ -20,9 +20,9 @@ class AccountInvoice(models.Model):
         if self.partner_id and self.type:
             if self.type == 'in_invoice':
                 self.payment_mode_id =\
-                    self.partner_id.supplier_payment_mode
+                    self.partner_id.supplier_payment_mode_id
             elif self.type == 'out_invoice':
-                payment_mode = self.partner_id.customer_payment_mode
+                payment_mode = self.partner_id.customer_payment_mode_id
                 self.payment_mode_id = payment_mode
                 if payment_mode and payment_mode.bank_account_link == 'fixed':
                     self.partner_bank_id = payment_mode.fixed_journal_id.\
diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py
index a3b6f8302..ee57a2ae9 100644
--- a/account_payment_partner/models/res_partner.py
+++ b/account_payment_partner/models/res_partner.py
@@ -9,12 +9,12 @@ from openerp import models, fields, api
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
-    supplier_payment_mode = fields.Many2one(
+    supplier_payment_mode_id = fields.Many2one(
         'account.payment.mode', string='Supplier Payment Mode',
         company_dependent=True,
         domain=[('payment_type', '=', 'outbound')],
         help="Select the default payment mode for this supplier.")
-    customer_payment_mode = fields.Many2one(
+    customer_payment_mode_id = fields.Many2one(
         'account.payment.mode', string='Customer Payment Mode',
         company_dependent=True,
         domain=[('payment_type', '=', 'inbound')],
@@ -23,5 +23,5 @@ class ResPartner(models.Model):
     @api.model
     def _commercial_fields(self):
         res = super(ResPartner, self)._commercial_fields()
-        res += ['supplier_payment_mode', 'customer_payment_mode']
+        res += ['supplier_payment_mode_id', 'customer_payment_mode_id']
         return res
diff --git a/account_payment_partner/views/res_partner_view.xml b/account_payment_partner/views/res_partner_view.xml
index 1e787b2bf..3d06ee856 100644
--- a/account_payment_partner/views/res_partner_view.xml
+++ b/account_payment_partner/views/res_partner_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
-    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    Copyright (C) 2014-2016 Akretion (http://www.akretion.com/)
     @author Alexis de Lattre <alexis.delattre@akretion.com>
     The licence is in the file __openerp__.py
 -->
@@ -9,19 +8,21 @@
 <openerp>
 <data>
 
+
 <record id="view_partner_property_form" model="ir.ui.view">
     <field name="name">account_partner_payment.partner_form</field>
     <field name="model">res.partner</field>
     <field name="inherit_id" ref="account.view_partner_property_form" />
     <field name="arch" type="xml">
         <field name="property_payment_term_id" position="after">
-            <field name="customer_payment_mode" widget="selection"/>
+            <field name="customer_payment_mode_id" widget="selection"/>
         </field>
         <field name="property_supplier_payment_term_id" position="after">
-            <field name="supplier_payment_mode" widget="selection"/>
+            <field name="supplier_payment_mode_id" widget="selection"/>
         </field>
     </field>
 </record>
 
+
 </data>
 </openerp>
diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py
index 244165703..5581ea850 100644
--- a/account_payment_sale/models/sale_order.py
+++ b/account_payment_sale/models/sale_order.py
@@ -16,7 +16,7 @@ class SaleOrder(models.Model):
     def onchange_partner_id(self):
         res = super(SaleOrder, self).onchange_partner_id()
         if self.partner_id:
-            self.payment_mode_id = self.partner_id.customer_payment_mode.id
+            self.payment_mode_id = self.partner_id.customer_payment_mode_id
         else:
             self.payment_mode_id = False
         return res