!347 zhou

Merge pull request !347 from 李鹏宇/dev_zhou

soong_workflow/__manifest__.py

@@ -9,6 +9,7 @@
     "data": [
         "data/soong_workflow_note_data.xml",
         "data/soong_workflow_inspector_code.xml",
+        "data/soong_workflow_time.xml",
         "security/soong_workflow_security.xml",
         "security/ir.model.access.csv",
         "views/kklw_workflow_approval_views.xml",

soong_workflow/data/soong_workflow_time.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+        <record forcecreate="True" id="soong_workflow_start_end_time" model="ir.cron">
+            <field name="name">定时任务：工作流的结束时间</field>
+            <field name="model_id" ref="model_soong_workflow"/>
+            <field name="state">code</field>
+            <field name="code">model.get_soong_workflow_time()</field>
+            <field eval="False" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 00:00:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
+    </data>
+</odoo>

soong_workflow/models/soong_workflow.py

@@ -3,7 +3,6 @@ import logging
 import datetime
 from odoo import models, fields, api, _, modules
 from odoo.exceptions import ValidationError, UserError
-
 _logger = logging.getLogger(__name__)
 
 MODEL_DOMAIN = """[
@@ -181,3 +180,9 @@ class SoongWorkflow(models.Model):
             "res_model": self.model_id.model,
             "views": [[False, "form"]],
         }
+
+    def get_soong_workflow_time(self):
+        for record in self.search([]):
+            if record.end_date:
+                if record.end_date < fields.Date.today():
+                    record.is_enable = False

yuthon_property/__manifest__.py

@@ -28,7 +28,7 @@
         'views/menuitem.xml',
     ],
     'demo': [],
-    'depends': ['mail','documents','soong_workflow'],
+    'depends': ['mail','documents','soong_workflow',],
     'installable': True,
     'application': True,
 }

yuthon_property/views/menuitem.xml

@@ -63,11 +63,11 @@
               parent="yuthon_property_menu_data"
               action="action_property_rental_form"/>
 
-    <menuitem id="yuthon_property_eligibility_form"
-              sequence="3"
-              name="承租资格申报表"
-              parent="yuthon_property_menu_data"
-              action="yuthon_property_approval.property_eligibility_action"/>
+<!--    <menuitem id="yuthon_property_eligibility_form"-->
+<!--              sequence="3"-->
+<!--              name="承租资格申报表"-->
+<!--              parent="yuthon_property_menu_data"-->
+<!--              action="yuthon_property_approval.property_eligibility_action"/>-->
 
     <menuitem id="yuthon_property_confirmation_of_transaction_menu"
               sequence="5"
@@ -84,11 +84,11 @@
               name="建设工程"
               parent="yuthon_property_estate_menu"
               action="property_assess_action"/>
-    <menuitem id="yuthon_property_lease_contract_menu"
-              sequence="3"
-              name="租赁合同"
-              parent="yuthon_property_estate_menu"
-              action="yuthon_property_approval.property_lease_contract_action"/>
+<!--    <menuitem id="yuthon_property_lease_contract_menu"-->
+<!--              sequence="3"-->
+<!--              name="租赁合同"-->
+<!--              parent="yuthon_property_estate_menu"-->
+<!--              action="yuthon_property_approval.property_lease_contract_action"/>-->
 
     <menuitem id="yuthon_property_science_menu"
               sequence="10"