From acdd537de6f01b943ff1e3863b19239792ac5ffb Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Mon, 5 May 2025 12:00:16 +0100
Subject: [PATCH 01/22] [FIX] odex25_website_event_track_gantt

---
 odex25_sales/odex25_website_event_track_gantt/i18n/ar.po | 1 -
 1 file changed, 1 deletion(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
index 926c47a6b..971290140 100644
--- a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
+++ b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
@@ -113,7 +113,6 @@ msgid "State"
 msgstr "المحافظة"
 
 #. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__state_id
 #: model_terms:ir.ui.view,arch_db:odex25_website_event_track_gantt.event_event_view_form
 msgid "Country"
 msgstr "الدولة"

From 9225ed0af952961c088926e86fecabf29754e061 Mon Sep 17 00:00:00 2001
From: Esraa-Exp <I.Madani@exp-sa.com>
Date: Sat, 10 May 2025 12:43:41 +0200
Subject: [PATCH 02/22] stop contrain

---
 .../dev_membership/models/res_partner.py      | 95 +++++++++++++++----
 1 file changed, 78 insertions(+), 17 deletions(-)

diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index be396d38f..ca387b5ea 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -11,6 +11,10 @@
 from odoo import fields, models, api,_
 from datetime import datetime
 
+from odoo.exceptions import Warning, ValidationError
+import re
+import logging
+_logger = logging.getLogger(__name__)
 
 class Partner(models.Model):
     _inherit = 'res.partner'
@@ -66,22 +70,26 @@ class Partner(models.Model):
                         partner.product_id = last_membership_id.product_id.id
     @api.depends('active_membership_id')
     def _compute_membership_end(self):
-        for partner in self:
-            partner.memebership_end_date = False
-            if partner.membership_count > 0:
-                if partner.active_membership_id:
-                	membership_id = self.env['dev.membership'].sudo().search([
-                	    ('partner_id', '=', partner.id),
-                        ('state', '=', 'active'),
-                        ('product_id', '=', partner.active_membership_id.product_id.id)], order='to_date desc', limit=1)
-                	if membership_id:
-                	    partner.memebership_end_date = membership_id.to_date
-                else:
-                    membership_id = self.env['dev.membership'].sudo().search([
-                	    ('partner_id', '=', partner.id),
-                        ('state', 'in', ('expire','cancel'))], order='to_date desc', limit=1)
-                    if membership_id:
-                	    partner.memebership_end_date = membership_id.to_date
+      for partner in self:
+        partner.membership_end_date = False
+        if partner.membership_count > 0:
+            if partner.active_membership_id:
+                # Search for the latest active membership with the same product
+                membership = self.env['dev.membership'].sudo().search([
+                    ('partner_id', '=', partner.id),
+                    ('state', '=', 'active'),
+                    ('product_id', '=', partner.active_membership_id.product_id.id)
+                ], order='to_date desc', limit=1)
+                if membership:
+                    partner.membership_end_date = membership.to_date
+            else:
+                # Find the latest expired or cancelled membership
+                membership = self.env['dev.membership'].sudo().search([
+                    ('partner_id', '=', partner.id),
+                    ('state', 'in', ('expire', 'cancel'))
+                ], order='to_date desc', limit=1)
+                if membership:
+                    partner.membership_end_date = membership.to_date
                     
     @api.depends('active_membership_id')             
     def _compute_membership_level(self):
@@ -156,4 +164,57 @@ class Partner(models.Model):
             'domain': [('id', '=', board_nominations)],
             'view_mode': 'tree,form',
             'target': 'current',
-        }
\ No newline at end of file
+        }
+    
+
+
+
+    @api.constrains('identification_number', 'is_member')
+    def _check_id_no_required_if_member(self):
+        for record in self:
+            if record.is_member and not record.identification_number:
+                raise ValidationError(_("ID number is required for members."))
+
+    @api.constrains('mobile', 'is_member')
+    def _check_mobile_required_if_member(self):
+        for record in self:
+            if record.is_member and not record.mobile:
+                raise ValidationError(_("Mobile number is required for members."))
+
+    @api.constrains('mobile', 'identification_number')
+    def _check_unique_mobile_id(self):
+        for record in self:
+            if record.mobile:
+                existing_mobile = self.search([
+                    ('mobile', '=', record.mobile),
+                    ('id', '!=', record.id)
+                ], limit=1)
+                if existing_mobile:
+                    raise ValidationError(_("Mobile number must be unique."))
+            if record.identification_number:
+                existing_id = self.search([
+                    ('identification_number', '=', record.identification_number),
+                    ('id', '!=', record.id)
+                ], limit=1)
+                if existing_id:
+                    raise ValidationError(_("ID number must be unique."))
+
+    # @api.constrains('mobile')
+    # def _check_mobile_format(self):
+    #     print("Test constraint running!")
+    #     for record in self:
+    #         print("Checking mobile format: %s", record.mobile)
+    #         if record.mobile and (len(record.mobile) != 10 or not record.mobile.isdigit()):
+    #             raise ValidationError(_("Mobile number must be exactly 10 digits."))
+
+    # Optional: Add SQL constraints for uniqueness
+    _sql_constraints = [
+        ('unique_mobile', 'UNIQUE(mobile)', 'Mobile number must be unique.'),
+        ('unique_identification_number', 'UNIQUE(identification_number)', 'ID number must be unique.'),
+    ] 
+            
+    
+    
+
+    
+    

From 7b0111167ecb99c93aef6a8b809955cee2dd44fc Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Sun, 11 May 2025 10:42:31 +0200
Subject: [PATCH 03/22] fix temlates for sales

---
 odex25_sales/dev_membership/data/mail_template.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/odex25_sales/dev_membership/data/mail_template.xml b/odex25_sales/dev_membership/data/mail_template.xml
index 41d7f8704..8d50b91b7 100644
--- a/odex25_sales/dev_membership/data/mail_template.xml
+++ b/odex25_sales/dev_membership/data/mail_template.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" ?>
 <odoo>
+<data noupdate="1">
+
      <record id="mt_dev_membership_created" model="mail.message.subtype">
             <field name="name">Membership Created</field>
             <field name="sequence">20</field>
@@ -100,5 +102,5 @@
                	<p>Your membership <b>${(object.name)}</b> was expired on <b>${object.datetime_convert()}</b> date.</p>
                 ]]></field>
     </record>
-
+</data>
 </odoo>

From 83204154c36f1c4ec49c35236cc0e6a3ef48eaab Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Sun, 11 May 2025 10:46:21 +0200
Subject: [PATCH 04/22] fix tempaltes

---
 .../odex25_sale_subscription/data/mail_template_data.xml    | 6 +++++-
 odex25_sales/sale_custom/data/mail_data.xml                 | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/odex25_sales/odex25_sale_subscription/data/mail_template_data.xml b/odex25_sales/odex25_sale_subscription/data/mail_template_data.xml
index aea2f67be..8dd4934d9 100644
--- a/odex25_sales/odex25_sale_subscription/data/mail_template_data.xml
+++ b/odex25_sales/odex25_sale_subscription/data/mail_template_data.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo >
+<data noupdate="1">
+
     <!-- Recurrent payment emails -->
     <record id="email_payment_close" model="mail.template">
         <field name="name">Subscription: Payment Failure</field>
@@ -466,4 +468,6 @@
         <field name="lang">${object.partner_id.lang}</field>
         <field name="auto_delete" eval="True"/>
     </record>
+    </data >
+
 </odoo>
diff --git a/odex25_sales/sale_custom/data/mail_data.xml b/odex25_sales/sale_custom/data/mail_data.xml
index 49cafa3cf..6ba09fd33 100644
--- a/odex25_sales/sale_custom/data/mail_data.xml
+++ b/odex25_sales/sale_custom/data/mail_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
+    <data noupdate="1">
+
         <record id="sale.email_template_edi_sale" model="mail.template">
             <field name="body_html" type="html">
                 <div style="margin: 0px; padding: 0px;">

From 4d2757f3fc620c2e06f9ed171a9a23d4bc2b0ca7 Mon Sep 17 00:00:00 2001
From: Esraa-Exp <I.Madani@exp-sa.com>
Date: Sun, 11 May 2025 19:42:31 +0200
Subject: [PATCH 05/22] Update res_partner.py

---
 .../dev_membership/models/res_partner.py         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index 1a87a3a83..bdc423341 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -199,13 +199,13 @@ class Partner(models.Model):
                 if existing_id:
                     raise ValidationError(_("ID number must be unique."))
 
-    # @api.constrains('mobile')
-    # def _check_mobile_format(self):
-    #     print("Test constraint running!")
-    #     for record in self:
-    #         print("Checking mobile format: %s", record.mobile)
-    #         if record.mobile and (len(record.mobile) != 10 or not record.mobile.isdigit()):
-    #             raise ValidationError(_("Mobile number must be exactly 10 digits."))
+    @api.constrains('mobile')
+    def _check_mobile_format(self):
+        print("Test constraint running!")
+        for record in self:
+            print("Checking mobile format: %s", record.mobile)
+            if record.mobile and (len(record.mobile) != 10 or not record.mobile.isdigit()):
+                raise ValidationError(_("Mobile number must be exactly 10 digits."))
 
 
     # Optional: Add SQL constraints for uniqueness
@@ -217,4 +217,4 @@ class Partner(models.Model):
     
     
 
-    
\ No newline at end of file
+    

From 2736b44b9e213fdea43468768d2668f0e84ee9d5 Mon Sep 17 00:00:00 2001
From: Esraa-Exp <I.Madani@exp-sa.com>
Date: Sun, 11 May 2025 20:34:31 +0200
Subject: [PATCH 06/22] stop mobile constrain

---
 odex25_sales/dev_membership/models/res_partner.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index bdc423341..4dcbc07a5 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -199,13 +199,13 @@ class Partner(models.Model):
                 if existing_id:
                     raise ValidationError(_("ID number must be unique."))
 
-    @api.constrains('mobile')
-    def _check_mobile_format(self):
-        print("Test constraint running!")
-        for record in self:
-            print("Checking mobile format: %s", record.mobile)
-            if record.mobile and (len(record.mobile) != 10 or not record.mobile.isdigit()):
-                raise ValidationError(_("Mobile number must be exactly 10 digits."))
+    # @api.constrains('mobile')
+    # def _check_mobile_format(self):
+    #     print("Test constraint running!")
+    #     for record in self:
+    #         print("Checking mobile format: %s", record.mobile)
+    #         if record.mobile and (len(record.mobile) != 10 or not record.mobile.isdigit()):
+    #             raise ValidationError(_("Mobile number must be exactly 10 digits."))
 
 
     # Optional: Add SQL constraints for uniqueness

From 6685aac6a1782eef9cd388d545592debc7cfb448 Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Mon, 12 May 2025 08:53:26 +0200
Subject: [PATCH 07/22] fix membership

---
 odex25_sales/dev_membership/i18n/ar_001.po    |  8 +-
 .../models/membership_cancel_request.py       |  3 +-
 .../dev_membership/models/res_partner.py      | 75 +++++++++----------
 .../dev_membership/security/security.xml      |  5 +-
 .../dev_membership/views/dev_membership.xml   |  2 +-
 .../dev_membership/views/partner_extended.xml |  8 ++
 6 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/odex25_sales/dev_membership/i18n/ar_001.po b/odex25_sales/dev_membership/i18n/ar_001.po
index 7bd3bdfc1..65e68af46 100644
--- a/odex25_sales/dev_membership/i18n/ar_001.po
+++ b/odex25_sales/dev_membership/i18n/ar_001.po
@@ -1572,4 +1572,10 @@ msgstr "المرشحين"
 #. module: dev_membership
 #: model:ir.actions.report,name:dev_membership.menu_print_membership_nomination
 msgid "Print Membership Nomination"
-msgstr "طباعة المرشحين للعضوية"
\ No newline at end of file
+msgstr "طباعة المرشحين للعضوية"
+
+#. module: dev_membership
+#: code:addons/dev_membership/models/res_partner.py:10
+#, python-format
+msgid "email must be unique."
+msgstr "يجب أن يكون البريد الإلكتروني فريدًا."
\ No newline at end of file
diff --git a/odex25_sales/dev_membership/models/membership_cancel_request.py b/odex25_sales/dev_membership/models/membership_cancel_request.py
index 8a9802cd5..3f8490119 100644
--- a/odex25_sales/dev_membership/models/membership_cancel_request.py
+++ b/odex25_sales/dev_membership/models/membership_cancel_request.py
@@ -28,7 +28,8 @@ class MembershipCancellationRequest(models.Model):
                 rec.membership_id.partner_id.memebership_end_date = request_date
             rec.membership_id.request_date = request_date
             rec.state = 'approved'
-            rec.membership_id.state = 'cancel'
+            if rec.membership_id.state=='active':
+               rec.membership_id.state = 'cancel'
             rec.membership_id.partner_id.check_active_membership()
 
     def action_reject(self):
diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index 1a87a3a83..2dac89c37 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -19,7 +19,10 @@ _logger = logging.getLogger(__name__)
 class Partner(models.Model):
     _inherit = 'res.partner'
 
-    is_member = fields.Boolean(string='Is Member')
+    is_member = fields.Boolean(string='Is Member' ,default=False)
+    mobile = fields.Char(copy=False)
+    identification_number = fields.Char(copy=False)
+    email = fields.Char(copy=False)
     membership_count = fields.Integer(string="Membership Count", compute="_get_membership_count")
     active_membership_id = fields.Many2one('dev.membership', string='Membership', compute='check_active_membership')
     membrship_level = fields.Many2one('membership.level',string='Membrship level',store=True,compute='_compute_membership_level')
@@ -169,50 +172,46 @@ class Partner(models.Model):
 
 
 
-    @api.constrains('identification_number', 'is_member')
-    def _check_id_no_required_if_member(self):
-        for record in self:
-            if record.is_member and not record.identification_number:
-                raise ValidationError(_("ID number is required for members."))
+    
 
-    @api.constrains('mobile', 'is_member')
-    def _check_mobile_required_if_member(self):
-        for record in self:
-            if record.is_member and not record.mobile:
-                raise ValidationError(_("Mobile number is required for members."))
+    
 
-    @api.constrains('mobile', 'identification_number')
+    @api.constrains('mobile', 'identification_number','email')
     def _check_unique_mobile_id(self):
-        for record in self:
-            if record.mobile:
-                existing_mobile = self.search([
-                    ('mobile', '=', record.mobile),
-                    ('id', '!=', record.id)
-                ], limit=1)
-                if existing_mobile:
-                    raise ValidationError(_("Mobile number must be unique."))
-            if record.identification_number:
-                existing_id = self.search([
-                    ('identification_number', '=', record.identification_number),
-                    ('id', '!=', record.id)
-                ], limit=1)
-                if existing_id:
-                    raise ValidationError(_("ID number must be unique."))
+         for record in self:
+             if record.mobile:
+                 existing_mobile = self.search([
+                     ('mobile', '=', record.mobile),
+                     ('id', '!=', record.id)
+                 ], limit=1)
+                 if existing_mobile:
+                     raise ValidationError(_("Mobile number must be unique."))
+             if record.identification_number:
+                 existing_id = self.search([
+                     ('identification_number', '=', record.identification_number),
+                     ('id', '!=', record.id)
+                 ], limit=1)
+                 if existing_id:
+                     raise ValidationError(_("ID number must be unique."))
+             if record.email:
+                 existing_email = self.search([
+                     ('email', '=', record.email),
+                     ('id', '!=', record.id)
+                 ], limit=1)
+                 if existing_email:
+                     raise ValidationError(_("email must be unique."))     
 
-    # @api.constrains('mobile')
-    # def _check_mobile_format(self):
-    #     print("Test constraint running!")
-    #     for record in self:
-    #         print("Checking mobile format: %s", record.mobile)
-    #         if record.mobile and (len(record.mobile) != 10 or not record.mobile.isdigit()):
-    #             raise ValidationError(_("Mobile number must be exactly 10 digits."))
+    @api.onchange('mobile')
+    def _check_mobile_format(self):
+         print("Test constraint running!")
+         for record in self:
+             print("Checking mobile format: %s", record.mobile)
+             if record.mobile and (len(record.mobile) != 10 or not record.mobile.isdigit()):
+                 raise ValidationError(_("Mobile number must be exactly 10 digits."))
 
 
     # Optional: Add SQL constraints for uniqueness
-    _sql_constraints = [
-        ('unique_mobile', 'UNIQUE(mobile)', 'Mobile number must be unique.'),
-        ('unique_identification_number', 'UNIQUE(identification_number)', 'ID number must be unique.'),
-    ] 
+    
             
     
     
diff --git a/odex25_sales/dev_membership/security/security.xml b/odex25_sales/dev_membership/security/security.xml
index 682252a1f..0faea90a8 100644
--- a/odex25_sales/dev_membership/security/security.xml
+++ b/odex25_sales/dev_membership/security/security.xml
@@ -39,8 +39,5 @@
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4, ref('group_membership_manager'))]"/>
     </record>
-<record id="sale_purchase_tab" model="res.groups">
-            <field name="name">Sale/Purchase Tab</field>
-            <field name="category_id" ref="dev_membership.membership_category"/> <!-- Or use your own category -->
-        </record>
+
 </odoo>
diff --git a/odex25_sales/dev_membership/views/dev_membership.xml b/odex25_sales/dev_membership/views/dev_membership.xml
index 3ec72d24e..6d6c44264 100644
--- a/odex25_sales/dev_membership/views/dev_membership.xml
+++ b/odex25_sales/dev_membership/views/dev_membership.xml
@@ -48,7 +48,7 @@
                             attrs="{'invisible':['|',('membership_id','!=',False),('state','not in',['expire','active','cancel'])]}"/>
                     <button name="%(dev_membership.membership_request_cancel_wizard_action)d" type="action" string="Cancel"
                             attrs="{'invisible': ([('state', 'not in', ['active','expire'])])}"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,activeexpire,cancel"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,active,expire,cancel"/>
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml
index fc9057727..8c7a6d1d2 100644
--- a/odex25_sales/dev_membership/views/partner_extended.xml
+++ b/odex25_sales/dev_membership/views/partner_extended.xml
@@ -231,6 +231,11 @@
             <xpath expr="//field[@name='function']" position="attributes">
                 <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
             </xpath>
+            <xpath expr="//field[@name='mobile']" position="attributes">
+                <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
+            </xpath>
+
+
             <xpath expr="//field[@name='company_type']" position="attributes">
                 <attribute name="attrs">{'invisible':[('is_member','=',True)]}</attribute>
             </xpath>
@@ -264,6 +269,9 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="partner_custom.partner_view_property_cusotm"/>
         <field name="arch" type="xml">
+        <xpath expr="//field[@name='identification_number']" position="attributes">
+                <attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
+            </xpath>
             <xpath expr="//group[@name='identifcation_info']" position="after">
                 <group>
                     <field name="gender" attrs="{'required':[('is_member','=',True)]}"/>

From c4e2320db2aea11579c182f25b612c7bce02fb80 Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Mon, 12 May 2025 09:36:52 +0200
Subject: [PATCH 08/22] remove

---
 odex25_sales/dev_membership/views/partner_extended.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml
index 8c7a6d1d2..0816d5497 100644
--- a/odex25_sales/dev_membership/views/partner_extended.xml
+++ b/odex25_sales/dev_membership/views/partner_extended.xml
@@ -170,9 +170,7 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='sales_purchases']" position="attributes">
-                <attribute name="groups">dev_membership.sale_purchase_tab</attribute>
-            </xpath>
+            
 
             <xpath expr="//field[@name='title']" position="replace"></xpath>
 

From b6410ec22d4e2221065527905ad47821844dda10 Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Mon, 12 May 2025 09:51:15 +0200
Subject: [PATCH 09/22] fix dev

---
 odex25_sales/dev_membership/models/res_partner.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index 2dac89c37..70d2d563a 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -22,7 +22,7 @@ class Partner(models.Model):
     is_member = fields.Boolean(string='Is Member' ,default=False)
     mobile = fields.Char(copy=False)
     identification_number = fields.Char(copy=False)
-    email = fields.Char(copy=False)
+    
     membership_count = fields.Integer(string="Membership Count", compute="_get_membership_count")
     active_membership_id = fields.Many2one('dev.membership', string='Membership', compute='check_active_membership')
     membrship_level = fields.Many2one('membership.level',string='Membrship level',store=True,compute='_compute_membership_level')
@@ -193,13 +193,7 @@ class Partner(models.Model):
                  ], limit=1)
                  if existing_id:
                      raise ValidationError(_("ID number must be unique."))
-             if record.email:
-                 existing_email = self.search([
-                     ('email', '=', record.email),
-                     ('id', '!=', record.id)
-                 ], limit=1)
-                 if existing_email:
-                     raise ValidationError(_("email must be unique."))     
+                 
 
     @api.onchange('mobile')
     def _check_mobile_format(self):

From 1a9a27a057ab478f6b2785a44b7948ad5f12605a Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Mon, 12 May 2025 10:45:37 +0200
Subject: [PATCH 10/22] add transation

---
 odex25_sales/dev_membership/i18n/ar_001.po | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/odex25_sales/dev_membership/i18n/ar_001.po b/odex25_sales/dev_membership/i18n/ar_001.po
index 65e68af46..106c6a923 100644
--- a/odex25_sales/dev_membership/i18n/ar_001.po
+++ b/odex25_sales/dev_membership/i18n/ar_001.po
@@ -1577,5 +1577,23 @@ msgstr "طباعة المرشحين للعضوية"
 #. module: dev_membership
 #: code:addons/dev_membership/models/res_partner.py:10
 #, python-format
-msgid "email must be unique."
-msgstr "يجب أن يكون البريد الإلكتروني فريدًا."
\ No newline at end of file
+msgid "Mobile number must be unique."
+msgstr "رقم الهاتف يجب أن يكون فريداً."
+
+
+#. module: dev_membership
+#: code:addons/dev_membership/models/res_partner.py:10
+#, python-format
+msgid "ID number must be unique."
+msgstr "رقم الهوية يجب أن يكون فريداً."
+
+
+
+#. module: dev_membership
+#: code:addons/dev_membership/models/res_partner.py:10
+#, python-format
+msgid "Mobile number must be exactly 10 digits."
+msgstr "رقم الهاتف يجب أن يتكون من 10 أرقام بالضبط."
+
+
+

From 8376355c44e44f9f555124b48a1589369ebda2f7 Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Mon, 12 May 2025 11:55:51 +0200
Subject: [PATCH 11/22] add priority

---
 odex25_sales/dev_membership/views/partner_extended.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml
index 0816d5497..3d046406e 100644
--- a/odex25_sales/dev_membership/views/partner_extended.xml
+++ b/odex25_sales/dev_membership/views/partner_extended.xml
@@ -285,6 +285,7 @@
     <record id="view_search_res_partner" model="ir.ui.view">
         <field name="name">res.partner.search</field>
         <field name="model">res.partner</field>
+        <field name="priority">20</field>
         <field name="arch" type="xml">
             <search string="Res Partner Search">
                 <field name="name"/>

From 9e85779e9f75ead4cb32b3741ec161f313f194f9 Mon Sep 17 00:00:00 2001
From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com>
Date: Sun, 18 May 2025 17:40:51 +0300
Subject: [PATCH 12/22] add event fields

---
 .../models/event_event.py                     | 33 +++++++++++++++++++
 .../views/event_event_views.xml               | 14 +++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
index 0cde461b2..e7d8b9b7d 100644
--- a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
+++ b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
@@ -24,6 +24,39 @@ class Event(models.Model):
     state_id = fields.Many2one("res.country.state", string='State', ondelete='restrict',
                                domain="[('country_id', '=?', country_id)]", related="address_id.state_id", readonly=True)
     country_id = fields.Many2one('res.country', string='Country', ondelete='restrict', related="address_id.country_id", readonly=True)
+    job_title = fields.Many2one(
+        string='المنصب الوظيفي',
+        related='user_id.employee_id.job_id',
+        store=True,
+        readonly=True
+    )
+
+    department_id = fields.Many2one(
+        'hr.department',
+        string='الإدارة',
+        related='user_id.employee_id.department_id',
+        store=True,
+        readonly=True
+    )
+
+    branch_name = fields.Many2one(
+        string='الفرع التابع للإدارة',
+        related='user_id.employee_id.department_id.branch_name',
+        store=True,
+        readonly=True
+    )
+
+    departments_id = fields.Many2one(
+        'hr.department',string='الإدارة التابع لها الفعالية'
+
+    )
+    branchs_name = fields.Many2one(
+        string='الفرع التابع للإدارة',
+        related='departments_id.branch_name',
+        store=True,
+        readonly=True
+    )
+
 
     @api.depends('date_begin', 'date_end')
     def _compute_remaining_time(self):
diff --git a/odex25_sales/odex25_website_event_track_gantt/views/event_event_views.xml b/odex25_sales/odex25_website_event_track_gantt/views/event_event_views.xml
index 4e24f73b3..e0bfb1651 100644
--- a/odex25_sales/odex25_website_event_track_gantt/views/event_event_views.xml
+++ b/odex25_sales/odex25_website_event_track_gantt/views/event_event_views.xml
@@ -21,9 +21,21 @@
                 <field name="remaining_days"/>
                 <field name="remaining_hours"/>
             </xpath>
-            <xpath expr="//field[@name='tag_ids']" position="after">
+
+             <xpath expr="//field[@name='tag_ids']" position="after">
                 <field name="Description_event"/>
             </xpath>
+             <xpath expr="//field[@name='user_id']" position="after">
+                <field name="job_title"/>
+                <field name="department_id"/>
+                <field name="branch_name"/>
+            </xpath>
+             <xpath expr="//field[@name='event_type_id']" position="before">
+                <field name="departments_id"/>
+                <field name="branchs_name"/>
+
+            </xpath>
+
             <xpath expr="//field[@name='address_id']" position="attributes">
                 <attribute name="context">{'show_address': 1, 'default_is_event_address': True,'default_is_company':
                     True}

From f6ae81805ec08976ee937aa1e71141bcca137d6f Mon Sep 17 00:00:00 2001
From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com>
Date: Sun, 18 May 2025 18:17:51 +0300
Subject: [PATCH 13/22] add event fields

---
 .../i18n/ar.po                                | 35 +++++++++++++++++++
 .../models/event_event.py                     | 10 +++---
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
index 971290140..26ad7113f 100644
--- a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
+++ b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
@@ -157,3 +157,38 @@ msgstr "أسم مسؤول التواصل"
 #: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_sponsor__contact_person
 msgid "Partner contact person"
 msgstr "أسم مسؤول التواصل عند الشريك"
+
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__job_title
+msgid "Job Position"
+msgstr "المنصب الوظيفي"
+
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__department_id
+msgid "Parent Department"
+msgstr "الإدارة"
+
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__branch_name
+msgid "Department Branch"
+msgstr "الفرع التابع للإدارة"
+
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__departments_id
+msgid "Department"
+msgstr "الإدارة التابع لها الفعالية"
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__branchs_name
+msgid "Departments Branch"
+msgstr "الفرع التابع للإدارة"
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__job_title
+msgid "Job Position"
+msgstr "المنصب الوظيفي"
+
diff --git a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
index e7d8b9b7d..a91f1acf2 100644
--- a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
+++ b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
@@ -25,7 +25,7 @@ class Event(models.Model):
                                domain="[('country_id', '=?', country_id)]", related="address_id.state_id", readonly=True)
     country_id = fields.Many2one('res.country', string='Country', ondelete='restrict', related="address_id.country_id", readonly=True)
     job_title = fields.Many2one(
-        string='المنصب الوظيفي',
+        string='Job Position',
         related='user_id.employee_id.job_id',
         store=True,
         readonly=True
@@ -33,25 +33,25 @@ class Event(models.Model):
 
     department_id = fields.Many2one(
         'hr.department',
-        string='الإدارة',
+        string='Parent Department',
         related='user_id.employee_id.department_id',
         store=True,
         readonly=True
     )
 
     branch_name = fields.Many2one(
-        string='الفرع التابع للإدارة',
+        string='Department Branch',
         related='user_id.employee_id.department_id.branch_name',
         store=True,
         readonly=True
     )
 
     departments_id = fields.Many2one(
-        'hr.department',string='الإدارة التابع لها الفعالية'
+        'hr.department',string='Department'
 
     )
     branchs_name = fields.Many2one(
-        string='الفرع التابع للإدارة',
+        string='Departments Branch',
         related='departments_id.branch_name',
         store=True,
         readonly=True

From add818a8a47b62d956a86f2f35543a07204db28b Mon Sep 17 00:00:00 2001
From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com>
Date: Sun, 18 May 2025 18:37:34 +0300
Subject: [PATCH 14/22] add event fields

---
 .../odex25_website_event_track_gantt/i18n/ar.po      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
index 26ad7113f..e4e4a3341 100644
--- a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
+++ b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
@@ -159,35 +159,35 @@ msgid "Partner contact person"
 msgstr "أسم مسؤول التواصل عند الشريك"
 
 
-#. module: event
+#. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:event.field_event_event__job_title
 msgid "Job Position"
 msgstr "المنصب الوظيفي"
 
 
-#. module: event
+#. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:event.field_event_event__department_id
 msgid "Parent Department"
 msgstr "الإدارة"
 
 
-#. module: event
+#. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:event.field_event_event__branch_name
 msgid "Department Branch"
 msgstr "الفرع التابع للإدارة"
 
 
-#. module: event
+#. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:event.field_event_event__departments_id
 msgid "Department"
 msgstr "الإدارة التابع لها الفعالية"
 
-#. module: event
+#. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:event.field_event_event__branchs_name
 msgid "Departments Branch"
 msgstr "الفرع التابع للإدارة"
 
-#. module: event
+#. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:event.field_event_event__job_title
 msgid "Job Position"
 msgstr "المنصب الوظيفي"

From ef472015e2b7adbed5fb3ec33b4fe65b78a1fce4 Mon Sep 17 00:00:00 2001
From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com>
Date: Sun, 18 May 2025 18:41:36 +0300
Subject: [PATCH 15/22] add event fields

---
 .../odex25_website_event_track_gantt/i18n/ar.po      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
index e4e4a3341..0be695239 100644
--- a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
+++ b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
@@ -160,35 +160,35 @@ msgstr "أسم مسؤول التواصل عند الشريك"
 
 
 #. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:event.field_event_event__job_title
+#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__job_title
 msgid "Job Position"
 msgstr "المنصب الوظيفي"
 
 
 #. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:event.field_event_event__department_id
+#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__department_id
 msgid "Parent Department"
 msgstr "الإدارة"
 
 
 #. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:event.field_event_event__branch_name
+#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__branch_name
 msgid "Department Branch"
 msgstr "الفرع التابع للإدارة"
 
 
 #. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:event.field_event_event__departments_id
+#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__departments_id
 msgid "Department"
 msgstr "الإدارة التابع لها الفعالية"
 
 #. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:event.field_event_event__branchs_name
+#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__branchs_name
 msgid "Departments Branch"
 msgstr "الفرع التابع للإدارة"
 
 #. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:event.field_event_event__job_title
+#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__job_title
 msgid "Job Position"
 msgstr "المنصب الوظيفي"
 

From ac06285d4d2889ed30294d96c16c2cfbdfd23089 Mon Sep 17 00:00:00 2001
From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com>
Date: Mon, 19 May 2025 11:38:22 +0300
Subject: [PATCH 16/22] add event fields

---
 odex25_sales/odex25_website_event_track_gantt/i18n/ar.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
index 0be695239..e7c07c6cb 100644
--- a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
+++ b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
@@ -162,7 +162,7 @@ msgstr "أسم مسؤول التواصل عند الشريك"
 #. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__job_title
 msgid "Job Position"
-msgstr "المنصب الوظيفي"
+msgstr " المنصب الوظيفي"
 
 
 #. module: odex25_website_event_track_gantt

From 7454a15bdf54d7c90d067e7ea8409abdf47a7881 Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Tue, 20 May 2025 12:21:39 +0200
Subject: [PATCH 17/22] group by account

---
 odex25_sales/crm_expense/models/hr_expence.py | 66 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/odex25_sales/crm_expense/models/hr_expence.py b/odex25_sales/crm_expense/models/hr_expence.py
index 91dd1b5f2..0ea943cd3 100644
--- a/odex25_sales/crm_expense/models/hr_expence.py
+++ b/odex25_sales/crm_expense/models/hr_expence.py
@@ -1,9 +1,73 @@
 # -*- coding: utf-8 -*-
 
 from odoo import api, fields, models
-
+from odoo.tools import float_round
+from collections import defaultdict
 
 class HrExpense(models.Model):
     _inherit = "hr.expense"
 
     crm_lead_id = fields.Many2one('crm.lead', 'CRM Lead')
+
+
+    def action_move_create(self):
+        # Filter out refused expenses
+        expenses = self.filtered(lambda x: not x.is_refused)
+        
+        # Group expenses by their respective sheets
+        expenses_by_sheet = {}
+        for expense in expenses:
+            sheet = expense.sheet_id
+            if sheet not in expenses_by_sheet:
+                expenses_by_sheet[sheet] = self.env['hr.expense']
+            expenses_by_sheet[sheet] += expense
+
+        # Get moves and line values using the filtered expenses
+        move_group_by_sheet = expenses._get_account_move_by_sheet()
+        move_line_values_by_expense = expenses._get_account_move_line_values()
+
+        # Process each expense sheet
+        for sheet, sheet_expenses in expenses_by_sheet.items():
+            move = move_group_by_sheet[sheet.id]
+
+            # Collect all move line values for this sheet
+            all_move_line_values = []
+            for expense in sheet_expenses:
+                all_move_line_values.extend(move_line_values_by_expense.get(expense.id, []))
+
+            # Consolidate lines by account_id
+            grouped_lines = defaultdict(lambda: {'debit': 0.0, 'credit': 0.0, 'values': {}})
+            for line in all_move_line_values:
+                account_id = line['account_id']
+                grouped_lines[account_id]['debit'] += line.get('debit', 0.0)
+                grouped_lines[account_id]['credit'] += line.get('credit', 0.0)
+                if not grouped_lines[account_id]['values']:
+                    grouped_lines[account_id]['values'] = {
+                        k: v for k, v in line.items() if k not in ('debit', 'credit')
+                    }
+
+            # Prepare final move lines with consolidated values
+            final_move_lines = []
+            for account_group in grouped_lines.values():
+                line_data = account_group['values'].copy()
+                line_data['debit'] = float_round(account_group['debit'], precision_digits=2)
+                line_data['credit'] = float_round(account_group['credit'], precision_digits=2)
+                final_move_lines.append((0, 0, line_data))
+
+            # Update the move with new lines (clear existing first)
+            move.write({'line_ids': [(5, 0, 0)] + final_move_lines})
+
+            # Link the move to the expense sheet
+            sheet.write({'account_move_id': move.id})
+
+            # Mark as paid if all expenses are company-paid
+            if all(expense.payment_mode == 'company_account' for expense in sheet_expenses):
+                sheet.paid_expense_sheets()
+
+        # Post all generated accounting moves
+        for move in move_group_by_sheet.values():
+            move._post()
+
+        return move_group_by_sheet
+
+    

From 32965fb269fe161b6288f82c0cae77efbc67309b Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Thu, 22 May 2025 10:58:45 +0100
Subject: [PATCH 18/22] [FIX] odex25_website_event_track_gantt

---
 odex25_sales/odex25_website_event_track_gantt/i18n/ar.po | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
index e7c07c6cb..7324d3bab 100644
--- a/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
+++ b/odex25_sales/odex25_website_event_track_gantt/i18n/ar.po
@@ -158,25 +158,16 @@ msgstr "أسم مسؤول التواصل"
 msgid "Partner contact person"
 msgstr "أسم مسؤول التواصل عند الشريك"
 
-
-#. module: odex25_website_event_track_gantt
-#: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__job_title
-msgid "Job Position"
-msgstr " المنصب الوظيفي"
-
-
 #. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__department_id
 msgid "Parent Department"
 msgstr "الإدارة"
 
-
 #. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__branch_name
 msgid "Department Branch"
 msgstr "الفرع التابع للإدارة"
 
-
 #. module: odex25_website_event_track_gantt
 #: model:ir.model.fields,field_description:odex25_website_event_track_gantt.field_event_event__departments_id
 msgid "Department"

From 42eb87d73aad5a7ddaecf779d4b8c4aaacf3487a Mon Sep 17 00:00:00 2001
From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com>
Date: Thu, 22 May 2025 13:54:37 +0300
Subject: [PATCH 19/22] change string to test push git

---
 .../odex25_website_event_track_gantt/models/event_event.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
index a91f1acf2..e4a1db44b 100644
--- a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
+++ b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
@@ -47,7 +47,7 @@ class Event(models.Model):
     )
 
     departments_id = fields.Many2one(
-        'hr.department',string='Department'
+        'hr.department',string='Departmentt'
 
     )
     branchs_name = fields.Many2one(

From 17192f4ebcfd2820e0083130cb77a4483f3206e5 Mon Sep 17 00:00:00 2001
From: blackbelts <74664702+eslamtalaat74@users.noreply.github.com>
Date: Thu, 22 May 2025 14:13:37 +0300
Subject: [PATCH 20/22] change string to test push git change field to be char

---
 .../models/event_event.py                              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
index e4a1db44b..b748597d2 100644
--- a/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
+++ b/odex25_sales/odex25_website_event_track_gantt/models/event_event.py
@@ -39,20 +39,20 @@ class Event(models.Model):
         readonly=True
     )
 
-    branch_name = fields.Many2one(
+    branch_name = fields.Char(
         string='Department Branch',
-        related='user_id.employee_id.department_id.branch_name',
+        related='user_id.employee_id.department_id.branch_name.name',
         store=True,
         readonly=True
     )
 
     departments_id = fields.Many2one(
-        'hr.department',string='Departmentt'
+        'hr.department',string='Department'
 
     )
-    branchs_name = fields.Many2one(
+    branchs_name = fields.Char(
         string='Departments Branch',
-        related='departments_id.branch_name',
+        related='departments_id.branch_name.name',
         store=True,
         readonly=True
     )

From 8cd73a02087c7f42304bc510ac04fde2daec96ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Wed, 28 May 2025 15:29:07 +0300
Subject: [PATCH 21/22] Update github action file

---
 .github/workflows/production_pull_code.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml
index 1384dbbf9..6254be019 100644
--- a/.github/workflows/production_pull_code.yml
+++ b/.github/workflows/production_pull_code.yml
@@ -26,7 +26,7 @@ jobs:
         run: |                    
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
   
@@ -40,7 +40,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
   
@@ -54,7 +54,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
 
@@ -68,7 +68,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.KAZ_PROJECT_USER }} ${{ secrets.KAZ_STANDARD_FOLDER_PATH }} ${{ secrets.KAZ_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
           sudo systemctl restart odoo-server-stage.service
@@ -83,7 +83,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_PROJECT_USER }} ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }} ${{ secrets.TWAHOD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
 
@@ -97,7 +97,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.EKRAM_PROJECT_USER }} ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }} ${{ secrets.EKRAM_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
 

From 0ead7ae0dab983e4b99faad9a6f7ecfbde17fb2e Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Wed, 28 May 2025 16:35:08 +0200
Subject: [PATCH 22/22] add tab event information

---
 .../views/res_partner_views.xml                   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/odex25_sales/odex25_website_event_track_gantt/views/res_partner_views.xml b/odex25_sales/odex25_website_event_track_gantt/views/res_partner_views.xml
index 7f31736b7..d9d356143 100644
--- a/odex25_sales/odex25_website_event_track_gantt/views/res_partner_views.xml
+++ b/odex25_sales/odex25_website_event_track_gantt/views/res_partner_views.xml
@@ -6,11 +6,16 @@
         <field name="priority">10</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='category_id']" position="after">
-                <field name="is_event_address" readonly="1"/>
-                <field name="is_organizer" readonly="1"/>
-                <field name="is_sponsor" readonly="1"/>
-            </xpath>
+            <xpath expr="//page[5]" position="after">
+    <page name="event_info" string="بيانات الفعالية"  groups="event.group_event_manager">
+        <group>
+            <field name="is_event_address" readonly="1"/>
+            <field name="is_organizer" readonly="1"/>
+            <field name="is_sponsor" readonly="1"/>
+        </group>
+    </page>
+</xpath>
+
             <xpath expr="//field[@name='website']" position="attributes">
                 <attribute name="attrs">{'required': [('is_sponsor', '=',
                     True)],'invisible':[('company_type','!=','company')]}