Skip to content

Commit

Permalink
Merge pull request #136 from lalithkota/15.0-1.0-develop-merge
Browse files Browse the repository at this point in the history
Merge 15.0-1.0-develop into merge-branch
  • Loading branch information
shibu-narayanan authored Oct 26, 2023
2 parents c6043b1 + 107ef02 commit 628a932
Show file tree
Hide file tree
Showing 12 changed files with 840 additions and 618 deletions.
2 changes: 2 additions & 0 deletions g2p_programs/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
"l10n_generic_coa",
"event_sms",
"calendar",
"queue_job",
],
"data": [
"security/program_security.xml",
"security/ir.model.access.csv",
"security/registrant_rule.xml",
"data/sequences.xml",
"data/queue_data.xml",
"report/voucher_card.xml",
"report/report_format.xml",
"views/main_view.xml",
Expand Down
18 changes: 18 additions & 0 deletions g2p_programs/data/queue_data.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record model="queue.job.channel" id="channel_root_program">
<field name="name">root_program</field>
</record>
<record model="queue.job.channel" id="channel_cycle">
<field name="name">cycle</field>
<field name="parent_id" ref="channel_root_program" />
</record>
<record model="queue.job.channel" id="channel_eligibility_manager">
<field name="name">eligibility_manager</field>
<field name="parent_id" ref="channel_root_program" />
</record>
<record model="queue.job.channel" id="channel_program_manager">
<field name="name">program_manager</field>
<field name="parent_id" ref="channel_root_program" />
</record>
</odoo>
14 changes: 14 additions & 0 deletions g2p_programs/i18n/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ msgid "%s Beneficiaries duplicate."
msgstr "%s مستفيدين مكررين."

#. module: g2p_programs
#: code:addons/g2p_programs/models/managers/cycle_manager.py:0
#: code:addons/g2p_programs/models/managers/program_manager.py:0
#, python-format
msgid "%s Beneficiaries enrolled."
Expand Down Expand Up @@ -1423,12 +1424,14 @@ msgid "Eligibility Managers"
msgstr ""

#. module: g2p_programs
#: code:addons/g2p_programs/models/managers/cycle_manager.py:0
#: code:addons/g2p_programs/models/managers/program_manager.py:0
#, python-format
msgid "Eligibility check finished."
msgstr ""

#. module: g2p_programs
#: code:addons/g2p_programs/models/managers/cycle_manager.py:0
#: code:addons/g2p_programs/models/managers/program_manager.py:0
#, python-format
msgid "Eligibility check of %s beneficiaries started."
Expand Down Expand Up @@ -1996,6 +1999,11 @@ msgstr ""
msgid "Issued Transaction Statistics"
msgstr ""

#. module: g2p_programs
#: model:ir.model,name:g2p_programs.model_queue_job_channel
msgid "Job Channels"
msgstr ""

#. module: g2p_programs
#: model:ir.model,name:g2p_programs.model_job_relate_mixin
msgid "Job Relate Mixin"
Expand Down Expand Up @@ -2596,6 +2604,12 @@ msgstr ""
msgid "Paid Transactions Statistics"
msgstr ""

#. module: g2p_programs
#: code:addons/g2p_programs/models/queue_job_channel.py:0
#, python-format
msgid "Parent channel required."
msgstr ""

#. module: g2p_programs
#: model:ir.model.fields.selection,name:g2p_programs.selection__g2p_cycle_membership__state__paused
#: model:ir.model.fields.selection,name:g2p_programs.selection__g2p_program_membership__state__paused
Expand Down
Loading

0 comments on commit 628a932

Please sign in to comment.