Switch to Odoo 19.0

account_discounts/__init__.py

@@ -1 +1 @@
-from . import models,wizard
+from . import models

account_discounts/__manifest__.py

@@ -1,15 +1,15 @@
 {
-    "name": "Account Discounts",
-    "summary": "This module defines and manages predefined discounts used in bills",
-    "version": "0.0.1",
+    "name": "Care: Account Discounts",
+    "summary": "Track discount groups on invoices using native Odoo discounts",
+    "version": "19.0.1.0.0",
     "category": "Accounting",
-    "installable": True,
-    "depends": ["base","account","web","insurance_management"],
+    "license": "LGPL-3",
+    "author": "Custom",
+    "depends": ["account"],
     "data": [
         "security/ir.model.access.csv",
+        "views/discount_group_views.xml",
         "views/account_move_views.xml",
-        "views/discount_groups_views.xml",
-        "views/product_template_views.xml",
-        "wizard/discount_category_report_wizard.xml",
     ],
-}
+    "installable": True,
+}

account_discounts/models/__init__.py

@@ -1 +1,2 @@
-from . import account_move,discount_groups, product_template
+from . import discount_group
+from . import account_move

account_discounts/models/account_move.py

@@ -1,112 +1,49 @@
-import json
 from odoo import api, fields, models
-from odoo.tools.float_utils import float_is_zero
 
 
 class AccountMove(models.Model):
     _inherit = "account.move"
 
-    discount_list = fields.Char(
-        compute="_compute_discount_summary", string="Discount", store=False
+    discount_summary = fields.Text(
+        string="Discount Summary",
+        compute="_compute_discount_summary",
+        store=False,
     )
 
-    @api.depends("invoice_line_ids.account_discount")
+    @api.depends("invoice_line_ids.discount", "invoice_line_ids.discount_group_id")
     def _compute_discount_summary(self):
         for move in self:
-            move.discount_list = None
-            if move.move_type == "out_invoice":
-                discount_dict = {}
-                for line in move.invoice_line_ids:
-                    if line.account_discount:
-                        for disc in line.account_discount:
-                            # Check if it's amount-based or percentage-based discount
-                            if disc.disc_amount:
-                                # Amount-based discount
-                                discount_amount = abs(disc.disc_amount * line.quantity)
-                            else:
-                                # Percentage-based discount
-                                discount_amount = abs(
-                                    line.price_subtotal * (disc.disc_percent / 100.0)
-                                )
-                            discount_amount = round(discount_amount, 2)
-
-                            if disc.discount_group.name not in discount_dict:
-                                discount_dict[disc.discount_group.name] = 0.0
-
-                            discount_dict[disc.discount_group.name] += discount_amount
-                discount_str = "\n".join(
-                    f"{k} : {format(v, '.2f')}" for k, v in discount_dict.items()
-                )
-                move.discount_list = discount_str
-
-    @api.model
-    def create(self, vals):
-        move = super(AccountMove, self).create(vals)
-        if move.move_type == "out_invoice":
-            discount_lines = move.invoice_line_ids.filtered(
-                lambda l: l.account_discount
-            )
-
-            if not discount_lines:
-                return move
-            section_line_commands = []
-
-            section_line_commands.append(
-                (
-                    0,
-                    0,
-                    {
-                        "display_type": "line_section",
-                        "name": "Discount",
-                    },
+            move.discount_summary = False
+            if move.move_type not in ("out_invoice", "in_invoice"):
+                continue
+
+            discount_totals = {}
+            for line in move.invoice_line_ids.filtered(lambda l: l.discount > 0):
+                group_name = line.discount_group_id.name if line.discount_group_id else "General"
+                # Calculate discount amount from the native discount percentage
+                discount_amount = line.price_unit * line.quantity * line.discount / 100
+                discount_totals[group_name] = discount_totals.get(group_name, 0.0) + discount_amount
+
+            if discount_totals:
+                move.discount_summary = "\n".join(
+                    f"{name}: {amount:.2f}" for name, amount in discount_totals.items()
                 )
-            )
-            discount_dict = {}
-            for line in discount_lines:
-                for disc in line.account_discount:
-                    # Check if it's amount-based or percentage-based discount
-                    if disc.disc_amount:
-                        # Amount-based discount
-                        discount_amount = abs(disc.disc_amount * line.quantity)
-                    else:
-                        # Percentage-based discount
-                        discount_amount = abs(
-                            line.price_subtotal * (disc.disc_percent / 100.0)
-                        )
-                    discount_amount = round(discount_amount, 2)
-
-                    if disc.id not in discount_dict:
-                        discount_dict[disc.id] = 0.0
-
-                    discount_dict[disc.id] += discount_amount
-            if discount_dict:
-                for product_tmpl_id, amount in discount_dict.items():
-                    product = self.env["product.product"].search(
-                        [("product_tmpl_id", "=", product_tmpl_id)], limit=1
-                    )
-                    if product:
-                        section_line_commands.append(
-                            (
-                                0,
-                                0,
-                                {
-                                    "product_id": product.id,
-                                    "received_qty": -1,
-                                    "quantity": -1,
-                                    "price_unit": amount,
-                                    "name": product.name,
-                                },
-                            )
-                        )
-
-            if section_line_commands:
-                move.write({"invoice_line_ids": section_line_commands})
-        return move
 
 
 class AccountMoveLine(models.Model):
     _inherit = "account.move.line"
 
-    account_discount = fields.Many2many(
-        "product.template", string="Discount", domain=[("is_disc_item", "=", True)]
+    # Track discount metadata - the actual discount is in the native 'discount' field
+    discount_group_id = fields.Many2one(
+        "account.discount.group",
+        string="Discount Group",
+        help="The discount group/scheme applied to this line",
+    )
+    discount_type = fields.Selection([
+        ('percentage', 'Percentage'),
+        ('fixed', 'Fixed Amount'),
+    ], string="Discount Type", default='percentage')
+    x_care_discount_id = fields.Char(
+        string="Care Discount ID",
+        help="Reference ID from Care system",
     )

account_discounts/models/discount_group.py

@@ -0,0 +1,9 @@
+from odoo import fields, models
+
+
+class AccountDiscountGroup(models.Model):
+    _name = "account.discount.group"
+    _description = "Discount Group"
+
+    name = fields.Char(string="Group Name", required=True)
+    x_care_id = fields.Char(string="Care ID", readonly=True)

account_discounts/security/ir.model.access.csv

@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_discount_groups,account.discount.groups,model_account_discount_groups,base.group_user,1,1,1,1
-access_discount_categ_wizard,discount.categ.wizard,model_discount_categ_wizard,base.group_user,1,1,1,1
+access_account_discount_group_user,account.discount.group.user,model_account_discount_group,account.group_account_user,1,0,0,0
+access_account_discount_group_manager,account.discount.group.manager,model_account_discount_group,account.group_account_manager,1,1,1,1

account_discounts/views/account_move_views.xml

@@ -1,18 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="view_move_discount_form" model="ir.ui.view">
-        <field name="name">account.move.form.care.discount</field>
+    <record id="view_move_form_discount" model="ir.ui.view">
+        <field name="name">account.move.form.discount</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_move_form" />
+        <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='invoice_line_ids']/list/field[@name='price_unit']" position="after">
-                <field name="account_discount" widget="many2many_tags"/>
-            </xpath>
-            <xpath expr="//field[@name='invoice_line_ids']/list/field[@name='product_id']" position="attributes">
-                <attribute name="domain">[('is_disc_item', '!=', True)]</attribute>
+            <xpath expr="//field[@name='invoice_line_ids']/list/field[@name='discount']" position="after">
+                <field name="discount_group_id" optional="hide"/>
             </xpath>
             <field name="tax_totals" position="after">
-                <field name="discount_list" options="{'line_breaks': True}" widget="text" nolabel="1" readonly="1"/>
+                <field name="discount_summary" widget="text" readonly="1" nolabel="1"/>
             </field>
         </field>
     </record>
-</odoo>
+</odoo>

account_discounts/views/discount_group_views.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_account_discount_group_list" model="ir.ui.view">
+        <field name="name">account.discount.group.list</field>
+        <field name="model">account.discount.group</field>
+        <field name="arch" type="xml">
+            <list string="Discount Groups">
+                <field name="name"/>
+                <field name="x_care_id" optional="hide"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_account_discount_group_form" model="ir.ui.view">
+        <field name="name">account.discount.group.form</field>
+        <field name="model">account.discount.group</field>
+        <field name="arch" type="xml">
+            <form string="Discount Group">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="x_care_id" groups="base.group_no_one"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_account_discount_group" model="ir.actions.act_window">
+        <field name="name">Discount Groups</field>
+        <field name="res_model">account.discount.group</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+    <menuitem
+        id="menu_account_discount_group"
+        name="Discount Groups"
+        parent="account.menu_finance_configuration"
+        action="action_account_discount_group"
+        sequence="30"
+    />
+</odoo>