Merge pull request #262 from expsa/zainab_sale

[UPDATE]UPDATE

odex25_sales/dev_membership/i18n/ar_001.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-17 05:38+0000\n"
+"POT-Creation-Date: 2024-07-18 09:58+0000\n"
-"PO-Revision-Date: 2024-07-17 05:38+0000\n"
+"PO-Revision-Date: 2024-07-18 09:58+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgstr ""
 msgid ""
 "<span class=\"o_form_label\">Membership Cancellation\".\n"
 "                                </span>"
-msgstr "إلغاء تلقائي للعضويات المنتهية بعد تجاوز المدة المحدده وعدم التجديد"
+msgstr "إلغاء العضوية"
 
 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
@@ -238,12 +238,16 @@ 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.membership_cancel_wizard_view_form
 #: 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_terms:ir.ui.view,arch_db:dev_membership.membership_cancel_wizard_view_form
+msgid "Cancel Membership"
+msgstr "إلغاء العضوية"
+
 #. module: dev_membership
 #: model:ir.actions.act_window,name:dev_membership.membership_request_cancel_wizard_action
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__cancel_reasone
@@ -504,6 +508,11 @@ msgstr ""
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.membership_cancel_wizard_view_form
+msgid "Ignore"
+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
@@ -797,7 +806,6 @@ msgstr ""
 
 #. module: dev_membership
 #: code:addons/dev_membership/models/dev_membership.py:0
-#: code:addons/dev_membership/models/dev_membership.py:0
 #: code:addons/dev_membership/wizard/renew_membership.py:0
 #: code:addons/dev_membership/wizard/renew_membership.py:0
 #: code:addons/dev_membership/wizard/renew_membership.py:0
@@ -857,7 +865,7 @@ msgstr ""
 #: 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 "سبب الالغاء"
+msgstr "رقم العضوية"
 
 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_product_product__nationality_ids
@@ -1030,11 +1038,6 @@ msgstr ""
 msgid "SMS Delivery error"
 msgstr ""
 
-#. module: dev_membership
-#: model_terms:ir.ui.view,arch_db:dev_membership.membership_cancel_wizard_view_form
-msgid "Save"
-msgstr ""
-
 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
 msgid "Send by Mail"

odex25_sales/dev_membership/models/dev_membership.py

@@ -52,20 +52,23 @@ class DevMembership(models.Model):
     @api.onchange('product_id')
     def _onchange_membership_type(self):
         if self.product_id:
-            self.membership_fees = self.product_id.list_price
+            if self.product_id.is_free:
+                self.membership_fees = 0
+            else:
+                self.membership_fees = self.product_id.list_price
             self.duration = (self.product_id.duration)
     @api.onchange('duration')
     def _onchange_duration(self):
         if self.duration and self.interval and self.membership_fees:
-           self.membership_fees = self.duration*self.membership_fees
+           self.membership_fees = self.duration*self.product_id.list_price
 
     @api.constrains('membership_fees')
     def _check_subscription_fee(self):
         for record in self:
-            if  record.product_id.duration==1 and record.membership_fees < record.product_id.list_price :
+            if  record.product_id.duration and record.membership_fees < record.product_id.list_price :
-                raise ValidationError(_('Membership fees cannot be less than the default value in Setting of membrship type.'))
-            elif record.product_id.duration>1 and  record.membership_fees*record.duration < record.product_id.list_price*record.duration :
                 raise ValidationError(_('Membership fees cannot be less than the default value in Setting of membrship type.'))
+            # elif record.product_id.duration>1 and  record.membership_fees*record.duration < record.product_id.list_price*record.duration :
+            #     raise ValidationError(_('Membership fees cannot be less than the default value in Setting of membrship type.'))
 
 
     @api.constrains('duration')

odex25_sales/dev_membership/wizard/cancel_membership.xml

@@ -11,8 +11,8 @@
 
                </group>
                 <footer>
-                    <button string='Save' name="request_cancel_reason" type="object" class="oe_highlight"/>
+                    <button string='Cancel Membership' name="request_cancel_reason" type="object" class="oe_highlight"/>
-                    <button string="Cancel" class="oe_link" special="cancel"/>
+                    <button string="Ignore" class="oe_link" special="cancel"/>
                 </footer>
            </form>
         </field>