Merge pull request #5337 from expsa/kcy_dev_odex25_ensan

Kcy dev odex25 ensan

odex25_ensan/odex_benefit/i18n/ar_001.po

@@ -4529,6 +4529,7 @@ msgid "Done"
 msgstr "تمت الزيارة"
 
 #. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
 #: model:ir.model.fields.selection,name:odex_benefit.selection__payment_orders__state__done
 #: model:ir.model.fields.selection,name:odex_benefit.selection__seasonal_service__state__done
 msgid "Done"
@@ -17084,4 +17085,19 @@ msgstr "يرجى اختيار أمر صرف واحد على الأقل."
 #: code:addons/odex_benefit/wizards/family_bank_report_wizard.py:0
 #, python-format
 msgid "Selected Payment Orders do not reference any posted moves."
-msgstr "أوامر الصرف المحددة لا تشير إلى أي قيود منشورة."
+msgstr "أوامر الصرف المحددة لا تشير إلى أي قيود منشورة."
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__payment_order_date
+msgid "Payment Order Date"
+msgstr "تاريخ أمر الصرف"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__payment_order_description
+msgid "Payment Order Description"
+msgstr "بند الخدمة"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__ref_num
+msgid "Ref. Number"
+msgstr "المرجع"

odex25_ensan/odex_benefit/models/payment_order.py

@@ -7,6 +7,7 @@ class PaymentOrders(models.Model):
     _name = 'payment.orders'
     _description = "Payment Orders"
     _inherit = ['mail.thread', 'mail.activity.mixin']
+    _order = 'payment_order_date desc'
 
     def _default_journal(self):
         setting = self.env['family.validation.setting'].search([], limit=1)

odex25_ensan/odex_benefit/models/seasonal_service.py

@@ -194,6 +194,11 @@ class SeasonalService(models.Model):
                 rec.state = 'waiting_receive'
                 rec.service_requests_ids.write({'state': 'send_request_to_supplier'})
 
+    def action_done(self):
+        for rec in self:
+            rec.state = 'done'
+            rec.service_requests_ids.write({'state': 'family_received_device'})
+
     def action_create_payment_order(self):
         for rec in self:
             self.env['payment.orders'].create({

odex25_ensan/odex_benefit/models/service_request.py

@@ -226,12 +226,15 @@ class ServiceRequest(models.Model):
             if rec.payment_order_id:
                 if rec.payment_order_id.state == "done":
                     payment_order_state = "done"
+                    rec.service_approval_date = fields.Datetime.now()
+                    rec.state = 'send_request_to_supplier'
                     rec.is_payment_order_done = True
                 else:
                     payment_order_state = "waiting"
             elif rec.vendor_bill:
                 if rec.vendor_bill.state == "posted":
                     payment_order_state = "done"
+                    rec.state = 'send_request_to_supplier'
                 else:
                     payment_order_state = "waiting"
             rec.payment_order_state = payment_order_state

odex25_ensan/odex_benefit/views/seasonal_service_view.xml

@@ -37,6 +37,12 @@
                             attrs="{'invisible': [('state', '!=', 'accounting_approve')]}"
                     />
 
+                    <button name="action_done" type="object"
+                            string="Done"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('state', '!=', 'waiting_receive')]}"
+                    />
+
                     <field name="state" widget="statusbar"
                            statusbar_visible="draft,calculated,accounting_approve,waiting_receive,done"/>
                 </header>

odex25_ensan/odex_benefit/views/service_request.xml

@@ -94,7 +94,7 @@
                                 groups="odex_benefit.group_service_projects_department"
                         />
 
-                        <button name="action_accounting_approve" type="object"
+                        <button name="action_accounting_approve" type="object" invisible="1"
                                 string="Accounting Approve" class="oe_highlight"
                                 confirm="Are you sure you want to approve  ?"
                                 states="accounting_approve" groups="odex_benefit.group_benefit_accounting_accept"/>
@@ -208,7 +208,7 @@
                                 <field name="service_cat"
                                        attrs="{'readonly':[('state','not in',['draft','researcher','waiting_approve'])]}"
                                        domain="[('id','in',available_service_cats)]" required="1"/>
-                                <field name="is_in_kind" widget="boolean_toggle"
+                                <field name="is_in_kind" widget="boolean_toggle" invisible="1"
                                        attrs="{'readonly':[('state','not in',['draft','researcher','waiting_approve'])]}"/>
                                 <field name="service_qty"
                                        attrs="{'invisible':[('is_in_kind','=',False)]}"/>