fixup!

Author: yostashiro

stock_outgoing_shipment_report/README.rst

@@ -22,9 +22,14 @@ Stock Outgoing Shipment Report
 
 |badge1| |badge2| |badge3|
 
-This module does the following:
-
--  Adds stock.outgoing.shipment.report model to export shipment data.
+Generates outgoing shipment reports from stock pickings for export to
+external systems.
+
+-  Creates report lines from delivery order moves with partner, carrier,
+   and product details
+-  Formats dates (dispatch, delivery, expiry) and truncates fields to
+   required lengths
+-  Validates warehouse lot numbers to ASCII characters only
 
 **Table of contents**
 

stock_outgoing_shipment_report/models/res_partner.py

@@ -16,3 +16,14 @@ def _get_shipping_address(self):
             self.street or "",
             self.street2 or "",
         )
+
+    def _get_shipment_report_vals(self):
+        partner_address = self._get_shipping_address()
+        return {
+            "partner_ref": self.ref[:10] if self.ref else False,
+            "partner_zip": self.zip[:8] if self.zip else False,
+            "partner_name": self.display_name,
+            "partner_address": partner_address[:80] if partner_address else False,
+            "partner_phone": self.phone[:12] if self.phone else False,
+            "customer_delivery_note": self.delivery_time,
+        }

stock_outgoing_shipment_report/models/stock_outgoing_shipment_report.py

@@ -43,22 +43,18 @@ class StockOutgoingShipmentReport(models.Model):
         store=True,
     )
 
-    @api.depends(
-        "move_id.date_deadline",
-        "move_id.picking_id.date_deadline",
-        "expiry_date_edit",
-    )
+    @api.depends("move_id.date", "move_id.date_deadline", "expiry_date_edit")
     def _compute_date_fields(self):
         date_format = "%Y/%m/%d"
         for line in self:
             move = line.move_id
-            if move.date_deadline:
+            if move.date:
                 line.dispatch_date = fields.Datetime.context_timestamp(
-                    self, move.date_deadline
+                    self, move.date
                 ).strftime(date_format)
-            if move.picking_id.date_deadline:
+            if move.date_deadline:
                 line.delivery_date = fields.Datetime.context_timestamp(
-                    self, move.picking_id.date_deadline
+                    self, move.date_deadline
                 ).strftime(date_format)
             if line.expiry_date_edit:
                 line.expiry_date = line.expiry_date_edit.strftime(date_format)
@@ -68,5 +64,5 @@ def _check_lot_num(self):
         for rec in self:
             if rec.lot_num and not rec.lot_num.isascii():
                 raise ValidationError(
-                    _("Please enter the warehouse lot using ASCII " "characters only.")
+                    _("Please key in the warehouse lot in ASCII characters.")
                 )

stock_outgoing_shipment_report/models/stock_picking.py

@@ -7,45 +7,32 @@
 class StockPicking(models.Model):
     _inherit = "stock.picking"
 
-    def _get_partner_vals(self, partner):
-        partner_address = partner._get_shipping_address()
-        return {
-            "partner_ref": partner.ref[:10] if partner.ref else False,
-            "partner_zip": partner.zip[:8] if partner.zip else False,
-            "partner_name": partner.display_name,
-            "partner_address": partner_address[:80] if partner_address else False,
-            "partner_phone": partner.phone[:12] if partner.phone else False,
-            "customer_delivery_note": partner.delivery_time,
-        }
-
     def generate_stock_outgoing_shipment_report(self):
         report_obj = self.env["stock.outgoing.shipment.report"]
         moves = self.mapped("move_ids")
         for move in moves:
-            order = move.group_id.sale_id
+            carrier = move.picking_id.carrier_id
             partner = move.picking_id.partner_id
             product = move.product_id
             sale_line = move.sale_line_id
             vals = {
                 "move_id": move.id,
-                "shipping_mode": order.carrier_id.shipping_mode,
-                "carrier_id": order.carrier_id.id if order else False,
-                "carrier_name": order.carrier_id.name[:20]
-                if order and order.carrier_id
-                else False,
+                "shipping_mode": carrier.shipping_mode,
+                "carrier_id": carrier.id,
+                "carrier_name": carrier and carrier.name[:20] or False,
                 "product_code": product.default_code[:7]
                 if product.default_code
                 else False,
                 "product_name": product.name[:32],
-                "client_order_ref": sale_line and sale_line.client_order_ref,
+                "client_order_ref": sale_line.client_order_ref,
                 "memo": sale_line.note[:9] if sale_line.note else False,
             }
             secondary_uom = move.product_id.stock_secondary_uom_id
             if secondary_uom:
                 factor = secondary_uom.factor * move.product_uom.factor
                 vals.update({"case_qty": int(move.quantity / (factor or 1.0))})
             if partner:
-                partner_vals = self._get_partner_vals(partner)
+                partner_vals = partner._get_shipment_report_vals()
                 vals.update(partner_vals)
             move_rec = report_obj.search([("move_id", "=", move.id)])
             move_rec.write(vals) if move_rec else report_obj.create(vals)

stock_outgoing_shipment_report/readme/DESCRIPTION.md

@@ -1,3 +1,5 @@
-This module does the following:
+Generates outgoing shipment reports from stock pickings for export to external systems.
 
-- Adds stock.outgoing.shipment.report model to export shipment data.
+- Creates report lines from delivery order moves with partner, carrier, and product details
+- Formats dates (dispatch, delivery, expiry) and truncates fields to required lengths
+- Validates warehouse lot numbers to ASCII characters only

stock_outgoing_shipment_report/static/description/index.html

@@ -8,11 +8,10 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -370,9 +369,14 @@ <h1 class="title">Stock Outgoing Shipment Report</h1>
 !! source digest: sha256:41fd6e5731b88042a9e51e5af1dc2d38587a90bc7a364f4026910893de890bf3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/qrtl/hls-custom/tree/18.0/stock_outgoing_shipment_report"><img alt="qrtl/hls-custom" src="https://img.shields.io/badge/github-qrtl%2Fhls--custom-lightgray.png?logo=github" /></a></p>
-<p>This module does the following:</p>
+<p>Generates outgoing shipment reports from stock pickings for export to
+external systems.</p>
 <ul class="simple">
-<li>Adds stock.outgoing.shipment.report model to export shipment data.</li>
+<li>Creates report lines from delivery order moves with partner, carrier,
+and product details</li>
+<li>Formats dates (dispatch, delivery, expiry) and truncates fields to
+required lengths</li>
+<li>Validates warehouse lot numbers to ASCII characters only</li>
 </ul>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">

stock_outgoing_shipment_report/tests/test_stock_outgoing_shipment_report.py

@@ -1,6 +1,9 @@
 # Copyright 2020 Quartile (https://www.quartile.co)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from datetime import date, datetime
+
+from odoo.exceptions import ValidationError
 from odoo.tests import TransactionCase, tagged
 
 
@@ -12,11 +15,15 @@ def setUpClass(cls):
         cls.partner = cls.env["res.partner"].create(
             {
                 "name": "Test Partner",
+                "zip": "123-4567",
                 "state_id": cls.env.ref("base.state_jp_jp-02").id,
                 "city": "City",
                 "street": "Street",
                 "street2": "Street2",
+                # 16 characters to test truncation to 12
+                "phone": "03-1234-5678-999",
                 "delivery_time": "test",
+                "ref": "CUST001",
             }
         )
         cls.env.ref("delivery.free_delivery_carrier").write({"shipping_mode": "10"})
@@ -51,17 +58,20 @@ def setUpClass(cls):
         cls.sale_order.action_confirm()
         cls.pickings = cls.sale_order.picking_ids
 
-    def test_01_get_shipping_address(self):
-        self.assertEqual(
-            self.partner._get_shipping_address(), "AomoriCityStreetStreet2"
-        )
+    def test_partner_get_shipment_report_vals(self):
+        vals = self.partner._get_shipment_report_vals()
+        self.assertEqual(vals["partner_ref"], "CUST001")
+        self.assertEqual(vals["partner_zip"], "123-4567")
+        self.assertEqual(vals["partner_address"], "AomoriCityStreetStreet2")
+        # Truncated to 12 characters
+        self.assertEqual(vals["partner_phone"], "03-1234-5678")
+        self.assertEqual(vals["customer_delivery_note"], "test")
 
-    def test_02_generate_stock_outgoing_shipment_report(self):
+    def test_generate_stock_outgoing_shipment_report(self):
         self.pickings.generate_stock_outgoing_shipment_report()
         report_lines = self.env["stock.outgoing.shipment.report"].search([])
         self.assertEqual(len(report_lines), 2)
         test_line = report_lines[0]
-
         self.assertEqual(test_line.shipping_mode, "10")
         self.assertEqual(
             test_line.carrier_name,
@@ -71,3 +81,27 @@ def test_02_generate_stock_outgoing_shipment_report(self):
         self.assertEqual(test_line.product_name, self.product.name)
         self.assertEqual(test_line.client_order_ref, "ref0001")
         self.assertEqual(test_line.memo, "Test Note")
+
+    def test_lot_num_constraint(self):
+        report = self.env["stock.outgoing.shipment.report"].create({})
+        report.lot_num = "ABC123"  # ASCII - should pass
+        with self.assertRaises(ValidationError):
+            report.lot_num = "あ１２３"  # Non-ASCII - should fail
+
+    def test_compute_date_fields(self):
+        move = self.pickings.move_ids[0]
+        move.write(
+            {
+                "date": datetime(2025, 1, 15, 10, 0, 0),
+                "date_deadline": datetime(2025, 1, 20, 10, 0, 0),
+            }
+        )
+        report = self.env["stock.outgoing.shipment.report"].create(
+            {
+                "move_id": move.id,
+                "expiry_date_edit": date(2025, 2, 28),
+            }
+        )
+        self.assertEqual(report.dispatch_date, "2025/01/15")
+        self.assertEqual(report.delivery_date, "2025/01/20")
+        self.assertEqual(report.expiry_date, "2025/02/28")