Merge lp:~akretion-team/openerp-connector/e-commerce-addons-payment-method-multicompany into lp:openerp-connector/7.0-e-commerce-addons

[arthru]

This adds multicompany supports for payment methods.

Simply add a relation to a res.company from the payment.method, a field to configure it, and a security rule.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM, thanks

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Can you propose the same change on the public e-commerce-addons branch please?
That's what I did myself too for the other addons than 'connector_ecommerce' (so when releasing, the MP will just concern connector_ecommerce).

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hmm, sorry I approved too quickly.

Why is the company_id mandatory? Couldn't a payment method be shared between 2 companies?
Your rule considers that company_id may be empty.

review: Needs Information

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

I think it's better to avoid to share payment method, because payment method are linked with a journal and the journal is specific to a company.
An other solution will be to have property field on payment method, but I think that not sharing payment method is simplier, what do you think?

[lp:~akretion-team/openerp-connector/e-commerce-addons-payment-method-multicompany]

339. By arthru on 2013-10-29

Remove of the required company for the payment method

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> I think it's better to avoid to share payment method, because payment method
> are linked with a journal and the journal is specific to a company.
> An other solution will be to have property field on payment method, but I
> think that not sharing payment method is simplier, what do you think?

Not necessarily, the journal_id is not mandatory.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

How the connectors do handle the selection of the correct payment method if two of them would be possible (1 per company)? Usually, the security rules would filter according to the user's company, but if sales orders are imported with the admin user, what happens?

review: Needs Information

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for the change.

I agree to merge it. The most important is to get it merged into the main branch though.

I'm still interested to know how you handle the selection of the correct payment method in the connectors if 2 methods have the same external id with a different company.

review: Approve

[arthru (arthru)]

As there is no payment method object in prestashop's API, we just match the payment method based on the name and on the company_id. So, there could not be 2 methods with the same external id, as there is no external id, juste a payment method name...

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

On 11/15/2013 10:46 AM, arthru wrote:
> As there is no payment method object in prestashop's API, we just match the payment method based on the name and on the company_id. So, there could not be 2 methods with the same external id, as there is no external id, juste a payment method name...
>

Thanks for your answer.
What you are saying me is that the name of the method is your external
id. So, if you can have several methods with the same name but with a
different company_id, you have several external ids.

My question was more to know if you had implemented the support of
company_id in the Binder... But by reading your answer, I guess that not.

Please propose this merge on lp:e-commerce-addons/7.0

--
Guewen Baconnier
Business Solutions Software Developer

Camptocamp SA
PSE A, CH-1015 Lausanne
Phone: [phone]
Office: [phone]
http://www.camptocamp.com/

=== modified file 'sale_payment_method/__openerp__.py'
--- sale_payment_method/__openerp__.py	2013-03-28 17:08:45 +0000
+++ sale_payment_method/__openerp__.py	2013-10-29 16:27:23 +0000
@@ -43,6 +43,7 @@
     'data': ['sale_view.xml',
              'payment_method_view.xml',
              'security/ir.model.access.csv',
+             'security/rules.xml',
              ],
     'demo': [],
     'installable': True,

=== modified file 'sale_payment_method/payment_method.py'
--- sale_payment_method/payment_method.py	2013-04-03 07:33:59 +0000
+++ sale_payment_method/payment_method.py	2013-10-29 16:27:23 +0000
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
 #                                                                             #
-#   sale_quick_payment for OpenERP                                  #
-#   Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>   #
-#   Copyright 2013 Camptocamp SA (Guewen Baconnier)
+#   sale_quick_payment for OpenERP                                            #
+#   Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>  #
+#   Copyright 2013 Camptocamp SA (Guewen Baconnier)                           #
 #                                                                             #
 #   This program is free software: you can redistribute it and/or modify      #
 #   it under the terms of the GNU Affero General Public License as            #
@@ -39,5 +39,18 @@
         'payment_term_id': fields.many2one(
             'account.payment.term',
             'Payment Term',
-             help="Default payment term of a sale order using this method."),
+            help="Default payment term of a sale order using this method."),
+        'company_id': fields.many2one(
+            'res.company',
+            'Company',
+        ),
+    }
+
+    def _default_company_id(self, cr, uid, context):
+        company_model = self.pool.get('res.company')
+        return company_model._company_default_get(cr, uid, 'payment.method',
+                                                  context=context)
+
+    _defaults = {
+        'company_id': _default_company_id,
     }

=== modified file 'sale_payment_method/payment_method_view.xml'
--- sale_payment_method/payment_method_view.xml	2013-04-17 08:49:35 +0000
+++ sale_payment_method/payment_method_view.xml	2013-10-29 16:27:23 +0000
@@ -18,6 +18,7 @@
                     </h1>
                     <group name="general">
                         <group name="config">
+                            <field name="company_id" string="Company" />
                             <field name="journal_id" string="Journal for payment"/>
                         </group>
                         <group name="payment_help" class="oe_grey" col="1">

=== added file 'sale_payment_method/security/rules.xml'
--- sale_payment_method/security/rules.xml	1970-01-01 00:00:00 +0000
+++ sale_payment_method/security/rules.xml	2013-10-29 16:27:23 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+    <record id="payment_method_rule" model="ir.rule">
+        <field name="name">Payment method multi-company</field>
+        <field name="model_id" ref="model_payment_method" />
+        <field name="global" eval="True" />
+        <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+    </record>
+
+</data>
+</openerp>