Merge lp:~jfb-tempo-consulting/unifield-server/US-8839 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2021-01-28 17:59:49 +0000
+++ bin/addons/account/account.py	2021-11-03 13:33:55 +0000
@@ -580,6 +580,43 @@
 class account_journal(osv.osv):
     _name = "account.journal"
     _description = "Journal"
+
+    def _get_false(self, cr, uid, ids, *a, **b):
+        """
+        Returns False for all ids (cf. only the search method is used for the field)
+        """
+        return {}.fromkeys(ids, False)
+
+    def _search_inv_doc_type(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain (based on the context) to get all journals matching with the doc type of the selected invoice
+        """
+        if context is None:
+            context = {}
+        if not args:
+            return []
+        doc_type = context.get('doc_type', '')
+        if doc_type == 'str':
+            journal_types = ['sale']
+        elif doc_type in ('isi', 'isr'):
+            journal_types = ['purchase']
+        elif doc_type == 'donation':
+            journal_types = ['inkind', 'extra']
+        else:
+            journals = {
+                'out_invoice': 'sale',
+                'in_invoice': 'purchase',
+                'out_refund': 'sale_refund',
+                'in_refund': 'purchase_refund',
+            }
+            journal_types = [journals.get(context.get('type', ''), 'purchase')]
+        journal_dom = [('type', 'in', journal_types), ('is_current_instance', '=', True)]
+        if doc_type in ('isi', 'isr'):
+            journal_dom.append(('code', '=', 'ISI'))
+        else:
+            journal_dom.append(('code', '!=', 'ISI'))
+        return journal_dom
+
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
@@ -609,6 +646,8 @@
         'bank_account_name': fields.char('Bank Account Name', size=256, required=False),
         'bank_swift_code': fields.char('Swift Code', size=32, required=False),
         'bank_address': fields.text('Address', required=False),
+        'inv_doc_type': fields.function(_get_false, method=True, type='boolean', string='Document Type', store=False,
+                                        fnct_search=_search_inv_doc_type),
     }
 
     _defaults = {
 
=== modified file 'bin/addons/account/account_invoice_payment_tab.xml'
--- bin/addons/account/account_invoice_payment_tab.xml	2021-01-29 15:17:52 +0000
+++ bin/addons/account/account_invoice_payment_tab.xml	2021-11-03 13:33:55 +0000
@@ -1,5 +1,5 @@
 <!-- PAYMENT TAB -->
-<!-- added in SI / SR / IVO / STV -->
+<!-- added in SI / SR / ISI / ISR / IVO / STV -->
 <page string="Payments"
       attrs="{'invisible': [('type', 'not in', ('in_refund', 'out_invoice')),
                             '|', ('type', '!=', 'in_invoice'), ('is_intermission', '=', True)]}">
 
=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2021-01-29 15:17:52 +0000
+++ bin/addons/account/account_invoice_view.xml	2021-11-03 13:33:55 +0000
@@ -144,6 +144,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
+                    <field name="document_date"/>
+                    <field name="supplier_reference"/>
+
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
@@ -151,17 +154,14 @@
                     <field name="journal_id" invisible="1"/>
                     <field name="period_id" invisible="1" groups="account.group_account_user"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="user_id"/>
                     <field name="date_due"/>
                     <field name="origin"/>
                     <field name="line_count"/>
                     <field name="currency_id"/>
-                    <field name="residual" sum="Residual Amount"/>
-                    <field name="amount_untaxed" sum="Untaxed Amount"/>
-                    <field name="amount_total" sum="Total Amount"/>
+                    <field name="residual" />
+                    <field name="amount_total"/>
                     <field name="state"/>
-
-                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                    <button name="invoice_open" states="draft,proforma2" type="object" string="Approve" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -174,7 +174,10 @@
             <field name="arch" type="xml">
                 <form string="Supplier Invoice">
                     <group col="8" colspan="4">
-                        <field name="journal_id" widget="selection"/>
+                        <field name="journal_id"
+                               domain="[('inv_doc_type', '=', True)]"
+                               attrs="{'readonly': ['|', ('state', '!=', 'draft'), '&amp;', ('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                        <field name="vat_ok" invisible="1" />
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="is_intermission" invisible="1"/>  <!-- for Payment tab -->
@@ -186,7 +189,7 @@
                                         'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                         <newline/>
                         <field string="Supplier" name="partner_id" domain="[('supplier', '=', True)]"
-                               on_change="onchange_partner_id(type, partner_id, date_invoice, payment_term, partner_bank_id, company_id)"
+                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term,partner_bank_id,company_id,is_inkind_donation,is_intermission,is_debit_note,is_direct_invoice,False)"
                                context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
                                attrs="{'readonly': ['|',
                                                     ('state', '!=', 'draft'),
@@ -195,25 +198,52 @@
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
+                        <field name="document_date" />
                         <field name="date_invoice"/>
-                        <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
-                        <group colspan="2" col="1" groups="account.group_account_user">
-                            <label align="0.0" string="(keep empty to use the current period)"/>
-                        </group>
-                    </group>
+                        <group colspan="2" col="1" />
+                    </group>
+                    <newline />
+                    <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
+                        <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
+                        <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
+                    </group>
+                    <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
+                        <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
+                        <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
+                    </group>
+                    <field name="analytic_distribution_id" invisible="1"/>
+                    <group colspan="3"/>
+
                     <notebook colspan="4">
                         <page string="Invoice">
-                           <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user"/>
+                           <field domain="[('company_id', '=', company_id), ('restricted_area', '=', 'in_invoice')]" name="account_id" />
                             <field name="reference_type" nolabel="1" size="0"/>
                             <field name="reference" nolabel="1"/>
                             <field name="date_due"/>
                             <field name="check_total" required="2"/>
+                            <field name="supplier_reference"/>
+                            <group name="import" string=" Import Lines " colspan="4" col="4"
+                               attrs="{'invisible': [('state', '!=', 'draft'), ('type', '!=', 'in_invoice')]}">
+                                    <button name="import_invoice" string="Import Invoice Line" icon="gtk-execute" colspan="2" type="object"
+                                            attrs="{'readonly': [('state', '!=', 'draft')],
+                                                    'invisible': [('type', '!=', 'in_invoice')]}"/>
+                                    <button name="export_invoice" string="Export Invoice Line" icon="gtk-execute" colspan="2" type="object"
+                                            attrs="{'invisible': [('type', '!=', 'in_invoice')]}"/>
+                                    <newline/>
+                                    <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" colspan="4" type="object"
+                                            attrs="{'invisible': [('state', '!=', 'draft')],
+                                                    'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                           </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">
+                                <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">
                                     <field name="from_supply" invisible="1"/>
                                     <field name="line_synced" invisible="1"/>
                                     <field name="invoice_type" invisible="1"/>
                                     <field name="partner_type" invisible="1"/>
+                                    <field name="line_number" displayon="noteditable"/>
+                                    <field name="is_corrected" invisible="1"/>
+                                    <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                                     <field name="product_id"
                                            attrs="{'readonly': ['|',
                                                                 '&amp;', ('invoice_type', '=', 'in_invoice'), '|', ('line_synced', '=', True), ('from_supply', '=', True),
@@ -224,7 +254,13 @@
                                            domain="[('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
                                     />
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
-                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="inactive_product" invisible="1" />
+                                    <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection" context="context" attrs="{'invisible': [('is_allocatable', '=', False)]}"/>
+                                    <field name="analytic_distribution_state_recap"/>
+                                    <field name="have_analytic_distribution_from_header" invisible="1"/>
+                                    <field name="analytic_distribution_state" invisible="1"/>
+                                    <field name="is_allocatable" invisible="1"/>
+
                                     <field name="quantity"
                                            attrs="{'readonly': ['|',
                                                                 '&amp;', ('invoice_type', '=', 'in_invoice'), '|', ('line_synced', '=', True),('from_supply', '=', True),
@@ -240,7 +276,9 @@
                                 </tree>
                             </field>
                             <group col="1" colspan="2">
-                                <field name="tax_line" nolabel="1" attrs="{'invisible': [('vat_ok', '=', False)], 'readonly': ['|', ('state','!=', 'draft'), '&amp;', ('type', '=', 'in_invoice'), ('synced', '=', True)]}">
+                                <field name="tax_line" nolabel="1"
+                                       attrs="{'invisible': ['|', ('vat_ok', '=', False), ('doc_type', 'in', ('isi', 'isr'))],
+                                               'readonly': ['|', ('state','!=', 'draft'), '&amp;', ('type', '=', 'in_invoice'), ('synced', '=', True)]}">
                                     <tree editable="bottom" string="Taxes">
                                         <field name="invoice_id" invisible="True"/>
                                         <field name="account_tax_id" on_change="tax_code_change(account_tax_id, parent.amount_untaxed, parent.partner_id, context)"/>
@@ -265,24 +303,66 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific"/>
-                                <field name="amount_untaxed"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes"
+                                        type="object" icon="terp-stock_format-scientific"
+                                        attrs="{'invisible': ['|', ('vat_ok', '=', False), ('doc_type', 'in', ('isi', 'isr'))],
+                                                'readonly': [('state', '!=', 'draft')]}"/>
+                                <field name="amount_untaxed" attrs="{'invisible': ['|', ('vat_ok', '=', False), ('doc_type', 'in', ('isi', 'isr'))]}"/>
                                 <label string="" colspan="2"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_tax" attrs="{'invisible': ['|', ('vat_ok', '=', False), ('doc_type', 'in', ('isi', 'isr'))]}" />
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid,inv_close' icon="gtk-execute"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                                    <field name="doc_type" invisible="1"/>
+                                    <button name="%(account.action_account_invoice_refund)d" type='action' string='Refund' icon="gtk-execute"
+                                        attrs="{'invisible': ['|', '|',
+                                                                ('state', '=', 'draft'),
+                                                                ('type', 'in', ['in_refund', 'out_refund']),
+                                                                '&amp;', ('doc_type', '=', 'isi'), ('counterpart_inv_status', '!=', 'inv_close')]}"
+                                    />
+                                    <group attrs="{'invisible': [('doc_type', 'in', ('isi', 'isr'))]}">
+                                        <button name="invoice_open" states="draft,proforma2" type="object" string="Validate" icon="gtk-go-forward"/>
+                                        <field name="is_direct_invoice" invisible="1"/>
+                                        <button name="button_split_invoice" states="draft,proforma2" type="object" string="Split Invoice" icon="gtk-cut"/>
+                                        <newline/>
+                                        <field name="can_merge_lines" invisible="1"/>
+                                        <button name="button_merge_lines" type="object"
+                                                colspan="3"
+                                                string="Merge Lines by Account" icon="gtk-convert"
+                                                confirm="You are about to merge invoice lines; are you sure you want to proceed? THIS OPERATION CAN NOT BE UNDONE."
+                                                attrs="{'invisible': [('can_merge_lines', '!=', True)]}"/>
+                                    </group>
+
                                 </group>
                             </group>
+                            <!-- for ISI/STR the display of the buttons takes the whole width -->
+                            <group col="8" colspan="6" attrs="{'invisible': [('doc_type', 'not in', ('isi', 'isr'))]}">
+                                <button name="button_merge_lines2" type="object"
+                                        string="Merge Lines by Account"
+                                        icon="gtk-convert" colspan="2"
+                                        confirm="You are about to merge invoice lines; are you sure you want to proceed? THIS OPERATION CAN NOT BE UNDONE."
+                                        attrs="{'invisible': [('can_merge_lines', '!=', True)]}"
+                                />
+                                <button name="button_split_invoice2" type="object"
+                                        string="Split Invoice"
+                                        icon="gtk-cut" colspan="2"
+                                        states="draft"
+                                />
+                                <button name="invoice_open2" type="object"
+                                        string="Validate"
+                                        icon="gtk-go-forward" colspan="4"
+                                        states="draft"
+                                />
+                            </group>
                         </page>
                         <page string="Other Info">
+                            <field name="amount_to_pay"/>
                             <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                            <field name="company_id"
+                                   on_change="onchange_company_id(company_id, partner_id, type, invoice_line, currency_id, context)"
+                                   widget="selection" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
                             <field name="name"
@@ -304,6 +384,31 @@
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                         &payment_tab;
+                        <page string="Down Payments">
+                            <field name="down_payment_ids" nolabel="1" colspan="4">
+                                <tree string="Down Payment">
+                                    <field name="move_id"/>
+                                    <field name="name" string="Description"/>
+                                    <field name="ref"/>
+                                    <field name="date"/>
+                                    <field name="partner_type"/>
+                                    <field name="reconcile_txt"/>
+                                    <field name="debit_currency"/>
+                                    <field name="credit_currency"/>
+                                    <field name="amount_currency" sum="Total Amount"/>
+                                    <field name="currency_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <!-- display the Counterpart Invoice tab in SI, hide it in SR -->
+                        <page string="Counterpart Invoice" attrs="{'invisible': [('type', '!=', 'in_invoice')]}">
+                            <field name="from_supply" invisible="1"/>  <!-- make the field exportable -->
+                            <field name="synced" readonly="1"/>  <!-- SI can never be ticked as "Synced" manually -->
+                            <newline/>
+                            <field name="counterpart_inv_number"/>
+                            <field name="counterpart_inv_status"/>
+                        </page>
+
                     </notebook>
                 </form>
             </field>
@@ -314,38 +419,46 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice" noteditable="state=='cancel'">
+                <form string="Stock Transfer Voucher" noteditable="state=='cancel'">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user" widget="selection"/>
-                    <field name="journal_type" invisible="1"/>
-                    <field name="number"/>
-                    <field name="type" invisible="1"/>
-                    <field name="is_intermission" invisible="1"/>  <!-- for Payment tab -->
-                    <field name="currency_id" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
-                    <newline/>
-                    <field string="Customer" name="partner_id"
-                           domain="[('customer', '=', True)]"
-                           on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                           groups="base.group_user" context="{'search_default_customer': 1}"
-                           attrs="{'readonly': ['|',
-                                                ('state', '!=', 'draft'),
-                                                '&amp;', '&amp;',
-                                                ('type', '=', 'out_invoice'),
-                                                ('from_supply', '=', True),
-                                                ('partner_type', 'in', ('intermission', 'section'))]}"/>
-                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-                    <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-                    <newline/>
-                    <field name="date_invoice"/>
-                    <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
-                    <group colspan="2" col="1" groups="account.group_account_user">
-                        <label align="0.0" string="(keep empty to use the current period)"/>
-                    </group>
-                    </group>
+                        <field name="journal_id" domain="[('inv_doc_type', '=', True)]"/>
+                        <field name="journal_type" invisible="1"/>
+                        <field name="number"/>
+                        <field name="type" invisible="1"/>
+                        <field name="is_intermission" invisible="1"/>  <!-- for Payment tab -->
+                        <field name="currency_id" width="50"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
+                        <newline/>
+                        <field string="Customer" name="partner_id"
+                               domain="[('customer', '=', True)]"
+                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
+                               groups="base.group_user" context="{'search_default_customer': 1}"
+                               attrs="{'readonly': ['|',
+                                                    ('state', '!=', 'draft'),
+                                                    '&amp;', '&amp;',
+                                                    ('type', '=', 'out_invoice'),
+                                                    ('from_supply', '=', True),
+                                                    ('partner_type', 'in', ('intermission', 'section'))]}"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                        <newline/>
+                        <field name="document_date"/>
+                        <field name="date_invoice"/>
+                        <group colspan="2" col="1" groups="account.group_account_user">
+                        </group>
+                    </group>
+                    <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
+                            <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
+                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
+                    </group>
+                    <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
+                            <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
+                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
+                    </group>
+                    <field name="analytic_distribution_id" invisible="1"/>
+                    <group colspan="3"/>
                     <notebook colspan="4">
                         <page string="Invoice">
-                            <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
+                            <field domain="[('company_id', '=', company_id), ('restricted_area', '=', 'out_invoice')]" name="account_id" />
                             <field name="name" attrs="{'readonly': ['|',
                                                                     ('state', '!=', 'draft'),
                                                                     '&amp;', '&amp;',
@@ -353,6 +466,21 @@
                                                                     ('from_supply', '=', True),
                                                                     ('partner_type', 'in', ('intermission', 'section'))]}"/>
                             <field name="payment_term" widget="selection"/>
+                            <group name="import" string=" Import Lines " colspan="4" col="4"
+                                attrs="{'invisible': [('state', '!=', 'draft'), ('type', '!=', 'out_invoice')]}">
+                                <button name="import_invoice" string="Import Invoice Line" icon="gtk-execute" colspan="2" type="object"
+                                    attrs="{'readonly': [('state', '!=', 'draft')],
+                                    'invisible': [('type', '!=', 'out_invoice')]}"/>
+                                <button name="export_invoice" string="Export Invoice Line" icon="gtk-execute" colspan="2" type="object"
+                                    attrs="{'invisible': [('type', '!=', 'out_invoice')]}"
+                                    force_editable="1"/>
+                                <newline/>
+                                <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" colspan="4" type="object"
+                                    attrs="{'invisible': [('state', '!=', 'draft')],
+                                    'readonly': [('type', '=', 'out_invoice'),
+                                    ('from_supply', '=', True),
+                                    ('partner_type', 'in', ('intermission', 'section'))]}"/>
+                            </group>
                             <field colspan="4" name="invoice_line" nolabel="1" context="{'fake': 1, 'from_inv_form': True}">
                                 <tree string="Invoice Line"
                                       colors="red:inactive_product == True or analytic_distribution_state in ('invalid', 'invalid_small_amount');blue:inactive_product == False and analytic_distribution_state in ('valid');black:inactive_product == False and analytic_distribution_state in ('none')"
@@ -397,44 +525,66 @@
                                     <field name="name"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="2">
-                                <field name="tax_line" nolabel="1">
-                                    <tree editable="bottom" string="Taxes">
-                                        <field name="name"/>
-                                        <field name="account_id" groups="account.group_account_invoice"/>
-                                        <field name="base"
-                                               on_change="base_change(base, parent.currency_id, parent.company_id, parent.document_date, parent.date_invoice)"
-                                               readonly="1"/>
-                                        <field name="amount"
-                                               on_change="amount_change(amount, parent.currency_id, parent.company_id, parent.document_date, parent.date_invoice)"/>
-                                        <field invisible="True" name="base_amount"/>
-                                        <field invisible="True" name="tax_amount"/>
-                                        <field name="factor_base" invisible="True"/>
-                                        <field name="factor_tax" invisible="True"/>
-                                    </tree>
-                                </field>
-                            </group>
-                            <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
-                                <field name="amount_untaxed"/>
-                                <label string="" colspan="2"/>
-                                <field name="amount_tax"/>
+                            <group col="1" colspan="2" />
+                            <group col="8" colspan="4">
+                                <label string="" colspan="3"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
+                                <label string="" colspan="3"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid,inv_close' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,inv_close,proforma,sale,proforma2"/>
-                                </group>
+                                <field name="is_debit_note" invisible="1"/>
+                            </group>
+                            <field name="partner_type" invisible="1"/>
+                            <group col="8" colspan="4">
+
+                                <field name="doc_type" invisible="1"/>
+
+                                <button string="Cancel document" name="invoice_cancel"
+                                        type="workflow" icon="gtk-cancel"
+                                        confirm="Do you really want to cancel this document?"
+                                        attrs="{'invisible': ['|', '|',
+                                                              ('state', '!=', 'draft'),
+                                                              ('type', '!=', 'out_invoice'),
+                                                              ('from_supply', '=', False)]}"/>
+
+                                <button name="button_split_invoice" type="object" string="Split Stock Transfer Voucher"
+                                        icon="gtk-cut"
+                                        context="{'from_stv': True}"
+                                        attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('doc_type', '!=', 'stv')]}"/>
+
+                                <button name="%(account.action_account_invoice_refund)d" type='action' string='Refund' icon="gtk-execute" attrs="{'invisible': ['|', ('state', 'in', ['draft']), ('type', 'in', ['in_refund', 'out_refund'])]}"/>
+                                <!-- add a confirmation step only for STV (not for CR/STR)
+                                     when the partner type is compatible with a synchro but "synced" isn't ticked -->
+                                <button name="invoice_open" type="object" string="Validate"
+                                        icon="gtk-go-forward"
+                                        attrs="{'invisible': ['|',
+                                                              ('state', '!=', 'draft'),
+                                                              '&amp;',
+                                                              ('doc_type', '=', 'stv'), ('partner_type', 'in', ('intermission', 'section')) ]}"/>
+                                <button name="invoice_open_with_confirmation" type="object" string="Validate"
+                                        icon="gtk-go-forward"
+                                        confirm="Are you sure you want to validate this invoice without synchronization?"
+                                        attrs="{'invisible': ['|', '|', '|',
+                                                              ('state', '!=', 'draft'),
+                                                              ('doc_type', '!=', 'stv'),
+                                                              ('synced', '=', True),
+                                                              ('partner_type', 'not in', ('intermission', 'section'))]}"/>
+
+                                <button name="invoice_open_with_sync_confirmation" type="object" string="Validate"
+                                        icon="gtk-go-forward"
+                                        confirm="This invoice will sync to its counterpart instance."
+                                        attrs="{'invisible': ['|', '|', '|',
+                                                              ('state', '!=', 'draft'),
+                                                              ('doc_type', '!=', 'stv'),
+                                                              ('synced', '=', False),
+                                                              ('partner_type', 'not in', ('intermission', 'section'))]}"/>
+                                <button name="%(account.account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,inv_close,proforma,sale,proforma2"/>
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id, partner_id, type, invoice_line, currency_id, context)"
+                                   widget="selection" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="date_due"/>
                             <field name="user_id" attrs="{'readonly': ['|',
@@ -461,7 +611,7 @@
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                         &payment_tab;
-                        <!-- display the Counterpart Invoice tab in STV, hide it in Customer Refunds -->
+                        <!-- display the Counterpart Invoice tab in STV, hide it in CR/STR -->
                         <page string="Counterpart Invoice" attrs="{'invisible': [('type', '!=', 'out_invoice')]}">
                             <field name="from_supply" invisible="1"/>
                             <field name="synced"
@@ -484,16 +634,19 @@
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
-                        <separator orientation="vertical"/>
-                        <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
+                        <filter name="unpaid" icon="terp-dolar_ok!" string="Open" domain="[('state','=','open')]" help="Open Invoices"/>
+                        <filter name="paid" icon="terp-dolar" string="Paid" domain="[('state', '=', 'paid')]"/>
+                        <filter name="closed" icon="terp-dialog-close" string="Closed" domain="[('state', '=', 'inv_close')]" />
+                        <filter name="cancel_state" icon="terp-gtk-stop" string="Cancelled" domain="[('state', '=', 'cancel')]"/>
+                        <separator orientation="vertical"/>
+                        <filter name="not_imported" icon="gtk-cancel" string="Not imported" domain="[('imported_state', '=', 'not')]"/>
+                        <filter name="partial" icon="terp-dolar_ok!" string="Partially imported" domain="[('imported_state', '=', 'partial')]"/>
+                        <filter name="imported" icon="gtk-apply" string="Imported" domain="[('imported_state', '=', 'imported')]"/>
+                        <separator orientation="vertical"/>
+
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" select="1" widget="selection" string="Salesman">
-                        <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" separator="1"/>
-                        </field>
                         <field name="origin"/>
                         <field name="amount_total"/>
                     </group>
@@ -501,11 +654,12 @@
                     <group col="10" colspan="4">
                         <field name="journal_id" widget="selection" select='1'/>
                         <field name="period_id" select='1' string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
+                        <field name="supplier_reference"/>
+                        <field name="name"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
@@ -552,15 +706,16 @@
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
 
-        <record id="action_invoice_tree1" model="ir.actions.act_window">
-            <field name="name">Customer Invoices</field>
+    <!-- Fix customer invoice display with a bypass on 'is_debit_note' set to True -->
+        <record id="account.action_invoice_tree1" model="ir.actions.act_window">
+            <field name="name">Customer Invoices</field>  <!-- Stock Transfer Vouchers -->
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="domain">[('doc_type', '=', 'stv')]</field>
+            <field name="context">{'doc_type': 'stv', 'type': 'out_invoice', 'journal_type': 'sale', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_unpaid': 1, 'search_default_paid': 1, 'search_default_closed': 1}</field>
+            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
             <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
         </record>
 
@@ -578,20 +733,26 @@
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
 
-        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
+        <!-- STV -->
+        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables" sequence="3"/>
 
-        <record id="action_invoice_tree2" model="ir.actions.act_window">
+          <!-- Fix supplier invoice display with a bypass on 'is_inkind_donation' set to True -->
+        <record id="account.action_invoice_tree2" model="ir.actions.act_window">
             <field name="name">Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','in_invoice')]</field>
-            <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
+            <!-- US-2704 if the domain change, do not forget to update the domain of account_board_supplier_invoice_draft in finance/board_account_view.xml -->
+            <field name="domain">[('doc_type', '=', 'si')]</field>
+            <field name="context">{'doc_type': 'si', 'type': 'in_invoice', 'journal_type': 'purchase', 'from_inv_form': True}</field>
+            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers.
+                OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice
+                from your supplier according to what you purchased or received.</field>
         </record>
-        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
+
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables" sequence="10"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
             <field name="name">Customer Refunds</field>
@@ -599,8 +760,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','out_refund')]</field>
-            <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
+            <field name="domain">[('doc_type', '=', 'cr')]</field>
+            <field name="context">{'doc_type': 'cr', 'type': 'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
         </record>
@@ -617,7 +778,8 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
-        <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
+        <!-- Customer Refunds Menu -->
+        <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables" sequence="6"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
             <field name="name">Supplier Refunds</field>
@@ -625,14 +787,40 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','in_refund')]</field>
-            <field name="context">{'type':'in_refund', 'journal_type': 'purchase_refund'}</field>
+            <field name="domain">[('doc_type', '=', 'sr')]</field>
+            <field name="context">{'doc_type': 'sr', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
         </record>
-        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
-
-        <act_window context="{'search_default_partner_id':[active_id]}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
+        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables" sequence="15"/>
+
+
+        <record id="generic_invoice_tree" model="ir.ui.view">
+            <field name="name">account.invoice.generic.tree</field>
+            <field name="model">account.invoice</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="100" />
+            <field name="arch" type="xml">
+                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice" hide_new_button="1" hide_edit_button="1" hide_delete_button="1">
+                    <button name="invoice_open_form_view" string="Display Invoice" icon="gtk-go-forward" type="object"/>
+                    <field name="doc_type"/>
+                    <field name="date_invoice"/>
+                    <field name="number"/>
+                    <field name="partner_id"/>
+                    <field name="name"/>
+                    <field name="date_due"/>
+                    <field name="origin"/>
+                    <field name="line_count"/>
+                    <field name="currency_id"/>
+                    <field name="residual" sum="Residual Amount"/>
+                    <field name="amount_untaxed" sum="Untaxed Amount"/>
+                    <field name="amount_total" sum="Total Amount"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <act_window context="{'search_default_partner_id': [active_id], 'generic_invoice': True}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner" view_id="generic_invoice_tree" view_mode="tree" search_view_id="view_account_invoice_filter"/>
+
 
         <act_window
            id="act_account_journal_2_account_invoice_opened"
@@ -641,5 +829,80 @@
            res_model="account.invoice"
            src_model="account.journal"/>
 
+        <!-- STOCK TRANSFER REFUNDS -->
+        <record id="action_str" model="ir.actions.act_window">
+            <field name="name">Stock Transfer Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field eval="False" name="view_id"/>
+            <field name="domain">[('doc_type', '=', 'str')]</field>
+            <field name="context">{'doc_type': 'str', 'type': 'out_refund', 'from_inv_form': True}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/> <!-- as for Customer Refunds -->
+        </record>
+        <record id="action_str_tree" model="ir.actions.act_window.view">
+            <field eval="30" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="invoice_tree"/> <!-- as for Customer Refunds (default tree view) -->
+            <field name="act_window_id" ref="action_str"/>
+        </record>
+        <record id="action_str_form" model="ir.actions.act_window.view">
+            <field eval="35" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>  <!-- as for Customer Refunds -->
+            <field name="act_window_id" ref="action_str"/>
+        </record>
+        <menuitem action="action_str" id="menu_action_str" parent="menu_finance_receivables" sequence="4"/>
+
+        <!-- INTERSECTION SUPPLIER INVOICES -->
+        <record id="action_isi" model="ir.actions.act_window">
+            <field name="name">Intersection Supplier Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field eval="False" name="view_id"/>
+            <field name="domain">[('doc_type', '=', 'isi')]</field>
+            <field name="context">{'doc_type': 'isi', 'type': 'in_invoice', 'from_inv_form': True}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/> <!-- as for Supplier Invoices -->
+        </record>
+        <record id="action_isi_tree" model="ir.actions.act_window.view">
+            <field eval="40" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="invoice_tree"/> <!-- default tree view -->
+            <field name="act_window_id" ref="action_isi"/>
+        </record>
+        <record id="action_isi_form" model="ir.actions.act_window.view">
+            <field eval="45" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_isi"/>
+        </record>
+        <menuitem action="action_isi" id="menu_action_isi" parent="menu_finance_payables" sequence="20"/>
+
+        <!-- INTERSECTION SUPPLIER REFUNDS -->
+        <record id="action_isr" model="ir.actions.act_window">
+            <field name="name">Intersection Supplier Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field eval="False" name="view_id"/>
+            <field name="domain">[('doc_type', '=', 'isr')]</field>
+            <field name="context">{'doc_type': 'isr', 'type': 'in_refund', 'from_inv_form': True}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/> <!-- as for Supplier Refunds -->
+        </record>
+        <record id="action_isr_tree" model="ir.actions.act_window.view">
+            <field eval="50" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="invoice_tree"/> <!-- default tree view -->
+            <field name="act_window_id" ref="action_isr"/>
+        </record>
+        <record id="action_isr_form" model="ir.actions.act_window.view">
+            <field eval="55" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_isr"/>
+        </record>
+        <menuitem action="action_isr" id="menu_action_isr" parent="menu_finance_payables" sequence="22"/>
+
     </data>
 </openerp>
 
=== modified file 'bin/addons/account/account_menuitem.xml'
--- bin/addons/account/account_menuitem.xml	2017-04-13 14:08:16 +0000
+++ bin/addons/account/account_menuitem.xml	2021-11-03 13:33:55 +0000
@@ -8,7 +8,7 @@
             web_icon_hover="images/accounting-hover.png"/>
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
-        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
+        <menuitem id="account.menu_finance_bank_and_cash" name="Registers" parent="account.menu_finance" sequence="1" />
             groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="9" groups="group_account_user,group_account_manager"/>
         <!-- This menu is used in account_code module -->
 
=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2020-10-28 13:59:22 +0000
+++ bin/addons/account/account_view.xml	2021-11-03 13:33:55 +0000
@@ -167,35 +167,89 @@
             <field name="arch" type="xml">
                 <form string="Account">
                     <group col="6" colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="parent_id"/>
-                    <field name="type" select="1"/>
-                    <field name="user_type" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <newline/>
+                        <field name="parent_id"/>
+                        <field name="type" select="1"/>
+                        <field name="user_type_code" invisible="1"/>
+                        <field name="is_analytic_addicted" invisible="1"/>
+                        <field name="user_type" on_change="onchange_user_type(user_type, code)"/>
+                         <field name="shrink_entries_for_hq"/>
+                        <field name="is_child_of_coa" invisible="1" />
+                        <field name="display_in_reports" attrs="{'invisible': [('is_child_of_coa', '=', False)]}"  />
+                        <field name="type_for_register"/>
+                        <field name="accrual_account" />
+                        <field name="is_not_hq_correctible" on_change="onchange_is_not_hq_correctible(is_not_hq_correctible)"/>
+                        <newline/>
+                        <label string="" colspan="2"/>
+                        <field name="is_not_ad_correctable" on_change="onchange_is_not_ad_correctable(is_not_ad_correctable)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field name="active" groups="base.group_extended" />
-                            <newline/>
-                            <group col="2" colspan="2">
-                                <separator string="Currency" colspan="2"/>
-                                <field name="currency_id"/>
-                                <field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Reconcile" colspan="2"/>
-                                <field name="reconcile"/>
-                            </group>
-                            <separator string="Default Taxes" colspan="4"/>
-                            <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
-                            <separator string="Consolidated Children" colspan="4"/>
-                            <field name="child_consol_ids" colspan="4" nolabel="1" attrs="{'readonly':[('type','!=','consolidation')]}"/>
+                            <group col="6" colspan="4">
+                                <field name="activation_date"/>
+                                <field name="inactivation_date"/>
+                                <group col="2" colspan="2">
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile)"/>
+                                    <field name="prevent_multi_curr_rec" attrs="{'readonly': [('reconcile', '=', False)]}"/>
+                                    <field name="reconciliation_debit_account_id"/>
+                                    <field name="reconciliation_credit_account_id"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Analytical Destination">
+                            <field name="default_destination_id" colspan="2"
+                                attrs="{'required': [('is_analytic_addicted', '=', True)], 'readonly': [('is_analytic_addicted', '!=', True)]}"/>
+                            <label string="" colspan="2"/>
+                            <field name="destination_ids" nolabel="1" colspan="4" domain="[('type', '!=', 'view'), ('category', '=', 'DEST')]">
+                                <tree string="Destinations">
+                                    <field name="name"/>
+                                    <field name="description"/>
+                                    <field name="date_start"/>
+                                    <field name="date"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Allowed Partner types">
+                            <group col="4" colspan="4">
+                                <group col="2" colspan="2">
+                                    <field name="has_partner_type_internal" />
+                                    <field name="has_partner_type_external" />
+                                    <field name="has_partner_type_esc" />
+                                    <newline />
+                                    <field name="has_partner_type_local" />
+                                    <field name="has_partner_type_ex" />
+                                    <field name="has_partner_type_empty" />
+                                    <newline />
+                                    <field name="has_partner_type_book" />
+                                </group>
+
+                                <group col="2" colspan="2">
+                                    <field name="has_partner_type_intermission" />
+                                    <field name="has_partner_type_section" />
+
+                                    <label /><label />
+                                    <newline />
+                                    <label /><label />
+                                    <label /><label />
+                                    <newline />
+                                    <label /><label />
+                                </group>
+                            </group>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
+                        <page string="Currency Revaluation" attrs="{'invisible': [('instance_level', '=', 'project')]}">
+                            <field name="instance_level" invisible="1"/>
+                            <field name="currency_revaluation"
+                                attrs="{'readonly': ['|', ('instance_level', '!=', 'section'), ('user_type_code', 'not in', ['receivables', 'payables', 'cash', 'asset', 'stock'])]}"/>
+                        </page>
+                        <page string="End Year Closing"  attrs="{'invisible': [('instance_level', '=', 'project')]}">
+                            <field name="include_in_yearly_move"
+                                attrs="{'readonly': ['|', ('instance_level', '!=', 'section'), ('type', 'not in', ['other', ])]}"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -290,26 +344,24 @@
             </field>
         </record>
 
-        <record id="view_account_list" model="ir.ui.view">
-            <field name="name">account.account.list</field>
+        <!-- Tree view for default tree view of accounts -->
+        <record id="account.view_account_list" model="ir.ui.view">
+            <field name="name">account.account_activable.list</field>
             <field name="model">account.account</field>
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" nolink="1">
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="user_type" invisible="1"/>
-                    <field name="debit"/>
-                    <field name="credit"/>
-                    <field name="balance"/>
                     <field name="type"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="company_currency_id"/>
+                    <field name="activation_date"/>
+                    <field name="inactivation_date"/>
                 </tree>
             </field>
         </record>
+
         <record id="view_treasory_graph" model="ir.ui.view">
            <field name="name">account.treasury.graph</field>
            <field name="model">account.account</field>
@@ -334,26 +386,29 @@
         <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
 
-        <record id="view_account_tree" model="ir.ui.view">
-            <field name="name">account.account.tree</field>
+        <record model="ir.ui.view" id="account.view_account_tree">
+            <field name="name">account.account_activable.tree</field>
             <field name="model">account.account</field>
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
-            <field name="priority" eval="13"/>
+            <field name="priority" eval="12"/>
             <field name="arch" type="xml">
-                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" expand_button="1" nolink="1">
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="debit"/>
-                    <field name="credit"/>
-                    <field name="balance"/>
-                    <field name="company_currency_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="type"/>
+                    <field name="note"/>
+                    <field name="type" invisible="1"/>
+                    <field name="type_for_register" invisible="1"/>
+                    <field name="accrual_account" invisible="1"/>
+                    <field name="is_not_hq_correctible" invisible="1"/>
+                    <field name="activation_date" invisible="1"/>
+                    <field name="inactivation_date" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
+                    <field name="is_analytic_addicted" invisible="1"/>
                 </tree>
             </field>
         </record>
+
         <record id="action_account_tree" model="ir.actions.act_window">
             <field name="name">Chart of Accounts</field>
             <field name="res_model">account.account</field>
@@ -546,52 +601,84 @@
         </record>
         <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="menu_journals"/>
 
-        <record id="view_account_bank_statement_filter" model="ir.ui.view">
+        <!-- Bank Statement Filter -->
+        <record id="account.view_account_bank_statement_filter" model="ir.ui.view">
             <field name="name">account.cash.statement.select</field>
             <field name="model">account.bank.statement</field>
             <field name="type">search</field>
-            <field name="priority" eval="18"/>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group col="8" colspan="4">
-                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                        <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" name="draft"/>
+                        <filter string="Open" domain="[('state', '=', 'open')]" icon="terp-camera_test" name="open"/>
+                        <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-dialog-close" name="confirm"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
+                        <field name="instance_id" domain="[('instance_to_display_ids','=',True)]"/>
                         <field name="name"/>
-                        <field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
+                        <newline/>
+                        <field name="period_id" domain="[('state', '!=', 'created')]"/>
+                        <field name="journal_id" domain="[('type', '=', 'cash')]" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By...">
+                    <group expand="1" string="Group By...">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                         <separator orientation="vertical"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                        <filter string="Instance" context="{'group_by': 'instance_id'}" icon="terp-stage"/>
                     </group>
                 </search>
             </field>
         </record>
 
-        <record id="view_bank_statement_tree" model="ir.ui.view">
+
+        <!-- Bank Statement Tree  US-807: force the priority to 10 to avoid showing the view in addons, for default tree view, check the view named account.view_bank_statement_tree_for_journal for more info -->
+        <record id="account.view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
             <field name="type">tree</field>
-            <field name="priority" eval="19"/>
-            <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end and state=='draft';blue:state=='draft' and (balance_end_real==balance_end);black:state=='confirm'" string="Statement">
-                    <field name="name"/>
-                    <field name="date"/>
-                    <field name="period_id"/>
-                    <field name="journal_id"/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
-                    <field name="balance_end" invisible="1"/>
-                    <field name="state"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
-                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
-                </tree>
-            </field>
-        </record>
+            <field name="priority" eval="10"/>
+            <field name="arch" type="xml">
+                <tree colors="blue:state=='draft';black:state in ('open','confirm')" string="Register" hide_new_button="1" hide_delete_button="1">
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="period_id"/>
+                    <field name="currency"/>
+                    <field name="journal_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end" />
+                    <field name="balance_end_real"/>
+                    <field name="state"/>
+                    <button name="button_open_bank_register" states="draft" string="Open Bank" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button name="button_confirm_bank" states="open" string="Close Register" type="object" icon="terp-camera_test"/>
+                </tree>
+            </field>
+        </record>
+
+           <!-- US-807: force the priority to 5 to show by default for all cases, BUT when the tree is called from Bank/Cash/Cheque main menu, then the explicit view name will be picked in the python code "register_accounting/account_bank_statement.py" method: get_statement() -->
+        <record id="account.view_bank_statement_tree_for_journal" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree.journal</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="5"/>
+            <field name="arch" type="xml">
+                <tree colors="blue:state=='draft';black:state in ('open','confirm')" string="Register" hide_new_button="1" hide_delete_button="1"  editable="bottom" noteditable="1">
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="period_id"/>
+                    <field name="currency"/>
+                    <field name="journal_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end" />
+                    <field name="balance_end_real"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+
+
+
         <record id="view_bank_statement_search" model="ir.ui.view">
             <field name="name">account.bank.statement.search</field>
             <field name="model">account.bank.statement</field>
@@ -1821,7 +1908,7 @@
                       <filter icon="terp-camera_test" string="Running" name="running" domain="[('state', '=', 'running')]"/>
                       <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state', '=', 'done')]" />
                       <field name="name"/>
-                      <field name="journal_id" domain="[('type', '=', 'purchase'), ('is_current_instance', '=', True)]"/>
+                      <field name="journal_id" domain="[('type', '=', 'purchase'), ('code', '!=', 'ISI'), ('is_current_instance', '=', True)]"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
 
=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2021-04-23 16:43:40 +0000
+++ bin/addons/account/invoice.py	2021-11-03 13:33:55 +0000
@@ -28,7 +28,7 @@
 from tools.translate import _
 from msf_partner import PARTNER_TYPE
 from base import currency_date
-
+from tools.safe_eval import safe_eval
 
 class account_invoice(osv.osv):
     def _amount_all(self, cr, uid, ids, name, args, context=None):
@@ -46,21 +46,6 @@
             res[invoice.id]['amount_total'] = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed']
         return res
 
-    def _get_journal(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        type_inv = context.get('type', 'out_invoice')
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        company_id = context.get('company_id', user.company_id.id)
-        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
-        refund_journal = {'out_invoice': False, 'in_invoice': False, 'out_refund': True, 'in_refund': True}
-        journal_obj = self.pool.get('account.journal')
-        res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
-                                           ('company_id', '=', company_id),
-                                           ('refund_journal', '=', refund_journal.get(type_inv, False))],
-                                 limit=1)
-        return res and res[0] or False
-
     def _get_journal_analytic(self, cr, uid, type_inv, context=None):
         type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
         tt = type2journal.get(type_inv, 'sale')
@@ -363,7 +348,6 @@
     _defaults = {
         'type': _get_type,
         'state': 'draft',
-        'journal_id': _get_journal,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
         'reference_type': 'none',
         'check_total': 0.0,
@@ -371,52 +355,76 @@
         'user_id': lambda s, cr, u, c: u,
     }
 
+    def _set_invoice_name(self, cr, uid, doc, context=None):
+        """
+        Sets the correct invoice name to be displayed depending on the doc_type
+        """
+        if context is None:
+            context = {}
+        if context.get('doc_type'):
+            for doc_type in self._get_invoice_type_list(cr, uid, context=context):
+                if context['doc_type'] in doc_type:
+                    doc.attrib['string'] = doc_type[1]
+                    break
+        return True
+
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
-        journal_obj = self.pool.get('account.journal')
         if context is None:
             context = {}
-
-        if context.get('active_model', '') in ['res.partner'] and context.get('active_ids', False) and context['active_ids']:
-            partner = self.pool.get(context['active_model']).read(cr, uid, context['active_ids'], ['supplier','customer'])[0]
-            if not view_type:
-                view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'account.invoice.tree')])
-                view_type = 'tree'
-            if view_type == 'form':
-                if partner['supplier'] and not partner['customer']:
-                    view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.supplier.form')])
-                else:
-                    view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.form')])
         if view_id and isinstance(view_id, (list, tuple)):
             view_id = view_id[0]
         res = super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-
-        type = context.get('journal_type', 'sale')
-        if 'journal_id' in res['fields']:
-            filter_journal = [('type', '=', type), ('is_current_instance','=',True)]
-            if type == 'inkind' and context.get('is_inkind_donation'):
-                filter_journal = [('is_current_instance','=',True), ('type', 'in', ('inkind', 'extra'))]
-            journal_select = journal_obj._name_search(cr, uid, '', filter_journal, context=context, limit=None, name_get_uid=1)
-            res['fields']['journal_id']['selection'] = journal_select
-
-        if view_type == 'form' and context.get('type', 'out_invoice') == 'in_refund':
+        if view_type == 'form':
             doc = etree.XML(res['arch'])
-            doc.attrib['string'] = _('Supplier Refund')
-            nodes = doc.xpath("//field[@name='amount_to_pay']")
-            for node in nodes:
-                node.set('string', _('Amount to be refunded'))
+            if context.get('type', 'out_invoice') == 'in_refund' or context.get('doc_type', '') == 'isr':
+                nodes = doc.xpath("//field[@name='amount_to_pay']")
+                for node in nodes:
+                    node.set('string', _('Amount to be refunded'))
+            # adapt the form name depending on the doc_type (used e.g. when clicking on a res.log)
+            self._set_invoice_name(cr, uid, doc, context=context)
+            """
+            Restriction on allowed partners:
+            - for STV/STR: Intersection or External customers only
+            - for ISI/ISR: Intersection suppliers only
+            - for SI/SR: non-Intersection suppliers only
+            """
+            partner_domain = ""
+            if context.get('doc_type', '') in ('stv', 'str') or (
+                context.get('type', False) == 'out_invoice' and context.get('journal_type', False) == 'sale' and
+                not context.get('is_debit_note', False) and not context.get('is_intermission', False)
+            ):
+                partner_domain = "[('partner_type', 'in', ('section', 'external')), ('customer', '=', True)]"
+            elif context.get('doc_type', '') in ('isi', 'isr'):
+                partner_domain = "[('partner_type', '=', 'section'), ('supplier', '=', True)]"
+            elif (context.get('doc_type', '') in ('si', 'sr')) or \
+                (context.get('type') == 'in_invoice' and context.get('journal_type') == 'purchase') or \
+                    (context.get('type') == 'in_refund' and context.get('journal_type') == 'purchase_refund'):
+                partner_domain = "[('partner_type', '!=', 'section'), ('supplier', '=', True)]"
+            if partner_domain:
+                partner_nodes = doc.xpath("//field[@name='partner_id']")
+                for node in partner_nodes:
+                    node.set('domain', partner_domain)
             res['arch'] = etree.tostring(doc)
-
-        if view_type == 'tree':
+        elif view_type == 'tree':
             doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='partner_id']")
             # (US-777) Remove the possibility to create new invoices through the "Advance Return" Wizard
             if context.get('from_wizard') and context.get('from_wizard')['model'] == 'wizard.cash.return':
                 doc.set('hide_new_button', 'True')
-            partner_string = _('Customer')
-            if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
+            # adapt the name of the Partner field depending on the view
+            nodes = doc.xpath("//field[@name='partner_id']")
+            if context.get('generic_invoice') or context.get('journal_type') == 'intermission':
+                # for tree views combining Customer and Supplier Invoices, or for IVI/IVO
+                partner_string = _('Partner')
+            elif context.get('journal_type', False) == 'inkind':
+                partner_string = _('Donor')
+            elif context.get('type', 'out_invoice') in ('in_invoice', 'in_refund') or context.get('doc_type', '') in ('isi', 'isr'):
                 partner_string = _('Supplier')
+            else:
+                partner_string = _('Customer')
             for node in nodes:
                 node.set('string', partner_string)
+            # ensure that the doc name remains consistent even after clicking on a filter in the Search View
+            self._set_invoice_name(cr, uid, doc, context=context)
             res['arch'] = etree.tostring(doc)
         elif view_type == 'search':
             # remove the Cancel filter in all invoices but IVO and STV (in Donations the filter is named differently)
@@ -430,20 +438,14 @@
                 if filter_node:
                     filter_node[0].getparent().remove(filter_node[0])
                 res['arch'] = etree.tostring(doc)
+        if view_type in ('tree', 'search') and (context.get('type') in ['out_invoice', 'out_refund'] or context.get('doc_type') == 'str'):
+            doc = etree.XML(res['arch'])
+            nodes = doc.xpath("//field[@name='supplier_reference']")
+            for node in nodes:
+                node.getparent().remove(node)
+            res['arch'] = etree.tostring(doc)
         return res
 
-    def get_log_context(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        is_intermission = context.get('is_intermission', False)
-        if is_intermission:
-            res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_override', 'view_intermission_form')
-        else:
-            res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
-        view_id = res and res[1] or False
-        context.update({'view_id': view_id})
-        return context
-
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
@@ -453,8 +455,6 @@
                 ctx = context.copy()
                 if 'is_intermission' in vals:
                     ctx.update({'is_intermission': vals['is_intermission']})
-                if vals.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
-                    ctx = self.get_log_context(cr, uid, context=ctx)
                 if 'type' in vals:
                     ctx.update({'type': vals['type']})
                 if '_terp_view_name' in ctx:
@@ -633,10 +633,8 @@
     def onchange_partner_bank(self, cursor, user, ids, partner_bank_id=False):
         return {'value': {}}
 
-    def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
+    def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id, context=None):
         val = {}
-        dom = {}
-        obj_journal = self.pool.get('account.journal')
         account_obj = self.pool.get('account.account')
         inv_line_obj = self.pool.get('account.invoice.line')
         if company_id and part_id and type:
@@ -683,35 +681,13 @@
                                                  _('Invoice line account company does not match with invoice company.'))
                         else:
                             continue
-        if company_id and type:
-            if type in ('out_invoice'):
-                journal_type = 'sale'
-            elif type in ('out_refund'):
-                journal_type = 'sale_refund'
-            elif type in ('in_refund'):
-                journal_type = 'purchase_refund'
-            else:
-                journal_type = 'purchase'
-            journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
-            if journal_ids:
-                val['journal_id'] = journal_ids[0]
-            res_journal_default = self.pool.get('ir.values').get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
-            for r in res_journal_default:
-                if r[1] == 'journal_id' and r[2] in journal_ids:
-                    val['journal_id'] = r[2]
-            if not val.get('journal_id', False):
-                raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
-            dom = {'journal_id':  [('id', 'in', journal_ids)]}
-        else:
-            journal_ids = obj_journal.search(cr, uid, [])
-
         if currency_id and company_id:
             currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
             if currency.company_id and currency.company_id.id != company_id:
                 val['currency_id'] = False
             else:
                 val['currency_id'] = currency.id
-        return {'value': val, 'domain': dom}
+        return {'value': val}
 
     def onchange_synced(self, cr, uid, ids, synced, partner_id):
         """
@@ -899,11 +875,12 @@
             i['currency_id'] = inv.currency_id.id
             i['amount_currency'] = i['price']
             i['ref'] = ref
-            if inv.type in ('out_invoice','in_refund'):
+            # the direction of the amounts depends on the invoice type
+            if inv.doc_type in ('stv', 'ivo', 'dn', 'sr', 'isr'):
                 i['price'] = -i['price']
                 i['amount_currency'] = - i['amount_currency']
                 i['change_sign'] = True
-            else:
+            else:  # 'str', 'ivi', 'si', 'di', 'isi', 'cr', 'donation'
                 i['change_sign'] = False
             total -= i['amount_currency']
         return total, invoice_move_lines
@@ -1008,6 +985,7 @@
                 # UTP-594: Get ref and name
                 if inv.type == 'in_invoice':
                     is_ivi = inv.is_intermission and not inv.is_debit_note and not inv.is_inkind_donation
+                    # SI or ISI
                     is_si = not inv.is_direct_invoice and not inv.is_inkind_donation and not inv.is_debit_note and not inv.is_intermission
                     intersection = inv.partner_id.partner_type == 'section'
                     external = inv.partner_id.partner_type == 'external'
@@ -1232,8 +1210,6 @@
 
             for inv_id, name in self.name_get(cr, uid, [id]):
                 ctx = context.copy()
-                if obj_inv.type in ('out_invoice', 'out_refund'):
-                    ctx = self.get_log_context(cr, uid, context=ctx)
                 ctx['type'] = obj_inv.type
                 message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
                 self.log(cr, uid, inv_id, message, context=ctx)
@@ -1243,6 +1219,13 @@
         """
         Sets the invoice to Cancelled and not Synchronized
         """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        draft_invoice_ids = self.search(cr, uid, [('state', '=', 'draft'), ('id', 'in', ids)])
+        if draft_invoice_ids:
+            self.update_commitments(cr, uid, draft_invoice_ids)
+
         self.write(cr, uid, ids, {'state': 'cancel', 'synced': False})
         return True
 
@@ -1291,13 +1274,22 @@
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
-        types = {
-            'out_invoice': 'CI: ',
-            'in_invoice': 'SI: ',
-            'out_refund': 'OR: ',
-            'in_refund': 'SR: ',
+        doc_types = {
+            'stv': _('STV: '),
+            'str': _('STR: '),
+            'cr': _('CR: '),
+            'dn': _('DN: '),
+            'ivo': _('IVO: '),
+            'si': _('SI: '),
+            'di': _('DI: '),
+            'sr': _('SR: '),
+            'isi': _('ISI: '),
+            'isr': _('ISR: '),
+            'donation': _('DON: '),
+            'ivi': _('IVI: '),
         }
-        return [(r['id'], (r['number']) or types[r['type']] + (r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
+        return [(r['id'], (r['number']) or doc_types[r['doc_type']] + (r['name'] or '')) for r in
+                self.read(cr, uid, ids, ['doc_type', 'number', 'name'], context, load='_classic_write')]
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
@@ -1364,8 +1356,8 @@
         """
         res = [
             'name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id',
-            'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id',
-            'analytic_distribution_id', 'document_date',
+            'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line',
+            'journal_id', 'analytic_distribution_id', 'document_date', 'doc_type',
         ]
         return res
 
@@ -1441,10 +1433,24 @@
             else:
                 refund_journal_ids = obj_journal.search(cr, uid, [('type','=','sale_refund')])
 
+            if invoice.get('doc_type') == 'stv':
+                doc_type = 'str'
+            elif invoice.get('doc_type') == 'isi':
+                doc_type = 'isr'
+            elif invoice.get('doc_type') in ('si', 'di'):
+                doc_type = 'sr'
+            elif invoice.get('doc_type') == 'ivo':
+                doc_type = 'ivi'
+            elif invoice.get('doc_type') == 'ivi':
+                doc_type = 'ivo'
+            else:
+                doc_type = ''
+
             if not date:
                 date = time.strftime('%Y-%m-%d')
             invoice.update({
                 'type': type_dict[invoice['type']],
+                'real_doc_type': doc_type,
                 'date_invoice': date,
                 'state': 'draft',
                 'number': False,
@@ -1474,7 +1480,7 @@
                 invoice[field] = invoice[field] and invoice[field][0]
             invoice = self._hook_refund_data(cr, uid, invoice) or invoice
             # create the new invoice
-            new_ids.append(self.create(cr, uid, invoice))
+            new_ids.append(self.create(cr, uid, invoice, context=context))
 
         return new_ids
 
@@ -1584,6 +1590,21 @@
                                                                                   'account.invoice.update_counterpart_inv', self._logger, check_identifier=False, context=context)
         return True
 
+    def invoice_open_form_view(self, cr, uid, ids, context=None):
+        if not ids:
+            return True
+        view_data = self._get_invoice_act_window(cr, uid, ids[0], views_order=['form', 'tree'], context=context)
+        view_data['res_id'] = ids[0]
+        view_data['target'] = 'current'
+        view_data['keep_open'] = True
+        if context.get('search_default_partner_id'):
+            dom = []
+            if view_data['domain']:
+                dom = safe_eval(view_data['domain'])
+            dom.append(('partner_id', '=', context.get('search_default_partner_id')))
+            view_data['domain'] = dom
+        return view_data
+
 account_invoice()
 
 class account_invoice_line(osv.osv):
@@ -2140,7 +2161,7 @@
     def get(self, cr, uid, key, key2, models, meta=False, context=None, res_id_req=False, without_user=True, key2_req=True, view_id=False):
         """
         Hides the reports:
-        - "Invoice Excel Export" in the menu of other invoices than IVO/IVI
+        - "Invoice Excel Export" in the menu of other invoices than IVO/IVI/STV
         - "FO Follow-up Finance" in the menu of other invoices than IVO/STV
         - "STV/IVO lines follow-up" in the menu of other invoices than IVO/STV (+ renames it depending on the inv. type)
         """
@@ -2162,7 +2183,8 @@
                     elif context_stv:
                         v[2]['name'] = _('STV lines follow-up')
                 # display
-                if not context.get('is_intermission') and len(v) > 2 and v[2].get('report_name', '') == 'invoice.excel.export':
+                if not context.get('is_intermission') and not context_stv and len(v) > 2 and \
+                        v[2].get('report_name', '') == 'invoice.excel.export':
                     continue
                 elif not context_ivo and not context_stv and len(v) > 1 and v[1] in ('fo_follow_up_finance', 'invoice_lines_follow_up'):
                     continue
 
=== modified file 'bin/addons/account/report/account_print_invoice.rml'
--- bin/addons/account/report/account_print_invoice.rml	2019-03-22 14:16:36 +0000
+++ bin/addons/account/report/account_print_invoice.rml	2021-11-03 13:33:55 +0000
@@ -139,6 +139,7 @@
   </stylesheet>
   <story>
   <pto>
+    <!-- NOTE: this report seems to be overwritten by account_override/report/account_print_invoice.rml -->
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8"></para>
     <pto_header><!-- Must be after setLang() -->
 
=== modified file 'bin/addons/account/report/export_invoice.py'
--- bin/addons/account/report/export_invoice.py	2021-04-27 16:09:42 +0000
+++ bin/addons/account/report/export_invoice.py	2021-11-03 13:33:55 +0000
@@ -27,13 +27,13 @@
     """
     Returns True if the fields Product and Quantity of the invoice must be readonly = not editable
     """
-    if inv.type == 'in_invoice' and not inv.is_direct_invoice and not inv.is_inkind_donation:  # IVI or SI
+    if inv.doc_type in ('ivi', 'si', 'isi'):
         is_readonly = inv.from_supply or inv.synced
-    elif inv.type == 'out_invoice' and inv.is_intermission:  # IVO
+    elif inv.doc_type == 'ivo':
         is_readonly = inv.from_supply
-    elif inv.type == 'out_invoice' and not inv.is_intermission and not inv.is_debit_note:  # STV
+    elif inv.doc_type == 'stv':
         is_readonly = inv.from_supply and inv.partner_type == 'section'
-    elif inv.type == 'in_invoice' and inv.is_inkind_donation:  # Donation
+    elif inv.doc_type == 'donation':
         is_readonly = inv.from_supply
     else:  # other inv. types are not supposed to be handled in this report
         is_readonly = True
 
=== modified file 'bin/addons/account/report/invoice_excel_export.py'
--- bin/addons/account/report/invoice_excel_export.py	2020-04-09 09:06:08 +0000
+++ bin/addons/account/report/invoice_excel_export.py	2021-11-03 13:33:55 +0000
@@ -37,8 +37,10 @@
 
     def _get_distribution_lines(self, inv_line):
         """
-        Returns distrib. line data related to the invoice line in parameter, as a list of dicts
-        Note: it gives a result even for lines without AD: the line subtotal is retrieved in any cases
+        Returns distrib. line data related to the invoice line in parameter, as a list of dicts.
+        Notes:
+            - it gives a result even for lines without AD: the line subtotal is retrieved in any cases
+            - only CC and Dest are retrieved, FP is excluded.
         """
         fp_distrib_line_obj = self.pool.get('funding.pool.distribution.line')
         distrib_lines = []
@@ -69,18 +71,19 @@
 
     def _get_shipment_number(self, inv):
         """
-        Returns the "shipment" or "simple OUT" number having generated the IVO if linked to a supply workflow
-        Displayed for both the IVO and the IVI.
+        Returns the "shipment" or "simple OUT" number having generated the IVO/STV if linked to a supply workflow
+        Displayed for both the IVO/STV and the IVI.
         """
         if self.invoices.get(inv.id, {}).get('shipment', None) is not None:
             # process only once per invoice
             return self.invoices[inv.id]['shipment']
         ship_or_out_ref = ''
-        if inv.from_supply and inv.is_intermission:
-            if inv.type == 'out_invoice':  # IVO
+        if inv.from_supply:
+            inv_type = self.pool.get('account.invoice').read(self.cr, self.uid, inv.id, ['doc_type'])['doc_type']
+            if inv_type in ('ivo', 'stv'):
                 if inv.name:
                     ship_or_out_ref = inv.name.split()[-1]
-            elif inv.type == 'in_invoice':  # IVI
+            elif inv_type == 'ivi':
                 if inv.picking_id:
                     ship_or_out_ref = inv.picking_id.shipment_ref or ''
         self.invoices.setdefault(inv.id, {}).update({'shipment': ship_or_out_ref})
@@ -88,20 +91,21 @@
 
     def _get_fo_number(self, inv):
         """
-        Returns the FO number related to the IVO if any.
-        Displayed for both the IVO and the IVI.
+        Returns the FO number related to the IVO/STV if any.
+        Displayed for both the IVO/STV and the IVI.
         """
         if self.invoices.get(inv.id, {}).get('fo', None) is not None:
             # process only once per invoice
             return self.invoices[inv.id]['fo']
         fo_number = ''
-        if inv.from_supply and inv.is_intermission:
-            if inv.type == 'out_invoice':  # IVO
+        if inv.from_supply:
+            inv_type = self.pool.get('account.invoice').read(self.cr, self.uid, inv.id, ['doc_type'])['doc_type']
+            if inv_type in ('ivo', 'stv'):
                 if inv.origin:
                     inv_source_doc_split = inv.origin.split(':')
                     if inv_source_doc_split:
                         fo_number = inv_source_doc_split[-1]
-            elif inv.type == 'in_invoice':  # IVI
+            elif inv_type == 'ivi':
                 if inv.main_purchase_id:
                     fo_number = inv.main_purchase_id.short_partner_ref or ''
         self.invoices.setdefault(inv.id, {}).update({'fo': fo_number})
@@ -109,25 +113,26 @@
 
     def _get_po_number(self, inv_line):
         """
-        Returns the PO number for Intermission Voucher Lines linked to a supply workflow.
-        For the IVO: PO to the external partner in order to buy the goods
+        Returns the PO number for the lines linked to a supply workflow.
+        For the IVO/STV: PO to the external partner in order to buy the goods
         For the IVI: PO to the intermission partner which triggered the creation of the FO
         """
         inv = inv_line.invoice_id
-        ivo_from_supply = inv.is_intermission and inv.type == 'out_invoice' and inv.from_supply
-        if not ivo_from_supply and self.invoices.get(inv.id, {}).get('po', None) is not None:
-            # process only once per invoice except for IVO from Supply where the check must be done line by line
+        inv_type = self.pool.get('account.invoice').read(self.cr, self.uid, inv.id, ['doc_type'])['doc_type']
+        out_inv_from_supply = inv_type in ('ivo', 'stv') and inv.from_supply
+        if not out_inv_from_supply and self.invoices.get(inv.id, {}).get('po', None) is not None:
+            # process only once per invoice except for IVO/STV from Supply where the check must be done line by line
             return self.invoices[inv.id]['po']
         po_number = ''
         po_line_obj = self.pool.get('purchase.order.line')
-        if inv.from_supply and inv.is_intermission:
-            if inv.type == 'out_invoice':  # IVO
+        if inv.from_supply:
+            if inv_type in ('ivo', 'stv'):
                 fo_line = inv_line.sale_order_line_id
                 if fo_line and fo_line.type == 'make_to_order':  # the line is sourced on a PO
                     pol_ids = po_line_obj.search(self.cr, self.uid, [('sale_order_line_id', '=', fo_line.id)])
                     if pol_ids:
                         po_number = po_line_obj.browse(self.cr, self.uid, pol_ids[0], fields_to_fetch=['order_id']).order_id.name
-            elif inv.type == 'in_invoice':  # IVI
+            elif inv_type == 'ivi':
                 if inv.main_purchase_id:
                     po_number = inv.main_purchase_id.name
         self.invoices.setdefault(inv.id, {}).update({'po': po_number})
 
=== modified file 'bin/addons/account/wizard/account_invoice_import.py'
--- bin/addons/account/wizard/account_invoice_import.py	2021-04-28 15:14:26 +0000
+++ bin/addons/account/wizard/account_invoice_import.py	2021-11-03 13:33:55 +0000
@@ -200,7 +200,7 @@
                     elif invoice.is_inkind_donation:  # for Donations
                         restricted_area = 'donation_lines'
                     else:
-                        restricted_area = 'invoice_lines'  # for SI / STV
+                        restricted_area = 'invoice_lines'  # for SI / STV / ISI
                     if not account_obj.search_exist(cr, uid, [('id', '=', account.id), ('restricted_area', '=', restricted_area)],
                                                     context=context):
                         errors.append(_("Line %s: the account %s is not allowed.") % (current_line_num, account_code))
 
=== modified file 'bin/addons/account/wizard/account_invoice_refund.py'
--- bin/addons/account/wizard/account_invoice_refund.py	2020-02-10 13:07:40 +0000
+++ bin/addons/account/wizard/account_invoice_refund.py	2021-11-03 13:33:55 +0000
@@ -32,13 +32,17 @@
 
     def _get_filter_refund(self, cr, uid, context=None):
         """
-        Returns the selectable Refund Types (no simple "Refund" in case of an IVO/IVI)
+        Returns the selectable Refund Types (no simple "Refund" in case of an IVO/IVI or STV, only Refund/Cancel in case of an ISI)
         """
         if context is None:
             context = {}
-        if context.get('is_intermission', False):
-            return [('modify', 'Modify'), ('cancel', 'Cancel')]
-        return [('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')]
+        refund_types = [('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')]
+        if context.get('is_intermission', False) or context.get('doc_type', '') == 'stv':
+            refund_types = [('modify', 'Modify'), ('cancel', 'Cancel')]
+        elif context.get('doc_type', '') == 'isi':
+            # note: Refund Cancel is allowed only if the counterpart invoice is closed (handled directly in ISI form)
+            refund_types = [('cancel', 'Cancel')]
+        return refund_types
 
     _columns = {
         'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
@@ -49,35 +53,10 @@
         'filter_refund': fields.selection(_get_filter_refund, "Refund Type", required=True, help='Refund invoice based on this type. You can not Modify and Cancel if the invoice is already reconciled'),
     }
 
-    def _get_journal(self, cr, uid, context=None):
-        obj_journal = self.pool.get('account.journal')
-        if context is None:
-            context = {}
-        journal = obj_journal.search(cr, uid, [('type', '=', 'sale_refund')])
-        if context.get('type', False):
-            if context['type'] in ('in_invoice', 'in_refund'):
-                journal = obj_journal.search(cr, uid, [('type', '=', 'purchase_refund')])
-        return journal and journal[0] or False
-
     _defaults = {
-        'journal_id': _get_journal,
         'filter_refund': 'modify',
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
-        journal_obj = self.pool.get('account.journal')
-        res = super(account_invoice_refund,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        type = context.get('journal_type', 'sale_refund')
-        if type in ('sale', 'sale_refund'):
-            type = 'sale_refund'
-        else:
-            type = 'purchase_refund'
-        for field in res['fields']:
-            if field == 'journal_id':
-                journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
-                res['fields'][field]['selection'] = journal_select
-        return res
-
     def _hook_fields_for_modify_refund(self, cr, uid, *args):
         """
         Permits to change values that are taken from initial invoice to new invoice(s)
@@ -94,11 +73,24 @@
         res = ['address_contact_id', 'address_invoice_id', 'partner_id', 'account_id', 'currency_id', 'payment_term', 'journal_id']
         return res
 
-    def _hook_create_invoice(self, cr, uid, data, form, *args):
+    def _get_invoice_context(self, context):
+        """
+        Gets the context to be used in _hook_create_invoice
+
+        US-8585: for now only "from_refund_button" is handled, the context is otherwise empty in order not to break the current behavior.
+        """
+        if context and context.get('from_refund_button'):
+            inv_context = {'from_refund_button': True}
+        else:
+            inv_context = {}
+        return inv_context
+
+    def _hook_create_invoice(self, cr, uid, data, form, context=None):
         """
         Permits to adapt invoice creation
         """
-        res = self.pool.get('account.invoice').create(cr, uid, data, {})
+        inv_context = self._get_invoice_context(context)
+        res = self.pool.get('account.invoice').create(cr, uid, data, context=inv_context)
         return res
 
     def _hook_create_refund(self, cr, uid, inv_ids, date, period, description, journal_id, form, context=None):
@@ -134,7 +126,6 @@
         inv_obj = self.pool.get('account.invoice')
         reconcile_obj = self.pool.get('account.move.reconcile')
         account_m_line_obj = self.pool.get('account.move.line')
-        mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         wf_service = netsvc.LocalService('workflow')
         inv_tax_obj = self.pool.get('account.invoice.tax')
@@ -158,14 +149,13 @@
                 if mode in ('cancel', 'modify') and not inv.account_id.reconcile:
                     raise osv.except_osv(_('Error !'), _("Cannot Cancel / Modify if the account can't be reconciled."))
                 if mode in ('cancel', 'modify') and inv_obj.has_one_line_reconciled(cr, uid, [inv.id], context=context):
-                    if inv.is_intermission:
-                        # error specific to IVO/IVI for which there is no simple refund option
-                        raise osv.except_osv(_('Error !'), _('Cannot %s an Intermission Voucher which is already reconciled, it should be unreconciled first.') % _(mode))
-                    if inv.state == 'inv_close':
-                        raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first.') % (mode))
+                    if inv.state == 'inv_close' or inv.is_intermission or inv.doc_type in ('stv', 'isi'):
+                        # error msg specific to UC where there is no simple refund option
+                        raise osv.except_osv(_('Error !'), _('Cannot %s an invoice which is already reconciled, '
+                                                             'it should be unreconciled first.') % _(mode))
                     else:
-                        raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
-
+                        raise osv.except_osv(_('Error !'), _('Cannot %s an invoice which is already reconciled, '
+                                                             'it should be unreconciled first. You can only Refund this invoice.') % _(mode))
                 if mode == 'refund' and inv.state == 'inv_close':
                     raise osv.except_osv(_('Error !'), _('It is not possible to refund a Closed invoice'))
 
@@ -252,6 +242,7 @@
                         source_doc = invoice.get('number', False)
                         invoice.update({
                             'type': inv.type,
+                            'real_doc_type': inv.doc_type or '',
                             'date_invoice': date,
                             'state': 'draft',
                             'number': False,
@@ -264,7 +255,7 @@
                         })
                         for field in self._hook_fields_m2o_for_modify_refund(cr, uid):
                             invoice[field] = invoice[field] and invoice[field][0]
-                        inv_id = self._hook_create_invoice(cr, uid, invoice, form)
+                        inv_id = self._hook_create_invoice(cr, uid, invoice, form, context=context)
                         if inv.payment_term.id:
                             data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], inv.payment_term.id, date)
                             if 'value' in data and data['value']:
@@ -283,28 +274,29 @@
                     ji_ids.extend([sr_ji.id for sr_ji in refund.move_id.line_id])
                     # write on JIs without recreating AJIs
                     account_m_line_obj.write(cr, uid, ji_ids, {'is_si_refund': True}, context=context, check=False, update_check=False)
-
-            if context.get('is_intermission', False):
-                module = 'account_override'
-                if inv.type == 'in_invoice':
-                    xml_id = 'action_intermission_out'
-                else:
-                    xml_id = 'action_intermission_in'
-            else:
-                module = 'account'
-                if inv.type in ('out_invoice', 'out_refund'):
-                    xml_id = 'action_invoice_tree3'
-                else:
-                    xml_id = 'action_invoice_tree4'
-            result = mod_obj.get_object_reference(cr, uid, module, xml_id)
-            id = result and result[1] or False
-            result = act_obj.read(cr, uid, id, context=context)
+            # return to a tree view containing the refund generated
+            from_doc_type = context.get('doc_type', '')
+            if from_doc_type == 'stv':
+                return_doc_type = 'str'
+            elif from_doc_type == 'ivo':
+                return_doc_type = 'ivi'
+            elif from_doc_type == 'ivi':
+                return_doc_type = 'ivo'
+            elif from_doc_type == 'isi':
+                return_doc_type = 'isr'
+            else:  # i.e. si, di
+                return_doc_type = 'sr'
+            action_act_window = inv_obj._invoice_action_act_window[return_doc_type]
+            result = act_obj.open_view_from_xmlid(cr, uid, action_act_window, context=context)
             invoice_domain = eval(result['domain'])
             invoice_domain.append(('id', 'in', created_inv))
             result['domain'] = invoice_domain
             return result
 
     def invoice_refund(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        context.update({'from_refund_button': True})
         data_refund = self.read(cr, uid, ids[0], ['filter_refund'], context=context)['filter_refund']
         return self.compute_refund(cr, uid, ids, data_refund, context=context)
 
 
=== modified file 'bin/addons/account/wizard/account_invoice_refund_view.xml'
--- bin/addons/account/wizard/account_invoice_refund_view.xml	2019-06-24 14:40:19 +0000
+++ bin/addons/account/wizard/account_invoice_refund_view.xml	2021-11-03 13:33:55 +0000
@@ -14,13 +14,17 @@
                          <field name="journal_id" required="1"/>
                          <field name="date" required="1"/>
                          <field name="period"/>
-                         <field name="filter_refund"/>
+                         <field name="filter_refund" attrs="{'readonly': [('is_isi', '=', True)]}"/>
                          <field name="is_intermission" invisible="1"/>
+                         <field name="is_stv" invisible="1"/>
+                         <field name="is_isi" invisible="1"/>
                     </group>
                     <separator colspan="4"/>
                     <group col="4" colspan="4" fill="1">
-                    	<label align="0.0" width="550" colspan="4" string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
-                        <group attrs="{'invisible': [('is_intermission', '=', True)] }">
+                         <group attrs="{'invisible': [('is_isi', '=', True)]}">
+                            <label align="0.0" width="550" colspan="4" string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
+                         </group>
+                         <group attrs="{'invisible': ['|', '|', ('is_intermission', '=', True), ('is_stv', '=', True), ('is_isi', '=', True)]}">
                             <label align="0.0" width="300" string="Refund Invoice: Creates the refund invoice, ready for editing."/>
                         </group>
                         <label align="0.0" width="500" colspan="4" string="Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice."/>
 
=== modified file 'bin/addons/account_hq_entries/account_view.xml'
--- bin/addons/account_hq_entries/account_view.xml	2019-01-10 13:48:23 +0000
+++ bin/addons/account_hq_entries/account_view.xml	2021-11-03 13:33:55 +0000
@@ -192,40 +192,6 @@
             </field>
         </record>
 
-        <!--
-            New account attribute for HQ entries corrections
-        -->
-
-        <record id="inherit_view_account_form2" model="ir.ui.view">
-            <field name='name'>inherit.view.account.form2</field>
-            <field name='model'>account.account</field>
-            <field name="type">form</field>
-            <field name='inherit_id' ref='account.view_account_form'/>
-            <field name="priority">30</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='user_type']" position="after">
-                    <field name="is_not_hq_correctible" on_change="onchange_is_not_hq_correctible(is_not_hq_correctible)"/>
-                    <newline/>
-                    <label string="" colspan="2"/>
-                    <field name="is_not_ad_correctable" on_change="onchange_is_not_ad_correctable(is_not_ad_correctable)"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="inherit_view_account_tree2" model="ir.ui.view">
-            <field name='name'>inherit.view.account.tree2</field>
-            <field name='model'>account.account</field>
-            <field name="type">tree</field>
-            <field name='inherit_id' ref='account.view_account_tree'/>
-            <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='activation_date']" position="before">
-                    <field name="is_not_hq_correctible" invisible="1"/>
-                </xpath>
-            </field>
-        </record>
-
-
     <!-- Actions: Menu actions -->
         <record id="action_hq_entries_import_wizard" model="ir.actions.act_window">
             <field name="name">Import HQ Entries</field>
 
=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2020-08-06 16:10:07 +0000
+++ bin/addons/account_mcdb/account_view.xml	2021-11-03 13:33:55 +0000
@@ -87,30 +87,6 @@
             </field>
         </record>
 
-    <!-- Account analytic line tree view -->
-        <record model="ir.ui.view" id="account_analytic_line_default">
-            <field name="name">account.analytic.line.default</field>
-            <field name="model">account.analytic.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
-            <field name="priority" eval="40"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/tree/field[@name='journal_id']" position="before">
-                        <field name="is_reversal" invisible="1"/>
-                        <field name="journal_type" invisible="1"/>
-                        <field name="is_corrigible" invisible="1"/>
-                        <button name="button_corrections" type="object" string="Accounting info/correction"
-                            attrs="{'invisible': [('is_corrigible', '=', False)]}" icon="terp-mail-message-new"/>
-                        <field name="is_reallocated" invisible="1"/>
-                        <field name="last_corrected_id" invisible="1"/>
-                        <field name="is_engi" invisible="1"/>
-                        <button string="Have been reallocated" attrs="{'invisible': [('is_reallocated', '=', False), ('last_corrected_id', '=', False)]}" icon="terp-mail-" colspan="2" name="button_open_analytic_corrections" type="object"/>
-                   </xpath>
-                </data>
-            </field>
-        </record>
-
     <!-- Actions -->
         <act_window id="analytic_distribution.action_mass_reallocation"
             name="Mass reallocation"
 
=== modified file 'bin/addons/account_override/__init__.py'
--- bin/addons/account_override/__init__.py	2019-06-13 16:16:46 +0000
+++ bin/addons/account_override/__init__.py	2021-11-03 13:33:55 +0000
@@ -51,6 +51,8 @@
     #+ Supplier Invoice
     #+ Direct Invoice
     #+ Supplier refund
+    #+ Intersection Supplier Invoice
+    #+ Intersection Supplier Refund
     'in_invoice': [
         ('type', '!=', 'view'),
         # Either Payable/Payables or Payable/Tax or Regular/Debt or Regular/Cash or Regular/Income accounts
@@ -61,6 +63,7 @@
     ],
     # HEADER OF:
     #+ Stock Transfer Voucher
+    #+ Stock Transfer Refund
     #+ Customer Refund
     #+ Debit Notes
     'out_invoice': [
@@ -81,7 +84,10 @@
     #+ Supplier invoice
     #+ Direct invoice
     #+ Supplier refund
+    #+ Intersection supplier invoice
+    #+ Intersection supplier refund
     #+ Stock transfer voucher
+    #+ Stock transfer refund
     #+ Customer refund
     #+ Debit notes
     'invoice_lines': [
 
=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2021-04-23 12:31:26 +0000
+++ bin/addons/account_override/account.py	2021-11-03 13:33:55 +0000
@@ -974,6 +974,7 @@
                                       required=True, states={'posted':[('readonly',True)]},
                                       domain="[('type', 'not in', "
                                              " ['accrual', 'hq', 'inkind', 'cur_adj', 'system', 'extra', 'correction', 'correction_hq']),"
+                                             "('code', '!=', 'ISI'), "
                                              "('instance_filter', '=', True)]",
                                       hide_default_menu=True),
         'document_date': fields.date('Document Date', size=255, required=True, help="Used for manual journal entries"),
 
=== modified file 'bin/addons/account_override/account_invoice_sync.py'
--- bin/addons/account_override/account_invoice_sync.py	2021-08-05 15:24:04 +0000
+++ bin/addons/account_override/account_invoice_sync.py	2021-11-03 13:33:55 +0000
@@ -174,7 +174,7 @@
         """
         Creates automatic counterpart invoice at synchro time.
         Intermission workflow: an IVO sent generates an IVI
-        Intersection workflow: an STV sent generates an SI
+        Intersection workflow: an STV sent generates an ISI
         """
         self._logger.info("+++ Create an account.invoice in %s matching the one sent by %s" % (cr.dbname, source))
         if context is None:
@@ -213,21 +213,24 @@
         inv_lines = invoice_dict.get('invoice_line', [])
         po = False
         vals = {}
-        # STV in sending instance: generates an SI in the receiving instance
+        # STV in sending instance: generates an ISI in the receiving instance
         if journal_type == 'sale':
-            pur_journal_ids = journal_obj.search(cr, uid, [('type', '=', 'purchase'), ('is_current_instance', '=', True)], limit=1, context=context)
-            if not pur_journal_ids:
-                raise osv.except_osv(_('Error'), _("No Purchase journal found for the current instance."))
-            # for the SI use the Account Payable of the partner
-            si_account = partner.property_account_payable
-            if not si_account or posting_date < si_account.activation_date or \
-                    (si_account.inactivation_date and posting_date >= si_account.inactivation_date):
+            isi_journal_ids = journal_obj.search(cr, uid,
+                                                 [('type', '=', 'purchase'), ('code', '=', 'ISI'), ('is_current_instance', '=', True)],
+                                                 limit=1, context=context)
+            if not isi_journal_ids:
+                raise osv.except_osv(_('Error'), _("No Intersection Supplier Invoice journal found for the current instance."))
+            # for the ISI use the Account Payable of the partner
+            isi_account = partner.property_account_payable
+            if not isi_account or posting_date < isi_account.activation_date or \
+                    (isi_account.inactivation_date and posting_date >= isi_account.inactivation_date):
                 raise osv.except_osv(_('Error'), _("Account Payable not found or inactive for the partner %s.") % partner.name)
             vals.update(
                 {
-                    'journal_id': pur_journal_ids[0],
-                    'account_id': si_account.id,
+                    'journal_id': isi_journal_ids[0],
+                    'account_id': isi_account.id,
                     'type': 'in_invoice',
+                    'real_doc_type': 'isi',
                     'is_direct_invoice': False,
                     'is_inkind_donation': False,
                     'is_debit_note': False,
@@ -249,6 +252,7 @@
                     'journal_id': int_journal_ids[0],
                     'account_id': ivi_account.id,
                     'type': 'in_invoice',
+                    'real_doc_type': 'ivi',
                     'is_inkind_donation': False,
                     'is_debit_note': False,
                     'is_intermission': True,
@@ -321,7 +325,7 @@
         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 = "SI No. %s created successfully." % inv_id
+                msg = "ISI No. %s created successfully." % inv_id
             elif journal_type == 'intermission':
                 msg = "IVI No. %s created successfully." % inv_id
             self._logger.info(msg)
@@ -352,7 +356,7 @@
             if counterpart_inv_number:
                 inv_ids = self.search(cr, uid, [('number', '=', counterpart_inv_number)], limit=1, context=context)
             elif not counterpart_inv_number and number:
-                # use case where the state of the IVO/STV is updated before the related IVI/SI has been opened
+                # use case where the state of the IVO/STV is updated before the related IVI/ISI has been opened
                 inv_ids = self.search(cr, uid, [('counterpart_inv_number', '=', number)], limit=1, context=context)
             if inv_ids:
                 self.write(cr, uid, inv_ids[0], vals, context=context)
 
=== modified file 'bin/addons/account_override/account_invoice_view.xml'
--- bin/addons/account_override/account_invoice_view.xml	2021-04-29 10:12:12 +0000
+++ bin/addons/account_override/account_invoice_view.xml	2021-11-03 13:33:55 +0000
@@ -27,46 +27,6 @@
             </field>
         </record>
 
-    <!--
-        Supplier Invoice
-    -->
-        <record id="invoice_supplier_form_3" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.form.3</field>
-            <field name="model">account.invoice</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/notebook/page[@string='Invoice']/field[@name='account_id']" position="attributes">
-                        <attribute name="domain">[('company_id', '=', company_id), ('restricted_area', '=', 'in_invoice')]</attribute>
-                    </xpath>
-                    <xpath expr="/form/group[1]/field[@name='partner_id']" position="attributes">
-                        <attribute name="on_change">onchange_partner_id(type,partner_id,date_invoice,payment_term,partner_bank_id,company_id,is_inkind_donation,is_intermission,is_debit_note,is_direct_invoice,False)</attribute>
-                    </xpath>
-                    <xpath expr="//tree[@string='Invoice lines']/field[@name='product_id']" position="before">
-                        <field name="line_number" displayon="noteditable"/>
-                    </xpath>
-                    <xpath expr="//field[@name='date_invoice']" position="before">
-                        <field name="document_date" />
-                    </xpath>
-                    <xpath expr="//field[@name='period_id']" position="replace">
-                    </xpath>
-                    <xpath expr="//label[@string='(keep empty to use the current period)']" position="replace">
-                    </xpath>
-                    <xpath expr="//button[@name='invoice_open']" position="after" >
-                        <button name="button_split_invoice" states="draft,proforma2" type="object" string="Split Invoice" icon="gtk-cut"/>
-                        <newline/>
-                        <field name="can_merge_lines" invisible="1"/>
-                        <button name="button_merge_lines" type="object"
-                            colspan="3"
-                            string="Merge Lines by Account" icon="gtk-convert"
-                            confirm="You are about to merge invoice lines; are you sure you want to proceed ? THIS OPERATION CAN NOT BE UNDONE"
-                            attrs="{'invisible': [('can_merge_lines', '!=', True)]}"/>
-                    </xpath>
-               </data>
-            </field>
-        </record>
 
     <!-- Change account_id domain -->
         <record id="invoice_line_form3" model="ir.ui.view">
@@ -82,131 +42,6 @@
             </field>
         </record>
 
-    <!--
-        Delete some field from account_invoice tree:
-        - Salesman or User (user_id)
-        - Total amount (amount_total)
-        - Untaxed (amount_untaxed)
-        Add some elements:
-        - Document date
-    -->
-        <record id="inherit_invoice_tree" model="ir.ui.view">
-            <field name="name">inherit.invoice.tree</field>
-            <field name="model">account.invoice</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.invoice_tree"/>
-            <field name="priority">17</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/tree/field[@name='date_invoice']" position="before">
-                        <field name="document_date"/>
-                        <field name="supplier_reference"/>
-                    </xpath>
-                    <xpath expr="/tree/field[@name='user_id']" position="replace">
-                    </xpath>
-                    <xpath expr="/tree/field[@name='amount_untaxed']" position="replace">
-                    </xpath>
-                    <xpath expr="/tree/field[@name='residual']" position="attributes">
-                        <attribute name="sum"></attribute>
-                    </xpath>
-                    <xpath expr="/tree/field[@name='amount_total']" position="attributes">
-                        <attribute name="sum"></attribute>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-    <!--
-        Delete some element from Search views:
-        - Salesman or user (user_id)
-        - Total (amount_total)
-        - Responsible button (group by)
-        - Proforma button
-        - Invoices button
-        - Unpaid button
-        And add some ones:
-        - Open button
-        - Paid button
-    -->
-        <record id="inherit_view_account_invoice_filter" model="ir.ui.view">
-            <field name="name">inherit.view.account.invoice.filter</field>
-            <field name="model">account.invoice</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
-            <field name="priority">17</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/search/group[1]/filter[@name='proforma']" position="replace">
-                    </xpath>
-                    <xpath expr="/search/group[1]/filter[@name='invoices']" position="replace">
-                    </xpath>
-                    <xpath expr="/search/group[1]/filter[@name='unpaid']" position="attributes">
-                      <attribute name="string">Open</attribute>
-                      <attribute name="help">Open Invoices</attribute>
-                    </xpath>
-                    <xpath expr="/search/group[1]/field[@name='user_id']" position="replace">
-                    </xpath>
-                    <xpath expr="/search/group[3]/filter[@string='Responsible']" position="replace">
-                    </xpath>
-                    <xpath expr="/search/group[2]/field[@name='period_id']" position="after">
-                        <field name="supplier_reference"/>
-                        <field name="name"/>
-                    </xpath>
-                    <xpath expr="/search/group[1]/separator[1]" position="replace">
-                    </xpath>
-                    <xpath expr="/search/group[1]/filter[@name='unpaid']" position="after">
-                        <filter name="paid" icon="terp-dolar" string="Paid" domain="[('state', '=', 'paid')]"/>
-                        <filter name="closed" icon="terp-dialog-close" string="Closed" domain="[('state', '=', 'inv_close')]" />
-                        <filter name="cancel_state" icon="terp-gtk-stop" string="Cancelled" domain="[('state', '=', 'cancel')]"/>
-                        <separator orientation="vertical"/>
-                            <filter name="not_imported" icon="gtk-cancel" string="Not imported" domain="[('imported_state', '=', 'not')]"/>
-                            <filter name="partial" icon="terp-dolar_ok!" string="Partially imported" domain="[('imported_state', '=', 'partial')]"/>
-                            <filter name="imported" icon="gtk-apply" string="Imported" domain="[('imported_state', '=', 'imported')]"/>
-                        <separator orientation="vertical"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-    <!--
-        Delete some elements from Stock transfer voucher (customer invoices):
-        - period_id
-        - label with "keep empty…"
-        Add some others elements:
-        - document_date
-    -->
-        <record id="invoice_form_4" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.form.4</field>
-            <field name="model">account.invoice</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="priority">22</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='date_invoice']" position="before">
-                        <field name="document_date"/>
-                    </xpath>
-                    <xpath expr="//field[@name='period_id']" position="replace">
-                    </xpath>
-                    <xpath expr="//label[@string='(keep empty to use the current period)']" position="replace">
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-    <!-- Add Split Invoice Button on invoices -->
-        <record id="invoice_form_3" model="ir.ui.view">
-            <field name="name">account.invoice.form.3</field>
-            <field name="model">account.invoice</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="priority">40</field>
-            <field name="arch" type="xml">
-                <button name='invoice_open' position="after">
-                    <button name="button_split_invoice" states="draft,proforma2" type="object" string="Split Invoice" icon="gtk-cut"/>
-                </button>
-            </field>
-        </record>
 
         <!--
             Debit Note views
@@ -245,7 +80,7 @@
             <field name="arch" type="xml">
                 <form string="Debit Note" hide_duplicate_button="1">
                     <group colspan="4" col="8">
-                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"/>
+                        <field name="journal_id" domain="[('inv_doc_type', '=', True)]"/>
                         <field name="number"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" width="50"/>
@@ -345,7 +180,7 @@
             <field name="arch" type="xml">
                 <form string="In-kind Donation" noteditable="state=='cancel'">
                     <group colspan="4" col="8">
-                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', 'in', ('inkind', 'extra'))]"/>
+                        <field name="journal_id" domain="[('inv_doc_type', '=', True)]"/>
                         <field name="number"/>
                         <field name="type" invisible="1"/>
                         <field name="is_inkind_donation" invisible="1"/>
@@ -508,7 +343,7 @@
             <field name="arch" type="xml">
                 <form string="Intermission Voucher" noteditable="state=='cancel'">
                     <group colspan="4" col="8">
-                        <field name="fake_journal_id" domain="[('is_current_instance','=',True)]" />
+                        <field name="fake_journal_id"/> <!-- readonly -->
                         <field name="journal_type" invisible="1"/>
                         <field name="number"/>
                         <field name="type" invisible="1"/>
@@ -747,113 +582,6 @@
         </record>
 
         <!--
-            Delete some elements on customer invoices:
-            - fiscal_position field
-            - proforma button (invoice_proforma2)
-            - payment_term field
-            - tax frame
-            - compute tax button (button_reset_taxes)
-            - amount untaxed field
-            - amount tax field
-            Update some other ones:
-            - account_id field to add a domain on accounts regarding "ACCOUNT_RESTRICTED_AREA" variable
-        -->
-        <record id="inherit_invoice_form" model="ir.ui.view">
-            <field name="name">inherit.invoice.form</field>
-            <field name="model">account.invoice</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="priority">61</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form" position="attributes">
-                        <attribute name="string">Stock Transfer Voucher</attribute>
-                    </xpath>
-                    <xpath expr="/form/notebook/page[@string='Invoice']/field[@name='account_id']" position="attributes">
-                        <attribute name="domain">[('company_id', '=', company_id), ('restricted_area', '=', 'out_invoice')]</attribute>
-                    </xpath>
-                    <field name="fiscal_position" position="replace"/>
-                    <field name="payment_term" position="replace"/>
-                    <field name="tax_line" position="replace"/>
-                    <button name="button_reset_taxes" position="replace"/>
-                    <button name="invoice_proforma2" position="replace"/>
-                    <xpath expr="/form/notebook/page[@string='Invoice']/field[@name='invoice_line']" position="before" >
-                        <group name="import" string=" Import Lines " colspan="4" col="4"
-                               attrs="{'invisible': [('state', '!=', 'draft'), ('type', '!=', 'out_invoice')]}">
-                            <button name="import_invoice" string="Import Invoice Line" icon="gtk-execute" colspan="2" type="object"
-                                    attrs="{'readonly': [('state', '!=', 'draft')],
-                                            'invisible': [('type', '!=', 'out_invoice')]}"/>
-                            <button name="export_invoice" string="Export Invoice Line" icon="gtk-execute" colspan="2" type="object"
-                                    attrs="{'invisible': [('type', '!=', 'out_invoice')]}"
-                                    force_editable="1"/>
-                            <newline/>
-                            <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" colspan="4" type="object"
-                                    attrs="{'invisible': [('state', '!=', 'draft')],
-                                            'readonly': [('type', '=', 'out_invoice'),
-                                                         ('from_supply', '=', True),
-                                                         ('partner_type', 'in', ('intermission', 'section'))]}"/>
-                        </group>
-                    </xpath>
-                    <xpath expr="/form/notebook/page[@string='Invoice']/group[3]" position="replace">
-                        <group col="8" colspan="4">
-                            <label string="" colspan="3"/>
-                            <field name="reconciled"/>
-                            <field name="amount_total"/>
-                            <label string="" colspan="3"/>
-                            <field name="state"/>
-                            <field name="residual"/>
-                            <field name="is_debit_note" invisible="1"/>
-                        </group>
-                        <field name="partner_type" invisible="1"/>
-                        <group col="8" colspan="4">
-
-                            <button string="Cancel document" name="invoice_cancel"
-                                    type="workflow" icon="gtk-cancel"
-                                    confirm="Do you really want to cancel this document?"
-                                    attrs="{'invisible': ['|', '|',
-                                                          ('state', '!=', 'draft'),
-                                                          ('type', '!=', 'out_invoice'),
-                                                          ('from_supply', '=', False)]}"/>
-
-                            <button name="button_split_invoice" type="object" string="Split Stock Transfer Voucher"
-                                    icon="gtk-cut"
-                                    context="{'from_stv': True}"
-                                    attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('type', '!=', 'out_invoice')]}"/>
-
-                            <button name="%(account.action_account_invoice_refund)d" type='action' string='Refund' icon="gtk-execute" attrs="{'invisible': ['|', ('state', 'in', ['draft']), ('type', 'in', ['in_refund', 'out_refund'])]}"/>
-                            <!-- add a confirmation step only for STV (not for Customer Refunds)
-                                 when the partner type is compatible with a synchro but "synced" isn't ticked -->
-                            <button name="invoice_open" type="object" string="Validate"
-                                    icon="gtk-go-forward"
-                                    attrs="{'invisible': ['|',
-                                                          ('state', '!=', 'draft'),
-                                                          '&amp;',
-                                                          ('type', '=', 'out_invoice'), ('partner_type', 'in', ('intermission', 'section')) ]}"/>
-                            <button name="invoice_open_with_confirmation" type="object" string="Validate"
-                                    icon="gtk-go-forward"
-                                    confirm="Are you sure you want to validate this invoice without synchronization?"
-                                    attrs="{'invisible': ['|', '|', '|',
-                                                          ('state', '!=', 'draft'),
-                                                          ('type', '!=', 'out_invoice'),
-                                                          ('synced', '=', True),
-                                                          ('partner_type', 'not in', ('intermission', 'section'))]}"/>
-
-                            <button name="invoice_open_with_sync_confirmation" type="object" string="Validate"
-                                    icon="gtk-go-forward"
-                                    confirm="This invoice will sync to its counterpart instance."
-                                    attrs="{'invisible': ['|', '|', '|',
-                                                          ('state', '!=', 'draft'),
-                                                          ('type', '!=', 'out_invoice'),
-                                                          ('synced', '=', False),
-                                                          ('partner_type', 'not in', ('intermission', 'section'))]}"/>
-                            <button name="%(account.account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,inv_close,proforma,sale,proforma2"/>
-                        </group>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <!--
             Debit note actions
         -->
 
@@ -864,8 +592,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','out_invoice'), ('is_debit_note', '!=', False), ('is_inkind_donation', '=', False)]</field>
-            <field name="context">{'type':'out_invoice', 'journal_type': 'sale', 'is_debit_note': True}</field>
+            <field name="domain">[('doc_type', '=', 'dn')]</field>
+            <field name="context">{'doc_type': 'dn', 'type': 'out_invoice', 'journal_type': 'sale', 'is_debit_note': True}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
         </record>
 
@@ -931,8 +659,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','in_invoice'), ('is_debit_note', '=', False), ('is_inkind_donation', '=', True)]</field>
-            <field name="context">{'type': 'in_invoice', 'journal_type': 'inkind', 'is_inkind_donation': '1', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_open': 1}</field>
+            <field name="domain">[('doc_type', '=', 'donation')]</field>
+            <field name="context">{'doc_type': 'donation', 'type': 'in_invoice', 'journal_type': 'inkind', 'is_inkind_donation': '1', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_open': 1}</field>
             <field name="search_view_id" ref="view_account_invoice_filter_donation"/>
         </record>
 
@@ -959,8 +687,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','out_invoice'), ('is_debit_note', '=', False), ('is_inkind_donation', '=', False), ('is_intermission', '=', True)]</field>
-            <field name="context">{'type': 'out_invoice', 'journal_type': 'intermission', 'is_intermission': True, 'intermission_type': 'out', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_unpaid': 1, 'search_default_paid': 1, 'search_default_closed': 1}</field>
+            <field name="domain">[('doc_type', '=', 'ivo')]</field>
+            <field name="context">{'doc_type': 'ivo', 'type': 'out_invoice', 'journal_type': 'intermission', 'is_intermission': True, 'intermission_type': 'out', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_unpaid': 1, 'search_default_paid': 1, 'search_default_closed': 1}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
         </record>
 
@@ -987,8 +715,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="view_id" ref="view_intermission_form"/>
-            <field name="domain">[('type','=','in_invoice'), ('is_debit_note', '=', False), ('is_inkind_donation', '=', False), ('is_intermission', '=', True)]</field>
-            <field name="context">{'type':'in_invoice', 'journal_type': 'intermission', 'is_intermission': True, 'intermission_type': 'in', 'from_inv_form': True}</field>
+            <field name="domain">[('doc_type', '=', 'ivi')]</field>
+            <field name="context">{'doc_type': 'ivi', 'type': 'in_invoice', 'journal_type': 'intermission', 'is_intermission': True, 'intermission_type': 'in', 'from_inv_form': True}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
         </record>
 
@@ -1008,34 +736,6 @@
             <field name="act_window_id" ref="action_intermission_in"/>
         </record>
 
-        <!-- Fix customer invoice display with a bypass on 'is_debit_note' set to True -->
-        <record id="account.action_invoice_tree1" model="ir.actions.act_window">
-            <field name="name">Customer Invoices</field>  <!-- Stock Transfer Vouchers -->
-            <field name="res_model">account.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','out_invoice'), ('is_debit_note', '=', False), ('is_inkind_donation', '=', False), ('is_intermission', '=', False)]</field>
-            <field name="context">{'type':'out_invoice', 'journal_type': 'sale', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_unpaid': 1, 'search_default_paid': 1, 'search_default_closed': 1}</field>
-            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
-        </record>
-
-        <!-- Fix supplier invoice display with a bypass on 'is_inkind_donation' set to True -->
-        <record id="account.action_invoice_tree2" model="ir.actions.act_window">
-            <field name="name">Supplier Invoices</field>
-            <field name="res_model">account.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field eval="False" name="view_id"/>
-            <!-- US-2704 if the domain change, do not forget to update the domain of account_board_supplier_invoice_draft in finance/board_account_view.xml -->
-            <field name="domain">[('type','=','in_invoice'), ('is_direct_invoice', '=', False), ('is_inkind_donation', '=', False), ('is_debit_note', "=", False), ('is_intermission', '=', False)]</field>
-            <field name="context">{'type': 'in_invoice', 'journal_type': 'purchase', 'from_inv_form': True}</field>
-            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers.
-                OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice
-                from your supplier according to what you purchased or received.</field>
-        </record>
 
         <!--
             Debit Note Menu
@@ -1045,13 +745,13 @@
         <menuitem action="action_debit_note" id="menu_action_debit_note" parent="account.menu_finance_receivables" sequence="10"/>
 
         <!-- In-kind Donation Menu in "Supplier Invoices" -->
-        <menuitem action="action_inkind_donation" id="menu_action_inkind_donation" parent="account.menu_finance_payables" sequence="11"/>
+        <menuitem action="action_inkind_donation" id="menu_action_inkind_donation" parent="account.menu_finance_payables" sequence="30"/>
 
         <!-- Intermission Voucher OUT in "Customer Invoices" -->
-        <menuitem action="action_intermission_out" id="menu_action_intermission_out" parent="account.menu_finance_receivables" sequence="10"/>
+        <menuitem action="action_intermission_out" id="menu_action_intermission_out" parent="account.menu_finance_receivables" sequence="12"/>
 
         <!-- Intermission Voucher IN in "Supplier Invoices" -->
-        <menuitem action="action_intermission_in" id="menu_action_intermission_in" parent="account.menu_finance_payables" sequence="12"/>
+        <menuitem action="action_intermission_in" id="menu_action_intermission_in" parent="account.menu_finance_payables" sequence="40"/>
 
         <!--
             Account invoice report redefinition
 
=== modified file 'bin/addons/account_override/account_view.xml'
--- bin/addons/account_override/account_view.xml	2019-06-18 11:15:45 +0000
+++ bin/addons/account_override/account_view.xml	2021-11-03 13:33:55 +0000
@@ -2,61 +2,6 @@
 <openerp>
     <data>
 
-        <record model="ir.ui.view" id="view_account_activable_form">
-            <field name="name">account.account_activable.form</field>
-            <field name="model">account.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_form"/>
-            <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <field name="company_id" position="replace"/>
-                <page string="General Information" position="replace">
-                    <page string="General Information">
-                        <group col="6" colspan="4">
-                            <field name="activation_date"/>
-                            <field name="inactivation_date"/>
-                            <group col="2" colspan="2">
-                                <field name="reconcile" on_change="onchange_reconcile(reconcile)"/>
-                                <field name="prevent_multi_curr_rec" attrs="{'readonly': [('reconcile', '=', False)]}"/>
-                                <field name="reconciliation_debit_account_id"/>
-                                <field name="reconciliation_credit_account_id"/>
-                            </group>
-                        </group>
-                    </page>
-                </page>
-
-                <page string="Notes" position="before">
-                    <page string="Allowed Partner types">
-                        <group col="4" colspan="4">
-                            <group col="2" colspan="2">
-                                <field name="has_partner_type_internal" />
-                                <field name="has_partner_type_external" />
-                                <field name="has_partner_type_esc" />
-                                <newline />
-                                <field name="has_partner_type_local" />
-                                <field name="has_partner_type_ex" />
-                                <field name="has_partner_type_empty" />
-                                <newline />
-                                <field name="has_partner_type_book" />
-                            </group>
-
-                            <group col="2" colspan="2">
-                                <field name="has_partner_type_intermission" />
-                                <field name="has_partner_type_section" />
-
-                                <label /><label />
-                                <newline />
-                                <label /><label />
-                                <label /><label />
-                                <newline />
-                                <label /><label />
-                            </group>
-                        </group>
-                    </page>
-                </page>
-            </field>
-        </record>
-
     <!-- Tree view for Balance by Account result: granularity by parent account -->
         <record model="ir.ui.view" id="balance_account_tree">
             <field name="name">balance.account.tree</field>
@@ -99,46 +44,6 @@
             </field>
         </record>
 
-    <!-- Tree view for chart of account result -->
-        <record model="ir.ui.view" id="account.view_account_tree">
-            <field name="name">account.account_activable.tree</field>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_id</field>
-            <field name="priority" eval="12"/>
-            <field name="arch" type="xml">
-                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" expand_button="1" nolink="1">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="note"/>
-                    <field name="type" invisible="1"/>
-                    <field name="user_type" invisible="1"/>
-                    <field name="activation_date" invisible="1"/>
-                    <field name="inactivation_date" invisible="1"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="is_analytic_addicted" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-    <!-- Tree view for default tree view of accounts -->
-        <record id="account.view_account_list" model="ir.ui.view">
-            <field name="name">account.account_activable.list</field>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_id</field>
-            <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" nolink="1">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="activation_date"/>
-                    <field name="inactivation_date"/>
-                </tree>
-            </field>
-        </record>
-
         <record id="action_account_activable_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
 
=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2021-08-11 15:37:51 +0000
+++ bin/addons/account_override/invoice.py	2021-11-03 13:33:55 +0000
@@ -26,7 +26,6 @@
 from osv import fields
 from time import strftime
 from tools.translate import _
-from lxml import etree
 from datetime import datetime
 from msf_partner import PARTNER_TYPE
 import re
@@ -51,55 +50,40 @@
         inv_name = inv.number or inv.name or 'No_description'
         prefix = 'STV_'
 
-        if inv.type == 'out_refund': # Customer refund
+        if inv.doc_type == 'cr':
             prefix = 'CR_'
-        elif inv.type == 'in_refund': # Supplier refund
+        elif inv.doc_type == 'sr':
             prefix = 'SR_'
-        elif inv.type == 'out_invoice':
-            # Stock transfer voucher
+        elif inv.doc_type == 'stv':
             prefix = 'STV_'
-            # Debit note
-            if inv.is_debit_note and not inv.is_inkind_donation and not inv.is_intermission:
-                prefix = 'DN_'
-            # Intermission voucher OUT
-            elif not inv.is_debit_note and not inv.is_inkind_donation and inv.is_intermission:
-                prefix = 'IVO_'
-        elif inv.type == 'in_invoice':
-            # Supplier invoice
+        elif inv.doc_type == 'dn':
+            prefix = 'DN_'
+        elif inv.doc_type == 'ivo':
+            prefix = 'IVO_'
+        elif inv.doc_type == 'si':
             prefix = 'SI_'
-            # Intermission voucher IN
-            if not inv.is_debit_note and not inv.is_inkind_donation and inv.is_intermission:
-                prefix = 'IVI_'
-            # Direct invoice
-            elif inv.is_direct_invoice:
-                prefix = 'DI_'
-            # In-kind donation
-            elif not inv.is_debit_note and inv.is_inkind_donation:
-                prefix = 'DON_'
+        elif inv.doc_type == 'ivi':
+            prefix = 'IVI_'
+        elif inv.doc_type == 'di':
+            prefix = 'DI_'
+        elif inv.doc_type == 'donation':
+            prefix = 'DON_'
+        elif inv.doc_type == 'str':
+            prefix = 'STR_'
+        elif inv.doc_type == 'isi':
+            prefix = 'ISI_'
+        elif inv.doc_type == 'isr':
+            prefix = 'ISR_'
         return '%s%s' % (prefix, inv_name)
 
     def _get_journal(self, cr, uid, context=None):
         """
-        WARNING: This method has been taken from account module from OpenERP
+        Returns the journal to be used by default, depending on the doc type of the selected invoice
         """
-        # @@@[e-mail]
         if context is None:
             context = {}
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if context.get('is_inkind_donation'):
-            args = [('type', 'in', ['inkind', 'extra'])]
-        else:
-            type_inv = context.get('type', 'out_invoice')
-            company_id = context.get('company_id', user.company_id.id)
-            type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
-            refund_journal = {'out_invoice': False, 'in_invoice': False, 'out_refund': True, 'in_refund': True}
-            args = [('type', '=', type2journal.get(type_inv, 'sale')),
-                    ('company_id', '=', company_id),
-                    ('refund_journal', '=', refund_journal.get(type_inv, False))]
-        if user.company_id.instance_id:
-            args.append(('is_current_instance','=',True))
         journal_obj = self.pool.get('account.journal')
-        res = journal_obj.search(cr, uid, args, order='id', limit=1, context=context)
+        res = journal_obj.search(cr, uid, [('inv_doc_type', '=', True)], order='id', limit=1, context=context)
         return res and res[0] or False
 
     def _get_fake(self, cr, uid, ids, field_name=None, arg=None, context=None):
@@ -209,14 +193,10 @@
             ids = [ids]
 
         for inv_br in self.browse(cr, uid, ids, context=context):
-            # US-357: allow merge of line only for draft SI
+            # allow to merge lines only for draft SI/ISI
             res[inv_br.id] = inv_br.state and inv_br.state == 'draft' \
                 and inv_br.invoice_line \
-                and inv_br.type == 'in_invoice' \
-                and not inv_br.is_direct_invoice \
-                and not inv_br.is_inkind_donation \
-                and not inv_br.is_debit_note \
-                and not inv_br.is_intermission \
+                and inv_br.doc_type in ('si', 'isi') \
                 or False
 
         return res
@@ -234,6 +214,158 @@
             res[inv.id] = len(inv.invoice_line)
         return res
 
+    def _get_invoice_type_list(self, cr, uid, context=None):
+        """
+        Returns the list of possible types for the account.invoice document.
+        """
+        return [('dn', _('Debit Note')),
+                ('donation', _('Donation')),
+                ('ivi', _('Intermission Voucher IN')),
+                ('ivo', _('Intermission Voucher OUT')),
+                ('di', _('Direct Invoice')),
+                ('si', _('Supplier Invoice')),
+                ('sr', _('Supplier Refund')),
+                ('stv', _('Stock Transfer Voucher')),
+                ('cr', _('Customer Refund')),
+                ('str', _('Stock Transfer Refund')),
+                ('isi', _('Intersection Supplier Invoice')),
+                ('isr', _('Intersection Supplier Refund')),
+                ('unknown', _('Unknown')),
+                ]
+
+    _invoice_action_act_window = {
+        'dn': 'account_override.action_debit_note',
+        'donation': 'account_override.action_inkind_donation',
+        'ivi': 'account_override.action_intermission_in',
+        'ivo': 'account_override.action_intermission_out',
+        'di': 'register_accounting.action_direct_invoice',
+        'si': 'account.action_invoice_tree2',
+        'sr': 'account.action_invoice_tree4',
+        'stv': 'account.action_invoice_tree1',
+        'cr': 'account.action_invoice_tree3',
+        'str': 'account.action_str',
+        'isi': 'account.action_isi',
+        'isr': 'account.action_isr',
+    }
+
+    def _get_invoice_act_window(self, cr, uid, invoice_id, views_order=None, context=None):
+        inv_doc_type = self.read(cr, uid, invoice_id, ['doc_type'], context=context)['doc_type']
+        return self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, self._invoice_action_act_window[inv_doc_type], views_order=views_order, context=context)
+
+    def _get_doc_type(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        """
+        Returns a dict with key = id of the account.invoice, and value = doc type (see the list of types in _get_invoice_type_list).
+        If a "real_doc_type" exists: it is used. Otherwise: the doc type is deduced from the other fields.
+        """
+        res = {}
+        fields = ['real_doc_type', 'type', 'is_debit_note', 'is_inkind_donation', 'is_intermission', 'is_direct_invoice']
+        for inv in self.browse(cr, uid, ids, fields_to_fetch=fields, context=context):
+            inv_type = 'unknown'
+            if inv.real_doc_type:  # str, isi, isr...
+                inv_type = inv.real_doc_type
+            elif inv.is_debit_note:
+                if inv.type == 'out_invoice':
+                    inv_type = 'dn'  # Debit Note
+            elif inv.is_inkind_donation:
+                if inv.type == 'in_invoice':
+                    inv_type = 'donation'
+            elif inv.is_intermission:
+                if inv.type == 'in_invoice':
+                    inv_type = 'ivi'  # Intermission Voucher In
+                elif inv.type == 'out_invoice':
+                    inv_type = 'ivo'  # Intermission Voucher Out
+            elif inv.type == 'in_invoice':
+                if inv.is_direct_invoice:
+                    inv_type = 'di'  # Direct Invoice
+                else:
+                    inv_type = 'si'  # Supplier Invoice
+            elif inv.type == 'in_refund':
+                inv_type = 'sr'  # Supplier Refund
+            elif inv.type == 'out_invoice':
+                inv_type = 'stv'  # Stock Transfer Voucher
+            elif inv.type == 'out_refund':
+                inv_type = 'cr'  # Customer Refund
+            res[inv.id] = inv_type
+        return res
+
+    def _get_dom_by_doc_type(self, doc_type):
+        """
+        Returns the domain matching with the doc type (see the list of types in _get_invoice_type_list).
+        """
+        if doc_type in ('str', 'isi', 'isr'):
+            dom = [('real_doc_type', '=', doc_type)]
+        elif doc_type == 'dn':  # Debit Note
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', '&', '&',
+                   ('real_doc_type', '=', False), ('type', '=', 'out_invoice'),
+                   ('is_debit_note', '!=', False), ('is_inkind_donation', '=', False)]
+        elif doc_type == 'donation':
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', '&', '&',
+                   ('real_doc_type', '=', False), ('type', '=', 'in_invoice'),
+                   ('is_debit_note', '=', False), ('is_inkind_donation', '=', True)]
+        elif doc_type == 'ivi':  # Intermission Voucher In
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', '&', '&', '&',
+                   ('real_doc_type', '=', False), ('type', '=', 'in_invoice'), ('is_debit_note', '=', False),
+                   ('is_inkind_donation', '=', False), ('is_intermission', '=', True)]
+        elif doc_type == 'ivo':  # Intermission Voucher Out
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', '&', '&', '&',
+                   ('real_doc_type', '=', False), ('type', '=', 'out_invoice'), ('is_debit_note', '=', False),
+                   ('is_inkind_donation', '=', False), ('is_intermission', '=', True)]
+        elif doc_type == 'di':  # Direct Invoice
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', '&', ('real_doc_type', '=', False), ('type', '=', 'in_invoice'), ('is_direct_invoice', '!=', False)]
+        elif doc_type == 'si':  # Supplier Invoice
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', '&', '&', '&', '&',
+                   ('real_doc_type', '=', False), ('type', '=', 'in_invoice'), ('is_direct_invoice', '=', False),
+                   ('is_inkind_donation', '=', False), ('is_debit_note', '=', False), ('is_intermission', '=', False)]
+        elif doc_type == 'sr':  # Supplier Refund
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', ('real_doc_type', '=', False), ('type', '=', 'in_refund')]
+        elif doc_type == 'stv':  # Stock Transfer Voucher
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', '&', '&', '&',
+                   ('real_doc_type', '=', False), ('type', '=', 'out_invoice'), ('is_debit_note', '=', False),
+                   ('is_inkind_donation', '=', False), ('is_intermission', '=', False)]
+        elif doc_type == 'cr':  # Customer Refund
+            dom = ['|',
+                   ('real_doc_type', '=', doc_type),
+                   '&', ('real_doc_type', '=', False), ('type', '=', 'out_refund')]
+        else:  # "unknown" or any undefined type
+            dom = [('id', '=', 0)]
+        return dom
+
+    def _search_doc_type(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain to get all invoices matching the selected doc types (see the list of types in _get_invoice_type_list).
+        """
+        if not args:
+            return []
+        dom = [('id', '=', 0)]
+        if not args[0] or len(args[0]) < 3 or args[0][1] not in ('=', 'in'):
+            raise osv.except_osv(_('Error'), _('Filter not implemented yet.'))
+        if args[0][1] == '=' and args[0][2]:
+            doc_type = args[0][2]
+            dom = self._get_dom_by_doc_type(doc_type)
+        if args[0][1] == 'in' and args[0][2] and isinstance(args[0][2], (list, tuple)):
+            dom = []
+            for i in range(len(args[0][2]) - 1):
+                dom.append('|')
+            for doc_type in args[0][2]:
+                dom.extend(self._get_dom_by_doc_type(doc_type))
+        return dom
+
     _columns = {
         'sequence_id': fields.many2one('ir.sequence', string='Lines Sequence', ondelete='cascade',
                                        help="This field contains the information related to the numbering of the lines of this order."),
@@ -271,6 +403,9 @@
         'refunded_invoice_id': fields.many2one('account.invoice', string='Refunded Invoice', readonly=True,
                                                help='The refunded invoice which has generated this document'),  # 2 inv types for Refund Modify
         'line_count': fields.function(_get_line_count, string='Line count', method=True, type='integer', store=False),
+        'real_doc_type': fields.selection(_get_invoice_type_list, 'Real Document Type', readonly=True),
+        'doc_type': fields.function(_get_doc_type, method=True, type='selection', selection=_get_invoice_type_list,
+                                    string='Document Type', store=False, fnct_search=_search_doc_type),
     }
 
     _defaults = {
@@ -283,6 +418,8 @@
         'vat_ok': lambda obj, cr, uid, context: obj.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok,
         'can_merge_lines': lambda *a: False,
         'is_merged_by_account': lambda *a: False,
+        # set a default value on doc type so that the restrictions on fields apply even before the form is saved
+        'doc_type': lambda obj, cr, uid, c: c and c.get('doc_type') or False,
     }
 
     def import_data_web(self, cr, uid, fields, datas, mode='init', current_module='', noupdate=False, context=None, filename=None,
@@ -420,30 +557,6 @@
                                                             noupdate=noupdate, context=context, filename=filename,
                                                             display_all_errors=display_all_errors, has_header=has_header)
 
-    def onchange_company_id(self, cr, uid, ids, company_id, part_id, ctype, invoice_line, currency_id):
-        """
-        This is a method to redefine the journal_id domain with the current_instance taken into account
-        """
-        res = super(account_invoice, self).onchange_company_id(cr, uid, ids, company_id, part_id, ctype, invoice_line, currency_id)
-        if company_id and ctype:
-            res.setdefault('domain', {})
-            res.setdefault('value', {})
-            ass = {
-                'out_invoice': 'sale',
-                'in_invoice': 'purchase',
-                'out_refund': 'sale_refund',
-                'in_refund': 'purchase_refund',
-            }
-            journal_ids = self.pool.get('account.journal').search(cr, uid, [
-                ('company_id','=',company_id), ('type', '=', ass.get(ctype, 'purchase')), ('is_current_instance', '=', True)
-            ], order='id')
-            if not journal_ids:
-                raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (ass.get(type, 'purchase'), ))
-            res['value']['journal_id'] = journal_ids[0]
-            # TODO: it's very bad to set a domain by onchange method, no time to rewrite UniField !
-            res['domain']['journal_id'] = [('id', 'in', journal_ids)]
-        return res
-
     def onchange_partner_id(self, cr, uid, ids, ctype, partner_id, date_invoice=False, payment_term=False, partner_bank_id=False,
                             company_id=False, is_inkind_donation=False, is_intermission=False, is_debit_note=False, is_direct_invoice=False,
                             account_id=False):
@@ -522,58 +635,27 @@
 
     def check_po_link(self, cr, uid, ids, context=None):
         """
-        Check that invoice (only supplier invoices) has no link with a PO. This is because of commitments presence.
+        Checks that the invoices aren't linked to any PO (because of the commitments).
         """
         if not context:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-        for inv in self.read(cr, uid, ids, ['purchase_ids', 'type', 'is_inkind_donation', 'is_debit_note', 'is_intermission', 'state']):
-            if inv.get('type', '') == 'in_invoice' and not inv.get('is_inkind_donation', False) and not inv.get('is_debit_note', False):
+        for inv in self.read(cr, uid, ids, ['purchase_ids', 'doc_type', 'state']):
+            if inv.get('doc_type', '') in ('ivi', 'si', 'isi'):
                 if inv.get('purchase_ids', False):
-                    if inv.get('is_intermission'):
+                    if inv['doc_type'] == 'ivi':
                         if inv.get('state', '') != 'draft':  # only draft IVIs can be deleted
                             raise osv.except_osv(_('Warning'),
                                                  _('Intermission Vouchers linked to a PO can be deleted only in Draft state.'))
+                    elif inv['doc_type'] == 'isi':
+                        raise osv.except_osv(_('Warning'),
+                                             _('You cannot cancel or delete an Intersection Supplier Invoice linked to a PO.'))
                     else:
                         # US-1702 Do not allow at all the deletion of SI coming from PO
                         raise osv.except_osv(_('Warning'), _('You cannot cancel or delete a supplier invoice linked to a PO.'))
         return True
 
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
-        """
-        Rename Supplier/Customer to "Donor" if view_type == tree
-        """
-        if not context:
-            context = {}
-        res = super(account_invoice, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        if view_type == 'tree' and (context.get('journal_type', False) == 'inkind' or context.get('journal_type', False) == 'intermission'):
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='partner_id']")
-            name = _('Donor')
-            if context.get('journal_type') == 'intermission':
-                name = _('Partner')
-            for node in nodes:
-                node.set('string', name)
-            res['arch'] = etree.tostring(doc)
-        elif view_type in ('tree', 'search') and context.get('type') in ['out_invoice', 'out_refund']:
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='supplier_reference']")
-            for node in nodes:
-                node.getparent().remove(node)
-            res['arch'] = etree.tostring(doc)
-        elif view_type == 'form' and context.get('type', False) == 'out_invoice' and context.get('journal_type', False) == 'sale' \
-                and not context.get('is_debit_note', False) and not context.get('is_intermission', False):
-            # Restriction on allowed partners for STV: Inter-section or External type, customers only
-            doc = etree.XML(res['arch'])
-            partner_nodes = doc.xpath("//field[@name='partner_id']")
-            partner_domain_stv = "[('partner_type', 'in', ('section', 'external')), ('customer', '=', True)]"
-            for node in partner_nodes:
-                node.set('domain', partner_domain_stv)
-            res['arch'] = etree.tostring(doc)
-        return res
-
     def default_get(self, cr, uid, fields, context=None, from_web=False):
         """
         Fill in account and journal for intermission invoice
@@ -704,6 +786,9 @@
                                                      context=context):
                 vals['supplier_reference'] = partner['ref']
 
+        if not vals.get('real_doc_type') and context.get('doc_type') and not context.get('from_refund_button'):
+            vals.update({'real_doc_type': context['doc_type']})
+
         self.pool.get('data.tools').replace_line_breaks_from_vals(vals, ['name'])
 
         return super(account_invoice, self).create(cr, uid, vals, context)
@@ -742,7 +827,7 @@
     def unlink(self, cr, uid, ids, context=None):
         """
         Delete register line if this invoice is a Direct Invoice.
-        Don't delete an invoice that is linked to a PO. This is only for supplier invoices.
+        Don't delete an invoice that is linked to a PO.
         """
         if not context:
             context = {}
@@ -783,65 +868,20 @@
 
     def log(self, cr, uid, inv_id, message, secondary=False, action_xmlid=False, context=None):
         """
-        Change first "Invoice" word from message into "Debit Note" if this invoice is a debit note.
-        Change it to "In-kind donation" if this invoice is an In-kind donation.
+        Updates the log message with the right document name + link it to the right action_act_window
         """
-        if not context:
+        if context is None:
             context = {}
-        local_ctx = context.copy()
-        # Prepare some values
-        # Search donation view and return it
-        try:
-            # try / except for runbot
-            debit_res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_override', 'view_debit_note_form')
-            inkind_res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_override', 'view_inkind_donation_form')
-            intermission_res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_override', 'view_intermission_form')
-            supplier_invoice_res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
-            customer_invoice_res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
-            supplier_direct_invoice_res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'register_accounting', 'direct_supplier_invoice_form')
-        except ValueError:
-            return super(account_invoice, self).log(cr, uid, inv_id, message, secondary, action_xmlid, context)
-        debit_view_id = debit_res and debit_res[1] or False
-        debit_note_ctx = {'view_id': debit_view_id, 'type':'out_invoice', 'journal_type': 'sale', 'is_debit_note': True}
-        # Search donation view and return it
-        inkind_view_id = inkind_res and inkind_res[1] or False
-        inkind_ctx = {'view_id': inkind_view_id, 'type':'in_invoice', 'journal_type': 'inkind', 'is_inkind_donation': True}
-        # Search intermission view
-        intermission_view_id = intermission_res and intermission_res[1] or False
-        intermission_ctx = {'view_id': intermission_view_id, 'journal_type': 'intermission', 'is_intermission': True}
-        customer_view_id = customer_invoice_res[1] or False
-        customer_ctx = {'view_id': customer_view_id, 'type': 'out_invoice', 'journal_type': 'sale'}
-        message_changed = False
+        # update the message
         pattern = re.compile('^(Invoice)')
-        for el in [('is_debit_note', 'Debit Note', debit_note_ctx), ('is_inkind_donation', 'In-kind Donation', inkind_ctx), ('is_intermission', 'Intermission Voucher', intermission_ctx)]:
-            if self.read(cr, uid, inv_id, [el[0]]).get(el[0], False) is True:
-                m = re.match(pattern, message)
-                if m and m.groups():
-                    message = re.sub(pattern, el[1], message, 1)
-                    message_changed = True
-                local_ctx.update(el[2])
-        # UF-1112: Give all customer invoices a name as "Stock Transfer Voucher".
-        if not message_changed and self.read(cr, uid, inv_id, ['type']).get('type', False) == 'out_invoice':
-            if local_ctx.get('is_intermission', False):
-                message = re.sub(pattern, 'Intermission Voucher', message, 1)
-                local_ctx.update(intermission_ctx)
-            else:
-                message = re.sub(pattern, 'Stock Transfer Voucher', message, 1)
-                local_ctx.update(customer_ctx)
-
-        # UF-1307: for supplier invoice log (from the incoming shipment), the context was not
-        # filled with all the information; this leaded to having a "Sale" journal in the supplier
-        # invoice if it was saved after coming from this link. Here's the fix.
-        if local_ctx.get('type', False) == 'in_invoice':
-            if not local_ctx.get('journal_type', False):
-                supplier_view_id = supplier_invoice_res and supplier_invoice_res[1] or False
-                local_ctx.update({'journal_type': 'purchase',
-                                  'view_id': supplier_view_id})
-            elif local_ctx.get('direct_invoice_view', False): # UFTP-166: The wrong context saved in log
-                supplier_view_id = supplier_direct_invoice_res and supplier_direct_invoice_res[1] or False
-                local_ctx = {'journal_type': 'purchase',
-                             'view_id': supplier_view_id}
-        return super(account_invoice, self).log(cr, uid, inv_id, message, secondary, action_xmlid, local_ctx)
+        doc_type = self.read(cr, uid, inv_id, ['doc_type'], context=context)['doc_type'] or ''
+        action_xmlid = self._invoice_action_act_window.get(doc_type) or action_xmlid
+        doc_name = dict(self.fields_get(cr, uid, context=context)['doc_type']['selection']).get(doc_type)
+        if doc_name:
+            m = re.match(pattern, message)
+            if m and m.groups():
+                message = re.sub(pattern, doc_name, message, 1)
+        return super(account_invoice, self).log(cr, uid, inv_id, message, secondary, action_xmlid=action_xmlid, context=context)
 
     def _check_tax_allowed(self, cr, uid, ids, context=None):
         """
@@ -931,6 +971,12 @@
 
         return True
 
+    def invoice_open2(self, cr, uid, ids, context=None):
+        """
+        Alias for invoice_open (used to handle different characteristics on both buttons)
+        """
+        return self.invoice_open(cr, uid, ids, context=context)
+
     def invoice_open_with_confirmation(self, cr, uid, ids, context=None):
         """
         Simply calls "invoice_open" (asking for confirmation is done at form level)
@@ -996,7 +1042,7 @@
     def action_cancel(self, cr, uid, ids, *args):
         """
         Reverse move if this object is a In-kind Donation. Otherwise do normal job: cancellation.
-        Don't delete an invoice that is linked to a PO. This is only for supplier invoices.
+        Don't cancel an invoice that is linked to a PO.
         """
         # Oct. 2019: log if this method is used at least once (cf it may be dead code?)
         self.pool.get('ir.config_parameter').set_param(cr, 1, 'action_cancel.in_use', True)
@@ -1041,43 +1087,6 @@
         self._check_document_date(cr, uid, ids)
         return res
 
-    def get_account_invoice_type(self, cr, uid, inv_id, context=None):
-        """
-        Returns the type of the account.invoice document as a string
-        It can be: 'si', 'sr', 'di', 'ivi', 'ivo', 'stv', 'dn', 'cr', 'donation'
-        Raises an error if the type is not recognized.
-        """
-        if context is None:
-            context = {}
-        inv_type = False
-        fields = ['type', 'is_debit_note', 'is_inkind_donation', 'is_intermission', 'is_direct_invoice', 'internal_number']
-        inv = self.browse(cr, uid, inv_id, fields_to_fetch=fields, context=context)
-        if inv.is_debit_note:
-            if inv.type == 'out_invoice':
-                inv_type = 'dn'  # Debit Note
-        elif inv.is_inkind_donation:
-            if inv.type == 'in_invoice':
-                inv_type = 'donation'
-        elif inv.is_intermission:
-            if inv.type == 'in_invoice':
-                inv_type = 'ivi'  # Intermission Voucher In
-            elif inv.type == 'out_invoice':
-                inv_type = 'ivo'  # Intermission Voucher Out
-        elif inv.type == 'in_invoice':
-            if inv.is_direct_invoice:
-                inv_type = 'di'  # Direct Invoice
-            else:
-                inv_type = 'si'  # Supplier Invoice
-        elif inv.type == 'in_refund':
-            inv_type = 'sr'  # Supplier Refund
-        elif inv.type == 'out_invoice':
-            inv_type = 'stv'  # Stock Transfer Voucher'
-        elif inv.type == 'out_refund':
-            inv_type = 'cr'  # Customer Refund'
-        if not inv_type:
-            raise osv.except_osv(_('Error'), _('The type of the document %s is unknown.') % inv.internal_number or '')
-        return inv_type
-
     def _check_journal(self, cr, uid, inv_id, inv_type=None, context=None):
         """
         Raises an error if the type of the account.invoice and the journal used are not compatible
@@ -1087,10 +1096,11 @@
         journal = self.browse(cr, uid, inv_id, fields_to_fetch=['journal_id'], context=context).journal_id
         j_type = journal.type
         if inv_type is None:
-            inv_type = self.get_account_invoice_type(cr, uid, inv_id, context=context)
-        if inv_type in ('si', 'di') and j_type != 'purchase' or inv_type == 'sr' and j_type != 'purchase_refund' or \
-            inv_type in ('ivi', 'ivo') and j_type != 'intermission' or inv_type in ('stv', 'dn') and j_type != 'sale' or \
-                inv_type == 'cr' and j_type != 'sale_refund' or inv_type == 'donation' and j_type not in ('inkind', 'extra'):
+            inv_type = self.read(cr, uid, inv_id, ['doc_type'])['doc_type']
+        if inv_type in ('si', 'di', 'isi', 'isr') and j_type != 'purchase' or inv_type == 'sr' and j_type != 'purchase_refund' or \
+            inv_type in ('ivi', 'ivo') and j_type != 'intermission' or inv_type in ('stv', 'str', 'dn') and j_type != 'sale' or \
+                inv_type == 'cr' and j_type != 'sale_refund' or inv_type == 'donation' and j_type not in ('inkind', 'extra') or \
+                inv_type in ('isi', 'isr') and journal.code != 'ISI' or inv_type not in ('isi', 'isr') and journal.code == 'ISI':
             raise osv.except_osv(_('Error'), _("The journal %s is not allowed for this document.") % journal.name)
 
     def _check_partner(self, cr, uid, inv_id, inv_type=None, context=None):
@@ -1102,13 +1112,15 @@
         partner = self.browse(cr, uid, inv_id, fields_to_fetch=['partner_id'], context=context).partner_id
         p_type = partner.partner_type
         if inv_type is None:
-            inv_type = self.get_account_invoice_type(cr, uid, inv_id, context=context)
+            inv_type = self.read(cr, uid, inv_id, ['doc_type'])['doc_type']
         # if a supplier/customer is expected for the doc: check that the partner used has the right flag
-        supplier_ko = inv_type in ('si', 'di', 'sr', 'ivi', 'donation') and not partner.supplier
-        customer_ko = inv_type in ('ivo', 'stv', 'dn', 'cr') and not partner.customer
+        # note: SI/SR on Intersection partners are blocked only at form level (the validation of old docs should still be possible)
+        supplier_ko = inv_type in ('si', 'di', 'sr', 'ivi', 'donation', 'isi', 'isr') and not partner.supplier
+        customer_ko = inv_type in ('ivo', 'stv', 'dn', 'cr', 'str') and not partner.customer
         if supplier_ko or customer_ko or inv_type in ('ivi', 'ivo') and p_type != 'intermission' or \
-            inv_type == 'stv' and p_type not in ('section', 'external') or \
-                inv_type == 'donation' and p_type not in ('esc', 'external', 'section'):
+            inv_type in ('stv', 'str') and p_type not in ('section', 'external') or \
+                inv_type == 'donation' and p_type not in ('esc', 'external', 'section') or \
+                inv_type in ('isi', 'isr') and p_type != 'section':
             raise osv.except_osv(_('Error'), _("The partner %s is not allowed for this document.") % partner.name)
 
     def _check_header_account(self, cr, uid, inv_id, inv_type=None, context=None):
@@ -1120,11 +1132,11 @@
         account_obj = self.pool.get('account.account')
         account = self.browse(cr, uid, inv_id, fields_to_fetch=['account_id'], context=context).account_id
         if inv_type is None:
-            inv_type = self.get_account_invoice_type(cr, uid, inv_id, context=context)
+            inv_type = self.read(cr, uid, inv_id, ['doc_type'])['doc_type']
         account_domain = []
-        if inv_type in ('si', 'di', 'sr'):
+        if inv_type in ('si', 'di', 'sr', 'isi', 'isr'):
             account_domain.append(('restricted_area', '=', 'in_invoice'))
-        elif inv_type in ('stv', 'cr'):
+        elif inv_type in ('stv', 'cr', 'str'):
             account_domain.append(('restricted_area', '=', 'out_invoice'))
         elif inv_type == 'dn':
             account_domain.append(('restricted_area', '=', 'out_invoice'))
@@ -1152,9 +1164,9 @@
         inv_line_obj = self.pool.get('account.invoice.line')
         lines = inv_line_obj.search(cr, uid, [('invoice_id', '=', inv_id)], context=context, order='NO_ORDER')
         if inv_type is None:
-            inv_type = self.get_account_invoice_type(cr, uid, inv_id, context=context)
+            inv_type = self.read(cr, uid, inv_id, ['doc_type'])['doc_type']
         account_domain = []
-        if inv_type in ('si', 'di', 'sr', 'cr'):
+        if inv_type in ('si', 'di', 'sr', 'cr', 'isi', 'isr', 'str'):
             account_domain.append(('restricted_area', '=', 'invoice_lines'))
         elif inv_type == 'stv':
             context.update(({'check_line_stv': True, }))
@@ -1175,7 +1187,7 @@
         if context is None:
             context = {}
         for inv_id in ids:
-            inv_type = self.get_account_invoice_type(cr, uid, inv_id, context=context)
+            inv_type = self.read(cr, uid, inv_id, ['doc_type'])['doc_type']
             self._check_journal(cr, uid, inv_id, inv_type=inv_type, context=context)
             self._check_partner(cr, uid, inv_id, inv_type=inv_type, context=context)
             self._check_header_account(cr, uid, inv_id, inv_type=inv_type, context=context)
@@ -1298,6 +1310,12 @@
             }
         return False
 
+    def button_split_invoice2(self, cr, uid, ids, context=None):
+        """
+        Alias for button_split_invoice (used to handle different characteristics on both buttons)
+        """
+        return self.button_split_invoice(cr, uid, ids, context=context)
+
     def button_donation_certificate(self, cr, uid, ids, context=None):
         """
         Open a view containing a list of all donation certificates linked to the given invoice.
@@ -1578,6 +1596,12 @@
 
         return res
 
+    def button_merge_lines2(self, cr, uid, ids, context=None):
+        """
+        Alias for button_merge_lines (used to handle different characteristics on both buttons)
+        """
+        return self.button_merge_lines(cr, uid, ids, context=context)
+
     def check_accounts_for_partner(self, cr, uid, ids, context=None,
                                    header_obj=False, lines_field='invoice_line',
                                    line_level_partner_type=False):
@@ -1766,6 +1790,12 @@
             res[i] = False
         return res
 
+    def _get_line_doc_type(self, cr, uid, context=None):
+        """
+        Gets the list of possible invoice types
+        """
+        return self.pool.get('account.invoice')._get_invoice_type_list(cr, uid, context=context)
+
     _columns = {
         'line_number': fields.integer(string='Line Number'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account Computation')),
@@ -1798,6 +1828,8 @@
         # (avoids having 2 fields with the same name within the same view)
         'line_synced': fields.related('invoice_id', 'synced', type='boolean', string='Synchronized', readonly=True, store=False,
                                       help='Technical field, similar to "synced"'),
+        'line_doc_type': fields.related('invoice_id', 'doc_type', type='selection', selection=_get_line_doc_type,
+                                        string='Document Type', store=False),
         'invoice_type': fields.related('invoice_id', 'type', string='Invoice Type', type='selection', readonly=True, store=False,
                                        selection=[('out_invoice', 'Customer Invoice'),
                                                   ('in_invoice', 'Supplier Invoice'),
@@ -1856,14 +1888,14 @@
             inv_fields = ['from_supply', 'synced', 'type', 'is_inkind_donation', 'partner_type']
             inv = inv_obj.browse(cr, uid, invoice_id, fields_to_fetch=inv_fields, context=context)
             if not inv.is_inkind_donation:  # never block manual line creation in Donations whatever the workflow and partner type
-                ivi_or_si_synced = inv.type == 'in_invoice' and inv.synced
+                ivi_or_isi_synced = inv.type == 'in_invoice' and inv.synced
                 intermission_or_section_from_supply = inv.partner_type in ('intermission', 'section') and inv.from_supply
                 from_split = context.get('from_split')
                 if context.get('from_inv_form'):
-                    if from_split and ivi_or_si_synced:
+                    if from_split and ivi_or_isi_synced:
                         raise osv.except_osv(_('Error'), _('This document has been generated via synchronization. '
                                                            'You can\'t split its lines.'))
-                    elif not from_split and (ivi_or_si_synced or intermission_or_section_from_supply):
+                    elif not from_split and (ivi_or_isi_synced or intermission_or_section_from_supply):
                         raise osv.except_osv(_('Error'), _('This document has been generated via a Supply workflow or via synchronization. '
                                                            'You can\'t add lines manually.'))
 
 
=== modified file 'bin/addons/account_override/report/account_print_invoice.rml'
--- bin/addons/account_override/report/account_print_invoice.rml	2021-04-26 10:34:04 +0000
+++ bin/addons/account_override/report/account_print_invoice.rml	2021-11-03 13:33:55 +0000
@@ -227,9 +227,10 @@
     [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
     <para style="terp_header">[[ o.is_debit_note and translate('Cancelled Debit Note') or o.is_intermission and translate('Cancelled Intermission Voucher OUT') or o.is_inkind_donation and translate('Cancelled In-kind Donation') or translate('Cancelled Invoice') ]] [[ o.number or '' ]]
     [[ (((o.type == 'out_invoice' or o.is_inkind_donation) and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-    <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_header">[[ o.is_inkind_donation == True and translate('In-kind Donation') or o.is_intermission and translate('Intermission Voucher IN') or ( o.type == 'in_invoice' and not o.register_line_ids ) and translate('Supplier Invoice') or translate('Supplier Direct Invoice') ]] [[ o.number ]]
+    <para style="terp_header">Refund [[ (o.doc_type in ('cr', 'str') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Supplier Refund [[ (o.doc_type == 'sr' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Intersection Supplier Refund [[ (o.doc_type == 'isr' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">[[ o.doc_type == 'donation' and translate('In-kind Donation') or o.doc_type == 'ivi' and translate('Intermission Voucher IN') or o.doc_type == 'si' and translate('Supplier Invoice') or o.doc_type == 'isi' and translate('Intersection Supplier Invoice') or translate('Supplier Direct Invoice') ]] [[ o.number ]]
     [[ (o.type == 'in_invoice' and (not o.is_inkind_donation or o.state != 'cancel') or removeParentNode('para')) and '' ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
 
=== modified file 'bin/addons/account_override/report/open_invoices_xls.mako'
--- bin/addons/account_override/report/open_invoices_xls.mako	2017-08-04 15:15:29 +0000
+++ bin/addons/account_override/report/open_invoices_xls.mako	2021-11-03 13:33:55 +0000
@@ -302,10 +302,12 @@
     <Row><Cell><Data ss:Type="String"></Data></Cell></Row>
 
 <% inv = invoices(data) %>
-<% doc_type_list = [('si_di', _('Supplier Invoices')), ('sr', _('Supplier Refunds')), ('donation', _('Donations')),
-                    ('ivi', _('Intermission Vouchers IN')), ('stv', _('Stock Transfer Vouchers')), ('cr', _('Customer Refunds')),
+<% doc_type_list = [('si_di', _('Supplier Invoices')), ('sr', _('Supplier Refunds')),
+                    ('isi', _('Intersection Supplier Invoices')), ('isr', _('Intersection Supplier Refunds')),
+                    ('donation', _('Donations')), ('ivi', _('Intermission Vouchers IN')),
+                    ('stv', _('Stock Transfer Vouchers')), ('str', _('Stock Transfer Refunds')), ('cr', _('Customer Refunds')),
                     ('dn', _('Debit Notes')), ('ivo', _('Intermission Vouchers OUT'))] %>
-% for (type, title) in doc_type_list:
+% for (doc_type, title) in doc_type_list:
    <Row >
     <Cell ss:StyleID="s23"><Data ss:Type="String">${title}</Data></Cell>
     <Cell ss:StyleID="s24"/>
@@ -329,9 +331,9 @@
         <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Number')}</Data></Cell>
         <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Document Date')}</Data></Cell>
         <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Posting Date')}</Data></Cell>
-% if type in ['stv', 'ivo', 'dn', 'cr']:
+% if doc_type in ['stv', 'ivo', 'dn', 'cr', 'str']:
         <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Customer')}</Data></Cell>
-% elif type in ['si_di', 'ivi', 'donation', 'sr']:
+% elif doc_type in ['si_di', 'ivi', 'donation', 'sr', 'isi', 'isr']:
         <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Supplier')}</Data></Cell>
 % else:
         <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Partner')}</Data></Cell>
@@ -357,8 +359,8 @@
 
 <% nb_line = 0 %>
 
-% if type in inv:
-% for o in inv[type]:
+% if doc_type in inv:
+% for o in inv[doc_type]:
     <Row>
         <% nb_line += 1 %>
         <% update_percent(nb_line, context) %>
 
=== modified file 'bin/addons/account_override/report/report_open_invoices.py'
--- bin/addons/account_override/report/report_open_invoices.py	2019-07-25 14:01:42 +0000
+++ bin/addons/account_override/report/report_open_invoices.py	2021-11-03 13:33:55 +0000
@@ -72,48 +72,20 @@
             self.percent = 0.05  # 5% of the process
             bg_obj.update_percent(self.cr, self.uid, [bg_id], self.percent)
         states = context.get('paid_invoice') and ['paid', 'inv_close'] or ['open']
-        for type in ['si_di', 'sr', 'donation', 'ivi', 'stv', 'cr', 'dn', 'ivo']:
+        for doc_type in ['si_di', 'sr', 'isi', 'isr', 'donation', 'ivi', 'stv', 'str', 'cr', 'dn', 'ivo']:
             # determine the domain to use according to the report type and the doc type
             domain = [('state', 'in', states)]
             if context.get('paid_invoice') and beginning_date and ending_date:
                 domain += [('date_invoice', '>=', beginning_date), ('date_invoice', '<=', ending_date)]
-            if type == 'si_di':
-                domain += [('type', '=', 'in_invoice'),
-                           ('is_inkind_donation', '=', False),
-                           ('is_debit_note', '=', False),
-                           ('is_intermission', '=', False)]
-            elif type == 'sr':
-                domain += [('type', '=', 'in_refund')]
-            elif type == 'donation':
-                domain += [('type', '=', 'in_invoice'),
-                           ('is_debit_note', '=', False),
-                           ('is_inkind_donation', '=', True)]
-            elif type == 'ivi':
-                domain += [('type', '=', 'in_invoice'),
-                           ('is_debit_note', '=', False),
-                           ('is_inkind_donation', '=', False),
-                           ('is_intermission', '=', True)]
-            elif type == 'stv':
-                domain += [('type', '=', 'out_invoice'),
-                           ('is_debit_note', '=', False),
-                           ('is_inkind_donation', '=', False),
-                           ('is_intermission', '=', False)]
-            elif type == 'cr':
-                domain += [('type', '=', 'out_refund')]
-            elif type == 'dn':
-                domain += [('type', '=', 'out_invoice'),
-                           ('is_debit_note', '!=', False),
-                           ('is_inkind_donation', '=', False)]
-            elif type == 'ivo':
-                domain += [('type','=','out_invoice'),
-                           ('is_debit_note', '=', False),
-                           ('is_inkind_donation', '=', False),
-                           ('is_intermission', '=', True)]
+            if doc_type == 'si_di':
+                domain += [('doc_type', 'in', ['si', 'di'])]
+            elif doc_type in ('sr', 'isi', 'isr', 'donation', 'ivi', 'stv', 'str', 'cr', 'dn', 'ivo'):
+                domain += [('doc_type', '=', doc_type)]
             type_ids = inv_obj.search(self.cr, self.uid, domain, context=context, order='move_name')
             if isinstance(type_ids, (int, long)):
                 type_ids = [type_ids]
             self.nb_lines += len(type_ids)
-            res.update({type: inv_obj.browse(self.cr, self.uid, type_ids, context)})
+            res.update({doc_type: inv_obj.browse(self.cr, self.uid, type_ids, context)})
         if bg_id:
             self.percent += 0.20  # 25% of the process
             bg_obj.update_percent(self.cr, self.uid, [bg_id], self.percent)
 
=== modified file 'bin/addons/account_payment/__openerp__.py'
--- bin/addons/account_payment/__openerp__.py	2019-10-10 15:06:49 +0000
+++ bin/addons/account_payment/__openerp__.py	2021-11-03 13:33:55 +0000
@@ -33,7 +33,6 @@
     'author': 'OpenERP SA',
     'depends': ['account'],
     'update_xml': [
-        'account_invoice_view.xml',
     ],
     'demo_xml': [],
     'test': [
 
=== removed file 'bin/addons/account_payment/account_invoice_view.xml'
=== modified file 'bin/addons/account_period_closing_level/account_period.py'
--- bin/addons/account_period_closing_level/account_period.py	2021-08-25 14:50:30 +0000
+++ bin/addons/account_period_closing_level/account_period.py	2021-11-03 13:33:55 +0000
@@ -501,7 +501,7 @@
             context = {}
         return self.register_view(cr, uid, ids, 'cash', context=context)
 
-    def invoice_view(self, cr, uid, ids, action_xmlid=None, context=None):
+    def invoice_view(self, cr, uid, ids, action_xmlid=None, doc_type=None, context=None):
         """
         Open an invoice tree view with the given domain for the period in ids
         """
@@ -510,17 +510,11 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-
-        # to get action_xmlid:
-        # 1/ on the web interface get id of ir.ui.menu menu
-        # 2/ get id of ir.actions.act_window:
-        #        select value from ir_values where model='ir.ui.menu' and res_id=<menu_id>;
-        # 3/ get xmlid:
-        #    select module||'.'||name from ir_model_data where res_id=<act_id> and module!='sd' and model='ir.actions.act_window';
-        module, xmlid = action_xmlid.split('.', 1)
-        act_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xmlid)[1]
-        keys = ['display_menu_tip', 'help', 'type', 'domain', 'res_model', 'view_id', 'search_view_id', 'view_mode', 'view_ids', 'context', 'name', 'views', 'view_type']
-        act = self.pool.get('ir.actions.act_window').read(cr, uid, act_id, keys, context=context)
+        if not action_xmlid and doc_type:
+            action_xmlid = self.pool.get('account.invoice')._invoice_action_act_window.get(doc_type)
+        if not action_xmlid:
+            raise osv.except_osv(_('Warning'), _('Impossible to retrieve the view to display.'))
+        act = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, action_xmlid, context=context)
         act_domain = act.get('domain', "[]") or "[]"
         act_context = act.get('context', "{}") or "{}"
         globals_dict = {'uid': uid}
@@ -535,7 +529,22 @@
             eval_domain += [('date_invoice', '<=', period['date_stop']), ('state', 'in', ['draft', 'open'])]
 
         eval_context = safe_eval(act_context, globals_dict)
-        eval_context['search_default_draft'] = 0
+
+        model_name = hasattr(model_obj, '_name') and getattr(model_obj, '_name')
+        model_inherit_name = hasattr(model_obj, '_inherit') and getattr(model_obj, '_inherit')
+        if model_name == 'account.invoice' or model_inherit_name == 'account.invoice':
+            # activate the Draft and Open filters
+            eval_context['search_default_draft'] = 1
+            if eval_context.get('doc_type') == 'donation':
+                eval_context['search_default_open'] = 1
+                eval_context['search_cancel_state_donation'] = 0
+            else:
+                eval_context['search_default_unpaid'] = 1  # Open
+                eval_context['search_default_paid'] = 0
+                eval_context['search_default_closed'] = 0
+            if eval_context.get('doc_type') in ('ivo', 'stv'):
+                eval_context['search_default_cancel_state'] = 0
+
         act['context'] = eval_context
         act['domain'] = eval_domain
         act['target'] = 'current'
@@ -546,68 +555,76 @@
         """
         Create a new tab with Open stock transfer vouchers from given period.
         """
-        return self.invoice_view(cr, uid, ids, action_xmlid='account.action_invoice_tree1', context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='stv', context=context)
 
     def button_customer_refunds(self, cr, uid, ids, context=None):
         """
         Create a new tab with Customer refunds from given period.
         """
-        return self.invoice_view(cr, uid, ids, action_xmlid='account.action_invoice_tree3', context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='cr', context=context)
 
     # Debit note
     def button_debit_note(self, cr, uid, ids, context=None):
-        return self.invoice_view(cr, uid, ids,
-                                 action_xmlid='account_override.action_debit_note',
-                                 context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='dn', context=context)
 
     # Intermission voucher OUT
     def button_intermission_out(self, cr, uid, ids, context=None):
-        return self.invoice_view(cr, uid, ids,
-                                 action_xmlid='account_override.action_intermission_out',
-                                 context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='ivo', context=context)
 
     def button_supplier_refunds(self, cr, uid, ids, context=None):
         """
-        Open a view that display Supplier invoices for given period
+        Open a view that displays Supplier Refunds for given period
         """
-        return self.invoice_view(cr, uid, ids,
-                                 action_xmlid='account.action_invoice_tree4', context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='sr', context=context)
 
     # Supplier direct invoices
     def button_supplier_direct_invoices(self, cr, uid, ids, context=None):
         """
         Open a view that display Direct invoices for this period
         """
-        return self.invoice_view(cr, uid, ids,
-                                 action_xmlid='register_accounting.action_direct_invoice',
-                                 context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='di', context=context)
 
     # In-kind donation
     def button_donation(self, cr, uid, ids, context=None):
         """
         Open a view that display Inkind donation for this period
         """
-        return self.invoice_view(cr, uid, ids,
-                                 action_xmlid='account_override.action_inkind_donation',
-                                 context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='donation', context=context)
 
     # Intermission voucher IN
     def button_intermission_in(self, cr, uid, ids, context=None):
         """
         Open a view that display intermission voucher in for this period
         """
-        return self.invoice_view(cr, uid, ids,
-                                 action_xmlid='account_override.action_intermission_in',
-                                 context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='ivi', context=context)
 
     # Supplier invoice
     def button_supplier_invoices(self, cr, uid, ids, context=None):
         """
         Open a view that display supplier invoices for this period
         """
-        return self.invoice_view(cr, uid, ids,
-                                 action_xmlid='account.action_invoice_tree2',
-                                 context=context)
+        return self.invoice_view(cr, uid, ids, doc_type='si', context=context)
+
+    # Intersection Supplier Invoice
+    def button_intersection_supplier_invoices(self, cr, uid, ids, context=None):
+        """
+        Opens a view with the ISI to check before closing the period
+        """
+        return self.invoice_view(cr, uid, ids, doc_type='isi', context=context)
+
+    # Intersection Supplier Refund
+    def button_intersection_supplier_refunds(self, cr, uid, ids, context=None):
+        """
+        Opens a view with the ISR to check before closing the period
+        """
+        return self.invoice_view(cr, uid, ids, doc_type='isr', context=context)
+
+    # Stock Transfer Refund
+    def button_stock_transfer_refunds(self, cr, uid, ids, context=None):
+        """
+        Opens a view with the STR to check before closing the period
+        """
+        return self.invoice_view(cr, uid, ids, doc_type='str', context=context)
 
     def button_close_field_period(self, cr, uid, ids, context=None):
         if not context:
 
=== modified file 'bin/addons/account_period_closing_level/account_period_closing_level_view.xml'
--- bin/addons/account_period_closing_level/account_period_closing_level_view.xml	2019-10-29 14:39:06 +0000
+++ bin/addons/account_period_closing_level/account_period_closing_level_view.xml	2021-11-03 13:33:55 +0000
@@ -152,15 +152,18 @@
                                 <label string="Did you check draft and open customer documents?" colspan="6" align="0.0"/>
                                 <group colspan="6" col="6">
                                     <button string="Stock transfer vouchers" name="button_stock_transfer_vouchers" type="object" icon="gtk-dnd" colspan="2"/>
+                                    <button string="Stock Transfer Refunds" name="button_stock_transfer_refunds" type="object" icon="gtk-dnd" colspan="2"/>
                                     <button string="Customer Refunds" name="button_customer_refunds" type="object" icon="gtk-dnd" colspan="2"/>
+                                    <button string="Intermission Voucher OUT" name="button_intermission_out" type="object" icon="gtk-dnd" colspan="2"/>
                                     <button string="Debit Note" name="button_debit_note" type="object" icon="gtk-dnd" colspan="2"/>
-                                    <button string="Intermission Voucher OUT" name="button_intermission_out" type="object" icon="gtk-dnd" colspan="2"/>
                                 </group>
                                 <label string="Did you check draft and open supplier documents?" colspan="6" align="0.0"/>
                                 <group colspan="6" col="6">
                                     <button string="Supplier invoices" name="button_supplier_invoices" type="object" icon="gtk-dnd" colspan="2"/>
                                     <button string="Supplier refunds" name="button_supplier_refunds" type="object" icon="gtk-dnd" colspan="2"/>
                                     <button string="Supplier direct invoices" name="button_supplier_direct_invoices" type="object" icon="gtk-dnd" colspan="2"/>
+                                    <button string="Intersection Supplier Invoices" name="button_intersection_supplier_invoices" type="object" icon="gtk-dnd" colspan="2"/>
+                                    <button string="Intersection Supplier Refunds" name="button_intersection_supplier_refunds" type="object" icon="gtk-dnd" colspan="2"/>
                                     <button string="Donation" name="button_donation" type="object" icon="gtk-dnd" colspan="2"/>
                                     <button string="Intermission Voucher IN" name="button_intermission_in" type="object" icon="gtk-dnd" colspan="2"/>
                                 </group>
 
=== modified file 'bin/addons/account_period_closing_level/account_year_end_closing.xml'
--- bin/addons/account_period_closing_level/account_year_end_closing.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/account_period_closing_level/account_year_end_closing.xml	2021-11-03 13:33:55 +0000
@@ -2,21 +2,6 @@
 <openerp>
     <data>
 
-        <record id="view_account_form_inherit" model="ir.ui.view">
-            <field name="name">account.account.form</field>
-            <field name="model">account.account</field>
-            <field name="type">form</field>
-            <field name="priority">55</field>
-            <field name="inherit_id" ref="account.view_account_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook" position="inside">
-                    <page string="End Year Closing"  attrs="{'invisible': [('instance_level', '=', 'project')]}">
-                        <field name="include_in_yearly_move"
-                            attrs="{'readonly': ['|', ('instance_level', '!=', 'section'), ('type', 'not in', ['other', ])]}"/>
-                    </page>
-                </xpath>
-            </field>
-        </record>
 
         <record id="account.action_account_fiscalyear_form" model="ir.actions.act_window">
             <field name="name">Fiscal Years</field>
@@ -37,4 +22,4 @@
         </record>
 
     </data>
-</openerp>
 \ No newline at end of file
+</openerp>
 
=== modified file 'bin/addons/account_subscription/account_model_view.xml'
--- bin/addons/account_subscription/account_model_view.xml	2020-08-17 16:32:14 +0000
+++ bin/addons/account_subscription/account_model_view.xml	2021-11-03 13:33:55 +0000
@@ -26,7 +26,7 @@
                         <group col="6" colspan="4">
                             <group attrs="{'readonly': [('state', '=', 'done')]}" colspan="6" col="6">
                                 <field name="name"/>
-                                <field name="journal_id" domain="[('type', '=', 'purchase'), ('is_current_instance', '=', True)]"/>
+                                <field name="journal_id" domain="[('type', '=', 'purchase'), ('code', '!=', 'ISI'), ('is_current_instance', '=', True)]"/>
                                 <field name="currency_id"/>
                             </group>
                             <group colspan="6" col="6" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
 
=== modified file 'bin/addons/analytic_distribution/account_commitment.py'
--- bin/addons/analytic_distribution/account_commitment.py	2021-08-17 13:24:42 +0000
+++ bin/addons/analytic_distribution/account_commitment.py	2021-11-03 13:33:55 +0000
@@ -29,7 +29,7 @@
 import decimal_precision as dp
 from account_override.period import get_period_from_date
 from tools.misc import flatten
-
+import netsvc
 
 class account_commitment(osv.osv):
     _name = 'account.commitment'
@@ -48,11 +48,23 @@
             ids = [ids]
         # Prepare some values
         res = {}
+        for _id in ids:
+            res[_id] = 0
         # Browse commitments
-        for co in self.browse(cr, uid, ids, context=context):
-            res[co.id] = 0.0
-            for line in co.line_ids:
-                res[co.id] += line.amount
+        if ids:
+            cr.execute('''
+                select
+                    commit_id, sum(amount)
+                from
+                    account_commitment_line
+                where
+                    commit_id in %s
+                group by
+                    commit_id
+            ''', (tuple(ids),))
+            for x in cr.fetchall():
+                res[x[0]] = round(x[1], 2)
+
         return res
 
     def _get_cv(self, cr, uid, ids, context=None):
@@ -86,8 +98,9 @@
 
     def _display_super_done_button(self, cr, uid, ids, name, arg, context=None):
         """
-        For now the "Super" Done button, which allows to always set a CV to Done whatever its state and origin,
-        is visible only by the Admin user. It is displayed only when the standard Done button isn't usable.
+        The "Super" Done button, which allows to always set a CV to Done whatever its state and origin, is displayed:
+        - when the standard Done button isn't usable.
+        - only for some "admin" users (the restriction is made by User Rights).
         """
         if context is None:
             context = {}
@@ -96,14 +109,14 @@
         res = {}
         for cv in self.read(cr, uid, ids, ['state', 'type'], context=context):
             other_done_button_usable = cv['state'] == 'open' and cv['type'] not in ('external', 'intermission', 'intersection')
-            res[cv['id']] = not other_done_button_usable and uid == 1 and cv['state'] != 'done'
+            res[cv['id']] = not other_done_button_usable and cv['state'] != 'done'
         return res
 
     _columns = {
         'journal_id': fields.many2one('account.analytic.journal', string="Journal", readonly=True, required=True),
         'name': fields.char(string="Number", size=64, readonly=True, required=True),
         'currency_id': fields.many2one('res.currency', string="Currency", required=True),
-        'partner_id': fields.many2one('res.partner', string="Supplier", required=True),
+        'partner_id': fields.many2one('res.partner', string="Partner", required=True),
         'period_id': fields.many2one('account.period', string="Period", readonly=True, required=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'Validated'), ('done', 'Done')], readonly=True, string="State", required=True),
         'date': fields.date(string="Commitment Date", readonly=True, required=True, states={'draft': [('readonly', False)], 'open': [('readonly', False)]}),
@@ -115,7 +128,9 @@
         'analytic_distribution_id': fields.many2one('analytic.distribution', string="Analytic distribution"),
         'type': fields.selection(get_cv_type, string="Type", readonly=True),
         'notes': fields.text(string="Comment"),
+        'cv_flow_type': fields.selection([('customer', 'Customer'), ('supplier', 'Supplier')], string="Type of CV"),
         'purchase_id': fields.many2one('purchase.order', string="Source document", readonly=True),
+        'sale_id': fields.many2one('sale.order', string="Source document", readonly=True),
         'description': fields.char(string="Description", size=256),
         'version': fields.integer('Version', required=True,
                                   help="Technical field to distinguish old CVs from new ones which have a different behavior."),
@@ -155,6 +170,10 @@
             partner = self.pool.get('res.partner').browse(cr, uid, [partner_id])
             if partner and partner[0] and not partner[0].active:
                 raise osv.except_osv(_('Warning'), _("Partner '%s' is not active.") % (partner[0] and partner[0].name or '',))
+        if vals.get('sale_id'):
+            vals['cv_flow_type'] = 'customer'
+        elif vals.get('purchase_id'):
+            vals['cv_flow_type'] = 'supplier'
         # Add sequence
         sequence_number = self.pool.get('ir.sequence').get(cr, uid, self._name)
         instance = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.instance_id
@@ -441,6 +460,9 @@
             ids = [ids]
         # Browse commitments
         for c in self.browse(cr, uid, ids, context=context):
+            sign = 1
+            if c.cv_flow_type == 'customer':
+                sign = -1
             for cl in c.line_ids:
                 # Verify that analytic distribution is present
                 if cl.analytic_distribution_state != 'valid':
@@ -456,10 +478,10 @@
                 if not al_ids:
                     # Create engagement journal lines
                     self.pool.get('analytic.distribution').\
-                        create_account_analytic_lines(cr, uid, [distrib_id], c.description or c.name, c.date, cl.amount,
+                        create_account_analytic_lines(cr, uid, [distrib_id], c.description or c.name, c.date, sign * cl.amount,
                                                       c.journal_id and c.journal_id.id,
                                                       c.currency_id and c.currency_id.id, c.date or False,
-                                                      (c.purchase_id and c.purchase_id.name) or c.name or False, c.date,
+                                                      (c.purchase_id and c.purchase_id.name or c.sale_id and c.sale_id.name) or c.name or False, c.date,
                                                       cl.account_id and cl.account_id.id or False, False, False, cl.id, context=context)
         return True
 
@@ -500,12 +522,56 @@
             self.write(cr, uid, [c.id], {'state':'done'}, context=context)
         return True
 
+    def test_and_close_cv_so(self, cr, uid, ids, invoice_ids=None, context=None):
+        """
+            set amout=0 on CV lines linked to closed, cancelled(-r) FO line (no more invoices expected)
+            and with no draft invoice
+
+
+            invoice_ids: list of draft invoices to ignore (state will be changed later in the code)
+        """
+
+        if invoice_ids is None:
+            invoice_ids = []
+
+        iv_ids = invoice_ids[:]
+        if not iv_ids:
+            iv_ids.append(0)
+
+        cv_line_obj = self.pool.get('account.commitment.line')
+        cr.execute('''
+            select
+                line.id, line.amount
+            from
+                account_commitment_line line
+            left join
+                sale_order_line sol on sol.id = line.so_line_id
+            left join
+                account_invoice_line inv_line on inv_line.sale_order_line_id = sol.id and inv_line.invoice_id not in %s
+            left join
+                account_invoice inv on inv_line.invoice_id = inv.id and inv.type = 'out_invoice' and inv.from_supply = 't'
+            where
+                sol.state in ('done', 'cancel', 'cancel_r') and
+                line.amount != 0 and
+                line.commit_id in %s
+            group by
+                line.id, line.amount
+            having (count(inv.state='draft' or NULL) = 0)
+        ''', (tuple(iv_ids), tuple(ids)))
+        # from_supply + out_invoice : to ignore draft refund
+
+        for x in cr.fetchall():
+            cv_line_obj._update_so_commitment_line(cr, uid, x[0], x[1], from_cancel=True, context=context)
+
+        return True
+
+
 account_commitment()
 
 class account_commitment_line(osv.osv):
     _name = 'account.commitment.line'
     _description = "Account Commitment Voucher Line"
-    _order = "po_line_id, id desc"
+    _order = "line_number, id desc"
     _rec_name = 'account_id'
     _trace = True
 
@@ -574,10 +640,9 @@
                                                     string="Purchase Order Lines (deprecated)", readonly=True),
         # for CV starting from version 2
         'po_line_id': fields.many2one('purchase.order.line', "PO Line"),
-        'po_line_product_id': fields.related('po_line_id', 'product_id', type='many2one', relation='product.product',
-                                             string="Product", readonly=True, store=True, write_relate=False),
-        'po_line_number': fields.related('po_line_id', 'line_number', type='integer_null', string="PO Line", readonly=True,
-                                         store=True, write_relate=False, _fnct_migrate=lambda *a: True),
+        'so_line_id': fields.many2one('sale.order.line', "SO Line"),
+        'line_product_id': fields.many2one('product.product', string="Product", readonly=True),
+        'line_number': fields.integer_null('Line', readonly=True),
     }
 
     _defaults = {
@@ -608,20 +673,23 @@
         # Prepare some values
         for cl in self.browse(cr, uid, ids, context=context):
             # Browse distribution
+            sign = 1
+            if cl.commit_id.cv_flow_type == 'customer':
+                sign = -1
             distrib_id = cl.analytic_distribution_id and cl.analytic_distribution_id.id or False
             if not distrib_id:
                 distrib_id = cl.commit_id and cl.commit_id.analytic_distribution_id and cl.commit_id.analytic_distribution_id.id or False
             if distrib_id:
                 analytic_line_ids = self.pool.get('account.analytic.line').search(cr, uid, [('commitment_line_id', '=', cl.id)], context=context)
                 self.pool.get('account.analytic.line').unlink(cr, uid, analytic_line_ids, context=context)
-                ref = cl.commit_id and cl.commit_id.purchase_id and cl.commit_id.purchase_id.name or False
+                ref = cl.commit_id and cl.commit_id.purchase_id and cl.commit_id.purchase_id.name or cl.commit_id.sale_id and cl.commit_id.sale_id.name or False
                 if cl.commit_id:
                     desc = cl.commit_id.description or cl.commit_id.name
                 else:
                     desc = 'Commitment voucher line'
                 self.pool.get('analytic.distribution').\
                     create_account_analytic_lines(cr, uid, [distrib_id], desc,
-                                                  cl.commit_id.date, amount, cl.commit_id.journal_id.id, cl.commit_id.currency_id.id,
+                                                  cl.commit_id.date, sign * amount, cl.commit_id.journal_id.id, cl.commit_id.currency_id.id,
                                                   cl.commit_id and cl.commit_id.date or False, ref, cl.commit_id.date,
                                                   account_id or cl.account_id.id, move_id=False, invoice_line_id=False,
                                                   commitment_line_id=cl.id, context=context)
@@ -678,15 +746,16 @@
             account = self.pool.get('account.account').browse(cr, uid, [account_id], context=context)[0]
             if account.type in ['view']:
                 raise osv.except_osv(_('Error'), _("You cannot write a commitment voucher line on a 'view' account type!"))
-        # Verify amount validity
-        if 'amount' in vals and vals.get('amount', 0.0) < 0.0:
-            raise osv.except_osv(_('Warning'), _('Amount Left should be equal or superior to 0!'))
-        if 'initial_amount' in vals and vals.get('initial_amount', 0.0) <= 0.0:
-            raise osv.except_osv(_('Warning'), _('Initial Amount should be superior to 0!'))
         # Update analytic distribution if needed and initial_amount
         for line in self.browse(cr, uid, ids, context=context):
+            # Verify amount validity
+            if 'amount' in vals and vals.get('amount', 0.0) < 0.0:
+                raise osv.except_osv(_('Warning'), _('Amount Left should be equal or superior to 0!'))
+            if 'initial_amount' in vals and vals.get('initial_amount', 0.0) <= 0.0:
+                raise osv.except_osv(_('Warning'), _('Initial Amount should be superior to 0!'))
+            message = _('Initial Amount should be superior to Amount Left')
+
             # verify that initial amount is superior to amount left
-            message = _('Initial Amount should be superior to Amount Left')
             if 'amount' in vals and 'initial_amount' in vals:
                 if vals.get('initial_amount') < vals.get('amount'):
                     raise osv.except_osv(_('Warning'), message)
@@ -783,5 +852,32 @@
             'context': context,
         }
 
+    def _update_so_commitment_line(self, cr, uid, id, amount, from_cancel=True, context=None):
+        """
+            reduce amount on CV line from SO
+            called when:
+              * FO line is canceled(-r)
+              * SI is opened or canceled
+        """
+        if context is None:
+            context = {}
+        wf_service = netsvc.LocalService("workflow")
+        cv_obj = self.pool.get('account.commitment')
+
+        cv_line = self.browse(cr, uid, id, context=context)
+        if not from_cancel and cv_line.commit_id.state == 'draft':
+            wf_service.trg_validate(uid, 'account.commitment', cv_line.commit_id.id, 'commitment_open', cr)
+
+        amount_left = max(round(cv_line.amount - amount, 2), 0)
+        # this will trigger AJIs update
+        self.write(cr, uid, [id], {'amount': amount_left}, context=context)
+
+        cv = cv_obj.read(cr, uid, cv_line.commit_id.id, ['total'], context=context)
+        if abs(cv['total']) < 0.001:
+            cv_obj.action_commitment_done(cr, uid, [cv_line.commit_id.id], context=context)
+
+        return True
+
+
 account_commitment_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/analytic_distribution/account_commitment_view.xml'
--- bin/addons/analytic_distribution/account_commitment_view.xml	2021-08-25 14:50:30 +0000
+++ bin/addons/analytic_distribution/account_commitment_view.xml	2021-11-03 13:33:55 +0000
@@ -8,12 +8,15 @@
             <field name="model">account.commitment</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Commitment Voucher" hide_duplicate_button="1">
+                <form string="Supplier Commitment Voucher" hide_duplicate_button="1">
                     <group col="6" colspan="4">
                         <field name="journal_id" domain="[('is_current_instance','=',True)]"/>
-                        <field name="partner_id" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" attrs="{'readonly': ['|', ('type', '!=', 'manual'), ('state', '!=', 'draft')]}"/>
+                        <field name="partner_id" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" attrs="{'readonly': ['|', ('type', '!=', 'manual'), ('state', '!=', 'draft')]}" string="Supplier"/>
                         <newline/>
                         <field name="name"/>
+                        <field name="cv_flow_type" invisible="1" />
+                        <field name="purchase_id" attrs="{'invisible': [('cv_flow_type', '!=', 'supplier')]}"/>
+                        <field name="sale_id" attrs="{'invisible': [('cv_flow_type', '!=', 'customer')]}"/>
                         <newline/>
                         <field name="date" on_change="onchange_date(date, period_id)"/>
                         <field name="period_id"/>
@@ -54,7 +57,7 @@
                                         'readonly': [('type', 'in', ['external', 'intermission', 'intersection'])]}"
                         />
                         <!-- button which allows to always set a CV to Done (whatever its state and origin) -->
-                        <button name="commitment_always_validate" string="Done (for Administrator only)"
+                        <button name="commitment_always_validate" string="Force Done"
                                 icon="terp-gtk-go-back-rtl" colspan="6"
                                 confirm='You are about to set this Commitment Voucher to the state "Done". Do you want to proceed?'
                                 attrs="{'invisible': [('display_super_done_button', '=', False)]}"/>
@@ -70,10 +73,11 @@
             <field name="model">account.commitment</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Commitment Voucher" colors="blue:state == 'draft';grey:state == 'done';black:state == 'open'">
+                <tree string="Supplier Commitment Vouchers" colors="blue:state == 'draft';grey:state == 'done';black:state == 'open'">
                     <field name="date"/>
                     <field name="name"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" string="Supplier"/>
+                    <field name="purchase_id" />
                     <field name="currency_id"/>
                     <field name="total" digits="(16,2)"/>
                     <field name="type"/>
@@ -83,6 +87,7 @@
             </field>
         </record>
 
+
     <!-- Commitment Lines -->
         <record model="ir.ui.view" id="account_commitment_line_tree">
             <field name="name">account.commitment.line.tree</field>
@@ -95,8 +100,8 @@
                       hide_delete_button="1"
                       >
                     <field name="commit_type"/>
-                    <field name="po_line_product_id"/>
-                    <field name="po_line_number"/>
+                    <field name="line_product_id"/>
+                    <field name="line_number"/>
                     <field name="account_id" domain="[('restricted_area', '=', 'commitment_lines')]"/>
                     <button name="button_analytic_distribution" string="Analytical Distribution" type="object"
                             icon="terp-stock_symbol-selection" context="context"
@@ -125,21 +130,21 @@
             <field name="model">account.commitment</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Commitment Voucher">
+                <search string="Supplier Commitment Vouchers">
                     <group col='6' colspan='4'>
-                        <filter icon="terp-tools" string="Manual" domain="[('type','=','manual')]" help="Manual Commitment Voucher"/>
-                        <filter icon="gtk-quit" string="External" domain="[('type','=','external')]" help="External Commitment Voucher"/>
-                        <filter icon="gtk-refresh" string="Intersection" domain="[('type', '=', 'intersection')]" help="Intersection Commitment Voucher"/>
-                        <filter icon="gtk-ok" string="Intermission" domain="[('type', '=', 'intermission')]" help="Intermission Commitment Voucher"/>
-                        <filter icon="terp-partner" string="ESC" domain="[('type','=','esc')]" help="ESC Commitment Voucher"/>
+                        <filter icon="terp-tools" string="Manual" domain="[('type','=','manual')]" help="Manual Commitment Vouchers"/>
+                        <filter icon="gtk-quit" string="External" domain="[('type','=','external')]" help="External Commitment Vouchers"/>
+                        <filter icon="gtk-refresh" string="Intersection" domain="[('type', '=', 'intersection')]" help="Intersection Commitment Vouchers"/>
+                        <filter icon="gtk-ok" string="Intermission" domain="[('type', '=', 'intermission')]" help="Intermission Commitment Vouchers"/>
+                        <filter icon="terp-partner" string="ESC" domain="[('type','=','esc')]" help="ESC Commitment Vouchers"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Commitment Voucher in Draft state" name="draft"/>
-                        <filter icon="terp-camera_test" string="Validated" domain="[('state','=','open')]" help="Commitment Voucher in Validated state" name="validated"/>
-                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Commitment Voucher in Done state" name="done"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Commitment Vouchers in Draft state" name="draft"/>
+                        <filter icon="terp-camera_test" string="Validated" domain="[('state','=','open')]" help="Commitment Vouchers in Validated state" name="validated"/>
+                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Commitment Vouchers in Done state" name="done"/>
                         <newline/>
                         <field name="currency_id" select="1"/>
                         <field name="date" select='1'/>
-                        <field name="partner_id" select='1'/>
+                        <field name="partner_id" select="1" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
                         <field name="name" select="1"/>
                         <field name="purchase_id"/>
                     </group>
@@ -148,6 +153,95 @@
             </field>
         </record>
 
+        <!-- Dedicated from FO views: duplicate CV from PO view and replace fields -->
+        <record model="ir.ui.view" id="account_commitment_fo_tree_copy">
+            <field name="name">account.commitment.fo.tree.copy</field>
+            <field name="model">account.commitment</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="150" />
+            <field name="duplicate_view_id" ref="account_commitment_tree" />
+            <field name="arch" type="xml">
+                <tree />
+            </field>
+        </record>
+        <record model="ir.ui.view" id="account_commitment_fo_tree">
+            <field name="name">account.commitment.fo.tree.copy.inherit</field>
+            <field name="model">account.commitment</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="160" />
+            <field name="inherit_id" ref="account_commitment_fo_tree_copy" />
+            <field name="arch" type="xml">
+                <xpath expr="/tree" position="attributes">
+                    <attribute name="string">Customer Commitment Vouchers</attribute>
+                </xpath>
+                <xpath expr="//field[@name='purchase_id']" position="replace">
+                    <field name="sale_id" />
+                </xpath>
+                <xpath expr="//field[@name='partner_id']" position="attributes">
+                    <attribute name="string">Customer</attribute>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_commitment_fo_search_copy">
+            <field name="name">account.commitment.fo.search.copy</field>
+            <field name="model">account.commitment</field>
+            <field name="type">search</field>
+            <field name="priority" eval="150" />
+            <field name="duplicate_view_id" ref="account_commitment_search" />
+            <field name="arch" type="xml">
+                <search />
+            </field>
+        </record>
+        <record model="ir.ui.view" id="account_commitment_fo_search">
+            <field name="name">account.commitment.fo.seach.copy.inherit</field>
+            <field name="model">account.commitment</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="160" />
+            <field name="inherit_id" ref="account_commitment_fo_search_copy" />
+            <field name="arch" type="xml">
+                <xpath expr="/search" position="attributes">
+                    <attribute name="string">Customer Commitment Vouchers</attribute>
+                </xpath>
+                <xpath expr="//field[@name='purchase_id']" position="replace">
+                    <field name="sale_id" />
+                </xpath>
+                <xpath expr="//field[@name='partner_id']" position="attributes">
+                    <attribute name="context">{'default_customer': 1, 'search_default_customer': 1, 'default_supplier': 0}</attribute>
+                    <attribute name="string">Customer</attribute>
+                </xpath>
+                <xpath expr="//filter[@string='External']" position="replace" />
+                <xpath expr="//filter[@string='ESC']" position="replace" />
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_commitment_fo_form_copy">
+            <field name="name">account.commitment.fo.form.copy</field>
+            <field name="model">account.commitment</field>
+            <field name="type">form</field>
+            <field name="priority" eval="160" />
+            <field name="duplicate_view_id" ref="account_commitment_form" />
+            <field name="arch" type="xml">
+                <form />
+            </field>
+        </record>
+        <record model="ir.ui.view" id="account_commitment_fo_form">
+            <field name="name">account.commitment.fo.form.copy.inherit</field>
+            <field name="model">account.commitment</field>
+            <field name="type">form</field>
+            <field name="priority" eval="160" />
+            <field name="inherit_id" ref="account_commitment_fo_form_copy" />
+            <field name="arch" type="xml">
+                <xpath expr="/form" position="attributes">
+                    <attribute name="string">Customer Commitment Voucher</attribute>
+                </xpath>
+                <xpath expr="//field[@name='partner_id']" position="attributes">
+                    <attribute name="context">{'default_customer': 1, 'search_default_customer': 1, 'default_supplier': 0}</attribute>
+                    <attribute name="string">Customer</attribute>
+                </xpath>
+            </field>
+        </record>
+
         <!-- Commitment Import view -->
         <record id="import_commitment_wizard_view" model="ir.ui.view">
             <field name="name">Import Intl Commitments</field>
@@ -252,16 +346,40 @@
             </field>
         </record>
 
-    <!-- Commitment Voucher Actions -->
+    <!-- Commitment Voucher Actions from PO -->
         <record model="ir.actions.act_window" id="action_account_commitment_tree">
             <field name="res_model">account.commitment</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="account_commitment_tree"/>
             <field name="search_view_id" ref="account_commitment_search"/>
+            <field name="domain">[('cv_flow_type', '=', 'supplier')]</field>
             <!-- US-2704 if a domain is added here, do not forget to update the domain of account_board_commitment_voucher in finance/board_account_view.xml -->
             <field name="context">{'search_default_draft': 1, 'search_default_validated': 1, 'target_filename_prefix': 'Commitment Vouchers'}</field>
         </record>
+    
+    <!-- Commitment Voucher Actions from FO -->
+        <record model="ir.actions.act_window" id="action_account_commitment_from_fo">
+            <field name="res_model">account.commitment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="account_commitment_fo_search_copy"/>
+            <field name="domain">[('cv_flow_type', '=', 'customer')]</field>
+            <field name="context">{'search_default_draft': 1, 'search_default_validated': 1, 'target_filename_prefix': 'Commitment Vouchers'}</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_account_commitment_from_fo_tree">
+            <field name="sequence" eval="10"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="account_commitment_fo_tree_copy"/>
+            <field name="act_window_id" ref="action_account_commitment_from_fo"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_account_commitment_from_fo_form">
+            <field name="sequence" eval="20"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_commitment_fo_form_copy"/>
+            <field name="act_window_id" ref="action_account_commitment_from_fo"/>
+        </record>
+
 
         <!-- next 2 views: duplicate AJI form/tree for commitment Lines (only used to link dedicated sidebar entries -->
         <record id="view_account_analytic_line_tree_commline" model="ir.ui.view">
@@ -337,9 +455,10 @@
 
     <!-- Menu -->
         <menuitem id="menu_commitment" name="Commitments" parent="account.menu_finance" sequence="4"/>
-        <menuitem name="Commitment Voucher" action="action_account_commitment_tree" id="menu_commitment_entries" parent="menu_commitment" sequence="1"/>
-        <menuitem name="Commitment Lines" action="action_engagement_line_tree" id="menu_engagement_lines" parent="menu_commitment" sequence="2"/>
-        <menuitem name="Import Intl Commitments" action="action_import_commitment_wizard" id="menu_import_commitment" parent="menu_commitment" sequence="3"/>
+        <menuitem name="Customer Commitment Vouchers" action="action_account_commitment_from_fo" id="menu_account_commitment_from_fo" parent="menu_commitment" sequence="10"/>
+        <menuitem name="Supplier Commitment Vouchers" action="action_account_commitment_tree" id="menu_commitment_entries" parent="menu_commitment" sequence="20"/>
+        <menuitem name="Commitment Lines" action="action_engagement_line_tree" id="menu_engagement_lines" parent="menu_commitment" sequence="30"/>
+        <menuitem name="Import Intl Commitments" action="action_import_commitment_wizard" id="menu_import_commitment" parent="menu_commitment" sequence="40"/>
 
     </data>
 
 
=== modified file 'bin/addons/analytic_distribution/account_invoice_refund.py'
--- bin/addons/analytic_distribution/account_invoice_refund.py	2019-06-24 14:40:19 +0000
+++ bin/addons/analytic_distribution/account_invoice_refund.py	2021-11-03 13:33:55 +0000
@@ -33,7 +33,6 @@
         """
         WARNING: This method has been taken from account module from OpenERP
         """
-        # @@@[e-mail]_invoice_refund.py
         obj_journal = self.pool.get('account.journal')
         obj_inv = self.pool.get('account.invoice')
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
@@ -43,8 +42,16 @@
         # in case of a DI refund from a register line use the dir_invoice_id in context
         doc_to_refund_id = context.get('dir_invoice_id', False) or (context.get('active_ids') and context['active_ids'][0])
         if doc_to_refund_id:
-            source = obj_inv.read(cr, uid, doc_to_refund_id, ['type', 'is_intermission'], context=context)
-            if source['is_intermission']:
+            source = obj_inv.read(cr, uid, doc_to_refund_id, ['type', 'is_intermission', 'doc_type', 'journal_id'], context=context)
+            if source['doc_type'] == 'stv':
+                if source['journal_id']:
+                    # by default use the same journal for the refund
+                    args = [('id', '=', source['journal_id'][0])]
+                else:
+                    args = [('type', '=', 'sale')]
+            elif source['doc_type'] == 'isi':
+                args = [('type', '=', 'purchase'), ('code', '=', 'ISI')]
+            elif source['is_intermission']:
                 args = [('type', '=', 'intermission')]
             elif source['type'] in ('in_invoice', 'in_refund'):
                 args = [('type', '=', 'purchase_refund')]
@@ -69,17 +76,24 @@
             context = {}
         journal_obj = self.pool.get('account.journal')
         res = super(account_invoice_refund,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        jtype = 'sale_refund'
-        if context.get('journal_type'):
-            jtype = isinstance(context['journal_type'], list) and context['journal_type'][0] or context['journal_type']
-        if jtype in ('sale', 'sale_refund'):
+        if context.get('doc_type', '') == 'stv':
+            jtype = 'sale'
+        elif context.get('doc_type', '') == 'isi':
+            jtype = 'purchase'
+        else:
             jtype = 'sale_refund'
-        elif jtype != 'intermission':  # for IVO/IVI keep using the Interm. journal
-            jtype = 'purchase_refund'
+            if context.get('journal_type'):
+                jtype = isinstance(context['journal_type'], list) and context['journal_type'][0] or context['journal_type']
+            if jtype in ('sale', 'sale_refund'):
+                jtype = 'sale_refund'
+            elif jtype != 'intermission':  # for IVO/IVI keep using the Interm. journal
+                jtype = 'purchase_refund'
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         for field in res['fields']:
             if field == 'journal_id' and user.company_id.instance_id:
                 journal_domain = [('type', '=', jtype), ('is_current_instance', '=', True)]
+                if context.get('doc_type', '') == 'isi':
+                    journal_domain.append(('code', '=', 'ISI'))
                 journal_select = journal_obj._name_search(cr, uid, '', journal_domain, context=context, limit=None, name_get_uid=1)
                 res['fields'][field]['selection'] = journal_select
                 res['fields'][field]['domain'] = journal_domain
@@ -88,7 +102,9 @@
     _columns = {
         'date': fields.date('Posting date'),
         'document_date': fields.date('Document Date', required=True),
-        'is_intermission': fields.boolean("Wizard opened from an Intermission Voucher", readonly=True)
+        'is_intermission': fields.boolean("Wizard opened from an Intermission Voucher", readonly=True),
+        'is_stv': fields.boolean("Wizard opened from a Stock Transfer Voucher", readonly=True),
+        'is_isi': fields.boolean("Wizard opened from an Intersection Supplier Invoice", readonly=True),
     }
 
     def _get_refund(self, cr, uid, context=None):
@@ -97,8 +113,10 @@
         """
         if context is None:
             context = {}
-        if context.get('is_intermission', False):
+        if context.get('is_intermission', False) or context.get('doc_type', '') == 'stv':
             return 'modify'
+        elif context.get('doc_type', '') == 'isi':
+            return 'cancel'
         return 'refund'  # note that only the "Refund" option is available in DI
 
     def _get_is_intermission(self, cr, uid, context=None):
@@ -109,11 +127,29 @@
             context = {}
         return context.get('is_intermission', False)
 
+    def _get_is_stv(self, cr, uid, context=None):
+        """
+        Returns True if the wizard has been opened from a Stock Transfer Voucher
+        """
+        if context is None:
+            context = {}
+        return context.get('doc_type', '') == 'stv'
+
+    def _get_is_isi(self, cr, uid, context=None):
+        """
+        Returns True if the wizard has been opened from an Intersection Supplier Invoice
+        """
+        if context is None:
+            context = {}
+        return context.get('doc_type', '') == 'isi'
+
     _defaults = {
         'document_date': _get_document_date,
         'filter_refund': _get_refund,
         'journal_id': _get_journal,  # US-193
         'is_intermission': _get_is_intermission,
+        'is_stv': _get_is_stv,
+        'is_isi': _get_is_isi,
     }
 
     def _hook_fields_for_modify_refund(self, cr, uid, *args):
@@ -143,7 +179,7 @@
         else:
             return self.pool.get('account.invoice').refund(cr, uid, inv_ids, date, period, description, journal_id, context=context)
 
-    def _hook_create_invoice(self, cr, uid, data, form, *args):
+    def _hook_create_invoice(self, cr, uid, data, form, context=None):
         """
         Permits to adapt invoice creation
         """
@@ -151,7 +187,7 @@
             self.pool.get('finance.tools').check_document_date(cr, uid,
                                                                form['document_date'], form['date'])
             data.update({'document_date': form['document_date']})
-        return super(account_invoice_refund, self)._hook_create_invoice(cr, uid, data, form)
+        return super(account_invoice_refund, self)._hook_create_invoice(cr, uid, data, form, context=context)
 
     def _hook_get_period_from_date(self, cr, uid, invoice_id, date=False, period=False):
         """
 
=== modified file 'bin/addons/analytic_distribution/account_invoice_view.xml'
--- bin/addons/analytic_distribution/account_invoice_view.xml	2020-01-21 14:01:11 +0000
+++ bin/addons/analytic_distribution/account_invoice_view.xml	2021-11-03 13:33:55 +0000
@@ -2,70 +2,6 @@
 <openerp>
     <data>
 
-    <!-- Add new analytic distribution button -->
-        <record id="invoice_supplier_form_2" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.form.2</field>
-            <field name="model">account.invoice</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="priority">30</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/notebook" position="before">
-                        <newline />
-                        <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
-                            <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
-                        </group>
-                        <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
-                            <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
-                        </group>
-                        <field name="analytic_distribution_id" invisible="1"/>
-                        <group colspan="3"/>
-                    </xpath>
-                    <xpath expr="//tree[@string='Invoice lines']/field[@name='account_analytic_id']" position="replace">
-                        <field name="inactive_product" invisible="1" />
-                        <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection" context="context" attrs="{'invisible': [('is_allocatable', '=', False)]}"/>
-                        <field name="analytic_distribution_state_recap"/>
-                        <field name="have_analytic_distribution_from_header" invisible="1"/>
-                        <field name="analytic_distribution_state" invisible="1"/>
-                        <field name="is_allocatable" invisible="1"/>
-                    </xpath>
-                    <xpath expr="//tree[@string='Invoice lines']" position="attributes">
-                        <attribute name="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</attribute>
-                    </xpath>
-                    <xpath expr="//tree[@string='Invoice lines']/field[@name='product_id']" position="before">
-                        <field name="is_corrected" invisible="1"/>
-                        <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <record id="invoice_form_2" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.form.2</field>
-            <field name="model">account.invoice</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="priority">35</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/notebook" position="before">
-                        <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
-                            <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
-                        </group>
-                        <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
-                            <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
-                        </group>
-                        <field name="analytic_distribution_id" invisible="1"/>
-                        <group colspan="3"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
 
         <record id="view_invoice_line_tree_2" model="ir.ui.view">
             <field name="name">account.invoice.line.tree.2</field>
@@ -122,7 +58,11 @@
                     <xpath expr="//field[@name='invoice_line_tax_id']" position="replace">
                         <field name="vat_ok" invisible="1" />
                         <field name="synced" invisible="1" />
-                        <group colspan="4" col="4" attrs="{'invisible': [('vat_ok', '=', False)]}">
+                        <field name="line_doc_type" invisible="1" />
+                        <!-- note: in STV and STR taxes are hidden even for external partners as these are in fact "false" external partners
+                             (e.g. instances for which the deployment of UniField hasn't been finished) -->
+                        <group colspan="4" col="4"
+                               attrs="{'invisible': ['|', ('vat_ok', '=', False), ('line_doc_type', 'in', ('stv', 'str', 'isi', 'isr'))]}">
                             <separator colspan="4" string="Taxes"/>
                             <field colspan="4"
                                    name="invoice_line_tax_id"
 
=== modified file 'bin/addons/analytic_distribution/account_view.xml'
--- bin/addons/analytic_distribution/account_view.xml	2021-09-07 16:24:58 +0000
+++ bin/addons/analytic_distribution/account_view.xml	2021-11-03 13:33:55 +0000
@@ -42,38 +42,6 @@
             </field>
         </record>
 
-        <record id="view_account_form" model="ir.ui.view">
-            <field name="name">account.form</field>
-            <field name="model">account.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_form"/>
-            <field name="priority">25</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='user_type']" position="replace">
-                        <field name="user_type_code" invisible="1"/>
-                        <field name="is_analytic_addicted" invisible="1"/>
-                        <field name="user_type" on_change="onchange_user_type(user_type, code)"/>
-                    </xpath>
-                    <xpath expr="/form/notebook/page[@string='General Information']" position="after">
-                        <page string="Analytical Destination">
-                            <field name="default_destination_id" colspan="2" 
-                                attrs="{'required': [('is_analytic_addicted', '=', True)], 'readonly': [('is_analytic_addicted', '!=', True)]}"/>
-                            <label string="" colspan="2"/>
-                            <field name="destination_ids" nolabel="1" colspan="4" domain="[('type', '!=', 'view'), ('category', '=', 'DEST')]">
-                                <tree string="Destinations">
-                                    <field name="name"/>
-                                    <field name="description"/>
-                                    <field name="date_start"/>
-                                    <field name="date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <record id="analytic_view_move_form" model="ir.ui.view">
             <field name="name">analytic.view.move.form</field>
             <field name="model">account.move</field>
 
=== modified file 'bin/addons/analytic_distribution/analytic_line_view.xml'
--- bin/addons/analytic_distribution/analytic_line_view.xml	2016-09-28 08:20:24 +0000
+++ bin/addons/analytic_distribution/analytic_line_view.xml	2021-11-03 13:33:55 +0000
@@ -2,42 +2,6 @@
 <openerp>
     <data>
 
-    <!-- Add icon ahead analytic line to inform if this line have been reallocated or not -->
-        <record id="inherit2_view_account_analytic_line_tree" model="ir.ui.view">
-            <field name="name">account.analytic.line.tree</field>
-            <field name="model">account.analytic.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
-            <field name="priority" eval="11"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/tree/field[@name='move_id']" position='replace'>
-                        <field name="entry_sequence"/>
-                    </xpath>
-                    <xpath expr="/tree/field[@name='functional_currency_id']" position="after">
-                      <field name="output_amount"/>
-                      <field name="output_currency"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-    <!-- View for Analytic Journal Items (FUNDING POOL) -->
-        <record id="view_account_analytic_line_tree" model="ir.ui.view">
-            <field name="name">account.analytic.line.tree</field>
-            <field name="model">account.analytic.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
-            <field name="priority" eval="12"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/tree/field[@name='account_id']" position='before'>
-                        <field name="destination_id" string="Destination" invisible="not context.get('display_fp', False)"/>
-                        <field name="cost_center_id" string="Cost Center" invisible="not context.get('display_fp', False)"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
 
     <!-- Action for Analytic Journal Items (FUNDING POOL) -->
         <record id="account.action_account_analytic_journal_open_form" model="ir.actions.act_window">
@@ -45,7 +9,7 @@
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_account_analytic_line_tree"/>
+            <field name="view_id" ref="account.view_account_analytic_line_tree"/>
             <field name="domain">[('account_id.category', '=', 'FUNDING')]</field>
             <field name="context">{'display_fp': True, 'target_filename_prefix': 'Analytic Journal Items'}</field>
         </record>
@@ -60,7 +24,7 @@
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_account_analytic_line_tree"/>
+            <field name="view_id" ref="account.view_account_analytic_line_tree"/>
             <field name="domain">[('account_id.category', '=', 'FREE1')]</field>
             <field name="context">{'display_fp': False, 'categ': 'FREE1'}</field>
         </record>
@@ -75,7 +39,7 @@
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_account_analytic_line_tree"/>
+            <field name="view_id" ref="account.view_account_analytic_line_tree"/>
             <field name="domain">[('account_id.category', '=', 'FREE2')]</field>
             <field name="context">{'display_fp': False, 'categ': 'FREE2'}</field>
         </record>
 
=== modified file 'bin/addons/analytic_distribution_supply/__openerp__.py'
--- bin/addons/analytic_distribution_supply/__openerp__.py	2017-10-04 05:23:42 +0000
+++ bin/addons/analytic_distribution_supply/__openerp__.py	2021-11-03 13:33:55 +0000
@@ -30,7 +30,6 @@
     "depends" : ["base", "account_journal", "analytic_distribution", "purchase_override", "stock", "res_currency_functional"],
     "init_xml" : [],
     "update_xml" : [
-        "account_commitment_view.xml",
     ],
     "demo_xml" : [],
     "test": [
 
=== removed file 'bin/addons/analytic_distribution_supply/account_commitment_view.xml'
=== modified file 'bin/addons/analytic_distribution_supply/invoice.py'
--- bin/addons/analytic_distribution_supply/invoice.py	2021-08-11 12:34:27 +0000
+++ bin/addons/analytic_distribution_supply/invoice.py	2021-11-03 13:33:55 +0000
@@ -27,7 +27,7 @@
 from tools.translate import _
 from base import currency_date
 import netsvc
-
+import time
 
 class account_invoice_line(osv.osv):
     _name = 'account.invoice.line'
@@ -130,38 +130,65 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        cv_obj = self.pool.get('account.commitment')
+        cv_line_obj = self.pool.get('account.commitment.line')
+        curr_obj = self.pool.get('res.currency')
+        check_cv_to_close = {}
         # Browse invoices
         for inv in self.browse(cr, uid, ids, context=context):
             grouped_invl_by_acc = {}
             grouped_invl_by_cvl = {}
-            co_ids = self.pool.get('account.commitment').search(cr, uid, [('purchase_id', 'in', [x.id for x in inv.purchase_ids]), ('state', 'in', ['open', 'draft'])], order='date desc', context=context)
-            if not co_ids:
-                continue
+
+            invoice_curr = inv.currency_id.id
+
+
+            cv_on_po = cv_obj.search_exists(cr, uid, [('purchase_id', 'in', [x.id for x in inv.purchase_ids]), ('state', 'in', ['open', 'draft'])], context=context)
+            cv_on_fo = False
+            if not cv_on_po:
+                cv_on_fo = cv_obj.search_exists(cr, uid, [('sale_id', 'in', [x.id for x in inv.order_ids]), ('state', 'in', ['open', 'draft'])], context=context)
+                if not cv_on_fo:
+                    continue
 
             for invl in inv.invoice_line:
                 # Do not take invoice line that have no order_line_id (so that are not linked to a purchase order line)
-                if not invl.order_line_id and not inv.is_merged_by_account:
-                    continue
-                # exclude push flow
-                if invl.order_line_id and (invl.order_line_id.order_id.push_fo or invl.order_line_id.set_as_sourced_n):
-                    continue
-                old_cv_version = True
+                if cv_on_po:
+                    if not invl.order_line_id and not inv.is_merged_by_account:
+                        continue
+                    # exclude push flow
+                    if invl.order_line_id and (invl.order_line_id.order_id.push_fo or invl.order_line_id.set_as_sourced_n):
+                        continue
+                    old_cv_version = True
+                else:
+                    if not invl.sale_order_line_id:
+                        continue
+                    old_cv_version = False
+
                 # CV STARTING FROM VERSION 2
                 amount_to_subtract = invl.price_subtotal or 0.0
                 for cv_line in invl.cv_line_ids:
                     old_cv_version = False  # the field cv_line_ids exist for CVs starting from version 2
                     if abs(amount_to_subtract) <= 10**-3:
                         break
-                    cvl_amount_left = cv_line.amount or 0.0
-                    if cvl_amount_left:
-                        if cv_line.id not in grouped_invl_by_cvl:
-                            grouped_invl_by_cvl[cv_line.id] = 0
-                        if amount_to_subtract >= cvl_amount_left:
-                            grouped_invl_by_cvl[cv_line.id] += cvl_amount_left
-                            amount_to_subtract -= cvl_amount_left
-                        else:
-                            grouped_invl_by_cvl[cv_line.id] += amount_to_subtract
-                            amount_to_subtract = 0
+                    if cv_on_fo:
+                        # no group by accounts on IS/IM SI
+                        if invoice_curr != cv_line.commit_id.currency_id.id:
+                            curr_date = currency_date.get_date(self, cr, inv.document_date, inv.date_invoice)
+
+                            amount_to_subtract = curr_obj.compute(cr, uid, invoice_curr, cv_line.commit_id.currency_id.id, amount_to_subtract, round=True,
+                                                                  context={'currency_date': curr_date or time.strftime('%Y-%m-%d')})
+                        check_cv_to_close[cv_line.commit_id.id] = True
+                        cv_line_obj._update_so_commitment_line(cr, uid, cv_line.id, amount_to_subtract, from_cancel=False, context=context)
+                    else:
+                        cvl_amount_left = cv_line.amount or 0.0
+                        if cvl_amount_left:
+                            if cv_line.id not in grouped_invl_by_cvl:
+                                grouped_invl_by_cvl[cv_line.id] = 0
+                            if amount_to_subtract >= cvl_amount_left:
+                                grouped_invl_by_cvl[cv_line.id] += cvl_amount_left
+                                amount_to_subtract -= cvl_amount_left
+                            else:
+                                grouped_invl_by_cvl[cv_line.id] += amount_to_subtract
+                                amount_to_subtract = 0
                 # CV IN VERSION 1
                 if old_cv_version:
                     # Fetch purchase order line account
@@ -183,9 +210,12 @@
                         grouped_invl_by_acc[a] = 0
                     grouped_invl_by_acc[a] += invl.price_subtotal
 
-            po_ids = [x.id for x in inv.purchase_ids]
-            self._update_commitments_lines(cr, uid, po_ids, account_amount_dic=grouped_invl_by_acc,
-                                           cvl_amount_dic=grouped_invl_by_cvl, from_cancel=False, context=context)
+            if cv_on_po:
+                po_ids = [x.id for x in inv.purchase_ids]
+                self._update_commitments_lines(cr, uid, po_ids, account_amount_dic=grouped_invl_by_acc,
+                                               cvl_amount_dic=grouped_invl_by_cvl, from_cancel=False, context=context)
+            if check_cv_to_close:
+                cv_obj.test_and_close_cv_so(cr, uid, check_cv_to_close.keys(), invoice_ids=ids, context=context)
 
         return True
 
@@ -356,17 +386,20 @@
         to_process = []
         # Verify if all invoice have a po that have a commitment
         for inv in self.browse(cr, uid, ids, context=context):
-            for po in inv.purchase_ids:
-                if po.commitment_ids:
-                    to_process.append(inv.id)
-                    # UTP-536 : Check if the PO is closed and all SI are draft, then close the CV
-                    po_states = ['done']
-                    if po.order_type == 'direct' and po.po_version == 1:
-                        # DPO v1 specific use case: CV and SI are both created at DPO confirmation
-                        # ==> close the CVs if the DPO is at least "Confirmed" and no SI is in Draft anymore
-                        po_states = ['confirmed', 'confirmed_p', 'done']
-                    if po.state in po_states and all(x.id in ids or x.state != 'draft' for x in po.invoice_ids):
-                        self.pool.get('purchase.order')._finish_commitment(cr, uid, [po.id], context=context)
+            if inv.order_ids:
+                to_process.append(inv.id)
+            else:
+                for po in inv.purchase_ids:
+                    if po.commitment_ids:
+                        to_process.append(inv.id)
+                        # UTP-536 : Check if the PO is closed and all SI are draft, then close the CV
+                        po_states = ['done']
+                        if po.order_type == 'direct' and po.po_version == 1:
+                            # DPO v1 specific use case: CV and SI are both created at DPO confirmation
+                            # ==> close the CVs if the DPO is at least "Confirmed" and no SI is in Draft anymore
+                            po_states = ['confirmed', 'confirmed_p', 'done']
+                        if po.state in po_states and all(x.id in ids or x.state != 'draft' for x in po.invoice_ids):
+                            self.pool.get('purchase.order')._finish_commitment(cr, uid, [po.id], context=context)
 
         # Process invoices
         self.update_commitments(cr, uid, to_process, context=context)
 
=== modified file 'bin/addons/base/__openerp__.py'
--- bin/addons/base/__openerp__.py	2019-12-12 13:30:26 +0000
+++ bin/addons/base/__openerp__.py	2021-11-03 13:33:55 +0000
@@ -23,7 +23,7 @@
 
 {
     'name': 'Base',
-    'version': '1.6',
+    'version': '1.7',
     'category': 'Generic Modules/Base',
     'description': """The kernel of OpenERP, needed for all installation.""",
     'author': 'OpenERP SA',
 
=== modified file 'bin/addons/base/ir/ir_actions.py'
--- bin/addons/base/ir/ir_actions.py	2020-02-25 14:52:32 +0000
+++ bin/addons/base/ir/ir_actions.py	2021-11-03 13:33:55 +0000
@@ -284,7 +284,7 @@
         'view_id': fields.many2one('ir.ui.view', 'View Ref.', ondelete='cascade'),
         'domain': fields.char('Domain Value', size=250,
                               help="Optional domain filtering of the destination data, as a Python expression"),
-        'context': fields.char('Context Value', size=250, required=True,
+        'context': fields.char('Context Value', size=512, required=True,
                                help="Context dictionary as Python expression, empty by default (Default: {})"),
         'res_model': fields.char('Object', size=64, required=True,
                                  help="Model name of the object to open in the view window"),
 
=== added directory 'bin/addons/base/migrations/8.0.1.7'
=== added file 'bin/addons/base/migrations/8.0.1.7/pre-update-bar.py'
--- bin/addons/base/migrations/8.0.1.7/pre-update-bar.py	1970-01-01 00:00:00 +0000
+++ bin/addons/base/migrations/8.0.1.7/pre-update-bar.py	2021-11-03 13:33:55 +0000
@@ -0,0 +1,22 @@
+import os
+from tools import config
+import logging
+
+
+def migrate(cr, version):
+    if not cr.table_exists('ir_model_data'):
+        return
+
+    logger = logging.getLogger('migration')
+    queries = os.path.join(config['root_path'], 'addons/base/migrations/8.0.1.7/update_bar_sdref.sql')
+    if os.path.exists(queries):
+        with open(queries) as lines:
+            for line in lines:
+                if line:
+                    cr.execute('SAVEPOINT migration')
+                    try:
+                        cr.execute(line)
+                    except:
+                        logger.warn('SQL error %s' % line)
+                        cr.execute('ROLLBACK TO SAVEPOINT migration')
+    return True
 
=== added file 'bin/addons/base/migrations/8.0.1.7/update_bar_sdref.sql'
--- bin/addons/base/migrations/8.0.1.7/update_bar_sdref.sql	1970-01-01 00:00:00 +0000
+++ bin/addons/base/migrations/8.0.1.7/update_bar_sdref.sql	2021-11-03 13:33:55 +0000
@@ -0,0 +1,108 @@
+delete from msf_button_access_rights_button_access_rule where name='button_split_invoice' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinvoice_supplier_form_3_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_button_split_invoice' where name='BAR_account_overrideinvoice_supplier_form_3_button_split_invoice' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_split_invoice' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinvoice_form_3_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_button_split_invoice' where name='BAR_account_overrideinvoice_form_3_button_split_invoice' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='invoice_open' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_invoice_open' where name='BAR_account_overrideinherit_invoice_form_invoice_open' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_analytic_distribution' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_button_analytic_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_button_analytic_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_analytic_distributioninvoice_supplier_form_2_button_analytic_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_button_analytic_distribution' where name='BAR_analytic_distributioninvoice_supplier_form_2_button_analytic_distribution' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_reset_distribution' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_button_reset_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_button_reset_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_analytic_distributioninvoice_supplier_form_2_button_reset_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_button_reset_distribution' where name='BAR_analytic_distributioninvoice_supplier_form_2_button_reset_distribution' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_open_analytic_lines' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_button_open_analytic_lines' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_button_open_analytic_lines' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_analytic_distributioninvoice_supplier_form_2_button_open_analytic_lines' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_button_open_analytic_lines' where name='BAR_analytic_distributioninvoice_supplier_form_2_button_open_analytic_lines' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_analytic_distribution' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_button_analytic_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_button_analytic_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_analytic_distributioninvoice_form_2_button_analytic_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_button_analytic_distribution' where name='BAR_analytic_distributioninvoice_form_2_button_analytic_distribution' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_reset_distribution' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_button_reset_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_button_reset_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_analytic_distributioninvoice_form_2_button_reset_distribution' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_button_reset_distribution' where name='BAR_analytic_distributioninvoice_form_2_button_reset_distribution' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='invoice_open' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_tree_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_tree_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_tree' and module='account') where id in (select res_id from ir_model_data where name='BAR_register_accountinginvoice_tree_2_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_tree_invoice_open' where name='BAR_register_accountinginvoice_tree_2_invoice_open' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='invoice_open' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_register_accountinginvoice_form_2_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_invoice_open' where name='BAR_register_accountinginvoice_form_2_invoice_open' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='invoice_open' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_register_accountinginvoice_supplier_form_2_invoice_open' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_invoice_open' where name='BAR_register_accountinginvoice_supplier_form_2_invoice_open' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_merge_lines' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_button_merge_lines' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_button_merge_lines' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinvoice_supplier_form_3_button_merge_lines' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_button_merge_lines' where name='BAR_account_overrideinvoice_supplier_form_3_button_merge_lines' and module='sd';
+delete from msf_button_access_rights_button_access_rule where xmlname='account.action_account_invoice_refund' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_accountaction_account_invoice_refund' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_accountaction_account_invoice_refund' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_register_accountinginvoice_supplier_form_2_accountaction_account_invoice_refund' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_accountaction_account_invoice_refund' where name='BAR_register_accountinginvoice_supplier_form_2_accountaction_account_invoice_refund' and module='sd';
+delete from msf_button_access_rights_button_access_rule where xmlname='account.action_account_invoice_refund' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_accountaction_account_invoice_refund' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_accountaction_account_invoice_refund' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_accountaction_account_invoice_refund' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_accountaction_account_invoice_refund' where name='BAR_account_overrideinherit_invoice_form_accountaction_account_invoice_refund' and module='sd';
+delete from msf_button_access_rights_button_access_rule where xmlname='account.account_invoices' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_accountaccount_invoices' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_accountaccount_invoices' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_accountaccount_invoices' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_accountaccount_invoices' where name='BAR_account_overrideinherit_invoice_form_accountaccount_invoices' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='wizard_import_si_line' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_wizard_import_si_line' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_wizard_import_si_line' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_wizard_import_si_line' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_wizard_import_si_line' where name='BAR_account_overrideinherit_invoice_form_wizard_import_si_line' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='wizard_import_si_line' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_wizard_import_si_line' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_wizard_import_si_line' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_register_accountinginvoice_supplier_form_2_wizard_import_si_line' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_wizard_import_si_line' where name='BAR_register_accountinginvoice_supplier_form_2_wizard_import_si_line' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='invoice_open_with_confirmation' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_invoice_open_with_confirmation' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_invoice_open_with_confirmation' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_invoice_open_with_confirmation' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_invoice_open_with_confirmation' where name='BAR_account_overrideinherit_invoice_form_invoice_open_with_confirmation' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='invoice_open_with_sync_confirmation' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_invoice_open_with_sync_confirmation' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_invoice_open_with_sync_confirmation' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_invoice_open_with_sync_confirmation' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_invoice_open_with_sync_confirmation' where name='BAR_account_overrideinherit_invoice_form_invoice_open_with_sync_confirmation' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='import_invoice' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_import_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_import_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_import_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_import_invoice' where name='BAR_account_overrideinherit_invoice_form_import_invoice' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='export_invoice' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_export_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_export_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_export_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_export_invoice' where name='BAR_account_overrideinherit_invoice_form_export_invoice' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='invoice_cancel' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_invoice_cancel' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_invoice_cancel' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_invoice_cancel' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_invoice_cancel' where name='BAR_account_overrideinherit_invoice_form_invoice_cancel' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_split_invoice' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_form_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_form_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_overrideinherit_invoice_form_button_split_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_form_button_split_invoice' where name='BAR_account_overrideinherit_invoice_form_button_split_invoice' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='import_invoice' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_import_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_import_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_register_accountinginvoice_supplier_form_2_import_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_import_invoice' where name='BAR_register_accountinginvoice_supplier_form_2_import_invoice' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='export_invoice' and id in (select res_id from ir_model_data where name='BAR_accountinvoice_supplier_form_export_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountinvoice_supplier_form_export_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='invoice_supplier_form' and module='account') where id in (select res_id from ir_model_data where name='BAR_register_accountinginvoice_supplier_form_2_export_invoice' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountinvoice_supplier_form_export_invoice' where name='BAR_register_accountinginvoice_supplier_form_2_export_invoice' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_corrections' and id in (select res_id from ir_model_data where name='BAR_accountview_account_analytic_line_tree_button_corrections' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountview_account_analytic_line_tree_button_corrections' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='view_account_analytic_line_tree' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_mcdbaccount_analytic_line_default_button_corrections' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountview_account_analytic_line_tree_button_corrections' where name='BAR_account_mcdbaccount_analytic_line_default_button_corrections' and module='sd';
+delete from msf_button_access_rights_button_access_rule where name='button_open_analytic_corrections' and id in (select res_id from ir_model_data where name='BAR_accountview_account_analytic_line_tree_button_open_analytic_corrections' and module='sd' and model='msf_button_access_rights.button_access_rule');
+delete from ir_model_data where name='BAR_accountview_account_analytic_line_tree_button_open_analytic_corrections' and module='sd' and model='msf_button_access_rights.button_access_rule';
+update msf_button_access_rights_button_access_rule set view_id=(select res_id from ir_model_data where model='ir.ui.view' and name='view_account_analytic_line_tree' and module='account') where id in (select res_id from ir_model_data where name='BAR_account_mcdbaccount_analytic_line_default_button_open_analytic_corrections' and module='sd' and model='msf_button_access_rights.button_access_rule');
+update ir_model_data set last_modification=NOW(), touched='[''name'']', name='BAR_accountview_account_analytic_line_tree_button_open_analytic_corrections' where name='BAR_account_mcdbaccount_analytic_line_default_button_open_analytic_corrections' and module='sd';
 
=== modified file 'bin/addons/base/module/instance_auto_creation.py'
--- bin/addons/base/module/instance_auto_creation.py	2020-07-16 09:16:26 +0000
+++ bin/addons/base/module/instance_auto_creation.py	2021-11-03 13:33:55 +0000
@@ -486,6 +486,11 @@
                 else:
                     previous_fy_dates_allowed = False
 
+                if config.has_option('reconfigure', 'customer_commitment'):
+                    customer_commitment = config.getboolean('reconfigure', 'customer_commitment')
+                else:
+                    customer_commitment = False
+
                 if config.has_option('reconfigure', 'payroll_ok'):
                     payroll_ok = config.getboolean('reconfigure', 'payroll_ok')
                 else:
@@ -538,6 +543,9 @@
                     },
                     'previous.fy.dates.setup': {
                         'previous_fy_dates_allowed': previous_fy_dates_allowed,
+                    },
+                    'customer.commitment.setup': {
+                        'customer_commitment': customer_commitment,
                     }
                 }
                 if country_id:
 
=== modified file 'bin/addons/finance/account_analytic_line_view.xml'
--- bin/addons/finance/account_analytic_line_view.xml	2018-11-12 17:20:58 +0000
+++ bin/addons/finance/account_analytic_line_view.xml	2021-11-03 13:33:55 +0000
@@ -10,19 +10,34 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <tree editable="top" noteditable="1" string="Analytic Journal Items" hide_delete_button="1" hide_new_button="1">
+                    <field name="instance_id" readonly="1"/>
+                    <field name="is_reversal" invisible="1"/>
+                    <field name="journal_type" invisible="1"/>
+                    <field name="is_corrigible" invisible="1"/>
+                    <button name="button_corrections" type="object" string="Accounting info/correction"
+                            attrs="{'invisible': [('is_corrigible', '=', False)]}" icon="terp-mail-message-new"/>
+                    <field name="is_reallocated" invisible="1"/>
+                    <field name="last_corrected_id" invisible="1"/>
+                    <field name="is_engi" invisible="1"/>
+                    <button string="Have been reallocated" attrs="{'invisible': [('is_reallocated', '=', False), ('last_corrected_id', '=', False)]}" icon="terp-mail-" colspan="2" name="button_open_analytic_corrections" type="object"/>
                     <field name="journal_id" domain="[('is_current_instance','=',True)]"/>
-                    <field name="move_id"/>
+                    <field name="entry_sequence"/>
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="document_date"/>
                     <field name="date"/>
                     <field name="period_id"/>
                     <field name="general_account_id"/>
+                    <field name="destination_id" string="Destination" invisible="not context.get('display_fp', False)"/>
+                    <field name="cost_center_id" string="Cost Center" invisible="not context.get('display_fp', False)"/>
                     <field name="account_id"/>
+                    <field name="partner_txt"/>
                     <field name="amount_currency" sum="Sum"/>
                     <field name="currency_id"/>
                     <field name="amount" sum="Sum"/>
                     <field name="functional_currency_id"/>
+                    <field name="output_amount"/>
+                    <field name="output_currency"/>
                     <field name="reversal_origin_txt"/>
                     <field name="user_id" invisible="1"/>
                 </tree>
 
=== modified file 'bin/addons/finance/account_view.xml'
--- bin/addons/finance/account_view.xml	2019-06-18 11:15:45 +0000
+++ bin/addons/finance/account_view.xml	2021-11-03 13:33:55 +0000
@@ -2,25 +2,6 @@
 <openerp>
     <data>
 
-    <!-- Account View -->
-        <record id="inherit_view_account_tree" model="ir.ui.view">
-            <field name="name">inherit.view.account.tree</field>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_id</field>
-            <field name="inherit_id" ref="account.view_account_tree"/>
-            <field name="priority">19</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='type']" position="replace">
-                </xpath>
-                <xpath expr="//field[@name='user_type']" position="after">
-                    <field name="type" invisible="1"/>
-                    <field name="type_for_register" invisible="1"/>
-                    <field name="accrual_account" invisible="1"/>
-                </xpath>
-            </field>
-        </record>
-
     <!--
         Journal Entries
     -->
@@ -149,21 +130,6 @@
             <field name="context">{'from_web_menu': True}</field>
         </record>
 
-    <!-- Account View -->
-        <record id="inherit_view_account_form" model="ir.ui.view">
-            <field name='name'>inherit.view.account.form</field>
-            <field name='model'>account.account</field>
-            <field name="type">form</field>
-            <field name="priority">50</field>
-            <field name='inherit_id' ref='account.view_account_form' />
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='user_type']" position="after">
-                    <field name="shrink_entries_for_hq"/>
-                    <field name="is_child_of_coa" invisible="1" />
-                    <field name="display_in_reports" attrs="{'invisible': [('is_child_of_coa', '=', False)]}"  />
-                </xpath>
-            </field>
-        </record>
 
     <!-- UF-1715 -->
     <report id="account_partner_balance_tree_xls"
 
=== modified file 'bin/addons/finance/board_account_view.xml'
--- bin/addons/finance/board_account_view.xml	2021-08-25 14:50:30 +0000
+++ bin/addons/finance/board_account_view.xml	2021-11-03 13:33:55 +0000
@@ -64,7 +64,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <!-- US-2704 domain is related to action_account_commitment_tree of analytic_distribution/account_commitment_view.xml with state='draft' domain addition -->
-            <field name="domain">[('state', '=', 'draft')]</field>
+            <field name="domain">[('state', '=', 'draft'), ('cv_flow_type', '=', 'supplier')]</field>
             <field name="context">{'board_view': True, 'search_default_draft': 1}</field>
             <field ref="account_board_commitment_voucher_view" name="view_id"/>
             <field name="limit">5</field>
@@ -96,8 +96,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <!-- US-2704 domain is related to account.action_invoice_tree2 of account_override/account_invoice_view.xml with state='draft' domain addition -->
-            <field name="domain">[('state', '=', 'draft'), ('type','=','in_invoice'), ('is_direct_invoice', '=', False), ('is_inkind_donation', '=', False), ('is_debit_note', "=", False), ('is_intermission', '=', False)]</field>
-            <field name="context">{'board_view': True, 'type': 'in_invoice', 'search_default_draft': 1}</field>
+            <field name="domain">[('state', '=', 'draft'), ('doc_type', '=', 'si')]</field>
+            <field name="context">{'doc_type': 'si', 'board_view': True, 'type': 'in_invoice', 'journal_type': 'purchase', 'from_inv_form': True, 'search_default_draft': 1}</field>
             <field ref="account_board_supplier_invoice_draft_view" name="view_id"/>
             <field name="limit">5</field>
         </record>
@@ -108,8 +108,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <!-- US-2704 domain is related to account.action_invoice_tree2 of account_override/account_invoice_view.xml with state='open' domain addition -->
-            <field name="domain">[('state', '=', 'open'), ('type','=','in_invoice'), ('is_direct_invoice', '=', False), ('is_inkind_donation', '=', False), ('is_debit_note', "=", False), ('is_intermission', '=', False)]</field>
-            <field name="context">{'board_view': True, 'type': 'in_invoice', 'search_default_unpaid': 1}</field>
+            <field name="domain">[('state', '=', 'open'), ('doc_type', '=', 'si')]</field>
+            <field name="context">{'doc_type': 'si', 'board_view': True, 'type': 'in_invoice', 'journal_type': 'purchase', 'from_inv_form': True, 'search_default_unpaid': 1}</field>
             <field ref="account_board_supplier_invoice_draft_view" name="view_id"/>
             <field name="limit">5</field>
         </record>
 
=== modified file 'bin/addons/msf_accrual/__openerp__.py'
--- bin/addons/msf_accrual/__openerp__.py	2017-10-09 21:06:10 +0000
+++ bin/addons/msf_accrual/__openerp__.py	2021-11-03 13:33:55 +0000
@@ -31,7 +31,6 @@
     "update_xml": [
         'security/ir.model.access.csv',
         'msf_accrual_view.xml',
-        'account_view.xml',
         'wizard/wizard_accrual_view.xml',
         'wizard/wizard_accrual_reversal_view.xml'
     ],
 
=== removed file 'bin/addons/msf_accrual/account_view.xml'
=== modified file 'bin/addons/msf_currency_revaluation/__openerp__.py'
--- bin/addons/msf_currency_revaluation/__openerp__.py	2019-11-04 10:48:48 +0000
+++ bin/addons/msf_currency_revaluation/__openerp__.py	2021-11-03 13:33:55 +0000
@@ -59,7 +59,6 @@
                 "account",
                 ],
     "init_xml": [
-        "account_view.xml",
         "wizard/wizard_currency_revaluation_view.xml"],
     "update_xml": [],
     "demo_xml": [],
 
=== removed file 'bin/addons/msf_currency_revaluation/account_view.xml'
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py	2019-10-30 16:33:21 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py	2021-11-03 13:33:55 +0000
@@ -373,105 +373,6 @@
                 self.write(cr, uid, ids, {'message': _(' Import in progress... \n Please wait that the import is finished before editing %s.') % (invoice_name or _('the object'), )})
         return False
 
-    def get_invoice_view(self, cr, uid, invoice_id, view_name, domain, context=None):
-        if view_name in ('view_intermission_form'):
-            module = 'account_override'
-        else:
-            module = 'account'
-        if view_name:
-            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, view_name)
-            view_id = view_id and view_id[1] or False
-            tree_view = self.pool.get('ir.model.data').get_object_reference(cr,
-                                                                            uid, 'account', 'invoice_tree')
-            tree_view_id = tree_view and tree_view[1] or False
-            return {
-                'type': 'ir.actions.act_window',
-                'res_model': 'account.invoice',
-                'view_type': 'form',