From a810f1a06255ee5efa913ccf80293beed37c91cc Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Wed, 11 Jan 2023 14:08:44 +0530
Subject: [PATCH] Jan 11 : [FIX] Bug Fixed 'agriculture_management_odoo'

---
 agriculture_management_odoo/__manifest__.py   |  2 +-
 .../doc/RELEASE_NOTES.md                      |  5 +++
 .../models/animal_rental.py                   |  1 +
 .../models/crop_requests.py                   |  1 +
 .../models/pest_request.py                    |  3 +-
 .../models/vehicle_rental.py                  |  1 +
 .../report/crop_report.xml                    |  8 +---
 .../report/pest_report.xml                    |  8 +---
 .../report/pest_report_template.xml           |  6 +--
 .../views/menu_action.xml                     |  2 +-
 .../wizard/crop_report_wiz.py                 | 33 +++++++++++++--
 .../wizard/pest_report_wiz.py                 | 42 +++++++++++++++----
 12 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/agriculture_management_odoo/__manifest__.py b/agriculture_management_odoo/__manifest__.py
index 192b87da3..a8f723aee 100644
--- a/agriculture_management_odoo/__manifest__.py
+++ b/agriculture_management_odoo/__manifest__.py
@@ -21,7 +21,7 @@
 #############################################################################
 {
     'name': 'Agriculture Management In Odoo',
-    'version': '15.0.1.0.0',
+    'version': '15.0.2.0.0',
     'summary': 'Agriculture Management In Odoo',
     'description': """Agriculture Management In Odoo""",
     'category': 'Productivity',
diff --git a/agriculture_management_odoo/doc/RELEASE_NOTES.md b/agriculture_management_odoo/doc/RELEASE_NOTES.md
index a81da80ab..ed72f5bb1 100644
--- a/agriculture_management_odoo/doc/RELEASE_NOTES.md
+++ b/agriculture_management_odoo/doc/RELEASE_NOTES.md
@@ -5,3 +5,8 @@
 #### ADD
 - Initial commit for agriculture_management_odoo
 
+#### 10.11.2022
+#### Version 15.0.2.0.0
+#### UPDT
+- Updated
+
diff --git a/agriculture_management_odoo/models/animal_rental.py b/agriculture_management_odoo/models/animal_rental.py
index b52e5989c..30f580951 100644
--- a/agriculture_management_odoo/models/animal_rental.py
+++ b/agriculture_management_odoo/models/animal_rental.py
@@ -27,6 +27,7 @@ class AnimalRental(models.Model):
     _name = 'animal.rental'
     _inherit = ['mail.thread', 'mail.activity.mixin']
     _description = 'Animal Rental'
+    _rec_name = 'animal_id'
 
     animal_id = fields.Many2one('animal.details', string='Animal',
                                 required=True, tracking=True)
diff --git a/agriculture_management_odoo/models/crop_requests.py b/agriculture_management_odoo/models/crop_requests.py
index 9f1ecabe0..086c59a25 100644
--- a/agriculture_management_odoo/models/crop_requests.py
+++ b/agriculture_management_odoo/models/crop_requests.py
@@ -118,5 +118,6 @@ class CropAnimals(models.Model):
 
     dec = fields.Many2one('crop.requests')
     animal_id = fields.Many2one('animal.details', string='Animal',
+                                domain=[('state', '=', 'available')],
                                 tracking=True)
     qty = fields.Integer(string='Quantity')
diff --git a/agriculture_management_odoo/models/pest_request.py b/agriculture_management_odoo/models/pest_request.py
index e6e0870ec..f35f5b803 100644
--- a/agriculture_management_odoo/models/pest_request.py
+++ b/agriculture_management_odoo/models/pest_request.py
@@ -47,7 +47,8 @@ class PestRequests(models.Model):
                                       self: self.env.user.company_id.currency_id)
     pest_quantity = fields.Integer(string='Pest Quantity', required=True,
                                    tracking=True)
-    pest_cost = fields.Float(string='Pest Cost', required=True, tracking=True)
+    pest_cost = fields.Float(string='Pest Cost', required=True,
+                             tracking=True, related='pest_id.pest_cost')
     total_cost = fields.Float(string='Total Cost',
                               compute='_compute_total_cost', store=True,
                               tracking=True)
diff --git a/agriculture_management_odoo/models/vehicle_rental.py b/agriculture_management_odoo/models/vehicle_rental.py
index 2ddd18955..87f09734c 100644
--- a/agriculture_management_odoo/models/vehicle_rental.py
+++ b/agriculture_management_odoo/models/vehicle_rental.py
@@ -26,6 +26,7 @@ class VehicleRental(models.Model):
     _name = 'vehicle.rental'
     _inherit = ['mail.thread', 'mail.activity.mixin']
     _description = 'Vehicle Rental'
+    _rec_name = 'vehicle_id'
 
     vehicle_id = fields.Many2one('vehicle.details', string='Vehicle',
                                  required=True, tracking=True)
diff --git a/agriculture_management_odoo/report/crop_report.xml b/agriculture_management_odoo/report/crop_report.xml
index 51d26b032..76c399f7a 100644
--- a/agriculture_management_odoo/report/crop_report.xml
+++ b/agriculture_management_odoo/report/crop_report.xml
@@ -4,12 +4,8 @@
         <field name="name">Crop Report</field>
         <field name="model">crop.report.wizard</field>
         <field name="report_type">qweb-pdf</field>
-        <field name="report_name">
-            agriculture_management_odoo.report_crop_details
-        </field>
-        <field name="report_file">
-            agriculture_management_odoo.report_crop_details
-        </field>
+        <field name="report_name">agriculture_management_odoo.report_crop_details</field>
+        <field name="report_file">agriculture_management_odoo.report_crop_details</field>
         <field name="binding_model_id" ref="model_crop_report_wizard"/>
         <field name="binding_type">report</field>
     </record>
diff --git a/agriculture_management_odoo/report/pest_report.xml b/agriculture_management_odoo/report/pest_report.xml
index 1456b11cb..fc5587766 100644
--- a/agriculture_management_odoo/report/pest_report.xml
+++ b/agriculture_management_odoo/report/pest_report.xml
@@ -4,12 +4,8 @@
         <field name="name">pest Report</field>
         <field name="model">pest.report.wizard</field>
         <field name="report_type">qweb-pdf</field>
-        <field name="report_name">
-            agriculture_management_odoo.report_pest_details
-        </field>
-        <field name="report_file">
-            agriculture_management_odoo.report_pest_details
-        </field>
+        <field name="report_name">agriculture_management_odoo.report_pest_details</field>
+        <field name="report_file">agriculture_management_odoo.report_pest_details</field>
         <field name="binding_model_id" ref="model_pest_report_wizard"/>
         <field name="binding_type">report</field>
     </record>
diff --git a/agriculture_management_odoo/report/pest_report_template.xml b/agriculture_management_odoo/report/pest_report_template.xml
index 51d2cc372..9324c9aa7 100644
--- a/agriculture_management_odoo/report/pest_report_template.xml
+++ b/agriculture_management_odoo/report/pest_report_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <template id="report_crop_details">
+    <template id="report_pest_details">
         <t t-call="web.html_container">
             <t t-call="web.external_layout">
                 <div class="page">
@@ -86,11 +86,11 @@
                                         </td>
                                         <td>
                                             <span t-att-style="style"
-                                                  t-esc="val[5]"/>
+                                                  t-esc="val[6]"/>
                                         </td>
                                         <td>
                                             <span t-att-style="style"
-                                                  t-esc="val[6]"/>
+                                                  t-esc="val[5]"/>
                                         </td>
                                         <td>
                                             <span t-att-style="style"
diff --git a/agriculture_management_odoo/views/menu_action.xml b/agriculture_management_odoo/views/menu_action.xml
index 403c7701e..53e7917c6 100644
--- a/agriculture_management_odoo/views/menu_action.xml
+++ b/agriculture_management_odoo/views/menu_action.xml
@@ -29,7 +29,7 @@
     </record>
 
     <record id="action_animal_rental" model="ir.actions.act_window">
-        <field name="name">Vehicle Rental</field>
+        <field name="name">Animal Rental</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">animal.rental</field>
         <field name="view_mode">tree,form,kanban</field>
diff --git a/agriculture_management_odoo/wizard/crop_report_wiz.py b/agriculture_management_odoo/wizard/crop_report_wiz.py
index ab6635424..d79b6a913 100644
--- a/agriculture_management_odoo/wizard/crop_report_wiz.py
+++ b/agriculture_management_odoo/wizard/crop_report_wiz.py
@@ -19,7 +19,8 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 #############################################################################
-from odoo import fields, models
+from odoo import fields, models, _
+from odoo.exceptions import UserError
 
 
 class CropReport(models.TransientModel):
@@ -41,10 +42,34 @@ class CropReport(models.TransientModel):
                     crop_requests.seed_id = seed_details.id
                     inner join location_details ON
                     crop_requests.location_id = location_details.id"""
+        today = fields.Date.today()
+
+        if self.date_from and not self.date_to:
+            if self.date_from > today:
+                raise UserError(
+                    _('You could not set the start date or the end date in the future.'))
+            else:
+                ret = ret + """ where crop_requests.request_date >= '""" + str(
+                    self.date_from) + """' AND crop_requests.request_date <= '""" \
+                      + str(
+                    today) + """'"""
+
+        if self.date_to and not self.date_from:
+            if self.date_to > today:
+                raise UserError(
+                    _('You could not set the start date or the end date in the future.'))
+            else:
+                ret = ret + """ where crop_requests.request_date <= '""" + str(
+                    self.date_to) + """'"""
         if self.date_from and self.date_to:
-            ret = ret + """ where crop_requests.request_date > '""" + str(
-                self.date_from) + """' AND crop_requests.request_date < '""" + str(
-                self.date_to) + """'"""
+            if self.date_from <= self.date_to:
+                ret = ret + """ where crop_requests.request_date >= '""" + \
+                      str(self.date_from) + """' AND crop_requests.request_date <= '""" \
+                      + str(self.date_to) + """'"""
+            else:
+                raise UserError(
+                    _('The start date must be inferior to the end date.'))
+
         self.env.cr.execute(ret)
         record = self.env.cr.fetchall()
         data = {
diff --git a/agriculture_management_odoo/wizard/pest_report_wiz.py b/agriculture_management_odoo/wizard/pest_report_wiz.py
index 455a2aa3c..61bdb9ba2 100644
--- a/agriculture_management_odoo/wizard/pest_report_wiz.py
+++ b/agriculture_management_odoo/wizard/pest_report_wiz.py
@@ -19,7 +19,8 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 #############################################################################
-from odoo import fields, models
+from odoo import fields, models, _
+from odoo.exceptions import UserError
 
 
 class CropReport(models.TransientModel):
@@ -31,15 +32,42 @@ class CropReport(models.TransientModel):
 
     def action_pdf_report(self):
         ret = """select pest_request.reference, res_partner.name, crop_requests.ref,
-                pest_request.disease, pest_details.pest_name,pest_request.pest_quantity,
-                pest_request.pest_cost, pest_request.total_cost,pest_request.state from pest_request
+                pest_request.disease, pest_details.pest_name as pest_name,pest_details.pest_cost as cost,pest_request.pest_quantity,
+                pest_request.total_cost,pest_request.state from pest_request
                 inner join res_partner on pest_request.farmer_id = res_partner.id
                 inner join crop_requests on crop_requests.id = pest_request.crop_id
                 inner join pest_details on pest_details.id = pest_request.pest_id"""
+        today = fields.Date.today()
+
+        if self.date_from and not self.date_to:
+            if self.date_from > today:
+                raise UserError(
+                    _('You could not set the start date or the end date in the future.'))
+            else:
+                ret = ret + """ where pest_request.request_date >= '""" + str(
+                    self.date_from) + """' AND pest_request.request_date <= 
+                    '""" \
+                      + str(
+                    today) + """'"""
+
+        if self.date_to and not self.date_from:
+            if self.date_to > today:
+                raise UserError(
+                    _('You could not set the start date or the end date in the future.'))
+            else:
+                ret = ret + """ where pest_request.request_date <= '""" + str(
+                    self.date_to) + """'"""
+
         if self.date_from and self.date_to:
-            ret = ret + """ where crop_requests.request_date > '""" + str(
-                self.date_from) + """' AND crop_requests.request_date < '""" + str(
-                self.date_to) + """'"""
+            if self.date_from <= self.date_to:
+                ret = ret + """ where pest_request.request_date >= '""" + \
+                      str(self.date_from) + """' AND pest_request.request_date 
+                      <= '""" \
+                      + str(self.date_to) + """'"""
+            else:
+                raise UserError(
+                    _('The start date must be inferior to the end date.'))
+
         self.env.cr.execute(ret)
         record = self.env.cr.fetchall()
         data = {
@@ -49,5 +77,5 @@ class CropReport(models.TransientModel):
             'record': record
         }
         return self.env.ref(
-            'agriculture_management_odoo.action_crop_request_report').report_action(
+            'agriculture_management_odoo.action_pest_request_report').report_action(
             self, data=data)