Skip to content

Commit 3f07323

Browse files
authored
Merge branch '17.0' into 802-replace-icons
2 parents 2d3ce97 + 9783d41 commit 3f07323

File tree

7 files changed

+47
-7
lines changed

7 files changed

+47
-7
lines changed

openspp-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ odoo-addon-spp-service-points==17.0.1.0.0.11
7575
odoo-addon-spp-starter==17.0.1.0.0.11
7676
odoo-addon-spp-user-roles==17.0.1.0.0.9
7777
# generated from manifests external_dependencies
78-
Pillow>=9.3.0
78+
Pillow>=9.0.1
7979
PyLD
8080
bravado_core
8181
faker

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# generated from manifests external_dependencies
2-
Pillow>=10.3.0
2+
Pillow>=9.0.1
33
PyLD
44
bravado_core
55
extendable_pydantic==1.3.0
@@ -14,10 +14,10 @@ pyproj
1414
python-magic
1515
pytz
1616
qrcode
17-
requests>=2.32.3
17+
requests>=2.25.1
1818
shapely
1919
simplejson
2020
swagger_spec_validator
21-
urllib3>=2.4.0
21+
urllib3>=1.26.5
2222
xlrd
2323
zipp>=3.19.1

spp_base/__manifest__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
"fastapi==0.112.2",
4646
"extendable_pydantic==1.3.0",
4747
"numpy>=1.22.2",
48-
"urllib3>=2.4.0",
48+
"urllib3>=1.26.5",
4949
"zipp>=3.19.1",
5050
"jwcrypto>=1.5.6",
51-
"requests>=2.32.3",
51+
"requests>=2.25.1",
5252
]
5353
}, # not directly required, pinned by Snyk to avoid a vulnerability and for fastapi, compatibility issues.
5454
"data": [
@@ -58,6 +58,7 @@
5858
"security/ir.model.access.csv",
5959
"views/registrant_view.xml",
6060
"views/main_view.xml",
61+
"views/users_view.xml",
6162
],
6263
"assets": {},
6364
"demo": [],

spp_base/views/users_view.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
<record id="base.action_partner_merge" model="ir.actions.act_window">
4+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
5+
</record>
6+
<record id="mail.action_partner_mass_mail" model="ir.actions.act_window">
7+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
8+
</record>
9+
<record id="sms.res_partner_act_window_sms_composer_multi" model="ir.actions.act_window">
10+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
11+
</record>
12+
<record model="ir.actions.server" id="web.download_contact">
13+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
14+
</record>
15+
<record model="ir.actions.server" id="portal.partner_wizard_action_create_and_open">
16+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
17+
</record>
18+
19+
</odoo>

spp_dms/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"base",
1515
"web",
1616
],
17-
"external_dependencies": {"python": ["Pillow>=10.3.0"]},
17+
"external_dependencies": {"python": ["Pillow>=9.0.1"]},
1818
"data": [
1919
"security/security.xml",
2020
"security/ir.model.access.csv",

spp_farmer_registry_base/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"views/res_partner.xml",
4343
"views/configuration_view.xml",
4444
"views/main_view.xml",
45+
"views/res_users.xml",
4546
],
4647
"assets": {
4748
"web.assets_backend": [
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
<record id="base.action_partner_merge" model="ir.actions.act_window">
4+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
5+
</record>
6+
<record id="mail.action_partner_mass_mail" model="ir.actions.act_window">
7+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
8+
</record>
9+
<record id="sms.res_partner_act_window_sms_composer_multi" model="ir.actions.act_window">
10+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
11+
</record>
12+
<record model="ir.actions.server" id="web.download_contact">
13+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
14+
</record>
15+
<record model="ir.actions.server" id="portal.partner_wizard_action_create_and_open">
16+
<field name="groups_id" eval="[(4, ref('base.group_system'))]" />
17+
</record>
18+
19+
</odoo>

0 commit comments

Comments
 (0)