@@ -28,13 +28,14 @@
|
||||
</page>
|
||||
<page string="关联流程">
|
||||
<field name="soong_record_ids" style="width:100%%; margin-top: 10px;">
|
||||
<tree edit="true" delete="true" editable="bottom">
|
||||
<tree edit="true" delete="true" editable="bottom" action="open_record" type="object">
|
||||
<field name="code"/>
|
||||
<field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"/>
|
||||
<field name="workflow_record_id" domain="[('users_ids', 'in', uid)]" options="{'no_open': True}"/>
|
||||
<field name="approvals_group_id"/>
|
||||
<field name="create_uid"/>
|
||||
<field name="write_date2"/>
|
||||
<button name="open_record" type="object" string="详情" class="btn-primary"/>
|
||||
<button name="unlink" type="object" string="删除" class="btn-primary"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
@@ -78,7 +79,7 @@
|
||||
<page string="关联流程">
|
||||
<field name="soong_record_ids" style="width:100%%; margin-top: 10px;">
|
||||
<tree editable="bottom">
|
||||
<field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"/>
|
||||
<field name="workflow_record_id" domain="[('users_ids', 'in', uid)]" options="{'no_open': True}"/>
|
||||
<field name="approvals_group_id"/>
|
||||
<field name="create_uid"/>
|
||||
<field name="write_date2"/>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="撤销确认">
|
||||
<p>确认要撤销当前所选的工作吗?</p>
|
||||
<p>确认要撤销当前所选的工作流吗?</p>
|
||||
<field name="record_id" invisible="1" />
|
||||
<footer>
|
||||
<button name="add_comment_revoke" string="确认" type="object" class="oe_highlight"/>
|
||||
|
||||
@@ -67,7 +67,7 @@ class GoApprovals(models.Model):
|
||||
if self.date_start and self.date_end:
|
||||
start = fields.Datetime.from_string(self.date_start)
|
||||
end = fields.Datetime.from_string(self.date_end)
|
||||
if start >= end:
|
||||
if start > end:
|
||||
raise ValidationError("开始时间必须小于结束时间,请重新设置。")
|
||||
delta = end - start
|
||||
self.days = delta.days
|
||||
|
||||
Reference in New Issue
Block a user