[16.0] [REF] MRP: init perf

addons/account/models/account_bank_statement_line.py

@@ -453,7 +453,7 @@ def _find_or_create_bank_account(self):
                 'partner_id': self.partner_id.id,
                 'journal_id': None,
             })
-        return bank_account.filtered(lambda x: x.company_id.id in (False, self.company_id.id))
+        return bank_account.filtered(lambda x: x.company_id.id in (False, self.company_id.id)).sudo(False)
 
     def _get_amounts_with_currencies(self):
         """

addons/account/views/report_invoice.xml

@@ -22,6 +22,9 @@
                                     <t t-if="o.company_id.account_fiscal_country_id.vat_label" t-esc="o.company_id.account_fiscal_country_id.vat_label" id="inv_tax_id_label"/>
                                     <t t-else="">Tax ID</t>: <span t-field="o.partner_id.vat"/>
                                 </div>
+                                <div t-if="o.partner_id.country_code == 'MA' and o.partner_id.company_registry">
+                                    ICE: <a t-field="o.partner_id.company_registry"/>
+                                </div>
                             </t>
                         </div>
                     </t>
@@ -33,6 +36,9 @@
                                     <t t-if="o.company_id.account_fiscal_country_id.vat_label" t-esc="o.company_id.account_fiscal_country_id.vat_label" id="inv_tax_id_label"/>
                                     <t t-else="">Tax ID</t>: <span t-field="o.partner_id.vat"/>
                                 </div>
+                                <div t-if="o.partner_id.country_code == 'MA' and o.partner_id.company_registry">
+                                    ICE: <a t-field="o.partner_id.company_registry"/>
+                                </div>
                             </t>
                         </div>
                     </t>
@@ -44,6 +50,9 @@
                                     <t t-if="o.company_id.account_fiscal_country_id.vat_label" t-esc="o.company_id.account_fiscal_country_id.vat_label" id="inv_tax_id_label"/>
                                     <t t-else="">Tax ID</t>: <span t-field="o.partner_id.vat"/>
                                 </div>
+                                <div t-if="o.partner_id.country_code == 'MA' and o.partner_id.company_registry">
+                                    ICE: <a t-field="o.partner_id.company_registry"/>
+                                </div>
                             </t>
                         </div>
                     </t>

addons/account/wizard/account_invoice_send.py

@@ -30,6 +30,11 @@ class AccountInvoiceSend(models.TransientModel):
         compute='_compute_move_types',
         readonly=True)
 
+    # Technical field to display or not the attachment button
+    display_attachment_fields = fields.Boolean(compute='_compute_display_attachment_fields')
+    # Technical field to display or not a warning icon besides attachments not supported
+    attachments_not_supported = fields.Json(compute='_compute_attachments_not_supported')
+
     @api.model
     def default_get(self, fields):
         res = super(AccountInvoiceSend, self).default_get(fields)
@@ -112,6 +117,16 @@ def _compute_invoice_without_email(self):
             else:
                 wizard.invoice_without_email = False
 
+    @api.depends('is_email', 'composition_mode')
+    def _compute_display_attachment_fields(self):
+        for wizard in self:
+            wizard.display_attachment_fields = wizard.is_email and wizard.composition_mode != 'mass_mail'
+
+    @api.depends('display_attachment_fields', 'attachment_ids')
+    def _compute_attachments_not_supported(self):
+        for wizard in self:
+            wizard.attachments_not_supported = {}
+
     def _send_email(self):
         if self.is_email:
             # with_context : we don't want to reimport the file we just exported.

addons/account/wizard/account_invoice_send_views.xml

@@ -18,6 +18,8 @@
                     <field name="invoice_ids" invisible="1"/>
                     <field name="email_from" invisible="1" />
                     <field name="mail_server_id" invisible="1"/>
+                    <field name="display_attachment_fields" invisible="1"/>
+                    <field name="attachments_not_supported" invisible="1"/>
                     <div name="option_print">
                         <field name="is_print" />
                         <b><label for="is_print"/></b>
@@ -53,16 +55,23 @@
                             <field name="body" class="oe-bordered-editor" options="{'style-inline': true}"/>
                         </div>
                         <group>
-                            <group attrs="{'invisible': [('composition_mode', '=', 'mass_mail')]}">
-                                <field name="attachment_ids" widget="many2many_binary" string="Attach a file" nolabel="1" colspan="2" attrs="{'invisible': [('composition_mode', '=', 'mass_mail')]}"/>
-                            </group>
                             <group>
                                 <field name="template_id" options="{'no_create': True, 'no_edit': True}"
                                     context="{'default_model': 'account.move'}"/>
                             </group>
                         </group>
                     </div>
 
+                    <group attrs="{'invisible': [('display_attachment_fields', '=', False)]}">
+                        <field name="attachment_ids"
+                               widget="many2many_binary"
+                               string="Attach a file"
+                               nolabel="1"
+                               colspan="2"
+                               attrs="{'invisible': [('display_attachment_fields', '=', False)]}"
+                               options="{'attachments_not_supported_field': 'attachments_not_supported' }"/>
+                    </group>
+
                     <footer>
                         <button string="Send &amp; Print"
                             attrs="{'invisible': ['|', ('is_email', '=', False), ('is_print', '=', False)]}" data-hotkey="q"

addons/account/wizard/account_tour_upload_bill.py

@@ -17,7 +17,7 @@ class AccountTourUploadBill(models.TransientModel):
 
     selection = fields.Selection(
         selection=lambda self: self._selection_values(),
-        default="sample"
+        default=lambda self: 'sample' if self.env.ref('base.res_partner_2', raise_if_not_found=False) else 'upload'
     )
 
     preview_invoice = fields.Html(
@@ -50,7 +50,9 @@ def _selection_values(self):
         journal_alias = self.env['account.journal'] \
             .search([('type', '=', 'purchase'), ('company_id', '=', self.env.company.id)], limit=1)
 
-        values = [('sample', _('Try a sample vendor bill')), ('upload', _('Upload your own bill'))]
+        # We don't want people putting demo data in their database if they didn't launch it in demo mode
+        values = [('sample', _('Try a sample vendor bill'))] if self.env.ref('base.res_partner_2', raise_if_not_found=False) else []
+        values.append(('upload', _('Upload your own bill')))
         if journal_alias.alias_name and journal_alias.alias_domain:
             values.append(('email', _('Or send a bill to %s@%s', journal_alias.alias_name, journal_alias.alias_domain)))
         return values
@@ -78,12 +80,7 @@ def apply(self):
             return purchase_journal.with_context(default_journal_id=purchase_journal.id, default_move_type='in_invoice').create_document_from_attachment(attachment_ids=self.attachment_ids.ids)
         elif self.selection == 'sample':
             invoice_date = fields.Date.today() - timedelta(days=12)
-            partner = self.env['res.partner'].search([('name', '=', 'Deco Addict')], limit=1)
-            if not partner:
-                partner = self.env['res.partner'].create({
-                    'name': 'Deco Addict',
-                    'is_company': True,
-                })
+            partner = self.env.ref('base.res_partner_2')
             bill = self.env['account.move'].create({
                 'move_type': 'in_invoice',
                 'partner_id': partner.id,

addons/account_add_gln/__init__.py

@@ -0,0 +1 @@
+from . import models

addons/account_add_gln/__manifest__.py

@@ -0,0 +1,13 @@
+{
+    'name': "Add Partner GLN",
+    'summary': "This module adds the Global Location Number to the partner. Used on delivery addresses, it is used to identify stock locations and is mandatory on the UBL/CII eInvoices (but not only). The module is intended be merged with account, later on, in master",
+    'category': 'Accounting/Accounting',
+    'version': '1.0',
+    'depends': ['account'],
+    'installable': True,
+    'auto_install': True,
+    'data': [
+        'views/res_partner_views.xml',
+    ],
+    'license': 'LGPL-3',
+}

addons/account_add_gln/models/__init__.py

@@ -0,0 +1 @@
+from . import res_partner

addons/account_add_gln/models/res_partner.py

@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    global_location_number = fields.Char(string="GLN", help="Global Location Number")

addons/account_add_gln/views/res_partner_views.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="account_add_gln.view_partner_form_inherit" model="ir.ui.view">
+        <field name="name">res.partner.form.inherit.account_peppol_partner_extra_fields</field>
+        <field name="model">res.partner</field>
+        <field name="priority">15</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <xpath expr=".//page[@name='sales_purchases']//group[@name='misc']" position="inside">
+                <field name="global_location_number" attrs="{'invisible': [('type', '!=', 'delivery')]}"/>
+            </xpath>
+            <xpath expr=".//page[@name='contact_addresses']/field[@name='child_ids']/form//field[@name='mobile']" position="after">
+                <field name="global_location_number" attrs="{'invisible': [('type', '!=', 'delivery')]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

addons/account_edi/models/account_edi_format.py

@@ -516,17 +516,18 @@ def _retrieve_product(self, name=None, default_code=None, barcode=None):
             domains.append([('default_code', '=', default_code)])
         if name:
             domains += [[('name', '=', name)], [('name', 'ilike', name)]]
-        products = self.env['product.product'].search(
-            expression.AND([
-                expression.OR(domains),
-                [('company_id', 'in', [False, self.env.company.id])],
-            ]),
-        )
-        if products:
-            for domain in domains:
-                products_by_domain = products.filtered_domain(domain)
-                if products_by_domain:
-                    return products_by_domain[0]
+
+        for domain in domains:
+            product = self.env['product.product'].search(
+                expression.AND([
+                    domain,
+                    [('company_id', 'in', [False, self.env.company.id])],
+                ]),
+                limit=1
+            )
+            # We need a single product. Exit early if one is found (implements the priority logic).
+            if product:
+                return product
         return self.env['product.product']
 
     def _retrieve_tax(self, amount, type_tax_use):

addons/account_edi_proxy_client/models/account_edi_proxy_user.py

@@ -117,9 +117,6 @@ def _make_request(self, url, params=False):
                 self._renew_token()
                 self.env.cr.commit() # We do not want to lose it if in the _make_request below something goes wrong
                 return self._make_request(url, params)
-            if error_code == 'no_such_user':
-                # This error is also raised if the user didn't exchange data and someone else claimed the edi_identificaiton.
-                self.sudo().active = False
             raise AccountEdiProxyError(error_code, proxy_error['message'] or False)
 
         return response['result']

addons/account_edi_ubl_cii/data/ubl_20_templates.xml

@@ -313,6 +313,8 @@
                 <cac:Delivery>
                     <cbc:ActualDeliveryDate t-out="foreach_vals.get('actual_delivery_date')"/>
                     <cac:DeliveryLocation>
+                        <cbc:ID t-att-schemeID="foreach_vals.get('delivery_location_vals', {}).get('delivery_location_scheme_id')"
+                                t-out="foreach_vals.get('delivery_location_vals', {}).get('delivery_location_id')"/>
                         <cac:Address>
                             <t t-call="{{AddressType_template}}">
                                 <t t-set="vals"

addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py

@@ -179,9 +179,6 @@ def _get_delivery_vals_list(self, invoice):
                              and supplier.country_id.code in economic_area
                              and supplier.country_id != customer.country_id)
 
-        if not intracom_delivery:
-            return []
-
         # [BR-IC-12]-In an Invoice with a VAT breakdown (BG-23) where the VAT category code (BT-118) is
         # "Intra-community supply" the Deliver to country code (BT-80) shall not be blank.
 
@@ -194,12 +191,31 @@ def _get_delivery_vals_list(self, invoice):
         else:
             partner_shipping = customer
 
-        return [{
-            'actual_delivery_date': invoice.invoice_date,
-            'delivery_location_vals': {
+        # TODO master: clean that code a bit hacky, when the module account_add_gln is merged with account
+        gln = 'global_location_number' in partner_shipping._fields and partner_shipping.global_location_number
+
+        if not intracom_delivery and not gln:
+            return []
+
+        delivery_vals = {
+            'delivery_location_vals': {},
+        }
+
+        if intracom_delivery:
+            delivery_vals.update({
+                'actual_delivery_date': invoice.invoice_date,
+            })
+            delivery_vals['delivery_location_vals'].update({
                 'delivery_address_vals': self._get_partner_address_vals(partner_shipping),
-            },
-        }]
+            })
+
+        if gln:
+            delivery_vals['delivery_location_vals'].update({
+                'delivery_location_scheme_id': '0088',
+                'delivery_location_id': partner_shipping.global_location_number,
+            })
+
+        return [delivery_vals]
 
     def _get_partner_address_vals(self, partner):
         # EXTENDS account.edi.xml.ubl_21
@@ -435,10 +451,6 @@ def _invoice_constraints_peppol_en16931_ubl(self, invoice, vals):
             'peppol_en16931_ubl_seller_endpoint': self._check_required_fields(
                 vals['supplier'], 'vat'
             ),
-            # PEPPOL-EN16931-R010: Buyer electronic address MUST be provided
-            'peppol_en16931_ubl_buyer_endpoint': self._check_required_fields(
-                vals['customer'], 'vat'
-            ),
             # PEPPOL-EN16931-R003: A buyer reference or purchase order reference MUST be provided.
             'peppol_en16931_ubl_buyer_ref_po_ref':
                 "A buyer reference or purchase order reference must be provided." if self._check_required_fields(