From 46949ab388255ccffbf427d68c1a8124d28b733c Mon Sep 17 00:00:00 2001
From: maltayyar2 <M.Altayyar@exp-sa.com>
Date: Thu, 20 Nov 2025 12:42:26 +0300
Subject: [PATCH] feat: Add string labels for Boolean fields in Purchase forms

- Add string="Requested by Purchase" for by_purchase field
- Add string="Use Analytic Account" for use_analytic field
- Maintain original field order and structure
- Preserve context attributes for department_id and branch_id
- All Boolean fields now display with proper labels

Synced with latest dev_odex25_purchase on 2025-11-20
---
 .../i18n/ar_001.po                            | 15 +++++++++++++
 .../views/purchase_request.xml                | 10 ++++-----
 .../views/purchase_requisition_custom.xml     | 21 +++++++------------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po b/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
index d5d0e23a2..7521d5e61 100644
--- a/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
+++ b/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
@@ -1991,6 +1991,21 @@ msgstr "معلومات الطلب"
 msgid "Status & Tracking"
 msgstr "الحالة والمتابعة"
 
+#. module: purchase_requisition_custom
+#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_order_custom_form_view
+msgid "Cash Advance"
+msgstr "سلفة نقدية"
+
+#. module: purchase_requisition_custom
+#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_order_custom_form_view
+msgid "Request Reference"
+msgstr "مرجع الطلب"
+
+#. module: purchase_requisition_custom
+#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_order_custom_form_view
+msgid "Request Employee"
+msgstr "موظف الطلب"
+
 #. module: purchase_requisition_custom
 #: model:ir.model.fields,field_description:purchase_requisition_custom.field_change_purchase_user_state__requisition_id
 msgid "Requisition"
diff --git a/odex25_purchase/purchase_requisition_custom/views/purchase_request.xml b/odex25_purchase/purchase_requisition_custom/views/purchase_request.xml
index 42cc61dd5..e910a677d 100644
--- a/odex25_purchase/purchase_requisition_custom/views/purchase_request.xml
+++ b/odex25_purchase/purchase_requisition_custom/views/purchase_request.xml
@@ -71,17 +71,17 @@
                             </h1>
                         </div>
                         <group col="4" colspan="3">
-                            <field name="by_purchase" groups="purchase.group_purchase_user"/>
+                            <field name="by_purchase" string="Requested by Purchase" groups="purchase.group_purchase_user"/>
                             <field name="picking_type_id" invisible="1"/>
                             <field name="department_id" force_save="1"
                                    attrs="{'readonly' : ['|',('state' , '!=' , 'draft'),('by_purchase' , '!=' , True)] , 'required' : [('by_purchase' , '=' , True)]}"
-                                   readonly="1"/>
-                            <field name="branch_id" readonly="1"/>
+                                   readonly="1" context="{'show_department_short': True}"/>
+                            <field name="branch_id" readonly="1" context="{'show_branch_short': True}"/>
                             <field name="employee_id" attrs="{'readonly':[('by_purchase' , '=' , False)]}" required="1"
                                    options="{'no_create' : True , 'no_edit' : True ,'no_open' : True}"/>
                             <field name="product_category_ids" widget="many2many_tags"/>
                             <field name="purchase_purpose" required="1"
-                                   attrs="{'readonly':[('state' , '!=' , 'draft')]}" placeholder="Request Purpose..."/>
+                                   attrs="{'readonly':[('state' , '!=' , 'draft')]}"/>
                             <field name="date" readonly="1"/>
                             <field name="purchase_create" invisible="1"/>
                             <field name="partner_id"
@@ -90,7 +90,7 @@
                                    attrs="{'readonly':['|',('edit_partner_id' , '=' , False),('state' , '!=' , 'waiting')]}"/>
                             <!--                            <div>-->
                             <!--                                <label for="use_analytic"/>-->
-                            <field name="use_analytic"/>
+                            <field name="use_analytic" string="Use Analytic Account"/>
                             <field name="account_analytic_id"
                                    options="{'no_create' : True , 'no_edit' : True ,'no_open' : True}"
                                    attrs="{'invisible':[('use_analytic' , '=' , False)],'required':[('use_analytic' , '=' , True)],'readonly':[('state' , '!=' , 'draft')]}"/>
diff --git a/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml b/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
index f8f8d0010..29a947404 100644
--- a/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
+++ b/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
@@ -297,20 +297,15 @@
                     <attribute name="attrs">{'readonly':[('state','in',('done','cancel','waiting'))]}</attribute>
                 </xpath>
                 <xpath expr="//field[@name='currency_id']" position="after">
-                    <separator string="Request Information"/>
-                    <group col="2" colspan="2">
-                        <field name="request_id" readonly="1"/>
-                        <field name="purchase_request_employee_id"/>
-                        <field name="department_id"/>
-                        <field name="branch_id" readonly="1"/>
-                        <field name="purpose" attrs="{'readonly': [('state','in',['done','cancel'])]}" colspan="2"/>
-                    </group>
-                    <separator string="Status &amp; Tracking"/>
-                    <group col="2" colspan="2">
-                        <field name="state_of_delivery"/>
-                        <field name="no_of_approve" readonly="1"/>
-                    </group>
+                    <field name="state_of_delivery"/>
                     <field name="is_purchase_budget" invisible="1"/>
+                    <field name="no_of_approve" readonly="1"/>
+                    <!--here -->
+                    <field name="purchase_cost" invisible="1"/>
+                    <field name="department_id" invisible="0" context="{'show_department_short': True}"/>
+                    <field name="branch_id" readonly="1" context="{'show_branch_short': True}"/>
+                    <field name="purchase_request_employee_id"/>
+                    <field name="purpose" attrs="{'readonly': [('state','in',['done','cancel'])]}"/>
                 </xpath>
                 <xpath expr="//field[@name='order_line']" position="before">
                     <button name="action_select_all" class="oe_highlight" type="object"