[PATCH] Upstream patch - 22042023

addons/l10n_es/__manifest__.py

@@ -14,7 +14,7 @@
 
 {
     "name" : "Spain - Accounting (PGCE 2008)",
-    "version" : "5.1",
+    "version" : "5.2",
     "author" : "Spanish Localization Team",
     'category': 'Accounting/Localizations/Account Charts',
     "description": """

addons/l10n_es/data/account_tax_data.xml

@@ -2565,7 +2565,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'tag_ids': [ref('mod_303_153')],
+                'tag_ids': [ref('mod_303_150')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -2595,7 +2595,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'tag_ids': [ref('mod_303_153')],
+                'tag_ids': [ref('mod_303_150')],
             }),
             (0,0, {
                 'factor_percent': 100,

addons/l10n_es/migrations/5.2/post-migrate_update_taxes.py

@@ -0,0 +1,7 @@
+# Part of Odoo, Flectra. See LICENSE file for full copyright and licensing details.
+
+from flectra.addons.account.models.chart_template import update_taxes_from_templates
+
+
+def migrate(cr, version):
+    update_taxes_from_templates(cr, 'l10n_es.account_chart_template_common')

addons/sale_margin/models/sale_order.py

@@ -60,7 +60,9 @@ class SaleOrder(models.Model):
     _inherit = "sale.order"
 
     margin = fields.Monetary("Margin", compute='_compute_margin', store=True)
-    margin_percent = fields.Float("Margin (%)", compute='_compute_margin', store=True)
+    margin_percent = fields.Float(
+        "Margin (%)", compute='_compute_margin', store=True, group_operator='avg'
+    )
 
     @api.depends('order_line.margin', 'amount_untaxed')
     def _compute_margin(self):

addons/website_sale/views/templates.xml

@@ -1672,13 +1672,13 @@
                                     <tbody>
                                         <tr>
                                             <td colspan="2">
-                                                <t t-esc="order.get_portal_last_transaction().acquirer_id.name" />
+                                                <t t-set="last_transaction" t-value="order.get_portal_last_transaction()"/>
+                                                <t t-esc="last_transaction.acquirer_id.display_as or last_transaction.acquirer_id.name" />
                                             </td>
                                             <td class="text-right" width="100">
                                                 <strong>Total:</strong>
                                             </td>
                                             <td class="text-right" width="100">
-                                                <t t-set="last_transaction" t-value="order.get_portal_last_transaction()"/>
                                                 <strong t-field="last_transaction.amount" t-options="{'widget': 'monetary', 'display_currency': last_transaction.currency_id}" />
                                             </td>
                                         </tr>