remove required npwp sppkp nib and fix purchase report

1 files changed, 43 insertions, 60 deletions

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 9d7f4028..040db3dd 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -26,8 +26,8 @@
     </template>
 
     <!-- Document Template -->
-<template id="report_purchaseorder_website_document">
-        <t t-call="web.external_layout">
+    <template id="report_purchaseorder_website_document">
+        <t t-call="web.html_container">
             <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
 
             <div class="page">
@@ -41,80 +41,68 @@
                 <h2 class="text-center mb4" style="color:#d32f2f; font-weight:bold;">
                     PURCHASE ORDER
                 </h2>
-                <h4 class="text-center mb32">
+                <h4 class="text-center mb24">
                     No. <span t-field="doc.name"/>
                 </h4>
 
-                <!-- Top Info sejajar -->
-                <div class="row mb16" style="font-size:12px;">
-                    <div class="col-4">
-                        <strong>Term Of Payment:</strong>
-                        <span t-field="doc.payment_term_id.name"/>
-                    </div>
-                    <div class="col-4">
-                        <strong>Order Date:</strong>
-                        <span t-field="doc.date_order" t-options='{"widget": "date"}'/>
-                    </div>
-                    <div class="col-4">
-                        <strong>Responsible:</strong>
-                        <span t-field="doc.user_id"/>
-                    </div>
+                <!-- Info Row -->
+                <div class="row mb16">
+                    <div class="col-4"><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></div>
+                    <div class="col-4"><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></div>
+                    <div class="col-4"><strong>Responsible:</strong> <span t-field="doc.user_id"/></div>
                 </div>
 
-                <!-- Vendor & Shipping Info sejajar -->
-                <div class="row mb32" style="font-size:12px;">
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px;">
+                <!-- Vendor & Delivery Row (Side by Side) -->
+                <div class="row mb24">
+                    <div class="col-6" style="border:1px solid #ccc; padding:8px; margin-right:4px;">
                         <strong>Alamat Pengiriman:</strong><br/>
                         PT Indoteknik (Bandengan 1 Depan)<br/>
                         Jl. Bandengan Utara Komp A 8 B<br/>
                         RT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET)<br/>
-                        JK 14440<br/>
-                        Indonesia
+                        JK 14440 - Indonesia
                     </div>
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px;">
+                    <div class="col-6" style="border:1px solid #ccc; padding:8px; margin-left:4px;">
                         <strong>Nama Vendor:</strong><br/>
-                        <div t-field="doc.partner_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"],
-                                        "no_marker": True, "phone_icons": True}'/>
+                        <span t-field="doc.partner_id.name"/><br/>
+                        <span t-field="doc.partner_id.street"/><br/>
+                        <span t-field="doc.partner_id.city"/> - <span t-field="doc.partner_id.zip"/>
                     </div>
                 </div>
 
-                <!-- Order Lines -->
-                <table class="table table-sm o_main_table" style="font-size:11px; border:1px solid #000; border-collapse: collapse; width:100%;">
-                    <thead style="display: table-row-group; background:#f5f5f5;">
-                        <tr>
-                            <th style="border:1px solid #000; padding:4px;">Description</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Quantity</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Unit Price</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Taxes</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Subtotal</th>
+                <!-- Order Lines Table -->
+                <table class="table table-sm o_main_table" style="border-collapse: collapse; width: 100%; margin-top: 12px;">
+                    <thead>
+                        <tr style="background:#f2f2f2;">
+                            <th style="border:1px solid #ccc;">Description</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Quantity</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Unit Price</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Taxes</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Subtotal</th>
                         </tr>
                     </thead>
                     <tbody>
                         <t t-foreach="doc.order_line" t-as="line">
-                            <!-- Main row -->
                             <tr>
-                                <td style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;">
                                     <span t-field="line.name"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                    <span t-field="line.product_qty"/>
-                                    <span t-field="line.product_uom"/>
+                                <td style="border:1px solid #ccc;" class="text-right">
+                                    <span t-field="line.product_qty"/> <span t-field="line.product_uom"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;" class="text-right">
                                     <span t-field="line.price_unit"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;" class="text-right">
                                     <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;" class="text-right">
                                     <span t-field="line.price_subtotal"/>
                                 </td>
                             </tr>
-                            <!-- Website Description row -->
                             <t t-if="line.product_id.website_description">
                                 <tr>
-                                    <td colspan="5" style="border:1px solid #000; padding:6px; font-size:10px; color:#555;">
+                                    <!-- Website Description tanpa border, tapi diberi padding agar rapih -->
+                                    <td colspan="5" style="padding:6px 12px; font-size:10px; background:#fafafa;">
                                         <div t-raw="line.product_id.website_description"/>
                                     </td>
                                 </tr>
@@ -124,27 +112,21 @@
                 </table>
 
                 <!-- Totals -->
-                <div class="clearfix">
+                <div class="clearfix mt16">
                     <div class="row">
                         <div class="col-4 ml-auto">
-                            <table class="table table-sm" style="border:1px solid #000; border-collapse: collapse; width:100%;">
+                            <table class="table table-sm">
                                 <tr>
-                                    <td style="border:1px solid #000; padding:4px;"><strong>Subtotal</strong></td>
-                                    <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                        <span t-field="doc.amount_untaxed"/>
-                                    </td>
+                                    <td><strong>Subtotal</strong></td>
+                                    <td class="text-right"><span t-field="doc.amount_untaxed"/></td>
                                 </tr>
                                 <tr>
-                                    <td style="border:1px solid #000; padding:4px;">Taxes</td>
-                                    <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                        <span t-field="doc.amount_tax"/>
-                                    </td>
+                                    <td>Taxes</td>
+                                    <td class="text-right"><span t-field="doc.amount_tax"/></td>
                                 </tr>
                                 <tr class="o_total">
-                                    <td style="border:1px solid #000; padding:4px;"><strong>Total</strong></td>
-                                    <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                        <span t-field="doc.amount_total"/>
-                                    </td>
+                                    <td><strong>Total</strong></td>
+                                    <td class="text-right"><span t-field="doc.amount_total"/></td>
                                 </tr>
                             </table>
                         </div>
@@ -152,11 +134,12 @@
                 </div>
 
                 <!-- Notes -->
-                <div class="mt32" style="font-size:11px;">
+                <div class="mt32">
                     <p t-field="doc.notes"/>
                 </div>
             </div>
         </t>
     </template>
 
+
 </odoo>