From 22c3c1e1229c267f3335a17a0c5526b6f9b4de3b Mon Sep 17 00:00:00 2001 From: Abdurrahman Saber Date: Mon, 14 Jul 2025 14:37:06 +0300 Subject: [PATCH] [IMP] ensan_sale_management: change boolean to selection & add translation --- .../ensan_sale_management/i18n/ar_001.po | 573 ++++++++++++++++++ .../models/sale_order.py | 8 +- .../models/sale_report.py | 6 +- .../views/sale_order_views.xml | 2 +- 4 files changed, 581 insertions(+), 8 deletions(-) create mode 100644 odex25_donation/ensan_sale_management/i18n/ar_001.po diff --git a/odex25_donation/ensan_sale_management/i18n/ar_001.po b/odex25_donation/ensan_sale_management/i18n/ar_001.po new file mode 100644 index 000000000..2346f5ec3 --- /dev/null +++ b/odex25_donation/ensan_sale_management/i18n/ar_001.po @@ -0,0 +1,573 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * ensan_sale_management +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-07-14 11:31+0000\n" +"PO-Revision-Date: 2025-07-14 11:31+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: ensan_sale_management +#: code:addons/ensan_sale_management/models/product.py:0 +#, python-format +msgid " Days" +msgstr "" + +#. module: ensan_sale_management +#: code:addons/ensan_sale_management/models/product.py:0 +#, python-format +msgid " Month " +msgstr "" + +#. module: ensan_sale_management +#: code:addons/ensan_sale_management/models/product.py:0 +#, python-format +msgid " Year" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_needaction +msgid "Action Needed" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_res_config_settings +msgid "Affiliate Configuration Model" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__donated_amount +msgid "Amount" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__done_percentage +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__done_percentage +msgid "Amount Percentage " +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_attachment_count +msgid "Attachment Count" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__attachment_ids +msgid "Attachments" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__available_for_dedication +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__available_for_dedication +msgid "Available For Dedication" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__beneficiaries +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__beneficiaries +msgid "Beneficiaries" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__beneficiaries_been_supported +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__beneficiaries_been_supported +msgid "Beneficiaries Been Supported" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__done_beneficiaries_percentage +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__done_beneficiaries_percentage +msgid "Beneficiaries Percentage " +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__beneficiaries_residual +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__beneficiaries_residual +msgid "Beneficiaries Residual" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_res_config_settings__cart_recovery_sms_template +#: model:ir.model.fields,field_description:ensan_sale_management.field_website__cart_recovery_sms_template_id +msgid "Cart Recovery SMS" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__cart_recovery_sms_sent +msgid "Cart recovery sms already sent" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__donated_amount +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__donated_amount +msgid "Collected Amount" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__create_uid +msgid "Created by" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__create_date +msgid "Created on" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__display_name +msgid "Display Name" +msgstr "" + +#. module: ensan_sale_management +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.product_template_inherit_form +msgid "Donation" +msgstr "" + +#. module: ensan_sale_management +#: model:sms.template,name:ensan_sale_management.sms_template_data_donation +msgid "Donation Confirmed" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__donation_type +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__donation_type +msgid "Donation Type" +msgstr "" + +#. module: ensan_sale_management +#: model:sms.template,name:ensan_sale_management.sms_template_donors_data_donation +msgid "Donation on Behalf Confirmed" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__donators_ids +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.view_order_form +msgid "Donators" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__done_with_quick_donation +msgid "Done With Quick Donation" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__order_name +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_report__order_name +msgid "Donor Name" +msgstr "اسم المتبرع" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__order_mobile_number +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_report__order_mobile_number +msgid "Donor Number" +msgstr "رقم هاتف المتبرع" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__donor_type +msgid "Donor Type" +msgstr "تصنيف المتبرع" + +#. module: ensan_sale_management +#: model:ir.actions.server,name:ensan_sale_management.send_abandoned_cart_sms_remainder_ir_actions_server +#: model:ir.cron,cron_name:ensan_sale_management.send_abandoned_cart_sms_remainder +#: model:ir.cron,name:ensan_sale_management.send_abandoned_cart_sms_remainder +msgid "E-Commerce: Send Abandoned Cart SMS Remainder" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_line__extra_donators_ids +msgid "Extra Donators" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_report__donor_type +msgid "First Time Donation" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields.selection,name:ensan_sale_management.selection__product_template__donation_type__fixed_amount +msgid "Fixed Amount" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_follower_ids +msgid "Followers" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_channel_ids +msgid "Followers (Channels)" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_partner_ids +msgid "Followers (Partners)" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields.selection,name:ensan_sale_management.selection__product_template__donation_type__free_amount +msgid "Free Amount" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.filters,name:ensan_sale_management.sale_filter_first_receiver_name +#: model:ir.filters,name:ensan_sale_management.sale_report_filter_first_receiver_name +msgid "Group By Gift Receiver Name" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.filters,name:ensan_sale_management.sale_filter_first_receiver_number +#: model:ir.filters,name:ensan_sale_management.sale_report_filter_first_receiver_number +msgid "Group By Gift Receiver Number" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.filters,name:ensan_sale_management.sale_filter_order_name +#: model:ir.filters,name:ensan_sale_management.sale_report_filter_order_name +msgid "Group By Gift Sender Name" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.filters,name:ensan_sale_management.sale_filter_order_mobile_number +#: model:ir.filters,name:ensan_sale_management.sale_report_filter_order_mobile_number +msgid "Group By Gift Sender Number" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__id +msgid "ID" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__message_needaction +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__message_unread +msgid "If checked, new messages require your attention." +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__message_has_error +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__message_has_sms_error +msgid "If checked, some messages have a delivery error." +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__is_donation +msgid "Is Donation Product?" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__is_donation +msgid "Is Donation Variant?" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_is_follower +msgid "Is Follower" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__is_gift +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__is_gift +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__is_gift +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_line__is_gift +msgid "Is Gift Product?" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__is_quick_donation +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__is_quick_donation +msgid "Is Quick Donation?" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators____last_update +msgid "Last Modified on" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__write_date +msgid "Last Updated on" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__line_id +msgid "Line" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_main_attachment_id +msgid "Main Attachment" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_has_error +msgid "Message Delivery error" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_ids +msgid "Messages" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__donator_mobile_number +msgid "Mobile" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__donator_name +msgid "Name" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields.selection,name:ensan_sale_management.selection__sale_order__donor_type__new +msgid "New" +msgstr "جديد" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__number_of_donations +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__number_of_donations +msgid "Number Of Donation" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_needaction_counter +msgid "Number of Actions" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_has_error_counter +msgid "Number of errors" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__message_needaction_counter +msgid "Number of messages which requires an action" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__message_has_error_counter +msgid "Number of messages with delivery error" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__message_unread_counter +msgid "Number of unread messages" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_report__is_gift +msgid "Order Contains Gift" +msgstr "" + +#. module: ensan_sale_management +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.sale_report_view_search_website +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.view_order_form +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.view_sales_order_filter +msgid "Order Contains Gift?" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_phone_validation_mixin +msgid "Phone Validation Mixin" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_product_product +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__product_id +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__product_ids +msgid "Product" +msgstr "المنتج" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_product_template +msgid "Product Template" +msgstr "قالب المنتج" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__quick_donation_only +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__quick_donation_only +msgid "Quick Donation Only" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__reason +msgid "Reason/Justification" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__first_receiver_name +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_report__first_receiver_name +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.sale_report_view_search_website +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.view_sales_order_filter +msgid "Receiver Name" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__first_receiver_number +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_report__first_receiver_number +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.sale_report_view_search_website +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.view_sales_order_filter +msgid "Receiver Number" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__remaining_amount +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__remaining_amount +msgid "Remaining Amount" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_res_partner +msgid "Renter" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields.selection,name:ensan_sale_management.selection__sale_order__donor_type__returning +msgid "Returning" +msgstr "عائد" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_has_sms_error +msgid "SMS Delivery error" +msgstr "" + +#. module: ensan_sale_management +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.res_config_settings_view_form +msgid "SMS Template" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__sale_id +msgid "Sale Order" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order__sale_order_portal_url +msgid "Sale Order Url" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_sale_report +msgid "Sales Analysis Report" +msgstr "تقرير المبيعات التحليلي" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_sale_order +msgid "Sales Order" +msgstr "أمر البيع" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_sale_order_line +msgid "Sales Order Line" +msgstr "بند أمر المبيعات" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_sms_composer +msgid "Send SMS Wizard" +msgstr "معالج إرسال الرسائل النصية القصيرة " + +#. module: ensan_sale_management +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.sale_order_form_add_sms_remainder +msgid "Send a Recovery SMS" +msgstr "" + +#. module: ensan_sale_management +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.sale_report_view_search_website +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.view_sales_order_filter +msgid "Sender Name" +msgstr "" + +#. module: ensan_sale_management +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.sale_report_view_search_website +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.view_sales_order_filter +msgid "Sender Number" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_product__target_amount +#: model:ir.model.fields,field_description:ensan_sale_management.field_product_template__target_amount +msgid "Target Amount" +msgstr "" + +#. module: ensan_sale_management +#: code:addons/ensan_sale_management/models/sale_order.py:0 +#, python-format +msgid "There is no phone number for this cart." +msgstr "" + +#. module: ensan_sale_management +#: code:addons/ensan_sale_management/models/sale_order.py:0 +#, python-format +msgid "There is no sms template defined in settings for abandoned carts." +msgstr "" + +#. module: ensan_sale_management +#: model_terms:ir.ui.view,arch_db:ensan_sale_management.res_config_settings_view_form +msgid "This email template is required when you send a recovery sms." +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_unread +msgid "Unread Messages" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__message_unread_counter +msgid "Unread Messages Counter" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.actions.server,name:ensan_sale_management.product_template_update_remaining_amount_ir_actions_server +#: model:ir.cron,cron_name:ensan_sale_management.product_template_update_remaining_amount +#: model:ir.cron,name:ensan_sale_management.product_template_update_remaining_amount +msgid "Update product remaining amounts" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_website +msgid "Website" +msgstr "الموقع الإلكتروني" + +#. module: ensan_sale_management +#: model:ir.model.fields,field_description:ensan_sale_management.field_sale_order_extra_donators__website_message_ids +msgid "Website Messages" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model.fields,help:ensan_sale_management.field_sale_order_extra_donators__website_message_ids +msgid "Website communication history" +msgstr "" + +#. module: ensan_sale_management +#: model:ir.model,name:ensan_sale_management.model_sale_order_extra_donators +msgid "sale.order.extra_donators" +msgstr "" + +#. module: ensan_sale_management +#: model:sms.template,body:ensan_sale_management.sms_template_donors_data_donation +msgid "" +"بكل الود أهديك تبرع عبر منصة إنسان لمشروع: {{object.product_id.name}} من : " +"{{object.sale_id.order_name}}" +msgstr "" + +#. module: ensan_sale_management +#: model:sms.template,body:ensan_sale_management.sms_template_data_donation +msgid "" +"عطاؤكم أثرٌ يبقى .. بلّغكم الله مرافقة النبي صلى الله عليه وسلم في " +"الجنة.سند التبرع:${'%s%s' % (object.get_base_url() , " +"object.get_portal_url())}" +msgstr "" \ No newline at end of file diff --git a/odex25_donation/ensan_sale_management/models/sale_order.py b/odex25_donation/ensan_sale_management/models/sale_order.py index 1e0c922e8..2cfac9dc8 100644 --- a/odex25_donation/ensan_sale_management/models/sale_order.py +++ b/odex25_donation/ensan_sale_management/models/sale_order.py @@ -16,7 +16,7 @@ class SaleOrder(models.Model): first_receiver_number = fields.Char("Receiver Number", compute="_compute_receiver_details", store=True) first_receiver_name = fields.Char("Receiver Name", compute="_compute_receiver_details", store=True) cart_recovery_sms_sent = fields.Boolean('Cart recovery sms already sent') - is_first_time = fields.Boolean('First Time Donation') + donor_type = fields.Selection([('new', 'New'), ('returning', 'Returning')]) def write(self, vals): if 'order_mobile_number' in vals: @@ -24,10 +24,10 @@ class SaleOrder(models.Model): orders = self.search([('state', '=', 'sale'), ('id', 'not in', self.ids)]) numbers = set(orders.mapped('order_mobile_number')) if vals['order_mobile_number'] in numbers: - vals['is_first_time'] = False - self |= orders.filtered(lambda o: o.order_mobile_number == vals['order_mobile_number']) + vals['donor_type'] = 'returning' + orders.filtered(lambda o: o.order_mobile_number == vals['order_mobile_number']).write({'donor_type': 'returning'}) else: - vals['is_first_time'] = True + vals['donor_type'] = 'new' return super(SaleOrder, self).write(vals) def get_sale_order_portal_url(self): diff --git a/odex25_donation/ensan_sale_management/models/sale_report.py b/odex25_donation/ensan_sale_management/models/sale_report.py index 887851922..f14b08550 100644 --- a/odex25_donation/ensan_sale_management/models/sale_report.py +++ b/odex25_donation/ensan_sale_management/models/sale_report.py @@ -10,7 +10,7 @@ class SaleReport(models.Model): first_receiver_name = fields.Char("Receiver Name", readonly=True) order_mobile_number = fields.Char("Donor Number", readonly=True) order_name = fields.Char("Donor Name", readonly=True) - is_first_time = fields.Boolean("First Time Donation", readonly=True) + donor_type = fields.Boolean("First Time Donation", readonly=True) def _select_additional_fields(self, fields): fields['is_gift'] = ", s.is_gift" @@ -18,11 +18,11 @@ class SaleReport(models.Model): fields['first_receiver_name'] = ", s.first_receiver_name" fields['order_mobile_number'] = ", s.order_mobile_number" fields['order_name'] = ", s.order_name" - fields['is_first_time'] = ", s.is_first_time" + fields['donor_type'] = ", s.donor_type" return super()._select_additional_fields(fields) def _group_by_sale(self, groupby=''): res = super()._group_by_sale(groupby) - res += """, s.is_gift, s.first_receiver_number,s.first_receiver_name,s.order_mobile_number,s.order_name,s.is_first_time""" + res += """, s.is_gift, s.first_receiver_number,s.first_receiver_name,s.order_mobile_number,s.order_name,s.donor_type""" return res \ No newline at end of file diff --git a/odex25_donation/ensan_sale_management/views/sale_order_views.xml b/odex25_donation/ensan_sale_management/views/sale_order_views.xml index b95de3dde..a59fd511b 100644 --- a/odex25_donation/ensan_sale_management/views/sale_order_views.xml +++ b/odex25_donation/ensan_sale_management/views/sale_order_views.xml @@ -9,7 +9,7 @@ - +