From 6cbea9d2f31e38196c27bc3fe659481488b01e66 Mon Sep 17 00:00:00 2001
From: gsinghpal <gur_preet.singh@outlook.com>
Date: Tue, 21 Apr 2026 22:57:33 -0400
Subject: [PATCH] feat(reports): SO PDF uses customer_line_header macro (Sub 2
 Task 18)

Collapse the SKU and Description columns in both the portrait and
landscape sale-order PDFs into a single Part column rendered through
the shared customer_line_header macro, so customer-facing quotes and
confirmed orders print the customer's part number (with revision)
instead of the internal service SKU.

Updates column widths, section/note colspans, and the conditional
col_count used for the landscape template's optional discount column
to reflect the collapsed header.
---
 .../report/report_fp_sale.xml                 | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/fusion_plating/fusion_plating_reports/report/report_fp_sale.xml b/fusion_plating/fusion_plating_reports/report/report_fp_sale.xml
index a1619867..ec1db5ad 100644
--- a/fusion_plating/fusion_plating_reports/report/report_fp_sale.xml
+++ b/fusion_plating/fusion_plating_reports/report/report_fp_sale.xml
@@ -137,8 +137,7 @@
                             <table class="bordered">
                                 <thead>
                                     <tr>
-                                        <th style="width: 10%;">SKU</th>
-                                        <th class="text-start" style="width: 40%;">DESCRIPTION</th>
+                                        <th class="text-start" style="width: 50%;">PART</th>
                                         <th style="width: 8%;">QTY</th>
                                         <th style="width: 8%;">UOM</th>
                                         <th style="width: 12%;">UNIT PRICE</th>
@@ -149,20 +148,15 @@
                                 <tbody>
                                     <t t-foreach="doc.order_line" t-as="line">
                                         <t t-if="line.display_type == 'line_section'">
-                                            <tr class="section-row"><td colspan="7"><strong t-field="line.name"/></td></tr>
+                                            <tr class="section-row"><td colspan="6"><strong t-field="line.name"/></td></tr>
                                         </t>
                                         <t t-elif="line.display_type == 'line_note'">
-                                            <tr class="note-row"><td colspan="7"><span t-field="line.name"/></td></tr>
+                                            <tr class="note-row"><td colspan="6"><span t-field="line.name"/></td></tr>
                                         </t>
                                         <t t-elif="not line.display_type or line.display_type == 'product'">
                                             <tr>
-                                                <td class="text-center"><span t-esc="line.product_id.default_code or ''"/></td>
                                                 <td>
-                                                    <t t-set="clean_name" t-value="line.name"/>
-                                                    <t t-if="line.name and '] ' in line.name">
-                                                        <t t-set="clean_name" t-value="line.name.split('] ', 1)[1]"/>
-                                                    </t>
-                                                    <span t-esc="clean_name"/>
+                                                    <t t-call="fusion_plating_reports.customer_line_header"/>
                                                 </td>
                                                 <td class="text-center">
                                                     <span t-esc="int(line.product_uom_qty) if line.product_uom_qty == int(line.product_uom_qty) else line.product_uom_qty"/>
@@ -409,12 +403,11 @@
 
                             <!-- Order lines — hide discount column unless at least one line has a discount -->
                             <t t-set="has_discount" t-value="any(l.discount for l in doc.order_line)"/>
-                            <t t-set="col_count" t-value="8 if has_discount else 7"/>
+                            <t t-set="col_count" t-value="7 if has_discount else 6"/>
                             <table class="bordered">
                                 <thead>
                                     <tr>
-                                        <th style="width: 10%;">SKU</th>
-                                        <th class="text-start" style="width: 32%;">DESCRIPTION</th>
+                                        <th class="text-start" style="width: 42%;">PART</th>
                                         <th style="width: 8%;">QTY</th>
                                         <th style="width: 8%;">UOM</th>
                                         <th style="width: 12%;">UNIT PRICE</th>
@@ -433,13 +426,8 @@
                                         </t>
                                         <t t-elif="not line.display_type or line.display_type == 'product'">
                                             <tr>
-                                                <td class="text-center"><span t-esc="line.product_id.default_code or ''"/></td>
                                                 <td>
-                                                    <t t-set="clean_name" t-value="line.name"/>
-                                                    <t t-if="line.name and '] ' in line.name">
-                                                        <t t-set="clean_name" t-value="line.name.split('] ', 1)[1]"/>
-                                                    </t>
-                                                    <span t-esc="clean_name"/>
+                                                    <t t-call="fusion_plating_reports.customer_line_header"/>
                                                 </td>
                                                 <td class="text-center">
                                                     <span t-esc="int(line.product_uom_qty) if line.product_uom_qty == int(line.product_uom_qty) else line.product_uom_qty"/>