diff --git a/ks_dashboard_ninja/models/ks_dashboard_ninja.py b/ks_dashboard_ninja/models/ks_dashboard_ninja.py index 65971b0f2..fd8ccf1e7 100644 --- a/ks_dashboard_ninja/models/ks_dashboard_ninja.py +++ b/ks_dashboard_ninja/models/ks_dashboard_ninja.py @@ -1392,3 +1392,17 @@ class KsDashboardNinjaBoard(models.Model): rec.ks_domain_field_id.name]['selection'] } return data + + + def action_ks_dashboard(self): + ks_ids = self.env["ks_dashboard_ninja.board"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + for rec in ks_ids: + action_id = self.env['ir.actions.actions'].search([('name', '=', rec.name)]) + for group in rec.ks_dashboard_group_access: + for user in group.users: + res = self.env['res.users'].search([('id', '=', user.id)]) + res.write({ + 'action_id':action_id.id}) + + diff --git a/ks_dashboard_ninja/views/ks_dashboard_ninja_view.xml b/ks_dashboard_ninja/views/ks_dashboard_ninja_view.xml index 85d6261f3..5e6e28f86 100644 --- a/ks_dashboard_ninja/views/ks_dashboard_ninja_view.xml +++ b/ks_dashboard_ninja/views/ks_dashboard_ninja_view.xml @@ -92,6 +92,9 @@ ks_dashboard_ninja.board +
+
diff --git a/room/models/room_room.py b/room/models/room_room.py index 8705f524c..6da1d2724 100644 --- a/room/models/room_room.py +++ b/room/models/room_room.py @@ -41,7 +41,7 @@ class Room(models.Model): meet_equipment = fields.Char(string="会议室设备") office_address = fields.Char(string="会议室地址", required=True) - company_id = fields.Many2one("hr.department", string="公司", required=True) + company_id = fields.Many2one("res.company", string="公司", required=True) meeting_type_template = fields.Selection([('template1', '默认模板')], string='会议室模板') meet_document_id = fields.Many2one('documents.document', string="布局图片") meet_capacity = fields.Integer(string="容纳人数", required=True) diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 15e1bf99f..44f018c15 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -365,7 +365,7 @@ class HolidaysRequestBatch(models.Model): @api.depends("users_id") def _compute_details(self): for record in self: - holiday_id = record.env['yuthon.holiday.setting'].search([('department_ids', 'in', record.users_id.employee_id.department_id.id)]) + holiday_id = record.env['yuthon.holiday.setting'].search([('department_ids', 'in', record.users_id.employee_id.department_id.id)], limit=1) if holiday_id: record.details = holiday_id.name else: diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index baabae1e3..f01536a7a 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -71,6 +71,7 @@ class PropertyLeaseContract(models.Model): lease_term_year = fields.Integer(string="租期(年)") lease_term_month = fields.Integer(string="租期(月)") lease_term_day = fields.Integer(string="租期(日)") + is_less_than_2 = fields.Boolean(string="是否小于2年", compute="_compute_is_less_than_2", store=True) term_start_time = fields.Date(string="合约开始时间", default=fields.Datetime.now) term_end_time = fields.Date(string="合约结束时间") actual_start_time = fields.Date(string="实际开始时间") @@ -148,12 +149,13 @@ class PropertyLeaseContract(models.Model): property_state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中')], string="状态", default=None) # 附件 license_id = fields.Many2one('ir.attachment', string="营业执照") - card_id = fields.Many2one('ir.attachment', string="经办人身份证") legal_entity_id = fields.Many2one('ir.attachment', string="法人身份证") power_attorney_id = fields.Many2one('ir.attachment', string="授权委托书") - handle_cards_id = fields.Many2one('ir.attachment', string="经办人身份证") + asset_valuation_id = fields.Many2one('ir.attachment', string="资产评估结果明细表") + lease_contract = fields.Many2one('ir.attachment', string="租赁合同(住宅)") confirmation_transaction_id = fields.Many2one('ir.attachment', string="成交确认书") - responsibility_book_id = fields.Many2one('ir.attachment', string="安全生产责任书") + responsibility_book_id = fields.Many2one('ir.attachment', string="安全生产责任书(住宅)") + other_id = fields.Many2one('ir.attachment', string="其他") handover_time = fields.Date(string="交接日期") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') @@ -164,6 +166,22 @@ class PropertyLeaseContract(models.Model): name_title = fields.Char(default=_get_default_name_title) + def action_done(self): + contract_ids = self.env["property.lease.contract"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + for contract in contract_ids: + if contract.lease_term_year < 2: + contract.is_less_than_2 = True + else: + contract.is_less_than_2 = False + + @api.depends('lease_term_year') + def _compute_is_less_than_2(self): + if self.lease_term_year < 2: + self.is_less_than_2 = True + else: + self.is_less_than_2 = False + def update_property(self): contract_ids = self.env["property.lease.contract"].browse( self._context.get('active_ids', self._context.get('active_id'))) diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index e9a0ae49e..2275b1413 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -5,6 +5,9 @@ property.lease.contract +
+
@@ -94,15 +97,15 @@ - - + - + + @@ -176,12 +179,13 @@ 日 + -