Skip to content

Commit 5c84a01

Browse files
committed
Merge branch '17.0' into openspp-17.0.1.2.1
2 parents 388c7b2 + ef94974 commit 5c84a01

File tree

22 files changed

+199
-132
lines changed

22 files changed

+199
-132
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ assignees: ""
1313
- **Priority:** [High/Medium/Low]
1414
- **Dependencies:** [Other tasks, modules, etc.]
1515
- **Attachments:** [Screenshots, diagrams, etc.]
16+
17+
18+
🔔 Note: This ticket should address common considerations without including country-specific content. Please ensure all references are generic and applicable across various contexts.
19+

.github/ISSUE_TEMPLATE/issue_template.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ assignees: ""
1515
**Screenshots**
1616

1717
**Additional context**
18+
19+
20+
21+
🔔 Note: This ticket should address common considerations without including country-specific content. Please ensure all references are generic and applicable across various contexts.

.github/auto_assign.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ reviewers:
1010
- gonzalesedwin1123
1111
- emjay0921
1212
- reichie020212
13-
- nhatnm0612
1413

1514
# A number of reviewers added to the PR
1615
# Set 0 to add all the reviewers (default: 0)

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
(github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA
1515
Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
1616
# Beta Release
17-
uses: contributor-assistant/github-action@v2.4.0
17+
uses: contributor-assistant/github-action@v2.5.1
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
# the below token should have repo scope and must be manually added by you in the repository's secret

.github/workflows/test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@ jobs:
8888
run: |
8989
rm -rf g2p_connect_demo
9090
- name: Create temporary test-requirement.txt
91-
run: cp test-requirements.txt spp-test-requirements.txt
91+
run: |
92+
touch spp-test-requirements.txt
93+
echo "--index-url=https://pypi.openspp.org/simple/" >> spp-test-requirements.txt
94+
echo "--extra-index-url=https://pypi.org/simple/" >> spp-test-requirements.txt
95+
cat test-requirements.txt >> spp-test-requirements.txt
96+
# Clone OpenG2P Registry repository
9297
- name: Turn off git detached head warnings
9398
run: git config --global advice.detachedHead false
9499
- name: Clone OpenG2P Registry Repository

farmer-requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--extra-index-url=https://pypi.openspp.org/simple/
2+
odoo-addon-spp-farmer-registry-base==17.0.1.0.0.34

g2p_programs/i18n/g2p_programs.pot

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,11 @@ msgstr ""
942942
msgid "Calendar Event"
943943
msgstr ""
944944

945+
#. module: g2p_programs
946+
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__can_publish
947+
msgid "Can Publish"
948+
msgstr ""
949+
945950
#. module: g2p_programs
946951
#. odoo-python
947952
#: code:addons/g2p_programs/models/duplicate.py:0
@@ -1651,11 +1656,6 @@ msgstr ""
16511656
msgid "DUPLICATE"
16521657
msgstr ""
16531658

1654-
#. module: g2p_programs
1655-
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__data_collection_date
1656-
msgid "Data Collection Date"
1657-
msgstr ""
1658-
16591659
#. module: g2p_programs
16601660
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_fund_report_view__date_posted
16611661
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__date
@@ -2334,16 +2334,6 @@ msgstr ""
23342334
msgid "Entitlements Validated and Approved."
23352335
msgstr ""
23362336

2337-
#. module: g2p_programs
2338-
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__enumerator_id
2339-
msgid "Enumerator"
2340-
msgstr ""
2341-
2342-
#. module: g2p_programs
2343-
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__enumerator_user_id
2344-
msgid "Enumerator User"
2345-
msgstr ""
2346-
23472337
#. module: g2p_programs
23482338
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__event_data_ids
23492339
msgid "Event Data IDs"
@@ -2901,6 +2891,11 @@ msgstr ""
29012891
msgid "Is Public"
29022892
msgstr ""
29032893

2894+
#. module: g2p_programs
2895+
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__is_published
2896+
msgid "Is Published"
2897+
msgstr ""
2898+
29042899
#. module: g2p_programs
29052900
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__is_company
29062901
msgid "Is a Company"
@@ -3980,11 +3975,6 @@ msgstr ""
39803975
msgid "Payment Managers"
39813976
msgstr ""
39823977

3983-
#. module: g2p_programs
3984-
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__property_payment_method_id
3985-
msgid "Payment Method"
3986-
msgstr ""
3987-
39883978
#. module: g2p_programs
39893979
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_entitlement__payment_status
39903980
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_payment__status
@@ -4135,14 +4125,6 @@ msgstr ""
41354125
msgid "Posted"
41364126
msgstr ""
41374127

4138-
#. module: g2p_programs
4139-
#: model:ir.model.fields,help:g2p_programs.field_g2p_program_membership__property_payment_method_id
4140-
msgid ""
4141-
"Preferred payment method when paying this vendor. This is used to filter "
4142-
"vendor bills by preferred payment method to register payments in mass. Use "
4143-
"cases: create bank files for batch wires, check runs."
4144-
msgstr ""
4145-
41464128
#. module: g2p_programs
41474129
#: model_terms:ir.ui.view,arch_db:g2p_programs.view_cycle_form
41484130
msgid "Prepare Entitlement"
@@ -4650,6 +4632,11 @@ msgstr ""
46504632
msgid "Responsible User"
46514633
msgstr ""
46524634

4635+
#. module: g2p_programs
4636+
#: model:ir.model.fields,help:g2p_programs.field_g2p_program_membership__website_id
4637+
msgid "Restrict publishing to this website."
4638+
msgstr ""
4639+
46534640
#. module: g2p_programs
46544641
#: model_terms:ir.ui.view,arch_db:g2p_programs.view_program_membership_form
46554642
msgid "Role"
@@ -5158,11 +5145,6 @@ msgstr ""
51585145
msgid "Supported ID Document Types"
51595146
msgstr ""
51605147

5161-
#. module: g2p_programs
5162-
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__supporting_documents_ids
5163-
msgid "Supporting Documents"
5164-
msgstr ""
5165-
51665148
#. module: g2p_programs
51675149
#: model_terms:ir.ui.view,arch_db:g2p_programs.view_notification_manager_sms_form
51685150
msgid "TEMPLATES"
@@ -5276,6 +5258,11 @@ msgid ""
52765258
"The fiscal position determines the taxes/accounts used for this contact."
52775259
msgstr ""
52785260

5261+
#. module: g2p_programs
5262+
#: model:ir.model.fields,help:g2p_programs.field_g2p_program_membership__website_url
5263+
msgid "The full URL to access the document through the website."
5264+
msgstr ""
5265+
52795266
#. module: g2p_programs
52805267
#: model:ir.model.fields,help:g2p_programs.field_g2p_program_membership__user_id
52815268
msgid "The internal user in charge of this contact."
@@ -5660,6 +5647,21 @@ msgstr ""
56605647
msgid "Verify eligibility"
56615648
msgstr ""
56625649

5650+
#. module: g2p_programs
5651+
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__website_published
5652+
msgid "Visible on current website"
5653+
msgstr ""
5654+
5655+
#. module: g2p_programs
5656+
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__visitor_ids
5657+
msgid "Visitors"
5658+
msgstr ""
5659+
5660+
#. module: g2p_programs
5661+
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__website_id
5662+
msgid "Website"
5663+
msgstr ""
5664+
56635665
#. module: g2p_programs
56645666
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__website
56655667
msgid "Website Link"
@@ -5674,6 +5676,11 @@ msgstr ""
56745676
msgid "Website Messages"
56755677
msgstr ""
56765678

5679+
#. module: g2p_programs
5680+
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__website_url
5681+
msgid "Website URL"
5682+
msgstr ""
5683+
56775684
#. module: g2p_programs
56785685
#: model:ir.model.fields,help:g2p_programs.field_g2p_cycle__website_message_ids
56795686
#: model:ir.model.fields,help:g2p_programs.field_g2p_program__website_message_ids

g2p_registry_base/i18n/g2p_registry_base.pot

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ msgstr ""
340340
#. odoo-python
341341
#: code:addons/g2p_registry_base/models/reg_relationship.py:0
342342
#: code:addons/g2p_registry_base/models/reg_relationship.py:0
343-
#: code:addons/g2p_registry_base/tests/test_reg_relationship.py:0
344343
#: model:ir.model.fields,field_description:g2p_registry_base.field_res_partner__is_group
345344
#: model:ir.model.fields,field_description:g2p_registry_base.field_res_users__is_group
346345
#, python-format
@@ -439,7 +438,6 @@ msgstr ""
439438
#. odoo-python
440439
#: code:addons/g2p_registry_base/models/reg_relationship.py:0
441440
#: code:addons/g2p_registry_base/models/reg_relationship.py:0
442-
#: code:addons/g2p_registry_base/tests/test_reg_relationship.py:0
443441
#, python-format
444442
msgid "Individual"
445443
msgstr ""

muk_web_colors/i18n/muk_web_colors.pot

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@ msgstr ""
1313
"Content-Transfer-Encoding: \n"
1414
"Plural-Forms: \n"
1515

16+
#. module: muk_web_colors
17+
#: model:ir.model,name:muk_web_colors.model_ir_asset
18+
msgid "Asset"
19+
msgstr ""
20+
1621
#. module: muk_web_colors
1722
#: model:ir.model,name:muk_web_colors.model_web_editor_assets
1823
msgid "Assets Utils"
1924
msgstr ""
2025

26+
#. module: muk_web_colors
27+
#: model:ir.model,name:muk_web_colors.model_ir_attachment
28+
msgid "Attachment"
29+
msgstr ""
30+
2131
#. module: muk_web_colors
2232
#: model_terms:ir.ui.view,arch_db:muk_web_colors.view_res_config_settings_form
2333
msgid "Brand"

sp-mis-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--extra-index-url=https://pypi.openspp.org/simple/
2+
odoo-addon-spp-base==17.0.1.0.0.20
3+
odoo-addon-spp-service-points==17.0.1.0.0.10

0 commit comments

Comments
 (0)