From 68af14b82123e2e6d824111d3af04b3ba678e49a Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Mon, 5 Jun 2023 18:13:07 +0530
Subject: [PATCH] Jun 5 [FIX]: Bug Fixed 'agriculture_management_odoo'

---
 agriculture_management_odoo/__init__.py       |  1 +
 agriculture_management_odoo/__manifest__.py   |  1 +
 .../data/data_sequence.xml                    |  1 +
 .../report/crop_animal.xml                    | 12 +++
 .../report/crop_animal_report.xml             | 75 ++++++------------
 .../report/crop_vehicle_report.xml            | 77 +++++++++----------
 6 files changed, 75 insertions(+), 92 deletions(-)
 create mode 100644 agriculture_management_odoo/report/crop_animal.xml

diff --git a/agriculture_management_odoo/__init__.py b/agriculture_management_odoo/__init__.py
index 4f3bd3dd4..ca12c8644 100644
--- a/agriculture_management_odoo/__init__.py
+++ b/agriculture_management_odoo/__init__.py
@@ -21,3 +21,4 @@
 #############################################################################
 from . import models
 from . import wizard
+
diff --git a/agriculture_management_odoo/__manifest__.py b/agriculture_management_odoo/__manifest__.py
index a8f723aee..c9998cda5 100644
--- a/agriculture_management_odoo/__manifest__.py
+++ b/agriculture_management_odoo/__manifest__.py
@@ -44,6 +44,7 @@
         'report/pest_report_template.xml',
         'report/crop_vehicle_report.xml',
         'report/crop_animal_report.xml',
+        'report/crop_animal.xml',
         'wizard/crop_report_wiz.xml',
         'wizard/pest_report_wiz.xml',
         'views/menu_action.xml',
diff --git a/agriculture_management_odoo/data/data_sequence.xml b/agriculture_management_odoo/data/data_sequence.xml
index 389a844e9..9ea064027 100644
--- a/agriculture_management_odoo/data/data_sequence.xml
+++ b/agriculture_management_odoo/data/data_sequence.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <data>
     <record id="seq_pesticide" model="ir.sequence">
         <field name="name">Pest Request</field>
diff --git a/agriculture_management_odoo/report/crop_animal.xml b/agriculture_management_odoo/report/crop_animal.xml
new file mode 100644
index 000000000..32a7c5561
--- /dev/null
+++ b/agriculture_management_odoo/report/crop_animal.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="report_animal_crop" model="ir.actions.report">
+        <field name="name">Animal Crop Report</field>
+        <field name="model">crop.requests</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">agriculture_management_odoo.animal_crop</field>
+        <field name="report_file">agriculture_management_odoo.animal_crop</field>
+        <field name="binding_model_id" ref="model_crop_requests"/>
+        <field name="binding_type">report</field>
+    </record>
+</odoo>
diff --git a/agriculture_management_odoo/report/crop_animal_report.xml b/agriculture_management_odoo/report/crop_animal_report.xml
index 0603d6e9d..1132fbaad 100644
--- a/agriculture_management_odoo/report/crop_animal_report.xml
+++ b/agriculture_management_odoo/report/crop_animal_report.xml
@@ -1,44 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <template id="animal_crop">
         <t t-call="web.html_container">
             <t t-foreach="docs" t-as="doc">
                 <t t-call="web.external_layout">
                     <div class="page">
-                        <strong>
+                        <center>
                             <h1>Crop Animal Report</h1>
-                        </strong>
-                        <table class="table table-sm"
-                               style="border: 2px solid black;">
-                            <tr>
-                                <td>REFERENCE</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.ref"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>FARMER</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.farmer_id.farmer_name.name"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>CROP</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.seed_id.name"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>LOCATION</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.location_id.location_name"/>
-                                </td>
-                            </tr>
-                        </table>
-
+                         </center><br></br>
+                        <div t-if="doc.ref" style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Reference :
+                                <t t-esc="doc.ref"/>
+                            </p>
+                        </div>
+                        <div t-if="doc.farmer_id.farmer_name.name" style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Farmer :
+                                <t t-esc="doc.farmer_id.farmer_name.name"/>
+                            </p>
+                        </div>
+                        <div t-if="doc.seed_id.name" style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Crop :
+                                <t t-esc="doc.seed_id.name"/>
+                            </p>
+                        </div>
+                        <div t-if="doc.location_id.location_name" style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Location :
+                                <t t-esc="doc.location_id.location_name"/>
+                            </p>
+                        </div>
                         <br>
                         </br>
                         <style>
@@ -48,8 +37,8 @@
                             padding: 5px;
                             }
                         </style>
-                        <table class="table table-sm"
-                               style="border: 2px solid black;">
+                        <table class="table table-bordered"
+                               style="border: 2px solid black;text-align: center !important;">
                             <thead>
                                 <tr>
                                     <strong>
@@ -74,18 +63,4 @@
             </t>
         </t>
     </template>
-
-
-    <record id="report_animal_crop" model="ir.actions.report">
-        <field name="name">Animal Crop Report</field>
-        <field name="model">crop.requests</field>
-        <field name="report_type">qweb-pdf</field>
-        <field name="report_name">agriculture_management_odoo.animal_crop
-        </field>
-        <field name="report_file">agriculture_management_odoo.animal_crop
-        </field>
-        <field name="binding_type">report</field>
-        <field name="binding_model_id" ref="model_crop_requests"/>
-    </record>
-
 </odoo>
\ No newline at end of file
diff --git a/agriculture_management_odoo/report/crop_vehicle_report.xml b/agriculture_management_odoo/report/crop_vehicle_report.xml
index e97d29f53..8269020a5 100644
--- a/agriculture_management_odoo/report/crop_vehicle_report.xml
+++ b/agriculture_management_odoo/report/crop_vehicle_report.xml
@@ -1,43 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <template id="vehicle_crop">
         <t t-call="web.html_container">
             <t t-foreach="docs" t-as="doc">
                 <t t-call="web.external_layout">
                     <div class="page">
-                        <strong>
-                            <h1>Crop Vehicle Report</h1>
-                        </strong>
-                        <table class="table table-sm"
-                               style="border: 2px solid black;">
-                            <tr>
-                                <td>REFERENCE</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.ref"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>FARMER</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.farmer_id.farmer_name.name"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>CROP</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.seed_id.name"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>LOCATION</td>
-                                <td>:</td>
-                                <td>
-                                    <t t-esc="doc.location_id.location_name"/>
-                                </td>
-                            </tr>
-                        </table>
+
+                            <center>
+                                <h1>Crop Vehicle Report</h1>
+                            </center>
+
+                        <br></br>
+                        <div t-if="doc.ref"
+                             style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Reference :
+                                <t t-esc="doc.ref"/>
+                            </p>
+                        </div>
+                        <div t-if="doc.farmer_id.farmer_name.name"
+                             style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Farmer :
+                                <t t-esc="doc.farmer_id.farmer_name.name"/>
+                            </p>
+                        </div>
+                        <div t-if="doc.seed_id.name"
+                             style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Crop :
+                                <t t-esc="doc.seed_id.name"/>
+                            </p>
+                        </div>
+                        <div t-if="doc.location_id.location_name"
+                             style="font-family: 'Montserrat', sans-serif !important;font-weight: bold;font-size: 1.3rem">
+                            <p>Location :
+                                <t t-esc="doc.location_id.location_name"/>
+                            </p>
+                        </div>
 
                         <br>
                         </br>
@@ -49,7 +46,7 @@
                             }
                         </style>
                         <table class="table table-sm"
-                               style="border: 2px solid black;">
+                               style="border: 2px solid black">
                             <thead>
                                 <tr>
                                     <strong>
@@ -74,17 +71,13 @@
             </t>
         </t>
     </template>
-
-
     <record id="report_vehicle_crop" model="ir.actions.report">
         <field name="name">Vehicle Crop Report</field>
         <field name="model">crop.requests</field>
         <field name="report_type">qweb-pdf</field>
-        <field name="report_name">agriculture_management_odoo.vehicle_crop
-        </field>
-        <field name="report_file">agriculture_management_odoo.vehicle_crop
-        </field>
-        <field name="binding_type">report</field>
+        <field name="report_name">agriculture_management_odoo.vehicle_crop</field>
+        <field name="report_file">agriculture_management_odoo.vehicle_crop</field>
         <field name="binding_model_id" ref="model_crop_requests"/>
+        <field name="binding_type">report</field>
     </record>
 </odoo>
\ No newline at end of file