From 214ed7e7d4aa80fde71503ebe221582dc97b38d1 Mon Sep 17 00:00:00 2001
From: "pawan.sharma" <pawan.sharma@sunarctechnologies.com>
Date: Tue, 23 Aug 2022 21:45:29 +0530
Subject: [PATCH] add project revenue date

---
 .../models/custom_project.py                   |  9 +++++----
 .../views/custom_project.xml                   | 10 ++++++----
 .../wizard/project_revenue_wizard.py           | 18 ++++++++++--------
 .../wizard/project_revenue_wizard.xml          |  5 +++--
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/project_revenue_amount/models/custom_project.py b/project_revenue_amount/models/custom_project.py
index f1e9b48..67a7707 100755
--- a/project_revenue_amount/models/custom_project.py
+++ b/project_revenue_amount/models/custom_project.py
@@ -14,8 +14,9 @@ class ProjectRevenueLines(models.Model):
     _name = 'project.revenue.lines'
 
     project_id  = fields.Many2one('project.project')
-    start_date = fields.Date(required=True)
-    end_date = fields.Date(required=True)
+    # start_date = fields.Date(required=True)
+    # end_date = fields.Date(required=True)
+    date = fields.Date(required=True)
     fixed_amount = fields.Float()
 
     def edit_revenue_history_record(self):
@@ -33,7 +34,7 @@ class ProjectRevenueLines(models.Model):
             # 'view_id': view_id
         }
 
-    @api.onchange('start_date')
+    """@api.onchange('start_date')
     def _onchange_start_date(self):
         if self.project_id:
             records = self.env['project.revenue.lines'].sudo().search([('project_id', '=', self.project_id.id)])
@@ -44,7 +45,7 @@ class ProjectRevenueLines(models.Model):
                     pass
                     for line in records:
                         if self.start_date >= line.start_date and self.start_date <= line.end_date:
-                            raise AccessError('Date already exist')
+                            raise AccessError('Date already exist')"""
 
     def update_record(self):
         return {
diff --git a/project_revenue_amount/views/custom_project.xml b/project_revenue_amount/views/custom_project.xml
index 0334e5f..01ecb60 100755
--- a/project_revenue_amount/views/custom_project.xml
+++ b/project_revenue_amount/views/custom_project.xml
@@ -10,8 +10,9 @@
                     <field name="revenue_amount_lines" context="{'project_id' : active_id}" readonly="1">
                         <tree editable="bottom">
                             <field name="project_id" invisible="1"/>
-                            <field name="start_date"/>
-                            <field name="end_date"/>
+                            <!--<field name="start_date"/>
+                            <field name="end_date"/>-->
+                            <field name="date"/>
                             <field name="fixed_amount"/>
                             <button type="object" name="edit_revenue_history_record" string="Edit" class="oe_highlight"/>
                             <button name="unlink"
@@ -33,8 +34,9 @@
                 <group>
                     <group>
                         <field name="project_id" readonly="1"/>
-                        <field name="start_date"/>
-                        <field name="end_date"/>
+                        <!--<field name="start_date"/>
+                        <field name="end_date"/>-->
+                        <field name="date"/>
                         <field name="fixed_amount"/>
                     </group>
                 </group>
diff --git a/project_revenue_amount/wizard/project_revenue_wizard.py b/project_revenue_amount/wizard/project_revenue_wizard.py
index b036bda..207699b 100755
--- a/project_revenue_amount/wizard/project_revenue_wizard.py
+++ b/project_revenue_amount/wizard/project_revenue_wizard.py
@@ -8,9 +8,10 @@ class CustomProjectWizard(models.TransientModel):
     _name = 'project.revenue.wizard'
 
     project_id = fields.Many2one('project.project')
-    start_date = fields.Date(required=True)
+    #start_date = fields.Date(required=True)
     #end_date = fields.Datet(compute='_compute_end_date', store=True)
-    end_date = fields.Date()
+    #end_date = fields.Date()
+    date = fields.Date(required=True)
     fixed_amount = fields.Float()
 
     # @api.depends('start_date')
@@ -20,22 +21,23 @@ class CustomProjectWizard(models.TransientModel):
     #             rec.end_date = rec.start_date + relativedelta.relativedelta(months=1) - relativedelta.relativedelta(
     #                 days=1)
 
-    @api.depends('start_date')
+    """@api.depends('start_date')
     def _compute_end_date(self):
         if self.start_date:
-            self.end_date = self.start_date + relativedelta.relativedelta(months=1) - relativedelta.relativedelta(days=1)
+            self.end_date = self.start_date + relativedelta.relativedelta(months=1) - relativedelta.relativedelta(days=1)"""
 
     def action_set_revenue_lines(self):
         values = {
             'project_id':self.project_id.id,
-            'start_date':self.start_date,
-            'end_date':self.end_date,
+            # 'start_date':self.start_date,
+            # 'end_date':self.end_date,
+            'date':self.date,
             'fixed_amount':self.fixed_amount
         }
         res = self.env['project.revenue.lines'].create(values)
         return res
 
-    @api.onchange('start_date')
+    """@api.onchange('start_date')
     def _onchange_start_date(self):
         active_id = self._context.get('active_ids', [])
         project_object = self.env['project.project'].search([('id', '=', active_id[0])])
@@ -47,4 +49,4 @@ class CustomProjectWizard(models.TransientModel):
                 self.project_id = project_object.id
             for line in records:
                 if self.start_date >= line.start_date and self.start_date <= line.end_date:
-                    raise AccessError('Date already exist')
+                    raise AccessError('Date already exist')"""
diff --git a/project_revenue_amount/wizard/project_revenue_wizard.xml b/project_revenue_amount/wizard/project_revenue_wizard.xml
index 69ab0e5..3c3e7ff 100755
--- a/project_revenue_amount/wizard/project_revenue_wizard.xml
+++ b/project_revenue_amount/wizard/project_revenue_wizard.xml
@@ -7,8 +7,9 @@
                 <group>
                     <group>
                         <field name="project_id" readonly="1"/>
-                        <field name="start_date"/>
-                        <field name="end_date"/>
+                        <!--<field name="start_date"/>
+                        <field name="end_date"/>-->
+                        <field name="date"/>
                         <field name="fixed_amount"/>
 
                     </group>