diff --git a/yuthon_account_report/models/financial_sheet_collection.py b/yuthon_account_report/models/financial_sheet_collection.py
index b8a68a295..4529cd519 100644
--- a/yuthon_account_report/models/financial_sheet_collection.py
+++ b/yuthon_account_report/models/financial_sheet_collection.py
@@ -1,4 +1,5 @@
from odoo import fields, models, api
+import json
class FinancialSheetCollection(models.Model):
diff --git a/yuthon_account_report/models/table_setting.py b/yuthon_account_report/models/table_setting.py
index 8a8c5fe51..297c8fde1 100644
--- a/yuthon_account_report/models/table_setting.py
+++ b/yuthon_account_report/models/table_setting.py
@@ -13,6 +13,18 @@ class SheetCollectionSetting(models.Model):
user_role_id = fields.Many2one('soong.user.role', string="角色")
start_date = fields.Date(string="生效日期", default=fields.Datetime.today())
end_date = fields.Date(string="失效日期")
+ is_enable = fields.Boolean(string="是否启用", compute="compute_is_enable")
+
+ @api.depends('start_date', 'end_date')
+ def compute_is_enable(self):
+ today = fields.Date.today()
+ for record in self:
+ if not record.start_date:
+ record.is_enable = False
+ elif not record.end_date:
+ record.is_enable = record.start_date <= today
+ else:
+ record.is_enable = record.start_date <= today <= record.end_date
class SummaryTableSetting(models.Model):
@@ -25,4 +37,16 @@ class SummaryTableSetting(models.Model):
company_id = fields.Many2one('res.company', string="公司")
start_date = fields.Date(string="生效日期", default=fields.Datetime.today())
end_date = fields.Date(string="失效日期")
+ is_enable = fields.Boolean(string="是否启用", compute="compute_is_enable")
+
+ @api.depends('start_date', 'end_date')
+ def compute_is_enable(self):
+ today = fields.Date.today()
+ for record in self:
+ if not record.start_date:
+ record.is_enable = False
+ elif not record.end_date:
+ record.is_enable = record.start_date <= today
+ else:
+ record.is_enable = record.start_date <= today <= record.end_date
diff --git a/yuthon_account_report/views/financial_sheet_collection_views.xml b/yuthon_account_report/views/financial_sheet_collection_views.xml
index 8574f6259..897f18c42 100644
--- a/yuthon_account_report/views/financial_sheet_collection_views.xml
+++ b/yuthon_account_report/views/financial_sheet_collection_views.xml
@@ -13,9 +13,10 @@
-
-
+ />
+
+
@@ -38,7 +39,8 @@
-
+
@@ -53,6 +55,46 @@
+
+ financial.sheet.line.kanban
+ financial.sheet.line
+
+
+
+
+
+
+
+
+
+
+
+
+ 项目:
+
+
+
+
+ 本期数:
+
+
+
+
+ 上年同期数:
+
+
+
+
+ 说明:
+
+
+
+
+
+
+
+
+
财务数据表收集
financial.sheet.collection
diff --git a/yuthon_account_report/views/information_summary_table_views.xml b/yuthon_account_report/views/information_summary_table_views.xml
index 4a860606b..6d25a48c8 100644
--- a/yuthon_account_report/views/information_summary_table_views.xml
+++ b/yuthon_account_report/views/information_summary_table_views.xml
@@ -38,7 +38,8 @@
-
+
@@ -51,9 +52,43 @@
+
+ information.summary.line.kanban
+ information.summary.line
+
+
+
+
+
+
+
+
+
+
+
+ 项目:
+
+
+
+
+ 本年底:
+
+
+
+
+ 说明:
+
+
+
+
+
+
+
+
+
信息汇总表
information.summary.table
- tree
+ tree,form
diff --git a/yuthon_account_report/views/table_setting_views.xml b/yuthon_account_report/views/table_setting_views.xml
index 5871299c3..5df437dfc 100644
--- a/yuthon_account_report/views/table_setting_views.xml
+++ b/yuthon_account_report/views/table_setting_views.xml
@@ -10,6 +10,7 @@
+
@@ -28,6 +29,7 @@
+