diff --git a/sale_stock_picking_invoicing/__manifest__.py b/sale_stock_picking_invoicing/__manifest__.py index 7341b0e5193..5954a54f175 100644 --- a/sale_stock_picking_invoicing/__manifest__.py +++ b/sale_stock_picking_invoicing/__manifest__.py @@ -21,7 +21,6 @@ "data": [ "views/res_company_view.xml", "views/res_config_settings_view.xml", - "views/sale_order_view.xml", ], "demo": [ "demo/sale_order_demo.xml", diff --git a/sale_stock_picking_invoicing/models/res_company.py b/sale_stock_picking_invoicing/models/res_company.py index 8fc5f6919a0..b651d9e2645 100644 --- a/sale_stock_picking_invoicing/models/res_company.py +++ b/sale_stock_picking_invoicing/models/res_company.py @@ -2,12 +2,24 @@ # @author Magno Costa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import fields, models +from odoo import api, fields, models class ResCompany(models.Model): _inherit = "res.company" + @api.model + def _default_sale_create_invoice_policy(self): + # In order to avoid errors in the tests CI environment when the tests + # Create of Invoice by Sale Order using sale.advance.payment.inv object + # is necessary let default policy as sale_order + # TODO: Is there other form to avoid this problem? + result = "stock_picking" + module_base = self.env["ir.module.module"].search([("name", "=", "base")]) + if module_base.demo: + result = "sale_order" + return result + sale_create_invoice_policy = fields.Selection( selection=[ ("sale_order", "Sale Order"), @@ -16,5 +28,5 @@ class ResCompany(models.Model): string="Sale Create Invoice Policy", help="Define, when Product Type are not service, if Invoice" " should be create from Sale Order or Stock Picking.", - default="stock_picking", + default=_default_sale_create_invoice_policy, ) diff --git a/sale_stock_picking_invoicing/models/sale_order.py b/sale_stock_picking_invoicing/models/sale_order.py index e27a7ce4803..94d29800834 100644 --- a/sale_stock_picking_invoicing/models/sale_order.py +++ b/sale_stock_picking_invoicing/models/sale_order.py @@ -2,40 +2,34 @@ # @author Magno Costa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import _, models +from odoo.exceptions import UserError class SaleOrder(models.Model): _inherit = "sale.order" - # Make Invisible Invoice Button - button_create_invoice_invisible = fields.Boolean( - compute="_compute_get_button_create_invoice_invisible" - ) - - @api.depends("state", "order_line.invoice_status") - def _compute_get_button_create_invoice_invisible(self): - for record in self: - button_create_invoice_invisible = False - - lines = record.order_line.filtered( - lambda line: line.invoice_status == "to invoice" - ) - - # Only after Confirmed Sale Order the button appear - if record.state != "sale": - button_create_invoice_invisible = True + def _get_invoiceable_lines(self, final=False): + """Return the invoiceable lines for order `self`.""" + lines = super()._get_invoiceable_lines(final) + model = self.env.context.get("active_model") + if ( + self.company_id.sale_create_invoice_policy == "stock_picking" + and model != "stock.picking" + ): + new_lines = lines.filtered(lambda ln: ln.product_id.type != "product") + if new_lines: + # Case lines with Product Type 'service' + lines = new_lines else: - if record.company_id.sale_create_invoice_policy == "stock_picking": - # The creation of Invoice to Services should - # be possible in Sale Order - if not any(line.product_id.type == "service" for line in lines): - button_create_invoice_invisible = True - else: - # In the case of Sale Create Invoice Policy based on Sale Order - # when the Button to Create Invoice clicked will be create - # automatic Invoice for Products and Services - if not lines: - button_create_invoice_invisible = True - - record.button_create_invoice_invisible = button_create_invoice_invisible + # Case only Products Type 'product' + raise UserError( + _( + "When 'Sale Create Invoice Policy' is defined as" + "'Stock Picking' the Invoice only can be created" + " from Stock Picking, if necessary you can change" + " this in Company or Sale Settings." + ) + ) + + return lines diff --git a/sale_stock_picking_invoicing/tests/test_sale_stock.py b/sale_stock_picking_invoicing/tests/test_sale_stock.py index ca8b9b49463..c807402aa1a 100644 --- a/sale_stock_picking_invoicing/tests/test_sale_stock.py +++ b/sale_stock_picking_invoicing/tests/test_sale_stock.py @@ -2,6 +2,8 @@ # @author Magno Costa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import exceptions + # TODO: In v16 check the possiblity to use the commom.py # from stock_picking_invoicing # https://github.com/OCA/account-invoicing/blob/16.0/ @@ -17,6 +19,15 @@ def setUpClass(cls): cls.invoice_wizard = cls.env["stock.invoice.onshipping"] cls.stock_return_picking = cls.env["stock.return.picking"] cls.stock_picking = cls.env["stock.picking"] + # In order to avoid errors in the tests CI environment when the tests + # Create of Invoice by Sale Order using sale.advance.payment.inv object + # is necessary let default policy as sale_order, just affect demo data. + # TODO: Is there other form to avoid this problem? + cls.companies = cls.env["res.company"].search( + [("sale_create_invoice_policy", "=", "sale_order")] + ) + for company in cls.companies: + company.sale_create_invoice_policy = "stock_picking" def _run_picking_onchanges(self, record): record.onchange_picking_type() @@ -242,6 +253,8 @@ def test_picking_sale_order_product_and_service(self): # Necessary after call onchange_partner_id "write_date", "__last_update", + # Field sequence add in creation of Invoice + "sequence", ] common_fields = list(set(acl_fields) & set(sol_fields) - set(skipped_fields)) @@ -369,7 +382,7 @@ def test_ungrouping_pickings_partner_shipping_different(self): # Invoice that has different Partner Shipping # should be not groupping invoice_pick_1 = invoices.filtered( - lambda t: t.partner_shipping_id == picking.partner_id + lambda t: t.partner_id != t.partner_shipping_id ) # Invoice should be create with partner_invoice_id self.assertEqual(invoice_pick_1.partner_id, sale_order_1.partner_invoice_id) @@ -383,47 +396,86 @@ def test_ungrouping_pickings_partner_shipping_different(self): self.assertIn(invoice_pick_3_4, picking3.invoice_ids) self.assertIn(invoice_pick_3_4, picking4.invoice_ids) - def test_button_create_bill_in_view(self): - """ - Test Field to make Button Create Bill invisible. - """ - sale_products = self.env.ref( + def test_down_payment(self): + """Test the case with Down Payment""" + sale_order_1 = self.env.ref( "sale_stock_picking_invoicing.main_company-sale_order_1" ) - # Caso do Pedido de Compra em Rascunho - self.assertTrue( - sale_products.button_create_invoice_invisible, - "Field to make invisible the Button Create Bill should be" - " invisible when Sale Order is not in state Sale.", + sale_order_1.action_confirm() + # Create Invoice Sale + context = { + "active_model": "sale.order", + "active_id": sale_order_1.id, + "active_ids": sale_order_1.ids, + } + # Test Create Invoice Policy + payment = ( + self.env["sale.advance.payment.inv"] + .with_context(context) + .create( + { + "advance_payment_method": "delivered", + } + ) ) - # Caso somente com Produtos - sale_products.action_confirm() - self.assertTrue( - sale_products.button_create_invoice_invisible, - "Field to make invisible the button Create Bill should be" - " invisible when Sale Order has only products.", + with self.assertRaises(exceptions.UserError): + payment.with_context(context).create_invoices() + + # DownPayment + payment_wizard = ( + self.env["sale.advance.payment.inv"] + .with_context(context) + .create( + { + "advance_payment_method": "percentage", + "amount": 50, + } + ) ) - picking = sale_products.picking_ids - self.picking_move_state(picking) - self.create_invoice_wizard(picking) - - # Service and Product - sale_service_product = self.env.ref( - "sale_stock_picking_invoicing.main_company-sale_order_2" + payment_wizard.create_invoices() + + invoice_down_payment = sale_order_1.invoice_ids[0] + invoice_down_payment.action_post() + payment_register = Form( + self.env["account.payment.register"].with_context( + active_model="account.move", + active_ids=invoice_down_payment.ids, + ) ) - sale_service_product.action_confirm() - self.assertFalse( - sale_service_product.button_create_invoice_invisible, - "Field to make invisible the Button Create Bill should be" - " False when the Sale Order has Service and Product.", + journal_cash = self.env["account.journal"].search( + [ + ("type", "=", "cash"), + ("company_id", "=", invoice_down_payment.company_id.id), + ], + limit=1, + ) + payment_register.journal_id = journal_cash + payment_method_manual_in = self.env.ref( + "account.account_payment_method_manual_in" ) + payment_register.payment_method_id = payment_method_manual_in + payment_register.amount = invoice_down_payment.amount_total + payment_register.save()._create_payments() - # Sale Invoice Policy based on sale_order - sale = self.env.ref("sale_stock_picking_invoicing.main_company-sale_order_3") - sale.company_id.sale_create_invoice_policy = "sale_order" - sale.action_confirm() - self.assertTrue( - sale.button_create_invoice_invisible, - "Field to make invisible the button Create Bill should be" - " invisible when Sale Invoice Policy based on sale_order.", + picking = sale_order_1.picking_ids + self.picking_move_state(picking) + invoice = self.create_invoice_wizard(picking) + # 2 Lines of Products and 2 lines of Down Payment + self.assertEqual(len(invoice.invoice_line_ids), 4) + line_section = invoice.invoice_line_ids.filtered( + lambda line: line.display_type == "line_section" + ) + assert line_section, "Invoice without Line Section for Down Payment." + down_payment_line = invoice.invoice_line_ids.filtered( + lambda line: line.sale_line_ids.is_downpayment + ) + assert down_payment_line, "Invoice without Down Payment line." + + def test_default_value_sale_create_invoice_policy(self): + """Test default value for sale_create_invoice_policy""" + company = self.env["res.company"].create( + { + "name": "Test", + } ) + self.assertEqual(company.sale_create_invoice_policy, "sale_order") diff --git a/sale_stock_picking_invoicing/views/sale_order_view.xml b/sale_stock_picking_invoicing/views/sale_order_view.xml deleted file mode 100644 index 67ce729ab91..00000000000 --- a/sale_stock_picking_invoicing/views/sale_order_view.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - sale_stock_picking_invoicing.order.form - sale.order - - 99 - - - - - - {'invisible': [('button_create_invoice_invisible', '=', True)]} - - - - {'invisible': ['|', ('button_create_invoice_invisible', '=', True), ('state', '=', 'sale')]} - - - - - diff --git a/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py b/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py index 635b74430ab..a3239b90f02 100644 --- a/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py +++ b/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py @@ -145,3 +145,80 @@ def _get_invoice_line_values(self, moves, invoice_values, invoice): values.update(sale_line_values_rm) return values + + def _create_invoice(self, invoice_values): + """Override this method if you need to change any values of the + invoice and the lines before the invoice creation + :param invoice_values: dict with the invoice and its lines + :return: invoice + """ + pickings = self._load_pickings() + pick = fields.first(pickings) + if pick.sale_id: + invoice_item_sequence = ( + 0 # Incremental sequencing to keep the lines order on the invoice. + ) + + order = pick.sale_id.with_company(pick.sale_id.company_id) + + invoiceable_lines = order._get_invoiceable_lines(final=True) + + # Get Sale Sequence + sale_sequence_list = [] + for line in invoice_values.get("invoice_line_ids"): + if line[2].get("sequence"): + sale_sequence_list.append(line[2].get("sequence")) + + invoice_item_sequence = max(sale_sequence_list) + 1 + + invoice_line_vals = [] + down_payment_section_added = False + for line in invoiceable_lines: + if not down_payment_section_added and line.is_downpayment: + # Create a dedicated section for the down payments + # (put at the end of the invoiceable_lines) + invoice_line_vals.append( + ( + 0, + 0, + order._prepare_down_payment_section_line( + sequence=invoice_item_sequence, + ), + ), + ) + down_payment_section_added = True + + if line.is_downpayment and line.price_unit: + value_down_payment = line._prepare_invoice_line() + invoice_line_vals.append( + (0, 0, value_down_payment), + ) + + invoice_item_sequence += 1 + + invoice_values["invoice_line_ids"] += invoice_line_vals + + moves = ( + self.env["account.move"] + .sudo() + .with_context(default_move_type="out_invoice") + .create(invoice_values) + ) + + # TODO: Should Final field always True? + final = True + if final: + moves.sudo().filtered( + lambda m: m.amount_total < 0 + ).action_switch_invoice_into_refund_credit_note() + for move in moves: + move.message_post_with_view( + "mail.message_origin_link", + values={ + "self": move, + "origin": move.line_ids.mapped("sale_line_ids.order_id"), + }, + subtype_id=self.env.ref("mail.mt_note").id, + ) + + return moves