Merge PR #170 into 16.0

OCA-git-bot · OCA-git-bot · commit 449defe82210 · 2025-10-06T21:02:12.000Z
Signed-off-by huguesdk
diff --git a/cooperator/models/subscription_request.py b/cooperator/models/subscription_request.py
@@ -325,7 +325,7 @@ def _compute_subscription_amount(self):
         required=True,
         readonly=True,
         states={"draft": [("readonly", False)]},
-        default=lambda self: self.env.company.default_country_id.code,
+        default=lambda self: self.env.company.default_country_id,
     )
     phone = fields.Char(readonly=True, states={"draft": [("readonly", False)]})
     user_id = fields.Many2one(
diff --git a/cooperator/readme/newsfragments/170.bugfix.0.rst b/cooperator/readme/newsfragments/170.bugfix.0.rst
@@ -0,0 +1 @@
+Fix default value of ``subscription.request.country_id``.
diff --git a/cooperator/readme/newsfragments/170.bugfix.1.rst b/cooperator/readme/newsfragments/170.bugfix.1.rst
@@ -0,0 +1 @@
+Use image widget for ``signature_scan``.
diff --git a/cooperator/views/res_config_settings_view.xml b/cooperator/views/res_config_settings_view.xml
@@ -144,7 +144,11 @@
                                     Board representative signature
                                 </span>
                                 <div class="mt16">
-                                    <field name="signature_scan" />
+                                    <field
+                                        name="signature_scan"
+                                        widget="image"
+                                        class="float-start oe_avatar"
+                                    />
                                 </div>
                             </div>
                         </div>

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ def _compute_subscription_amount(self):`
`325`	`325`	`required=True,`
`326`	`326`	`readonly=True,`
`327`	`327`	`states={"draft": [("readonly", False)]},`
`328`		`- default=lambda self: self.env.company.default_country_id.code,`
	`328`	`+ default=lambda self: self.env.company.default_country_id,`
`329`	`329`	`)`
`330`	`330`	`phone = fields.Char(readonly=True, states={"draft": [("readonly", False)]})`
`331`	`331`	`user_id = fields.Many2one(`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix default value of ``subscription.request.country_id``.