From e7b4edbe5852a6308966eac13d748d8cc031d1c6 Mon Sep 17 00:00:00 2001 From: SodexisTeam Date: Fri, 11 Nov 2022 19:03:23 +0530 Subject: [PATCH] [MIG] account_payment_sale: Migration to 16.0 --- account_payment_sale/__init__.py | 1 - account_payment_sale/__manifest__.py | 2 +- account_payment_sale/models/sale_order.py | 1 + account_payment_sale/readme/CONTRIBUTORS.rst | 1 + account_payment_sale/tests/test_sale_order.py | 3 +-- account_payment_sale/wizard/sale_make_invoice_advance.py | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py index 2c9b3790d..9b4296142 100644 --- a/account_payment_sale/__init__.py +++ b/account_payment_sale/__init__.py @@ -1,3 +1,2 @@ from . import models from . import wizard -from . import tests diff --git a/account_payment_sale/__manifest__.py b/account_payment_sale/__manifest__.py index ea20463a6..e2a8d8c29 100644 --- a/account_payment_sale/__manifest__.py +++ b/account_payment_sale/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Account Payment Sale", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "category": "Banking addons", "license": "AGPL-3", "summary": "Adds payment mode on sale orders", diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index 3fc69c238..5a931e655 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -12,6 +12,7 @@ class SaleOrder(models.Model): compute="_compute_payment_mode", store=True, readonly=False, + precompute=True, check_company=True, domain="[('payment_type', '=', 'inbound'), ('company_id', '=', company_id)]", ) diff --git a/account_payment_sale/readme/CONTRIBUTORS.rst b/account_payment_sale/readme/CONTRIBUTORS.rst index 408931b06..155888dbf 100644 --- a/account_payment_sale/readme/CONTRIBUTORS.rst +++ b/account_payment_sale/readme/CONTRIBUTORS.rst @@ -5,3 +5,4 @@ * Raphaël Valyi * Raf Ven * Manuel Regidor +* Sodexis diff --git a/account_payment_sale/tests/test_sale_order.py b/account_payment_sale/tests/test_sale_order.py index a2c5e994b..40a4fc2f0 100644 --- a/account_payment_sale/tests/test_sale_order.py +++ b/account_payment_sale/tests/test_sale_order.py @@ -10,8 +10,6 @@ class TestSaleOrder(CommonTestCase): def create_sale_order(self, payment_mode=None): with Form(self.env["sale.order"]) as sale_form: sale_form.partner_id = self.base_partner - sale_form.partner_invoice_id = self.base_partner - sale_form.partner_shipping_id = self.base_partner sale_form.pricelist_id = self.env.ref("product.list0") for (_, p) in self.products.items(): with sale_form.order_line.new() as order_line: @@ -89,6 +87,7 @@ class TestSaleOrder(CommonTestCase): "advance_payment_method": "fixed", "fixed_amount": 5, "product_id": self.env.ref("sale.advance_product_0").id, + "sale_order_ids": order, } ) payment.with_context(**context).create_invoices() diff --git a/account_payment_sale/wizard/sale_make_invoice_advance.py b/account_payment_sale/wizard/sale_make_invoice_advance.py index 9d9dc1a18..c166cef33 100644 --- a/account_payment_sale/wizard/sale_make_invoice_advance.py +++ b/account_payment_sale/wizard/sale_make_invoice_advance.py @@ -7,8 +7,8 @@ from odoo import models class SaleAdvancePaymentInv(models.TransientModel): _inherit = "sale.advance.payment.inv" - def _prepare_invoice_values(self, order, name, amount, so_line): + def _prepare_invoice_values(self, order, so_line): """Copy payment mode from sale order to invoice""" - vals = super()._prepare_invoice_values(order, name, amount, so_line) + vals = super()._prepare_invoice_values(order, so_line) order._get_payment_mode_vals(vals) return vals