Merge pull request #6054 from expsa/yio

Yio

odex25_benefit/odex_benefit/i18n/ar_001.po

@@ -8913,6 +8913,7 @@ msgstr "غير طارئة"
 
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_expenses_line__note
+#: model:ir.model.fields,field_description:odex_benefit.field_salary_line__note
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -8931,6 +8932,8 @@ msgstr "جوار السكن"
 #: model:ir.model.fields,field_description:odex_benefit.field_service_attachments_settings__notes
 #: model:ir.model.fields,field_description:odex_benefit.field_visit_location_refusal_reason_wizard__refusal_notes
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_resume_reason_wizard_form
+#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
+#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__notes
 msgid "Notes"
 msgstr "الملاحظات"
 

odex25_benefit/odex_benefit/models/benefit.py

@@ -645,6 +645,7 @@ class GrantBenefitProfile(models.Model):
         store=True
     )
     current_rent_contract_id = fields.Many2one('rent.contract',string='Current Active Rent Contract',compute='_compute_current_rent_contract',store=True,)
+    notes = fields.Html(string='Notes', tracking=True)
 
     _sql_constraints = [
         ('unique_code', "unique (code) WHERE state NOT IN ('draft', 'new')", 'This code already exists')

odex25_benefit/odex_benefit/models/benefit_config.py

@@ -308,6 +308,7 @@ class Salary(models.Model):
     approved = fields.Boolean(string="Is Approved", default=False)
     is_default = fields.Boolean(string='Is Default?')
     state = fields.Selection(string='Status',selection=[('waiting', 'Waiting'),('accepted', 'Accepted'),('refused', 'Refused')],default="waiting")
+    note = fields.Char(string="Note")
     # total_salary = fields.Float(string="Total Salary", compute='_compute_total_salary',store=True)
 
     # @api.depends('salary_amount','state')

odex25_benefit/odex_benefit/views/benefit_view.xml

@@ -936,6 +936,7 @@
                                                 <field name="salary_attach" widget="many2many_attachment_preview"/>
                                                 <field name="attach_start_date"/>
                                                 <field name="attach_end_date"/>
+                                                <field name="note"/>
                                                 <field name="is_required" invisible="1"/>
                                                 <field name="is_default" invisible="1"/>
                                                 <field name="state" invisible="1"/>
@@ -1591,6 +1592,7 @@
                                         <field name="salary_attach" widget="many2many_attachment_preview"/>
                                         <field name="attach_start_date"/>
                                         <field name="attach_end_date"/>
+                                        <field name="note"/>
                                         <field name="is_required" invisible="1"/>
                                         <field name="is_default" invisible="1"/>
                                         <field name="state" invisible="1"/>
@@ -1935,6 +1937,11 @@
                                     </tree>
                                 </field>
                             </page>
+                            <page string="Notes">
+                                <group>
+                                    <field name="notes" nolabel="1"/>
+                                </group>
+                            </page>
                             <page string="Configuration" groups="odex_benefit.group_benefit_manager" invisible="1">
                                 <!--                                <group col="4">-->
                                 <!--                                    <field name="is_life" attrs="{'invisible':[('is_life','!=',False)]}"/>-->

odex25_benefit/odex_benefit/views/family_members.xml

@@ -308,18 +308,15 @@
 
                             <page string="Attachments">
                                 <field name="attachment_ids" mode="tree" options="{'no_open': True}"
-                                       widget="one2many_list">
+                                       widget="one2many_list" attrs="{'readonly':[('state','not in',['draft','complete_info'])]}">
                                     <tree editable="bottom">
                                         <field name="name" string="Attachment Name" force_save="1"
                                                attrs="{'readonly':[('is_default','=',True)]}"/>
-                                        <field name="datas" string="File content"
+                                        <field name="datas" string="File content"/>
-                                               attrs="{'readonly':[('parent.state','not in',['draft','complete_info'])]}"/>
                                         <button name="action_preview_attachment" type="object" icon="fa-search-plus"
                                                 attrs="{'invisible': [('file_size', '=', 0)]}"/>
-                                        <field name="expiration_date"
+                                        <field name="expiration_date"/>
-                                               attrs="{'readonly':[('parent.state','not in',['draft','complete_info'])]}"/>
+                                        <field name="attach_status"/>
-                                        <field name="attach_status"
-                                               attrs="{'readonly':[('parent.state','not in',['draft','complete_info'])]}"/>
                                         <field name="allow_days"/>
                                         <field name="member_id" invisible="1"/>
                                         <field name="is_default" invisible="1"/>