Merge branch 'dev_odex25_ensan' of https://github.com/expsa/odex25-standard-modules into notes_8

2025-11-10 11:08:19 +03:00 · 2025-11-10 11:08:19 +03:00 · ca4b9fee69
parent 47aa3c0dbc 4734a512dd
commit ca4b9fee69
4 changed files with 106 additions and 14 deletions
--- a/odex25_ensan/odex_benefit/i18n/ar_001.po
+++ b/odex25_ensan/odex_benefit/i18n/ar_001.po
@ -3201,6 +3201,7 @@ msgstr "اجراءت مصاريف الاسر"

 #. module: odex_benefit
 #: model:ir.actions.act_window,name:odex_benefit.action_confirm_benefit_expense
+#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
 msgid "Confirm Benefit Expenses"
 msgstr "مصاريف الاسر"

@ -6691,6 +6692,7 @@ msgstr "تاريخ الانقطاع"
 #: model:ir.model.fields,field_description:odex_benefit.field_external_benefits__invoice_warn
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__invoice_warn
 #: model:ir.model.fields,field_description:odex_benefit.field_needs_payment_line__invoice_id
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__payment_method__invoice
 msgid "Invoice"
 msgstr "فاتورة"

@ -10119,6 +10121,7 @@ msgstr "الاخصائي الاجتماعي"

 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
+#: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_confirm_benefit_expense_form
 msgid "Reset"
 msgstr "إرجاع"
@ -10564,6 +10567,11 @@ msgstr "نوع الخدمة الرئيسية"
 msgid "Services"
 msgstr "الخدمات"

+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__payment_orders__type__services
+msgid "Services"
+msgstr "خدمات"
+
 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.services_settings_form
@ -12372,6 +12380,7 @@ msgstr ""
 #: code:addons/odex_benefit/models/benefit.py:0
 #: code:addons/odex_benefit/models/family_members.py:0
 #: code:addons/odex_benefit/models/service_request.py:0
+#: code:addons/odex_benefit/models/payment_order.py:0
 #: code:addons/odex_benefit/models/visit.py:0
 #, python-format
 msgid "You cannot delete this record"
@ -14421,8 +14430,11 @@ msgid "Exchange orders"
 msgstr "أمر الصرف"

 #. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_benefit_expense_line__payment_order_id
 #: model:ir.model.fields,field_description:odex_benefit.field_seasonal_grant_benefit__payment_order_id
 #: model:ir.model.fields,field_description:odex_benefit.field_seasonal_service__payment_order_id
+#: model:ir.model.fields,field_description:odex_benefit.field_service_request__payment_order_id
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__payment_method__payment_order
 msgid "Payment Order"
 msgstr "أمر الصرف"

@ -14443,6 +14455,7 @@ msgid "Payment Order Done"
 msgstr "أمر الصرف تم"

 #. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
 msgid "Payment Done"
 msgstr "تم الدفع"
@ -14477,6 +14490,11 @@ msgstr "طلبات الخدمات الموسمية"
 msgid "Seasonal Services"
 msgstr "الخدمات الموسمية"

+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__payment_orders__type__seasonal_services
+msgid "Seasonal Services"
+msgstr "خدمات موسمية"
+
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__seasonal_service__state__draft
 msgid "Draft"
@ -16505,6 +16523,7 @@ msgstr "المصروف الشهري للأسر"
 #. module: odex_benefit
 #: model:ir.actions.act_window,name:odex_benefit.action_benefit_expense_line
 #: model:ir.model.fields,field_description:odex_benefit.field_confirm_benefit_expense__benefit_expense_line_ids
+#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__benefit_expense_line_ids
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_benefit_expense_line_tree
 msgid "Benefit Expense Lines"
 msgstr "سجلات المصروف الشهري"
@ -16887,6 +16906,7 @@ msgstr "حالة أمر الدفع"
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__seasonal_service__payment_order_state__none
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__payment_order_state__none
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__payment_method__none
 msgid "None"
 msgstr "لا يوجد"

@ -16948,6 +16968,7 @@ msgid "Manager approval"
 msgstr "موافقة المسؤول"

 #. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
 msgid "Payment Waiting"
 msgstr "في انتظار الدفع"
@ -16958,4 +16979,71 @@ msgstr "في انتظار الدفع"
 msgid ""
 "Some attachment records are missing files. Please make sure all required "
 "attachments are uploaded before submitting."
-msgstr "بعض سجلات المرفقات تفتقد إلى ملفات. يرجى التأكد من تحميل جميع المرفقات المطلوبة قبل الإرسال."
+msgstr "بعض سجلات المرفقات تفتقد إلى ملفات. يرجى التأكد من تحميل جميع المرفقات المطلوبة قبل الإرسال."
+
+#. module: odex_benefit
+#: model:ir.actions.server,name:odex_benefit.server_action_accounting_transfer
+msgid "Accounting Transfer"
+msgstr "الترحيل المالي"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_exchange_order_wizard__accountant_id
+#: model:ir.model.fields,field_description:odex_benefit.field_family_validation_setting__accountant_id
+#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__accountant_id
+#: model:ir.model.fields,field_description:odex_benefit.field_service_request__accountant_id
+#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__accountant_id
+msgid "Accountant"
+msgstr "المحاسب"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__type
+msgid "Payment Order Type"
+msgstr "نوع أمر الصرف"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__payment_orders__type__benefit_expense
+msgid "Monthly Expense"
+msgstr "المصروف الشهري"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__move_id
+msgid "Move"
+msgstr "القيد"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#, python-format
+msgid ""
+"The following service requests do not meet the conditions:\n"
+"%s\n"
+"Each request must:\n"
+"• Be in 'Accounting Approve' state\n"
+"• Have payment order state = 'None'\n"
+"• Not be linked to any invoice"
+msgstr ""
+"طلبات الخدمة التالية لا تستوفي الشروط:\n"
+"%s\n"
+"يجب أن يكون كل طلب:\n"
+"• في حالة 'بانتظار المالية'\n"
+"• حالة الدفع = 'لا يوجد'\n"
+"• غير مرتبط بأي فاتورة"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__payment_orders__state__waiting_deposit
+msgid "Waiting for Deposit"
+msgstr "بانتظار الايداع"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__payment_method
+msgid "Payment Method"
+msgstr "طريقة الدفع"
+
+#. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
+msgid "Create Entry"
+msgstr "إنشاء قيد"
+
+#. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
+msgid "Deposit Completed"
+msgstr "اكتمل الإيداع"
--- a/odex25_ensan/odex_benefit/models/payment_order.py
+++ b/odex25_ensan/odex_benefit/models/payment_order.py
@ -64,7 +64,6 @@ class PaymentOrders(models.Model):

    def create_entry(self):
        for rec in self:
-            vals = {}
            line_ids = rec.get_lines()
            move_vals = {
                'journal_id': rec.journal_id.id,
@ -81,8 +80,8 @@ class PaymentOrders(models.Model):
                    # 'ref': ref1 + '/' + ref2,
                    'benefit_family_ids': [(6, 0, family_ids)],
                })
-            move_id = self.env['account.move'].create(vals)
-            #move_id.action_post()
+            move_id = self.env['account.move'].create(move_vals)
+            # move_id.action_post()
            rec.move_id = move_id

    def action_deposit(self):
@ -90,7 +89,7 @@ class PaymentOrders(models.Model):
            if rec.type == "seasonal_services":
                rec.seasonal_requests_ids.action_accounting_approve()
            elif rec.type == "services":
-                rec.service_requests_ids.write({'state':'action_accounting_approve'})
+                rec.service_requests_ids.write({'state': 'action_accounting_approve'})
            rec.state = 'done'

    def action_gm_approval(self):
@ -191,7 +190,7 @@ class PaymentOrders(models.Model):

    def _create_debit_line(self, line, account_id, amount, name):
        """Create a debit line"""
-        return (0, 0, {
+        return {
            'name': name,
            'family_confirm_id': line.confirm_expense_id.id,
            'benefit_family_id': line.family_id.id,
@ -200,7 +199,7 @@ class PaymentOrders(models.Model):
            'account_id': account_id,
            'debit': amount,
            'credit': 0.0,
-        })
+        }

    def get_lines(self):
        lines = []
--- a/odex25_ensan/odex_benefit/views/payment_order.xml
+++ b/odex25_ensan/odex_benefit/views/payment_order.xml
@ -14,15 +14,21 @@
                                string="Approve" class="oe_highlight"/>
                        <button name="action_reset_to_draft" type="object"
                                states="waiting_head"
-                                string="Reset" class="oe_highlight"/>
+                                string="Reset" class="btn btn-warning"/>

                        <button name="action_finance_approval" type="object"
                                states="waiting_finance"
                                string="Approve" class="oe_highlight"/>
+                        <button name="action_reset_to_draft" type="object"
+                                states="waiting_finance"
+                                string="Reset" class="btn btn-warning"/>

                        <button name="action_gm_approval" type="object"
                                states="waiting_gm"
                                string="Approve" class="oe_highlight"/>
+                        <button name="action_reset_to_draft" type="object"
+                                states="waiting_gm"
+                                string="Reset" class="btn btn-warning"/>

                        <button name="create_entry" type="object"
                                string="Create Entry" class="oe_highlight"
@ -36,15 +42,14 @@

                        <button name="action_refuse" type="object"
                                states="draft"
-                                string="Refuse" class="oe_highlight"/>
+                                string="Refuse" class="btn btn-danger"/>

                        <field name="state" widget="statusbar"/>
                    </header>
                    <sheet>
-                        <div class="oe_button_box" name="button_box"
-                             attrs="{'invisible': [('state','!=','waiting_gm')]}">
+                        <div class="oe_button_box" name="button_box">
                            <button icon="fa-usd" name="action_open_related_move_records"
-                                    type="object">
+                                    type="object" attrs="{'invisible': [('total_moves','=',0)]}">
                                <field name="total_moves" string="Moves" widget="statinfo"/>
                            </button>
                        </div>
--- a/odex25_ensan/odex_benefit/views/seasonal_service_view.xml
+++ b/odex25_ensan/odex_benefit/views/seasonal_service_view.xml
@ -44,9 +44,9 @@

                    <field name="is_payment_order_done" invisible="1"/>
                    <field name="payment_order_state" invisible="1"/>
-                    <widget name="web_ribbon" title="Payment Order Done" bg_color="bg-success"
+                    <widget name="web_ribbon" title="Payment Done" bg_color="bg-success"
                            attrs="{'invisible': [('payment_order_state', '!=', 'done')]}"/>
-                    <widget name="web_ribbon" title="Payment Order Waiting" bg_color="bg-warning"
+                    <widget name="web_ribbon" title="Payment Waiting" bg_color="bg-warning"
                            attrs="{'invisible': [('payment_order_state', '!=', 'waiting')]}"/>
                    <group>
                        <group>