From 8f79b55cd2cec2ea318dbb3a101c3321abd432f1 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:10:03 +0300
Subject: [PATCH 1/6] Update res_config_settings.py
---
odex25_sales/dev_membership/models/res_config_settings.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/odex25_sales/dev_membership/models/res_config_settings.py b/odex25_sales/dev_membership/models/res_config_settings.py
index 505160c27..c1156a29a 100644
--- a/odex25_sales/dev_membership/models/res_config_settings.py
+++ b/odex25_sales/dev_membership/models/res_config_settings.py
@@ -61,7 +61,7 @@ class CancellReason(models.Model):
name = fields.Char(string='Reasone of Cancellation')
reasone_no = fields.Char("Number", default=lambda self: self._get_next_reasone_no(), tracking=True,copy=False)
sequence = fields.Integer(string="Sequence", help="Define the display order")
-
+ company_id = fields.Many2one('res.company', string='Company', readonly=True,default=lambda self: self.env.company)
@api.model
def _get_next_reasone_no(self):
From c595de6718311f3901891cc77e05abaf17fd4d5f Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:10:32 +0300
Subject: [PATCH 2/6] Update membershib_level.py
---
odex25_sales/dev_membership/models/membershib_level.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/odex25_sales/dev_membership/models/membershib_level.py b/odex25_sales/dev_membership/models/membershib_level.py
index 0f06b051a..cbe07e92a 100644
--- a/odex25_sales/dev_membership/models/membershib_level.py
+++ b/odex25_sales/dev_membership/models/membershib_level.py
@@ -11,7 +11,8 @@ class MembershipLevel(models.Model):
color = fields.Char(string='Membership Card Color')
level_no = fields.Char("Number", default=lambda self: self._get_next_levelno(), tracking=True,copy=False)
sequence = fields.Integer(string="Sequence", help="Define the display order")
-
+ company_id = fields.Many2one('res.company', string='Company', readonly=True,
+ default=lambda self: self.env.company)
@api.model
def _get_next_levelno(self):
From e14f3afaf75ba6af76a51211c79949b7a8a8e77e Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:12:18 +0300
Subject: [PATCH 3/6] Update product_template.py
---
odex25_sales/dev_membership/models/product_template.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/odex25_sales/dev_membership/models/product_template.py b/odex25_sales/dev_membership/models/product_template.py
index e1bac225a..1a69f7a9b 100644
--- a/odex25_sales/dev_membership/models/product_template.py
+++ b/odex25_sales/dev_membership/models/product_template.py
@@ -16,6 +16,8 @@ class ProductTemplate(models.Model):
type_no = fields.Char("Number", default=lambda self: self._get_next_projectno(), tracking=True,copy=False)
sequence_no = fields.Integer(string="Sequence", help="Define the display order")
+ company_id = fields.Many2one('res.company', string='Company', readonly=True,
+ default=lambda self: self.env.company)
@api.model
def _get_next_projectno(self):
From 3c0c6b9d4ba5a50e36d6cd336785459de1d92e0a Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:13:36 +0300
Subject: [PATCH 4/6] Update membership_level.xml
---
odex25_sales/dev_membership/views/membership_level.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/odex25_sales/dev_membership/views/membership_level.xml b/odex25_sales/dev_membership/views/membership_level.xml
index df6031bec..90cd395b1 100644
--- a/odex25_sales/dev_membership/views/membership_level.xml
+++ b/odex25_sales/dev_membership/views/membership_level.xml
@@ -10,6 +10,8 @@
+
+
@@ -25,6 +27,8 @@
+
+
From b010d7f7fddd9ba48b06e6eeb4ace5ad546a32a0 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:14:35 +0300
Subject: [PATCH 5/6] Update res_config_settings.xml
---
odex25_sales/dev_membership/views/res_config_settings.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/odex25_sales/dev_membership/views/res_config_settings.xml b/odex25_sales/dev_membership/views/res_config_settings.xml
index c5b9e39d5..32cdcac98 100644
--- a/odex25_sales/dev_membership/views/res_config_settings.xml
+++ b/odex25_sales/dev_membership/views/res_config_settings.xml
@@ -117,6 +117,8 @@
+
+
From a77fb20979f52774b950ea8d005edbbe587ab678 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:15:25 +0300
Subject: [PATCH 6/6] Update product_template.xml
---
odex25_sales/dev_membership/views/product_template.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/odex25_sales/dev_membership/views/product_template.xml b/odex25_sales/dev_membership/views/product_template.xml
index f7175f1a7..aa60230dc 100644
--- a/odex25_sales/dev_membership/views/product_template.xml
+++ b/odex25_sales/dev_membership/views/product_template.xml
@@ -6,8 +6,8 @@
product.template
+
-
@@ -51,6 +51,7 @@
+