activity modifications 2

odex25_ensan/odex25_program_activity/models/program.py

@@ -310,6 +310,21 @@ class PaProgramActivityRegistration(models.Model):
         store=False
     )
 
+    return_reason = fields.Text(string='Return Reason')
+
+
+
+    def action_return_to_draft(self):
+        # Open wizard to collect return reason - opens form view on 'empowerment.return.reason.wizard'
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('سبب الإرجاع'),
+            'view_mode': 'form',
+            'res_model': 'pa.return.reason.wizard',
+            'target': 'new',
+            'context': {'default_registration_id': self.id}
+        }
+
 
     @api.depends('familye_id', 'familye_id.member_ids', 'familye_id.member_ids.relationn',
                  'familye_id.member_ids.relationn.relation_type')
@@ -416,8 +431,11 @@ class PaReturnReasonWizard(models.TransientModel):
             # move back to draft or social_specialist depending on the context/state
             if self.registration_id.state == 'operation_manager':
                 self.registration_id.state = 'social_specialist'
+                self.registration_id.return_reason = self.reason
             else:
                 self.registration_id.state = 'draft'
+                self.registration_id.return_reason = self.reason
+
         return {'type': 'ir.actions.act_window_close'}
 
 class PaProgram(models.Model):

odex25_ensan/odex25_program_activity/views/program.xml

@@ -323,10 +323,11 @@
             <button name="action_refuse" string="رفض" type="object"
                     states="draft,social_specialist,operation_manager,branch_manager,activity_head,finance_manager"
                     groups="odex25_program_activity.group_social_specialist,odex25_program_activity.group_pa_operation_manager,odex25_program_activity.group_pa_branch_manager,odex25_program_activity.group_pa_activity_head,odex25_program_activity.group_pa_finance_manager"/>
-            <button name="%(action_open_return_reason_wizard)d" string="إعادة إلى المسودة" type="action"
+            <button name="action_return_to_draft"
+                    string="إعادة إلى المسودة" type="action"
                     groups="odex25_program_activity.group_social_specialist,odex25_program_activity.group_pa_operation_manager"
                     states="social_specialist,operation_manager"/>
-            <button name="%(action_open_return_reason_wizard)d" string="إعادة إلى الأخصائي الاجتماعي" type="action"
+            <button name="action_return_to_draft" string="إعادة إلى الأخصائي الاجتماعي" type="action"
                     groups="odex25_program_activity.group_pa_operation_manager" states="operation_manager"/>
           </header>
 
@@ -363,6 +364,7 @@
             <field name="activity_id"/>
             <field name="medad_id"/>
             <field name="want_transport"/>
+            <field name="return_reason"/>
           </group>
 
           <notebook string="بيانات احصائية">