diff --git a/room/models/room_booking.py b/room/models/room_booking.py
index 1e6c11b1b..4dbf6c3f9 100644
--- a/room/models/room_booking.py
+++ b/room/models/room_booking.py
@@ -30,12 +30,11 @@ class RoomBooking(models.Model):
department_id = fields.Many2one('hr.department', related='organizer_id.employee_id.department_id', string="部门")
is_notice = fields.Boolean(string="是否发布通知", default=True)
- is_hour = fields.Boolean(string="提前一小时", default=True)
- is_day = fields.Boolean(string="提前一天", default=True)
+ task_time_ids = fields.Many2many('yuthon.task.time', string='提醒')
meeting_type = fields.Selection([('up', '线上'), ('down', '线下'), ('exterior', '外部')], default='down', string="会议形式",
required=True)
meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型")
- room_users_ids = fields.Many2many('hr.employee', string="出席人员")
+ room_users_ids = fields.Many2many('res.users', string="出席人员")
room_users_names = fields.Char(string="出席人员char", compute="_compute_room_users", store=True)
other_company_id = fields.Many2one('res.partner', string="外部公司")
host = fields.Many2one('hr.employee', string="主持人")
diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml
index cf4e2cbb8..9e706b0b4 100644
--- a/room/views/room_booking_views.xml
+++ b/room/views/room_booking_views.xml
@@ -180,22 +180,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/yuthon_property_approval/data/sale_renting_code_data.xml b/yuthon_property_approval/data/sale_renting_code_data.xml
index 224835f0d..f3b7e36fa 100644
--- a/yuthon_property_approval/data/sale_renting_code_data.xml
+++ b/yuthon_property_approval/data/sale_renting_code_data.xml
@@ -104,7 +104,7 @@
延租编号
property_lease_extension_code
- YZ%(y)s%(month)s%(day)s
+ YANZ%(y)s%(month)s%(day)s
3
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index 036a5a6f9..d927d58c5 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -634,9 +634,6 @@ class PropertyLeaseContract(models.Model):
for rec in self:
start = rec.term_start_time
end = rec.term_end_time
- if start and end:
- total_months = (end.year - start.year) * 12 + (end.month - start.month)
- management_month_number = max(total_months, 0)
# 初始化值
rec.is_water = False
rec.is_electricity = False
@@ -678,6 +675,8 @@ class PropertyLeaseContract(models.Model):
if lease.address_id.is_message_fee and lease.address_id.message_standard_id:
if lease.address_id.rent_area > 0:
+ total_months = (end.year - start.year) * 12 + (end.month - start.month)
+ management_month_number = max(total_months, 0)
message_fee_values.append([0, 0, {
'breakdown_id': rec.id,
'management_unit_price': lease.address_id.message_standard_id.amount,
diff --git a/yuthon_trade/data/sale_renting_code_data.xml b/yuthon_trade/data/sale_renting_code_data.xml
index 83e371c14..283232bb4 100644
--- a/yuthon_trade/data/sale_renting_code_data.xml
+++ b/yuthon_trade/data/sale_renting_code_data.xml
@@ -17,7 +17,7 @@
用章审批编号
yuthon_seals_approval_code
- YZ%(y)s%(month)s%(day)s
+ YONZ%(y)s%(month)s%(day)s
3
diff --git a/yuthon_trade/models/yuthon_seals_approval.py b/yuthon_trade/models/yuthon_seals_approval.py
index 64d6fa7af..8ad2e1caf 100644
--- a/yuthon_trade/models/yuthon_seals_approval.py
+++ b/yuthon_trade/models/yuthon_seals_approval.py
@@ -23,13 +23,9 @@ class YuthonSealsApproval(models.Model):
remake = fields.Text(string="用章意见")
active = fields.Boolean('Active', default=True, tracking=True)
work_end = fields.Boolean(string="结束")
- name_title = fields.Char()
- self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
- def end_approval(self):
- workflow_id = (self.env['soong.workflow.record'].search([('code', '=', self.code)]))
- self.env['soong.workflow.line'].create({
- 'model': self._name,
- 'res_id': self.id,
- 'workflow_record_id': workflow_id.id,
- })
\ No newline at end of file
+ def _get_default_name_title(self):
+ return self._description if self._description else self._name
+
+ name_title = fields.Char(default=_get_default_name_title)
+ self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py
index e141f6ef9..d3beb371b 100644
--- a/yuthon_will_task/models/yuthon_will_task.py
+++ b/yuthon_will_task/models/yuthon_will_task.py
@@ -214,7 +214,7 @@ class YuthonWillTask(models.Model):
data_employee_id = ('司机:' + ', '.join(self.employee_ids2.mapped('name')) + '\n') if self.employee_ids2 else ''
data_nota = ('备注:' + self.remarks) if self.remarks else ('') + '\n'
data = data_name + data_user_ids + data_nota + data_employee_id
- self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid,title="日程事项提醒", description=data,
+ self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee_id.wecom_userid, title="日程事项提醒", description=data,
url=url, btntxt="详细信息")
def button_add_comment(self):
@@ -237,7 +237,7 @@ class YuthonWillTask(models.Model):
raise UserError("请同步{}的企业微信".format(employee_id.name))
menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的日程')])
url = f'https://oa.thtzjt.com/web#id={self.id}&cids=2&action={menu_id.action.id}&model=yuthon.will.task&view_type=list&menu_id={menu_id.id}'
- self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid,
+ self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee_id.wecom_userid,
title="日程事项提醒", description="事项名称: " + self.name + '\t' + '该事项已取消',
url=url, btntxt="详细信息")
for record in self: