Skip to content

Commit e7653a5

Browse files
Rishabh-RahangdaleRishabh-Rahangdale
authored
Merge pull request #43 from Rishabh-Rahangdale/fix/audit-escalation-and-none-mail-resolve
Fix/audit escalation and none mail resolve
2 parents ca9c616 + 849c9a2 commit e7653a5

2 files changed

Lines changed: 23 additions & 22 deletions

File tree

‎audit_management/audit_management/doctype/audit_level/audit_level.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,75 +150,75 @@ def update_my_audit(self): # Moved method into the class
150150
# Handle each stage individually
151151
for record in my_audit_records:
152152
# Stage 1: BM
153-
if self.stage_1_bm_emp_id and (record.bm_user_status == "" or record.bm_user_status == "Pending"):
153+
if self.stage_1_bm_emp_id:
154154
frappe.db.set_value("My Audits", record.name, "bm_user_id", self.stage_1_bm_user_id, update_modified=False)
155155
frappe.db.set_value("My Audits", record.name, "bm_name", self.stage_1_bm_name, update_modified=False)
156156
frappe.db.set_value("My Audits", record.name, "bm_mail", self.stage_1_bm_mail, update_modified=False)
157157

158158
# Stage 2: DH
159-
if self.stage_2_dh_emp_id and (record.dh_user_status == "" or record.dh_user_status == "Pending"):
159+
if self.stage_2_dh_emp_id:
160160
frappe.db.set_value("My Audits", record.name, "dh_user_id", self.stage_2_dh_user_id, update_modified=False)
161161
frappe.db.set_value("My Audits", record.name, "dh_name", self.stage_2_dh_name, update_modified=False)
162162
frappe.db.set_value("My Audits", record.name, "dh_mail", self.stage_2_dh_mail, update_modified=False)
163163

164164
# Stage 2: COM
165-
if self.stage_2_com_emp_id and (record.com_user_status == "" or record.com_user_status == "Pending"):
165+
if self.stage_2_com_emp_id:
166166
frappe.db.set_value("My Audits", record.name, "com_user_id", self.stage_2_com_user_id, update_modified=False)
167167
frappe.db.set_value("My Audits", record.name, "com_name", self.stage_2_com_name, update_modified=False)
168168
frappe.db.set_value("My Audits", record.name, "com_mail", self.stage_2_com_mail, update_modified=False)
169169

170170

171171
# Stage 3: RM
172-
if self.stage_3_rm_emp_id and (record.rm_user_status == "" or record.rm_user_status == "Pending"):
172+
if self.stage_3_rm_emp_id:
173173
frappe.db.set_value("My Audits", record.name, "rm_user_id", self.stage_3_rm_user_id, update_modified=False)
174174
frappe.db.set_value("My Audits", record.name, "rm_name", self.stage_3_rm_name, update_modified=False)
175175
frappe.db.set_value("My Audits", record.name, "rm_mail", self.stage_3_rm_mail, update_modified=False)
176176

177177

178178
# Stage 3: ROM
179-
if self.stage_3_rom_emp_id and (record.rom_user_status == "" or record.rom_user_status == "Pending"):
179+
if self.stage_3_rom_emp_id:
180180
frappe.db.set_value("My Audits", record.name, "rom_user_id", self.stage_3_rom_user_id, update_modified=False)
181181
frappe.db.set_value("My Audits", record.name, "rom_name", self.stage_3_rom_name, update_modified=False)
182182
frappe.db.set_value("My Audits", record.name, "rom_mail", self.stage_3_rom_mail, update_modified=False)
183183

184184

185185
# Stage 4: ZM
186-
if self.stage_4_zm_emp_id and (record.zm_user_status == "" or record.zm_user_status == "Pending"):
186+
if self.stage_4_zm_emp_id:
187187
frappe.db.set_value("My Audits", record.name, "zm_user_id", self.stage_4_zm_user_id, update_modified=False)
188188
frappe.db.set_value("My Audits", record.name, "zm_name", self.stage_4_zm_name, update_modified=False)
189189
frappe.db.set_value("My Audits", record.name, "zm_mail", self.stage_4_zm_mail, update_modified=False)
190190

191191

192192
# Stage 4: ZOM
193-
if self.stage_4_zom_emp_id and (record.zom_user_status == "" or record.zom_user_status == "Pending"):
193+
if self.stage_4_zom_emp_id:
194194
frappe.db.set_value("My Audits", record.name, "zom_user_id", self.stage_4_zom_user_id, update_modified=False)
195195
frappe.db.set_value("My Audits", record.name, "zom_name", self.stage_4_zom_name, update_modified=False)
196196
frappe.db.set_value("My Audits", record.name, "zom_mail", self.stage_4_zom_mail, update_modified=False)
197197

198198

199199
# Stage 5: GM
200-
if self.stage_5_gm_emp_id and (record.gm_user_status == "" or record.gm_user_status == "Pending"):
200+
if self.stage_5_gm_emp_id:
201201
frappe.db.set_value("My Audits", record.name, "gm_user_id", self.stage_5_gm_user_id, update_modified=False)
202202
frappe.db.set_value("My Audits", record.name, "gm_name", self.stage_5_gm_name, update_modified=False)
203203
frappe.db.set_value("My Audits", record.name, "gm_mail", self.stage_5_gm_mail, update_modified=False)
204204

205205

206206
# Stage 6: HR
207-
if self.stage_6_hr_emp_id and (record.hr_user_status == "" or record.hr_user_status == "Pending"):
207+
if self.stage_6_hr_emp_id:
208208
frappe.db.set_value("My Audits", record.name, "hr_user_id", self.stage_6_hr_user_id, update_modified=False)
209209
frappe.db.set_value("My Audits", record.name, "hr_name", self.stage_6_hr_name, update_modified=False)
210210
frappe.db.set_value("My Audits", record.name, "hr_mail", self.stage_6_hr_mail, update_modified=False)
211211

212212

213213
# Stage 7: COO
214-
if self.stage_7_coo_emp_id and (record.coo_user_status == "" or record.coo_user_status == "Pending"):
214+
if self.stage_7_coo_emp_id:
215215
frappe.db.set_value("My Audits", record.name, "coo_user_id", self.stage_7_coo_user_id, update_modified=False)
216216
frappe.db.set_value("My Audits", record.name, "coo_name", self.stage_7_coo_name, update_modified=False)
217217
frappe.db.set_value("My Audits", record.name, "coo_mail", self.stage_7_coo_mail, update_modified=False)
218218

219219

220220
# Stage 8: CEO
221-
if self.stage_8_ceo_emp_id and (record.ceo_user_status == "" or record.ceo_user_status == "Pending"):
221+
if self.stage_8_ceo_emp_id:
222222
frappe.db.set_value("My Audits", record.name, "ceo_user_id", self.stage_8_ceo_user_id, update_modified=False)
223223
frappe.db.set_value("My Audits", record.name, "ceo_name", self.stage_8_ceo_name, update_modified=False)
224224
frappe.db.set_value("My Audits", record.name, "ceo_mail", self.stage_8_ceo_mail, update_modified=False)

‎audit_management/audit_management/doctype/my_audits/my_audits.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ def has_pending_exceeded(record, user_status_field, pending_time_field, now_time
496496
"query_generated_by_designation",
497497
"query_generated_by_branch",
498498
"audit_query_subject_box",
499+
"audit_query_box",
499500
"query_type",
500501
"emp_branch",
501502
"dh_name", "com_name",
@@ -505,17 +506,17 @@ def has_pending_exceeded(record, user_status_field, pending_time_field, now_time
505506
"hr_name",
506507
"coo_name",
507508
"ceo_name",
508-
"bm_user_status", "bm_pending_time", "bm_mail",
509-
"dh_user_status", "dh_pending_time", "dh_mail",
510-
"com_user_status", "com_pending_time", "com_mail",
511-
"rm_user_status", "rm_pending_time", "rm_mail",
512-
"rom_user_status", "rom_pending_time", "rom_mail",
513-
"zm_user_status", "zm_pending_time", "zm_mail",
514-
"zom_user_status", "zom_pending_time", "zom_mail",
515-
"gm_user_status", "gm_pending_time", "gm_mail",
516-
"hr_user_status", "hr_pending_time", "hr_mail",
517-
"coo_user_status", "coo_pending_time", "coo_mail",
518-
"ceo_user_status", "ceo_pending_time", "ceo_mail"
509+
"bm_user_status", "bm_pending_time", "bm_mail", "bm_response_box",
510+
"dh_user_status", "dh_pending_time", "dh_mail", "dh_response_box",
511+
"com_user_status", "com_pending_time", "com_mail", "com_response_box",
512+
"rm_user_status", "rm_pending_time", "rm_mail", "rm_response_box",
513+
"rom_user_status", "rom_pending_time", "rom_mail", "rom_response_box",
514+
"zm_user_status", "zm_pending_time", "zm_mail", "zm_response_box",
515+
"zom_user_status", "zom_pending_time", "zom_mail", "zom_response_box",
516+
"gm_user_status", "gm_pending_time", "gm_mail", "gm_response_box",
517+
"hr_user_status", "hr_pending_time", "hr_mail", "hr_response_box",
518+
"coo_user_status", "coo_pending_time", "coo_mail", "coo_response_box",
519+
"ceo_user_status", "ceo_pending_time", "ceo_mail", "ceo_response_box"
519520
]
520521
)
521522

0 commit comments

Comments
 (0)