Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into form-sp

1 files changed, 79 insertions, 92 deletions

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 9d7f4028..cd8af78a 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -25,96 +25,88 @@
         </t>
     </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">
-                <!-- Header Image -->
-                <div class="mb16">
-                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
-                        style="width:100%; max-height:100px; object-fit:contain;"/>
-                </div>
+            <!-- Header -->
+            <div class="header">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
+                    style="width:100%; display: block;"/>
+            </div>
 
-                <!-- Title -->
-                <h2 class="text-center mb4" style="color:#d32f2f; font-weight:bold;">
+
+            <!-- PAGE CONTENT -->
+            <div class="article" style="margin: 0 1.5cm 0 1.5cm; ">
+                <!-- TITLE -->
+                <h2 style="text-align:center; margin:0; color:#d32f2f; font-weight:bold;">
                     PURCHASE ORDER
                 </h2>
-                <h4 class="text-center mb32">
+                <h4 style="text-align:center; margin:0 0 20px 0;">
                     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>
-                </div>
+                <!-- TOP INFO -->
+                <table style="width:100%; margin-bottom:16px; font-size:14px;">
+                    <tr>
+                        <td><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></td>
+                        <td><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></td>
+                        <td><strong>Responsible:</strong> <span t-field="doc.user_id"/></td>
+                    </tr>
+                </table>
 
-                <!-- Vendor & Shipping Info sejajar -->
-                <div class="row mb32" style="font-size:12px;">
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px;">
-                        <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
-                    </div>
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px;">
-                        <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}'/>
-                    </div>
-                </div>
+                <!-- VENDOR & DELIVERY -->
+                <table style="width:100%; margin-bottom:24px; border-collapse:separate; border-spacing:16px 0;">
+                    <tr>
+                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
+                            <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 - Indonesia
+                        </td>
+                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
+                            <strong>Nama Vendor:</strong><br/>
+                            <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"/>
+                        </td>
+                    </tr>
+                </table>
 
-                <!-- 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 style="border-collapse:collapse; width:100%; margin-top:16px;">
+                    <thead>
+                        <tr style="background:#f2f2f2;">
+                            <th style="border:1px solid #ccc; padding:4px;">Description</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Quantity</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Unit Price</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Taxes</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align: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; padding:4px;">
                                     <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; padding:4px; text-align: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; padding:4px; text-align: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; padding:4px; text-align: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; padding:4px; text-align: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;">
+                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa; border-left:1px solid #ccc; border-right:1px solid #ccc;">
                                         <div t-raw="line.product_id.website_description"/>
                                     </td>
                                 </tr>
@@ -123,40 +115,35 @@
                     </tbody>
                 </table>
 
-                <!-- Totals -->
-                <div class="clearfix">
-                    <div class="row">
-                        <div class="col-4 ml-auto">
-                            <table class="table table-sm" style="border:1px solid #000; border-collapse: collapse; width:100%;">
-                                <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>
-                                </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>
-                                </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>
-                                </tr>
-                            </table>
-                        </div>
-                    </div>
-                </div>
+                <!-- TOTALS -->
+                <table style="margin-top:20px; margin-left:auto; width:40%; font-size:14px;">
+                    <tr>
+                        <td><strong>Subtotal</strong></td>
+                        <td style="text-align:right;"><span t-field="doc.amount_untaxed"/></td>
+                    </tr>
+                    <tr>
+                        <td>Taxes</td>
+                        <td style="text-align:right;"><span t-field="doc.amount_tax"/></td>
+                    </tr>
+                    <tr>
+                        <td><strong>Total</strong></td>
+                        <td style="text-align:right;"><span t-field="doc.amount_total"/></td>
+                    </tr>
+                </table>
 
-                <!-- Notes -->
-                <div class="mt32" style="font-size:11px;">
+                <!-- NOTES -->
+                <div style="margin-top:24px;">
                     <p t-field="doc.notes"/>
                 </div>
             </div>
+        <!-- STATIC FOOTER -->
+            <div class="footer">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
+                    style="width:100%; display: block;"/>
+            </div>
+
         </t>
     </template>
 
+
 </odoo>