Merge pull request #5325 from expsa/ket_dev_odex25_ensan
[IMP] odex_benefit: IMP benefit
This commit is contained in:
kchyounes19
GitHub
commit
0ced8d2a5a
|
|
@ -1466,6 +1466,7 @@ msgstr "موافقة رئيس العمليات"
|
|||
#: model_terms:ir.ui.view,arch_db:odex_benefit.benefit_food_surplus_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.changes_requests_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_tree
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.view_benefit_category_form
|
||||
msgid "Approve"
|
||||
|
|
@ -3105,6 +3106,7 @@ msgstr "مؤسسات تشير إلي شركاء"
|
|||
#: model:ir.model.fields,field_description:odex_benefit.field_benefits_representative__company_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_external_benefits__company_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__company_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__company_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_seasonal_service__company_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__company_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__company_id
|
||||
|
|
@ -3824,6 +3826,7 @@ msgstr "حد الائتمان"
|
|||
#: model:ir.model.fields,field_description:odex_benefit.field_payment_collection_line__currency_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_receive_benefit_loans__currency_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__currency_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__currency_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__currency_id
|
||||
msgid "Currency"
|
||||
msgstr "العملة"
|
||||
|
|
@ -9693,6 +9696,8 @@ msgstr "رقم الزيارة"
|
|||
#: model_terms:ir.ui.view,arch_db:odex_benefit.external_request_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_tree
|
||||
msgid "Refuse"
|
||||
msgstr "رفض"
|
||||
|
||||
|
|
@ -10109,6 +10114,7 @@ msgstr "الاخصائي الاجتماعي"
|
|||
|
||||
#. module: odex_benefit
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_tree
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.view_confirm_benefit_expense_form
|
||||
msgid "Reset"
|
||||
|
|
@ -16958,6 +16964,7 @@ msgstr "طلبات الخدمة التالية لا تستوفي الشروط:\n
|
|||
|
||||
#. module: odex_benefit
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_tree
|
||||
msgid "Manager approval"
|
||||
msgstr "موافقة المسؤول"
|
||||
|
||||
|
|
@ -17037,11 +17044,13 @@ msgstr "طريقة الدفع"
|
|||
|
||||
#. module: odex_benefit
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_tree
|
||||
msgid "Create Entry"
|
||||
msgstr "إنشاء قيد"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_tree
|
||||
msgid "Deposit Completed"
|
||||
msgstr "اكتمل الإيداع"
|
||||
|
||||
|
|
@ -17050,3 +17059,18 @@ msgstr "اكتمل الإيداع"
|
|||
msgid "Payment State"
|
||||
msgstr "حالة أمر الدفع"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_family_validation_setting__payment_journal_id
|
||||
msgid "Payment Journal"
|
||||
msgstr "دفتر اليومية للدفع"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_payment_orders__total_amount
|
||||
msgid "Total Amount"
|
||||
msgstr "إجمالي المبلغ"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: code:addons/odex_benefit/models/payment_order.py:0
|
||||
#, python-format
|
||||
msgid "Please select a journal before creating the entry."
|
||||
msgstr "يرجى اختيار دفتر اليومية قبل إنشاء القيد."
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
from odoo import fields, models, api, _
|
||||
from stdnum.au.acn import to_abn
|
||||
from odoo.exceptions import ValidationError
|
||||
from odoo.exceptions import ValidationError,UserError
|
||||
|
||||
|
||||
class PaymentOrders(models.Model):
|
||||
|
|
@ -38,7 +38,7 @@ class PaymentOrders(models.Model):
|
|||
('refused', 'Refused')], default='draft', tracking=True)
|
||||
is_seasonal = fields.Boolean(string='Is Seasonal Service?')
|
||||
journal_id = fields.Many2one(comodel_name='account.journal', string="Journal", copy=False,
|
||||
domain="[('type','in',['cash','bank'])]", required=True, default=_default_journal)
|
||||
domain="[('type','in',['cash','bank'])]", default=_default_journal)
|
||||
type = fields.Selection(
|
||||
selection=[
|
||||
('services', 'Services'),
|
||||
|
|
@ -78,6 +78,8 @@ class PaymentOrders(models.Model):
|
|||
|
||||
def create_entry(self):
|
||||
for rec in self:
|
||||
if not rec.journal_id:
|
||||
raise UserError(_("Please select a journal before creating the entry."))
|
||||
line_ids = rec.get_lines()
|
||||
move_vals = {
|
||||
'journal_id': rec.journal_id.id,
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@
|
|||
<group>
|
||||
<field name="payment_order_date" readonly="1"/>
|
||||
<field name="type" readonly="1"/>
|
||||
<field name="accountant_id"/>
|
||||
<field name="journal_id"/>
|
||||
<field name="accountant_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
|
||||
<field name="journal_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="payment_order_description" readonly="1"/>
|
||||
|
|
@ -157,12 +157,50 @@
|
|||
<field name="total_amount" widget="monetary" decoration-bf="1"
|
||||
options="{'currency_field': 'currency_id'}"/>
|
||||
<field name="type"/>
|
||||
<field name="move_id" invisible="1"/>
|
||||
<field name="state"
|
||||
widget="badge"
|
||||
decoration-info="state == 'draft'"
|
||||
decoration-warning="state not in ['draft','done']"
|
||||
decoration-success="state == 'done'"
|
||||
/>
|
||||
<button name="action_manager_approval" type="object" states="draft"
|
||||
string="Manager approval" class="oe_highlight"/>
|
||||
|
||||
<button name="action_head_approval" type="object"
|
||||
states="waiting_head"
|
||||
string="Approve" class="oe_highlight"/>
|
||||
<button name="action_reset_to_draft" type="object"
|
||||
states="waiting_head"
|
||||
string="Reset" class="btn btn-warning"/>
|
||||
|
||||
<button name="action_finance_approval" type="object"
|
||||
states="waiting_finance"
|
||||
string="Approve" class="oe_highlight"/>
|
||||
<button name="action_reset_to_draft" type="object"
|
||||
states="waiting_finance"
|
||||
string="Reset" class="btn btn-warning"/>
|
||||
|
||||
<button name="action_gm_approval" type="object"
|
||||
states="waiting_gm"
|
||||
string="Approve" class="oe_highlight"/>
|
||||
<button name="action_reset_to_draft" type="object"
|
||||
states="waiting_gm"
|
||||
string="Reset" class="btn btn-warning"/>
|
||||
|
||||
<button name="create_entry" type="object"
|
||||
string="Create Entry" class="oe_highlight"
|
||||
attrs="{'invisible': ['|',('state','!=','waiting_deposit'),('move_id', '!=',False)]}"
|
||||
/>
|
||||
<button name="action_deposit" type="object"
|
||||
string="Deposit Completed" class="oe_highlight"
|
||||
attrs="{'invisible': ['|',('state','!=','waiting_deposit'),('move_id', '=',False)]}"
|
||||
/>
|
||||
|
||||
|
||||
<button name="action_refuse" type="object"
|
||||
states="draft"
|
||||
string="Refuse" class="btn btn-danger"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
Loading…
Reference in New Issue