Merge lp:~julie-w/unifield-server/US-8896 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2022-01-05 16:30:54 +0000
+++ bin/addons/account/account_invoice_view.xml	2022-01-06 16:20:57 +0000
@@ -83,7 +83,10 @@
                             <field name="discount" groups="base.group_extended"
                                    attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}"/>
                             <field colspan="4" name="name"/>
-                            <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                            <field name="account_id"
+                                   domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
+                                   required="1"
+                            />
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <newline/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -236,7 +239,7 @@
                            </group>
 
                             <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
-                                <tree string="Invoice lines" editable="both" colors="red:analytic_distribution_state in ('invalid', 'invalid_small_amount') or inactive_product == True;black:analytic_distribution_state in ('none','valid') and inactive_product == False">
+                                <tree string="Invoice lines" editable="both" colors="red:analytic_distribution_state in ('invalid', 'invalid_small_amount') or inactive_product == True or not account_id;black:analytic_distribution_state in ('none', 'valid') and inactive_product == False and account_id">
                                     <field name="from_supply" invisible="1"/>
                                     <field name="line_synced" invisible="1"/>
                                     <field name="invoice_type" invisible="1"/>
@@ -252,6 +255,7 @@
                                     />
                                     <field name="account_id"
                                            domain="[('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
+                                           required="1"
                                     />
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field name="inactive_product" invisible="1" />
@@ -489,6 +493,7 @@
                                     />
                                     <field name="account_id"
                                            domain="[('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
+                                           required="1"
                                            context="{'type': parent.type, 'journal_type': parent.journal_type}"
                                     />
                                     <button name="button_analytic_distribution" string="Analytical Distribution" type="object"

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2022-01-05 16:25:16 +0000
+++ bin/addons/account/invoice.py	2022-01-06 16:20:57 +0000
@@ -1338,6 +1338,9 @@
             if 'analytic_line_ids' in line:
                 line['analytic_line_ids'] = False
 
+            if 'allow_no_account' in line:
+                line['allow_no_account'] = False
+
             for field in (
                     'company_id', 'partner_id', 'account_id', 'product_id',
                     'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id','account_tax_id',
@@ -1660,7 +1663,8 @@
                                        selection=PARTNER_TYPE, readonly=True, store=False),
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
-        'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
+        'account_id': fields.many2one('account.account', 'Account', domain=[('type', '<>', 'view'), ('type', '<>', 'closed')],
+                                      help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
                                           digits_compute= dp.get_precision('Account'), store=True),

=== modified file 'bin/addons/account/report/export_invoice.mako'
--- bin/addons/account/report/export_invoice.mako	2021-04-28 14:17:59 +0000
+++ bin/addons/account/report/export_invoice.mako	2022-01-06 16:20:57 +0000
@@ -145,7 +145,7 @@
         % endif
         <Data ss:Type="String">${inv_line.product_id and inv_line.product_id.default_code or ''|x}</Data></Cell>
 
-        <Cell ss:StyleID="editable"><Data ss:Type="String">${inv_line.account_id.code|x}</Data></Cell>
+        <Cell ss:StyleID="editable"><Data ss:Type="String">${inv_line.account_id and inv_line.account_id.code or ''|x}</Data></Cell>
 
         % if is_ro:
             <Cell ss:StyleID="non_editable_number">

=== modified file 'bin/addons/account/report/invoice_excel_export.mako'
--- bin/addons/account/report/invoice_excel_export.mako	2020-04-14 16:07:03 +0000
+++ bin/addons/account/report/invoice_excel_export.mako	2022-01-06 16:20:57 +0000
@@ -115,7 +115,7 @@
                 <Cell ss:StyleID="line_number"><Data ss:Type="Number">${distrib_line['percentage']|x}</Data></Cell>
                 <Cell ss:StyleID="line_number"><Data ss:Type="Number">${inv_line.price_unit|x}</Data></Cell>
                 <Cell ss:StyleID="line_number"><Data ss:Type="Number">${distrib_line['subtotal']|x}</Data></Cell>
-                <Cell ss:StyleID="line"><Data ss:Type="String">${inv_line.account_id.code|x}</Data></Cell>
+                <Cell ss:StyleID="line"><Data ss:Type="String">${inv_line.account_id and inv_line.account_id.code or ''|x}</Data></Cell>
                 <Cell ss:StyleID="line"><Data ss:Type="String">${distrib_line['cost_center']|x}</Data></Cell>
                 <Cell ss:StyleID="line"><Data ss:Type="String">${distrib_line['destination']|x}</Data></Cell>
                 <Cell ss:StyleID="line"><Data ss:Type="String">${inv_line.invoice_id.number or ''|x}</Data></Cell>

=== modified file 'bin/addons/account_override/account_invoice_sync.py'
--- bin/addons/account_override/account_invoice_sync.py	2021-10-18 08:18:07 +0000
+++ bin/addons/account_override/account_invoice_sync.py	2022-01-06 16:20:57 +0000
@@ -84,6 +84,21 @@
                 fp_distrib_line_obj.create(cr, uid, distrib_vals, context=context)
             vals.update({'analytic_distribution_id': distrib_id,})
 
+    def _set_partially_run(self, line_name, partially_run_msg, new_msg, context):
+        """
+        Sets the invoices in Partially (Not) Run:
+        - updates contexts accordingly
+        - updates the partially_run_msg with the new_msg
+        - at line level sets the account to False and the tag allow_no_account to True
+        """
+        context['partial_sync_run'] = True
+        line_account_id = False
+        allow_no_account = True
+        if partially_run_msg:
+            partially_run_msg += "\n"
+        partially_run_msg += 'Line "%s": %s' % (line_name, new_msg)
+        return line_account_id, allow_no_account, partially_run_msg
+
     def _create_invoice_lines(self, cr, uid, inv_lines_data, inv_id, inv_posting_date, inv_linked_po, from_supply, context=None):
         """
         Creates the lines of the automatic counterpart invoice (inv_id) generated at synchro time.
@@ -96,7 +111,9 @@
         product_uom_obj = self.pool.get('product.uom')
         inv_line_obj = self.pool.get('account.invoice.line')
         pol_obj = self.pool.get('purchase.order.line')
+        partially_run_msg = ""
         for inv_line in inv_lines_data:
+            allow_no_account = False
             line_name = inv_line.get('name', '')
             if not line_name:  # required field
                 raise osv.except_osv(_('Error'), _("Impossible to retrieve the line description."))
@@ -153,22 +170,51 @@
             elif not line_account_id:
                 account_code = inv_line.get('account_id', {}).get('code', '')
                 if not account_code:
-                    raise osv.except_osv(_('Error'), _("Impossible to retrieve the account code at line level."))
-                account_ids = account_obj.search(cr, uid, [('code', '=', account_code)], limit=1, context=context)
-                if not account_ids:
-                    raise osv.except_osv(_('Error'), _("Account code %s not found.") % account_code)
-                line_account_id = account_ids[0]
-            if not line_account_id:
-                raise osv.except_osv(_('Error'), _("Error when retrieving the account at line level."))
-            line_account = account_obj.browse(cr, uid, line_account_id,
-                                              fields_to_fetch=['activation_date', 'inactivation_date'], context=context)
-            if inv_posting_date < line_account.activation_date or \
-                    (line_account.inactivation_date and inv_posting_date >= line_account.inactivation_date):
-                raise osv.except_osv(_('Error'), _('The account "%s - %s" is inactive.') % (line_account.code, line_account.name))
-            inv_line_vals.update({'account_id': line_account_id,
+                    new_msg = "Impossible to retrieve the account code."
+                    line_account_id, allow_no_account, partially_run_msg = self._set_partially_run(line_name,
+                                                                                                   partially_run_msg,
+                                                                                                   new_msg, context)
+                else:
+                    account_ids = account_obj.search(cr, uid, [('code', '=', account_code)], limit=1, context=context)
+                    if not account_ids:
+                        new_msg = "Account %s not found." % (account_code,)
+                        line_account_id, allow_no_account, partially_run_msg = self._set_partially_run(line_name, partially_run_msg,
+                                                                                                       new_msg, context)
+                    else:
+                        line_account_id = account_ids[0]
+            if not line_account_id and not allow_no_account:
+                new_msg = "Error when retrieving the account."
+                line_account_id, allow_no_account, partially_run_msg = self._set_partially_run(line_name, partially_run_msg, new_msg, context)
+            if line_account_id:
+                line_account = account_obj.browse(cr, uid, line_account_id,
+                                                  fields_to_fetch=['activation_date', 'inactivation_date', 'code'], context=context)
+                if inv_posting_date < line_account.activation_date or \
+                        (line_account.inactivation_date and inv_posting_date >= line_account.inactivation_date):
+                    new_msg = "Account %s inactive." % (line_account.code,)
+                    line_account_id, allow_no_account, partially_run_msg = self._set_partially_run(line_name, partially_run_msg,
+                                                                                                   new_msg, context)
+            inv_line_vals.update({'account_id': line_account_id or False,
+                                  'allow_no_account': allow_no_account,
                                   'product_id': product_id,
                                   })
             inv_line_obj.create(cr, uid, inv_line_vals, context=context)
+        return partially_run_msg
+
+    def _get_msg(self, journal_type, partially_run_msg, inv_id):
+        """
+        Returns the message to be printed in the Messages Received
+        """
+        if journal_type == 'sale':
+            msg_prefix = 'The ISI No.'
+        elif journal_type == 'intermission':
+            msg_prefix = 'The IVI No.'
+        else:
+            msg_prefix = 'The Invoice No.'
+        if partially_run_msg:
+            msg_suffix = "is Partially Not Run.\n\n%s" % partially_run_msg
+        else:
+            msg_suffix = "has been created successfully."
+        return "%s %s %s" % (msg_prefix, inv_id, msg_suffix)
 
     def create_invoice_from_sync(self, cr, uid, source, invoice_data, context=None):
         """
@@ -323,11 +369,8 @@
         )
         inv_id = self.create(cr, uid, vals, context=context)
         if inv_id:
-            self._create_invoice_lines(cr, uid, inv_lines, inv_id, posting_date, po, from_supply, context=context)
-            if journal_type == 'sale':
-                msg = "ISI No. %s created successfully." % inv_id
-            elif journal_type == 'intermission':
-                msg = "IVI No. %s created successfully." % inv_id
+            partially_run_msg = self._create_invoice_lines(cr, uid, inv_lines, inv_id, posting_date, po, from_supply, context=context)
+            msg = self._get_msg(journal_type, partially_run_msg, inv_id)
             self._logger.info(msg)
             return msg
 

=== modified file 'bin/addons/account_override/account_invoice_view.xml'
--- bin/addons/account_override/account_invoice_view.xml	2022-01-05 16:28:33 +0000
+++ bin/addons/account_override/account_invoice_view.xml	2022-01-06 16:20:57 +0000
@@ -28,21 +28,6 @@
         </record>
 
 
-    <!-- Change account_id domain -->
-        <record id="invoice_line_form3" model="ir.ui.view">
-            <field name="name">account.invoice.line.form</field>
-            <field name="model">account.invoice.line</field>
-            <field name="type">form</field>
-            <field name="priority" eval="20"/>
-            <field name="inherit_id" ref="account.view_invoice_line_form"/>
-            <field name="arch" type="xml">
-              <xpath expr="//field[@name='account_id']" position="attributes">
-                  <attribute name="domain">[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]</attribute>
-              </xpath>
-            </field>
-        </record>
-
-
         <!--
             Debit Note views
         -->
@@ -104,7 +89,7 @@
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list">
                                 <tree editable="top" string="Invoice Line" noteditable="1" hide_new_button="1">
                                     <field name="name"/>
-                                    <field name="account_id" domain="[('restricted_area', '=', 'invoice_lines')]"/>
+                                    <field name="account_id" domain="[('restricted_area', '=', 'invoice_lines')]" required="1"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" string="UoM"/>
                                     <field name="price_unit"/>
@@ -236,7 +221,7 @@
                                            attrs="{'readonly': [('from_supply', '=', True)]}"
                                            on_change="onchange_donation_product(product_id, quantity, parent.currency_id, context)"
                                     />
-                                    <field name="account_id" domain="[('restricted_area', '=', 'donation_lines')]"/>
+                                    <field name="account_id" domain="[('restricted_area', '=', 'donation_lines')]" required="1"/>
                                     <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection"
                                         context="{'d_journal_id': parent.journal_id , 'd_partner_id': parent.partner_id, 'd_address_invoice_id':parent.address_invoice_id,'d_date_invoice': parent.date_invoice, 'd_register_posting_date': parent.register_posting_date, 'd_account_id': parent.account_id, 'd_partner_bank_id': parent.partner_bank_id, 'd_payment_term': parent.payment_term, 'd_name': parent.name, 'd_origine': parent.origin, 'd_address_contact_id': parent.address_contact_id, 'd_user_id': parent.user_id, 'd_comment': parent.comment}"
                                         />
@@ -260,7 +245,7 @@
                                            on_change="onchange_donation_product(product_id, quantity, parent.currency_id, context)"
                                            default_focus="1"
                                     />
-                                    <field name="account_id" domain="[('restricted_area', '=', 'donation_lines')]"/>
+                                    <field name="account_id" domain="[('restricted_area', '=', 'donation_lines')]" required="1"/>
                                     <field name="name" colspan="4" />
                                     <field name="quantity"
                                            attrs="{'readonly': [('from_supply', '=', True)]}"
@@ -405,7 +390,7 @@
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'is_intermission': True, 'from_inv_form': True}">
                                 <tree string="Intermission Voucher Lines"
                                       editable="both"
-                                      colors="red:analytic_distribution_state in ('invalid', 'invalid_small_amount') or inactive_product == True;black:inactive_product == False and analytic_distribution_state in ('none', 'valid')">
+                                      colors="red:analytic_distribution_state in ('invalid', 'invalid_small_amount') or inactive_product == True or not account_id;black:inactive_product == False and analytic_distribution_state in ('none', 'valid') and account_id">
                                     <field name="from_supply" invisible="1"/>
                                     <field name="line_synced" invisible="1"/>
                                     <field name="invoice_type" invisible="1"/>
@@ -418,6 +403,7 @@
                                                                         ('from_supply', '=', True),
                                                                         '&amp;', ('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}" />
                                     <field name="account_id" domain="[('restricted_area', '=', 'intermission_lines')]"
+                                           required="1"
                                            context="{'type': parent.type, 'journal_type': parent.journal_type, 'intermission_type': parent.type == 'out_invoice' and 'out' or 'in'}"
                                     />
                                     <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection"
@@ -468,7 +454,7 @@
                                             <field name="price_unit" attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}"/>
                                             <field name="discount" groups="base.group_extended" attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}"/>
                                             <field name="name" colspan="4"/>
-                                            <field name="account_id" domain="[('restricted_area', '=', 'intermission_lines')]"/>
+                                            <field name="account_id" domain="[('restricted_area', '=', 'intermission_lines')]" required="1"/>
                                             <group colspan="6">
                                                 <field name="analytic_distribution_state" invisible="1"/>
                                                 <field name="newline" invisible="1" />

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2022-01-05 16:30:54 +0000
+++ bin/addons/account_override/invoice.py	2022-01-06 16:20:57 +0000
@@ -1640,6 +1640,7 @@
         # - an invoice line can be linked to several CV lines => e.g. merge invoice lines by account
         'cv_line_ids': fields.many2many('account.commitment.line', 'inv_line_cv_line_rel', 'inv_line_id', 'cv_line_id',
                                         string='Commitment Voucher Lines'),
+        'allow_no_account': fields.boolean(string='Allow an empty account on the line', readonly=True),
     }
 
     _defaults = {
@@ -1647,10 +1648,16 @@
         'is_corrected': lambda *a: False,
         'vat_ok': lambda obj, cr, uid, context: obj.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok,
         'merged_line': lambda *a: False,
+        'allow_no_account': lambda *a: False,
     }
 
     _order = 'line_number'
 
+    _sql_constraints = [
+        ('ck_invl_account', "CHECK(account_id IS NOT NULL OR COALESCE(allow_no_account, 'f') = 't')",
+         'The invoice lines must have an account.')
+    ]
+
     def _check_on_invoice_line_big_amounts(self, cr, uid, ids, context=None):
         """
         Prevents booking amounts having more than 10 digits before the comma, i.e. amounts starting from 10 billions.
@@ -1782,20 +1789,26 @@
 
         return new_id
 
-    def copy_data(self, cr, uid, inv_id, default=None, context=None):
+    def copy_data(self, cr, uid, invl_id, default=None, context=None):
         """
         Copy an invoice line without its move lines,
         without the link to a reversed invoice line,
         and without link to PO/FO/CV lines when the duplication is manual
-        Reset the merged_line tag.
+        Reset the merged_line and allow_no_account tags.
+        Prevent the manual duplication of invoices lines with no account.
         """
         if context is None:
             context = {}
         if default is None:
             default = {}
+        # The only way to get invoice lines without account should be via synchro and not via duplication
+        # (display a specific error message instead of the SQL error)
+        if context.get('from_copy_web') and not self.read(cr, uid, invl_id, ['account_id'], context=context)['account_id']:
+            raise osv.except_osv(_('Warning'), _("Duplication not allowed. Please set an account on all lines first."))
         default.update({'move_lines': False,
                         'reversed_invoice_line_id': False,
                         'merged_line': False,
+                        'allow_no_account': False,
                         })
         # Manual duplication should generate a "manual document not created through the supply workflow"
         # so we don't keep the link to PO/FO/CV at line level
@@ -1807,7 +1820,7 @@
                 'purchase_order_line_ids': [],
                 'cv_line_ids': [(6, 0, [])],
             })
-        return super(account_invoice_line, self).copy_data(cr, uid, inv_id, default, context)
+        return super(account_invoice_line, self).copy_data(cr, uid, invl_id, default, context)
 
     def unlink(self, cr, uid, ids, context=None):
         """

=== modified file 'bin/addons/account_override/report/allocation_invoices_report.rml'
--- bin/addons/account_override/report/allocation_invoices_report.rml	2016-04-29 14:08:12 +0000
+++ bin/addons/account_override/report/allocation_invoices_report.rml	2022-01-06 16:20:57 +0000
@@ -88,7 +88,7 @@
                 <para style="Information">[[ o.partner_id.name ]]</para>
             </td>
             <td>
-            	<para style="Information">[[ getSel(o, 'type') ]]</para>
+            	<para style="Information">[[ get_doc_type(o) ]]</para>
             </td>
             <td>
                 <para style="Information">[[ get_journal_code(o) ]]</para>

=== modified file 'bin/addons/account_override/report/report_allocation_invoices.py'
--- bin/addons/account_override/report/report_allocation_invoices.py	2017-08-09 13:31:11 +0000
+++ bin/addons/account_override/report/report_allocation_invoices.py	2022-01-06 16:20:57 +0000
@@ -34,6 +34,7 @@
             'time': time,
             'get_data': self.get_data,
             'get_total_amount': self.get_total_amount,
+            'get_doc_type': self.get_doc_type,
             'get_journal_code': self.get_journal_code,
         })
 
@@ -45,6 +46,7 @@
         - an AD defined at line level (first SELECT)
         - an AD defined at header level (second SELECT)
         - no AD (third SELECT)
+        - no account - in that case the AD is seen as empty (fourth SELECT)
         """
         self._cr.execute("""SELECT line_number,NULLIF('[' || default_code || '] ' || name_template, '[] ') as product,i.name as description, ac.code || ' ' || ac.name as account, quantity, ROUND(price_unit, 2) as price_unit, ROUND(percentage, 2) as percentage, ROUND(price_subtotal*percentage/100, 2) as sub_total, y.name as currency, n1.code as destination, n2.code as cost_center, n3.code as funding_pool
             FROM funding_pool_distribution_line a
@@ -56,7 +58,7 @@
             INNER JOIN account_account ac ON ac.id = i.account_id
             LEFT JOIN product_product p ON p.id = i.product_id
             LEFT JOIN res_currency y ON y.id = s.currency_id
-            WHERE i.invoice_id=%s
+            WHERE i.invoice_id=%s AND i.account_id IS NOT NULL AND ac.is_analytic_addicted = True
             UNION ALL
             SELECT line_number,NULLIF('[' || default_code || '] ' || name_template, '[] ') as product,i.name as description, ac.code || ' ' || ac.name as account, quantity, ROUND(price_unit, 2) as price_unit, ROUND(percentage, 2) as percentage, ROUND(price_subtotal*percentage/100, 2) as sub_total, y.name as currency, n1.code as destination, n2.code as cost_center, n3.code as funding_pool
             FROM funding_pool_distribution_line a
@@ -68,7 +70,7 @@
             INNER JOIN account_analytic_account n3 ON n3.id = a.analytic_id
             INNER JOIN res_currency y ON y.id = s.currency_id
             LEFT JOIN product_product p ON p.id = i.product_id
-            WHERE s.id=%s AND ac.is_analytic_addicted = True
+            WHERE s.id=%s AND i.account_id IS NOT NULL AND ac.is_analytic_addicted = True
             UNION ALL
             SELECT line_number, NULLIF('[' || default_code || '] ' || name_template, '[] ') as product, i.name as description, 
             ac.code || ' ' || ac.name as account, quantity, ROUND(price_unit, 2) as price_unit, NULL, 
@@ -78,9 +80,18 @@
             INNER JOIN account_account ac ON ac.id = i.account_id
             INNER JOIN res_currency y ON y.id = s.currency_id
             LEFT JOIN product_product p ON p.id = i.product_id
-            WHERE s.id=%s and is_analytic_addicted = False
+            WHERE s.id=%s AND i.account_id IS NOT NULL AND is_analytic_addicted = False
+            UNION ALL
+            SELECT line_number, NULLIF('[' || default_code || '] ' || name_template, '[] ') as product, i.name as description, 
+            '' as account, quantity, ROUND(price_unit, 2) as price_unit, NULL, 
+            ROUND(price_subtotal, 2) as sub_total, y.name as currency, NULL, NULL, NULL
+            FROM account_invoice_line i
+            INNER JOIN account_invoice s ON s.id = i.invoice_id
+            INNER JOIN res_currency y ON y.id = s.currency_id
+            LEFT JOIN product_product p ON p.id = i.product_id
+            WHERE s.id=%s AND i.account_id IS NULL
             ORDER BY line_number, destination, cost_center, funding_pool
-            """, (invoice_id, invoice_id, invoice_id))
+            """, (invoice_id, invoice_id, invoice_id, invoice_id))
         res = self._cr.fetchall()
         self.total_amount = sum([line[7] or 0.0 for line in res])
         return res
@@ -88,11 +99,24 @@
     def get_total_amount(self):
         return self.total_amount
 
+    def get_doc_type(self, inv):
+        """
+        Returns the String corresponding to the invoice type.
+        Note that using "getSel" doesn't work because "doc_type" is a fields.function.
+        """
+        inv_doc_type = ""
+        inv_obj = self.pool.get('account.invoice')
+        for doc_type in inv_obj._get_invoice_type_list(self.cr, self.uid):
+            if len(doc_type) >= 2 and inv.doc_type == doc_type[0]:
+                inv_doc_type = doc_type[1]
+                break
+        return inv_doc_type
+
     def get_journal_code(self, inv):
-        '''
+        """
         If the SI has been (partially or totally) imported in a register, return the Journal Code
         It the SI has been partially imported in several registers, return : "code1 / code2 / code3"
-        '''
+        """
         journal_code_list = []
         if inv and inv.move_id:
             absl_ids = self.pool.get('account.bank.statement.line').search(self.cr, self.uid, [('imported_invoice_line_ids', 'in', [x.id for x in inv.move_id.line_id])])

=== modified file 'bin/addons/analytic_distribution/analytic_distribution.py'
--- bin/addons/analytic_distribution/analytic_distribution.py	2021-04-14 16:45:55 +0000
+++ bin/addons/analytic_distribution/analytic_distribution.py	2022-01-06 16:20:57 +0000
@@ -170,7 +170,7 @@
         account = self.pool.get('account.account').read(cr, uid, account_id, ['destination_ids'])
         # Check Cost Center lines regarding destination/account and destination/CC links
         for cc_line in distrib.cost_center_lines:
-            if cc_line.destination_id.id not in account.get('destination_ids', []):
+            if account and cc_line.destination_id.id not in account.get('destination_ids', []):
                 return 'invalid'
             if not self.check_dest_cc_compatibility(cr, uid, cc_line.destination_id.id,
                                                     cc_line.analytic_id and cc_line.analytic_id.id or False, context=context):
@@ -193,7 +193,7 @@
                         return 'invalid'
                 if doc_date and fp_line.analytic_id and not analytic_acc_obj.is_account_active(fp_line.analytic_id, doc_date):
                     return 'invalid'
-            if fp_line.destination_id.id not in account.get('destination_ids', []):
+            if account and fp_line.destination_id.id not in account.get('destination_ids', []):
                 return 'invalid'
             if not self.check_dest_cc_compatibility(cr, uid, fp_line.destination_id.id, fp_line.cost_center_id.id, context=context):
                 return 'invalid'

=== modified file 'bin/addons/analytic_distribution/invoice.py'
--- bin/addons/analytic_distribution/invoice.py	2020-01-21 16:18:01 +0000
+++ bin/addons/analytic_distribution/invoice.py	2022-01-06 16:20:57 +0000
@@ -213,7 +213,7 @@
         res = {}
         for invl in self.browse(cr, uid, ids):
             res[invl.id] = ''
-            if not invl.is_allocatable:
+            if not invl.is_allocatable or (invl.allow_no_account and not invl.account_id):
                 continue
             from_header = ''
             if invl.have_analytic_distribution_from_header:

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-01-05 16:30:54 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-01-06 16:20:57 +0000
@@ -106168,23 +106168,11 @@
 msgstr "Champ interne indiquant si le document est lié à un flux \"Supply\""
 
 #. module: account_override
-#: code:addons/account_override/account_invoice_sync.py:120
-#, python-format
-msgid "Account code %s not found."
-msgstr "Code comptable %s non trouvé."
-
-#. module: account_override
 #: code:addons/account_override/account_invoice_sync.py:189
 #, python-format
 msgid "Impossible to retrieve the currency."
 msgstr "Impossible de récupérer la devise."
 
-#. module: account_override
-#: code:addons/account_override/account_invoice_sync.py:117
-#, python-format
-msgid "Impossible to retrieve the account code at line level."
-msgstr "Impossible de récupérer le code comptable au niveau d'une ligne."
-
 #. modules: account_override, account
 #: code:addons/account_override/account_invoice_sync.py:193
 #: code:addons/account/wizard/account_invoice_import.py:107
@@ -106193,12 +106181,6 @@
 msgstr "Devise %s non trouvée ou inactive."
 
 #. module: account_override
-#: code:addons/account_override/account_invoice_sync.py:123
-#, python-format
-msgid "Error when retrieving the account at line level."
-msgstr "Erreur lors de la récupération du compte au niveau d'une ligne."
-
-#. module: account_override
 #: code:addons/account_override/account_invoice_sync.py:235
 #, python-format
 msgid "The Intermission counterpart account is missing in the Company form or is inactive."
@@ -106217,12 +106199,6 @@
 msgstr "Impossible de récupérer la description de la ligne."
 
 #. module: account_override
-#: code:addons/account_override/account_invoice_sync.py:128
-#, python-format
-msgid "The account \"%s - %s\" is inactive."
-msgstr "Le compte \"%s - %s\" est inactif."
-
-#. module: account_override
 #: code:addons/account_override/account_invoice_sync.py:135
 #, python-format
 msgid "Unit of Measure %s not found."
@@ -113224,6 +113200,28 @@
 msgid "You must select an old version of the Kit to be able to import from it"
 msgstr "Vous devez sélectionner une ancienne version de ce Kit pour pouvoir importer depuis ce Kit"
 
+#. module: account_override
+#: field:account.invoice.line,allow_no_account:0
+msgid "Allow an empty account on the line"
+msgstr "Autoriser un compte vide sur la ligne"
+
+#. module: account_override
+#: sql_constraint:account.invoice.line:0
+msgid "The invoice lines must have an account."
+msgstr "Les lignes de facture doivent avoir un compte."
+
+#. module: register_accounting
+#: code:addons/register_accounting/invoice.py:369
+#, python-format
+msgid "The account is missing on the line No. %s."
+msgstr "Il manque le compte sur la ligne N°%s."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:1759
+#, python-format
+msgid "Duplication not allowed. Please set an account on all lines first."
+msgstr "Duplication non autorisée. Veuillez d'abord définir un compte sur toutes les lignes."
+
 #. module: analytic_override
 #: field:account.analytic.line,ad_updated:0
 msgid "Analytic Distribution Updated"

=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
--- bin/addons/register_accounting/account_invoice_view.xml	2021-10-21 09:49:00 +0000
+++ bin/addons/register_accounting/account_invoice_view.xml	2022-01-06 16:20:57 +0000
@@ -49,7 +49,10 @@
                                       colors="red:analytic_distribution_state in ('invalid', 'invalid_small_amount') or inactive_product == True;black:inactive_product == False and analytic_distribution_state in ('none','valid')">
                                     <field name="name"/>
                                     <field name="reference"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]" name="account_id"/>
+                                    <field name="account_id"
+                                           domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
+                                           required="1"
+                                    />
                                     <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection"
                                         context="{'d_journal_id': parent.journal_id , 'd_partner_id': parent.partner_id, 'd_address_invoice_id':parent.address_invoice_id,'d_date_invoice': parent.date_invoice, 'd_register_posting_date': parent.register_posting_date, 'd_document_date': parent.document_date, 'd_account_id': parent.account_id, 'd_partner_bank_id': parent.partner_bank_id, 'd_payment_term': parent.payment_term, 'd_name': parent.name, 'd_origine': parent.origin, 'd_address_contact_id': parent.address_contact_id, 'd_user_id': parent.user_id, 'd_comment': parent.comment,'d_reference': parent.reference}"
                                         />
@@ -176,7 +179,10 @@
                                     <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                                     <field name="name"/>
                                     <field name="reference" />
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]" name="account_id"/>
+                                    <field name="account_id"
+                                           domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
+                                           required="1"
+                                    />
                                     <field name="analytic_distribution_state_recap" attrs="{'invisible': [('is_allocatable', '=', False)]}"/>
                                     <field name="analytic_distribution_state" invisible="1"/>
                                     <field name="have_analytic_distribution_from_header" invisible="1"/>

=== modified file 'bin/addons/register_accounting/invoice.py'
--- bin/addons/register_accounting/invoice.py	2017-08-18 14:07:26 +0000
+++ bin/addons/register_accounting/invoice.py	2022-01-06 16:20:57 +0000
@@ -358,6 +358,20 @@
                 aal_obj.write(cr, uid, aal_ids, {'reference': reference}, context=context)
         return True
 
+    def _check_empty_account(self, cr, uid, ids, context=None):
+        """
+        Raises an error if one of the invoice lines has no account.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for inv in self.browse(cr, uid, ids, fields_to_fetch=['invoice_line'], context=context):
+            for invl in inv.invoice_line:
+                if not invl.account_id:
+                    raise osv.except_osv(_('Error'), _('The account is missing on the line No. %s.') % invl.line_number)
+        return True
+
     def action_open_invoice(self, cr, uid, ids, context=None, *args):
         """
         Add down payment check after others verifications
@@ -368,6 +382,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
         # Browse invoice and all invoice lines to detect a non-valid line
+        self._check_empty_account(cr, uid, ids, context=context)
         self._check_analytic_distribution_state(cr, uid, ids)
         # Default behaviour
         res = super(account_invoice, self).action_open_invoice(cr, uid, ids, context)