Merge remote-tracking branch 'upstream/17.0-develop' into 17.0-develop

Signed-off-by: Lalith Kota <[email protected]>
OpenG2P · Sep 5, 2024 · cfe9b7e · cfe9b7e
2 parents 2671f5b + 590c024
commit cfe9b7e
Show file tree

Hide file tree

Showing 80 changed files with 1,874 additions and 1,560 deletions.
diff --git a/.github/auto-assign.yml b/.github/auto-assign.yml
diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml
diff --git a/g2p_entitlement_differential/__manifest__.py b/g2p_entitlement_differential/__manifest__.py
@@ -7,7 +7,7 @@
     "author": "OpenG2P",
     "website": "https://openg2p.org",
     "license": "LGPL-3",
-    "depends": ["g2p_entitlement_cash"],
+    "depends": ["spp_entitlement_cash"],
     "data": ["views/entitlement_manager_view.xml"],
     "demo": [],
     "assets": {},

diff --git a/g2p_entitlement_differential/i18n/g2p_entitlement_differential.pot b/g2p_entitlement_differential/i18n/g2p_entitlement_differential.pot
@@ -0,0 +1,40 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* g2p_entitlement_differential
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 17.0\n"
+"Report-Msgid-Bugs-To: \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: g2p_entitlement_differential
+#: model:ir.model,name:g2p_entitlement_differential.model_g2p_program_entitlement_manager_cash
+msgid "Cash Entitlement Manager"
+msgstr ""
+
+#. module: g2p_entitlement_differential
+#: model:ir.model,name:g2p_entitlement_differential.model_g2p_program_entitlement_manager_cash_item
+msgid "Cash Entitlement Manager Items"
+msgstr ""
+
+#. module: g2p_entitlement_differential
+#: model:ir.model.fields,field_description:g2p_entitlement_differential.field_g2p_program_entitlement_manager_cash__enable_inflation
+#: model_terms:ir.ui.view,arch_db:g2p_entitlement_differential.view_entitlement_manager_cash_form_diff_inherit
+msgid "Enable Inflation"
+msgstr ""
+
+#. module: g2p_entitlement_differential
+#: model:ir.model.fields,field_description:g2p_entitlement_differential.field_g2p_program_entitlement_manager_cash__inflation_rate
+msgid "Inflation Rate"
+msgstr ""
+
+#. module: g2p_entitlement_differential
+#: model:ir.model.fields,field_description:g2p_entitlement_differential.field_g2p_program_entitlement_manager_cash_item__name
+msgid "Name"
+msgstr ""
diff --git a/g2p_entitlement_differential/views/entitlement_manager_view.xml b/g2p_entitlement_differential/views/entitlement_manager_view.xml
@@ -7,7 +7,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
     <record id="view_entitlement_manager_cash_form_diff_inherit" model="ir.ui.view">
         <field name="name">view_entitlement_manager_cash_form_diff_inherit</field>
         <field name="model">g2p.program.entitlement.manager.cash</field>
-        <field name="inherit_id" ref="g2p_entitlement_cash.view_entitlement_manager_cash_form" />
+        <field name="inherit_id" ref="spp_entitlement_cash.view_entitlement_manager_cash_form" />
         <field name="priority">100</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='max_amount']" position="after">

diff --git a/g2p_entitlement_in_kind/i18n/g2p_entitlement_in_kind.pot b/g2p_entitlement_in_kind/i18n/g2p_entitlement_in_kind.pot
@@ -0,0 +1,13 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 17.0\n"
+"Report-Msgid-Bugs-To: \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"
diff --git a/g2p_entitlement_voucher/i18n/g2p_entitlement_voucher.pot b/g2p_entitlement_voucher/i18n/g2p_entitlement_voucher.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -43,6 +43,11 @@ msgstr ""
 msgid "Auto Generate Voucher On Approval"
 msgstr ""
 
+#. module: g2p_entitlement_voucher
+#: model:ir.model,name:g2p_entitlement_voucher.model_g2p_program_entitlement_manager
+msgid "Cash Entitlement Manager"
+msgstr ""
+
 #. module: g2p_entitlement_voucher
 #: model_terms:ir.actions.act_window,help:g2p_entitlement_voucher.action_entitlement_manager_voucher
 msgid "Click the create button to enter a new entitlement manager."
@@ -58,11 +63,6 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
-#. module: g2p_entitlement_voucher
-#: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_program_entitlement_manager_voucher__crypto_key_set
-msgid "Crypto Key Set"
-msgstr ""
-
 #. module: g2p_entitlement_voucher
 #: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_program_entitlement_manager_voucher__currency_id
 msgid "Currency"
@@ -74,26 +74,21 @@ msgid "Display Name"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
-#: model:ir.model,name:g2p_entitlement_voucher.model_g2p_entitlement
-#: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_payment_file_qrcode__entitlement_id
-msgid "Entitlement"
+#: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_program_entitlement_manager_voucher__encryption_provider_id
+msgid "Encryption Provider"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
-#: model:ir.model,name:g2p_entitlement_voucher.model_g2p_program_entitlement_manager
-msgid "Entitlement Manager"
+#: model:ir.model,name:g2p_entitlement_voucher.model_g2p_entitlement
+#: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_payment_file_qrcode__entitlement_id
+msgid "Entitlement"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
 #: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_program_entitlement_manager_voucher__entitlement_validation_group_id
 msgid "Entitlement Validation Group"
 msgstr ""
 
-#. module: g2p_entitlement_voucher
-#: model:ir.model,name:g2p_entitlement_voucher.model_g2p_crypto_key_set
-msgid "G2P Crypto Key Set"
-msgstr ""
-
 #. module: g2p_entitlement_voucher
 #: model_terms:ir.ui.view,arch_db:g2p_entitlement_voucher.view_entitlement_voucher_form
 msgid "Generate Voucher"
@@ -115,8 +110,8 @@ msgid "ID"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
-#: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_program_entitlement_manager_voucher____last_update
-msgid "Last Modified on"
+#: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_program_entitlement_manager_voucher__id_type
+msgid "ID Type to store in entitlements"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
@@ -140,6 +135,12 @@ msgid "Maximum number of individual in group"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
+#: model_terms:ir.ui.view,arch_db:g2p_entitlement_voucher.view_entitlement_manager_voucher_form
+msgid "Open voucher config form"
+msgstr ""
+
+#. module: g2p_entitlement_voucher
+#. odoo-python
 #: code:addons/g2p_entitlement_voucher/models/entitlement_manager.py:0
 #, python-format
 msgid "Payment File Config"
@@ -207,6 +208,7 @@ msgid "Transfer fee will be a percentage of amount"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
+#. odoo-python
 #: code:addons/g2p_entitlement_voucher/models/entitlement.py:0
 #: code:addons/g2p_entitlement_voucher/models/entitlement.py:0
 #, python-format
@@ -247,6 +249,11 @@ msgid "Voucher File Config"
 msgstr ""
 
 #. module: g2p_entitlement_voucher
-#: model:ir.model.fields,field_description:g2p_entitlement_voucher.field_g2p_crypto_key_set__voucher_manager_id
-msgid "Voucher Manager"
+#: model_terms:ir.ui.view,arch_db:g2p_entitlement_voucher.view_entitlement_voucher_form
+msgid "generate voucher action"
+msgstr ""
+
+#. module: g2p_entitlement_voucher
+#: model_terms:ir.ui.view,arch_db:g2p_entitlement_voucher.view_entitlement_voucher_form
+msgid "print voucher action"
 msgstr ""
diff --git a/g2p_payment_cash/i18n/g2p_payment_cash.pot b/g2p_payment_cash/i18n/g2p_payment_cash.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -30,7 +30,6 @@ msgstr ""
 
 #. module: g2p_payment_cash
 #: model:ir.model,name:g2p_payment_cash.model_g2p_program_payment_manager_cash
-#: model:ir.model.fields,field_description:g2p_payment_cash.field_g2p_crypto_key_set__cash_payment_manager_id
 #: model_terms:ir.ui.view,arch_db:g2p_payment_cash.view_payment_manager_cash_form
 msgid "Cash Payment Manager"
 msgstr ""
@@ -56,11 +55,6 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
-#. module: g2p_payment_cash
-#: model:ir.model.fields,field_description:g2p_payment_cash.field_g2p_program_payment_manager_cash__crypto_key_set
-msgid "Crypto Key Set"
-msgstr ""
-
 #. module: g2p_payment_cash
 #: model:ir.model.fields,field_description:g2p_payment_cash.field_g2p_program_payment_manager_cash__currency_id
 msgid "Currency"
@@ -71,12 +65,18 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: g2p_payment_cash
+#: model:ir.model.fields,field_description:g2p_payment_cash.field_g2p_program_payment_manager_cash__encryption_provider_id
+msgid "Encryption Provider"
+msgstr ""
+
 #. module: g2p_payment_cash
 #: model:ir.model,name:g2p_payment_cash.model_g2p_entitlement
 msgid "Entitlement"
 msgstr ""
 
 #. module: g2p_payment_cash
+#. odoo-python
 #: code:addons/g2p_payment_cash/models/entitlement.py:0
 #, python-format
 msgid "Entitlement is not approved!"
@@ -87,11 +87,6 @@ msgstr ""
 msgid "File Document Store"
 msgstr ""
 
-#. module: g2p_payment_cash
-#: model:ir.model,name:g2p_payment_cash.model_g2p_crypto_key_set
-msgid "G2P Crypto Key Set"
-msgstr ""
-
 #. module: g2p_payment_cash
 #: model_terms:ir.ui.view,arch_db:g2p_payment_cash.payment_manager_cash_filter
 msgid "Group By"
@@ -103,16 +98,12 @@ msgid "ID"
 msgstr ""
 
 #. module: g2p_payment_cash
+#. odoo-python
 #: code:addons/g2p_payment_cash/models/entitlement.py:0
 #, python-format
 msgid "Invalid operation!"
 msgstr ""
 
-#. module: g2p_payment_cash
-#: model:ir.model.fields,field_description:g2p_payment_cash.field_g2p_program_payment_manager_cash____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: g2p_payment_cash
 #: model:ir.model.fields,field_description:g2p_payment_cash.field_g2p_program_payment_manager_cash__write_uid
 msgid "Last Updated by"
@@ -129,6 +120,14 @@ msgid "Manager Name"
 msgstr ""
 
 #. module: g2p_payment_cash
+#. odoo-python
+#: code:addons/g2p_payment_cash/models/payment_manager.py:0
+#, python-format
+msgid "No payment batches to process."
+msgstr ""
+
+#. module: g2p_payment_cash
+#. odoo-python
 #: code:addons/g2p_payment_cash/models/entitlement.py:0
 #: code:addons/g2p_payment_cash/models/payment_manager.py:0
 #, python-format
@@ -146,12 +145,14 @@ msgid "Payment Manager"
 msgstr ""
 
 #. module: g2p_payment_cash
+#. odoo-python
 #: code:addons/g2p_payment_cash/models/payment_manager.py:0
 #, python-format
 msgid "Payment files created successfully"
 msgstr ""
 
 #. module: g2p_payment_cash
+#. odoo-python
 #: code:addons/g2p_payment_cash/models/entitlement.py:0
 #, python-format
 msgid "Payment was issued and sent."