From 3da946de0be5e84f0cc4fd00a139820867ee4d6f Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 15 Aug 2024 17:06:33 +0300
Subject: [PATCH 1/2] Update membership_card_reports.xml

---
 .../report/membership_card_reports.xml                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/odex25_sales/membership_card_odoo/report/membership_card_reports.xml b/odex25_sales/membership_card_odoo/report/membership_card_reports.xml
index f8551cf8e..acc6259f3 100644
--- a/odex25_sales/membership_card_odoo/report/membership_card_reports.xml
+++ b/odex25_sales/membership_card_odoo/report/membership_card_reports.xml
@@ -33,12 +33,12 @@
             <!-- Header -->
             <style>
                 @font-face {font-family: "Sakkal Majalla"; src:
-                url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot"); src:
-                url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot?#iefix")
+                url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot); src:
+                url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot?#iefix)
                 format("embedded-opentype"),
-                url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff2") format("woff2"),
-                url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff") format("woff"),
-                url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.ttf") format("truetype");
+                url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff2) format("woff2"),
+                url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff) format("woff"),
+                url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.ttf) format("truetype");
                 }
                 #font{
                 font-family: Sakkal Majalla;

From ccc0d761c4054ed49c855ee54363e14405272812 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 15 Aug 2024 17:09:28 +0300
Subject: [PATCH 2/2] Update partner_extended.xml

---
 .../dev_membership/views/partner_extended.xml | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml
index 987882aee..1930ddce6 100644
--- a/odex25_sales/dev_membership/views/partner_extended.xml
+++ b/odex25_sales/dev_membership/views/partner_extended.xml
@@ -186,21 +186,23 @@
             </xpath>
 
             <xpath expr="//field[@name='title']" position="replace"></xpath>
-                       
+
 
             <xpath expr="//div/h1" position="replace">
                 <h1 class="o_addressformat">
                     <div class="o_address_row" style="display: flex; justify-content: flex-start; align-items: center;">
                         <!-- Title Field -->
-                        <div attrs="{'invisible': [('company_type', '=', 'company')]}" style="flex: 0 0 auto; margin-right: 10px;">
+                        <div attrs="{'invisible': [('company_type', '=', 'company')]}"
+                             style="flex: 0 0 auto; margin-right: 10px;">
                             <field widget="selection" name="title" placeholder="Title"
                                    options="{'no_quick_create': True}"
                                    attrs="{'invisible': [('company_type', '=', 'company')]}"/>
                         </div>
-                         <!-- Separator -->
-            <div attrs="{'invisible': [('company_type', '=', 'company')]}" style="flex: 0 0 auto; margin: 0 10px;">
-                /
-            </div>
+                        <!-- Separator -->
+                        <div attrs="{'invisible': [('company_type', '=', 'company')]}"
+                             style="flex: 0 0 auto; margin: 0 10px;">
+                            /
+                        </div>
                         <!-- Name Field -->
                         <div style="flex: 0 0 auto;">
                             <field name="name" default_focus="1" placeholder="e.g. Lumber Inc"
@@ -233,30 +235,30 @@
             </xpath>
             <xpath expr="//field[@name='function']" position="after">
             </xpath>
-            <xpath expr="//field[@name='function']"position="attributes">
-                <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
-            </xpath>
-            
-             <xpath expr="//field[@name='street']"position="attributes">
+            <xpath expr="//field[@name='function']" position="attributes">
                 <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
             </xpath>
 
-              <xpath expr="//field[@name='street2']"position="attributes">
+            <xpath expr="//field[@name='street']" position="attributes">
                 <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
             </xpath>
 
-             <xpath expr="//field[@name='city']"position="attributes">
+            <xpath expr="//field[@name='street2']" position="attributes">
                 <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
             </xpath>
 
-              <xpath expr="//field[@name='state_id']"position="attributes">
+            <xpath expr="//field[@name='city']" position="attributes">
                 <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
             </xpath>
 
-             <xpath expr="//field[@name='zip']"position="attributes">
+            <xpath expr="//field[@name='state_id']" position="attributes">
                 <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
             </xpath>
-            
+
+            <xpath expr="//field[@name='zip']" position="attributes">
+                <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
+            </xpath>
+
             <xpath expr="//field[@name='vat']" position="attributes">
                 <attribute name="attrs">{'invisible':[('company_type','!=','company')]}</attribute>