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

[jftempo]

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2018-02-13 15:48:51 +0000
+++ bin/addons/account/account_invoice_view.xml	2019-07-15 07:18:58 +0000
@@ -53,11 +53,29 @@
                 <form string="Invoice Line">
                     <notebook>
                         <page string="Line">
-                            <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})" default_focus="1"/>
-                            <field name="uos_id"  on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
-                            <field name="quantity"/>
-                            <field name="price_unit"/>
-                            <field name="discount" groups="base.group_extended"/>
+                            <field name="invoice_type" invisible="1"/>
+                            <field name="from_supply" invisible="1"/>
+                            <field name="partner_type" invisible="1"/>
+                            <field name="product_id"
+                                   on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
+                                   default_focus="1"
+                                   attrs="{'readonly': ['|',
+                                                        '&amp;', ('invoice_type', '=', 'in_invoice'), ('synced', '=', True),
+                                                        '&amp;', '&amp;', ('invoice_type', '=', 'out_invoice'), ('from_supply', '=', True), ('partner_type', 'in', ('intermission', 'section'))]}"
+                            />
+                            <field name="uos_id"
+                                   on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
+                                   attrs="{'readonly': ['|',
+                                                        '&amp;', ('invoice_type', '=', 'in_invoice'), ('synced', '=', True),
+                                                        '&amp;', '&amp;', ('invoice_type', '=', 'out_invoice'), ('from_supply', '=', True), ('partner_type', 'in', ('intermission', 'section'))]}"
+                            />
+                            <field name="quantity" attrs="{'readonly': ['|',
+                                                           '&amp;', ('invoice_type', '=', 'in_invoice'), ('synced', '=', True),
+                                                           '&amp;', '&amp;', ('invoice_type', '=', 'out_invoice'), ('from_supply', '=', True), ('partner_type', 'in', ('intermission', 'section'))]}"
+                            />
+                            <field name="price_unit" attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                            <field name="discount" groups="base.group_extended"
+                                   attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                             <field colspan="4" name="name"/>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@@ -152,10 +170,17 @@
                         <field name="journal_id" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
-                        <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"/>
+                        <field name="currency_id" width="50" attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize"
+                                string="Change" groups="account.group_account_user"
+                                attrs="{'invisible':[('state', '!=', 'draft')],
+                                        '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)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
+                        <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)"
+                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
+                               attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"
+                        />
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -187,25 +212,39 @@
                                 </tree>
                             </field>
                             <group col="1" colspan="2">
-                                <field name="tax_line" nolabel="1">
-                                    <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,context)"/>
-                                        <field name="name"/>
-
-                                        <field name="account_id" groups="account.group_account_invoice"
-                                               domain="[('type', 'not in', ['view', 'consolidation']),
-                                                        ('user_type_code', '=', 'tax')]"/>
-                                        
-                                        <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
-                                        <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,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 colspan="1" attrs="{'invisible': ['|', ('type', '!=', 'in_invoice'), ('synced', '=', False)]}">
+                                    <!-- SI synced: Tax Lines always in read-only -->
+                                    <field name="tax_line_ids" nolabel="1">
+                                        <tree noteditable="1" string="Taxes">
+                                            <field name="account_tax_id"/>
+                                            <field name="name"/>
+                                            <field name="account_id"/>
+                                            <field name="base"/>
+                                            <field name="amount"/>
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group colspan="1" attrs="{'invisible': [('type', '=', 'in_invoice'), ('synced', '=', True)]}">
+                                    <field name="tax_line" nolabel="1">
+                                        <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,context)"/>
+                                            <field name="name"/>
+
+                                            <field name="account_id" groups="account.group_account_invoice"
+                                                   domain="[('type', 'not in', ['view', 'consolidation']),
+                                                            ('user_type_code', '=', 'tax')]"/>
+
+                                            <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
+                                            <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,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>
                             <group col="4" colspan="2">
                                 <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific"/>
@@ -230,11 +269,14 @@
                             <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"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
-                            <field name="name"/>
+                            <field name="name"
+                                   attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True), ('from_supply', '=', True)]}"/>
                             <newline/>
-                            <field name="origin" groups="base.group_extended"/>
+                            <field name="origin" groups="base.group_extended"
+                                   attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True), ('from_supply', '=', True)]}"/>
                             <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
-                            <field name="user_id"/>
+                            <field name="user_id"
+                                   attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
@@ -273,7 +315,13 @@
                     <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}"/>
+                    <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': [('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/>
@@ -286,9 +334,11 @@
                     <notebook colspan="4">
                         <page string="Invoice">
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
-                            <field name="name"/>
+                            <field name="name" attrs="{'readonly': [('type', '=', 'out_invoice'),
+                                                                    ('from_supply', '=', True),
+                                                                    ('partner_type', 'in', ('intermission', 'section'))]}"/>
                             <field name="payment_term" widget="selection"/>
-                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'fake':1}"/>
+                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'fake': 1, 'from_inv_form': True}"/>
                             <group col="1" colspan="2">
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
@@ -328,11 +378,15 @@
                             <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"/>
                             <newline/>
                             <field name="date_due"/>
-                            <field name="user_id"/>
+                            <field name="user_id" attrs="{'readonly': [('type', '=', 'out_invoice'),
+                                                                       ('from_supply', '=', True),
+                                                                       ('partner_type', 'in', ('intermission', 'section'))]}"/>
                             <newline/>
                             <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
                                 groups="base.group_extended"/>
-                            <field name="origin"/>
+                            <field name="origin" attrs="{'readonly': [('type', '=', 'out_invoice'),
+                                                                      ('from_supply', '=', True),
+                                                                      ('partner_type', 'in', ('intermission', 'section'))]}"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
                                 groups="base.group_extended"/>
                             <field name="move_id" groups="account.group_account_user"/>
@@ -353,6 +407,16 @@
                                 </tree>
                             </field>
                         </page>
+                        <!-- display the Counterpart Invoice tab in STV, hide it in Customer Refunds -->
+                        <page string="Counterpart Invoice" attrs="{'invisible': [('type', '!=', 'out_invoice')]}">
+                            <field name="from_supply" invisible="1"/>
+                            <field name="synced"
+                                   attrs="{'readonly': ['|', ('from_supply', '=', True), ('state', '!=', 'draft')]}"
+                                   on_change="onchange_synced(synced, partner_id)"/>
+                            <newline/>
+                            <field name="counterpart_inv_number"/>
+                            <field name="counterpart_inv_status"/>
+                        </page>
                     </notebook>
                 </form>
             </field>

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2019-06-05 09:09:37 +0000
+++ bin/addons/account/invoice.py	2019-07-15 07:18:58 +0000
@@ -26,6 +26,7 @@
 import netsvc
 from osv import fields, osv, orm
 from tools.translate import _
+from msf_partner import PARTNER_TYPE
 
 
 class account_invoice(osv.osv):
@@ -257,7 +258,7 @@
     _order = "id desc"
 
     _columns = {
-        'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Description', size=256, select=True, readonly=True, states={'draft': [('readonly', False)]}),
         'origin': fields.char('Source Document', size=512, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
             ('out_invoice','Customer Invoice'),
@@ -302,7 +303,8 @@
         'account_id': fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The partner account used for this invoice."),
         'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
-
+        'tax_line_ids': fields.related('tax_line', type='one2many', relation='account.invoice.tax', string='Tax Lines',
+                                       readonly=True, store=False, help="Internal field for taxes always in read-only mode"),
         'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
                                           store={
@@ -463,13 +465,17 @@
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        invoices = self.read(cr, uid, ids, ['state'], context=context)
+        invoices = self.read(cr, uid, ids, ['state', 'synced', 'from_supply'], context=context)
         unlink_ids = []
         for t in invoices:
-            if t['state'] in ('draft', 'cancel'):
+            if t['state'] not in ('draft', 'cancel'):
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened or paid !'))
+            elif t['from_supply']:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) generated by a Supply workflow!'))
+            elif t['synced']:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) set as "Synchronized"!'))
+            else:
                 unlink_ids.append(t['id'])
-            else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened or paid !'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
@@ -481,6 +487,7 @@
         acc_id = False
         bank_id = False
         fiscal_position = False
+        partner_type = False
 
         opt = [('uid', str(uid))]
         if partner_id:
@@ -490,6 +497,8 @@
             contact_addr_id = res['contact']
             invoice_addr_id = res['invoice']
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            partner_type = p.partner_type  # update the partner type immediately as it is used in a domain in attrs
+
             if company_id:
                 if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id:
                     property_obj = self.pool.get('ir.property')
@@ -526,7 +535,8 @@
             'address_invoice_id': invoice_addr_id,
             'account_id': acc_id,
             'payment_term': partner_payment_term,
-            'fiscal_position': fiscal_position
+            'fiscal_position': fiscal_position,
+            'partner_type': partner_type,
         }
         }
 
@@ -662,6 +672,22 @@
                 val['currency_id'] = currency.id
         return {'value': val, 'domain': dom}
 
+    def onchange_synced(self, cr, uid, ids, synced, partner_id):
+        """
+        Resets "synced" field and informs the user in case the box is ticked whereas the partner is neither Intermission nor Intersection
+        """
+        res = {}
+        partner_obj = self.pool.get('res.partner')
+        if synced and partner_id:
+            if partner_obj.browse(cr, uid, partner_id, fields_to_fetch=['partner_type']).partner_type not in ('intermission', 'section'):
+                warning = {
+                    'title': _('Warning!'),
+                    'message': _('Synchronization is allowed only with Intermission and Intersection partners.')
+                }
+                res['warning'] = warning
+                res['value'] = {'synced': False, }
+        return res
+
     # go from canceled state to draft state
     def action_cancel_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state':'draft'})
@@ -705,6 +731,10 @@
             'move_name':False,
             'internal_number': False,
             'main_purchase_id': False,
+            'from_supply': False,
+            'synced': False,
+            'counterpart_inv_number': False,
+            'counterpart_inv_status': False,
         })
         if 'date_invoice' not in default:
             default.update({
@@ -1324,12 +1354,18 @@
         for invoice in invoices:
             del invoice['id']
 
-            type_dict = {
-                'out_invoice': 'out_refund', # Customer Invoice
-                'in_invoice': 'in_refund',   # Supplier Invoice
-                'out_refund': 'out_invoice', # Customer Refund
-                'in_refund': 'in_invoice',   # Supplier Refund
-            }
+            if context.get('is_intermission', False):
+                type_dict = {
+                    'out_invoice': 'in_invoice',  # IVO
+                    'in_invoice': 'out_invoice',  # IVI
+                }
+            else:
+                type_dict = {
+                    'out_invoice': 'out_refund', # Customer Invoice
+                    'in_invoice': 'in_refund',   # Supplier Invoice
+                    'out_refund': 'out_invoice', # Customer Refund
+                    'in_refund': 'in_invoice',   # Supplier Refund
+                }
 
             invoice_lines = obj_invoice_line.read(cr, uid, invoice['invoice_line'])
             invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines, is_account_inv_line=True, context=context)
@@ -1355,6 +1391,10 @@
                 'journal_id': refund_journal_ids,
                 'origin': invoice['number']
             })
+            if context.get('is_intermission', False):
+                invoice.update({
+                    'is_intermission': True,
+                })
             if period_id:
                 invoice.update({
                     'period_id': period_id,
@@ -1515,6 +1555,8 @@
         'name': fields.char('Description', size=256, required=True),
         'origin': fields.char('Origin', size=512, help="Reference of the document that produced this invoice."),
         'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
+        'partner_type': fields.related('invoice_id', 'partner_type', string='Partner Type', type='selection',
+                                       selection=PARTNER_TYPE, readonly=True, store=False),
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),

=== modified file 'bin/addons/account/wizard/account_invoice_refund.py'
--- bin/addons/account/wizard/account_invoice_refund.py	2018-05-14 12:41:04 +0000
+++ bin/addons/account/wizard/account_invoice_refund.py	2019-07-15 07:18:58 +0000
@@ -29,13 +29,24 @@
 
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
+
+    def _get_filter_refund(self, cr, uid, context=None):
+        """
+        Returns the selectable Refund Types (no simple "Refund" in case of an IVO/IVI)
+        """
+        if context is None:
+            context = {}
+        if context.get('is_intermission', False):
+            return [('modify', 'Modify'), ('cancel', 'Cancel')]
+        return [('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')]
+
     _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!'),
         'period': fields.many2one('account.period', 'Force period'),
         'journal_id': fields.many2one('account.journal', 'Refund Journal', hide_default_menu=True,
                                       help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
         'description': fields.char('Description', size=128, required=True),
-        'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
+        '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):
@@ -145,7 +156,10 @@
                 if inv.state in ['draft', 'proforma2', 'cancel']:
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if mode in ('cancel', 'modify') and inv_obj.has_one_line_reconciled(cr, uid, [inv.id], context=context):
-                    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))
+                    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))
+                    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))
                 if form['period']:
                     period = form['period']
                 else:
@@ -188,8 +202,14 @@
                 refund_id = self._hook_create_refund(cr, uid, [inv.id], date, period, description, journal_id, form, context=context)
                 del context['refund_mode']  # ignore it for the remaining process (in particular for the SI created in a refund modify...)
                 refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
+                # for Intermission Vouchers OUT: at standard creation time there is no "check_total" entered manually,
+                # its value is always 0.0 => use the "amount_total" value for the IVI generated so it won't block at validation step
+                if inv.is_intermission and inv.type == 'out_invoice':
+                    check_total = inv.amount_total or 0.0
+                else:
+                    check_total = inv.check_total
                 inv_obj.write(cr, uid, [refund.id], {'date_due': date,
-                                                     'check_total': inv.check_total})
+                                                     'check_total': check_total})
 
                 created_inv.append(refund_id[0])
                 if mode in ('cancel', 'modify'):
@@ -230,6 +250,7 @@
                             'period_id': False,
                             'name': description,
                             'origin': source_doc,
+                            'is_intermission': inv.is_intermission,
                         })
                         for field in self._hook_fields_m2o_for_modify_refund(cr, uid):
                             invoice[field] = invoice[field] and invoice[field][0]
@@ -254,11 +275,19 @@
                     # 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 inv.type in ('out_invoice', 'out_refund'):
-                xml_id = 'action_invoice_tree3'
+            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:
-                xml_id = 'action_invoice_tree4'
-            result = mod_obj.get_object_reference(cr, uid, 'account', xml_id)
+                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)
             invoice_domain = eval(result['domain'])

=== modified file 'bin/addons/account/wizard/account_invoice_refund_view.xml'
--- bin/addons/account/wizard/account_invoice_refund_view.xml	2018-05-15 08:55:26 +0000
+++ bin/addons/account/wizard/account_invoice_refund_view.xml	2019-07-15 07:18:58 +0000
@@ -15,11 +15,14 @@
                          <field name="date" required="1"/>
                          <field name="period"/>
                          <field name="filter_refund"/>
+                         <field name="is_intermission" 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."/>
-                        <label align="0.0" width="300" string="Refund Invoice: Creates the refund invoice, ready for editing."/>
+                        <group attrs="{'invisible': [('is_intermission', '=', 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."/>
                     </group>
                     <separator colspan="4"/>

=== modified file 'bin/addons/account_override/__init__.py'
--- bin/addons/account_override/__init__.py	2019-01-08 11:20:04 +0000
+++ bin/addons/account_override/__init__.py	2019-07-15 07:18:58 +0000
@@ -230,4 +230,5 @@
 import report
 import wizard
 import finance_export
+import account_invoice_sync
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/account_override/account_invoice_sync.py'
--- bin/addons/account_override/account_invoice_sync.py	1970-01-01 00:00:00 +0000
+++ bin/addons/account_override/account_invoice_sync.py	2019-07-15 07:18:58 +0000
@@ -0,0 +1,362 @@
+#!/usr/bin/env python
+#-*- encoding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2019 TeMPO Consulting, MSF. All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+import logging
+import time
+
+
+class account_invoice_sync(osv.osv):
+    _inherit = 'account.invoice'
+    _logger = logging.getLogger('------sync.account.invoice')
+
+    _columns = {
+        'synced': fields.boolean("Synchronized"),
+        'from_supply': fields.boolean('From Supply', help="Internal field indicating whether the document is related to a Supply workflow"),
+        'counterpart_inv_number': fields.char('Counterpart Invoice Number', size=64, readonly=True),
+        'counterpart_inv_status': fields.selection([
+            ('draft', 'Draft'),
+            ('open', 'Open'),
+            ('paid', 'Paid'),
+            ('cancel', 'Cancelled'),
+        ], string='Counterpart Invoice Status', readonly=True),
+    }
+
+    _defaults = {
+        'synced': lambda *a: False,
+        'from_supply': lambda *a: False,
+    }
+
+    def _create_analytic_distrib(self, cr, uid, vals, distrib, context=None):
+        """
+        Updates vals with the new analytic_distribution_id created based on the distrib in parameter if it exists
+        """
+        if context is None:
+            context = {}
+        analytic_distrib_obj = self.pool.get('analytic.distribution')
+        cc_distrib_line_obj = self.pool.get('cost.center.distribution.line')
+        fp_distrib_line_obj = self.pool.get('funding.pool.distribution.line')
+        data_obj = self.pool.get('ir.model.data')
+        # get the Funding Pool "PF"
+        try:
+            fp_id = data_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
+        except ValueError:
+            fp_id = 0
+        if distrib:  # original distrib from PO or PO line
+            # create the Analytic Distribution
+            distrib_id = analytic_distrib_obj.create(cr, uid, {}, context=context)
+            for cc_line in distrib.cost_center_lines:
+                distrib_vals = {
+                    'analytic_id': cc_line.analytic_id and cc_line.analytic_id.id,  # analytic_id = Cost Center for the CC distrib line
+                    'percentage': cc_line.percentage or 0.0,
+                    'distribution_id': distrib_id,
+                    'currency_id': cc_line.currency_id.id,
+                    'destination_id': cc_line.destination_id.id,
+                }
+                cc_distrib_line_obj.create(cr, uid, distrib_vals, context=context)
+                distrib_vals.update({
+                    'analytic_id': fp_id,  # analytic_id = Funding Pool for the FP distrib line
+                    'cost_center_id': cc_line.analytic_id and cc_line.analytic_id.id,
+                })
+                fp_distrib_line_obj.create(cr, uid, distrib_vals, context=context)
+            vals.update({'analytic_distribution_id': distrib_id,})
+
+    def _create_invoice_lines(self, cr, uid, inv_lines_data, inv_id, inv_posting_date, inv_linked_po, from_supply, context=None):
+        """
+        Creates the lines of the automatic counterpart invoice (inv_id) generated at synchro time.
+        """
+        if context is None:
+            context = {}
+        so_po_common_obj = self.pool.get('so.po.common')
+        product_obj = self.pool.get('product.product')
+        account_obj = self.pool.get('account.account')
+        product_uom_obj = self.pool.get('product.uom')
+        inv_line_obj = self.pool.get('account.invoice.line')
+        for inv_line in inv_lines_data:
+            line_name = inv_line.get('name', '')
+            if not line_name:  # required field
+                raise osv.except_osv(_('Error'), _("Impossible to retrieve the line description."))
+            product_id = False
+            product_data = inv_line.get('product_id', {})
+            line_account_id = False
+            # for the lines related to a product: use the account of the product / else use the one of the source invoice line
+            if product_data:
+                default_code = product_data.get('default_code', '')
+                product_id = so_po_common_obj.get_product_id(cr, uid, product_data, default_code=default_code, context=context) or False
+                if not product_id:
+                    raise osv.except_osv(_('Error'), _("Product %s not found.") % default_code)
+                product = product_obj.browse(cr, uid, product_id, fields_to_fetch=['active', 'default_code', 'product_tmpl_id', 'categ_id'],
+                                             context=context)
+                if not product.active:
+                    raise osv.except_osv(_('Error'), _("The product %s is inactive.") % product.default_code or '')
+                line_account_id = product.product_tmpl_id.property_account_expense and product.product_tmpl_id.property_account_expense.id
+                if not line_account_id:
+                    line_account_id = product.categ_id and product.categ_id.property_account_expense_categ and product.categ_id.property_account_expense_categ.id
+            else:
+                account_code = inv_line.get('account_id', {}).get('code', '')
+                if not account_code:
+                    raise osv.except_osv(_('Error'), _("Impossible to retrieve the account code at line level."))
+                account_ids = account_obj.search(cr, uid, [('code', '=', account_code)], limit=1, context=context)
+                if not account_ids:
+                    raise osv.except_osv(_('Error'), _("Account code %s not found.") % account_code)
+                line_account_id = account_ids[0]
+            if not line_account_id:
+                raise osv.except_osv(_('Error'), _("Error when retrieving the account at line level."))
+            line_account = account_obj.browse(cr, uid, line_account_id,
+                                              fields_to_fetch=['activation_date', 'inactivation_date'], context=context)
+            if inv_posting_date < line_account.activation_date or \
+                    (line_account.inactivation_date and inv_posting_date >= line_account.inactivation_date):
+                raise osv.except_osv(_('Error'), _('The account "%s - %s" is inactive.') % (line_account.code, line_account.name))
+            uom_id = False
+            uom_data = inv_line.get('uos_id', {})
+            if uom_data:
+                uom_name = uom_data.get('name', '')
+                uom_ids = product_uom_obj.search(cr, uid, [('name', '=', uom_name)], limit=1, context=context)
+                if not uom_ids:
+                    raise osv.except_osv(_('Error'), _("Unit of Measure %s not found.") % uom_name)
+                uom_id = uom_ids[0]
+            quantity = inv_line.get('quantity', 0.0)
+            inv_line_vals = {
+                'invoice_id': inv_id,
+                'account_id': line_account_id,
+                'name': line_name,
+                'quantity': quantity,
+                'price_unit': inv_line.get('price_unit', 0.0),
+                'discount': inv_line.get('discount', 0.0),
+                'product_id': product_id,
+                'uos_id': uom_id,
+            }
+            if from_supply and inv_linked_po:
+                # fill in the AD at line level if applicable
+                # search the matching between PO line and invoice line based on description/product/quantity
+                matching_po_line = False
+                for po_line in inv_linked_po.order_line:
+                    if po_line.name == line_name and po_line.product_id and po_line.product_id.id == product_id and \
+                            po_line.product_qty == quantity and po_line.state not in ('draft', 'cancel', 'cancel_r'):
+                        matching_po_line = po_line
+                        break
+                if matching_po_line:
+                    po_line_distrib = matching_po_line.analytic_distribution_id
+                    self._create_analytic_distrib(cr, uid, inv_line_vals, po_line_distrib, context=context)  # update inv_line_vals
+            inv_line_obj.create(cr, uid, inv_line_vals, context=context)
+
+    def create_invoice_from_sync(self, cr, uid, source, invoice_data, context=None):
+        """
+        Creates automatic counterpart invoice at synchro time.
+        Intermission workflow: an IVO sent generates an IVI
+        Intersection workflow: an STV sent generates an SI
+        """
+        self._logger.info("+++ Create an account.invoice in %s matching the one sent by %s" % (cr.dbname, source))
+        if context is None:
+            context = {}
+        journal_obj = self.pool.get('account.journal')
+        currency_obj = self.pool.get('res.currency')
+        partner_obj = self.pool.get('res.partner')
+        user_obj = self.pool.get('res.users')
+        po_obj = self.pool.get('purchase.order')
+        stock_picking_obj = self.pool.get('stock.picking')
+        invoice_dict = invoice_data.to_dict()
+        # the counterpart instance must exist and be active
+        partner_ids = partner_obj.search(cr, uid, [('name', '=', source), ('active', '=', True)], limit=1, context=context)
+        if not partner_ids:
+            raise osv.except_osv(_('Error'), _("The partner %s doesn't exist or is inactive.") % source)
+        partner_id = partner_ids[0]
+        partner = partner_obj.browse(cr, uid, partner_id, fields_to_fetch=['property_account_payable', 'name'], context=context)
+        journal_type = invoice_dict.get('journal_id', {}).get('type', '')
+        if not journal_type or journal_type not in ('sale', 'intermission'):
+            raise osv.except_osv(_('Error'), _("Impossible to retrieve the journal type, or the journal type is incorrect."))
+        currency_name = invoice_dict.get('currency_id', {}).get('name', '')
+        if not currency_name:
+            raise osv.except_osv(_('Error'), _("Impossible to retrieve the currency."))
+        currency_ids = currency_obj.search(cr, uid, [('name', '=', currency_name), ('currency_table_id', '=', False),
+                                                     ('active', '=', True)], limit=1, context=context)
+        if not currency_ids:
+            raise osv.except_osv(_('Error'), _("Currency %s not found or inactive.") % currency_name)
+        currency_id = currency_ids[0]
+        number = invoice_dict.get('number', '')
+        state = invoice_dict.get('state', '')  # note that we get the real state as the doc can be beyond the "open" state at sync. time
+        doc_date = invoice_dict.get('document_date', time.strftime('%Y-%m-%d'))
+        posting_date = invoice_dict.get('date_invoice', time.strftime('%Y-%m-%d'))
+        description = invoice_dict.get('name', '')
+        source_doc = invoice_dict.get('origin', '')
+        from_supply = invoice_dict.get('from_supply', False)
+        inv_lines = invoice_dict.get('invoice_line', [])
+        po = False
+        vals = {}
+        # STV in sending instance: generates an SI 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):
+                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,
+                    'type': 'in_invoice',
+                    'is_direct_invoice': False,
+                    'is_inkind_donation': False,
+                    'is_debit_note': False,
+                    'is_intermission': False,
+                }
+            )
+        # IVO in sending instance: generates an IVI in the receiving instance
+        elif journal_type == 'intermission':
+            int_journal_ids = journal_obj.search(cr, uid, [('type', '=', 'intermission'), ('is_current_instance', '=', True)], limit=1, context=context)
+            if not int_journal_ids:
+                raise osv.except_osv(_('Error'), _("No Intermission journal found for the current instance."))
+            # for the IVI use the Intermission counterpart account from the Company form
+            ivi_account = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id'], context=context).company_id.intermission_default_counterpart
+            if not ivi_account or posting_date < ivi_account.activation_date or \
+                    (ivi_account.inactivation_date and posting_date >= ivi_account.inactivation_date):
+                raise osv.except_osv(_('Error'), _("The Intermission counterpart account is missing in the Company form or is inactive."))
+            vals.update(
+                {
+                    'journal_id': int_journal_ids[0],
+                    'account_id': ivi_account.id,
+                    'type': 'in_invoice',
+                    'is_inkind_donation': False,
+                    'is_debit_note': False,
+                    'is_intermission': True,
+                }
+            )
+        # common fields whatever the invoice type
+        if from_supply:
+            po_id = False
+            po_number = ''
+            fo_number = ''
+            ship_or_out_ref = ''
+            main_in = False
+            # extract PO number, and Shipment or Simple Out ref, from refs looking like:
+            # "se_HQ2C1.19/se_HQ2/HT101/PO00001 : SHIP/00002-01" or "se_HQ1C2.19/se_HQ1/HT201/PO00003 : OUT/00001"
+            inv_name_split = description.split()
+            if inv_name_split:
+                po_number = inv_name_split[0].split('.')[-1]
+                po_ids = po_obj.search(cr, uid, [('name', '=', po_number)], limit=1, context=context)
+                if po_ids:
+                    po_id = po_ids[0]
+                ship_or_out_ref = inv_name_split[-1]
+            # extract FO number from source docs looking like:
+            # "SHIP/00001-04:19/se_HQ1/HT101/FO00007" or "OUT/00003:19/se_HQ1/HT101/FO00008"
+            inv_source_doc_split = source_doc.split(':')
+            if inv_source_doc_split:
+                fo_number = inv_source_doc_split[-1]
+            if po_id:
+                po = po_obj.browse(cr, uid, po_id, fields_to_fetch=['picking_ids', 'analytic_distribution_id', 'order_line'], context=context)
+                shipment_ref = "%s.%s" % (source or '', ship_or_out_ref or '')
+                # get the "main" IN
+                main_in_ids = stock_picking_obj.search(cr, uid,
+                                                       [('id', 'in', [picking.id for picking in po.picking_ids]),
+                                                        ('shipment_ref', '=', shipment_ref)],
+                                                       limit=1, context=context)
+                if main_in_ids:
+                    main_in = stock_picking_obj.browse(cr, uid, main_in_ids[0], fields_to_fetch=['name'], context=context)
+                # fill in the Analytic Distribution
+                # at header level if applicable
+                po_distrib = po.analytic_distribution_id
+                self._create_analytic_distrib(cr, uid, vals, po_distrib, context=context)  # update vals
+            # note: in case a FO would have been manually created the PO and IN would be missing in the ref/source doc,
+            # but the same codification is used so it's visible that sthg is missing
+            description = "%s.%s : %s" % (source, fo_number, main_in and main_in.name or '')  # e.g. se_HQ1C1.19/se_HQ1/HT101/FO00008 : IN/00009
+            source_doc = "%s:%s" % (main_in and main_in.name or '', po_id and po_number or '')  # e.g. IN/00009:19/se_HQ1/HT201/PO00009
+        vals.update(
+            {
+                'partner_id': partner_id,
+                'currency_id': currency_id,
+                'document_date': doc_date,
+                'date_invoice': posting_date,
+                'name': description,
+                'origin': source_doc,
+                'counterpart_inv_number': number,
+                'counterpart_inv_status': state,
+                'from_supply': from_supply,
+                'synced': True,
+            }
+        )
+        inv_id = self.create(cr, uid, vals, context=context)
+        if inv_id:
+            self._create_invoice_lines(cr, uid, inv_lines, inv_id, posting_date, po, from_supply, context=context)
+            if journal_type == 'sale':
+                self._logger.info("SI No. %s created successfully." % inv_id)
+            elif journal_type == 'intermission':
+                self._logger.info("IVI No. %s created successfully." % inv_id)
+
+    def update_counterpart_inv(self, cr, uid, source, invoice_data, state, context=None):
+        """
+        Updates the Counterpart Invoice Number and Status (to be triggered at synchro time)
+
+        For the record:
+        In most cases the state "Open" of the Out Invoices will be updated following both msg rules "create_invoice_from_sync" and
+        "update_counterpart_inv_opened". However "update_counterpart_inv_opened" can't be skipped to cover use cases such as:
+        - in C1: open IVO and reconcile the related JI manually: IVO is in Paid state
+        - sync from C1 to C2: the counterpart inv. status in the IVI generated is directly: Paid
+        - in C1: unreconcile IVO JI. The IVO is back to Open.
+        - sync from C1 to C2: the counterpart inv. status in the related IVI is updated to: Open
+        """
+        self._logger.info("+++ Update Counterpart Invoice data from %s" % source)
+        if context is None:
+            context = {}
+        invoice_dict = invoice_data.to_dict()
+        number = invoice_dict.get('number', '')
+        counterpart_inv_number = invoice_dict.get('counterpart_inv_number', '')
+        if state:
+            vals = {
+                'counterpart_inv_status': state,
+            }
+            if number:
+                vals.update(
+                    {
+                        'counterpart_inv_number': number,
+                    }
+                )
+            inv_ids = []
+            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
+                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)
+                # note that the "Counterpart Inv. Number" received is the "Number" of the invoice updated!
+                self._logger.info("account.invoice %s: Counterpart Invoice %s set to %s" % (counterpart_inv_number, number, state))
+
+    def update_counterpart_inv_opened(self, cr, uid, source, invoice_data, context=None):
+        self.update_counterpart_inv(cr, uid, source, invoice_data, 'open', context=context)
+
+    def update_counterpart_inv_paid(self, cr, uid, source, invoice_data, context=None):
+        self.update_counterpart_inv(cr, uid, source, invoice_data, 'paid', context=context)
+
+    def update_counterpart_inv_cancelled(self, cr, uid, source, invoice_data, context=None):
+        self.update_counterpart_inv(cr, uid, source, invoice_data, 'cancel', context=context)
+
+
+account_invoice_sync()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_override/account_invoice_view.xml'
--- bin/addons/account_override/account_invoice_view.xml	2018-02-01 13:22:25 +0000
+++ bin/addons/account_override/account_invoice_view.xml	2019-07-15 07:18:58 +0000
@@ -43,7 +43,7 @@
                         <field name="line_number"/>
                     </xpath>
                     <xpath expr="//field[@name='date_invoice']" position="before">
-                        <field name="document_date"/>
+                        <field name="document_date" attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                     </xpath>
                     <xpath expr="//field[@name='period_id']" position="replace">
                     </xpath>
@@ -52,7 +52,9 @@
                     <button name='invoice_cancel' position="replace">
                         <!-- The widget boolean permit to the attrs to work efficiently -->
                         <field name="purchase_ids" invisible="1" widget="boolean" readonly="1" />
-                        <button name="invoice_cancel" string="Cancel" icon="gtk-cancel" attrs="{'invisible': ['|', ('state', 'in', ['open', 'paid']), ('purchase_ids', '!=', False)]}" confirm="You are about to cancel this invoice. Do you want to proceed?"/>
+                        <button name="invoice_cancel" string="Cancel" icon="gtk-cancel"
+                                attrs="{'invisible': ['|', '|', ('state', 'in', ['open', 'paid']), ('purchase_ids', '!=', False), ('synced', '=', True)]}"
+                                confirm="You are about to cancel this invoice. Do you want to proceed?"/>
                     </button>
                     <xpath expr="//button[@name='invoice_open']" position="after" >
                         <button name="button_split_invoice" states="draft,proforma2" type="object" string="Split Invoice" icon="gtk-cut"/>
@@ -482,13 +484,22 @@
                         <field name="type" invisible="1"/>
                         <field name="is_intermission" invisible="1"/>
                         <!-- US-370: use the change currency button -->
-                        <field name="currency_id" width="50"/>
-                        <button name="%(account.action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" />
+                        <field name="currency_id" width="50" attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                        <button name="%(account.action_account_change_currency)d" type="action"
+                                icon="terp-stock_effects-object-colorize" string="Change"
+                                attrs="{'invisible': [('state', '!=', 'draft')],
+                                        'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}" />
                         <newline/>
-                        <field string="Partner" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id, False, is_intermission, False, False, account_id)" domain="[('by_invoice_type', '=', True), ('partner_type', '=', 'intermission')]" context="{'type': context.get('type')}"/>
+                        <field string="Partner" name="partner_id"
+                               on_change="onchange_partner_id(type,partner_id, date_invoice,payment_term, partner_bank_id, company_id, False, is_intermission, False, False, account_id)"
+                               domain="[('by_invoice_type', '=', True), ('partner_type', '=', 'intermission')]"
+                               context="{'type': context.get('type')}"
+                               attrs="{'readonly': ['|',
+                                                    '&amp;', ('type', '=', 'in_invoice'), ('synced', '=', True),
+                                                    '&amp;', ('type', '=', 'out_invoice'), ('from_supply', '=', True)]}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" string="Partner address"/>
                         <newline/>
-                        <field name="document_date" string="I/MI voucher date"/>
+                        <field name="document_date" string="I/MI voucher date" attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                         <field name="date_invoice"/>
                         <newline/>
                         <group colspan="8" col="8" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
@@ -505,13 +516,19 @@
                     <notebook colspan="4">
                         <page string="Invoice">
                             <field name="account_id" domain="[('company_id', '=', company_id), ('restricted_area', '=', 'intermission_header')]"/>
-                            <field name="name" string="Reference"/>
+                            <field name="name" string="Reference" attrs="{'readonly': [('from_supply', '=', True)]}"/>
                             <newline/>
                             <group name="import" string=" Import Lines " colspan="4" col="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
-                                <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
+                                <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" type="object"
+                                        attrs="{'invisible': [('state', '!=', 'draft')],
+                                                'readonly': ['|',
+                                                             ('from_supply', '=', True),
+                                                             '&amp;', ('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                             </group>
-                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'is_intermission': True}">
-                                <tree string="Intermission Voucher Lines">
+                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'is_intermission': True, 'from_inv_form': True}">
+                                <tree string="Intermission Voucher Lines"
+                                      colors="red:analytic_distribution_state == 'invalid' or inactive_product == True;black:inactive_product == False and analytic_distribution_state in ('none', 'valid')">
+                                    <field name="line_number"/>
                                     <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="name"/>
@@ -523,7 +540,7 @@
                                     <field name="analytic_distribution_state" invisible="1"/>
                                     <field name="have_analytic_distribution_from_header" invisible="1"/>
                                     <field name="quantity"/>
-                                    <field name="uos_id" string="UOM" invisible="1" />
+                                    <field name="uos_id" string="UOM"/>
                                     <field name="price_unit"/>
                                     <field name="price_subtotal"/>
                                     <field name="inactive_product" invisible="1" />
@@ -532,12 +549,42 @@
                                 <form string="Intermission Voucher Lines">
                                     <notebook>
                                         <page string="Line">
-                                            <field name="name" default_focus="1"/>
+                                            <field name="from_supply" invisible="1"/>
+                                            <field name="synced" invisible="1"/>
+                                            <field name="invoice_type" invisible="1"/>
+                                            <field name="product_id"
+                                                   on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
+                                                   default_focus="1"
+                                                   attrs="{'readonly': ['|',
+                                                                        ('from_supply', '=', True),
+                                                                        '&amp;', ('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}" />
+                                            <field name="uos_id"
+                                                   on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
+                                                   attrs="{'readonly': ['|',
+                                                                        ('from_supply', '=', True),
+                                                                        '&amp;', ('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}"
+                                            />
+                                            <field name="quantity" attrs="{'readonly': ['|',
+                                                                                        ('from_supply', '=', True),
+                                                                                        '&amp;', ('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                                            <field name="price_unit" attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                                            <field name="discount" groups="base.group_extended" attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
+                                            <field name="name" colspan="4"/>
                                             <field name="account_id" domain="[('restricted_area', '=', 'intermission_lines')]"/>
-                                            <field name="quantity"/>
-                                            <field name="uos_id" string="UOM" invisible="1"/>
-                                            <field name="price_unit"/>
-                                            <field name="price_subtotal"/>
+                                            <group colspan="6">
+                                                <field name="analytic_distribution_state" invisible="1"/>
+                                                <field name="newline" invisible="1" />
+                                                <field name="is_allocatable" invisible="1"/>
+                                                <group colspan="2" col="4">
+                                                    <button name="button_analytic_distribution" string="Change analytic distribution"
+                                                            type="object" icon="terp-check" context="context" colspan="1"
+                                                            attrs="{'invisible': ['|','|', ('newline', '=', True), ('analytic_distribution_state', '!=', 'valid'), ('is_allocatable', '=', False)]}" />
+                                                    <button name="button_analytic_distribution" string="Change analytic distribution"
+                                                            type="object" icon="terp-emblem-important" context="context" colspan="1"
+                                                            attrs="{'invisible': ['|','|', ('newline', '=', True), ('analytic_distribution_state', '=', 'valid'), ('is_allocatable', '=', False)]}" />
+                                                    <field name="analytic_distribution_state_recap" attrs="{'invisible': [('is_allocatable', '=', False)]}"/>
+                                                </group>
+                                            </group>
                                         </page>
                                         <page string="Notes">
                                             <field name="note" nolabel="1" colspan="4"/>
@@ -550,12 +597,26 @@
                                 <field name="state"/>
                                 <field name="amount_total"/>
                             </group>
-                            <group col="2" colspan="4" states="draft">
+                            <group col="6" colspan="4" states="draft">
                                 <label string=""/>
-                                <button name="invoice_open" type="object" states="draft" string="Validate" icon="gtk-go-forward"/>
+                                <!-- add a confirmation step only for IVOs when "synced" isn't selected -->
+                                <button name="invoice_open" type="object" string="Validate"
+                                        icon="gtk-go-forward"
+                                        attrs="{'invisible': ['|',
+                                                              ('state', '!=', 'draft'),
+                                                              '&amp;', ('type', '=', 'out_invoice'), ('synced', '=', False)]}"/>
+                                <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)]}"/>
                             </group>
-                            <group col="2" colspan="4" states="open,paid">
+                            <group col="6" colspan="4" states="open,paid">
                                 <label string=""/>
+                                <button name="%(account.action_account_invoice_refund)d" type="action" string="Refund" icon="gtk-execute"
+                                        attrs="{'invisible': [('state', '!=', 'open')]}"/>
                                 <button name="%(account.account_invoices)d" string="Print Intermission Voucher" type="action" icon="gtk-print" states="open,paid"/>
                             </group>
                         </page>
@@ -563,15 +624,29 @@
                             <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"/>
                             <newline/>
                             <field name="date_due"/>
-                            <field name="user_id"/>
+                            <field name="user_id"
+                                   attrs="{'readonly': ['|',
+                                                        '&amp;', ('type', '=', 'in_invoice'), ('synced', '=', True),
+                                                        '&amp;', ('type', '=', 'out_invoice'), ('from_supply', '=', True)]}"/>
                             <newline/>
                             <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id" />
-                            <field name="origin"/>
+                            <field name="origin" attrs="{'readonly': [('from_supply', '=', True)]}"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" />
                             <field name="move_id" />
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
+                        <page string="Counterpart Invoice">
+                            <field name="from_supply" invisible="1"/>
+                            <field name="synced"
+                                   attrs="{'readonly': ['|', '|',
+                                                        ('from_supply', '=', True),
+                                                        ('state', '!=', 'draft'),
+                                                        ('type', '=', 'in_invoice')]}"/>  <!-- IVI can never be ticked as "Synced" manually -->
+                            <newline/>
+                            <field name="counterpart_inv_number"/>
+                            <field name="counterpart_inv_status"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -610,7 +685,11 @@
                     <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')]}">
-                            <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
+                            <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" 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">
@@ -623,11 +702,27 @@
                             <field name="residual"/>
                             <field name="is_debit_note" invisible="1"/>
                         </group>
+                        <field name="partner_type" invisible="1"/>
                         <group col="8" colspan="4">
                             <button name="invoice_cancel" states="proforma2,open" string="Cancel" icon="gtk-cancel"/>
                             <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'])]}"/>
                             <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
-                            <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward" type="object"/>
+                            <!-- 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;', '&amp;',
+                                                          ('type', '=', 'out_invoice'), ('synced', '=', False), ('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="%(account.account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                         </group>
                     </xpath>
@@ -813,7 +908,7 @@
             <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'}</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

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2019-05-21 08:19:49 +0000
+++ bin/addons/account_override/invoice.py	2019-07-15 07:18:58 +0000
@@ -28,12 +28,14 @@
 from tools.translate import _
 from lxml import etree
 from datetime import datetime
+from msf_partner import PARTNER_TYPE
 import re
 import netsvc
 
 
 import decimal_precision as dp
 
+
 class account_invoice(osv.osv):
     _name = 'account.invoice'
     _inherit = 'account.invoice'
@@ -251,6 +253,8 @@
         'st_lines': fields.one2many('account.bank.statement.line', 'invoice_id', string="Register lines", readonly=True, help="Register lines that have a link to this invoice."),
         'can_merge_lines': fields.function(_get_can_merge_lines, method=True, type='boolean', string='Can merge lines ?'),
         'is_merged_by_account': fields.boolean("Is merged by account"),
+        'partner_type': fields.related('partner_id', 'partner_type', string='Partner Type', type='selection',
+                                       selection=PARTNER_TYPE, readonly=True, store=False),
     }
 
     _defaults = {
@@ -814,6 +818,35 @@
                              'view_id': supplier_view_id}
         return super(account_invoice, self).log(cr, uid, inv_id, message, secondary, action_xmlid, local_ctx)
 
+    def _check_tax_allowed(self, cr, uid, ids, context=None):
+        """
+        Raises an error if a tax is used with an Intermission or Intersection partner
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        warning_msg = _('Taxes are forbidden with Intermission and Intersection partners.')
+        for inv in self.browse(cr, uid, ids, fields_to_fetch=['partner_id', 'tax_line', 'invoice_line'], context=context):
+            if inv.partner_id.partner_type in ('intermission', 'section'):
+                if inv.tax_line:
+                    raise osv.except_osv(_('Warning'), warning_msg)
+                for inv_line in inv.invoice_line:
+                    if inv_line.invoice_line_tax_id:
+                        raise osv.except_osv(_('Warning'), warning_msg)
+
+    def _check_sync_allowed(self, cr, uid, ids, context=None):
+        """
+        Raises an error if the doc is marked as Synced whereas the Partner is neither Intermission nor Intersection
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for inv in self.browse(cr, uid, ids, fields_to_fetch=['partner_id', 'synced'], context=context):
+            if inv.partner_id.partner_type not in ('intermission', 'section') and inv.synced:
+                raise osv.except_osv(_('Warning'), _('Synchronized invoices are allowed only with Intermission and Intersection partners.'))
+
     def invoice_open(self, cr, uid, ids, context=None):
         """
         No longer fills the date automatically, but requires it to be set
@@ -823,6 +856,8 @@
             context = {}
         self._check_invoice_merged_lines(cr, uid, ids, context=context)
         self.check_accounts_for_partner(cr, uid, ids, context=context)
+        self._check_tax_allowed(cr, uid, ids, context=context)
+        self._check_sync_allowed(cr, uid, ids, context=context)
 
         # Prepare workflow object
         wf_service = netsvc.LocalService("workflow")
@@ -871,6 +906,12 @@
 
         return True
 
+    def invoice_open_with_confirmation(self, cr, uid, ids, context=None):
+        """
+        Simply calls "invoice_open" (asking for confirmation is done at form level)
+        """
+        return self.invoice_open(cr, uid, ids, context=context)
+
     def action_reconcile_imported_invoice(self, cr, uid, ids, context=None):
         """
         Reconcile each imported invoice with its attached invoice line
@@ -1107,6 +1148,21 @@
             self._check_header_account(cr, uid, inv_id, inv_type=inv_type, context=context)
             self._check_line_accounts(cr, uid, inv_id, inv_type=inv_type, context=context)
 
+    def update_counterpart_inv_status(self, cr, uid, ids, context=None):
+        """
+        In case an IVO or STV, with an Intermission or Intersection partner and set as Synchronized, is being opened:
+        set the Counterpart Invoice Status to Draft automatically
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        inv_fields = ['type', 'is_debit_note', 'synced', 'partner_type', 'counterpart_inv_status']
+        for inv in self.browse(cr, uid, ids, fields_to_fetch=inv_fields, context=context):
+            is_ivo_or_stv = inv.type == 'out_invoice' and not inv.is_debit_note
+            if is_ivo_or_stv and inv.synced and inv.partner_type in ('intermission', 'section') and not inv.counterpart_inv_status:
+                self.write(cr, uid, inv.id, {'counterpart_inv_status': 'draft'}, context=context)
+
     def action_open_invoice(self, cr, uid, ids, context=None, *args):
         """
         Give function to use when changing invoice to open state
@@ -1124,6 +1180,7 @@
         if not self.action_reconcile_imported_invoice(cr, uid, ids, context):
             return False
         self.check_domain_restrictions(cr, uid, ids, context)  # raises an error if one unauthorized element is used
+        self.update_counterpart_inv_status(cr, uid, ids, context=context)
         return True
 
 
@@ -1629,6 +1686,13 @@
                                            relation="account.analytic.account", string='Funding Pool',
                                            states={'draft': [('readonly', False)]},
                                            help="Field used for import only"),
+        'from_supply': fields.related('invoice_id', 'from_supply', type='boolean', string='From Supply', readonly=True, store=False),
+        'synced': fields.related('invoice_id', 'synced', type='boolean', string='Synchronized', readonly=True, 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'),
+                                                  ('out_refund', 'Customer Refund'),
+                                                  ('in_refund', 'Supplier Refund')]),
     }
 
     _defaults = {
@@ -1661,6 +1725,23 @@
             if abs(qty) >= too_big_amount or abs(pu) >= too_big_amount or abs(discount) >= too_big_amount or abs(subtotal) >= too_big_amount:
                 raise osv.except_osv(_('Error'), _('Line "%s": one of the numbers entered is more than 10 digits.') % inv_line.name)
 
+    def _check_automated_invoice(self, cr, uid, invoice_id, context=None):
+        """
+        Prevents the creation of manual inv. lines if the related invoice has been generated via Sync. or
+        by a Supply workflow (for Intermission/Intersection partners)
+        """
+        if context is None:
+            context = {}
+        inv_obj = self.pool.get('account.invoice')
+        if invoice_id:
+            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)
+            ivi_or_si_synced = inv.type == 'in_invoice' and not inv.is_inkind_donation and inv.synced
+            intermission_or_section_from_supply = inv.partner_type in ('intermission', 'section') and inv.from_supply
+            if context.get('from_inv_form') and (ivi_or_si_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.'))
+
     def create(self, cr, uid, vals, context=None):
         """
         Give a line_number to invoice line.
@@ -1671,6 +1752,7 @@
         """
         if not context:
             context = {}
+        self._check_automated_invoice(cr, uid, vals.get('invoice_id'), context=context)
         # Create new number with invoice sequence
         if vals.get('invoice_id') and self._name in ['account.invoice.line']:
             invoice = self.pool.get('account.invoice').browse(cr, uid, vals['invoice_id'])
@@ -1766,9 +1848,10 @@
 
     def unlink(self, cr, uid, ids, context=None):
         """
-        If invoice is a Direct Invoice and is in draft state:
-         - compute total amount (check_total field)
-         - write total to the register line
+        - If invoice is a Direct Invoice and is in draft state:
+            - compute total amount (check_total field)
+            - write total to the register line
+        - Raise error msg if the related inv. has been generated via Sync. or by a Supply workflow (for Intermission/Intersection partners)
         """
         if not context:
             context = {}
@@ -1776,16 +1859,25 @@
             ids = [ids]
         # Fetch all invoice_id to check
         direct_invoice_ids = []
+        invoice_ids = []
         abst_obj = self.pool.get('account.bank.statement.line')
         for invl in self.browse(cr, uid, ids):
-            if invl.invoice_id and invl.invoice_id.is_direct_invoice and invl.invoice_id.state == 'draft':
-                direct_invoice_ids.append(invl.invoice_id.id)
-                # find account_bank_statement_lines and used this to delete the account_moves and associated records
-                absl_ids = abst_obj.search(cr, uid,
-                                           [('invoice_id','=',invl.invoice_id.id)],
-                                           order='NO_ORDER')
-                if absl_ids:
-                    abst_obj.unlink_moves(cr, uid, absl_ids, context)
+            if invl.invoice_id and invl.invoice_id.id not in invoice_ids:
+                invoice = invl.invoice_id
+                invoice_ids.append(invoice.id)  # check each invoice only once
+                is_ivi_or_si = invoice.type == 'in_invoice' and not invoice.is_inkind_donation
+                if (is_ivi_or_si and invoice.synced) or (invoice.from_supply and invoice.partner_type in ('intermission', 'section')):
+                    # will be displayed when trying to delete lines manually / merge lines / or split invoices
+                    raise osv.except_osv(_('Error'), _("This document has been generated via a Supply workflow or via synchronization. "
+                                                       "Existing lines can't be deleted."))
+                if invoice.is_direct_invoice and invoice.state == 'draft':
+                    direct_invoice_ids.append(invoice.id)
+                    # find account_bank_statement_lines and use this to delete the account_moves and associated records
+                    absl_ids = abst_obj.search(cr, uid,
+                                               [('invoice_id', '=', invoice.id)],
+                                               order='NO_ORDER')
+                    if absl_ids:
+                        abst_obj.unlink_moves(cr, uid, absl_ids, context)
         # Normal behaviour
         res = super(account_invoice_line, self).unlink(cr, uid, ids, context)
         # See all direct invoice

=== modified file 'bin/addons/analytic_distribution/account_invoice_refund.py'
--- bin/addons/analytic_distribution/account_invoice_refund.py	2018-05-14 12:41:04 +0000
+++ bin/addons/analytic_distribution/account_invoice_refund.py	2019-07-15 07:18:58 +0000
@@ -43,8 +43,10 @@
         # 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_type = obj_inv.read(cr, uid, doc_to_refund_id, ['type'], context=context)['type']
-            if source_type in ('in_invoice', 'in_refund'):
+            source = obj_inv.read(cr, uid, doc_to_refund_id, ['type', 'is_intermission'], context=context)
+            if source['is_intermission']:
+                args = [('type', '=', 'intermission')]
+            elif source['type'] in ('in_invoice', 'in_refund'):
                 args = [('type', '=', 'purchase_refund')]
         if user.company_id.instance_id:
             args.append(('is_current_instance','=',True))
@@ -72,7 +74,7 @@
             jtype = isinstance(context['journal_type'], list) and context['journal_type'][0] or context['journal_type']
         if jtype in ('sale', 'sale_refund'):
             jtype = 'sale_refund'
-        else:
+        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']:
@@ -86,13 +88,32 @@
     _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)
     }
 
+    def _get_refund(self, cr, uid, context=None):
+        """
+        Returns the default value for the 'filter_refund' field depending on the context
+        """
+        if context is None:
+            context = {}
+        if context.get('is_intermission', False):
+            return 'modify'
+        return 'refund'  # note that only the "Refund" option is available in DI
+
+    def _get_is_intermission(self, cr, uid, context=None):
+        """
+        Returns True if the wizard has been opened from an Intermission Voucher
+        """
+        if context is None:
+            context = {}
+        return context.get('is_intermission', False)
+
     _defaults = {
         'document_date': _get_document_date,
-        #UTP-961: refund DI: only refund option is available
-        'filter_refund': 'refund',
+        'filter_refund': _get_refund,
         'journal_id': _get_journal,  # US-193
+        'is_intermission': _get_is_intermission,
     }
 
     def _hook_fields_for_modify_refund(self, cr, uid, *args):

=== modified file 'bin/addons/analytic_distribution/account_invoice_view.xml'
--- bin/addons/analytic_distribution/account_invoice_view.xml	2018-02-23 14:35:29 +0000
+++ bin/addons/analytic_distribution/account_invoice_view.xml	2019-07-15 07:18:58 +0000
@@ -120,10 +120,16 @@
                     <xpath expr="//separator[@string='Taxes']" position="replace" />
                     <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)]}">
                             <separator colspan="4" string="Taxes"/>
-                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"
-                                nolabel="1"/>
+                            <field colspan="4"
+                                   name="invoice_line_tax_id"
+                                   context="{'type': parent.type}"
+                                   domain="[('parent_id', '=', False), ('company_id', '=', parent.company_id)]"
+                                   nolabel="1"
+                                   attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('synced', '=', True)]}"
+                            />
                         </group>
                     </xpath>
                 </data>

=== modified file 'bin/addons/msf_audittrail/audittrail_invoice_data.yml'
--- bin/addons/msf_audittrail/audittrail_invoice_data.yml	2019-05-13 09:18:37 +0000
+++ bin/addons/msf_audittrail/audittrail_invoice_data.yml	2019-07-15 07:18:58 +0000
@@ -9,7 +9,8 @@
         # Create the rule
         fields = ['date_invoice', 'state', 'account_id', 'address_invoice_id', 'amount_to_pay', 'analytic_distribution_id', 
                   'check_total', 'comment', 'currency_id', 'fiscal_position', 'name', 'origin', 'partner_id', 
-                  'payment_ids', 'period_id', 'reference', 'reference_type', 'tax_line']
+                  'payment_ids', 'period_id', 'reference', 'reference_type', 'tax_line', 'synced', 'counterpart_inv_number',
+                  'counterpart_inv_status']
 
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'account.invoice'), ('name', 'in', fields)], context=context)
 

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2019-05-10 13:59:15 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2019-07-15 07:18:58 +0000
@@ -1579,6 +1579,7 @@
                 'fiscal_position': partner.property_account_position.id,
                 'date_invoice': context.get('date_inv', False) or today,
                 'user_id': uid,
+                'from_supply': True,
             }
 
             cur_id = shipment.pack_family_memory_ids[0].currency_id.id
@@ -1614,6 +1615,7 @@
                 continue
 
             if is_ivo or is_stv:
+                invoice_vals.update({'synced': True, })  # add "synced" tag for STV and IVO created from Supply flow
                 origin_inv = 'origin' in invoice_vals and invoice_vals['origin'] or False
                 fo = move and move.sale_line_id and move.sale_line_id.order_id or False
                 new_origin = origin_inv and fo and "%s:%s" % (origin_inv, fo.name)

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2019-06-20 14:28:17 +0000
+++ bin/addons/msf_profile/data/patches.xml	2019-07-15 07:18:58 +0000
@@ -429,5 +429,10 @@
             <field name="method">us_6111_nr_field_closed_mar_2018</field>
         </record>
 
+        <!-- UF14.0 -->
+        <record id="us_6076_set_inv_as_from_supply" model="patch.scripts">
+            <field name="method">us_6076_set_inv_as_from_supply</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-06-20 14:24:33 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-07-15 07:18:58 +0000
@@ -8811,6 +8811,8 @@
 #: selection:wizard.import.product.line,state:0
 #: selection:product.mass.update,state:0
 #: selection:stock.expired.damaged.report,state:0
+#: selection:account.invoice,counterpart_inv_status:0
+#: selection:wizard.account.invoice,counterpart_inv_status:0
 #, python-format
 msgid "Draft"
 msgstr "Brouillon"
@@ -10423,6 +10425,8 @@
 #: selection:sale.donation.stock.moves,partner_type:0
 #: selection:sale.loan.stock.moves,partner_type:0
 #: selection:stock.picking,partner_type:0
+#: selection:account.invoice,partner_type:0
+#: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:32
 #: field:supplier.performance.wizard,partner_type_intermission:0
 msgid "Intermission"
@@ -11252,7 +11256,7 @@
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
-msgid "Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled"
+msgid "Refund invoice based on this type. You can not Modify and Cancel if the invoice is already reconciled"
 msgstr "Facture d'Avoirs basée sur ce type. Vous ne pouvez pas Modifier ni Annuler si la facture est déjà lettrée."
 
 #. module: base
@@ -12219,7 +12223,7 @@
 msgid "No envoi.ini file found in given ZIP file!"
 msgstr "Pas de fichier envoi.ini trouvé dans le fichier ZP donné!"
 
-#. modules: msf_processes, account, register_accounting
+#. modules: msf_processes, account, register_accounting, account_override
 #: view:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
@@ -12233,6 +12237,7 @@
 #: code:addons/register_accounting/account_bank_statement.py:2735
 #: view:wizard.account.invoice:0
 #: selection:wizard.account.invoice,type:0
+#: selection:account.invoice.line,invoice_type:0
 #, python-format
 msgid "Supplier Invoice"
 msgstr "Facture Fournisseur"
@@ -13330,7 +13335,7 @@
 msgid "Automatic entry"
 msgstr "Ecriture Automatique"
 
-#. modules: msf_order_date, purchase, msf_partner, stock_override, purchase_override, msf_config_locations, sale, account_override, analytic_distribution, msf_outgoing, msf_supply_doc_export
+#. modules: msf_order_date, purchase, msf_partner, stock_override, purchase_override, msf_config_locations, sale, account_override, analytic_distribution, msf_outgoing, msf_supply_doc_export, account
 #: selection:shipment,partner_type:0
 #: selection:purchase.order.merged.line,po_partner_type_stored:0
 #: selection:sale.loan.stock.moves,partner_type:0
@@ -13348,6 +13353,8 @@
 #: selection:sale.donation.stock.moves,partner_type:0
 #: selection:sale.order.change.currency,partner_type:0
 #: selection:stock.picking,partner_type_stock_picking:0
+#: selection:account.invoice,partner_type:0
+#: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:30
 #: field:supplier.performance.wizard,partner_type_external:0
 msgid "External"
@@ -14950,8 +14957,9 @@
 msgid "BARBADOS DOLLAR"
 msgstr "BARBADOS DOLLAR"
 
-#. modules: account, register_accounting
+#. modules: account, register_accounting, account_override
 #: selection:account.invoice,type:0
+#: selection:account.invoice.line,invoice_type:0
 #: selection:account.invoice.report,type:0
 #: report:account.invoice2:0
 #: selection:report.invoice.created,type:0
@@ -17436,12 +17444,13 @@
 msgid "Warning!"
 msgstr "Avertissement!"
 
-#. modules: purchase, sale
+#. modules: purchase, sale, account_override
 #: code:addons/purchase/purchase_workflow.py:549
 #: code:addons/sale/sale_workflow.py:529
+#: code:addons/account_override/invoice.py:829
 #, python-format
-msgid "You can't use taxes with an intermission partner."
-msgstr "Vous ne pouvez pas utiliser de taxes avec un partenaire intermission."
+msgid "Taxes are forbidden with Intermission and Intersection partners."
+msgstr "Les taxes sont interdites avec les partenaires Intermission et Intersection."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -21180,7 +21189,7 @@
 msgid "Free 1 Lines"
 msgstr "Option 1 Lignes"
 
-#. modules: account_override, msf_outgoing, purchase_override, stock_override, sale, msf_order_date, purchase, msf_partner, msf_supply_doc_export
+#. modules: account_override, msf_outgoing, purchase_override, stock_override, sale, msf_order_date, purchase, msf_partner, msf_supply_doc_export, account
 #: field:account.account,has_partner_type_section:0
 #: selection:shipment,partner_type:0
 #: selection:purchase.order.merged.line,po_partner_type_stored:0
@@ -21188,6 +21197,8 @@
 #: selection:sale.loan.stock.moves,partner_type:0
 #: selection:stock.picking,partner_type:0
 #: selection:sale.order,partner_type:0
+#: selection:account.invoice,partner_type:0
+#: selection:account.invoice.line,partner_type:0
 #: view:res.partner:0
 #: selection:res.partner,partner_type:0
 #: selection:purchase.order,partner_type:0
@@ -27161,6 +27172,8 @@
 #: field:purchase.report,invoiced:0
 #: view:account.invoice:0
 #: selection:account.direct.invoice.wizard,state:0
+#: selection:account.invoice,counterpart_inv_status:0
+#: selection:wizard.account.invoice,counterpart_inv_status:0
 msgid "Paid"
 msgstr "Payé"
 
@@ -45639,6 +45652,7 @@
 
 #. modules: account, register_accounting
 #: field:account.invoice,tax_line:0
+#: field:account.invoice,tax_line_ids:0
 #: field:wizard.account.invoice,tax_line:0
 msgid "Tax Lines"
 msgstr "Lignes de Taxe"
@@ -47234,7 +47248,7 @@
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#. modules: msf_order_date, purchase, msf_outgoing, msf_partner, stock_override, purchase_override, sale, account_override, analytic_distribution, msf_supply_doc_export
+#. modules: msf_order_date, purchase, msf_outgoing, msf_partner, stock_override, purchase_override, sale, account_override, analytic_distribution, msf_supply_doc_export, account
 #: field:account.account,has_partner_type_esc:0
 #: view:account.commitment:0
 #: selection:sale.order,partner_type:0
@@ -47250,6 +47264,8 @@
 #: selection:sale.order.change.currency,partner_type:0
 #: selection:stock.picking,partner_type:0
 #: selection:stock.picking,partner_type_stock_picking:0
+#: selection:account.invoice,partner_type:0
+#: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:31
 #: field:supplier.performance.wizard,partner_type_esc:0
 msgid "ESC"
@@ -52060,9 +52076,11 @@
 msgid "Search Donation"
 msgstr "Rechercher Donation"
 
-#. module: sale
+#. modules: sale, account_override, account
 #: report:addons/sale/report/sale_donation_stock_moves_report_xls.mako:127
 #: field:sale.donation.stock.moves,partner_type:0
+#: field:account.invoice,partner_type:0
+#: field:account.invoice.line,partner_type:0
 msgid "Partner Type"
 msgstr "Type de Partenaire"
 
@@ -57043,8 +57061,9 @@
 msgid "Kit Composition List"
 msgstr "Liste de composition du Kit"
 
-#. modules: account, register_accounting
+#. modules: account, register_accounting, account_override
 #: selection:account.invoice,type:0
+#: selection:account.invoice.line,invoice_type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 #: selection:wizard.account.invoice,type:0
@@ -63480,6 +63499,18 @@
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr "Impossible de supprimer des factures qui sont déjà ouvertes ou payées !"
 
+#. module: account
+#: code:addons/account/invoice.py:472
+#, python-format
+msgid "Cannot delete invoice(s) generated by a Supply workflow!"
+msgstr "Impossible de supprimer des factures générées par un flux \"Supply\" !"
+
+#. module: account
+#: code:addons/account/invoice.py:474
+#, python-format
+msgid "Cannot delete invoice(s) set as \"Synchronized\"!"
+msgstr "Impossible de supprimer des factures marquées comme \"Synchronisées\" !"
+
 #. module: stock
 #: view:physical.inventory:0
 msgid "Counting sheet"
@@ -66467,8 +66498,9 @@
 msgid "Remove all Instances"
 msgstr "Supprimer toutes les instances"
 
-#. module: analytic_distribution
+#. modules: analytic_distribution, account_override
 #: view:account.invoice.line:0
+#: view:account.invoice:0
 msgid "Change analytic distribution"
 msgstr "Changer la distribution analytique"
 
@@ -68529,7 +68561,7 @@
 #. module: account_override
 #: view:account.invoice:0
 msgid "You are about to cancel this invoice. Do you want to proceed?"
-msgstr "You are about to cancel this invoice. Do you want to proceed?"
+msgstr "Vous êtes sur le point d'annuler cette facture. Voulez-vous continuer ?"
 
 #. module: procurement
 #: help:procurement.order,name:0
@@ -73872,6 +73904,7 @@
 #: code:addons/account_override/invoice.py:1484
 #: code:addons/account_override/invoice.py:1772
 #: code:addons/account_override/invoice.py:1775
+#: code:addons/account_override/account_invoice_sync.py:0
 #: code:addons/account_reconciliation/account_move_line.py:236
 #: code:addons/account_reconciliation/account_move_line.py:256
 #: code:addons/account_reconciliation/account_move_line.py:258
@@ -78469,6 +78502,8 @@
 #: selection:purchase.order,rfq_state:0
 #: view:tender:0
 #: selection:tender,state:0
+#: selection:account.invoice,counterpart_inv_status:0
+#: selection:wizard.account.invoice,counterpart_inv_status:0
 #: field:po.follow.up,cancel_ok:0
 #, python-format
 msgid "Cancelled"
@@ -88640,6 +88675,8 @@
 #: selection:wizard.import.cheque,state:0
 #: selection:wizard.import.invoice,state:0
 #: selection:wizard.register.creation,state:0
+#: selection:account.invoice,counterpart_inv_status:0
+#: selection:wizard.account.invoice,counterpart_inv_status:0
 #, python-format
 msgid "Open"
 msgstr "Ouvert"
@@ -89009,10 +89046,17 @@
 
 #. module: account_override
 #: code:addons/account_override/invoice.py:747
+#: code:addons/account_override/account_invoice_sync.py:230
 #, python-format
 msgid "No Intermission journal found for the current instance."
 msgstr "Pas de journal Intermission trouvé pour l'instance actuelle."
 
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:209
+#, python-format
+msgid "No Purchase journal found for the current instance."
+msgstr "Pas de journal des Achats trouvé pour l'instance actuelle."
+
 #. module: msf_profile
 #: field:email.configuration,smtp_server:0
 msgid "SMTP Server"
@@ -94980,6 +95024,24 @@
 msgid "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
 msgstr "Ne peut %s une facture qui est déjà lettrée, le lettrage de la facture devrait d'abord être annulé. Vous ne pouvez que Rembourser cette facture"
 
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:161
+#, python-format
+msgid "Cannot %s an Intermission Voucher which is already reconciled, it should be unreconciled first."
+msgstr "Ne peut %s un Bon Intermission qui est déjà lettré, le lettrage du bon devrait d'abord être annulé."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "modify"
+msgstr "modifier"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "cancel"
+msgstr "annuler"
+
 #. modules: return_claim, msf_outgoing, stock_override, kit, msf_doc_import
 #: selection:assign.to.kit.line,integrity_status:0
 #: selection:kit.selection.line,integrity_status:0
@@ -97634,7 +97696,7 @@
 msgid "Document Date"
 msgstr "Date du Document"
 
-#. modules: msf_order_date, purchase, msf_outgoing, stock_move_tracking, msf_partner, stock_override, purchase_override, msf_config_locations, sale, account_override, stock_batch_recall, specific_rules, msf_doc_import, stock, msf_supply_doc_export
+#. modules: msf_order_date, purchase, msf_outgoing, stock_move_tracking, msf_partner, stock_override, purchase_override, msf_config_locations, sale, account_override, stock_batch_recall, specific_rules, msf_doc_import, stock, msf_supply_doc_export, account
 #: field:account.account,has_partner_type_internal:0
 #: selection:stock.location.configuration.wizard,location_type:0
 #: selection:stock.remove.location.wizard,location_usage:0
@@ -97663,6 +97725,8 @@
 #: selection:stock.picking,fake_type:0
 #: selection:stock.picking,partner_type:0
 #: selection:stock.picking,partner_type_stock_picking:0
+#: selection:account.invoice,partner_type:0
+#: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:28
 #: field:supplier.performance.wizard,partner_type_internal:0
 #, python-format
@@ -101384,12 +101448,13 @@
 msgid "On "
 msgstr "Allumé "
 
-#. modules: account, register_accounting
+#. modules: account, register_accounting, account_override
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 #: selection:wizard.account.invoice,type:0
+#: selection:account.invoice.line,invoice_type:0
 msgid "Customer Invoice"
 msgstr "Bon client"
 
@@ -106827,3 +106892,167 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+#. module: account
+#: field:account.invoice.refund,is_intermission:0
+msgid "Wizard opened from an Intermission Voucher"
+msgstr "Assistant ouvert depuis un Bon Intermission"
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:1739
+#, python-format
+msgid "This document has been generated via a Supply workflow or via synchronization. You can't add lines manually."
+msgstr "Ce document a été généré via un flux \"Supply\" ou via la synchronisation. Vous ne pouvez pas ajouter de lignes manuellement."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:1868
+#, python-format
+msgid "This document has been generated via a Supply workflow or via synchronization. Existing lines can't be deleted."
+msgstr "Ce document a été généré via un flux \"Supply\" ou via la synchronisation. Les lignes existantes ne peuvent pas être supprimées."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:848
+#, python-format
+msgid "Synchronized invoices are allowed only with Intermission and Intersection partners."
+msgstr "Les factures synchronisées ne sont autorisées qu'avec les partenaires Intermission et Intersection."
+
+#. module: account
+#: code:addons/account/invoice.py:683
+#, python-format
+msgid "Synchronization is allowed only with Intermission and Intersection partners."
+msgstr "La synchronisation n'est autorisée qu'avec les partenaires Intermission et Intersection."
+
+#. module: account_override
+#: view:account.invoice:0
+msgid "Are you sure you want to validate this invoice without synchronization?"
+msgstr "Etes-vous sûr de vouloir valider cette facture sans synchronisation ?"
+
+#. modules: account_override, account, register_accounting
+#: view:account.invoice:0
+msgid "Counterpart Invoice"
+msgstr "Facture de Contrepartie"
+
+#. modules: account_override, register_accounting
+#: field:account.invoice,counterpart_inv_number:0
+#: field:wizard.account.invoice,counterpart_inv_number:0
+msgid "Counterpart Invoice Number"
+msgstr "Numéro de la Facture de Contrepartie"
+
+#. modules: account_override, register_accounting
+#: field:account.invoice,counterpart_inv_status:0
+#: field:wizard.account.invoice,counterpart_inv_status:0
+msgid "Counterpart Invoice Status"
+msgstr "Etat de la Facture de Contrepartie"
+
+#. modules: account_override, register_accounting
+#: field:account.invoice,synced:0
+#: field:wizard.account.invoice,synced:0
+#: field:account.invoice.line,synced:0
+msgid "Synchronized"
+msgstr "Synchronisé"
+
+#. modules: account_override, register_accounting
+#: field:account.invoice,from_supply:0
+#: field:wizard.account.invoice,from_supply:0
+#: field:account.invoice.line,from_supply:0
+msgid "From Supply"
+msgstr "De la \"Supply\""
+
+#. module: account_override
+#: field:account.invoice.line,invoice_type:0
+msgid "Invoice Type"
+msgstr "Type de Facture"
+
+#. modules: account_override, register_accounting
+#: help:account.invoice,from_supply:0
+#: help:wizard.account.invoice,from_supply:0
+msgid "Internal field indicating whether the document is related to a Supply workflow"
+msgstr "Champ interne indiquant si le document est lié à un flux \"Supply\""
+
+#. module: account
+#: help:account.invoice,tax_line_ids:0
+msgid "Internal field for taxes always in read-only mode"
+msgstr "Champ interne pour les taxes toujours en mode lecture seule"
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:120
+#, python-format
+msgid "Account code %s not found."
+msgstr "Code comptable %s non trouvé."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:189
+#, python-format
+msgid "Impossible to retrieve the currency."
+msgstr "Impossible de récupérer la devise."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:117
+#, python-format
+msgid "Impossible to retrieve the account code at line level."
+msgstr "Impossible de récupérer le code comptable au niveau d'une ligne."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:193
+#, python-format
+msgid "Currency %s not found or inactive."
+msgstr "Devise %s non trouvée ou inactive."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:123
+#, python-format
+msgid "Error when retrieving the account at line level."
+msgstr "Erreur lors de la récupération du compte au niveau d'une ligne."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:235
+#, python-format
+msgid "The Intermission counterpart account is missing in the Company form or is inactive."
+msgstr "Il manque le compte de Contrepartie Intermission dans le formulaire de la Société, ou bien ce compte est inactif."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:186
+#, python-format
+msgid "Impossible to retrieve the journal type, or the journal type is incorrect."
+msgstr "Impossible de récupérer le type de journal, ou le type de journal est incorrect."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:100
+#, python-format
+msgid "Impossible to retrieve the line description."
+msgstr "Impossible de récupérer la description de la ligne."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:128
+#, python-format
+msgid "The account \"%s - %s\" is inactive."
+msgstr "Le compte \"%s - %s\" est inactif."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:135
+#, python-format
+msgid "Unit of Measure %s not found."
+msgstr "Unité de Mesure %s non trouvée."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:109
+#, python-format
+msgid "Product %s not found."
+msgstr "Produit %s non trouvé."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:181
+#, python-format
+msgid "The partner %s doesn't exist or is inactive."
+msgstr "Le partenaire %s n'existe pas ou est inactif."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:113
+#, python-format
+msgid "The product %s is inactive."
+msgstr "Le produit %s est inactif."
+
+#. module: account_override
+#: code:addons/account_override/account_invoice_sync.py:214
+#, python-format
+msgid "Account Payable not found or inactive for the partner %s."
+msgstr "Compte Fournisseur non trouvé ou inactif pour le partenaire %s."

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2019-06-20 14:28:17 +0000
+++ bin/addons/msf_profile/msf_profile.py	2019-07-15 07:18:58 +0000
@@ -69,6 +69,21 @@
                     err_msg,
                 )
 
+    # UF14.0
+    def us_6076_set_inv_as_from_supply(self, cr, uid, *a, **b):
+        """
+        Set the new tag from_supply to True in the related account.invoices
+        """
+        update_inv = """
+            UPDATE account_invoice
+            SET from_supply = 't' 
+            WHERE picking_id IS NOT NULL
+            OR id IN (SELECT DISTINCT (invoice_id) FROM shipment WHERE invoice_id IS NOT NULL);
+        """
+        cr.execute(update_inv)
+        self._logger.warn('Tag from_supply set to True in %s account.invoice(s).' % (cr.rowcount,))
+        return True
+
     # UF13.1
     def us_3413_align_in_partner_to_po(self,cr, uid, *a, **b):
         cr.execute("select p.name, p.id, po.partner_id, p.partner_id from stock_picking p, purchase_order po where p.type='in' and po.id = p.purchase_id and ( p.partner_id != po.partner_id or p.partner_id2 != po.partner_id) order by p.name")

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2019-02-16 16:57:55 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2019-07-15 07:18:58 +0000
@@ -15,6 +15,10 @@
 msf_sync_data_server.validated_claim_create_claim,TRUE,TRUE,"['category_return_claim', 'creation_date_return_claim', 'description_return_claim', 'follow_up_return_claim', 'name', 'picking_id_return_claim/shipment_ref', 'po_id_return_claim/name', 'po_so_return_claim', 'goods_expected', 'processor_origin', 'state', 'type_return_claim', 'origin_claim', 'event_ids_return_claim/name', 'event_ids_return_claim/creation_date_claim_event', 'event_ids_return_claim/from_picking_wizard_claim_event', 'event_ids_return_claim/replacement_picking_expected_claim_event', 'event_ids_return_claim/type_claim_event', 'event_ids_return_claim/description_claim_event', 'product_line_ids_return_claim/price_unit_claim_product_line', 'product_line_ids_return_claim/qty_claim_product_line', 'product_line_ids_return_claim/product_id_claim_product_line/id', 'product_line_ids_return_claim/product_id_claim_product_line/name', 'product_line_ids_return_claim/price_currency_claim_product_line/id', 'product_line_ids_return_claim/price_currency_claim_product_line/name', 'product_line_ids_return_claim/uom_id_claim_product_line/id', 'product_line_ids_return_claim/uom_id_claim_product_line/name', 'product_line_ids_return_claim/type_check', 'product_line_ids_return_claim/expiry_date_claim_product_line']","[('state', '=', 'in_progress'), ('partner_id_return_claim.partner_type', 'in', ['internal', 'intermission', 'intersection']), ('type_return_claim', '=', 'supplier'), ('old_version', '=', False)]",partner_id_return_claim,MISSION,return.claim.validated_claim_create_claim,return.claim,Validated Claim creates Claim,28,,Valid
 msf_sync_data_server.origin_claim_close_claim,TRUE,TRUE,"['name', 'state', 'partner_id_return_claim/name', 'partner_id_return_claim/partner_type']","[('state', '=', 'done'), ('partner_id_return_claim.partner_type', '=', 'internal'), ('type_return_claim', '=', 'supplier'), ('old_version', '=', False)]",partner_id_return_claim,MISSION,return.claim.origin_claim_close_claim,return.claim,Original Closed Claim close counterpart Claim,29,,Valid
 msf_sync_data_server.goods_expecting_picking_from_claim_creates_fo,TRUE,TRUE,"['name', 'claim_name', 'purchase_id/name', 'purchase_id/delivery_requested_date','purchase_id/details', 'purchase_id/notes', 'purchase_id/categ', 'purchase_id/order_type', 'purchase_id/priority', 'purchase_id/loan_duration', 'purchase_id/analytic_distribution_id/id', 'purchase_id/is_a_counterpart', 'purchase_id/pricelist_id/name', 'purchase_id/stock_take_date', 'move_lines/product_id/name', 'move_lines/purchase_line_id/id', 'move_lines/purchase_line_id/sync_local_id', 'move_lines/name', 'move_lines/comment', 'move_lines/product_qty', 'move_lines/product_uom/name', 'move_lines/price_unit', 'move_lines/line_number']","['&', '&', ('state', '=', 'assigned'), ('partner_id.partner_type', '=', 'internal'), ('claim', '=', True), ('claim_name', '!=', False), '|', ('name', 'like', 'replacement'), ('name', 'like', 'missing')]",partner_id,MISSION,stock.picking.goods_expecting_picking_from_claim_creates_fo,stock.picking,IN-replacement/-missing created by Claim creates FO,30,,Valid
+msf_sync_data_server.create_account_invoice,TRUE,TRUE,"['number', 'document_date', 'date_invoice', 'journal_id/type', 'name', 'origin', 'from_supply', 'state', 'currency_id/name', 'invoice_line/name', 'invoice_line/quantity', 'invoice_line/uos_id/name', 'invoice_line/price_unit', 'invoice_line/discount', 'invoice_line/account_id/code', 'invoice_line/product_id/id', 'invoice_line/product_id/default_code']","[('type', '=', 'out_invoice'), ('is_debit_note', '=', False), ('state', '!=', 'draft'), ('number', '!=', False), ('synced', '=', True), ('partner_type', 'in', ('intermission', 'section'))]",partner_id,MISSION,account.invoice.create_invoice_from_sync,account.invoice,Account Invoice Creation,40,,Valid
+msf_sync_data_server.update_counterpart_inv_opened,TRUE,TRUE,"['number', 'state', 'counterpart_inv_number']","[('synced', '=', True), ('partner_type', 'in', ('intermission', 'section')), ('number', '!=', False), ('state', '=', 'open')]",partner_id,MISSION,account.invoice.update_counterpart_inv_opened,account.invoice,Account Invoice Open State Update,42,,Valid
+msf_sync_data_server.update_counterpart_inv_paid,TRUE,TRUE,"['number', 'state', 'counterpart_inv_number']","[('synced', '=', True), ('partner_type', 'in', ('intermission', 'section')), ('number', '!=', False), ('state', '=', 'paid')]",partner_id,MISSION,account.invoice.update_counterpart_inv_paid,account.invoice,Account Invoice Paid State Update,43,,Valid
+msf_sync_data_server.update_counterpart_inv_cancelled,TRUE,TRUE,"['number', 'state', 'counterpart_inv_number']","[('synced', '=', True), ('partner_type', 'in', ('intermission', 'section')), ('number', '!=', False), ('state', '=', 'cancel')]",partner_id,MISSION,account.invoice.update_counterpart_inv_cancelled,account.invoice,Account Invoice Cancel State Update,44,,Valid
 msf_sync_data_server.create_batch_object,FALSE,TRUE,"['name', 'xmlid_name', 'prefix', 'product_id/id', 'product_id/default_code', 'partner_id/id', 'date', 'ref','life_date','sequence_id','type']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_batch_number,stock.production.lot,Create Batch Object,1001,,Valid
 msf_sync_data_server.create_asset_object,TRUE,TRUE,"['name', 'xmlid_name', 'arrival_date', 'asset_type_id/id', 'partner_id/id', 'brand', 'comment', 'description', 'hq_ref', 'international_po', 'invo_certif_depreciation', 'invo_currency/id', 'invo_date', 'invo_donator_code', 'invo_num', 'invo_supplier', 'invo_value', 'local_ref', 'model', 'orig_mission_code', 'product_id/id', 'product_id/default_code', 'project_po', 'receipt_place', 'serial_nb', 'type', 'year']","[('name', '=', False)]",partner_id,MISSION,stock.picking.create_asset,product.asset,Create Asset Object,1002,,Valid
 msf_sync_data_server.reset_ref_by_recovery_mode,TRUE,TRUE,['name'],"[('name', '=', False)]",partner_id,MISSION,sale.order.reset_ref_by_recovery_mode,sale.order,Reset Due to Recovery,1003,,Valid

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2019-05-14 08:00:10 +0000
+++ bin/addons/purchase/purchase_workflow.py	2019-07-15 07:18:58 +0000
@@ -502,15 +502,15 @@
 
     def check_po_tax(self, cr, uid, ids, context=None):
         """
-        Prevents from validating a PO with taxes when using an Intermission partner
+        Prevents from validating a PO with taxes when using an Intermission or Intersection partner
         """
         if context is None:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
         for po_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'taxes_id'], context=context):
-            if po_line.taxes_id and po_line.order_id.partner_type == 'intermission':
-                raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
+            if po_line.taxes_id and po_line.order_id.partner_type in ('intermission', 'section'):
+                raise osv.except_osv(_('Error'), _("Taxes are forbidden with Intermission and Intersection partners."))
 
     def check_origin_for_validation(self, cr, uid, ids, context=None):
         if not context:

=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
--- bin/addons/register_accounting/account_invoice_view.xml	2018-05-15 08:55:26 +0000
+++ bin/addons/register_accounting/account_invoice_view.xml	2019-07-15 07:18:58 +0000
@@ -316,11 +316,15 @@
                     </field>
                     <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')]}">
-                            <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
+                            <button name="wizard_import_si_line" string="Import lines" icon="gtk-dnd" type="object"
+                                    attrs="{'invisible': [('state', '!=', 'draft')],
+                                            'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                         </group>
                     </xpath>
                     <field name="journal_id" position="replace">
-                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"/>
+                        <field name="journal_id"
+                               domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"
+                               attrs="{'readonly': [('type', '=', 'in_invoice'), ('synced', '=', True)]}"/>
                         <field name="vat_ok" invisible="1" />
                     </field>
                     <button name="action_cancel_draft" position="replace"/>
@@ -348,6 +352,14 @@
                                 </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>
                     </page>
 
                     <xpath expr="/form//field[@name='tax_line']" position="attributes">

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2019-05-14 08:00:10 +0000
+++ bin/addons/sale/sale_workflow.py	2019-07-15 07:18:58 +0000
@@ -529,15 +529,15 @@
 
     def check_fo_tax(self, cr, uid, ids, context=None):
         """
-        Prevents from validating a FO with taxes when using an Intermission partner
+        Prevents from validating a FO with taxes when using an Intermission or Intersection partner
         """
         if context is None:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
         for fo_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'tax_id'], context=context):
-            if fo_line.tax_id and fo_line.order_id.partner_type == 'intermission':
-                raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
+            if fo_line.tax_id and fo_line.order_id.partner_type in ('intermission', 'section'):
+                raise osv.except_osv(_('Error'), _("Taxes are forbidden with Intermission and Intersection partners."))
 
     def action_validate(self, cr, uid, ids, context=None):
         '''

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2019-05-10 14:40:57 +0000
+++ bin/addons/stock/stock.py	2019-07-15 07:18:58 +0000
@@ -1228,6 +1228,7 @@
                 'company_id': picking.company_id.id,
                 'user_id':uid,
                 'picking_id': picking.id,
+                'from_supply': True,
             }
             if picking.sale_id:
                 if not partner.property_account_position.id:
@@ -1321,6 +1322,13 @@
             if origin_ivi:
                 invoice_vals.update({'origin': origin_ivi})
 
+            # Add "synced" tag for STV and IVO created from Supply flow
+            out_invoice = inv_type == 'out_invoice'
+            is_stv = out_invoice and not di and not inkind_donation and not intermission
+            is_ivo = out_invoice and not debit_note and not inkind_donation and intermission
+            if is_stv or is_ivo:
+                invoice_vals.update({'synced': True, })
+
             # Update Payment terms and due date for the Supplier Invoices and Refunds
             if is_si or inv_type == 'in_refund':
                 si_payment_term = self._get_payment_term(cr, uid, picking)

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2019-05-10 14:31:04 +0000
+++ bin/addons/stock_override/stock.py	2019-07-15 07:18:58 +0000
@@ -942,6 +942,11 @@
         if sp.type == 'out' and sp.partner_id.partner_type == 'external' and invoice_type != 'in_refund':
             res = False
 
+        # Move in on an intermission or intersection partner should not create an IVI / SI (generation of Donations shouldn't be blocked)
+        if sp.type == 'in' and sp.purchase_id and sp.purchase_id.order_type not in ('donation_st', 'donation_exp') \
+                and sp.partner_id and sp.partner_id.partner_type in ('intermission', 'section') and invoice_type == 'in_invoice':
+            res = False
+
         return res
 
     def _create_invoice(self, cr, uid, stock_picking):

=== modified file 'bin/addons/sync_so/picking.py'
--- bin/addons/sync_so/picking.py	2018-06-08 14:22:21 +0000
+++ bin/addons/sync_so/picking.py	2019-07-15 07:18:58 +0000
@@ -316,10 +316,7 @@
         if shipment:
             shipment_ref = shipment['name'] # shipment made
         else:
-            #UFTP-332: Check if name is really an OUT, because DPO could have PICk but no SHIP nor OUT --> do not link this PICK to IN
             shipment_ref = pick_dict.get('name', False) # the case of OUT
-            if shipment_ref and 'OUT' not in shipment_ref:
-                shipment_ref = False
         if not po_id and pick_dict.get('sale_id') and pick_dict.get('sale_id', {}).get('claim_name_goods_return'):
             po_sync_name = pick_dict.get('sale_id', {}).get('client_order_ref')
             if po_sync_name:
@@ -756,6 +753,9 @@
                     so_po_common = self.pool.get('so.po.common')
                     so_po_common.create_invalid_recovery_message(cr, uid, source, in_name, context)
                     return "Recovery: the reference to " + in_name + " at " + source + " will be set to void."
+        elif 'PICK' in out_doc_name:
+            return "Msg ignored"
+
         if message:
             self._logger.info(message)
             return message