[15.0][MIG]sale_backorder

Author: Vandan-OSI

sale_backorder/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Sale Backorder Report",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "license": "LGPL-3",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "summary": "Report of Un-Invoice Goods Delivered and Backorders",

sale_backorder/models/__init__.py

@@ -1,3 +1,4 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from . import sale
+from . import sale_order_line

sale_backorder/models/sale.py

@@ -1,41 +1,39 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2022 - TODAY, Open Source Integrators
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from odoo import api, fields, models
-from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
 
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
     last_date_delivered = fields.Datetime(
-        string="Last Date Delivered", compute="_compute_last_date_delivered", store=True
+        string="Date Delivered", compute="_compute_last_date_delivered", store=True
     )
     last_bill_date = fields.Datetime(
-        string="Last Bill Date", compute="_compute_last_bill_date", store=True
+        string="Bill Date", compute="_compute_last_bill_date", store=True
     )
-    uigd_value = fields.Monetary(
-        string="UIGD Value", compute="_compute_uigd_value", store=True
+    uninvoiced_goods_delivered_value = fields.Monetary(
+        string="UIGD Value",
+        compute="_compute_uigd_value",
+        store=True,
+        help="Un-Invoiced Goods Delivered Value",
     )
     bo_value = fields.Monetary(
         string="Backorder Value", compute="_compute_bo_value", store=True
     )
 
-    @api.depends("order_line.uigd_qty", "order_line.price_unit")
+    @api.depends("order_line.uninvoiced_goods_delivered_value")
     def _compute_uigd_value(self):
         for order in self:
-            total = 0
-            for line in order.order_line:
-                total += line.uigd_value
-            order.uigd_value = total
+            order.uninvoiced_goods_delivered_value = sum(
+                order.order_line.mapped("uninvoiced_goods_delivered_value")
+            )
 
-    @api.depends("order_line.bo_qty", "order_line.price_unit")
+    @api.depends("order_line.bo_value")
     def _compute_bo_value(self):
         for order in self:
-            total = 0
-            for line in order.order_line:
-                total += line.bo_value
-            order.bo_value = total
+            order.bo_value = sum(order.order_line.mapped("bo_value"))
 
     @api.depends(
         "order_line.last_date_delivered",
@@ -62,77 +60,3 @@ def _compute_last_bill_date(self):
                 if line.last_bill_date:
                     max_date = line.last_bill_date
             order.last_bill_date = max_date
-
-
-class SaleOrderLine(models.Model):
-    _inherit = "sale.order.line"
-
-    last_date_delivered = fields.Datetime(
-        string="Last Date Delivered", compute="_compute_last_date_delivered", store=True
-    )
-    last_bill_date = fields.Datetime(
-        string="Last Bill Date", compute="_compute_last_bill_date", store=True
-    )
-    uigd_qty = fields.Float(string="UIGD Qty", compute="_compute_uigd_qty", store=True)
-    bo_qty = fields.Float(string="Backorder Qty", compute="_compute_bo_qty", store=True)
-    uigd_value = fields.Monetary(
-        string="UIGD Value", compute="_compute_uigd_value", store=True
-    )
-    bo_value = fields.Monetary(
-        string="Backorder Value", compute="_compute_bo_value", store=True
-    )
-    product_type = fields.Selection(
-        string="Product Type", related="product_id.product_tmpl_id.type"
-    )
-
-    @api.depends("qty_delivered", "product_uom_qty")
-    def _compute_bo_qty(self):
-        for line in self:
-            line.bo_qty = line.product_uom_qty - line.qty_delivered
-
-    @api.depends("qty_delivered", "qty_invoiced")
-    def _compute_uigd_qty(self):
-        for line in self:
-            line.uigd_qty = line.qty_delivered - line.qty_invoiced
-
-    @api.depends("uigd_qty", "price_unit")
-    def _compute_uigd_value(self):
-        for line in self:
-            line.uigd_value = line.uigd_qty * line.price_unit
-
-    @api.depends("bo_qty", "price_unit")
-    def _compute_bo_value(self):
-        for line in self:
-            line.bo_value = line.bo_qty * line.price_unit
-
-    @api.depends("qty_delivered", "qty_invoiced")
-    def _compute_last_date_delivered(self):
-        for line in self:
-            max_date = False
-            for move in line.move_ids:
-                if (
-                    move.state == "done"
-                    and move.location_dest_id.usage == "customer"
-                    and move.to_refund
-                ):
-                    continue
-                else:
-                    max_date = move.date
-            line.last_date_delivered = max_date
-
-    @api.depends("qty_delivered", "qty_invoiced")
-    def _compute_last_bill_date(self):
-        for line in self:
-            max_date = False
-            for inv_line in line.invoice_lines:
-                if (
-                    inv_line.move_id.state != "cancel"
-                    and inv_line.move_id.move_type == "out_invoice"
-                    and inv_line.move_id.date
-                ):
-                    max_date = inv_line.move_id.date
-                elif inv_line.move_id.move_type == "out_refund":
-                    continue
-            line.last_bill_date = (
-                max_date and max_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT) or False
-            )

sale_backorder/models/sale_order_line.py

@@ -0,0 +1,76 @@
+# Copyright (C) 2022 - TODAY, Open Source Integrators
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo import api, fields, models
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    last_date_delivered = fields.Datetime(
+        string="Date Delivered", compute="_compute_last_date_delivered", store=True
+    )
+    last_bill_date = fields.Datetime(
+        string="Bill Date", compute="_compute_last_bill_date", store=True
+    )
+    uninvoiced_goods_delivered_qty = fields.Float(
+        string="UIGD Qty",
+        compute="_compute_uigd_qty",
+        store=True,
+        help="Un-Invoiced Goods Delivered Qty",
+    )
+    bo_qty = fields.Float(string="Backorder Qty", compute="_compute_bo_qty", store=True)
+    uninvoiced_goods_delivered_value = fields.Monetary(
+        string="UIGD Value",
+        compute="_compute_uigd_value",
+        store=True,
+        help="Un-Invoiced Goods Delivered Value",
+    )
+    bo_value = fields.Monetary(
+        string="Backorder Value", compute="_compute_bo_value", store=True
+    )
+    product_type = fields.Selection(
+        string="Product Type", related="product_id.product_tmpl_id.type"
+    )
+
+    @api.depends("qty_delivered", "product_uom_qty")
+    def _compute_bo_qty(self):
+        for line in self:
+            line.bo_qty = line.product_uom_qty - line.qty_delivered
+
+    @api.depends("qty_delivered", "qty_invoiced")
+    def _compute_uigd_qty(self):
+        for line in self:
+            line.uninvoiced_goods_delivered_qty = line.qty_delivered - line.qty_invoiced
+
+    @api.depends("uninvoiced_goods_delivered_qty", "price_unit")
+    def _compute_uigd_value(self):
+        for line in self:
+            line.uninvoiced_goods_delivered_value = (
+                line.uninvoiced_goods_delivered_qty * line.price_unit
+            )
+
+    @api.depends("bo_qty", "price_unit")
+    def _compute_bo_value(self):
+        for line in self:
+            line.bo_value = line.bo_qty * line.price_unit
+
+    @api.depends("qty_delivered", "qty_invoiced")
+    def _compute_last_date_delivered(self):
+        for line in self:
+            moves = line.move_ids.sorted("id", reverse=True).filtered(
+                lambda move: move.state != "done"
+                or move.location_dest_id.usage != "customer"
+                or not move.to_refund
+            )
+            line.last_date_delivered = moves and moves[0].date or False
+
+    @api.depends("qty_delivered", "qty_invoiced")
+    def _compute_last_bill_date(self):
+        for line in self:
+            invoices = line.invoice_lines.sorted("id", reverse=True).filtered(
+                lambda inv: inv.move_id.state != "cancel"
+                or inv.move_id.move_type == "out_invoice"
+                or inv.move_id.date
+            )
+            line.last_bill_date = invoices and invoices[0].move_id.date or False

sale_backorder/readme/CONTRIBUTORS.rst

@@ -2,3 +2,4 @@
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Freni Patel <fpatel@opensourceintegrators.com>
+* Vandan Pandeji <vpandeji@opensourceintegrators.com>

sale_backorder/report/so_backorder_report.xml

@@ -4,9 +4,9 @@
     <template id="so_backorder_report">
         <t t-call="web.html_container">
             <t t-call="web.external_layout">
-                <br />
                 <div class="page">
-                    <h2>PO Backorder Report</h2>
+                    <br />
+                    <h2>SO Backorder Report</h2>
                     <table class="table table-sm table-condensed">
                         <thead>
                             <tr>
@@ -31,10 +31,10 @@
                                         t-field="line.bo_value"
                                     /></td>
                                 <td class="text-right"><span
-                                        t-field="line.uigd_qty"
+                                        t-field="line.uninvoiced_goods_delivered_qty"
                                     /></td>
                                 <td class="text-right"><span
-                                        t-field="line.uigd_value"
+                                        t-field="line.uninvoiced_goods_delivered_value"
                                     /></td>
                                 <td><span t-field="line.last_date_delivered" /></td>
                                 <td><span t-field="line.last_bill_date" /></td>

sale_backorder/tests/test_sale_backorder.py

@@ -13,7 +13,8 @@ def setUp(self):
         super(TestSaleBackorderCommon, self).setUp()
         self.SaleOrder = self.env["sale.order"]
         self.sobackorder_wiz = self.env["sobackorder.report.wizard"]
-        self.fsm_per_order_1 = self.env["product.product"].create(
+        self.product_obj = self.env["product.product"]
+        self.fsm_per_order_1 = self.product_obj.create(
             {
                 "name": "FSM Order per Sale Order #1",
                 "categ_id": self.env.ref("product.product_category_3").id,
@@ -25,7 +26,7 @@ def setUp(self):
                 "invoice_policy": "order",
             }
         )
-        self.fsm_per_order_2 = self.env["product.product"].create(
+        self.fsm_per_order_2 = self.product_obj.create(
             {
                 "name": "FSM Order per Sale Order #1",
                 "categ_id": self.env.ref("product.product_category_3").id,
@@ -78,7 +79,7 @@ def setUp(self):
                             "product_uom": self.fsm_per_order_1.uom_id.id,
                             "price_unit": self.fsm_per_order_1.list_price,
                             "tax_id": False,
-                            "uigd_value": 1.0,
+                            "uninvoiced_goods_delivered_value": 1.0,
                             "bo_value": 1.0,
                             "bo_qty": 1.0,
                         },
@@ -93,7 +94,7 @@ def setUp(self):
                             "product_uom": self.fsm_per_order_2.uom_id.id,
                             "price_unit": self.fsm_per_order_2.list_price,
                             "tax_id": False,
-                            "uigd_value": 1.0,
+                            "uninvoiced_goods_delivered_value": 1.0,
                             "bo_value": 1.0,
                             "bo_qty": 1.0,
                             "last_date_delivered": datetime.now() + rdelta(days=15),
@@ -117,16 +118,14 @@ def test_sale_order(self):
 
     def test_sale_order_order_line(self):
         self.sale_order_1.action_confirm()
-        self.context = {
-            "active_model": "sale.order",
-            "active_ids": [self.sale_order_1.id],
-            "active_id": self.sale_order_1.id,
-            "default_journal_id": self.default_journal_sale.id,
-        }
-
         downpayment = (
             self.env["sale.advance.payment.inv"]
-            .with_context(self.context)
+            .with_context(
+                active_model="sale.order",
+                active_ids=self.sale_order_1.ids,
+                active_id=self.sale_order_1.id,
+                default_journal_id=self.default_journal_sale.id,
+            )
             .create(
                 {
                     "advance_payment_method": "fixed",
@@ -156,7 +155,11 @@ def test_sale_order_line_method(self):
         self.invoice.action_reverse()
         move_reversal = (
             self.env["account.move.reversal"]
-            .with_context(active_model="account.move", active_ids=self.invoice.ids)
+            .with_context(
+                active_model="account.move",
+                active_ids=self.invoice.ids,
+                default_journal_id=self.default_journal_sale.id,
+            )
             .create(
                 {
                     "date": datetime.today(),

sale_backorder/views/sale_view.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="sale_order_form_backorder" model="ir.ui.view">
@@ -7,10 +6,14 @@
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='partner_shipping_id']" position="after">
-                <field name="uigd_value" readonly='1' />
+                <field name="uninvoiced_goods_delivered_value" readonly='1' />
                 <field name="bo_value" readonly='1' />
-                <field name="last_bill_date" readonly='1' />
-                <field name="last_date_delivered" readonly='1' />
+                <field name="last_bill_date" readonly='1' string="Last Bill Date" />
+                <field
+                    name="last_date_delivered"
+                    readonly='1'
+                    string="Last Date Delivered"
+                />
             </xpath>
         </field>
     </record>

sale_backorder/views/so_backorder_view.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="so_backorder_tree_view" model="ir.ui.view">
@@ -10,10 +9,10 @@
                 <field name="name" />
                 <field name="bo_qty" />
                 <field name="bo_value" />
-                <field name="uigd_qty" />
-                <field name="uigd_value" />
-                <field name="last_date_delivered" />
-                <field name="last_bill_date" />
+                <field name="uninvoiced_goods_delivered_qty" />
+                <field name="uninvoiced_goods_delivered_value" />
+                <field name="last_date_delivered" string="Last Date Delivered" />
+                <field name="last_bill_date" string="Last Bill Date" />
             </tree>
         </field>
     </record>
@@ -26,7 +25,7 @@
         <field name="view_id" ref="sale_backorder.so_backorder_tree_view" />
         <field name="context">{'create': False, 'edit': False}</field>
         <field name="domain">['&amp;', ('product_type', '=', 'product'), '|',
-            ('bo_value', '!=', 0), ('uigd_value', '!=', 0)]
+            ('bo_value', '!=', 0), ('uninvoiced_goods_delivered_value', '!=', 0)]
         </field>
     </record>
 

sale_backorder/wizard/so_backorder_wizard.py

@@ -15,9 +15,9 @@ def action_print_report(self):
                 ("product_type", "=", "product"),
                 "|",
                 ("bo_value", "!=", 0),
-                ("uigd_value", "!=", 0),
+                ("uninvoiced_goods_delivered_value", "!=", 0),
             ]
         )
-        return self.env.ref("sale_backorder.action_so_backorder_report").report_action(
-            data
-        )
+        return self.env.ref(
+            "sale_backorder.action_so_backorder_report", raise_if_not_found=False
+        ).report_action(data)