From a59d437f319e1ac55ab6400d352e79ee93ddefd6 Mon Sep 17 00:00:00 2001
From: zainab8585 <zeinabeng900@gmail.com>
Date: Wed, 3 Jul 2024 11:23:32 +0200
Subject: [PATCH] [ADD]ADD new custom editing in dev_membership

---
 odex25_sales/dev_membership/__manifest__.py   |   2 +-
 odex25_sales/dev_membership/i18n/ar_001.po    | 867 ++++++++++++++++++
 .../dev_membership/models/product_template.py |  20 +-
 .../models/res_config_settings.py             |  55 +-
 .../dev_membership/views/product_template.xml |  17 +-
 .../views/res_config_settings.xml             |  96 +-
 6 files changed, 1039 insertions(+), 18 deletions(-)
 create mode 100644 odex25_sales/dev_membership/i18n/ar_001.po

diff --git a/odex25_sales/dev_membership/__manifest__.py b/odex25_sales/dev_membership/__manifest__.py
index 6ba49b6bf..0bf562f66 100644
--- a/odex25_sales/dev_membership/__manifest__.py
+++ b/odex25_sales/dev_membership/__manifest__.py
@@ -63,7 +63,7 @@ odoo app manage Membership subscription plans, odoo membership memeber, odoo mem
 
     """,
     'summary': 'odoo app manage Membership subscription plans, odoo membership memeber, odoo member list, subscription renew, membership renew, member engagement, member expiry, membership recuring plans, membership billing, subscription expiry, subscription tracking, subscription methods and fees, membership list',
-    'depends': ['sale_management'],
+    'depends': ['sale_management','survey'],
     'data': [
         'security/security.xml',
         'security/ir.model.access.csv',
diff --git a/odex25_sales/dev_membership/i18n/ar_001.po b/odex25_sales/dev_membership/i18n/ar_001.po
new file mode 100644
index 000000000..00b18b56e
--- /dev/null
+++ b/odex25_sales/dev_membership/i18n/ar_001.po
@@ -0,0 +1,867 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* dev_membership
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-07-01 17:35+0000\n"
+"PO-Revision-Date: 2024-07-01 17:35+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: dev_membership
+#: model:mail.template,body_html:dev_membership.dev_membership_expired_mail_template
+msgid ""
+"\n"
+"               \t<p>Hello ${object.partner_id.name},</p>\n"
+"               \t<p>Hope you doing well!</p>\n"
+"               \t<p>Your membership <b>${(object.name)}</b> was expired on <b>${object.datetime_convert()}</b> date.</p>\n"
+"                "
+msgstr ""
+"\n"
+"               \t<p>مرحبا ${object.partner_id.name},</p>\n"
+"               \t<p>آمل أنك تبلي حسنا!</p>\n"
+"               \t<p>عضويتك <b>${(object.name)}</b> لقد انتهت في <b>${object.datetime_convert()}</b> date.</p>\n"
+"     "
+
+#. module: dev_membership
+#: model:mail.template,body_html:dev_membership.dev_membership_expire_reminder_mail_template
+msgid ""
+"\n"
+"               \t<p>Hello ${object.partner_id.name}.</p>\n"
+"               \t<p>Hope you doing well!</p>\n"
+"               \t<p>It's gentle reminder that your membership is about to expire on ${object.datetime_convert()}.</p>\n"
+"                "
+msgstr ""
+
+#. module: dev_membership
+#: model:mail.template,report_name:dev_membership.template_membership
+msgid "${(object.name)}_Membership"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.main_membership_card
+msgid "<b>Description</b>"
+msgstr "<b>الوصف</b>"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.main_membership_card
+msgid "<b>Fees</b>"
+msgstr "<b>رسوم الاشتراك</b>"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.main_membership_card
+msgid "<b>From</b>"
+msgstr "<b>من</b>"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.main_membership_card
+msgid "<b>Member</b>"
+msgstr "<b>العضو</b>"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.main_membership_card
+msgid "<b>Membership</b>"
+msgstr "<b>العضوية</b>"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.main_membership_card
+msgid "<b>To</b>"
+msgstr "<b>إلي</b>"
+
+#. module: dev_membership
+#: model:mail.template,body_html:dev_membership.template_membership
+msgid ""
+"<div style=\"font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+"                <h3>Hello ${object.partner_id.name},</h3>\n"
+"                <p>Your <b>${object.product_id.name}</b> membership of amount <b>${object.membership_fees}</b> have activated on <b>${object.from_date}</b> - <b>${object.to_date}</b> . </p>\n"
+"                <br/>\n"
+"                <br/>\n"
+"                <br/>\n"
+"                <p>Regards,</p>\n"
+"                <p>${object.company_id.name}</p>\n"
+"            </div>\n"
+"        "
+msgstr ""
+"<div style=\"font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+"                <h3>مرحبا ${object.partner_id.name},</h3>\n"
+"                <p>Your <b>${object.product_id.name}</b> رسوم الاشتراك <b>${object.membership_fees}</b> تم تفعيلها <b>${object.from_date}</b> - <b>${object.to_date}</b> . </p>\n"
+"                <br/>\n"
+"                <br/>\n"
+"                <br/>\n"
+"                <p>تحياتي,</p>\n"
+"                <p>${object.company_id.name}</p>\n"
+"            </div>\n"
+"        "
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "<span class=\"o_form_label\">Membership Expire Reminder</span>"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "<span class=\"o_stat_text\">Invoice</span>"
+msgstr "<span class=\"o_stat_text\">الفاتورة</span>"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_res_partner_memeber_form
+msgid "<span class=\"o_stat_text\">Membership</span>"
+msgstr "<span class=\"o_stat_text\">العضوية</span>"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__dev_membership__state__active
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "Active"
+msgstr "نشط"
+
+#. module: dev_membership
+#: model:ir.actions.act_window,name:dev_membership.action_active_membership
+#: model:ir.ui.menu,name:dev_membership.menu_active_membership
+msgid "Active Memberships"
+msgstr "العضويات النشطة"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.actions.server,name:dev_membership.cron_membership_auto_expire_ir_actions_server
+#: model:ir.cron,cron_name:dev_membership.cron_membership_auto_expire
+#: model:ir.cron,name:dev_membership.cron_membership_auto_expire
+msgid "Auto Expire Membership"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__dev_membership__state__cancel
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_renew_membership_form
+msgid "Cancel"
+msgstr "الغاء"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__company_id
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "Company"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model,name:dev_membership.model_res_config_settings
+msgid "Config Settings"
+msgstr "ضبط الاعدادات"
+
+#. module: dev_membership
+#: model:ir.ui.menu,name:dev_membership.menu_configuration_root
+msgid "Configuration"
+msgstr "الاعدادات"
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__dev_membership__state__confirm
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Confirm"
+msgstr "تاكيد"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Create Invoice"
+msgstr "انشاء فاتورة"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__create_uid
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__create_date
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__product_template__interval__days
+#: model:ir.model.fields.selection,name:dev_membership.selection__renew_membership__interval__days
+msgid "Days"
+msgstr "ايام"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_res_config_settings__days_before
+msgid "Days Before"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__description
+msgid "Description"
+msgstr "الوصف"
+
+#. module: dev_membership
+#: model:ir.model,name:dev_membership.model_dev_membership
+msgid "Dev Membership"
+msgstr "العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Dev Membership Form View"
+msgstr "العضويات"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_tree
+msgid "Dev Membership Tree View"
+msgstr "العضويات"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__display_name
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__display_name
+#: model:ir.model.fields,field_description:dev_membership.field_report_dev_membership_membership_card__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__dev_membership__state__draft
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__duration
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__duration
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__duration
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__duration
+msgid "Duration"
+msgstr "الفترة"
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__dev_membership__state__expire
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "Expire"
+msgstr "منتهي"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__membership_id
+#: model:ir.model.fields,field_description:dev_membership.field_res_partner__is_membership_expire
+#: model:ir.model.fields,field_description:dev_membership.field_res_users__is_membership_expire
+msgid "Expire Membership"
+msgstr "انتهاء العضوية"
+
+#. module: dev_membership
+#: model:ir.actions.act_window,name:dev_membership.action_expire_membership
+#: model:ir.ui.menu,name:dev_membership.menu_expire_membership
+msgid "Expire Memberships"
+msgstr "العضويات المنتهية"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "Group by"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__id
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__id
+#: model:ir.model.fields,field_description:dev_membership.field_report_dev_membership_membership_card__id
+msgid "ID"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__message_needaction
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__message_has_error
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__interval
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__interval
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__interval
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__interval
+msgid "Interval"
+msgstr "الفترة"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__invoice_id
+msgid "Invoice"
+msgstr "الفاتورة"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_res_partner__is_member
+#: model:ir.model.fields,field_description:dev_membership.field_res_users__is_member
+msgid "Is Member"
+msgstr "عضو"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__is_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__is_membership
+msgid "Is Membership"
+msgstr "عضوية"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__from_date
+msgid "Join Date"
+msgstr "تاريخ الانضمام"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership____last_update
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership____last_update
+#: model:ir.model.fields,field_description:dev_membership.field_report_dev_membership_membership_card____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__write_uid
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__write_date
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: dev_membership
+#: model:res.groups,name:dev_membership.group_membership_manager
+msgid "Manager"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.actions.act_window,name:dev_membership.action_members
+msgid "Member"
+msgstr "العضو"
+
+#. module: dev_membership
+#: model:ir.ui.menu,name:dev_membership.menu_members
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_res_partner_member_tree
+msgid "Members"
+msgstr "اﻷعضاء"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__product_id
+#: model:ir.model.fields,field_description:dev_membership.field_res_partner__active_membership_id
+#: model:ir.model.fields,field_description:dev_membership.field_res_users__active_membership_id
+#: model:ir.module.category,name:dev_membership.membership_category
+#: model:ir.ui.menu,name:dev_membership.menu_membership_main
+#: model:ir.ui.menu,name:dev_membership.menu_membership_root
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_kanban
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_renew_membership_form
+msgid "Membership"
+msgstr "العضوية"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__membership_count
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__membership_count
+#: model:ir.model.fields,field_description:dev_membership.field_res_partner__membership_count
+#: model:ir.model.fields,field_description:dev_membership.field_res_users__membership_count
+msgid "Membership Count"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Membership Date"
+msgstr "تاريخ العضوية"
+
+#. module: dev_membership
+#: model:mail.template,subject:dev_membership.template_membership
+msgid "Membership Detail"
+msgstr "تفاصيل العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Membership Duration"
+msgstr "فترة العضوية"
+
+#. module: dev_membership
+#: model:mail.template,subject:dev_membership.dev_membership_expire_reminder_mail_template
+msgid "Membership Expire Reminder"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__membership_fees
+#: model:ir.model.fields,field_description:dev_membership.field_renew_membership__membership_fees
+msgid "Membership Fees"
+msgstr "رسوم الاشتراك"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__from_date
+msgid "Membership From Date"
+msgstr "تاريخ اﻷنضمام"
+
+#. module: dev_membership
+#: code:addons/dev_membership/models/dev_membership.py:0
+#, python-format
+msgid ""
+"Membership Invoice is not paid.\n"
+"Please Paid membership invoice and active the membership."
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.actions.act_window,name:dev_membership.action_membership_pro
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__product_id
+#: model:ir.ui.menu,name:dev_membership.menu_membership
+msgid "Membership Product"
+msgstr "انواع العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
+msgid "Membership Product Form View"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.tree_membership_product
+msgid "Membership Product Tree View"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.main_membership_card
+msgid "Membership Receipt"
+msgstr "ايصال عضوية"
+
+#. module: dev_membership
+#: model:ir.actions.server,name:dev_membership.cron_dev_membership_reminder_ir_actions_server
+#: model:ir.cron,cron_name:dev_membership.cron_dev_membership_reminder
+#: model:ir.cron,name:dev_membership.cron_dev_membership_reminder
+msgid "Membership Reminder"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model,name:dev_membership.model_report_dev_membership_membership_card
+msgid "Membership Report"
+msgstr "تقرير العضوية"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_res_partner__memebership_status
+#: model:ir.model.fields,field_description:dev_membership.field_res_users__memebership_status
+msgid "Membership Status"
+msgstr "حالة العضوية"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__to_date
+msgid "Membership To Date"
+msgstr "تاريخ نهاية العضوية"
+
+#. module: dev_membership
+#: model:ir.actions.act_window,name:dev_membership.action_dev_membership
+#: model:ir.ui.menu,name:dev_membership.menu_membership1
+msgid "Memberships"
+msgstr "العضويات"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__product_template__interval__month
+#: model:ir.model.fields.selection,name:dev_membership.selection__renew_membership__interval__month
+msgid "Month"
+msgstr "شهر"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__name
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_res_partner_member_tree
+msgid "Name"
+msgstr "رقم العضوية"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_res_partner_memeber_form
+msgid "Other Details"
+msgstr "تفاصيل اخري"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__partner_id
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "Partner"
+msgstr "العضو"
+
+#. module: dev_membership
+#: code:addons/dev_membership/models/dev_membership.py:0
+#, python-format
+msgid "Please Create Membership Invoice"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
+msgid "Price"
+msgstr "رسوم الاشتراك"
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__membership_fees
+msgid "Price at which the product is sold to customers."
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.actions.report,name:dev_membership.menu_print_membership
+msgid "Print Membership"
+msgstr "طباعة العضوية"
+
+#. module: dev_membership
+#: model:ir.model,name:dev_membership.model_product_product
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "Product"
+msgstr "العضوية"
+
+#. module: dev_membership
+#: model:ir.model,name:dev_membership.model_product_template
+msgid "Product Template"
+msgstr "قالب المنتج"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__reason
+msgid "Reason/Justification"
+msgstr "الاسباب/ المبررات"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_renew_membership_form
+msgid "Renew"
+msgstr "تجديد"
+
+#. module: dev_membership
+#: model:ir.actions.act_window,name:dev_membership.action_renew_membership
+#: model:ir.model,name:dev_membership.model_renew_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__membership_id
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Renew Membership"
+msgstr "تجديد العضوية"
+
+#. module: dev_membership
+#: model:ir.model,name:dev_membership.model_res_partner
+msgid "Renter"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__date
+msgid "Request Date"
+msgstr "تاريخ الطلب"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_user_id
+msgid "Responsible User"
+msgstr "المسؤول"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__user_id
+msgid "Resposible"
+msgstr "المسؤول"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "SES"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Send by Mail"
+msgstr "ارسال بريد إلكتروني"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Set To Draft"
+msgstr "ارجاع لمسودة"
+
+#. module: dev_membership
+#: model:ir.actions.act_window,name:dev_membership.action_dev_membership_config_settings
+#: model:ir.ui.menu,name:dev_membership.menu_dev_membership_general_settings
+msgid "Settings"
+msgstr "الاعدادات"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__state
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_search
+msgid "State"
+msgstr "الحالة"
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
+msgid "Taxes"
+msgstr "الضرائب"
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: dev_membership
+#: model:res.groups,name:dev_membership.group_membership_user
+msgid "User"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields,help:dev_membership.field_dev_membership__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.model.fields.selection,name:dev_membership.selection__product_template__interval__year
+#: model:ir.model.fields.selection,name:dev_membership.selection__renew_membership__interval__year
+msgid "Year"
+msgstr "سنة"
+
+#. module: dev_membership
+#: code:addons/dev_membership/models/dev_membership.py:0
+#, python-format
+msgid "You already have a membership from '%s' to '%s' !!!!"
+msgstr ""
+
+#. module: dev_membership
+#: model:mail.template,subject:dev_membership.dev_membership_expired_mail_template
+msgid "Your membership ${(object.name)} Expired"
+msgstr ""
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.dev_res_partner_member_kanban_view
+msgid "at"
+msgstr "في"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__is_free
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__is_free
+msgid "Is Free"
+msgstr "مجاني"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__nominee
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__nominee
+msgid "Nominee"
+msgstr "الترشيح لعضوية مجلس الادارة"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__join_period
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__join_period
+msgid "Join Period"
+msgstr "فترة الانضمام"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__nationality_id
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__nationality_id
+msgid "Nationality"
+msgstr "الجنسية"
+
+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__age
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__age
+msgid "Age"
+msgstr "العمر"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
+msgid "Membership Terms"
+msgstr "شروط العضوية"
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
+msgid "Nomination for Membership"
+msgstr " الترشيح للعضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "<span class=\"o_form_label\">Membership Expire First Reminder</span>"
+msgstr "تذكير انتهاء العضوية الأول"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "Expire membership send reminder mail before days."
+msgstr "إرسال بريد تذكير بانتهاء العضوية قبل عدد الأيام"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "<span class=\"o_form_label\">Membership Expire Second Reminder</span>"
+msgstr "تذكير انتهاء العضوية الثاني"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "Expire membership send second reminder mail before days."
+msgstr "إرسال تذكير ثاني قبل انتهاء العضوية بعدد الأيام."
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "Membership Registration Evaluation."
+msgstr "تقييم تسجيل العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "<span class=\"o_form_label\">Membership Registration Evaluation</span>"
+msgstr "تقييم تسجيل العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "Membership Renewal Evaluation."
+msgstr "تقييم تجديد العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "<span class=\"o_form_label\">Membership Renewal Evaluation</span>"
+msgstr "تقييم تجديد العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid ""
+"<span class=\"o_form_label\">Membership Cancellation\".\n"
+"                                </span>"
+msgstr "إلغاء العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "Membership Cancellation"
+msgstr "إلغاء العضوية"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
+msgid "Membership Cancellation\"."
+msgstr "إلغاء العضوية"
diff --git a/odex25_sales/dev_membership/models/product_template.py b/odex25_sales/dev_membership/models/product_template.py
index a4eba9e0e..f2ec2bb45 100644
--- a/odex25_sales/dev_membership/models/product_template.py
+++ b/odex25_sales/dev_membership/models/product_template.py
@@ -8,7 +8,7 @@
 #
 ##############################################################################
 
-from odoo import fields, models
+from odoo import fields,api, models,_
 
 
 class ProductTemplate(models.Model):
@@ -38,8 +38,24 @@ class ProductTemplate(models.Model):
                                                                ('year', 'Year')]), default='month')
 
     membership_count = fields.Integer(string="Membership Count", compute="_get_membership_count")
+#     todo start
+#     add new fields
+    # New Fields
+    is_free = fields.Boolean(string="Is Free")
+    nominee = fields.Boolean(string="Nominee")
+    join_period = fields.Integer(string="Join Period")
+    nationality_id = fields.Many2one('res.country', string="Nationality")
+    age = fields.Integer(string="Age", default=18)
+    # Sale Description Override
 
-
+    @api.model
+    def default_get(self, fields):
+        res = super(ProductTemplate, self).default_get(fields)
+        company_nationality = self.env.user.company_id.country_id
+        if 'nationality_id' in fields and company_nationality:
+            res['nationality_id'] = company_nationality.id
+        return res
+# todo end
 class ProductProduct(models.Model):
     _inherit = "product.product"
 
diff --git a/odex25_sales/dev_membership/models/res_config_settings.py b/odex25_sales/dev_membership/models/res_config_settings.py
index b670c5c94..82ceceae9 100644
--- a/odex25_sales/dev_membership/models/res_config_settings.py
+++ b/odex25_sales/dev_membership/models/res_config_settings.py
@@ -1,10 +1,61 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 
 
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    days_before = fields.Integer(string='Days Before', config_parameter='dev_membership.days_before')
+    days_before = fields.Integer(
+        string='Days Before First Reminder',
+        config_parameter='dev_membership.days_before'
+    )
+
+    # Add new fields
+    days_before_second = fields.Integer(
+        string="Days Before Second Reminder",
+        config_parameter='dev_membership.days_before_second'
+    )
+
+    membership_registration_evaluation = fields.Boolean(
+        string="Evaluate Membership Registration",
+        default=True,
+        config_parameter='dev_membership.membership_registration_evaluation'
+    )
+
+    registration_evaluation_form = fields.Many2one(
+        'survey.survey',
+        string="Evaluation Form",
+        config_parameter='dev_membership.registration_evaluation_form'
+    )
+
+    membership_renewal_evaluation = fields.Boolean(
+        string="Evaluate Membership Renewal",
+        default=True,
+        config_parameter='dev_membership.membership_renewal_evaluation'
+    )
+
+    renewal_evaluation_form = fields.Many2one(
+        'survey.survey',
+        string="Evaluation Form",
+        config_parameter='dev_membership.renewal_evaluation_form'
+    )
+
+    post_expiry_period = fields.Integer(
+        string="Period After Expiry",
+        config_parameter='dev_membership.post_expiry_period'
+    )
+
+    cancellation_reason = fields.Many2one(
+        'cancellation.reason',
+        string="Cancellation Reason",
+        config_parameter='dev_membership.cancellation_reason'
+    )
+
+
+class CancellReason(models.Model):
+    _name = 'cancellation.reason'
+    _description = 'Cancellation Reason'
+
+    name = fields.Char(string='Name')
diff --git a/odex25_sales/dev_membership/views/product_template.xml b/odex25_sales/dev_membership/views/product_template.xml
index 185e251c3..abc18fb08 100644
--- a/odex25_sales/dev_membership/views/product_template.xml
+++ b/odex25_sales/dev_membership/views/product_template.xml
@@ -57,7 +57,8 @@
                                 <field name="interval"
                                        style="width: 49%; height:10%; padding-left:3px; font-size:14px;" required="1"/>
                             </div>
-                            <field name="list_price" string="Price"  required="1"/>
+                            <field name="is_free"/>
+                            <field attrs="{'invisible': [('is_free', '=', True)],'required':[(('is_free', '=', False))]}" name="list_price" string="Price"/>
                             <field name="property_account_income_id"/>
                             <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
                         </group>
@@ -67,7 +68,21 @@
                             <label for="description"/>
                         </h3>
                         <field name="description"/>
+                        <h3>
+                            Membership Terms
+                        </h3>
+                        <field name="description_sale"/>
                     </div>
+                    <group>
+                        <group string="Membership Terms">
+                            <field name="nationality_id"/>
+                            <field name="age"/>
+                        </group>
+                        <group string="Nomination for Membership">
+                            <field name="nominee"/>
+                            <field name="join_period" attrs="{'invisible': [('nominee', '=', False)]}"/>
+                        </group>
+                    </group>
                 </sheet>
             </form>
         </field>
diff --git a/odex25_sales/dev_membership/views/res_config_settings.xml b/odex25_sales/dev_membership/views/res_config_settings.xml
index bacd2ad8b..5a7959e23 100644
--- a/odex25_sales/dev_membership/views/res_config_settings.xml
+++ b/odex25_sales/dev_membership/views/res_config_settings.xml
@@ -6,21 +6,93 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block" data-string="Membership" data-key="dev_membership">
-                <h2>Membership</h2>
-                <div class="row mt16 o_settings_container" name="dev_membership_setting_container">
-                    <div class="col-12 col-lg-6 o_setting_box" id="late_fine">
-                        <div class="o_setting_left_pane"/>
-                        <div class="o_setting_right_pane">
-                            <span class="o_form_label">Membership Expire Reminder</span>
-                            <div class="text-muted">
-                                 Expire membership send reminder mail before days.
-                            </div>
-                            <div class="text-muted content-group mt16">
-                                <field name="days_before" class="text-left oe_inline"/>
+                <div class="app_settings_block" data-string="Membership Expiry Reminders" data-key="dev_membership">
+                    <h2>Membership Expiry Reminders</h2>
+                    <div class="row mt16 o_settings_container" name="dev_membership_setting_container">
+                        <div class="col-12 col-lg-6 o_setting_box" id="late_fine">
+                            <div class="o_setting_left_pane"/>
+                            <div class="o_setting_right_pane">
+                                <span class="o_form_label">Membership Expire First Reminder</span>
+                                <div class="text-muted">
+                                    Expire membership send reminder mail before days.
+                                </div>
+                                <div class="text-muted content-group mt16">
+                                    <field name="days_before" class="text-left oe_inline"/>
+                                </div>
                             </div>
                         </div>
+                        <!--                    todo start -->
+                        <!-- Second Reminder -->
+                        <div class="col-12 col-lg-6 o_setting_box" id="late_fine_second">
+                            <div class="o_setting_left_pane"/>
+                            <div class="o_setting_right_pane">
+                                <span class="o_form_label">Membership Expire Second Reminder</span>
+                                <div class="text-muted">
+                                    Expire membership send second reminder mail before days.
+                                </div>
+                                <div class="text-muted content-group mt16">
+                                    <field name="days_before_second" class="text-left oe_inline"/>
+                                </div>
+                            </div>
+                        </div>
+                        <!--                    todo end -->
                     </div>
+                </div>
+                <div class="app_settings_block" data-string="Member Experience Evaluation" data-key="dev_membership">
+                    <h2>Membership Experience Evaluation</h2>
+                    <div class="row mt16 o_settings_container" name="dev_membership_setting_container">
+                        <div class="col-12 col-lg-6 o_setting_box" id="late_reg">
+                            <div class="o_setting_left_pane"/>
+                            <div class="o_setting_right_pane">
+                                <span class="o_form_label">Membership Registration Evaluation</span>
+                                <div class="text-muted">
+                                    Membership Registration Evaluation.
+                                </div>
+                                <div class="text-muted content-group mt16">
+                                    <field name="membership_registration_evaluation" class="text-left oe_inline"/>
+                                    <field attrs="{'invisible': [('membership_registration_evaluation', '=', False)]}"
+                                           name="registration_evaluation_form" class="text-left oe_inline"/>
+                                </div>
+                            </div>
+                        </div>
+                        <!--                    todo start -->
+                        <!-- Second Reminder -->
+                        <div class="col-12 col-lg-6 o_setting_box" id="late_mem">
+                            <div class="o_setting_left_pane"/>
+                            <div class="o_setting_right_pane">
+                                <span class="o_form_label">Membership Renewal Evaluation</span>
+                                <div class="text-muted">
+                                    Membership Renewal Evaluation.
+                                </div>
+                                <div class="text-muted content-group mt16">
+                                    <field name="membership_renewal_evaluation" class="text-left oe_inline"/>
+                                    <field attrs="{'invisible': [('membership_renewal_evaluation', '=', False)]}"
+                                           name="renewal_evaluation_form" class="text-left oe_inline"/>
+                                </div>
+                            </div>
+                        </div>
+                        <!--                    todo end -->
+                    </div>
+                </div>
+                <div class="app_settings_block" data-string="Membership Cancellation" data-key="dev_membership">
+                    <h2>Membership Cancellation</h2>
+                    <div class="row mt16 o_settings_container" name="dev_membership_setting_container">
+                        <div class="col-12 col-lg-6 o_setting_box" id="late_cancellfine">
+                            <div class="o_setting_left_pane"/>
+                            <div class="o_setting_right_pane">
+                                <span class="o_form_label">Membership Cancellation".
+                                </span>
+                                <div class="text-muted">
+                                    Membership Cancellation".
+                                </div>
+                                <div class="text-muted content-group mt16">
+                                    <field name="post_expiry_period"/>
+                                </div>
+                                <div class="text-muted content-group mt16">
+                                    <field name="cancellation_reason"/>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </xpath>