audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MIG] account_banking_mandate_sale from v14 to v15

Browse Source 
The mandate must now be linked to the invoicing partner and not to the partner of the sale order
This commit is contained in:
Alexis de Lattre
2022-01-05 00:23:02 +01:00
parent e2d61839e6
commit bc393d13e9
6 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
account_banking_mandate_sale/__manifest__.py
View File

@@ -1,17 +1,17 @@
# Copyright 2016-2020 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2016-2022 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
"name": "Account Banking Mandate Sale",
"version": "14.0.1.0.0",
"version": "15.0.1.0.0",
"category": "Banking addons",
"license": "AGPL-3",
"summary": "Adds mandates on sale orders",
"author": "Odoo Community Association (OCA), " "Akretion",
"author": "Odoo Community Association (OCA), Akretion",
"maintainers": ["alexis-via"],
"website": "https://github.com/OCA/bank-payment",
"depends": [
"account_payment_sale",
"sale_commercial_partner",
"account_banking_mandate",
],
"data": [

29
account_banking_mandate_sale/models/sale_order.py
View File

@@ -1,4 +1,4 @@
# Copyright 2014-2020 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2014-2022 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, fields, models
@@ -7,15 +7,18 @@ from odoo import api, fields, models
class SaleOrder(models.Model):
_inherit = "sale.order"
# This field commercial_partner_id should be moved
# in an OCA base module named for example sale_commercial_partner
commercial_invoice_partner_id = fields.Many2one(
related="partner_invoice_id.commercial_partner_id",
string="Invoicing Commercial Entity",
store=True,
)
mandate_id = fields.Many2one(
"account.banking.mandate",
string="Direct Debit Mandate",
ondelete="restrict",
check_company=True,
readonly=False,
domain="[('partner_id', '=', commercial_partner_id), "
domain="[('partner_id', '=', commercial_invoice_partner_id), "
"('state', 'in', ('draft', 'valid')), "
"('company_id', '=', company_id)]",
)
@@ -26,20 +29,25 @@ class SaleOrder(models.Model):
def _prepare_invoice(self):
"""Copy mandate from sale order to invoice"""
vals = super()._prepare_invoice()
vals["mandate_id"] = self.mandate_id.id or False
if self.mandate_id:
vals["mandate_id"] = self.mandate_id.id
return vals
@api.depends("partner_id")
@api.depends("partner_invoice_id")
def _compute_payment_mode(self):
"""Select by default the first valid mandate of the partner"""
super()._compute_payment_mode()
"""Select by default the first valid mandate of the invoicing partner"""
res = super()._compute_payment_mode()
abm_obj = self.env["account.banking.mandate"]
for order in self:
if order.mandate_required and order.partner_id:
if order.mandate_required and order.partner_invoice_id:
mandate = abm_obj.search(
[
("state", "=", "valid"),
("partner_id", "=", order.commercial_partner_id.id),
(
"partner_id",
"=",
order.partner_invoice_id.commercial_partner_id.id,
),
("company_id", "=", order.company_id.id),
],
limit=1,
@@ -47,3 +55,4 @@ class SaleOrder(models.Model):
order.mandate_id = mandate or False
else:
order.mandate_id = False
return res

4
account_banking_mandate_sale/views/sale_order.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
© 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
Copyright 2016-2022 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
@@ -11,12 +11,12 @@
<field name="inherit_id" ref="account_payment_sale.view_order_form" />
<field name="arch" type="xml">
<field name="fiscal_position_id" position="after">
<field name="commercial_partner_id" invisible="1" />
<field
name="mandate_id"
attrs="{'invisible': [('mandate_required', '=', False)]}"
/>
<field name="mandate_required" invisible="1" />
<field name="commercial_invoice_partner_id" invisible="1" />
</field>
</field>
</record>

2
account_banking_mandate_sale/wizard/sale_make_invoice_advance.py
View File

@@ -1,4 +1,4 @@
# Copyright 2016-2020 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2016-2022 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models

1
setup/account_banking_mandate_sale/odoo/addons/account_banking_mandate_sale Symbolic link
View File

@@ -0,0 +1 @@
../../../../account_banking_mandate_sale

6
setup/account_banking_mandate_sale/setup.py Normal file
View File

@@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)