Skip to content

Commit befb58c

Browse files
committed
[IMP] base_cancel_confirm: add cancel_by and cancel_date
1 parent 6211f08 commit befb58c

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

base_cancel_confirm/model/base_cancel_confirm.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ class BaseCancelConfirm(models.AbstractModel):
2626
copy=False,
2727
help="An optional cancel reason",
2828
)
29+
cancel_by = fields.Many2one(
30+
comodel_name="res.users",
31+
copy=False,
32+
)
33+
cancel_date = fields.Date(copy=False)
2934

3035
def _cancel_confirm_disabled(self):
3136
key = f"{self._name}.cancel_confirm_disable"
@@ -50,7 +55,14 @@ def open_cancel_confirm_wizard(self):
5055
return action
5156

5257
def clear_cancel_confirm_data(self):
53-
self.write({"cancel_confirm": False, "cancel_reason": False})
58+
self.write(
59+
{
60+
"cancel_confirm": False,
61+
"cancel_reason": False,
62+
"cancel_by": False,
63+
"cancel_date": False,
64+
}
65+
)
5466

5567
def get_view(self, view_id=None, view_type="form", **options):
5668
res = super().get_view(view_id=view_id, view_type=view_type, **options)

base_cancel_confirm/views/cancel_confirm_template.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<div>
55
<group colspan="4" attrs="{'invisible':[('cancel_reason', '=', False)]}">
66
<field name="cancel_confirm" invisible="1" />
7+
<field name="cancel_by" readonly="1" />
8+
<field name="cancel_date" readonly="1" />
79
<field name="cancel_reason" readonly="1" />
810
</group>
911
</div>

base_cancel_confirm/wizard/cancel_confirm.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ def confirm_cancel(self):
2727
docs.write({"cancel_confirm": True})
2828
# Cancel Reason
2929
if self.has_cancel_reason in ["optional", "required"]:
30-
docs.write({"cancel_reason": self.cancel_reason})
30+
docs.write(
31+
{
32+
"cancel_reason": self.cancel_reason,
33+
"cancel_by": self.env.user,
34+
"cancel_date": fields.Date.context_today(self),
35+
}
36+
)
3137
res = getattr(docs, cancel_method)()
3238
return res

0 commit comments

Comments
 (0)