Merge pull request #4668 from expsa/activity_bugs

activity modifications

odex25_ensan/odex25_program_activity/data/ir_sequence_data.xml

@@ -44,12 +44,22 @@
         <field name="number_increment">1</field>
         <field name="padding">4</field>
     </record>
-    <record id="seq_pa_program_registration" model="ir.sequence">
-        <field name="name">Registration Code</field>
-        <field name="code">pa.program.registration</field>
+<!--    <record id="seq_pa_program_registration" model="ir.sequence">-->
+<!--        <field name="name">Registration Code</field>-->
+<!--        <field name="code">pa.program.registration</field>-->
+<!--        <field name="prefix">PA/</field>-->
+<!--        <field name="number_next">1</field>-->
+<!--        <field name="number_increment">1</field>-->
+<!--        <field name="padding">4</field>-->
+<!--    </record>-->
+
+    <record id="seq_pa_program_activity_registration" model="ir.sequence">
+        <field name="name">Program Activity Registration Code</field>
+        <field name="code">pa.program.activity.registration</field>
         <field name="prefix">PA/</field>
         <field name="number_next">1</field>
         <field name="number_increment">1</field>
         <field name="padding">4</field>
     </record>
+
 </odoo>

odex25_ensan/odex25_program_activity/i18n/ar_001.po

@@ -529,5 +529,38 @@ msgid "Name"
 msgstr "نوع البرنامج"
 
 
+#. module: odex25_program_activity
+#: model:ir.model.fields.selection,name:odex25_program_activity.selection__pa_program_level_type__route
+msgid "Tracks"
+msgstr "مسارات "
+
+#. module: odex25_program_activity
+#: model:ir.model.fields.selection,name:odex25_program_activity.selection__pa_program_level_type__activity
+msgid "Activities"
+msgstr "أنشطة"
+
+#. module: odex25_program_activity
+#: model:ir.model.fields.selection,name:odex25_program_activity.selection__pa_program_level_type__medad
+msgid "Medad"
+msgstr "مداد"
+
+
+#. module: odex25_program_activity
+#: model:ir.model.fields,field_description:odex25_program_activity.field_family_member__need_trans
+msgid "Need Transportation"
+msgstr " هل يحتاج إلى مواصلات؟"
+
+
+#. module: odex25_program_activity
+#: model:ir.model.fields,field_description:odex25_program_activity.field_family_member__need_medicin
+msgid "Need Medicien"
+msgstr "هل يتناول ادوية "
+
+
+#. module: odex25_program_activity
+#: model:ir.model.fields,field_description:odex25_program_activity.field_family_member__need_mental_dis
+msgid "Have Mental Disorders"
+msgstr "  هل يوجد شخص فى الاسرة لديه اضطرابات نفسية"
+
 
 

odex25_ensan/odex25_program_activity/models/program.py

@@ -255,6 +255,7 @@ class PaProgramActivityRegistration(models.Model):
 
     name = fields.Char(string='Request Number', readonly=True, index=True,
                        default=lambda self: self.env['ir.sequence'].next_by_code('pa.program.activity.registration') or 'New')
+
     request_date = fields.Datetime(string='Request Date', default=fields.Datetime.now, readonly=True)
     creator_id = fields.Many2one('res.users', string='Creator', default=lambda self: self.env.user, readonly=True)
 
@@ -436,3 +437,8 @@ class FamilyMember(models.Model):
         ondelete='cascade',
         index=True,
     )
+
+    need_trans = fields.Boolean(string='Need Transportation')
+    need_medicin = fields.Boolean(string='Need Medicien')
+    need_mental_dis = fields.Boolean(string='Have Mental Disorders')
+

odex25_ensan/odex25_program_activity/views/program.xml

@@ -313,20 +313,21 @@
           <header>
             <field name="state" widget="statusbar"
                    statusbar_visible="draft,social_specialist,operation_manager,branch_manager,activity_head,finance_manager,approved,refused"/>
-            <button name="action_to_social_specialist" string="اعتماد الاخصائي الاجتماعي" type="object"
+            <button name="action_to_social_specialist" 
+                    string="اعتماد الاخصائي الاجتماعي" type="object"
                     class="oe_highlight" states="draft"
-                    groups="odex25_program_activity.group_social_specialist"/>
+                    groups="odex25_program_activity.group_pa_social_specialist"/>
             <button name="action_approve" string="اعتماد" type="object"
                     states="social_specialist,operation_manager,branch_manager,activity_head,finance_manager"
-                    groups="odex25_program_activity.group_operation_manager,odex25_program_activity.group_branch_manager,odex25_program_activity.group_activity_head,odex25_program_activity.group_finance_manager"/>
+                    groups="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_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_operation_manager,odex25_program_activity.group_branch_manager,odex25_program_activity.group_activity_head,odex25_program_activity.group_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"
-                    groups="odex25_program_activity.group_social_specialist,odex25_program_activity.group_operation_manager"
+                    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"
-                    groups="odex25_program_activity.group_operation_manager" states="operation_manager"/>
+                    groups="odex25_program_activity.group_pa_operation_manager" states="operation_manager"/>
           </header>
 
           <group string="معلومات الإنشاء" col="2">
@@ -376,6 +377,7 @@
                 <field name="mother_is_life" readonly="1"/>
                 <field name="mother_location_conf" readonly="1"/>
                 <field name="is_mother_work" readonly="1"/>
+                <field name="education_status" readonly="1"/>
 <!--                <field name="mother_education" readonly="1"/>-->
                 <field name="housing_type" readonly="1"/>
               </group>
@@ -449,6 +451,11 @@
                         <field name="age_status"/>
                         <field name="is_married"
                                attrs="{'invisible':[('is_mother','=',True)]}"/>
+
+                        <field name="need_trans"/>
+                        <field name="need_medicin"/>
+                        <field name="need_mental_dis"/>
+
                         <field name="marriage_certificate"
                                widget="many2many_attachment_preview"
                                attrs="{'invisible':['|',('is_mother','=',True),('is_married','=',False)]}"/>
@@ -464,7 +471,7 @@
                       </group>
                     </group>
                     <notebook>
-                      <page string="Hobbies">
+                      <page string="الهوايات">
                         <field name="hobbies_attachment_ids" widget="one2many_list">
                           <tree editable="bottom">
                             <field name="hobbies_id" required="1"/>
@@ -479,7 +486,7 @@
                           </tree>
                         </field>
                       </page>
-                      <page string="Diseases">
+                      <page string="الامراض">
                         <field name="diseases_attachment_ids" widget="one2many_list">
                           <tree editable="bottom">
                             <field name="diseases_id" required="1"/>
@@ -494,7 +501,7 @@
                           </tree>
                         </field>
                       </page>
-                      <page string="Disabilities">
+                      <page string="الاعاقات">
                         <field name="disabilities_attachment_ids" widget="one2many_list">
                           <tree editable="bottom">
                             <field name="disabilities_id" required="1"/>
@@ -509,11 +516,11 @@
                           </tree>
                         </field>
                       </page>
-                      <page string="Education">
+                      <page string="الحالة التعليمية">
                         <h3>Education Status</h3>
                         <field name="member_education_status_ids" mode="tree,form"/>
                       </page>
-                      <page string="Attachments">
+                      <page string="المستندات التعريفية">
                         <field name="attachment_ids" widget="one2many_list">
                           <tree editable="bottom" delete="0">
                             <field name="name" string="Attachment Name"