添加功能
This commit is contained in:
@@ -12,7 +12,7 @@ class SoongWorkflowInspector(models.Model):
|
||||
name = fields.Char(string="标题")
|
||||
start_data = fields.Date(string="督办日期")
|
||||
end_data = fields.Date(string="完成日期")
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user)
|
||||
department_id = fields.Many2one(related='user_id.department_id', string="部门")
|
||||
code = fields.Char(string="督办编号", default=lambda self: self.env['ir.sequence'].next_by_code('inspector_code'))
|
||||
|
||||
@@ -45,6 +45,25 @@ class SoongWorkflowCommentWizard(models.TransientModel):
|
||||
string="督办人员", store=True)
|
||||
is_automatic = fields.Boolean('是否自动匹配')
|
||||
|
||||
employee_ids1 = fields.Many2many(
|
||||
'hr.employee',
|
||||
'employee_ids1_rel',
|
||||
'custom_id1',
|
||||
'employee_id1',
|
||||
string="转交人员",
|
||||
store=True
|
||||
)
|
||||
|
||||
@api.onchange('employee_ids')
|
||||
def _onchange_employee_ids(self):
|
||||
if len(self.employee_ids) == 1:
|
||||
self.employee_ids1 = self.employee_ids
|
||||
|
||||
@api.constrains('employee_ids1')
|
||||
def _check_employee_ids1(self):
|
||||
if not self.employee_ids1:
|
||||
raise ValidationError("必须有转交人员")
|
||||
|
||||
@api.depends('comment_note_id', 'comment_note')
|
||||
def _compute_comment(self):
|
||||
for record in self:
|
||||
@@ -85,15 +104,15 @@ class SoongWorkflowCommentWizard(models.TransientModel):
|
||||
if '转交' not in next_list:
|
||||
raise UserError('配置错误,请配置当前{}的转交按钮'.format(btn.name))
|
||||
else:
|
||||
if btn.is_automatic:
|
||||
employee_user_role_id = self.env['hr.employee'].search(
|
||||
[('user_role_id', '=', btn.users_role_id.id),
|
||||
('department_id', '=', record_id.department_id.id)])
|
||||
employee_user_role_id = self.env['hr.employee'].search(
|
||||
[('user_role_id', '=', btn.users_role_id.id),
|
||||
('department_id', '=', record_id.department_id.id)])
|
||||
if employee_user_role_id:
|
||||
self.employee_ids = employee_user_role_id
|
||||
else:
|
||||
employee_user_role_ids = self.env['hr.employee'].search(
|
||||
[('user_role_id', '=', btn.users_role_id.id)])
|
||||
self.employee_ids = employee_user_role_ids
|
||||
raise UserError('下一个流程节点没有匹配的人员,请联系管理员配置')
|
||||
if btn.is_automatic:
|
||||
self.employee_ids1 = employee_user_role_id
|
||||
|
||||
@api.onchange('trans_link_id')
|
||||
def onchange_trans_employee_ids(self):
|
||||
|
||||
@@ -48,7 +48,8 @@
|
||||
<!-- 转交人员 -->
|
||||
<field name="trans_link_id" string="转交节点" invisible="node_btn_name == '退回'"/>
|
||||
<field name="employee_trans_domain_ids" invisible="1"/>
|
||||
<field name="employee_ids" widget="many2many_tags" string="人员范围"/>
|
||||
<field name="employee_ids" widget="many2many_tags" string="人员范围" invisible="1"/>
|
||||
<field name="employee_ids1" widget="many2many_tags" string="人员范围" domain="[('id', 'in', employee_ids)]"/>
|
||||
</group>
|
||||
<div invisible="node_btn_name != '结束'">
|
||||
<h2>当前流程是否结束,请确认</h2>
|
||||
|
||||
@@ -20,7 +20,7 @@ class YuthonFixesApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
leave_id = fields.Many2one('hr.leave.allocation')
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
|
||||
@@ -22,7 +22,7 @@ class CardApprovals(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
attendance_id = fields.Many2one('hr.attendance', string="补卡日期")
|
||||
attendance = fields.Char(string="补卡日期")
|
||||
|
||||
@@ -18,7 +18,7 @@ class RemoveHolidayApprovals(models.Model):
|
||||
statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], string="状态",
|
||||
default='drft')
|
||||
role_id = fields.Many2one('yuthon.user.role', string="岗位")
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
|
||||
@@ -16,7 +16,7 @@ class YuthonAbnormalApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
|
||||
|
||||
@@ -16,7 +16,7 @@ class YuthonAdjustmentsApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
replacement_data = fields.Date(string="值班时间")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
|
||||
@@ -17,7 +17,7 @@ class YuthonCustomerApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
|
||||
|
||||
@@ -25,7 +25,7 @@ class YuthonShiftApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
|
||||
|
||||
@@ -10,7 +10,7 @@ class YuthonSpecialApproval(models.Model):
|
||||
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
name = fields.Char(string="标题", readonly=False, default=lambda self: self.env.user.employee_id.resource_id.name)
|
||||
reason_application = fields.Html(string="申请事由")
|
||||
reason_application = fields.Text(string="申请事由")
|
||||
company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.user.company_id.id)
|
||||
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('special_approval'))
|
||||
resource_id = fields.Many2one('resource.resource', string="发起人",
|
||||
|
||||
@@ -27,7 +27,7 @@ class YuthonOnboardApproval(models.Model):
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
|
||||
account = fields.Char(string='账号')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
work_end = fields.Boolean(string="结束")
|
||||
employee_id = fields.Many2one('hr.employee', string="员工姓名")
|
||||
bank = fields.Char(string='开户行')
|
||||
|
||||
@@ -11,7 +11,7 @@ class YuthonPrepareApproval(models.Model):
|
||||
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
|
||||
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_prepare_approval_code'))
|
||||
name = fields.Char(string='标题')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
|
||||
@@ -12,7 +12,7 @@ class YuthonRecruitmentApproval(models.Model):
|
||||
name = fields.Char(string='标题')
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_recruitment_approval_code'))
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
recruitment_ids = fields.One2many('hr.job', 'recruitment_approval_id', string="招聘申请")
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
|
||||
@@ -27,7 +27,7 @@ class YutransferApproval(models.Model):
|
||||
notification_change_id = fields.Many2one("hr.employee", string="告知人员")
|
||||
handover_reason = fields.Text(string="移交原因")
|
||||
notice_documents_id = fields.Many2one('ir.attachment', string="附件")
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
|
||||
@@ -13,7 +13,7 @@ class YuthonEmployeeApproval(models.Model):
|
||||
dimension = fields.Char('评价维度', required=True)
|
||||
creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now())
|
||||
job_id = fields.Many2one('hr.job', string="岗位")
|
||||
reason_text = fields.Html(string='申请事由')
|
||||
reason_text = fields.Text(string='申请事由')
|
||||
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('library_changes_personal_code'))
|
||||
|
||||
change_employee_library_ids = fields.One2many("yuthon.index.employee",'change_employee_library_id',string="员工指标库库变更明细")
|
||||
|
||||
@@ -10,7 +10,7 @@ class YuthonIndexApproval(models.Model):
|
||||
name = fields.Char('标题')
|
||||
creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now())
|
||||
job_id = fields.Many2one('hr.job', string="岗位")
|
||||
reason_text = fields.Html(string='申请事由')
|
||||
reason_text = fields.Text(string='申请事由')
|
||||
code = fields.Char(string="编号",
|
||||
default=lambda self: self.env['ir.sequence'].next_by_code('library_changes_organize_code'))
|
||||
change_index_library_ids = fields.One2many("yuthon.index.management",'change_index_library_id',string="组织指标库变更明细")
|
||||
|
||||
@@ -7,6 +7,6 @@ class YuthonPlanApproval(models.Model):
|
||||
name = fields.Char('标题')
|
||||
creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now())
|
||||
job_id = fields.Many2one('hr.job', string="岗位")
|
||||
reason_text = fields.Html(string='申请事由')
|
||||
reason_text = fields.Text(string='申请事由')
|
||||
|
||||
# change_plan_ids = fields.One2many("yuthon.plan.management.line",'change_plan_id',string="个人计划变更明细")
|
||||
|
||||
@@ -13,7 +13,7 @@ class YuthonTissueDutyApproval(models.Model):
|
||||
creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now())
|
||||
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('duty_approval_code'))
|
||||
job_id = fields.Many2one('hr.job', string="岗位")
|
||||
reason_text = fields.Html(string='申请事由')
|
||||
reason_text = fields.Text(string='申请事由')
|
||||
|
||||
# 指标变更
|
||||
change_duty_kpi_ids = fields.One2many('yuthon.kpi.line', 'change_duty_kpi_id', string="原KPI明细")
|
||||
|
||||
@@ -14,7 +14,7 @@ class PropertyClaimApproval(models.Model):
|
||||
department_id = fields.Many2one('hr.department', string="部门")
|
||||
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
|
||||
default='normal')
|
||||
reason = fields.Html(string="事由")
|
||||
reason = fields.Text(string="事由")
|
||||
total_received = fields.Float(string='总额')
|
||||
work_fee = fields.Float(string='办公费')
|
||||
manage_fee = fields.Float(string='管理费')
|
||||
|
||||
@@ -13,7 +13,7 @@ class PropertyBorrowingApproval(models.Model):
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
department_id = fields.Many2one('hr.department', string="部门")
|
||||
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal')
|
||||
reason = fields.Html(string="事由")
|
||||
reason = fields.Text(string="事由")
|
||||
pay_tissue = fields.Char(string="付款组织")
|
||||
collection_account = fields.Char(string="收款账号")
|
||||
total_received = fields.Float(string='总额')
|
||||
|
||||
@@ -19,7 +19,7 @@ class PropertyConstructionApproval(models.Model):
|
||||
project_content = fields.Char(string="工程内容")
|
||||
company_b_id = fields.Many2one('property.construction.unit', string="乙方")
|
||||
property_id = fields.Many2one('yuthon.property', string='物业')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
image = fields.Binary(string="开工前图片")
|
||||
contract_id = fields.Many2one('ir.attachment', string="合同")
|
||||
start_date = fields.Date(string="开始日期")
|
||||
|
||||
@@ -21,7 +21,7 @@ class PropertyEligibility(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason = fields.Html(string="事由")
|
||||
reason = fields.Text(string="事由")
|
||||
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
|
||||
|
||||
@@ -16,7 +16,7 @@ class PropertyIntentionApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason = fields.Html(string="事由")
|
||||
reason = fields.Text(string="事由")
|
||||
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
intention_customer_ids = fields.One2many('property.intention.customer.line', 'property_intention_id', string="关联意向客户明细行")
|
||||
|
||||
@@ -12,7 +12,7 @@ class PropertyLeaseExtension(models.Model):
|
||||
_rec_name = 'name'
|
||||
|
||||
name = fields.Char(string='标题')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
|
||||
code = fields.Char(string="编号",
|
||||
|
||||
@@ -8,7 +8,7 @@ class PropertyMergeApproval(models.Model):
|
||||
_description = '物业合并审批'
|
||||
|
||||
name = fields.Char(string='标题')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
|
||||
|
||||
@@ -12,7 +12,7 @@ class PropertyPenaltyRelief(models.Model):
|
||||
_rec_name = 'name'
|
||||
|
||||
name = fields.Char(string='标题')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
department_id = fields.Many2one('hr.department', string="部门", related='users_id.employee_id.department_id')
|
||||
code = fields.Char(string="编号",
|
||||
|
||||
@@ -11,7 +11,7 @@ class PropertyRentRelief(models.Model):
|
||||
_rec_name = 'name'
|
||||
|
||||
name = fields.Char(string='标题')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
code = fields.Char(string="编号",
|
||||
default=lambda self: self.env['ir.sequence'].next_by_code('property_penalty_relief_code'))
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
|
||||
@@ -8,7 +8,7 @@ class PropertyRentalForm(models.Model):
|
||||
_inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
|
||||
|
||||
name = fields.Char(string="名称", required=True)
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
listing_method = fields.Selection([('enterprise', '企业自挂牌'), ('makeup', '广交所挂牌')], string="挂牌方式")
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
|
||||
@@ -21,7 +21,7 @@ class PropertySplitApproval(models.Model):
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
name = fields.Char(string='标题')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
property_split_approval_line_ids = fields.One2many('property.split.approval.line', 'property_split_approval_id', string='关联物业拆分明细行')
|
||||
split_quantity = fields.Integer(string='拆分数量', default=2)
|
||||
|
||||
@@ -15,7 +15,7 @@ class PropertyTransactionConfirmed(models.Model):
|
||||
lessee_id = fields.Many2one('property.tenant.information', string='承租方')
|
||||
entity_type = fields.Selection([('person', '个人'), ('enterprise', '企业')], string='实体类型')
|
||||
details = fields.Text(string='详情') #这里可以完善承租方信息,为租赁合同服务
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
|
||||
|
||||
@@ -17,7 +17,7 @@ class PropertyTransferApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason = fields.Html(string="事由")
|
||||
reason = fields.Text(string="事由")
|
||||
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
rental_address = fields.Char(string="租赁地址")
|
||||
|
||||
@@ -13,7 +13,7 @@ class YuthonOfficeSupplies(models.Model):
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
|
||||
department_id = fields.Many2one('hr.department', string="部门", related='users_id.employee_id.department_id')
|
||||
reason_application = fields.Html(string="事由")
|
||||
reason_application = fields.Text(string="事由")
|
||||
date = fields.Date(string="申请日期", default=fields.Date.today())
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
office_supplies_ids = fields.One2many('yuthon.office.supplies.line', 'supplies_id', string="关联办公用品申请明细")
|
||||
|
||||
@@ -18,7 +18,7 @@ class YuthonBusinessApproval(models.Model):
|
||||
is_issues = fields.Boolean(string='是否上会')
|
||||
issues_result = fields.Html(string="会议结果")
|
||||
related_issues_id = fields.Many2one('issue.library', string="关联议题")
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
document_ids = fields.Many2many('ir.attachment', string="附件")
|
||||
active = fields.Boolean('Active', default=True, tracking=True)
|
||||
work_end = fields.Boolean(string="结束")
|
||||
|
||||
@@ -14,7 +14,7 @@ class YuthonCareCondolences(models.Model):
|
||||
default=lambda self: self.env['ir.sequence'].next_by_code('property_care_reward_code_sequence'))
|
||||
date = fields.Date(string='日期')
|
||||
fees = fields.Float(string='费用')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
marriage_cate_id = fields.Many2one('ir.attachment', string="结婚证明")
|
||||
marriage_date = fields.Date(string="结婚时间")
|
||||
born_cate_id = fields.Many2one('ir.attachment', string="出生证明")
|
||||
|
||||
@@ -14,7 +14,7 @@ class YuthonWorkCondolences(models.Model):
|
||||
default=lambda self: self.env['ir.sequence'].next_by_code('property_work_condolences_code_sequence'))
|
||||
date = fields.Date(string='日期')
|
||||
fees = fields.Float(string='费用')
|
||||
reason = fields.Html(string="正文")
|
||||
reason = fields.Text(string="正文")
|
||||
scheme_id = fields.Many2one('ir.attachment', string="方案")
|
||||
meeting_id = fields.Many2one('ir.attachment', string="会议纪要")
|
||||
work_end = fields.Boolean(string="结束")
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
<field name="name"/>
|
||||
<field name="users_id"/>
|
||||
<field name="reason"/>
|
||||
<field name="document_ids" widget="preview_many2many"/>
|
||||
<field name="document_ids" widget="preview_many2many"/>d
|
||||
<field name="department_id" invisible="1"/>
|
||||
</group>
|
||||
</sheet>
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
<group string="审批事项">
|
||||
<field name="work_end" invisible="1"/>
|
||||
<field name="name"/>
|
||||
<field name="users_id"/>
|
||||
<field name="type_stamp_ids" widget="many2many_tags"/>
|
||||
<field name="scope_chapter_id"/>
|
||||
<field name="approval_id"/>
|
||||
<field name="users_id" options="{'no_create': True}"/>
|
||||
<field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True}"/>
|
||||
<field name="scope_chapter_id" options="{'no_create': True}"/>
|
||||
<field name="approval_id" options="{'no_create': True}"/>
|
||||
<field name="remake"/>
|
||||
<field name="document_ids" widget="preview_many2many"/>
|
||||
<field name="department_id" invisible="1"/>
|
||||
|
||||
@@ -28,7 +28,7 @@ class YuthonWillTask(models.Model):
|
||||
user_role_ids = fields.Many2many('soong.user.role', string='角色', store=True, index=True)
|
||||
task_time_ids = fields.Many2many('yuthon.task.time', string='提醒')
|
||||
address = fields.Char(string='地点')
|
||||
start_time = fields.Datetime(string='开始时间',default=lambda self: datetime.combine(datetime.now().date(), time(1, 0, 0)))
|
||||
start_time = fields.Datetime(string='开始时间', default=fields.Datetime.now)
|
||||
end_time = fields.Datetime(string='结束时间')
|
||||
task_state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态', store=True)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user